Re-organized dependencies for pkg-config (bug #217278)

Package-Manager: portage-2.1.5_rc4

5 files changed, 23 insertions, 34 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 8df323034a1b..a1bdea1ded44 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.32 2008/03/31 14:53:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.33 2008/04/22 08:13:19 bicatali Exp $
+
+  22 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> acml-3.6.0-r1.ebuild,
+  acml-3.6.1-r1.ebuild, acml-4.0.1.ebuild:
+  Re-organized dependencies for pkg-config (bug #217278).
 
   31 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
   files/lapack.pc.in, acml-3.6.0-r1.ebuild, acml-3.6.1-r1.ebuild,
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index ba72da3f8bea..59e8eba3e2ff 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -13,15 +13,15 @@ DIST acml-3-6-1-gfortran-64bit.tgz 20452058 RMD160 8df00704e7ac037dcd55a9207f45d
 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 4533 RMD160 9fae9c360a7faeb69444fb264d4ce98c6c8c7f94 SHA1 4f9f5082749f912d09ddd2ffd7c38056f1fce8f8 SHA256 4ad23b72a702f816f03940f1ffc6e414073850f02edaecea7a5be3416f9de35e
-EBUILD acml-3.6.1-r1.ebuild 5291 RMD160 ca705ea0d488f7a61f8e9a6c7d5ada6e9a9080ec SHA1 881806aa3423db7c03e94f8d57fef753ddd31c23 SHA256 f8874344f0b4720911de0c08f8a692720d5719e75899440c82a4eca977ebca5e
-EBUILD acml-4.0.1.ebuild 4974 RMD160 e492506659f032f28a2f704f0840209a29a77c3e SHA1 976b8950cef48ce7bbe6b3f4b2a154fa67c71270 SHA256 b086183bd2c007b1a0c13af463041cb6c211606c33aa265a89bd74af308514e1
-MISC ChangeLog 6509 RMD160 f205b8bd284bfce55a9b647577988883abfa6136 SHA1 8c1642f0a4d564f0a2ffc52f70368d9f4bd9e1cb SHA256 78e1c470267b025f256262af99f8acc8b0d496ce59ffb6ba23a634d12c57bbcf
+EBUILD acml-3.6.0-r1.ebuild 4486 RMD160 d740d9f002c2a4d1a8bb0c094108983d23400c00 SHA1 648a4efa47b57f2827fcd37235f59f6256ce6997 SHA256 8c1b0d1e02ba64ffdd60cc020e10d9f6e167fb6cdfabe6408c2279bc791a62ca
+EBUILD acml-3.6.1-r1.ebuild 5223 RMD160 b1799bd496f14aa19043a3bf210cc59ba58107d2 SHA1 5934984c91f4bd27b28d98a6c5fb6184d453bf8f SHA256 4f6ec15274818e6e2df0dc68c5e033fb72443f6289e610c05733f2c5ef810ec1
+EBUILD acml-4.0.1.ebuild 4926 RMD160 03ea891a51366243be1a318cbfbd65b407c10800 SHA1 0762345d1dd1198060dcfe8244d083bb10ba9946 SHA256 bdea166ec84cd5e7eff4d7490cfab2f7c83d343f2a7d61f5e6470560f13f30d2
+MISC ChangeLog 6688 RMD160 7153e55ddb488c605dc85b89e93c6bd550b40999 SHA1 6e8e0a19246ffad287c40cfba512c6c57e2625c8 SHA256 b698cd06ad99840f7a81fc60097dd93d11f310e18f4e46987b9373551ebbe41a
 MISC metadata.xml 812 RMD160 878a52e199a177a1dade27a1ebfdf623a42b7e5d SHA1 24e5f44c01dfc65ac8c699015bb649abf29efcaf SHA256 3597c6694fc8b1f7b57103ffd799dfa077c29444c31d6a5be43ebc0198636cae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH8PsK1ycZbhPLE2ARAoyiAKCsPz5n8cjex6cCki1kC9rMETecxwCfaHgD
-ylKHnAnwzZw7qOoLZJGhqKU=
-=wx78
+iD8DBQFIDZ4q1ycZbhPLE2ARAhLTAJ9sDSokPgpkySTsp/SLcKzS4NSabgCcCXuR
+ZlCNPqm+rq+4cb7/oukzfQc=
+=pxns
 -----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 0138f36c2468..48fdb665bf16 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-2008 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.8 2008/03/31 14:53:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.9 2008/04/22 08:13:19 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -61,10 +61,6 @@ src_unpack() {
 	FORTDIRS="$(ls -d ${FORT}*)"
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_test() {
 	for fort in ${FORTDIRS}; do
 		einfo "Testing acml for $(basename ${fort})"
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
index bec23a3c0192..1f37ba11b54b 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-2008 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.8 2008/03/31 14:53:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.9 2008/04/22 08:13:19 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -19,12 +19,10 @@ LICENSE="ACML"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-DEPEND="app-admin/eselect-blas
-	app-admin/eselect-lapack
-	dev-util/pkgconfig
-	openmp? ( >=sys-devel/gcc-4.2 )
-	!openmp? ( =sys-devel/gcc-4.1* )"
-
+DEPEND="openmp? ( >=sys-devel/gcc-4.2 )
+	!openmp? ( =sys-devel/gcc-4.1* )
+	app-admin/eselect-blas
+	app-admin/eselect-lapack"
 RDEPEND="${DEPEND}
 	doc? ( app-doc/blas-docs app-doc/lapack-docs )"
 
@@ -70,10 +68,6 @@ src_unpack() {
 	FORTDIRS="$(ls -d ${FORT}*)"
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_test() {
 	local forts=${FORTDIRS}
 	# only testing with current compiler
diff --git a/sci-libs/acml/acml-4.0.1.ebuild b/sci-libs/acml/acml-4.0.1.ebuild
index 514ff6fa50d4..a749f62737c4 100644
--- a/sci-libs/acml/acml-4.0.1.ebuild
+++ b/sci-libs/acml/acml-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.4 2008/03/31 14:53:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.5 2008/04/22 08:13:19 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -19,12 +19,11 @@ RESTRICT="strip fetch"
 LICENSE="ACML"
 SLOT="0"
 
-DEPEND="app-admin/eselect-blas
-	app-admin/eselect-lapack
-	ifc? ( dev-lang/ifc )
+DEPEND="ifc? ( dev-lang/ifc )
 	openmp? ( !ifc? ( >=sys-devel/gcc-4.2 ) )
-	!openmp? ( !ifc? ( =sys-devel/gcc-4.1* ) )"
-
+	!openmp? ( !ifc? ( =sys-devel/gcc-4.1* ) )
+	app-admin/eselect-blas
+	app-admin/eselect-lapack"
 RDEPEND="${DEPEND}
 	doc? ( app-doc/blas-docs app-doc/lapack-docs )"
 
@@ -70,10 +69,6 @@ src_unpack() {
 	FORTDIRS="$(ls -d ${FORT}*)"
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_test() {
 	local forts=${FORTDIRS}
 	# only testing with current compiler