Fix for as-needed per bug 289232

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 103 insertions, 14 deletions

diff --git a/sci-libs/libint/ChangeLog b/sci-libs/libint/ChangeLog
index e930876f282f..db3053537761 100644
--- a/sci-libs/libint/ChangeLog
+++ b/sci-libs/libint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/libint
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libint/ChangeLog,v 1.6 2008/07/07 06:38:17 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libint/ChangeLog,v 1.7 2010/02/13 18:27:00 jlec Exp $
+
+*libint-1.1.4-r1 (13 Feb 2010)
+
+  13 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/1.1.4-as-needed.patch, libint-1.1.4.ebuild,
+  +libint-1.1.4-r1.ebuild:
+  Fix for as-needed per 289232
 
 *libint-1.1.4 (07 Jul 2008)
 
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 25801fa5a465..a661f00da14c 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.1.4-as-needed.patch 1574 RMD160 93f051b47484d88ca5b85685cfc3e617363887a9 SHA1 21a09a5be7aece44b6f2f7ca5eae98a90535aad7 SHA256 2a30a6155cc689ffcf7884b76078e607b766909830f57896bc7ca563b90a1061
 AUX dont-append-mcpu.patch 647 RMD160 1d9d53caf80001710179196a55fd30dcd9c58441 SHA1 a1bb8c29fb01f64a3ce45090e2519a072f393cbe SHA256 e0a9981a6c5fc1a76e4e0f2593708897cad80576a55b824e128ff89db002a97d
 DIST libint-1.1.2.tar.gz 376882 RMD160 10760f08a9625a819037121212296e3647534f3f SHA1 dfd6b44b7158e171974f33467bff862fd151a69f SHA256 b65d035a1a1dfb917d0777f5cd9cf7b7eee94aaf69563e21f2d7a6048bbf283b
 DIST libint-1.1.4.tar.gz 350252 RMD160 030f22c5b44e99620178320d1c6c58cf58ad3b86 SHA1 b5c7fc8e37755061b35e6061a263b0a4cfac3143 SHA256 f67b13bdf1135ecc93b4cff961c1ff33614d9f8409726ddc8451803776885cff
 EBUILD libint-1.1.2.ebuild 994 RMD160 8c4c56d2d3b1af0265494d741cd9a9f9659e7fbb SHA1 9c8385f14df969f5e0dccfc594f8889a9d54d391 SHA256 af687e4339ccacc3597d034f344537cfe65c2b7a4fc77660613a40f11c775e86
