Fix broken autotools handling.

Package-Manager: portage-2.1.2_rc4-r5

4 files changed, 48 insertions, 31 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 5c5b613fe2c5..1203997a6b0a 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.43 2006/11/03 14:59:37 ribosome Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.44 2007/01/04 18:17:10 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> fftw-2.1.5-r2.ebuild,
+  fftw-3.0.1-r2.ebuild:
+  Fix broken autotools handling.
 
 *fftw-2.1.5-r2 (03 Nov 2006)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 1dc23c8f6ca3..05fb07d93ee1 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3-tmpfile.patch 538 RMD160 e87f7b414a4cb9371c970bf140f87074f8024f25 SHA1 b2fc4017eabde077534c9ef1a9050b71c301014f SHA256 c51956fc0ce2bb25cf84e4929ab76de27dca47efeef659d57d7513e0099f99d1
 MD5 1395bb17e5d04e7050eab24d5b7b25d1 files/3-tmpfile.patch 538
 RMD160 e87f7b414a4cb9371c970bf140f87074f8024f25 files/3-tmpfile.patch 538
@@ -27,18 +30,18 @@ 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-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-2.1.5-r2.ebuild 4235 RMD160 afdb28446a84f0fde0c9848f16a91f431eadaa37 SHA1 349f3c387f74dc329dce41fc0d78e500211c88b4 SHA256 a63273c99130661f6f6a6a3265d46493ec3ae0b057e1596704599442f688cc44
+MD5 21e9fe2b01c9e36e44f08154beb02926 fftw-2.1.5-r2.ebuild 4235
+RMD160 afdb28446a84f0fde0c9848f16a91f431eadaa37 fftw-2.1.5-r2.ebuild 4235
+SHA256 a63273c99130661f6f6a6a3265d46493ec3ae0b057e1596704599442f688cc44 fftw-2.1.5-r2.ebuild 4235
 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
 SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8 fftw-3.0.1-r1.ebuild 2759
-EBUILD fftw-3.0.1-r2.ebuild 2973 RMD160 373b02df8e313351732609a56172fb0c9549799f SHA1 3b7e58d31221cf821ce0bc2521a06a4c66ad3a23 SHA256 9f59092765ac49da28b581058a38ffd99b6d839d7a7450bbf8d128317664eacb
-MD5 19a2a10f8939c09ccfc0c40ac7976aa5 fftw-3.0.1-r2.ebuild 2973
-RMD160 373b02df8e313351732609a56172fb0c9549799f fftw-3.0.1-r2.ebuild 2973
-SHA256 9f59092765ac49da28b581058a38ffd99b6d839d7a7450bbf8d128317664eacb fftw-3.0.1-r2.ebuild 2973
+EBUILD fftw-3.0.1-r2.ebuild 3005 RMD160 a1345fb026140017d000bb9a7441b33f1965f7ce SHA1 820e318b3387a4584de049772dbda649811fdb35 SHA256 c3a7a181429c0f4fb848e650a5df69a5e8442486d172a8651f3651e9c01573bc
+MD5 ddba46a6fd2f5b1f5e8ec13b3bbc3a04 fftw-3.0.1-r2.ebuild 3005
+RMD160 a1345fb026140017d000bb9a7441b33f1965f7ce fftw-3.0.1-r2.ebuild 3005
+SHA256 c3a7a181429c0f4fb848e650a5df69a5e8442486d172a8651f3651e9c01573bc fftw-3.0.1-r2.ebuild 3005
 EBUILD fftw-3.0.1.ebuild 2103 RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 SHA1 cfb4e8bb53f91a0629b8d0ed9c02ceb2efcd449b SHA256 9c0f3b39259be3d778db1d306e8fb712684a3f1d8b3f1189bbd38cadf10707c4
 MD5 1b3f7c7f367fa0164bf31ab90e61d8f5 fftw-3.0.1.ebuild 2103
 RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 fftw-3.0.1.ebuild 2103
