Fixup autotools wrt bug #205018, remove old.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

7 files changed, 15 insertions, 251 deletions

diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index e29caad603cd..a4ac28277d8f 100644
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/siege
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.43 2007/10/26 18:59:34 nixnut Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.44 2008/07/05 09:11:37 loki_val Exp $
+
+  05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> -siege-2.60.ebuild,
+  -siege-2.61-r1.ebuild, -siege-2.64-r1.ebuild, -siege-2.65.ebuild,
+  siege-2.66.ebuild:
+  Fixup autotools wrt bug #205018, remove old.
 
   26 Oct 2007; nixnut <nixnut@gentoo.org> siege-2.66.ebuild:
   Stable on ppc wrt bug 196572
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index c86ff497d10c..b2a5e3dcdec2 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,14 +1,6 @@
 AUX siege-2.60-gentoo.diff 1740 RMD160 33d69561f9c790d7c3d6783743ae69768022f8ad SHA1 f02341c4de8d49d6febca495b48a15616d74d813 SHA256 26efc21c9ba60e8b92428eddd8113586e41e8dc71ade8f32a26415105df301ae
 AUX siege.bash-completion 783 RMD160 79348616a55fa1e810cb5c8d1bfba21e9970dc80 SHA1 688b05dd4a5004f6775d507b3b0f21fa1424ab66 SHA256 a7e54183dc7a6e0032683c3801b5eaa494ebe4356ff1a3cb09391bce7c30ad25
-DIST siege-2.60.tar.gz 375480 RMD160 4b9e6797412080ae964ecb3a0fd9fb672679d7ba SHA1 d63636d528587a1fe3ed59da09fb768fdbb9a4ae SHA256 80c393511fa015370c939a4d8c12737d40e77f6b81b11182127d87890e622fd5
-DIST siege-2.61.tar.gz 375910 RMD160 50dc36f4ec33acf81040404c02a6c436c92291a3 SHA1 a5ae78b201aa2f9b205f1b494e2d7a445fe30bc7 SHA256 9b49a4559f578b8a1b9dda49bbb3f12bd2a0dbf9b4694fcd06d3e2751eee9d35
-DIST siege-2.64.tar.gz 480612 RMD160 6447871f20c04cb3ef39930569071a67d1bfe985 SHA1 0c8167a7606a0f633835f1ce3b0914ac7e91e742 SHA256 063888555b2fbf362440496397da6e0ccf724fed9b990135231dec5b8bb5f47e
-DIST siege-2.65.tar.gz 472720 RMD160 6e42262b02983caff84feada3e833082a479b1bc SHA1 51a6474427288db122171611d3a89fc30bbbf94d SHA256 5595ee6789c7fc603a5cac326922de1a4bd0d09a79c7e44ddc927cc5ea382e9e
 DIST siege-2.66.tar.gz 478161 RMD160 25cd395432477cda02d04da3b7c72e6c15008714 SHA1 06c5fa98a4522b37281c7fc0b66dd904cd2962fc SHA256 c4b4aefc94e42f6817445ea88725b8058fcb87d238c1b3a7f9f3d21cde057be5
