Added patch to enable compilation with gcc-4.1.

Package-Manager: portage-2.1_rc2

4 files changed, 48 insertions, 17 deletions

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index 53d4d5717acb..9ab2573a2f48 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.4 2006/04/27 22:26:41 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.5 2006/05/23 21:20:35 markusle Exp $
+
+  23 May 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/apbs-gcc4-gentoo.patch, apbs-0.4.0.ebuild:
+  Added patch to enable compilation with gcc-4.1.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-apbs-0.3.2,
   Manifest:
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 7e86a7385392..bfe420349a08 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,22 +1,26 @@
-AUX apbs-examples-gentoo.patch 1446 RMD160 f0468219d3295cbaf90de7c0e3489d443f1ea144 SHA1 906197ecc9ee745cb0573ed2798a671cccd7b5a4 SHA256 1b12fdf855c4e80bb6e88d6b9c433a4c18eb406a5a6d1671146be897452863d4 size 1446
+AUX apbs-examples-gentoo.patch 1446 RMD160 f0468219d3295cbaf90de7c0e3489d443f1ea144 SHA1 906197ecc9ee745cb0573ed2798a671cccd7b5a4 SHA256 1b12fdf855c4e80bb6e88d6b9c433a4c18eb406a5a6d1671146be897452863d4
 MD5 43dd7c966e75cdbd40215b3616cfddf5 files/apbs-examples-gentoo.patch 1446
 RMD160 f0468219d3295cbaf90de7c0e3489d443f1ea144 files/apbs-examples-gentoo.patch 1446
 SHA256 1b12fdf855c4e80bb6e88d6b9c433a4c18eb406a5a6d1671146be897452863d4 files/apbs-examples-gentoo.patch 1446
-DIST apbs-0.3.2.tar.gz 6560956 RMD160 2482656dc7b81ac9551c5939edb1987669a0db36 SHA256 914a77f9b48e56fd761ec9bcda11e7ba44a5cde95e855a4891b3d19168ec1aa8 size 6560956
-DIST apbs-0.4.0.tar.gz 6490858 RMD160 259c89efed2296eb20af1f8076adc767ef35228c SHA256 d1f6637e10b3051e6f618abaa14063f8f9bafbbbad75058645866b606d708acc size 6490858
-EBUILD apbs-0.3.2.ebuild 1591 RMD160 dcfc1d57d44ca4e83dec75311be034c5b49a96dc SHA1 60dcb4788b135f41202e2bf4d0b19f0f118c1962 SHA256 2a69f675e3303aea56133623b6c36abc9d4b9578fd35365079e0b87347807838 size 1591
+AUX apbs-gcc4-gentoo.patch 1080 RMD160 88138dc27c2fa17e558dc3a5c8c41e52bd2f0309 SHA1 c102e23f81627891552194896f2769f2cb7f0d6e SHA256 9077f4ffc41a2af28eed4193a2e56d20b668e2bc280ca2740d3a8803e28c48d6
+MD5 c54fdb174c6ca236268f3fb45c3c837e files/apbs-gcc4-gentoo.patch 1080
+RMD160 88138dc27c2fa17e558dc3a5c8c41e52bd2f0309 files/apbs-gcc4-gentoo.patch 1080
+SHA256 9077f4ffc41a2af28eed4193a2e56d20b668e2bc280ca2740d3a8803e28c48d6 files/apbs-gcc4-gentoo.patch 1080
+DIST apbs-0.3.2.tar.gz 6560956 RMD160 2482656dc7b81ac9551c5939edb1987669a0db36 SHA1 723460aecb1b1e8e03f30fe4761f9e2e1628137d SHA256 914a77f9b48e56fd761ec9bcda11e7ba44a5cde95e855a4891b3d19168ec1aa8
+DIST apbs-0.4.0.tar.gz 6490858 RMD160 259c89efed2296eb20af1f8076adc767ef35228c SHA1 f7a5aaefebb545b06f66cb11f229f959060e6c3f SHA256 d1f6637e10b3051e6f618abaa14063f8f9bafbbbad75058645866b606d708acc
+EBUILD apbs-0.3.2.ebuild 1591 RMD160 dcfc1d57d44ca4e83dec75311be034c5b49a96dc SHA1 60dcb4788b135f41202e2bf4d0b19f0f118c1962 SHA256 2a69f675e3303aea56133623b6c36abc9d4b9578fd35365079e0b87347807838
 MD5 401bb19a1a50e92cccd4580795528579 apbs-0.3.2.ebuild 1591
 RMD160 dcfc1d57d44ca4e83dec75311be034c5b49a96dc apbs-0.3.2.ebuild 1591
 SHA256 2a69f675e3303aea56133623b6c36abc9d4b9578fd35365079e0b87347807838 apbs-0.3.2.ebuild 1591
