Fix also older versions for g2c/gfortran libs

Package-Manager: portage-2.1.4_rc9

4 files changed, 41 insertions, 35 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 14c606937bbc..a9484cde0221 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.28 2007/12/19 13:03:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.29 2007/12/19 19:30:47 bicatali Exp $
+
+  19 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> acml-3.6.0-r1.ebuild,
+  acml-3.6.1-r1.ebuild:
+  Fix also older versions for g2c/gfortran libs
 
   19 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> acml-4.0.1.ebuild:
   Fixed directory for acml and forced dynamic linking with gfortran when
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index fecfdc7039e2..ce2ff42a7012 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -22,14 +22,14 @@ DIST acml-4-0-0-ifort-64bit.tgz 26676345 RMD160 2f4a1f14a55ac3334fd3fc045355a4fd
 DIST acml-4-0-1-gfortran-64bit-int64.tgz 21885486 RMD160 a5811d98744a2662855c85efb2c22ab78f42bee0 SHA1 8bcf5c8a1c4f9bd18f5e197edb1256910c627656 SHA256 aa9d506218c80577c3375e5c9076e786f39d0951426ca2e2ac2356c867db84ea
 DIST acml-4-0-1-gfortran-64bit.tgz 22558344 RMD160 1f2e06eb99568899a9145d27c520043d55b21606 SHA1 87ab9473899caef3bfeae11ebeeb4929e3640a51 SHA256 a1063922d7c8b4bbff3635d19b3757674b225c91c784416f0d7edd0939baf658
 DIST acml-4-0-1-ifort-64bit.tgz 24741959 RMD160 323827cc893de6a524bd8ece8126f4e2b502d0e4 SHA1 bacfddb5ab2359191666871c542ae9933cc93a48 SHA256 ee2553fb850eb0b32105c1df48e2a1d0507db8876003e62c3b7724fd15d5f57e
-EBUILD acml-3.6.0-r1.ebuild 4394 RMD160 492b09b11781f9a1367b3bae1e525427207f424d SHA1 2c6d8957ba25e3f9d28714fb4a2447267a4d12e6 SHA256 ef78dce7889f5b139a3c0307dfba73a6f575c0eac63e16a9720a7dcfeff3ea3e
-MD5 401bbf11ccb105ec62688b7ba522b160 acml-3.6.0-r1.ebuild 4394
-RMD160 492b09b11781f9a1367b3bae1e525427207f424d acml-3.6.0-r1.ebuild 4394
-SHA256 ef78dce7889f5b139a3c0307dfba73a6f575c0eac63e16a9720a7dcfeff3ea3e acml-3.6.0-r1.ebuild 4394
-EBUILD acml-3.6.1-r1.ebuild 5147 RMD160 662a6c830c57df54cb1f97736acb5f81b7ed7a63 SHA1 56c432aa0012eb84a87f2bac79754d69dcb4ef14 SHA256 d8aa3aa6e6445e217ed99b815a359eeb3f53da9a028362740996bba97769f164
-MD5 74f75e408e64b3ced59f6b0e79a8b51b acml-3.6.1-r1.ebuild 5147
-RMD160 662a6c830c57df54cb1f97736acb5f81b7ed7a63 acml-3.6.1-r1.ebuild 5147
-SHA256 d8aa3aa6e6445e217ed99b815a359eeb3f53da9a028362740996bba97769f164 acml-3.6.1-r1.ebuild 5147
+EBUILD acml-3.6.0-r1.ebuild 4483 RMD160 d6d91e1a16787a20a5d003a6fa7fbb2f1f2de623 SHA1 93f56ed9f8f92cdd7357e6e7f35ae57a6b670722 SHA256 7ad78db5183031e912b363d568d0e4c3757524bdc72e91715f73d835f688a02a
+MD5 0fc9419fe3de4d59999157ad88bd237e acml-3.6.0-r1.ebuild 4483
+RMD160 d6d91e1a16787a20a5d003a6fa7fbb2f1f2de623 acml-3.6.0-r1.ebuild 4483
+SHA256 7ad78db5183031e912b363d568d0e4c3757524bdc72e91715f73d835f688a02a acml-3.6.0-r1.ebuild 4483
+EBUILD acml-3.6.1-r1.ebuild 5240 RMD160 55441fe57584cc505a69f22bcd505f08dd11dd32 SHA1 2d00a7dca839ab02a02d2cce4adc23625584652a SHA256 54481a0a03263188ed94c3be4b75cbaf926df782cbdede0bdfb618891eaec6c3
+MD5 5a2313f3f7e9a77309c1583f0757243a acml-3.6.1-r1.ebuild 5240
+RMD160 55441fe57584cc505a69f22bcd505f08dd11dd32 acml-3.6.1-r1.ebuild 5240
+SHA256 54481a0a03263188ed94c3be4b75cbaf926df782cbdede0bdfb618891eaec6c3 acml-3.6.1-r1.ebuild 5240
 EBUILD acml-4.0.0.ebuild 4830 RMD160 adf9cc005177787f51eff1e0bdf0175c6eb87b78 SHA1 aa5e082f0a62b7a7f0efde3e5c6df08fe73503c5 SHA256 681a7447ef72f99a79d7063c491d443116bd68ee294eb3da117e41df11af24da
 MD5 a62275fc4451124aa260e9856c331ba1 acml-4.0.0.ebuild 4830
 RMD160 adf9cc005177787f51eff1e0bdf0175c6eb87b78 acml-4.0.0.ebuild 4830
