fixed automake dependency as per bug #148797

Package-Manager: portage-2.1.2_pre1

4 files changed, 56 insertions, 21 deletions

diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index 1254fb507d38..9699f8b331a5 100644
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-benchmarks/siege
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.34 2005/11/03 21:55:37 ka0ttic Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.35 2006/09/23 22:31:59 dragonheart Exp $
+
+  23 Sep 2006; Daniel Black <dragonheart@gentoo.org> siege-2.61-r1.ebuild:
+  fixed automake dependency as per bug #148797 thanks Patrick Lauer
 
 *siege-2.64-r1 (03 Nov 2005)
 *siege-2.61-r1 (03 Nov 2005)
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 119c7a69f3c3..33014575b858 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,20 +1,50 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1c12fd3bf518072159b08c6c469ff0e3 ChangeLog 4106
-MD5 1185a0d2d8ac987001f575f8eb302327 files/digest-siege-2.60 62
-MD5 777c4d7f0fca11bdfc849cb76422dde9 files/digest-siege-2.61-r1 62
-MD5 6f081910176735dfe5a4ab9bcc7203c2 files/digest-siege-2.64-r1 62
+AUX siege-2.60-gentoo.diff 1740 RMD160 33d69561f9c790d7c3d6783743ae69768022f8ad SHA1 f02341c4de8d49d6febca495b48a15616d74d813 SHA256 26efc21c9ba60e8b92428eddd8113586e41e8dc71ade8f32a26415105df301ae
 MD5 9e437904b960c0cab42d691c8678774b files/siege-2.60-gentoo.diff 1740
+RMD160 33d69561f9c790d7c3d6783743ae69768022f8ad files/siege-2.60-gentoo.diff 1740
+SHA256 26efc21c9ba60e8b92428eddd8113586e41e8dc71ade8f32a26415105df301ae files/siege-2.60-gentoo.diff 1740
+AUX siege.bash-completion 783 RMD160 79348616a55fa1e810cb5c8d1bfba21e9970dc80 SHA1 688b05dd4a5004f6775d507b3b0f21fa1424ab66 SHA256 a7e54183dc7a6e0032683c3801b5eaa494ebe4356ff1a3cb09391bce7c30ad25
 MD5 16fc2e7263b085c5c027844be0fdc63f files/siege.bash-completion 783
-MD5 15d8ee1460109dffd23fe7d243b750bd metadata.xml 257
+RMD160 79348616a55fa1e810cb5c8d1bfba21e9970dc80 files/siege.bash-completion 783
+SHA256 a7e54183dc7a6e0032683c3801b5eaa494ebe4356ff1a3cb09391bce7c30ad25 files/siege.bash-completion 783
+DIST siege-2.60.tar.gz 375480
+DIST siege-2.61.tar.gz 375910 RMD160 50dc36f4ec33acf81040404c02a6c436c92291a3 SHA1 a5ae78b201aa2f9b205f1b494e2d7a445fe30bc7 SHA256 9b49a4559f578b8a1b9dda49bbb3f12bd2a0dbf9b4694fcd06d3e2751eee9d35
+DIST siege-2.64.tar.gz 480612
+EBUILD siege-2.60.ebuild 1460 RMD160 4b21c8f1ac6008a41b8b19de8ad271007fe6f26a SHA1 779732846b086c1254e996326dee112046228bcb SHA256 ade1381741c98129bb1691541dfbd8a9a82f24ba9cf2c75e7097e4d48c09d972
 MD5 58eac526181cbc7c3337fdaea49ab8ab siege-2.60.ebuild 1460
-MD5 019e0f9aa2b1a87a40e64af38cbb1579 siege-2.61-r1.ebuild 1473
+RMD160 4b21c8f1ac6008a41b8b19de8ad271007fe6f26a siege-2.60.ebuild 1460
+SHA256 ade1381741c98129bb1691541dfbd8a9a82f24ba9cf2c75e7097e4d48c09d972 siege-2.60.ebuild 1460
+EBUILD siege-2.61-r1.ebuild 1496 RMD160 0b5454333f00e94b993575d060b466bfc2f6e573 SHA1 d6adcfe7bb874d0e3d89fd4b33540e0ed6272519 SHA256 a0b6aecf44f4671565df4a0ba983a7611094bde0c118032db79cc7e4e890a1fe
+MD5 f281bbcf878c574d17b0de8043854b76 siege-2.61-r1.ebuild 1496
+RMD160 0b5454333f00e94b993575d060b466bfc2f6e573 siege-2.61-r1.ebuild 1496
+SHA256 a0b6aecf44f4671565df4a0ba983a7611094bde0c118032db79cc7e4e890a1fe siege-2.61-r1.ebuild 1496
+EBUILD siege-2.64-r1.ebuild 1755 RMD160 81708141d04308476ee66ad9e101ba89f0fb9599 SHA1 d251678e539518bf7ed746ff3c97c0b29d2b12f9 SHA256 450ec7103c9083527b4fc89a23feb9da07d552e2a245ec385951a063a37b9d13
 MD5 2563ad7345d9ca9ffcd5a1f566523858 siege-2.64-r1.ebuild 1755