-EBUILD apbs-0.4.0.ebuild 2199 RMD160 6cfd3d2661dddffb3c6799b39a1a4f3cfa13bf48 SHA1 7ad92554f72840c55a612dfdfc9830c957d2d176 SHA256 f1724df9846941eec4199cd65a3dfe2819b4373b3c57568fab973b54a93251e7 size 2199
-MD5 d38797836d9a5ff8fd2671e85f481b64 apbs-0.4.0.ebuild 2199
-RMD160 6cfd3d2661dddffb3c6799b39a1a4f3cfa13bf48 apbs-0.4.0.ebuild 2199
-SHA256 f1724df9846941eec4199cd65a3dfe2819b4373b3c57568fab973b54a93251e7 apbs-0.4.0.ebuild 2199
-MISC ChangeLog 848 RMD160 def4fa8d5e107d6577be8cf541aadb722dcfcf47 SHA1 0c11c37daced33930acbf85520fe7bd92163ceda SHA256 638db17ebbc6aa0781b23c5d00485808ad193cfdd1e761f33ab825ae6caf1b7f size 848
-MD5 1e084aca4facf9474c42007d2c0836d7 ChangeLog 848
-RMD160 def4fa8d5e107d6577be8cf541aadb722dcfcf47 ChangeLog 848
-SHA256 638db17ebbc6aa0781b23c5d00485808ad193cfdd1e761f33ab825ae6caf1b7f ChangeLog 848
-MISC metadata.xml 272 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 SHA1 960809f50e770bf2df44dda2557cf62ab9190c13 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77 size 272
+EBUILD apbs-0.4.0.ebuild 2271 RMD160 7050926e03c36dd6908ccf77742c22eed3ec484c SHA1 eac152629df744d822186111131f955fc6fce8a6 SHA256 ec6eb118bae3c7c247986ce29e324e0c0d57f4ef8b32ae1e7a3b0c2e817bfdb4
+MD5 e0b7d70ae39cf41ec67c3235e85e06ba apbs-0.4.0.ebuild 2271
+RMD160 7050926e03c36dd6908ccf77742c22eed3ec484c apbs-0.4.0.ebuild 2271
+SHA256 ec6eb118bae3c7c247986ce29e324e0c0d57f4ef8b32ae1e7a3b0c2e817bfdb4 apbs-0.4.0.ebuild 2271
+MISC ChangeLog 1005 RMD160 b150705811f7b22acf69a89b9a0e4e2a832a50fd SHA1 52ac75ceee686528580129737ba82126b69abe87 SHA256 dae3581e00bcbf4d47ebfd841fdfab665c14e68b7de2471afa40cf912bb72d02
+MD5 91f9817fa417c1abaf730b22f92c3e19 ChangeLog 1005
+RMD160 b150705811f7b22acf69a89b9a0e4e2a832a50fd ChangeLog 1005
+SHA256 dae3581e00bcbf4d47ebfd841fdfab665c14e68b7de2471afa40cf912bb72d02 ChangeLog 1005
+MISC metadata.xml 272 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 SHA1 960809f50e770bf2df44dda2557cf62ab9190c13 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77
 MD5 df166a2ae1cb64196abc394d4fa522ed metadata.xml 272
 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 metadata.xml 272
 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77 metadata.xml 272
diff --git a/sci-chemistry/apbs/apbs-0.4.0.ebuild b/sci-chemistry/apbs/apbs-0.4.0.ebuild
index e61251406059..ad26ce177695 100644
--- a/sci-chemistry/apbs/apbs-0.4.0.ebuild
+++ b/sci-chemistry/apbs/apbs-0.4.0.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/apbs/apbs-0.4.0.ebuild,v 1.1 2006/03/09 11:48:28 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-0.4.0.ebuild,v 1.2 2006/05/23 21:20:35 markusle Exp $
 
 inherit eutils fortran
 
@@ -18,8 +18,10 @@ DEPEND="blas? ( virtual/blas )
 		dev-libs/maloc
 		mpi? ( virtual/mpi )"
 
+FORTRAN="g77 gfortran"
+
 pkg_setup() {
-	need_fortran g77
+	fortran_pkg_setup
 
 	# the configure script has a weird MPI related behaviour:
 	# if maloc was compiled with mpi, apbs requires mpi as
@@ -39,7 +41,8 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/apbs-examples-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-examples-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-gcc4-gentoo.patch
 }
 
 src_compile() {
diff --git a/sci-chemistry/apbs/files/apbs-gcc4-gentoo.patch b/sci-chemistry/apbs/files/apbs-gcc4-gentoo.patch
new file mode 100644
index 000000000000..434a7fc0a05c
--- /dev/null
+++ b/sci-chemistry/apbs/files/apbs-gcc4-gentoo.patch
@@ -0,0 +1,20 @@
+--- apbs-0.4.0/configure	2005-12-14 14:11:17.000000000 -0500
++++ apbs-0.4.0-new/configure	2006-05-23 17:01:07.000000000 -0400
+@@ -3513,7 +3513,7 @@
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
++  for ac_prog in g77 gfortran f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+@@ -3555,7 +3555,7 @@
+ fi
+ if test -z "$F77"; then
+   ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
++  for ac_prog in g77 gfortran f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2