Added acml as possible dependency for fftw (see bug #181057).

Package-Manager: portage-2.1.2.9

5 files changed, 32 insertions, 23 deletions

diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog
index 24c004a0ca87..ebec0bd9fa9b 100644
--- a/sci-libs/itpp/ChangeLog
+++ b/sci-libs/itpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/itpp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.36 2007/06/05 01:42:12 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.37 2007/06/06 14:27:04 markusle Exp $
+
+  06 Jun 2007; Markus Dittrich <markusle@gentoo.org> itpp-3.10.10.ebuild,
+  itpp-3.10.11.ebuild, itpp-3.99.1.ebuild:
+  Added acml as possible dependency for fftw. Thanks much to
+  Adam Piatyszek <ediap@et.put.poznan.pl> for pointing
+  this out (see bug #181057).
 
 *itpp-3.10.11 (04 Jun 2007)
 
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 3648e3705cb0..a59fc6b2b93d 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -2,26 +2,26 @@ DIST itpp-3.10.10.tar.bz2 800010 RMD160 7e7f730bc6a08067b9e464eddbc0aec402d7797f
 DIST itpp-3.10.11.tar.bz2 793735 RMD160 ce2b935097879b69d07929d3ddcadfe5433cef03 SHA1 08451fea6b0e52d1b9574a2c2c4df642112da757 SHA256 40329388708f8ddad7c47f1c5492367bbcc1a02748afc19444c95e55c318598b
 DIST itpp-3.10.9.tar.bz2 800061 RMD160 799984a70e6a1a39bb06e803828019fdf9bd3ef5 SHA1 3f1a7446f102b4b14517f26575b6a0fc5781bbf7 SHA256 af1e86de12a83921d1cc6239607b73dad48a7bf7fdec64d36fcf17fdfb75ef2a
 DIST itpp-3.99.1.tar.bz2 868613 RMD160 05d42d88240136cd62451426a524aac5775ac5dd SHA1 e4271d83cd5d8c52fbf59f25d1319e3b382761cd SHA256 844d2b3060d44243297dff846a859dd8a0fd65158a5045c10484696591b56c26
-EBUILD itpp-3.10.10.ebuild 1564 RMD160 82c6918ce62bea4cda28e63d9a83d6515c78d47e SHA1 f0afbeceee77b1f963fda23a28def0d344362ee0 SHA256 cc13cb77c2e7b01247191718574e970846f46a92ab93c4cf52aff547d21b3f3a
-MD5 ac653e860fde71314efce7fc51305977 itpp-3.10.10.ebuild 1564
-RMD160 82c6918ce62bea4cda28e63d9a83d6515c78d47e itpp-3.10.10.ebuild 1564
-SHA256 cc13cb77c2e7b01247191718574e970846f46a92ab93c4cf52aff547d21b3f3a itpp-3.10.10.ebuild 1564
-EBUILD itpp-3.10.11.ebuild 1564 RMD160 2dac1cca79ddaf8804d349ba62b4a1d9a0857b27 SHA1 7634247d264209fcee7149ffc65c348b086886f0 SHA256 268b77e608bc4e8ff41662971a3f6fd39298698bd0e684dfb59bed61bb72d90d
-MD5 1ecb610fe18ae1af2f95963e010e2918 itpp-3.10.11.ebuild 1564
-RMD160 2dac1cca79ddaf8804d349ba62b4a1d9a0857b27 itpp-3.10.11.ebuild 1564
-SHA256 268b77e608bc4e8ff41662971a3f6fd39298698bd0e684dfb59bed61bb72d90d itpp-3.10.11.ebuild 1564
+EBUILD itpp-3.10.10.ebuild 1598 RMD160 e775f68414a14181a1b04e938986489b20ce0e73 SHA1 a016fc80297179275aef985bc81fadb6fe806e5d SHA256 2d855fd38d9a21274e670cc285cb792511d36f6574af6b49df01ea6df988a197
+MD5 3fa0d6a948fccba0e53569ee45aaa22a itpp-3.10.10.ebuild 1598
+RMD160 e775f68414a14181a1b04e938986489b20ce0e73 itpp-3.10.10.ebuild 1598
+SHA256 2d855fd38d9a21274e670cc285cb792511d36f6574af6b49df01ea6df988a197 itpp-3.10.10.ebuild 1598
+EBUILD itpp-3.10.11.ebuild 1598 RMD160 53ec46d16e1a035ff12a68a50253eeded613e863 SHA1 535826e0efa87f94c98fad88138129af1bde73cc SHA256 64494a552f9a3e4f88e437ed13f1b576179b1fac98a52178c8347c696b2d64f2
+MD5 60aa3d162a2bbe5bcaf9536b47c82447 itpp-3.10.11.ebuild 1598
+RMD160 53ec46d16e1a035ff12a68a50253eeded613e863 itpp-3.10.11.ebuild 1598
+SHA256 64494a552f9a3e4f88e437ed13f1b576179b1fac98a52178c8347c696b2d64f2 itpp-3.10.11.ebuild 1598
 EBUILD itpp-3.10.9.ebuild 1559 RMD160 cd41b0150d8cd6659ebb3575a0eb96483d434516 SHA1 ff9f4476be07f2bc33b2502eeafcfcfee9cc8573 SHA256 aa29d14e10554ad0ea78f5c1e28df681b2bac792cc32ab6affaf907c1bfe2b7d
 MD5 b7284f8881aa9cb860a55de852451f63 itpp-3.10.9.ebuild 1559
 RMD160 cd41b0150d8cd6659ebb3575a0eb96483d434516 itpp-3.10.9.ebuild 1559
 SHA256 aa29d14e10554ad0ea78f5c1e28df681b2bac792cc32ab6affaf907c1bfe2b7d itpp-3.10.9.ebuild 1559
-EBUILD itpp-3.99.1.ebuild 1779 RMD160 430ee7589db8a768f6dced81e183a646f236b2e3 SHA1 e8d60a45eaef127b661c42c382f19a8bc63d470d SHA256 41b85534c18214359559166976fdcd964eec7d42f8c556f56d98c3ef63752f06
-MD5 1ec6bf2bf011a001e532f07f1cecb124 itpp-3.99.1.ebuild 1779
-RMD160 430ee7589db8a768f6dced81e183a646f236b2e3 itpp-3.99.1.ebuild 1779
-SHA256 41b85534c18214359559166976fdcd964eec7d42f8c556f56d98c3ef63752f06 itpp-3.99.1.ebuild 1779
-MISC ChangeLog 6300 RMD160 d800e4c1ed0d0863a6aa93b5385d5dd4ccb3467a SHA1 693542741ffa8c347d1320c2c992151d726f5bc3 SHA256 e6e97aec389a4a4234d23d2b7fea906932670453964f30cffa56ac9397506d4d
-MD5 5b48b059bf99b41dc3221887712c7b77 ChangeLog 6300
-RMD160 d800e4c1ed0d0863a6aa93b5385d5dd4ccb3467a ChangeLog 6300
-SHA256 e6e97aec389a4a4234d23d2b7fea906932670453964f30cffa56ac9397506d4d ChangeLog 6300
+EBUILD itpp-3.99.1.ebuild 1816 RMD160 c9eb27426debd36138173f1a7822cd21b081f29d SHA1 4917092c95cf63811b1bc51504e3f98fbe437943 SHA256 2d92ea148da813db420c9e5a79a0a85a2ecacb7dec4345e1f7f34453d4a4c75e
+MD5 0a5868f5ad44eb98f1084ce1a623e371 itpp-3.99.1.ebuild 1816
+RMD160 c9eb27426debd36138173f1a7822cd21b081f29d itpp-3.99.1.ebuild 1816
+SHA256 2d92ea148da813db420c9e5a79a0a85a2ecacb7dec4345e1f7f34453d4a4c75e itpp-3.99.1.ebuild 1816
+MISC ChangeLog 6564 RMD160 fcf4f07e78764923663232a8da63774ed0ce0906 SHA1 626a81b82729be1377994e215a4dd1a9ff10c89d SHA256 d123f9d4cfaa5612389e1eda53f53119c9ee0bd7807642060e1b672305b86ef4
+MD5 452ed2370d07cb16b4eac9e200c0728b ChangeLog 6564
+RMD160 fcf4f07e78764923663232a8da63774ed0ce0906 ChangeLog 6564
+SHA256 d123f9d4cfaa5612389e1eda53f53119c9ee0bd7807642060e1b672305b86ef4 ChangeLog 6564
 MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454
 MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
diff --git a/sci-libs/itpp/itpp-3.10.10.ebuild b/sci-libs/itpp/itpp-3.10.10.ebuild
index aa61b74201d8..d39af8d5dc4b 100644
--- a/sci-libs/itpp/itpp-3.10.10.ebuild
+++ b/sci-libs/itpp/itpp-3.10.10.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/itpp/itpp-3.10.10.ebuild,v 1.2 2007/04/11 19:03:37 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-3.10.10.ebuild,v 1.3 2007/06/06 14:27:04 markusle Exp $
 
 inherit fortran
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="blas cblas debug doc fftw lapack"
 
-DEPEND="fftw? ( >=sci-libs/fftw-3.0.0 )
+DEPEND="fftw? ( || ( >=sci-libs/fftw-3.0.0
+					>=sci-libs/acml-2.5.3 ) )
 		blas? ( virtual/blas
 				cblas? ( || ( >=sci-libs/gsl-1.4
 							>=sci-libs/acml-2.5.3
diff --git a/sci-libs/itpp/itpp-3.10.11.ebuild b/sci-libs/itpp/itpp-3.10.11.ebuild
index ae18c0a7bb67..e0a338187dd0 100644
--- a/sci-libs/itpp/itpp-3.10.11.ebuild
+++ b/sci-libs/itpp/itpp-3.10.11.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/itpp/itpp-3.10.11.ebuild,v 1.1 2007/06/05 01:42:12 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-3.10.11.ebuild,v 1.2 2007/06/06 14:27:04 markusle Exp $
 
 inherit fortran
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="blas cblas debug doc fftw lapack"
 
-DEPEND="fftw? ( >=sci-libs/fftw-3.0.0 )
+DEPEND="fftw? ( || ( >=sci-libs/fftw-3.0.0
+					>=sci-libs/acml-2.5.3 ) )
 		blas? ( virtual/blas
 				cblas? ( || ( >=sci-libs/gsl-1.4
 							>=sci-libs/acml-2.5.3
diff --git a/sci-libs/itpp/itpp-3.99.1.ebuild b/sci-libs/itpp/itpp-3.99.1.ebuild
index c13d81d644b5..68d6f2bc13a1 100644
--- a/sci-libs/itpp/itpp-3.99.1.ebuild
+++ b/sci-libs/itpp/itpp-3.99.1.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/itpp/itpp-3.99.1.ebuild,v 1.1 2007/03/23 13:41:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-3.99.1.ebuild,v 1.2 2007/06/06 14:27:04 markusle Exp $
 
 inherit fortran
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="blas cblas debug doc fftw lapack minimal"
 
-DEPEND="!minimal? ( fftw? ( >=sci-libs/fftw-3.0.0 ) )
+DEPEND="!minimal? ( fftw? ( || ( >=sci-libs/fftw-3.0.0
+								>=sci-libs/acml-2.5.3 ) ) )
 		blas? ( virtual/blas
 				cblas? ( || ( >=sci-libs/gsl-1.4
 							>=sci-libs/acml-2.5.3