-EBUILD siege-2.60.ebuild 1463 RMD160 b2d253c82013093a71448a07afd29aa2c96deaa8 SHA1 a3a173a1283293eefcf8ef88dad23c8abdf39152 SHA256 bca236e7e740c8a2f084ac8680fc8c827853a761c71f2bb983ec1adfb13da604
-EBUILD siege-2.61-r1.ebuild 1495 RMD160 9959a5270896e62dd1fcae8fbd4273bbcb08446d SHA1 c45872598923494d2b84a96cb2a276ff904e25f4 SHA256 6aab6ea71751d5645e9a0f4123682f70bcbf21a5d3a3ab5eb6431c533e7c4cb2
-EBUILD siege-2.64-r1.ebuild 1758 RMD160 fa6f5d2a8a02f5c2dfefd4f883c4c66d6aef255b SHA1 0cb68d9f9627ef1b6822f32ae07eed9282724e29 SHA256 b7348ca8e544900d8752b0c6cba6529a36b33d08ba447fdf30fc1a8c6d405984
-EBUILD siege-2.65.ebuild 1755 RMD160 09e92e3673d60ac7b8343a431ada72affb79d930 SHA1 e6ea3875abb95a00780258e52385294b6d3b2b80 SHA256 af83aa90cdc3f6775d8a10b065706eebacc6384f5013617924b0edf1756b31f5
-EBUILD siege-2.66.ebuild 1759 RMD160 136a43325f41ffef702808e35ae6d0273b64c7be SHA1 d790e987f709c54a6ab128fa7f52cff7494e762d SHA256 7c8260da99db95017d299b95e15294fe8fc3eb54bbeb152c2f43f57b9c872cec
-MISC ChangeLog 5333 RMD160 9f92b5831e72c0ef1f56a6149bcf12f8feeecd99 SHA1 48198cdc5b6eb337ae9e9d9de94566f791fcd490 SHA256 7e1783f9d375c2ea2e3d27cb15a43cdf783ab5977388c5888e8ffad35eb4592a
+EBUILD siege-2.66.ebuild 1765 RMD160 a61d3886c9b7fe6ce6cd23440d1f03ffebe5937e SHA1 f39962e443e22a2965df9cda5eb24ee1b6c31ff9 SHA256 67f360c1a3be5552700989c78fce0d65d4bee850120a938579af50f99c5f4ab6
+MISC ChangeLog 5545 RMD160 1edbd570acf506789adbbdfe8aa861e0d75af42c SHA1 9521f138ad4c7ab153f62b9264d0b106a90d52fc SHA256 98e3386a59ffcd28632dac79cf3892561c89d03ddb5ba3ba314597cf0cbbf065
 MISC metadata.xml 164 RMD160 80582ab33b0b579ef4d41eb9899dbc2a5904566c SHA1 ad15e5d3d68ce39107636b39a2bcc6a847ab45dd SHA256 d1c053798bce14287e6955dac28fa5fc6c7415449545b2922f4d30fe4d84894c
