diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/acml/ChangeLog | 5 | ||||
-rw-r--r-- | sci-libs/acml/Manifest | 11 | ||||
-rw-r--r-- | sci-libs/acml/acml-4.1.0-r1.ebuild | 33 |
3 files changed, 18 insertions, 31 deletions
diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog index 872398554bcb..a5c5bbec30fb 100644 --- a/sci-libs/acml/ChangeLog +++ b/sci-libs/acml/ChangeLog @@ -1,6 +1,9 @@ # 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.36 2008/05/27 10:16:17 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.37 2008/06/23 14:43:38 bicatali Exp $ + + 23 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> acml-4.1.0-r1.ebuild: + Added gfortran fetch for x86, now available on amd website 27 May 2008; Sébastien Fabbro <bicatali@gentoo.org> -acml-4.1.0.ebuild, acml-4.1.0-r1.ebuild: diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest index 42ba2a06be15..cb22da29ebeb 100644 --- a/sci-libs/acml/Manifest +++ b/sci-libs/acml/Manifest @@ -13,6 +13,7 @@ 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 +DIST acml-4-1-0-gfortran-32bit.tgz 18258099 RMD160 f48bc4f308cbae2c6f9b85631c20c83e6ffe99d0 SHA1 a85c102bab1f300bb2bb28bcffac46b58dfd743f SHA256 52580576c3a425635eccb19fc5df38c3139fbc44fd669799bc8ffd0e2d82ccc7 DIST acml-4-1-0-gfortran-64bit-int64.tgz 29351223 RMD160 99b26b025a60b21600d4a337b4a986a98b5fa03c SHA1 b14210b45ab710e7e63c26658b68be7ed2a82d46 SHA256 825ae742df873cf6d41fbaaecff08941badb2b43a7021ba6c8af7abc75a6d14d DIST acml-4-1-0-gfortran-64bit.tgz 29995624 RMD160 53a50524235903569905ecc3cd3f65225e5c081e SHA1 ef29426885af41c5ea121e2ace1e1a59c7b423fe SHA256 50f64687b86556123538e1f2bd4c185ff1d018501a5a5834ec8acf7487c817c4 DIST acml-4-1-0-ifort-32bit.tgz 18797527 RMD160 bbc0ec7e367693d8201b032b310bf3b36edf1834 SHA1 d6c1bacc012718190d54d3b7fd5804bc85429c46 SHA256 5dfa768c12e96d2d25678e85cf2e0eea3bd427ddd94f417bcad09abe25369375 @@ -21,13 +22,13 @@ DIST acml-4-1-0-ifort-64bit.tgz 36577689 RMD160 35ef227d2bf24ae3ff2141a802570d6d 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 -EBUILD acml-4.1.0-r1.ebuild 5896 RMD160 ebdec59d71257f51515c60396795eef564885f64 SHA1 bbdab6a8dcef39593f4ccc13be64378986bab7f9 SHA256 3b3e03d791ce93b9af9981b15c4dbf5ab6fe9145d9162bda29ad105ede3ff452 -MISC ChangeLog 7328 RMD160 f8b12655820dff0a5d37e77a52866edd5afd5da2 SHA1 011e23afacd2db85a76bec2c15352c49bc558a5b SHA256 38060f2b4bd9e6b8228181857410fc7f46ac807c3cd5c9ce47dc9e9228dd2ecc +EBUILD acml-4.1.0-r1.ebuild 5372 RMD160 b60565c959c2417dbd39b8a028b06a6fe8a8f015 SHA1 8fd7a451b6e126910bafe8f24c4732bc06ec8a82 SHA256 3dbb665ef788f1adbc4a7011a833e8cf7314971bba5e9bbc419d2506788940d8 +MISC ChangeLog 7467 RMD160 d8424b9c21737565c67359cb2f908dea7a79e2dc SHA1 d3e156724915918fd0de1d5c40709bab0f1a2447 SHA256 1b5f401fc4daf21469038fe3034537db132957493f08dfa9e16b372e2983e881 MISC metadata.xml 812 RMD160 878a52e199a177a1dade27a1ebfdf623a42b7e5d SHA1 24e5f44c01dfc65ac8c699015bb649abf29efcaf SHA256 3597c6694fc8b1f7b57103ffd799dfa077c29444c31d6a5be43ebc0198636cae -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkg734cACgkQ1ycZbhPLE2BiFQCeLPHXkw45uhFLthP/+1YZyK9t -eaYAn11n0OC0g5L4W+DOt63x6QiJLUrA -=gZsP +iEUEARECAAYFAkhftqkACgkQ1ycZbhPLE2BAfACeO+1lNw8zQvsR69sY6QWw22Sl +8i8AljExjqPlBgBKiMJYsI8Ao8PmYnc= +=3geT -----END PGP SIGNATURE----- diff --git a/sci-libs/acml/acml-4.1.0-r1.ebuild b/sci-libs/acml/acml-4.1.0-r1.ebuild index e3b00bec037d..145c0c8c6f3b 100644 --- a/sci-libs/acml/acml-4.1.0-r1.ebuild +++ b/sci-libs/acml/acml-4.1.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-4.1.0-r1.ebuild,v 1.2 2008/05/27 10:16:17 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild,v 1.3 2008/06/23 14:43:38 bicatali Exp $ EAPI="1" @@ -19,14 +19,10 @@ SRC_URI=" !ifc? ( !gfortran? ( ${MY_P}-gfortran-64bit.tgz int64? ( ${MY_P}-gfortran-64bit-int64.tgz ) ) ) ) - x86? ( ${MY_P}-ifort-32bit.tgz )" - -# Once gfortran builds appear, replace x86? -# and remove the hack_x86 in the ebuild -# x86? ( -# ifc? ( ${MY_P}-ifort-32bit.tgz ) -# gfortran? ( ${MY_P}-gfortran-32bit.tgz ) -# !ifc? ( !gfortran ( ${MY_P}-gfortran-32bit.tgz ) ) )" + x86? ( + ifc? ( ${MY_P}-ifort-32bit.tgz ) + gfortran? ( ${MY_P}-gfortran-32bit.tgz ) + !ifc? ( !gfortran? ( ${MY_P}-gfortran-32bit.tgz ) ) )" IUSE="doc examples gfortran ifc int64 openmp test" KEYWORDS="~amd64 ~x86" @@ -35,13 +31,9 @@ RESTRICT="strip fetch" LICENSE="ACML" SLOT="0" -# gfortran? ( sys-devel/gcc:4.2 ) -# !gfortran? ( !ifc? ( sys-devel/gcc:4.2 ) ) ) -# hack_x86 CDEPEND="ifc? ( dev-lang/ifc ) - amd64? ( gfortran? ( sys-devel/gcc:4.2 ) - !gfortran? ( !ifc? ( amd64? ( sys-devel/gcc:4.2 ) ) ) ) - x86? ( dev-lang/ifc )" + gfortran? ( sys-devel/gcc:4.2 ) + !gfortran? ( !ifc? ( sys-devel/gcc:4.2 ) )" DEPEND="test? ( ${CDEPEND} ) app-admin/eselect-blas @@ -64,18 +56,11 @@ pkg_nofetch() { } pkg_setup() { - # hack_x86 - if use x86 && ! use ifc; then - ewarn "On x86 architectures, acml is only available with ifc." - ewarn "Make sure you have proper licenses to use ifc" - fi FORTRAN="" if use test; then use gfortran && FORTRAN="${FORTRAN} gfortran" use ifc && FORTRAN="${FORTRAN} ifc" use gfortran || use ifc || FORTRAN="gfortran" - # hack_x86 - use x86 && FORTRAN="ifc" fortran_pkg_setup # work around incomplete fortran eclass if use gfortran && @@ -90,9 +75,7 @@ pkg_setup() { # construct default profile dprof from default ddir local ddir=gfortran use ifc && ddir=ifort - # hack_x86 - use x86 && ddir=ifort32 || ddir=ifort64 - #use x86 && ddir=${ddir}32 || ddir=${ddir}64 + use x86 && ddir=${ddir}32 || ddir=${ddir}64 use openmp && ddir=${ddir}_mp use int64 && ddir=${ddir}_int64 ACML_DEFAULT_DIR=${ddir} |