Marked .58 stable on x86 and version bumped to .59

5 files changed, 53 insertions, 26 deletions

diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index cd2e4673b1f6..6faea8b3918f 100644
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,27 +1,15 @@
 # ChangeLog for app-benchmarks/siege
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.6 2003/12/23 09:19:22 pyrania Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.7 2004/02/22 13:45:11 pyrania Exp $
 
-*siege-2.58 (23 Dec 2003)
+*siege-2.59 (22 Feb 2004)
 
-  23 Dec 2003; Markus Nigbur <pyrania@gentoo.org> siege-2.58.ebuild:
-  Version bump. Thanks to Brian O'Kelley (bug #35963)
+  22 Feb 2004; Markus Nigbur <pyrania@gentoo.org> siege-2.58.ebuild,
+  siege-2.59.ebuild:
+  Marked .58 stable on x86 and version bumped to .59
 
-  21 Oct 2003; Markus Nigbur <pyrania@gentoo.org> siege-2.55.ebuild:
-  Another openssl fix.
-
-  16 Oct 2003; Markus Nigbur <pyrania@gentoo.org> siege-2.55.ebuild:
-  Added patch to support openssl >=0.9.7. Thanks to kloeri for tracking it down
-  (bug 31126).
-
-*siege-2.55 (20 Jul 2002)
-
-  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
-
-  Added ppc keyword
-
-  20 Jul 2002; Bruce A. Locke <blocke@shivan.org> siege-2.55.ebuild, digest-siege-2.55:
-
-  Initial Version
+*siege-2.58-r1 22 Feb 2004
 
+  22 Feb 2004;  <> 
+  # INSERT ENTRY HERE
 
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 4363f846d333..12b85ef817fb 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,6 +1,8 @@
-MD5 0778cb499d79ba0e9e60550dba8169a7 siege-2.58.ebuild 1037
+MD5 a21966918c388f313c7d81a2870a26a0 siege-2.59.ebuild 1037
+MD5 c4418bdeda47dac33c59bb477d1a7157 siege-2.58.ebuild 1036
 MD5 7d0fde75d0a336ebe9f7e6a33d1f6197 siege-2.55.ebuild 1038
-MD5 2d1630b35521144c780c6f62d4d2bc47 ChangeLog 851
+MD5 a982b3238938c421f499deab8f53d328 ChangeLog 465
 MD5 4aebf8c1efbfd38b632e0861ccff739d files/siege-gentoo_openssl.patch 304
 MD5 f2fd20cd35c2a0514b5e37150182f32b files/digest-siege-2.55 62
 MD5 7601ce7e597322b08b4bd43b0f3b00ec files/digest-siege-2.58 62
+MD5 163ff997dbf4a1327327c037ae2d1a76 files/digest-siege-2.59 62
diff --git a/app-benchmarks/siege/files/digest-siege-2.59 b/app-benchmarks/siege/files/digest-siege-2.59
new file mode 100644
index 000000000000..b50f14fe50c5
--- /dev/null
+++ b/app-benchmarks/siege/files/digest-siege-2.59
@@ -0,0 +1 @@
+MD5 52bf3ae4d8e7bdec158a5ad16a6c66f0 siege-2.59.tar.gz 374921
diff --git a/app-benchmarks/siege/siege-2.58.ebuild b/app-benchmarks/siege/siege-2.58.ebuild
index 48876e141ad0..b6231e47ea2b 100644
--- a/app-benchmarks/siege/siege-2.58.ebuild
+++ b/app-benchmarks/siege/siege-2.58.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.58.ebuild,v 1.1 2003/12/23 09:19:22 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.58.ebuild,v 1.2 2004/02/22 13:45:11 pyrania Exp $
 
 DESCRIPTION="An http regression testing and benchmarking utility"
 SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
 HOMEPAGE="http://www.joedog.org/siege/"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 IUSE="ssl"
 
diff --git a/app-benchmarks/siege/siege-2.59.ebuild b/app-benchmarks/siege/siege-2.59.ebuild
new file mode 100644
index 000000000000..01f49690b60d
--- /dev/null
+++ b/app-benchmarks/siege/siege-2.59.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.59.ebuild,v 1.1 2004/02/22 13:45:11 pyrania Exp $
+
+DESCRIPTION="An http regression testing and benchmarking utility"
+SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
+HOMEPAGE="http://www.joedog.org/siege/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+IUSE="ssl"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
+
+src_compile() {
+	has_version '=dev-libs/openssl-0.9.7*' \
+		&& sed -i -e "s:^# include <openssl/e_os.h>::" src/ssl.h
+	local myconf
+	use ssl && myconf="--with-ssl" || myconf="--with-ssl=off"
+	econf ${myconf}
+	emake || die
+
+}
+
+src_install() {
+	# makefile tries to install into $HOME by default... bad monkey!
+	dodir /usr/share/doc/${P}
+
+	einstall SIEGERC="${D}/usr/share/doc/${P}/siegerc-example"
+
+	# all non-html docs must be gzip'd
+	gzip ${D}/usr/share/doc/${P}/siegerc-example
+
+	dodoc AUTHORS COPYING INSTALL KNOWNBUGS NEWS MACHINES README
+}