@@ -38,10 +38,10 @@ EBUILD acml-4.0.1.ebuild 4868 RMD160 749368f1450e178e7f33c9368aa2d0e92f102f43 SH
 MD5 e6f6dcbb1dd09eff89a880150636ea3f acml-4.0.1.ebuild 4868
 RMD160 749368f1450e178e7f33c9368aa2d0e92f102f43 acml-4.0.1.ebuild 4868
 SHA256 a39dc1ba1ec2dd0885d25ab94f3b067444d4a27c48ba6309c37aeab7e92f3542 acml-4.0.1.ebuild 4868
-MISC ChangeLog 5679 RMD160 d57d91a091dd1398411c79719f987ea0e38114a7 SHA1 20a7636d5d968e92024c641da2a8e55e5a47ac14 SHA256 2b13a242c3cceb0287903812cda57833ca207066d852d2c3a646022bf9f37175
-MD5 b05f0a5227f5212ad67437feb8198882 ChangeLog 5679
-RMD160 d57d91a091dd1398411c79719f987ea0e38114a7 ChangeLog 5679
-SHA256 2b13a242c3cceb0287903812cda57833ca207066d852d2c3a646022bf9f37175 ChangeLog 5679
+MISC ChangeLog 5829 RMD160 dd6e80cdb9b1d19c89960fd67d21c4d1070e6760 SHA1 5e9d82290a7cfc8301d37f3d7d09f0c0df699333 SHA256 47509c507ffe9e3da1483f718ca27e83525ae5409e4677749ab5a0db17e0bcf8
+MD5 8afae5113a7a648cba0ab261c16411d2 ChangeLog 5829
+RMD160 dd6e80cdb9b1d19c89960fd67d21c4d1070e6760 ChangeLog 5829
+SHA256 47509c507ffe9e3da1483f718ca27e83525ae5409e4677749ab5a0db17e0bcf8 ChangeLog 5829
 MISC metadata.xml 879 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f SHA1 375f02d5d2550aa144c759818140e7f1c55de278 SHA256 a2b244cea577e4260368dad481a0b5886a471185f966288bc58af29fb335fe74
 MD5 a42a87565bfb006095c3fa658c84b275 metadata.xml 879
 RMD160 2d3f16b5906f71d5d455954d5b20afdc8b8aac1f metadata.xml 879
