Fixed "--as-needed" brokenness in the stable branch

(Portage version: 2.1.1-r1)
 (Unsigned Manifest commit)

3 files changed, 11 insertions, 156 deletions

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 538149d53453..1dc23c8f6ca3 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -27,10 +27,10 @@ DIST fftw-3.0.1.tar.gz 1946361 RMD160 075bbdf5da67bb29117f9f54864db26acd971034 S
 DIST fftw-3.1.1.tar.gz 2719997 RMD160 4236f43159a39e3bd9d34bda1b95ce82609d26b6 SHA1 4efa2482451a71ea0887997eee7ce7b168e8efea SHA256 1d3e90da1aab15928586ef814784e217ac91bbac878906d82392b0d2e64aff0c
 DIST fftw-3.1.2.tar.gz 2736360 RMD160 13069b3582eeaa1fba1614cdca2dfbc2e45ab585 SHA1 3e4c64009ffb48123a0f30f46c1d89da7810dc67 SHA256 e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf
 DIST fftw-3.1.tar.gz 2692325 RMD160 af9f8a720daa60597416ca3ed3a54b8a789a6d44 SHA256 e961dd3f7df9ec11cebf3a9c80752caee22a00fd149b36c7680f8da708e76bf7
-EBUILD fftw-2.1.5-r1.ebuild 4236 RMD160 985d91248025ebb4e58aeef85f0ae6aa44001eca SHA1 c69f9a26a3430cb4c2e6b58ac3242e1847bf6f9f SHA256 6376f7f374f0f93abbf5eb8079a83d41e7af48c015b839ee0691c9f32d112a3a
-MD5 884b77217bf1072fcdd6724d77c92927 fftw-2.1.5-r1.ebuild 4236
-RMD160 985d91248025ebb4e58aeef85f0ae6aa44001eca fftw-2.1.5-r1.ebuild 4236
-SHA256 6376f7f374f0f93abbf5eb8079a83d41e7af48c015b839ee0691c9f32d112a3a fftw-2.1.5-r1.ebuild 4236
+EBUILD fftw-2.1.5-r2.ebuild 4297 RMD160 661750e6db9a27449756c49214cce5cb30a4c24c SHA1 9f4d6e66717f82ad835f132269ecd126702aef15 SHA256 e893b87c6e84461bd43c273a2462b34292daa86eea45a9e8eaf1f91366b9fe03
+MD5 39feb51aae4f8e3e7eb94edf528b1913 fftw-2.1.5-r2.ebuild 4297
+RMD160 661750e6db9a27449756c49214cce5cb30a4c24c fftw-2.1.5-r2.ebuild 4297
+SHA256 e893b87c6e84461bd43c273a2462b34292daa86eea45a9e8eaf1f91366b9fe03 fftw-2.1.5-r2.ebuild 4297
 EBUILD fftw-3.0.1-r1.ebuild 2759 RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef SHA1 f6123e5e3501c6934d7c226988fb067b13f72bf3 SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8
 MD5 4a8f8342448809b69143f66d02e7f2d2 fftw-3.0.1-r1.ebuild 2759
 RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef fftw-3.0.1-r1.ebuild 2759
@@ -55,17 +55,17 @@ EBUILD fftw-3.1.ebuild 2151 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 SHA1
 MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151
 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151
 SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151
-MISC ChangeLog 10448 RMD160 db6588f11e3490a2fde42bea8401078e8e45d88a SHA1 de4cc3fe4569f158468f2cb881a6774c0a2708cb SHA256 0953b4e4f4736736e4fe61804a9ba6983a9953758898cc8baf18e31c994985b0
-MD5 6de77feb2d7921a5b8775419743d3028 ChangeLog 10448
-RMD160 db6588f11e3490a2fde42bea8401078e8e45d88a ChangeLog 10448
-SHA256 0953b4e4f4736736e4fe61804a9ba6983a9953758898cc8baf18e31c994985b0 ChangeLog 10448
+MISC ChangeLog 10708 RMD160 700f5bda857a6b3ff56ff80ac8fd18531ccf1f41 SHA1 5ebdba7b28596f8df967f8137c7521ed0c4f0a5c SHA256 f1f63bb3ea1c95e41d9ffbf0c4a65a0156f4b4335bbff753f4c78a3d0724ff8d
+MD5 572f245cacd1f01bb9b7a03001519b75 ChangeLog 10708
+RMD160 700f5bda857a6b3ff56ff80ac8fd18531ccf1f41 ChangeLog 10708
+SHA256 f1f63bb3ea1c95e41d9ffbf0c4a65a0156f4b4335bbff753f4c78a3d0724ff8d ChangeLog 10708
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
-MD5 e8cb5e91d1ddf875789f95dfbdce7059 files/digest-fftw-2.1.5-r1 235
-RMD160 a854a6665474fce2b3601a6d956ea2c63bb77376 files/digest-fftw-2.1.5-r1 235
-SHA256 b7f8db8489af7206824f9b6353bbae681a17d3cb089a42617d0cfa425e78e5c6 files/digest-fftw-2.1.5-r1 235
+MD5 e8cb5e91d1ddf875789f95dfbdce7059 files/digest-fftw-2.1.5-r2 235
+RMD160 a854a6665474fce2b3601a6d956ea2c63bb77376 files/digest-fftw-2.1.5-r2 235
+SHA256 b7f8db8489af7206824f9b6353bbae681a17d3cb089a42617d0cfa425e78e5c6 files/digest-fftw-2.1.5-r2 235
 MD5 d79d7261a50d0b3c10659e5beacd0ab4 files/digest-fftw-3.0.1 235
 RMD160 583f42a9b329e5113a76834c8e94fd33d162faf6 files/digest-fftw-3.0.1 235
 SHA256 312aec81b01e5fc0f42721ef933f2f89347d8e3d27c07394ddbc717be7577368 files/digest-fftw-3.0.1 235