diff --git a/app-benchmarks/siege/siege-2.60.ebuild b/app-benchmarks/siege/siege-2.60.ebuild
deleted file mode 100644
index 058088932750..000000000000
--- a/app-benchmarks/siege/siege-2.60.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.60.ebuild,v 1.13 2007/01/23 15:51:26 genone Exp $
-
-inherit eutils bash-completion
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
-SRC_URI="ftp://sid.joedog.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~amd64"
-SLOT="0"
-IUSE="ssl"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	einfo "Running autoreconf"
-	autoreconf || die "autoreconf failed"
-	econf $(use_with ssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# bug 111057 - siege.config utility uses ${} which gets
-	# 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
-
-	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}
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed as"
-	elog "/usr/share/doc/${PF}/siegerc-example.gz"
-	bash-completion_pkg_postinst
-}
diff --git a/app-benchmarks/siege/siege-2.61-r1.ebuild b/app-benchmarks/siege/siege-2.61-r1.ebuild
deleted file mode 100644
index 606f73a9fee0..000000000000
--- a/app-benchmarks/siege/siege-2.61-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 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.4 2007/01/23 15:51:26 genone Exp $
-
-inherit eutils bash-completion autotools
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
-SRC_URI="ftp://sid.joedog.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 mips ppc x86"
-SLOT="0"
-IUSE="ssl"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/"${PN}-2.60-gentoo.diff
-	export WANT_AUTOMAKE="1.5"
-	eautoreconf || die "autoreconf failed"
-}
-
-src_compile() {
-	econf $(use_with ssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# bug 111057 - siege.config utility uses ${} which gets
-	# 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
-
-	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}
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed as"
-	elog "/usr/share/doc/${PF}/siegerc-example.gz"
-	bash-completion_pkg_postinst
-}
diff --git a/app-benchmarks/siege/siege-2.64-r1.ebuild b/app-benchmarks/siege/siege-2.64-r1.ebuild
deleted file mode 100644
index 027454f1b50f..000000000000
--- a/app-benchmarks/siege/siege-2.64-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.64-r1.ebuild,v 1.3 2007/01/23 15:51:26 genone Exp $
-
-inherit eutils bash-completion
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
-SRC_URI="ftp://sid.joedog.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug ssl"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-2.60-gentoo.diff
-
-	# use of \b causes the T in "Transactions" to be displayed
-	# on the last column of the previous line.
-	sed -i 's/\\b\(Transactions:\)/\1/' src/main.c || \
-		die "sed src/main.c failed"
-
-	automake || die "automake failed"
-}
-
-src_compile() {
-	local myconf
-	use ssl && myconf="--with-ssl=/usr" || myconf="--without-ssl"
-
-	econf ${myconf} \
-		$(use_with debug debugging) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# bug 111057 - siege.config utility uses ${} which gets
-	# 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
-
-	dodoc AUTHORS ChangeLog INSTALL MACHINES README* KNOWNBUGS \
-		siegerc-example urls.txt || die "dodoc failed"
-	dobashcompletion ${FILESDIR}/${PN}.bash-completion
-
-	for x in $(find ${D}/usr/bin -name '*.pl') ; do mv "${x}" "${x%.*}" ; done
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed as"
-	elog "/usr/share/doc/${PF}/siegerc-example.gz"
-	bash-completion_pkg_postinst
-}
diff --git a/app-benchmarks/siege/siege-2.65.ebuild b/app-benchmarks/siege/siege-2.65.ebuild
deleted file mode 100644
index 812b5727d5fc..000000000000
--- a/app-benchmarks/siege/siege-2.65.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.65.ebuild,v 1.2 2007/01/23 15:51:26 genone Exp $
-
-inherit eutils bash-completion
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
-SRC_URI="ftp://sid.joedog.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-SLOT="0"
-IUSE="debug ssl"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-2.60-gentoo.diff
-
-	# use of \b causes the T in "Transactions" to be displayed
-	# on the last column of the previous line.
-	sed -i 's/\\b\(Transactions:\)/\1/' src/main.c || \
-		die "sed src/main.c failed"
-
-	automake || die "automake failed"
-}
-
-src_compile() {
-	local myconf
-	use ssl && myconf="--with-ssl=/usr" || myconf="--without-ssl"
-
-	econf ${myconf} \
-		$(use_with debug debugging) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# bug 111057 - siege.config utility uses ${} which gets
-	# 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
-
-	dodoc AUTHORS ChangeLog INSTALL MACHINES README* KNOWNBUGS \
-		siegerc-example urls.txt || die "dodoc failed"
-	dobashcompletion ${FILESDIR}/${PN}.bash-completion
-
-	for x in $(find ${D}/usr/bin -name '*.pl') ; do mv "${x}" "${x%.*}" ; done
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed as"
-	elog "/usr/share/doc/${PF}/siegerc-example.gz"
-	bash-completion_pkg_postinst
-}
diff --git a/app-benchmarks/siege/siege-2.66.ebuild b/app-benchmarks/siege/siege-2.66.ebuild
index 62153c94b2eb..9b07a972de84 100644
--- a/app-benchmarks/siege/siege-2.66.ebuild
+++ b/app-benchmarks/siege/siege-2.66.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.66.ebuild,v 1.4 2007/10/26 18:59:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.66.ebuild,v 1.5 2008/07/05 09:11:37 loki_val Exp $
 
-inherit eutils bash-completion
+WANT_AUTOMAKE=1.9
+
+inherit eutils bash-completion autotools
 
 DESCRIPTION="A HTTP regression testing and benchmarking utility"
 HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
@@ -25,8 +27,7 @@ src_unpack() {
 	# on the last column of the previous line.
 	sed -i 's/\\b\(Transactions:\)/\1/' src/main.c || \
 		die "sed src/main.c failed"
-
-	automake || die "automake failed"
+	eautomake
 }
 
 src_compile() {