Version bump; 2.61 stable on mips.

(Portage version: 2.0.51.22-r2)

6 files changed, 36 insertions, 29 deletions

diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index 268bd7280643..e64b5ffa83b7 100644
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2005/08/11 01:48:59 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.31 2005/09/08 16:52:50 ka0ttic Exp $
+
+*siege-2.64_beta1 (08 Sep 2005)
+
+  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> siege-2.61.ebuild,
+  -siege-2.63_beta3.ebuild, +siege-2.64_beta1.ebuild:
+  Version bump; 2.61 stable on mips.
 
   11 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> siege-2.61.ebuild,
   siege-2.63_beta3.ebuild:
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 93dbb8c9eff7..066670b298cf 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 baa4d63469ca4b2292403a9e694d68c0 ChangeLog 3236
-MD5 15d8ee1460109dffd23fe7d243b750bd metadata.xml 257
 MD5 c8390cbc140a9b92aa12c49879d70e42 siege-2.60.ebuild 1230
-MD5 d06830959a74919a416e5e5156d3a70f siege-2.61.ebuild 1243
-MD5 0b3cc0f2815cb846d4df9a5d2c9062a1 siege-2.63_beta3.ebuild 1386
-MD5 1185a0d2d8ac987001f575f8eb302327 files/digest-siege-2.60 62
-MD5 777c4d7f0fca11bdfc849cb76422dde9 files/digest-siege-2.61 62
-MD5 1bb8e0418515255d53fd5966fcd2731b files/digest-siege-2.63_beta3 64
+MD5 c6a6a2ca865fe9d7f7defa1e74c66a82 siege-2.64_beta1.ebuild 1617
+MD5 f97313fc3281ede28c9f7ecd2b59332f ChangeLog 3429
+MD5 15d8ee1460109dffd23fe7d243b750bd metadata.xml 257
+MD5 1033842efeb81e4e54b05bd82418b3be siege-2.61.ebuild 1242
+MD5 2484681d7271e0b3d8dc0fd249681347 files/digest-siege-2.64_beta1 64
 MD5 9e437904b960c0cab42d691c8678774b files/siege-2.60-gentoo.diff 1740
 MD5 16fc2e7263b085c5c027844be0fdc63f files/siege.bash-completion 783
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC+q6eEZCkKN40op4RAkD2AKCD3fKcGYsDqwQbHRzqc5aQArnhLACeMFn4
-T0jpFv/QpE4gyf5uwi3yHqg=
-=AFfi
------END PGP SIGNATURE-----
+MD5 1185a0d2d8ac987001f575f8eb302327 files/digest-siege-2.60 62
+MD5 777c4d7f0fca11bdfc849cb76422dde9 files/digest-siege-2.61 62
diff --git a/app-benchmarks/siege/files/digest-siege-2.63_beta3 b/app-benchmarks/siege/files/digest-siege-2.63_beta3
deleted file mode 100644
index cef7b92a1f68..000000000000
--- a/app-benchmarks/siege/files/digest-siege-2.63_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 115e8832f700f0696bedace39c2149af siege-2.63b3.tar.gz 380292
diff --git a/app-benchmarks/siege/files/digest-siege-2.64_beta1 b/app-benchmarks/siege/files/digest-siege-2.64_beta1
new file mode 100644
index 000000000000..cbc0144cd11d
--- /dev/null
+++ b/app-benchmarks/siege/files/digest-siege-2.64_beta1
@@ -0,0 +1 @@
+MD5 c823e0aafbbb073934c493f5e216cc8b siege-2.64b1.tar.gz 380343
diff --git a/app-benchmarks/siege/siege-2.61.ebuild b/app-benchmarks/siege/siege-2.61.ebuild
index 51f7732788fe..e12813bbb1b5 100644
--- a/app-benchmarks/siege/siege-2.61.ebuild
+++ b/app-benchmarks/siege/siege-2.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.61.ebuild,v 1.7 2005/08/11 01:48:59 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.61.ebuild,v 1.8 2005/09/08 16:52:50 ka0ttic Exp $
 
 inherit eutils bash-completion
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.joedog.org/siege/"
 SRC_URI="ftp://sid.joedog.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ppc x86"
+KEYWORDS="~amd64 mips ppc x86"
 SLOT="0"
 IUSE="ssl"
 
diff --git a/app-benchmarks/siege/siege-2.63_beta3.ebuild b/app-benchmarks/siege/siege-2.64_beta1.ebuild
index 32c2fccca9e5..159ab3f01456 100644
--- a/app-benchmarks/siege/siege-2.63_beta3.ebuild
+++ b/app-benchmarks/siege/siege-2.64_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.63_beta3.ebuild,v 1.2 2005/08/11 01:48:59 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.64_beta1.ebuild,v 1.1 2005/09/08 16:52:50 ka0ttic Exp $
 
 inherit eutils bash-completion
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://sid.joedog.org/pub/${PN}/beta/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~mips ~ppc ~x86"
 SLOT="0"
-IUSE="ssl"
+IUSE="debug ssl"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
 RDEPEND="${DEPEND}
@@ -23,24 +23,35 @@ RDEPEND="${DEPEND}
 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() {
-	einfo "Running autoreconf"
-	autoreconf || die "autoreconf failed"
-	econf $(use_with ssl) || die "econf failed"
+	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"
-	dodoc AUTHORS ChangeLog INSTALL MACHINES README KNOWNBUGS \
+	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
+
+	for x in $(find ${D}/usr/bin -name '*.pl') ; do mv "${x}" "${x%.*}" ; done
 }
 
 pkg_postinst() {