-EBUILD libint-1.1.4.ebuild 918 RMD160 afd25938fa8870bcc9ebf1aa084eabb02e3abc92 SHA1 34c9647f93c4f4488d9ff85581b667dd730a11db SHA256 f63fa00bd2bd74e6436f9ea6313233a420d95b886e166109be91e2d2ea8126b0
-MISC ChangeLog 1226 RMD160 f99d25eeaa3a37a65806dfb34d009103fffd9bf2 SHA1 0cdc18f09d1b83c7d69d7ceac956f60424d32cda SHA256 36546461c0a65977c890cc4dc9233d586408f63a2aede09ef5e2645fbcbdec8e
+EBUILD libint-1.1.4-r1.ebuild 975 RMD160 e6c8a6d2c6f6630081d6ebedbd4f1bc366ec7b50 SHA1 04c18bb1a8bee588e0881e43de72d2c8ae8de6f8 SHA256 75fee84c68bd62be8213a993968397c9c758fbb21b9078b6fcfe434ba99e0236
+EBUILD libint-1.1.4.ebuild 870 RMD160 e7477bad715c489a1b1e30d514e9edfc09d82fed SHA1 f63309467bfbe7d57093b5b9b9e4c1e23b91b17c SHA256 e937b0b06df790c3ec2840e79c32403c93f0eabced8ce2d2575e93addd0429ee
+MISC ChangeLog 1419 RMD160 ce4493672ce5fa7df1016de6ad91a9dae7e7ea05 SHA1 37b6d6463b11c6c3cda5a344d2466e2f00f1a0d0 SHA256 e6dc23b212f9ce29ff0015a78a3f574e9d76278c75ed245772954f0645d94601
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkhxud8ACgkQXVaO67S1rtvQjACgq7UZp6JS6FPfj8VODdBNKSuA
-URsAnjuZMfHpgM+Mjg2NRMpNg/Wtrj3K
-=vT4I
+iEYEARECAAYFAkt27vsACgkQgAnW8HDreRZjgQCfRKot01VccnpjN4U8xkqC6CRH
+5oYAoI0CkFW8nwk0McJ8cxadJbs/Niuu
+=dkKc
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libint/files/1.1.4-as-needed.patch b/sci-libs/libint/files/1.1.4-as-needed.patch
new file mode 100644
index 000000000000..cc87d760b699
--- /dev/null
+++ b/sci-libs/libint/files/1.1.4-as-needed.patch
@@ -0,0 +1,39 @@
+diff --git a/src/lib/libderiv/Makefile.library b/src/lib/libderiv/Makefile.library
+index ee152ef..8debfe8 100644
+--- a/src/lib/libderiv/Makefile.library
++++ b/src/lib/libderiv/Makefile.library
+@@ -23,7 +23,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
+ 
+ # this is how shared library is made
+ $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
+-	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
++	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
+ 
+ $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
+ 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
+diff --git a/src/lib/libint/Makefile.library b/src/lib/libint/Makefile.library
+index 23e2918..01c4225 100644
+--- a/src/lib/libint/Makefile.library
++++ b/src/lib/libint/Makefile.library
+@@ -41,7 +41,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
+ 
+ # this is how shared library is made
+ $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
+-	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
++	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
+ 
+ $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
+ 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
+diff --git a/src/lib/libr12/Makefile.library b/src/lib/libr12/Makefile.library
+index 1510807..26d47a4 100644
+--- a/src/lib/libr12/Makefile.library
++++ b/src/lib/libr12/Makefile.library
+@@ -47,7 +47,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
+ 
+ # this is how shared library is made
+ $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
+-	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
++	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
+ 
+ $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
+ 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
diff --git a/sci-libs/libint/libint-1.1.4-r1.ebuild b/sci-libs/libint/libint-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..4609b17bad9c
--- /dev/null
+++ b/sci-libs/libint/libint-1.1.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libint/libint-1.1.4-r1.ebuild,v 1.1 2010/02/13 18:27:00 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Used to evaluate traditional and novel two-body matrix elements (integrals) over Cartesian Gaussian functions"
+HOMEPAGE="http://www.chem.vt.edu/chem-dept/valeev/software/libint/libint.html"
+SRC_URI="http://www.chem.vt.edu/chem-dept/valeev/software/libint/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.1.4-as-needed.patch
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-deriv \
+		--enable-r12 \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-cc-optflags="${CFLAGS}" \
+		--with-cxx-optflags="${CXXFLAGS}"
+}
+
+src_compile() {
+	emake \
+		LDFLAGS="${LDFLAGS}" \
+		|| die
+}
+
+src_install() {
+	einstall || die
+}
diff --git a/sci-libs/libint/libint-1.1.4.ebuild b/sci-libs/libint/libint-1.1.4.ebuild
index e438d7b0076b..fc5de514196c 100644
--- a/sci-libs/libint/libint-1.1.4.ebuild
+++ b/sci-libs/libint/libint-1.1.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libint/libint-1.1.4.ebuild,v 1.1 2008/07/07 06:38:17 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libint/libint-1.1.4.ebuild,v 1.2 2010/02/13 18:27:00 jlec Exp $
+
+EAPI="3"
 
 inherit toolchain-funcs
 
@@ -14,7 +16,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-src_compile() {
+src_configure() {
 	econf \
 		--enable-shared \
 		--enable-deriv \
@@ -22,9 +24,7 @@ src_compile() {
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
 		--with-cc-optflags="${CFLAGS}" \
-		--with-cxx-optflags="${CXXFLAGS}" \
-		|| die "econf failed"
-	emake || die "emake failed"
+		--with-cxx-optflags="${CXXFLAGS}"
 }
 
 src_install() {