Cleaned up 2.60; removed old ebuilds/patch

8 files changed, 21 insertions, 112 deletions

diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index 0603a81591f8..32c1c805fc6f 100644
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/siege
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.14 2004/09/18 13:30:13 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.15 2004/09/20 10:55:39 ka0ttic Exp $
+
+  20 Sep 2004; Aaron Walker <ka0ttic@gentoo.org>
+  -files/siege-gentoo_openssl.patch, -siege-2.55.ebuild, -siege-2.58.ebuild,
+  siege-2.60.ebuild:
+  Cleaned up 2.60; removed old ebuilds/patch
 
   18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> siege-2.60.ebuild:
   Versions <2.60 are pretty buggy (segfault often), so marking 2.60 stable on x86
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index e70697588be7..343d48fc8c31 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,11 +1,6 @@
-MD5 35bb76a698e4a53a0790d523082596ce ChangeLog 1116
-MD5 bdb6314b7b3d6743ef6569d5a91b8fe9 siege-2.55.ebuild 1045
-MD5 a42805f753e9a301535d6c443e52a5f2 siege-2.58.ebuild 1042
 MD5 904a71f83c784ae52d61439531dbbd0b siege-2.59.ebuild 1043
-MD5 2161b9a567fa9fa45fb421818fd8ebb9 siege-2.60.ebuild 1047
+MD5 69aa94eba0815ccacb1dacc8fac904e1 siege-2.60.ebuild 683
+MD5 2f439a74a5e1ab931b5ee8a390a33f29 ChangeLog 1309
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 f2fd20cd35c2a0514b5e37150182f32b files/digest-siege-2.55 62
-MD5 7601ce7e597322b08b4bd43b0f3b00ec files/digest-siege-2.58 62
 MD5 163ff997dbf4a1327327c037ae2d1a76 files/digest-siege-2.59 62
-MD5 4aebf8c1efbfd38b632e0861ccff739d files/siege-gentoo_openssl.patch 304
 MD5 1185a0d2d8ac987001f575f8eb302327 files/digest-siege-2.60 62
diff --git a/app-benchmarks/siege/files/digest-siege-2.55 b/app-benchmarks/siege/files/digest-siege-2.55
deleted file mode 100644
index 3758e9ad82b8..000000000000
--- a/app-benchmarks/siege/files/digest-siege-2.55
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fb07257e7cf58c8a69fd81f20be5b2eb siege-2.55.tar.gz 344618
diff --git a/app-benchmarks/siege/files/digest-siege-2.58 b/app-benchmarks/siege/files/digest-siege-2.58
deleted file mode 100644
index 4559e0d60275..000000000000
--- a/app-benchmarks/siege/files/digest-siege-2.58
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91dadcb43cab9fc4739eef54acd87a38 siege-2.58.tar.gz 374263
diff --git a/app-benchmarks/siege/files/siege-gentoo_openssl.patch b/app-benchmarks/siege/files/siege-gentoo_openssl.patch
deleted file mode 100644
index efe9bb712a8f..000000000000
--- a/app-benchmarks/siege/files/siege-gentoo_openssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sl.h	2003-10-15 02:41:38.776399904 +0200
-+++ src/ssl.h	2003-10-15 02:41:54.941942368 +0200
-@@ -30,7 +30,7 @@
- #include <pthread.h>
- 
- #ifdef HAVE_SSL
--# include <openssl/e_os.h>
-+# include <openssl/e_os2.h>
- # include <openssl/lhash.h>
- # include <openssl/crypto.h>
- # include <openssl/buffer.h>
diff --git a/app-benchmarks/siege/siege-2.55.ebuild b/app-benchmarks/siege/siege-2.55.ebuild
deleted file mode 100644
index 443592172e4e..000000000000
--- a/app-benchmarks/siege/siege-2.55.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.55.ebuild,v 1.13 2004/06/24 21:29:04 agriffis Exp $
-
-DESCRIPTION="An http regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/siege/"
-SRC_URI="ftp://ftp.armstrong.com/pub/siege/${P}.tar.gz"
-
-KEYWORDS="x86 ppc"
-SLOT="0"
-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} || die "econf failed"
-	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 INSTALL KNOWNBUGS NEWS MACHINES README
-}
diff --git a/app-benchmarks/siege/siege-2.58.ebuild b/app-benchmarks/siege/siege-2.58.ebuild
deleted file mode 100644
index 0187cd4445cb..000000000000
--- a/app-benchmarks/siege/siege-2.58.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.5 2004/06/24 21:29:04 agriffis Exp $
-
-DESCRIPTION="An http regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/siege/"
-SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-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} || die "econf failed"
-	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 INSTALL KNOWNBUGS NEWS MACHINES README
-}
diff --git a/app-benchmarks/siege/siege-2.60.ebuild b/app-benchmarks/siege/siege-2.60.ebuild
index 326c5d9f3d82..bfb81a203d43 100644
--- a/app-benchmarks/siege/siege-2.60.ebuild
+++ b/app-benchmarks/siege/siege-2.60.ebuild
@@ -1,36 +1,30 @@
 # Copyright 1999-2004 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.3 2004/09/18 13:30:13 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.60.ebuild,v 1.4 2004/09/20 10:55:39 ka0ttic Exp $
 
-DESCRIPTION="An http regression testing and benchmarking utility"
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
 HOMEPAGE="http://www.joedog.org/siege/"
-SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
+SRC_URI="ftp://sid.joedog.org/pub/${PN}/${P}.tar.gz"
 
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 SLOT="0"
-LICENSE="GPL-2"
 IUSE="ssl"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
 
 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} || die "econf failed"
+	econf $(use_with ssl) || die
 	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 ChangeLog INSTALL KNOWNBUGS NEWS MACHINES README
+	emake DESTDIR="${D}" \
+		SIEGERC="${S}/siegerc-example" \
+		install || die
+	dodoc AUTHORS ChangeLog INSTALL MACHINES README \
+		KNOWNBUGS siegerc-example
+	use ssl && dodoc README.https
 }