diff --git a/sci-libs/fftw/fftw-2.1.5-r1.ebuild b/sci-libs/fftw/fftw-2.1.5-r1.ebuild
deleted file mode 100644
index 2f9d8d4080c6..000000000000
--- a/sci-libs/fftw/fftw-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.10 2006/10/22 18:10:34 ribosome Exp $
-
-inherit flag-o-matic multilib
-
-IUSE="mpi"
-
-DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)"
-SRC_URI="http://www.fftw.org/${P}.tar.gz"
-HOMEPAGE="http://www.fftw.org"
-
-DEPEND="mpi? ( >=sys-cluster/lam-mpi-6.5.6 )"
-SLOT="2.1"
-LICENSE="GPL-2"
-
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-pkg_setup() {
-	#this one is reported to cause trouble on pentium4 m series
-	filter-mfpmath "sse"
-
-	#here I need (surprise) to increase optimization:
-	#--enable-i386-hacks requires -fomit-frame-pointer to work properly
-	if [ "${ARCH}" != "amd64" ]; then
-		is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-	fi
-
-	einfo ""
-	einfo "This ebuild installs double and single precision versions of library"
-	einfo "This involves some name mangling, as supported by package and required"
-	einfo "by some apps that use it."
-	einfo "By default, the symlinks to non-mangled names will be created off"
-	einfo "double-precision version. In order to symlink to single-precision use"
-	einfo "SINGLE=yes emerge fftw"
-	einfo ""
-}
-
-src_unpack() {
-	#doc suggests installing single and double precision versions via separate compilations
-	#will do in two separate source trees
-	#since some sed'ing is done during the build (?if --enable-type-prefix is set?)
-
-	unpack "${P}.tar.gz"
-	cd "${WORKDIR}"
-	mv ${P} ${P}-single
-
-	unpack "${P}.tar.gz"
-	cd "${WORKDIR}"
-	mv ${P} ${P}-double
-}
-
-
-src_compile() {
-	local myconf=""
-	use mpi && myconf="${myconf} --enable-mpi"
-
-	if [ "${ARCH}" == "amd64" ]; then
-		myconf="${myconf} --disable-i386-hacks"
-	else
-		myconf="${myconf} --enable-i386-hacks"
-	fi
-
-	#mpi is not a valid flag yet. In this revision it is used merely to block --enable-mpi option
-	#it might be needed if it is decided that lam is an optional dependence
-
-	cd "${S}-single"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	econf \
-		--enable-shared \
-		--enable-threads \
-		--enable-type-prefix \
-		--enable-float \
-		--enable-vec-recurse \
-		${myconf} || die "./configure failed"
-	emake || die
-
-	#the only difference here is no --enable-float
-	cd "${S}-double"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	econf \
-		--enable-shared \
-		--enable-threads \
-		--enable-type-prefix \
-		--enable-vec-recurse \
-		${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	#both builds are installed in the same place
-	#libs are distinguished by preffix (s or d), see docs for details
-	cd "${S}-single"
-
-	make DESTDIR=${D} install || die
-
-	cd "${S}-double"
-
-	# fix info file
-	local infofile
-	for infofile in doc/fftw*info*; do
-		echo "INFO-DIR-SECTION Libraries" >>${infofile}
-		echo "START-INFO-DIR-ENTRY" >>${infofile}
-		echo "* fftw: (fftw).                  C subroutine library for computing the Discrete Fourier Transform (DFT)" >>${infofile}
-		echo "END-INFO-DIR-ENTRY" >>${infofile}
-	done
-	make DESTDIR=${D} install || die
-
-	# Install documentation.
-	cd "${S}-single"
-
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS  TODO
-	dohtml doc/fftw*.html
-
-	if [ "$SINGLE" = "yes" ]; then
-		cd ${D}usr/include
-		dosym sfftw.h /usr/include/fftw.h
-		dosym srfftw.h /usr/include/rfftw.h
-		dosym sfftw_threads.h /usr/include/fftw_threads.h
-		dosym srfftw_threads.h /usr/include/rfftw_threads.h
-		cd ${D}usr/$(get_libdir)
-		dosym libsfftw.so /usr/$(get_libdir)/libfftw.so
-		dosym libsrfftw.so /usr/$(get_libdir)/librfftw.so
-		dosym libsfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
-		dosym libsrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
-	else
-		cd ${D}usr/include
-		dosym dfftw.h /usr/include/fftw.h
-		dosym drfftw.h /usr/include/rfftw.h
-		dosym dfftw_threads.h /usr/include/fftw_threads.h
-		dosym drfftw_threads.h /usr/include/rfftw_threads.h
-		cd ${D}usr/$(get_libdir)
-		dosym libdfftw.so /usr/$(get_libdir)/libfftw.so
-		dosym libdrfftw.so /usr/$(get_libdir)/librfftw.so
-		dosym libdfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
-		dosym libdrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
-	fi
-
-	cd "${S}-single/fortran"
-	insinto usr/include
-	doins fftw_f77.i
-}
diff --git a/sci-libs/fftw/files/digest-fftw-2.1.5-r1 b/sci-libs/fftw/files/digest-fftw-2.1.5-r1
deleted file mode 100644
index 949efaeda653..000000000000
--- a/sci-libs/fftw/files/digest-fftw-2.1.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz 1256888
-RMD160 723308722d76c12710db6473979adf8d086b0909 fftw-2.1.5.tar.gz 1256888
-SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 fftw-2.1.5.tar.gz 1256888