@@ -55,10 +58,10 @@ 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 10708 RMD160 700f5bda857a6b3ff56ff80ac8fd18531ccf1f41 SHA1 5ebdba7b28596f8df967f8137c7521ed0c4f0a5c SHA256 f1f63bb3ea1c95e41d9ffbf0c4a65a0156f4b4335bbff753f4c78a3d0724ff8d
-MD5 572f245cacd1f01bb9b7a03001519b75 ChangeLog 10708
-RMD160 700f5bda857a6b3ff56ff80ac8fd18531ccf1f41 ChangeLog 10708
-SHA256 f1f63bb3ea1c95e41d9ffbf0c4a65a0156f4b4335bbff753f4c78a3d0724ff8d ChangeLog 10708
+MISC ChangeLog 10842 RMD160 997c6d9ef022f9d28d79c24a4d5ca333616a0000 SHA1 87ff92b5326dc9040e0a45b9c8a4bd3762088cc3 SHA256 3a74f9d3bcd0b6ac67ad3285b98acb2fc674945898489dcabcc66fd795e44007
+MD5 08d02e0b264b9a821ad49418ff5a6c56 ChangeLog 10842
+RMD160 997c6d9ef022f9d28d79c24a4d5ca333616a0000 ChangeLog 10842
+SHA256 3a74f9d3bcd0b6ac67ad3285b98acb2fc674945898489dcabcc66fd795e44007 ChangeLog 10842
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -84,3 +87,10 @@ SHA256 5756b978bf8b840ec07b71fe2caa22919afc66a970fa69e76ed20dfa96a72b1d files/di
 MD5 e03cdf0ef064939e4df4bdbc91efc583 files/digest-fftw-3.1.2 235
 RMD160 559ef1b1533981db0a1b926b8b689b3589a7fe2a files/digest-fftw-3.1.2 235
 SHA256 7aeabf836fd80094bd20daf14a0ca5778d6416887fc3f7a67b849643d12de0a1 files/digest-fftw-3.1.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnUSwAiZjviIA2XgRAhHaAKDUbkXTC8TiHak9v7xCx0i0rUJZSgCg9JPS
+XIgJNqa4ULJEWCx/nx4faLY=
+=wPGc
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-2.1.5-r2.ebuild b/sci-libs/fftw/fftw-2.1.5-r2.ebuild
index efc99d2af3a1..f5ce05b0aa88 100644
--- a/sci-libs/fftw/fftw-2.1.5-r2.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r2.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2006/11/03 14:59:37 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r2.ebuild,v 1.2 2007/01/04 18:17:10 flameeyes Exp $
 
-inherit flag-o-matic multilib libtool
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit flag-o-matic multilib libtool autotools
 
 IUSE="mpi"
 
@@ -42,12 +45,13 @@ src_unpack() {
 	#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
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	eautoreconf
 
-	unpack "${P}.tar.gz"
 	cd "${WORKDIR}"
-	mv ${P} ${P}-double
+	cp -R ${P} ${P}-double
+	mv ${P} ${P}-single
 }
 
 
@@ -65,8 +69,6 @@ src_compile() {
 	#it might be needed if it is decided that lam is an optional dependence
 
 	cd "${S}-single"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	libtoolize --copy --force
 	econf \
 		--enable-shared \
 		--enable-threads \
@@ -78,8 +80,6 @@ src_compile() {
 
 	#the only difference here is no --enable-float
 	cd "${S}-double"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	libtoolize --copy --force
 	econf \
 		--enable-shared \
 		--enable-threads \
@@ -103,7 +103,7 @@ src_install () {
 	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 "* 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
diff --git a/sci-libs/fftw/fftw-3.0.1-r2.ebuild b/sci-libs/fftw/fftw-3.0.1-r2.ebuild
index 8052ce286e74..c02226bfa5ad 100644
--- a/sci-libs/fftw/fftw-3.0.1-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.0.1-r2.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1-r2.ebuild,v 1.13 2006/07/17 02:49:10 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1-r2.ebuild,v 1.14 2007/01/04 18:17:10 flameeyes Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+
+inherit flag-o-matic eutils toolchain-funcs autotools
 
 DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)"
 HOMEPAGE="http://www.fftw.org/"
@@ -28,8 +31,8 @@ src_unpack() {
 		-i ${infofile} || die "failed to fix info files"
 	done
 
-	autoreconf
-	libtoolize --copy --force
+	eautoreconf
+
 	cd "${WORKDIR}"
 	use ppc-macos && epatch ${FILESDIR}/${PN}-ppc-macos.patch
 	mv ${P} ${P}-single