More as-needed fixes (bug 324301). Thanks Jeremy Murphy <jeremy.william.murphy@gmail...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/sci-chemistry/mpqc/ChangeLog b/sci-chemistry/mpqc/ChangeLog
index e7a58839a54f60d30e5c28e19d5c88cc1f9a5ba2..f44cf55b09dd16f3545e70415aacf671b90cf585 100644 (file)
--- a/sci-chemistry/mpqc/ChangeLog
+++ b/sci-chemistry/mpqc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/mpqc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mpqc/ChangeLog,v 1.18 2010/05/23 10:40:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mpqc/ChangeLog,v 1.19 2010/06/18 18:20:53 xarthisius Exp $
+
+  18 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  files/mpqc-2.3.1-as-needed.patch:
+  More as-needed fixes (bug 324301). Thanks Jeremy Murphy
+  <jeremy.william.murphy@gmail.com> for reporting
 
 *mpqc-2.3.1-r2 (23 May 2010)
 

diff --git a/sci-chemistry/mpqc/Manifest b/sci-chemistry/mpqc/Manifest
index 8be55a99fcf2753336cc9185a139e392f5c644a3..bf4e5eca0875bf36ec5dc2e95a4e0da3365eb304 100644 (file)
--- a/sci-chemistry/mpqc/Manifest
+++ b/sci-chemistry/mpqc/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mpqc-2.3.1-as-needed.patch 5612 RMD160 7ee0d350f43a2efa2b95d84cf1e6465052c80064 SHA1 1c4e4387749a1cbf5984aeff0c3f67caccd0e8a3 SHA256 01eab253e1ad7b9be0802f5d9df7a316e9685e68da224f5c22abdf5ec53859da
+AUX mpqc-2.3.1-as-needed.patch 6101 RMD160 2c9e67125a1ec77bb701a5d9203dad5a109ef489 SHA1 b700b898f80fd84ad9aa85bb72913b29a08ab5df SHA256 5ed64fad86561612bf03678f6f3e780099f5bd393f0b5c20622fa7789ac23845
 AUX mpqc-2.3.1-respect-ldflags.patch 666 RMD160 20c262d37a81ccf1d4bbd8fadcbb57d0051d8197 SHA1 39c6015c2204b3247341df420bda5d10d8458b72 SHA256 3f50b2e3a0038b7d4fc8f98eb375f794f37164a69edf6d7a767b0146e20481ca
 AUX mpqc-2.3.1-test-failure-hack.patch 543 RMD160 101aa46ca5a0d823baacfa4ee27fc8dd5bca231c SHA1 d33eb79e9342029c9ad51bd4c5544ddfafb559e2 SHA256 af5ae5f76916cbfe1a94981f94a30b373188de60ea19cc3d677d82c71412e503
 DIST mpqc-2.3.1.tar.bz2 2521392 RMD160 0e3b395e9ed663b9c3de120fb4f5a00bc40c7e0f SHA1 f89fcbe6e07e90abe02fc21dbce045a2a749f65d SHA256 18f162ca9cb8b3b05372b0ec3d02b4b8a4a7aabfc7b2abead350ddef8f048ecc
 EBUILD mpqc-2.3.1-r1.ebuild 2442 RMD160 7a0a2df4f1b9b6bc97635e36d269593a1cd2a78d SHA1 9d493d65f856f2468d95082287a3c131b1e77a6c SHA256 809ab551eaed5f722fd7b85e6e5fadd9161b05201cc0a98b0e682dc7d3daeec3
 EBUILD mpqc-2.3.1-r2.ebuild 2583 RMD160 5fd75c1d2bc11578f8f4972f6937e94103708277 SHA1 87a5e18f56e5f56d2caa1b61641ef494a03bad75 SHA256 f7c55c82f6f7d940e1b30960a309eadc24bb381407729d54deb2e87a6bbcfb14
