diff options
author | 2013-09-26 17:49:03 +0000 | |
---|---|---|
committer | 2013-09-26 17:49:03 +0000 | |
commit | dbaaf4ad1239b9ec2bfde3fcb663cbafa0ec29f7 (patch) | |
tree | 2ad42bc9e05c92ddbb2a188366cd2ef393ac4553 /sci-libs | |
parent | Ebuild for jboss-logging - JBoss' logging framework (diff) | |
download | historical-dbaaf4ad1239b9ec2bfde3fcb663cbafa0ec29f7.tar.gz historical-dbaaf4ad1239b9ec2bfde3fcb663cbafa0ec29f7.tar.bz2 historical-dbaaf4ad1239b9ec2bfde3fcb663cbafa0ec29f7.zip |
removed old (bug #478608)
Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/fftw/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/fftw/Manifest | 31 | ||||
-rw-r--r-- | sci-libs/fftw/fftw-3.2.2-r2.ebuild | 130 | ||||
-rw-r--r-- | sci-libs/fftw/fftw-3.2.2.ebuild | 125 | ||||
-rw-r--r-- | sci-libs/fftw/fftw-3.3.3-r1.ebuild | 150 | ||||
-rw-r--r-- | sci-libs/fftw/fftw-3.3.3.ebuild | 143 | ||||
-rw-r--r-- | sci-libs/fftw/files/fftw-3.2.1-as-needed.patch | 82 | ||||
-rw-r--r-- | sci-libs/fftw/files/fftw-3.2.2-pc-threads.patch | 19 | ||||
-rw-r--r-- | sci-libs/fftw/metadata.xml | 1 |
9 files changed, 9 insertions, 680 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index 279ae9da198c..227f087991de 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/fftw # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.153 2013/09/26 17:32:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.154 2013/09/26 17:48:57 ottxor Exp $ + + 26 Sep 2013; Christoph Junghans <ottxor@gentoo.org> -fftw-3.2.2-r2.ebuild, + -fftw-3.2.2.ebuild, -fftw-3.3.3-r1.ebuild, -fftw-3.3.3.ebuild, + -files/fftw-3.2.1-as-needed.patch, -files/fftw-3.2.2-pc-threads.patch, + metadata.xml: + removed old (bug #478608) 26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> fftw-3.3.3-r2.ebuild: Stable for arm, wrt bug #477182 diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index 4a23feac4611..2280a7296bee 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -1,39 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX fftw-2.1.5-as-needed.patch 4374 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0 SHA512 b460d3d3fcc8ea325ef9fc6aa29d0d4f0274697c55b8986d4219531234f89037c814e178144524b5bc6e4a30adf64e1cb30a25ebf042358510485b151c31d049 WHIRLPOOL 6ad4e5676285c8ac17feeaf91980a8bf1116aa70d59e96db319b6beb53579cc6506c684c4c09da482b5307fd634e4d6e449bc1ad59186ead559793d481c23745 AUX fftw-2.1.5-cc.patch 546 SHA256 52b2ba8a140e46e9a1f1c71d8e85faaac70e6d783ba8e45f4423ba6f70f04dbe SHA512 f21ba12ec727a023d41df95b24d03273d416888b21f56dde8d2a256d15b9543a091a02f7100e86196bb7a38492d470b58ab293fed58a21e2417e2427f786368a WHIRLPOOL a333539e1bf7feee517818f9c9c7375d1c71a7792aa1662d18ba6727ab517c444a68375c0e1210f736f0e9dcd297f3ab64273777f5064afe3b724985dff4a641 AUX fftw-2.1.5-configure.in.patch 8208 SHA256 67a153b67cd8aef3fedd92da09185063ac0cb17d63f1a06c5f480873e037d6cd SHA512 c2758932553bcc9f106def7a21bcd8d84766f58a3eb297feeac339c119f6e05fc6a1d85f10bab0e5b1b7db69a31e2fd09cb8b8116fcd84d0cbf09f969d3a5619 WHIRLPOOL dcf3f691dfcb7d5e1cdb4d3df3e04376f047a34cb67254419bb80381339cb42443ea72c734a678f1e56ddd40601c33d19fa613985e7dc3741caf410593290300 AUX fftw-2.1.5-no-test.patch 1247 SHA256 9a6cad5e81b4a68ef6c8e137a189ffad462cbbea4850211969417b03768eede1 SHA512 2afea8ab8dff922f47322ab73d1611e0d8c1217fbd046917e9b7b0eda98fcb0b86fe5c2a7fb18c8a4a07dca2eff546f3853160372d5b426ab3738c2d4e0f5937 WHIRLPOOL 28fad72db5eaf7939154d16312db371c6bbb4fbea4ab5bc1848376a71abad761fb7ecabd366ab8cad09143588530cae7241d933ac0a8e762a9052dfb86528ade AUX fftw-2.1.5-texinfo5.1.patch 596 SHA256 00e61fd86bd0e742efb72212c005615964da4eade40c3024443504e50b9c7186 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214 WHIRLPOOL 9f382908ab6dac7c41c80c7e88a391bb2a71d1c3d8b0e38d153a5fdd8f48b46aee4a216860b599495275ef0f1e2c1501dbe2c12598eae0c637bb16f0878ce2a0 -AUX fftw-3.2.1-as-needed.patch 3184 SHA256 c70c4544a060f134d88930019562b4b4f413382e33b373e8389036be6aefb91c SHA512 548054cc8aec9b835a88d0e199fcec126d3ef0e54fc0bcacff2dee9c4da844c973087fa7b44cea5525ca725456a29e4b4122529707c0a5941f0e1a943e7c34b2 WHIRLPOOL 5c0b3c32c397ccf3ca37150a0fe0055e5c234266589948051070f0b278e545f6d8d113d22c9c309f5c5015307b744d233cbf09a0f942634b839f89804de082a7 -AUX fftw-3.2.2-pc-threads.patch 650 SHA256 26a442c168324623a60d1fc986f9c70ddf2d66d91e5d4a620ded1982bd22a593 SHA512 e4872154df4c93ce02572e2f2d23bf04efc7d325630dffe8b52602cc28ca310ecfc782f99d7ca5bfe14cf8f79f27b340dccc828392edb084cd8b25be1ca0debb WHIRLPOOL e028943d6a4910e4a88812094cf4a5b8b3588a78d0e6c9a581fd044cc5b5e9e4e33d5d7c47b126aeac97f3184a406ab6c40ef2ff4254bb46468884673e002bf0 DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 WHIRLPOOL 2ea64d246c12e14962b93e05411c5f06dd193a887acb3fe5e7f63231a1a2f1f21b3a41f75951e18c332b25105865633c87150f2107169f5487b6b9983b968e10 -DIST fftw-3.2.2.tar.gz 3495117 SHA256 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f SHA512 0bcb01b2e84102f6d70b0c8dabf8541917f88e249405cad44ab49783513eb6519b2db13ce17c23598c807a14eff02327f59e1853335b85c7ec592e7176038094 WHIRLPOOL 55126a6b44ed84c66c8596d3f504f9f0b5e19636f60bb36e252fd625cc5471049d4ec9193d2a7c31816ea8fb26d4a0d7b105ebdd645f58573cce5396416dd8c7 DIST fftw-3.3.3.tar.gz 3920661 SHA256 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3 SHA512 1d88b6376ba8c15cceafd3381de1d181a974b921b72b31dd89c297e5771e8d665aa3c121ef2504a70e7b0bb562b1e0612ac2a02121c412d27df06c4d687507c4 WHIRLPOOL b410cb4d854988f9a57f08344d9207ece4ebf218ec6fa605036235e472bef91f5037d852793fa6a7bc0f8a6a7081dc1e71b25b15ab1259e299bb95affca40d3b EBUILD fftw-2.1.5-r8.ebuild 3985 SHA256 cbb0c89c800ba8e33de782e4dbaa4870ac731f4d4a9ed7da677e693493112385 SHA512 f1a9a027d3e6408f8e45b885e4909dcb82356a574be8faebf719f87f51ed85693dd3bc3eefafd92c9fd6066e4d75be59bf55b14b360a7053564c47c9fafe28f4 WHIRLPOOL aeb2fda6ea435b4fd25fef07923f23964244f311437efba1bde49806ee83461d9db6ea913c79fb345e3102b0fd60be6ba3035ab84e21ae608509291d39e410e7 -EBUILD fftw-3.2.2-r2.ebuild 3860 SHA256 23a82110c30d422195befeab7463f6a4e226bd3233f9d96ef13fca2f11ce315a SHA512 3b029a451fb15bec245e7813d41f0ce49aaf7345ba9df820c4a0c7e77faa0b0099fcbeb14129685f59d0496639c05754206de94d7acff1fea933f16a3782cc00 WHIRLPOOL 6479e46b5740f6522896e5e3fcbeacd8bdf6fb3a5b0bb105af77bc0239e6e90a68bf05dca1c02562bfc750ebb775414654329342328c7e527ccc46db1bcbe0cc -EBUILD fftw-3.2.2.ebuild 3652 SHA256 7be4b3e229e3a3b226d37ac76601c4a1ed38da4846565ff445d4aabfb3496f08 SHA512 862fc6ce08819ba8ec3967c5eda63fb84bc8990d319e481aac7d80bd50f4bd1ed70eec227b368dc3ea5e4a1eda865db5f107118561eb8c37c275f9c9b39f7404 WHIRLPOOL 80d8d2e9f86ffe5d7b7bad06fe559efcaeb510359936a01cc0f1e8e1077193fdd756a137ad85f22ee3dec6ee95ffe0e58c588e87fe388682f0bc8024d6e7e535 -EBUILD fftw-3.3.3-r1.ebuild 4042 SHA256 e6ef2d1170fd01abf42bda4a764cf6110f1397f86441419832c1ec74695b33db SHA512 be412ee4b94b5cdf116356903003d4193967998a65a60298b4aa679c46e6dce12ed79241f32e331862ddcbf4f20005095c041bdd6691024a3ab96e43c4ed5a52 WHIRLPOOL 6f9dc16986da644156ebcc9ebc64027c24b78e8af592c1128df8408ba32a24020794ae8628a0e7a62957b2782ea024d876f92e25757383affd172e18581cb345 EBUILD fftw-3.3.3-r2.ebuild 3904 SHA256 17cf3c43681d1db09388800e51fe0e46a696563ceee92ecb77638bdfe27bea16 SHA512 c8a4fe2249d4fd7e849659ce016924d5c4746d5a74e8a7ae97ab6d7d1a2e3b2f517336ad4cfa00b382652ed16906ac9252d11484f5c402dab398a86ac401a73e WHIRLPOOL 86f5919fcc0e692eb0cbca5e72f26cd5216d5b8d54f6dbfbab8d52608c39679aa450323de69dec5895835ed21c39494beeeac806e8ef07c1223615bd9dd02e42 EBUILD fftw-3.3.3-r3.ebuild 5212 SHA256 c532e0ef7157a50d49d3e51d4177999638a02121f96363ee95cbb7f7d754076f SHA512 c6e95441b0e957f8ef2eb21638331a9e6fbf76fe9665cbdba89ca46b476fffcfe0ed42896d362c3eac1f7d4f19857f5d8c7d4f473fd2e958af941b8b22871b1a WHIRLPOOL 3fb681398b7b0eaa5c7f2b8586ac52707f6baff98650c397b1928e014dd956786cac257d73076ccf1e86b178774d329754bab3546ed05a085064969f98e18715 -EBUILD fftw-3.3.3.ebuild 3664 SHA256 65d9c22b3331103b7c6358db69f3e51109825c300f2e06c90578f0730849cfe2 SHA512 485a5ce72f155dcb62573329a226a3911ad4efa5874be6f255bd4e5acb2ce8390843722fa3b31bc14d4ad65cd54befe808e08f541b7beccb55a80c54f4e46eb3 WHIRLPOOL bf527e6bf93fb876a48b468e93fa54e436f4c2e452af784e103589c0a707f8261f92f5f1519996d301f89e69a488f54ad0675be61ac83ff2997d815353e0b994 -MISC ChangeLog 27098 SHA256 adc4c7d1425f9bc3318449a51e4bc5b6025dfa52246705c4ef9878888df2f4e6 SHA512 838e51766edfd9ea665ddcd75365776651fdefadd3a292c0852636a5625634874bb68384c29abaee8150718c8edd56ba9de59b9314c2bf6e67fdd6e552b8671f WHIRLPOOL 376a3fa63a93a9e73eb59ba52b062e02c1345c5fe550892216dd1e3b75c7b20af00667bd7c4fd890e8b6c48c60c3651134d365742342ea8f689090c286051d3f -MISC metadata.xml 1243 SHA256 34a8bc5356ea410cdd708b2ef4f5e57a53be0f1d6af7c54ae72f57d65f4caae2 SHA512 b790a83e5bd8451b7e5efaa8c7430dc0c879a4be30f913f484572cf8c3b6199b283483df51d0234e0d6b99d324e9bade7e03f84254058225b592a74a90e5eddf WHIRLPOOL 4fa9379a2d144d25c1d60dd0370e02b4207be3d0327d4b849a4c8ab651f3986dc36b463451007611f1d0af83084833a71f98c672b369bca2dff0823ebe15a3f7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) - -iQIcBAEBCgAGBQJSRG7rAAoJELp701BxlEWfmGIQAKw+SEQLMDNegsoXmFKuqo67 -M89ByqBJH+fa8MdTiOq8eWIDQLJ/ZOYF9T97kh5cVjTrly8SV3iiwgJGB4sgocda -Ugrds9Pru9NPvyQh+4+BXANfPOeOMCD4SY8pmVqLRu6o/Md/OwOI4RL3uwVJEVQp -pqkcHSe0U0eg3XmM28GihEwFVUY0xCxykLCCuqFA2ui3gAo1QUez4UYFc6nEc+Vf -lfxlOEXgoHzqK7JQaF/t3mdr2BhL8fiPNS6W5Xfwf/6ig1GDAXhQ0jiSqGWnvnhU -DidVzHt9KzQFWgSPxwx3O8wxaMqb/PJK+vtC6pfpvzFuvJab9yU02fYjnJpHdj8e -PGEDKFyf6ETSoKq/gKqTc664MycPmTTFAa3AbtusrddrjXTIuTbXoaamrJjLX5Q4 -X0Inxxp9C5v54Gj9I0rbNa/o1YaDcJkecivnXO6VTN81Fx+UiqhfdlQt0ZxNaxA4 -R5/dQS20nJ/Go90jONzkmalyLr08+jJmgXPUruAbNIdmLslimlD5C4VbOA/2euWe -miPFo9MKPWzpDkLRdi+EXP1WFyCZaNQE3Wx1BY+ki5GtxC8nEXCwZrIHc+UVbh8u -uoOHccWZ1snm9BsZpFNMZU1ELM8ym1lVQ5GAEVm7F8ccLHhWx+j8Jzh9nsVn07OH -4RzwE1JmOm1Q7NfWT68Y -=83QP ------END PGP SIGNATURE----- +MISC ChangeLog 27361 SHA256 6873115c975ebd7b5a02fce61a4537f92d494e38e726deb6f7231225e8fa18b9 SHA512 b4370d186bd11edb860fa2c4abd0a57b912ee83c008f7852b51817e729c5f51a00c96005e7a44cd482db9cadcb2ab84b6c860fcbce49dfbb02db8f76f0e0d104 WHIRLPOOL 2861d3ba77b4121406dc8eb67c7912f5ae263f25732411733ac0b40ea6f288195c2165508fd07fb1017e3a1d6fd71765c5ed94e79162a4a9532948b336f15211 +MISC metadata.xml 1153 SHA256 4098cfa7c224af2bafc5dac8c1834e4f53b4c992f2dcfe20ce494b0ecbc3caf4 SHA512 e1f7f672f1f185781fbe4135a787b03800199caea1ad8e9287182a0605401db8f61de96372a106d92f608900aa158ebaa96b3256d6d7566fdd5f183f0be91b88 WHIRLPOOL 50140233feb932045fc2bf97d3a254628fe6afff32c3c30ddb524d03442ba84aaf4f10e5e3868ba416f8928f81718901ad68b2ca45db442467ab26942a74196f diff --git a/sci-libs/fftw/fftw-3.2.2-r2.ebuild b/sci-libs/fftw/fftw-3.2.2-r2.ebuild deleted file mode 100644 index 09bf267563fb..000000000000 --- a/sci-libs/fftw/fftw-3.2.2-r2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r2.ebuild,v 1.4 2013/02/22 10:11:14 jlec Exp $ - -EAPI=2 - -FORTRAN_NEEDED=fortran - -inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs - -DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" -SRC_URI="http://www.fftw.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="altivec doc fortran openmp paired-single sse sse2 threads zbus" - -pkg_setup() { - use openmp && FORTRAN_NEED_OPENMP="1" - fortran-2_pkg_setup - FFTW_THREADS="--disable-threads --disable-openmp" - if use openmp; then - FFTW_THREADS="--disable-threads --enable-openmp" - elif use threads; then - FFTW_THREADS="--enable-threads --disable-openmp" - fi - if use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " - ewarn "If you want to build fftw with OpenMP, abort now," - ewarn "and switch CC to an OpenMP capable compiler" - ewarn "Otherwise, we will build using POSIX threads." - epause 5 - FFTW_THREADS="--enable-threads --disable-openmp" - fi - FFTW_DIRS="single double longdouble" - use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) -} - -src_prepare() { - use threads && epatch "${FILESDIR}"/${P}-pc-threads.patch - epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch - - # fix info file for category directory - sed -i \ - -e 's/Texinfo documentation system/Libraries/' \ - doc/fftw3.info || die "failed to fix info file" - - rm m4/lt* m4/libtool.m4 - - AT_M4DIR=m4 eautoreconf - for x in ${FFTW_DIRS}; do - mkdir "${S}-${x}" || die - done -} - -src_configure() { - # filter -Os according to docs - replace-flags -Os -O2 - - local myconfcommon="--enable-shared - $(use_enable fortran) - $(use_enable zbus mips-zbus-timer) - ${FFTW_THREADS}" - - local myconfsingle="${myconfcommon} --enable-single" - local myconfdouble="${myconfcommon}" - local myconflongdouble="${myconfcommon} --enable-long-double" - if use sse2; then - myconfsingle="${myconfsingle} --enable-sse" - myconfdouble="${myconfdouble} --enable-sse2" - elif use sse; then - myconfsingle="${myconfsingle} --enable-sse" - fi - # altivec only helps singles, not doubles - if use altivec; then - myconfsingle="${myconfsingle} --enable-altivec" - fi - if use paired-single; then - myconfsingle="${myconfsingle} --enable-mips-ps" - fi - - for x in ${FFTW_DIRS}; do - cd "${S}-${x}" - einfo "Configuring for ${x} precision" - local p=myconf${x} - ECONF_SOURCE="${S}" econf ${!p} - done -} - -src_compile() { - for x in ${FFTW_DIRS}; do - cd "${S}-${x}" - einfo "Compiling for ${x} precision" - emake || die "emake for ${x} precision failed" - done -} - -src_test () { - # We want this to be a reasonably quick test, but that is still hard... - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" - # Do not increase the number of threads, it will not help your performance - #local testbase="perl check.pl --nthreads=1 --estimate" - # ${testbase} -${p}d || die "Failure: $n" - for x in ${FFTW_DIRS}; do - cd "${S}-${x}/tests" - einfo "Testing ${x} precision" - emake -j1 check || die "emake test ${x} failed" - done -} - -src_install () { - # all builds are installed in the same place - # libs have distinuguished names; include files, docs etc. identical. - for x in ${FFTW_DIRS}; do - cd "${S}-${x}" - emake DESTDIR="${D}" install || die "emake install for ${x} failed" - done - - cd "${S}" - dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS - if use doc; then - cd doc - insinto /usr/share/doc/${PF} - doins -r html fftw3.pdf || die "doc install failed" - insinto /usr/share/doc/${PF}/faq - doins FAQ/fftw-faq.html/* - fi -} diff --git a/sci-libs/fftw/fftw-3.2.2.ebuild b/sci-libs/fftw/fftw-3.2.2.ebuild deleted file mode 100644 index fd45cc4fd129..000000000000 --- a/sci-libs/fftw/fftw-3.2.2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2.ebuild,v 1.19 2013/02/22 10:11:14 jlec Exp $ - -EAPI=2 - -FORTRAN_NEEDED=fortran - -inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs - -DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" -SRC_URI="http://www.fftw.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="altivec doc fortran openmp sse sse2 threads" - -pkg_setup() { - use openmp && FORTRAN_NEED_OPENMP="1" - fortran-2_pkg_setup - FFTW_THREADS="--disable-threads --disable-openmp" - if use openmp; then - FFTW_THREADS="--disable-threads --enable-openmp" - elif use threads; then - FFTW_THREADS="--enable-threads --disable-openmp" - fi - if use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " - ewarn "If you want to build fftw with OpenMP, abort now," - ewarn "and switch CC to an OpenMP capable compiler" - ewarn "Otherwise, we will build using POSIX threads." - epause 5 - FFTW_THREADS="--enable-threads --disable-openmp" - fi - FFTW_DIRS="single double longdouble" - use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch - - # fix info file for category directory - sed -i \ - -e 's/Texinfo documentation system/Libraries/' \ - doc/fftw3.info || die "failed to fix info file" - - rm m4/lt* m4/libtool.m4 - - AT_M4DIR=m4 eautoreconf - for x in ${FFTW_DIRS}; do - mkdir "${S}-${x}" || die - done -} - -src_configure() { - # filter -Os according to docs - replace-flags -Os -O2 - - local myconfcommon="--enable-shared - $(use_enable fortran) - ${FFTW_THREADS}" - - local myconfsingle="${myconfcommon} --enable-single" - local myconfdouble="${myconfcommon}" - local myconflongdouble="${myconfcommon} --enable-long-double" - if use sse2; then - myconfsingle="${myconfsingle} --enable-sse" - myconfdouble="${myconfdouble} --enable-sse2" - elif use sse; then - myconfsingle="${myconfsingle} --enable-sse" - fi - # altivec only helps singles, not doubles - if use altivec; then - myconfsingle="${myconfsingle} --enable-altivec" - fi - - for x in ${FFTW_DIRS}; do - cd "${S}-${x}" - einfo "Configuring for ${x} precision" - local p=myconf${x} - ECONF_SOURCE="${S}" econf ${!p} - done -} - -src_compile() { - for x in ${FFTW_DIRS}; do - cd "${S}-${x}" - einfo "Compiling for ${x} precision" - emake || die "emake for ${x} precision failed" - done -} - -src_test () { - # We want this to be a reasonably quick test, but that is still hard... - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" - # Do not increase the number of threads, it will not help your performance - #local testbase="perl check.pl --nthreads=1 --estimate" - # ${testbase} -${p}d || die "Failure: $n" - for x in ${FFTW_DIRS}; do - cd "${S}-${x}/tests" - einfo "Testing ${x} precision" - emake -j1 check || die "emake test ${x} failed" - done -} - -src_install () { - # all builds are installed in the same place - # libs have distinuguished names; include files, docs etc. identical. - for x in ${FFTW_DIRS}; do - cd "${S}-${x}" - emake DESTDIR="${D}" install || die "emake install for ${x} failed" - done - - cd "${S}" - dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS - if use doc; then - cd doc - insinto /usr/share/doc/${PF} - doins -r html fftw3.pdf || die "doc install failed" - insinto /usr/share/doc/${PF}/faq - doins FAQ/fftw-faq.html/* - fi -} diff --git a/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/sci-libs/fftw/fftw-3.3.3-r1.ebuild deleted file mode 100644 index 9c192d6e6606..000000000000 --- a/sci-libs/fftw/fftw-3.3.3-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.5 2013/06/27 14:30:29 aballier Exp $ - -EAPI=5 - -#AUTOTOOLS_AUTORECONF=1 -FORTRAN_NEEDED=fortran - -inherit autotools-multilib eutils flag-o-matic fortran-2 toolchain-funcs versionator - -DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" -SRC_URI="http://www.fftw.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus" - -# there is no abi_x86_32 port of virtual/mpi right now -REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )" - -RDEPEND="mpi? ( virtual/mpi ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" -DEPEND="${RDEPEND} - test? ( dev-lang/perl )" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - FFTW_DIRS="single double longdouble" - if use quad; then - if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then - ewarn "quad precision only available for gcc >= 4.6" - die "need quad precision capable gcc" - fi - FFTW_DIRS+=" quad" - fi -} - -src_prepare() { - # fix info file for category directory - sed -i \ - -e 's/Texinfo documentation system/Libraries/' \ - doc/fftw3.info || die "failed to fix info file" - - autotools-utils_src_prepare -} - -src_configure() { - local x - - # filter -Os according to docs - replace-flags -Os -O2 - - for x in ${FFTW_DIRS}; do - myeconfargs=( - $(use_enable fma) - $(use_enable fortran) - $(use_enable zbus mips-zbus-timer) - $(use_enable threads) - $(use_enable openmp) - ) - if [[ $x == single ]]; then - #altivec, sse, single-paired only work for single - myeconfargs+=( - --enable-single - $(use_enable altivec) - $(use_enable avx) - $(use_enable sse) - $(use_enable mpi) - $(use_enable neon) - ) - elif [[ $x == double ]]; then - myeconfargs+=( - $(use_enable avx) - $(use_enable sse2) - $(use_enable mpi) - ) - elif [[ $x == longdouble ]]; then - myeconfargs+=( - --enable-long-double - $(use_enable mpi) - ) - elif [[ $x == quad ]]; then - #quad does not support mpi - myeconfargs+=( --enable-quad-precision ) - else - die "${x} precision not implemented in this ebuild" - fi - - einfo "Configuring for ${x} precision" - BUILD_DIR="${S}-${x}" \ - autotools-multilib_src_configure - done -} - -src_compile() { - for x in ${FFTW_DIRS}; do - einfo "Compiling for ${x} precision" - BUILD_DIR="${S}-${x}" \ - autotools-multilib_src_compile - done -} - -src_test () { - do_smalltest() { cd "${BUILD_DIR}" && emake -C tests smallcheck; } - # We want this to be a reasonably quick test, but that is still hard... - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" - # Do not increase the number of threads, it will not help your performance - #local testbase="perl check.pl --nthreads=1 --estimate" - # ${testbase} -${p}d || die "Failure: $n" - for x in ${FFTW_DIRS}; do - einfo "Testing ${x} precision" - BUILD_DIR="${S}-${x}" \ - multilib_foreach_abi do_smalltest - done -} - -src_install () { - local u x - DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS ) - HTML_DOCS=( doc/html/ ) - for x in ${FFTW_DIRS}; do - BUILD_DIR="${S}-${x}" \ - autotools-multilib_src_install - done - - if use doc; then - dodoc doc/*.pdf - insinto /usr/share/doc/${PF}/faq - doins -r doc/FAQ/fftw-faq.html/* - else - rm -r "${ED}"/usr/share/doc/${PF}/html - fi - - for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do - for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do - sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die - done - done -} diff --git a/sci-libs/fftw/fftw-3.3.3.ebuild b/sci-libs/fftw/fftw-3.3.3.ebuild deleted file mode 100644 index 1a9518a28649..000000000000 --- a/sci-libs/fftw/fftw-3.3.3.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3.ebuild,v 1.2 2012/12/08 22:18:24 ottxor Exp $ - -EAPI=4 - -#AUTOTOOLS_AUTORECONF=1 -FORTRAN_NEEDED=fortran - -inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs versionator - -DESCRIPTION="Fast C library for the Discrete Fourier Transform" -HOMEPAGE="http://www.fftw.org/" -SRC_URI="http://www.fftw.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs threads zbus" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - FFTW_DIRS="single double longdouble" - if use quad; then - if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then - ewarn "quad precision only available for gcc >= 4.6" - die "need quad precision capable gcc" - fi - FFTW_DIRS+=" quad" - fi -} - -src_prepare() { - # fix info file for category directory - sed -i \ - -e 's/Texinfo documentation system/Libraries/' \ - doc/fftw3.info || die "failed to fix info file" - - autotools-utils_src_prepare -} - -src_configure() { - local x - - # filter -Os according to docs - replace-flags -Os -O2 - - for x in ${FFTW_DIRS}; do - myeconfargs=( - $(use_enable fma) - $(use_enable fortran) - $(use_enable zbus mips-zbus-timer) - $(use_enable threads) - $(use_enable openmp) - ) - if [[ $x == single ]]; then - #altivec, sse, single-paired only work for single - myeconfargs+=( - --enable-single - $(use_enable altivec) - $(use_enable avx) - $(use_enable sse) - $(use_enable mpi) - $(use_enable neon) - ) - elif [[ $x == double ]]; then - myeconfargs+=( - $(use_enable avx) - $(use_enable sse2) - $(use_enable mpi) - ) - elif [[ $x == longdouble ]]; then - myeconfargs+=( - --enable-long-double - $(use_enable mpi) - ) - elif [[ $x == quad ]]; then - #quad does not support mpi - myeconfargs+=( --enable-quad-precision ) - else - die "${x} precision not implemented in this ebuild" - fi - - einfo "Configuring for ${x} precision" - BUILD_DIR="${S}-${x}" \ - autotools-utils_src_configure - done -} - -src_compile() { - for x in ${FFTW_DIRS}; do - einfo "Compiling for ${x} precision" - BUILD_DIR="${S}-${x}" \ - autotools-utils_src_compile - done -} - -src_test () { - # We want this to be a reasonably quick test, but that is still hard... - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" - # Do not increase the number of threads, it will not help your performance - #local testbase="perl check.pl --nthreads=1 --estimate" - # ${testbase} -${p}d || die "Failure: $n" - for x in ${FFTW_DIRS}; do - cd "${S}-${x}/tests" - einfo "Testing ${x} precision" - emake smallcheck - done -} - -src_install () { - local u x - DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS ) - HTML_DOCS=( doc/html/ ) - for x in ${FFTW_DIRS}; do - BUILD_DIR="${S}-${x}" \ - autotools-utils_src_install - done - - if use doc; then - dodoc doc/*.pdf - insinto /usr/share/doc/${PF}/faq - doins -r doc/FAQ/fftw-faq.html/* - else - rm -r "${ED}"/usr/share/doc/${PF}/html - fi - - for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do - for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do - sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die - done - done -} diff --git a/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch b/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch deleted file mode 100644 index ee9c12a4df59..000000000000 --- a/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -Nur fftw-3.2.1.orig/configure.ac fftw-3.2.1/configure.ac ---- fftw-3.2.1.orig/configure.ac 2009-02-20 19:28:55.832163268 +0000 -+++ fftw-3.2.1/configure.ac 2009-02-26 15:02:37.533259854 +0000 -@@ -440,14 +440,15 @@ - AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no) - - if test "$enable_openmp"x != nox; then -- AX_OPENMP([THREADLIBS=" " -+ AX_OPENMP([THREADLIBS="$OPENMP_LIBS" - AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives]) - CFLAGS="$CFLAGS $OPENMP_CFLAGS"], -- [AC_MSG_ERROR([don't know how to enable OpenMP])]) -+ [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])]) -+else -+ THREADLIBS="" - fi - - dnl Check for threads library... --THREADLIBS="" - if test "$enable_threads" = "yes"; then - # POSIX threads, the default choice: - if test -z "$THREADLIBS"; then -diff -Nur fftw-3.2.1.orig/m4/ax_openmp.m4 fftw-3.2.1/m4/ax_openmp.m4 ---- fftw-3.2.1.orig/m4/ax_openmp.m4 2009-02-20 19:28:55.792160754 +0000 -+++ fftw-3.2.1/m4/ax_openmp.m4 2009-02-26 15:02:08.887255943 +0000 -@@ -54,13 +54,18 @@ - done - []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS - ]) -+OPENMP_LIBS=" " - if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then - m4_default([$2],:) - else - if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then - OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp -+ if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then -+ OPENMP_LIBS="-lgomp" -+ fi - fi - m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])]) - fi - AC_SUBST(OPENMP_[]_AC_LANG_PREFIX[]FLAGS) -+AC_SUBST(OPENMP_LIBS) - ])dnl AX_OPENMP -diff -Nur fftw-3.2.1.orig/Makefile.am fftw-3.2.1/Makefile.am ---- fftw-3.2.1.orig/Makefile.am 2009-02-20 19:28:56.040169973 +0000 -+++ fftw-3.2.1/Makefile.am 2009-02-26 15:02:08.887255943 +0000 -@@ -36,6 +36,13 @@ - if SMP - if COMBINED_THREADS - COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la -+else -+lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la -+libfftw3@PREC_SUFFIX@_threads_la_SOURCES = -+libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ -+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \ -+ libfftw3@PREC_SUFFIX@.la \ -+ threads/libfftw3@PREC_SUFFIX@_threads.la - endif - endif - -diff -Nur fftw-3.2.1.orig/threads/Makefile.am fftw-3.2.1/threads/Makefile.am ---- fftw-3.2.1.orig/threads/Makefile.am 2009-02-20 19:28:55.832163268 +0000 -+++ fftw-3.2.1/threads/Makefile.am 2009-02-26 15:02:08.887255943 +0000 -@@ -2,11 +2,7 @@ - -I$(top_srcdir)/rdft -I$(top_srcdir)/api - - if SMP --if COMBINED_THREADS - noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la --else --lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la --endif - endif - - # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@ -@@ -16,4 +12,5 @@ - openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \ - vrank-geq1-rdft2.c f77api.c f77funcs.h - -+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS) - libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ diff --git a/sci-libs/fftw/files/fftw-3.2.2-pc-threads.patch b/sci-libs/fftw/files/fftw-3.2.2-pc-threads.patch deleted file mode 100644 index d3fe6aa47260..000000000000 --- a/sci-libs/fftw/files/fftw-3.2.2-pc-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 0231ab8..2e26035 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -61,9 +61,12 @@ libfftw3@PREC_SUFFIX@_la_LDFLAGS = -no-undefined -version-info \ - - fftw3@PREC_SUFFIX@.pc: fftw.pc - cp -f fftw.pc fftw3@PREC_SUFFIX@.pc -+fftw3@PREC_SUFFIX@_threads.pc: fftw.pc -+ cp -f fftw.pc fftw3@PREC_SUFFIX@_threads.pc -+ sed 's|-lfftw3@PREC_SUFFIX@|-lfftw3@PREC_SUFFIX@_threads|g' \ -+ -i fftw3@PREC_SUFFIX@_threads.pc - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = fftw3@PREC_SUFFIX@.pc -- -+pkgconfig_DATA = fftw3@PREC_SUFFIX@.pc fftw3@PREC_SUFFIX@_threads.pc - WISDOM_DIR = /etc/fftw - WISDOM = wisdom@PREC_SUFFIX@ - diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml index ec2aafe5eb8a..c7ae6003bbab 100644 --- a/sci-libs/fftw/metadata.xml +++ b/sci-libs/fftw/metadata.xml @@ -16,7 +16,6 @@ <flag name="float">Link default library to single precision instead of double (symlinks only and fftw-2.1)</flag> <flag name="fma">Use the Fused Multiply Add instruction set (fma3/fma4 either one)</flag> - <flag name="paired-single">Adds support for pair-single optimizations of mips</flag> <flag name="quad">Build quadruple precision lib</flag> <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag> </use> |