+RMD160 81708141d04308476ee66ad9e101ba89f0fb9599 siege-2.64-r1.ebuild 1755
+SHA256 450ec7103c9083527b4fc89a23feb9da07d552e2a245ec385951a063a37b9d13 siege-2.64-r1.ebuild 1755
+MISC ChangeLog 4254 RMD160 e988c4f5dfb792a75c0ba84e17414c5188795982 SHA1 d6d938cdf0e3202f656be7a863903017e02ed5e7 SHA256 d29ef33c4a43926826125bfab1258772a157223fe76692ecf541cc535d961761
+MD5 d4ec5c0eb8787643f75ab1b0415a16dd ChangeLog 4254
+RMD160 e988c4f5dfb792a75c0ba84e17414c5188795982 ChangeLog 4254
+SHA256 d29ef33c4a43926826125bfab1258772a157223fe76692ecf541cc535d961761 ChangeLog 4254
+MISC metadata.xml 257 RMD160 086d490cb2f6baa752e296a7281484d8457a2dbd SHA1 da7eaace8a524b51ff64e6b739338368f0051336 SHA256 adedbf0a4b24d158d11a66c694d49cb9b399ecb37810d1e16f3743d5b64f0d60
+MD5 15d8ee1460109dffd23fe7d243b750bd metadata.xml 257
+RMD160 086d490cb2f6baa752e296a7281484d8457a2dbd metadata.xml 257
+SHA256 adedbf0a4b24d158d11a66c694d49cb9b399ecb37810d1e16f3743d5b64f0d60 metadata.xml 257
+MD5 1185a0d2d8ac987001f575f8eb302327 files/digest-siege-2.60 62
+RMD160 ca5df751b59ddf9cfd1e3f3a6bc1bae230a770a9 files/digest-siege-2.60 62
+SHA256 5a2ace86e8cd87a3c8d0638464d38016aabb5cfc14e4c7eabc492a2de524f139 files/digest-siege-2.60 62
+MD5 09bbe5460dd93993ef79f680f7784006 files/digest-siege-2.61-r1 232
+RMD160 3c21a42dced32d0796f006cd4fbf7343047cb352 files/digest-siege-2.61-r1 232
+SHA256 b2240e9b5a38247d89a41983b2cead476dcb10a099aed153a1e7278ab020e49a files/digest-siege-2.61-r1 232
+MD5 6f081910176735dfe5a4ab9bcc7203c2 files/digest-siege-2.64-r1 62
+RMD160 1b82b12a5decc53281212a8d705e73c4050990ce files/digest-siege-2.64-r1 62
+SHA256 42e64b0fe34fe44f90c1a6712779316777c6acbd1e2dd92e508ebd0dc1d75db3 files/digest-siege-2.64-r1 62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDaodpEZCkKN40op4RAlIpAJ9dJFy+iD2qoKonlrX9iHVJdAnUngCfWfxy
-p9+/DDq6uN+jrNWj5tleKsU=
-=Aw0Z
+iD8DBQFFFbhpmdTrptrqvGERAuwUAJ4q1wKdiG0ndSVKp6QhHguNcmQyIgCeKjnG
+pZAbTirUD6JptVrW+es2eFI=
+=2iBw
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/siege/files/digest-siege-2.61-r1 b/app-benchmarks/siege/files/digest-siege-2.61-r1
index 0be92fb9f502..6e48faaf4d23 100644
--- a/app-benchmarks/siege/files/digest-siege-2.61-r1
+++ b/app-benchmarks/siege/files/digest-siege-2.61-r1
@@ -1 +1,3 @@
 MD5 ab523ff9bd2daed416038d1774656e4a siege-2.61.tar.gz 375910
+RMD160 50dc36f4ec33acf81040404c02a6c436c92291a3 siege-2.61.tar.gz 375910
+SHA256 9b49a4559f578b8a1b9dda49bbb3f12bd2a0dbf9b4694fcd06d3e2751eee9d35 siege-2.61.tar.gz 375910
diff --git a/app-benchmarks/siege/siege-2.61-r1.ebuild b/app-benchmarks/siege/siege-2.61-r1.ebuild
index 3695262c2feb..93b82d2d8a8b 100644
--- a/app-benchmarks/siege/siege-2.61-r1.ebuild
+++ b/app-benchmarks/siege/siege-2.61-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.61-r1.ebuild,v 1.1 2005/11/03 21:55:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.61-r1.ebuild,v 1.2 2006/09/23 22:31:59 dragonheart Exp $
 
-inherit eutils bash-completion
+inherit eutils bash-completion autotools
 
 DESCRIPTION="A HTTP regression testing and benchmarking utility"
 HOMEPAGE="http://www.joedog.org/siege/"
@@ -19,13 +19,13 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.60-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/"${PN}-2.60-gentoo.diff
+	export WANT_AUTOMAKE="1.5"
+	eautoreconf || die "autoreconf failed"
 }
 
 src_compile() {
-	einfo "Running autoreconf"
-	autoreconf || die "autoreconf failed"
 	econf $(use_with ssl) || die "econf failed"
 	emake || die "emake failed"
 }
@@ -37,12 +37,12 @@ src_install() {
 	# interpreted by bash sending the contents to stderr
 	# instead of ${HOME}/.siegerc
 	sed -i -e 's|\${}|\\${}|' -e 's|\$(HOME)|\\$(HOME)|' \
-		${D}/usr/bin/siege.config
+		"${D}"/usr/bin/siege.config
 
 	dodoc AUTHORS ChangeLog INSTALL MACHINES README KNOWNBUGS \
 		siegerc-example urls.txt || die "dodoc failed"
 	use ssl && dodoc README.https
-	dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN}
+	dobashcompletion "${FILESDIR}"/${PN}.bash-completion ${PN}
 }
 
 pkg_postinst() {