Replaced global appending of -fPIC to CFLAGS/FFLAGS by a local patch to Makefile.in.

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 38 insertions, 15 deletions

diff --git a/sci-chemistry/pdb2pqr/ChangeLog b/sci-chemistry/pdb2pqr/ChangeLog
index 88d92922601a..3ac5ecd9c65e 100644
--- a/sci-chemistry/pdb2pqr/ChangeLog
+++ b/sci-chemistry/pdb2pqr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pdb2pqr
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.3 2006/07/01 16:57:48 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.4 2006/07/01 18:28:02 markusle Exp $
+
+  01 Jul 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/pdb2pqr-1.1.2-fpic-gentoo.patch, pdb2pqr-1.1.2.ebuild:
+  Replaced global appending of -fPIC to CFLAGS/FFLAGS by a local patch
+  to Makefile.in.
 
 *pdb2pqr-1.1.2 (01 Jul 2006)
 
diff --git a/sci-chemistry/pdb2pqr/Manifest b/sci-chemistry/pdb2pqr/Manifest
index 8e9e96bfca40..c65dbedb2029 100644
--- a/sci-chemistry/pdb2pqr/Manifest
+++ b/sci-chemistry/pdb2pqr/Manifest
@@ -1,3 +1,7 @@
+AUX pdb2pqr-1.1.2-fpic-gentoo.patch 668 RMD160 e076ebcfe1e0fd39ca7b2219b6d9938b6f4870c8 SHA1 38018f5494b21296dfabe02c61824d0af6d6ce36 SHA256 6455be2583ded00bea43f49789cde72cdd240858f187db6d59ed67c87163af45
+MD5 d1c597eaafca05caa2cffb3b6c214f75 files/pdb2pqr-1.1.2-fpic-gentoo.patch 668
+RMD160 e076ebcfe1e0fd39ca7b2219b6d9938b6f4870c8 files/pdb2pqr-1.1.2-fpic-gentoo.patch 668
+SHA256 6455be2583ded00bea43f49789cde72cdd240858f187db6d59ed67c87163af45 files/pdb2pqr-1.1.2-fpic-gentoo.patch 668
 AUX pdb2pqr-1.1.2-gcc4-gentoo.patch 1104 RMD160 87d7c92e4f24be4f205379acafdc9c41b8e99a9b SHA1 346ed354808f2d902a2d4076e9c41690a83995f5 SHA256 164ae1a21de69ea97f5439a15004d1441fc7d11cbd79cf1c5ab777363b1e3019
 MD5 2a1a14d26d040d99dd114fe930e3414a files/pdb2pqr-1.1.2-gcc4-gentoo.patch 1104
 RMD160 87d7c92e4f24be4f205379acafdc9c41b8e99a9b files/pdb2pqr-1.1.2-gcc4-gentoo.patch 1104
@@ -16,14 +20,14 @@ EBUILD pdb2pqr-1.0.2.ebuild 1645 RMD160 ebecb11e695825c9d8e82d9d833dbe8ee51e2643
 MD5 08a7a0573e1ce75bfc1fb14570a8f6b5 pdb2pqr-1.0.2.ebuild 1645
 RMD160 ebecb11e695825c9d8e82d9d833dbe8ee51e2643 pdb2pqr-1.0.2.ebuild 1645
 SHA256 5d9cafa88d8aa70d119223f5858c31bad7e5e1285869c1b632e5a81b9f7e6005 pdb2pqr-1.0.2.ebuild 1645