-MISC ChangeLog 4652 RMD160 c25616d9f45365b46c02e7b3d66f84ed7ef648b5 SHA1 f1b4f73b3e4cc6b5cb974f88c4fa019bd47376c6 SHA256 5c74767e6ba1b247277f7dc8269dc0b5d5d7c0c561552b811221988d2b23ceed
+MISC ChangeLog 4857 RMD160 1428ab3e8b01f94b2391a9891412845f6b515c15 SHA1 9b27e822e5453bdc35af766906fe1b3aa4285034 SHA256 f746c53010de657a7a4c47a8649caae7d2ed887e23c01f0f39adf33c0b1dce1a
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv5BjgACgkQgAnW8HDreRboOQCbBZIREzd+7vAEdnKCva23pxi5
-EHsAoJFYrF2ftelPgMOwTwJBhNbx6XQp
-=KhKY
+iJwEAQECAAYFAkwbuRMACgkQIiMqcbOVdxQF+gP/RaTZURczwG1dVXls2siu5wSk
+OQLQPLOqYm+2GbTZ4zMu1ojOMEvK09Ufkf+jpjMs4PBLZsSNvI3n4Vkjxio7wROJ
+ZPZVU/gDBZRmvazw5Q6V7/54wBBonrbZL2uPQQmzsA4IAWq/hohrEYjJcH0z3jFA
+cb9DX2RszeA+1AISnO4=
+=pIpi
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/mpqc/files/mpqc-2.3.1-as-needed.patch b/sci-chemistry/mpqc/files/mpqc-2.3.1-as-needed.patch
index ce9defbdebadc388b1d59898760d2defaf7d5584..a917c0aaff7051761247448dde9e94a6a4923122 100644 (file)
--- a/sci-chemistry/mpqc/files/mpqc-2.3.1-as-needed.patch
+++ b/sci-chemistry/mpqc/files/mpqc-2.3.1-as-needed.patch
@@ -15,13 +15,14 @@
  
 --- mpqc-2.3.1.orig/src/lib/chemistry/qc/wfn/Makefile  2004-06-12 06:50:35.000000000 +0200
 +++ mpqc-2.3.1/src/lib/chemistry/qc/wfn/Makefile       2010-02-13 14:20:06.911896080 +0100
-@@ -48,6 +48,11 @@
+@@ -48,6 +48,12 @@
  
  LIBS = $(shell $(LISTLIBS) $(INCLUDE) $(SRCDIR)/../dft/LIBS.h)
  
 +LIBADD = $(SRCDIR)/$(TOPDIR)/lib/libSCisosurf.la \
 +      $(SRCDIR)/$(TOPDIR)/lib/libSCsolvent.la \
 +      $(SRCDIR)/$(TOPDIR)/lib/libSCbasis.la \
++      $(SRCDIR)/$(TOPDIR)/lib/libSCdft.la \
 +      $(SRCDIR)/$(TOPDIR)/lib/libSCintv3.la
 +
  wfntest:: wfntest.$(OBJSUF) $(LIBS)
@@ -149,3 +150,14 @@
  
  install_devel:: $(TOPDIR)/lib/libmpqc.$(LIBSUF)
        $(INSTALL) $(INSTALLDIROPT) $(installroot)$(libdir)
+--- mpqc-2.3.1.orig/src/lib/chemistry/qc/Makefile.orig 2010-06-18 18:09:58.192621760 +0000
++++ mpqc-2.3.1/src/lib/chemistry/qc/Makefile   2010-06-18 18:10:10.350261767 +0000
+@@ -33,7 +33,7 @@
+ include $(SRCDIR)/$(TOPDIR)/lib/GlobalMakefile
+ include $(TOPDIR)/lib/Makedirlist
+ 
+-SUBDIRS = basis oint3 intv3 wfn scf dft mbpt
++SUBDIRS = basis oint3 intv3 dft wfn scf mbpt
+ ifeq ($(HAVE_SC_SRC_LIB_CHEMISTRY_QC_PSI),yes)
+ SUBDIRS := $(SUBDIRS) psi
+ endif