@@ -61,7 +61,7 @@ SHA256 4506265713b69006c1f709c64bdd3523216f6ab938b95f5ed92ac572e59186a7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHaRbC1ycZbhPLE2ARAilxAJ9Bn3qCLFXTvVVWOwvpimGvluQkkwCfal6D
-v9nL/XxomYTdNnd6g9w0ihM=
-=tKrk
+iD8DBQFHaXFz1ycZbhPLE2ARAsL3AKCtJXU5GVnoAOms2LhildbKaSXgaACgiPKD
+oRY8tkZXxxBIYYY4ZAV45Nw=
+=zRax
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-3.6.0-r1.ebuild b/sci-libs/acml/acml-3.6.0-r1.ebuild
index ffc28d381a86..4f34d42d9da8 100644
--- a/sci-libs/acml/acml-3.6.0-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.5 2007/11/21 00:25:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.6 2007/12/19 19:30:47 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -98,9 +98,10 @@ src_install() {
 		local libname=${acmldir}/lib/libacml
 		local extlibs
 		local extflags
+		[[ ${fort} =~ g77 ]] && extlibs="${extlibs} -lg2c"
 		if [[ ${fort} =~ _mp ]]; then
 			ESELECT_PROF=${ESELECT_PROF}-openmp
-			extlibs=-lpthread
+			extlibs="${extlibs} -lpthread"
 			libname=${libname}_mp
 			extflags="${extflags} -openmp"
 		fi
@@ -108,7 +109,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}:g" \
+				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
@@ -117,12 +118,12 @@ src_install() {
 			doins ${l}.pc || die "doins ${l}.pc failed"
 
 			# eselect files
-			cat > eselect.${l} << EOF
-${libname}.so /usr/@LIBDIR@/lib${l}.so.0
-${libname}.so /usr/@LIBDIR@/lib${l}.so
-${libname}.a /usr/@LIBDIR@/lib${l}.a
-${acmldir}/lib/${l}.pc  /usr/@LIBDIR@/pkgconfig/${l}.pc
-EOF
+			cat > eselect.${l} <<-EOF
+				${libname}.so /usr/@LIBDIR@/lib${l}.so.0
+				${libname}.so /usr/@LIBDIR@/lib${l}.so
+				${libname}.a /usr/@LIBDIR@/lib${l}.a
+				${acmldir}/lib/${l}.pc  /usr/@LIBDIR@/pkgconfig/${l}.pc
+			EOF
 			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
 		done
 		echo "LDPATH=${instdir}/${fort}/lib" > 35acml
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
index bf458e89adff..c5b422fcc994 100644
--- a/sci-libs/acml/acml-3.6.1-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.5 2007/11/21 00:25:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.6 2007/12/19 19:30:47 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -62,7 +62,7 @@ src_unpack() {
 	(DISTDIR="${S}" unpack contents-acml-*.tgz)
 	case ${FORTRANC} in
 		gfortran) FORT=gfortran ;;
-		ifc|ifort) FORT=ifort ;;
+		if*) FORT=ifort ;;
 		*) eerror "Unsupported fortran compiler: ${FORTRANC}"
 			die ;;
 	esac
@@ -114,9 +114,10 @@ src_install() {
 			ESELECT_PROF=${ESELECT_PROF}-int64
 			extflags="${extflags} -fdefault-integer-8"
 		fi
+		[[ ${fort} =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
 		if [[ ${fort} =~ _mp ]]; then
 			ESELECT_PROF=${ESELECT_PROF}-openmp
-			extlibs=-lpthread
+			extlibs="${extlibs} -lpthread"
 			libname=${libname}_mp
 			extflags="${extflags} -fopenmp"
 		fi
@@ -124,7 +125,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}:g" \
+				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
@@ -133,12 +134,12 @@ src_install() {
 			doins ${l}.pc
 
 			# eselect files
-			cat > eselect.${l} << EOF
-${libname}.so /usr/@LIBDIR@/lib${l}.so.0
-${libname}.so /usr/@LIBDIR@/lib${l}.so
-${libname}.a /usr/@LIBDIR@/lib${l}.a
-${acmldir}/lib/${l}.pc  /usr/@LIBDIR@/pkgconfig/${l}.pc
-EOF
+			cat > eselect.${l} <<-EOF
+				${libname}.so /usr/@LIBDIR@/lib${l}.so.0
+				${libname}.so /usr/@LIBDIR@/lib${l}.so
+				${libname}.a /usr/@LIBDIR@/lib${l}.a
+				${acmldir}/lib/${l}.pc  /usr/@LIBDIR@/pkgconfig/${l}.pc
+			EOF
 			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
 		done
 		echo "LDPATH=${acmldir}/lib" > "${S}"/35acml