-EBUILD pdb2pqr-1.1.2.ebuild 1956 RMD160 c127cb07c261b0328ea8ada0bfe4eda9b6cac1d3 SHA1 19f165f07e0656d4296d9463368bd054aebbb48e SHA256 bc87af44beca7ac63ca9f826d9598931b9231285d89fcd850929e9915d61c43e
-MD5 9b574c64bb402af344c0ab93dd189027 pdb2pqr-1.1.2.ebuild 1956
-RMD160 c127cb07c261b0328ea8ada0bfe4eda9b6cac1d3 pdb2pqr-1.1.2.ebuild 1956
-SHA256 bc87af44beca7ac63ca9f826d9598931b9231285d89fcd850929e9915d61c43e pdb2pqr-1.1.2.ebuild 1956
-MISC ChangeLog 757 RMD160 7ace584321574638107dcc686e174787d122002a SHA1 b045c21fe13d14871edcc9ebd668b79f77f3066b SHA256 8a665a02ef98842e2303e245ed01e77e1bdfd7f5a29f709d4afcefb1daf7e6d7
-MD5 82af991181a05b0611d66670ff555733 ChangeLog 757
-RMD160 7ace584321574638107dcc686e174787d122002a ChangeLog 757
-SHA256 8a665a02ef98842e2303e245ed01e77e1bdfd7f5a29f709d4afcefb1daf7e6d7 ChangeLog 757
+EBUILD pdb2pqr-1.1.2.ebuild 1873 RMD160 ac13b74c5a1b7371513866c9a7cf3f3387c0cb9d SHA1 6cc937631ce20d7ae836242b6e28446d62daadbe SHA256 b6c9511b30d30d0e9778e8668fc60d415cff22ef83b6e50653a1a1432c7551b2
+MD5 c159b5ee25bc4ab39a5e1fe0ae8b8c30 pdb2pqr-1.1.2.ebuild 1873
+RMD160 ac13b74c5a1b7371513866c9a7cf3f3387c0cb9d pdb2pqr-1.1.2.ebuild 1873
+SHA256 b6c9511b30d30d0e9778e8668fc60d415cff22ef83b6e50653a1a1432c7551b2 pdb2pqr-1.1.2.ebuild 1873
+MISC ChangeLog 964 RMD160 baedcb3277f2a6734c175a5cd37b5d0a20649dac SHA1 cc249325d717d7b087832988bfd30d896ed813fc SHA256 e0f87f4ad0d8047222b6b5b508e8c95c4d71587b67d082b6e98bbe775ce551fd
+MD5 bf430bc00f4699e8d067c9d8c6a437dc ChangeLog 964
+RMD160 baedcb3277f2a6734c175a5cd37b5d0a20649dac ChangeLog 964
+SHA256 e0f87f4ad0d8047222b6b5b508e8c95c4d71587b67d082b6e98bbe775ce551fd ChangeLog 964
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-chemistry/pdb2pqr/files/pdb2pqr-1.1.2-fpic-gentoo.patch b/sci-chemistry/pdb2pqr/files/pdb2pqr-1.1.2-fpic-gentoo.patch
new file mode 100644
index 000000000000..254041a7b586
--- /dev/null
+++ b/sci-chemistry/pdb2pqr/files/pdb2pqr-1.1.2-fpic-gentoo.patch
@@ -0,0 +1,18 @@
+--- pdb2pqr-1.1.2/propka/Makefile.in	2006-06-23 10:16:25.000000000 -0400
++++ pdb2pqr-1.1.2-new/propka/Makefile.in	2006-07-01 14:15:29.000000000 -0400
+@@ -210,13 +210,13 @@
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++	$(COMPILE) -fPIC -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+ 	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+ 
+ .f.o:
+-	$(F77COMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++	$(F77COMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .f.obj:
+ 	$(F77COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.1.2.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.1.2.ebuild
index d837b876ac4c..58e376bd9a38 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.1.2.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.1.2.ebuild,v 1.1 2006/07/01 16:57:48 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.1.2.ebuild,v 1.2 2006/07/01 18:28:02 markusle Exp $
 
 inherit eutils fortran multilib flag-o-matic distutils
 
@@ -22,11 +22,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gcc4-gentoo.patch
-
-	# need to add -fPIC to CFLAGS and FFLAGS to avoid TEXTRELS 
-	# in _propkalib.so
-	append-flags -fPIC
-	FFLAGS="${FFLAGS} -fPIC"
+	epatch "${FILESDIR}"/${P}-fpic-gentoo.patch
 }
 
 src_compile() {