Fixup autotools wrt bug #205018, remove old.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

6 files changed, 13 insertions, 241 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/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() {