Clean up

5 files changed, 6 insertions, 75 deletions

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index 9792413e3681..237dec76a38a 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/jmeter
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.10 2004/08/23 22:02:07 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.11 2004/08/23 22:03:33 zx Exp $
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org>
+  -files/jmeter-1.8.1-gentoo.diff, -jmeter-1.8.1.ebuild:
+  Clean up
 
 *jmeter-2.0.1 (23 Aug 2004)
 
diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index 3f7dbb068840..d4fac13354bf 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,9 +1,6 @@
-MD5 4de82b6731111e819f3201ceed796837 ChangeLog 2026
-MD5 6bb9b14e5696a27fae27031014c195a0 jmeter-1.8.1.ebuild 892
+MD5 8dd6f55048148638436066b8583be307 ChangeLog 2142
 MD5 c97c686cbc6ff06da185468aad4c954d jmeter-1.9.1.ebuild 940
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 900723f87168b8d26b7c04c258b238dd jmeter-2.0.1.ebuild 1006
-MD5 95c741b3cec21124a6ed8ebcac8f8aef files/digest-jmeter-1.8.1 206
 MD5 a62f7266e5fa7c30d2b82af95a3fea55 files/digest-jmeter-1.9.1 74
-MD5 39ba6f903ec77a9818e377eff831a0a3 files/jmeter-1.8.1-gentoo.diff 1221
 MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1 74
diff --git a/app-benchmarks/jmeter/files/digest-jmeter-1.8.1 b/app-benchmarks/jmeter/files/digest-jmeter-1.8.1
deleted file mode 100644
index a8920ab1958b..000000000000
--- a/app-benchmarks/jmeter/files/digest-jmeter-1.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39ba6f903ec77a9818e377eff831a0a3 /files/jmeter-1.8.1-gentoo.diff 1221
-MD5 d93fc43ba7d40888dc7d91e98786b8ae /jmeter-1.8.1.ebuild 946
-MD5 9d0a946461a05a20c1662a0c18203cd0 jakarta-jmeter-1.8.1.tgz 5077769
diff --git a/app-benchmarks/jmeter/files/jmeter-1.8.1-gentoo.diff b/app-benchmarks/jmeter/files/jmeter-1.8.1-gentoo.diff
deleted file mode 100644
index 68ea05ba54cb..000000000000
--- a/app-benchmarks/jmeter/files/jmeter-1.8.1-gentoo.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur jakarta-jmeter-1.8.1/bin/jmeter new/bin/jmeter
---- jakarta-jmeter-1.8.1/bin/jmeter	2003-01-28 14:22:52.000000000 -0500
-+++ new/bin/jmeter	2003-03-16 04:58:31.000000000 -0500
-@@ -1,3 +1,6 @@
- #! /bin/sh
- 
-+echo This program requires the Sun JDK 1.3.1 or later!
-+echo Other JDKs like IBM will not work!
-+
- java -Xincgc -jar `dirname $0`/ApacheJMeter.jar "$@"
-diff -ur jakarta-jmeter-1.8.1/bin/jmeter-server new/bin/jmeter-server
---- jakarta-jmeter-1.8.1/bin/jmeter-server	2003-01-28 14:22:52.000000000 -0500
-+++ new/bin/jmeter-server	2003-03-16 04:58:47.000000000 -0500
-@@ -1,3 +1,6 @@
- #!/bin/sh
- 
-+echo This program requires the Sun JDK 1.3.1 or later!
-+echo Other JDKs like IBM will not work!
-+
- `dirname $0`/jmeter -s
-diff -Nur jakarta-jmeter-1.8.1/jmeter new/jmeter
---- jakarta-jmeter-1.8.1/jmeter 1969-12-31 19:00:00.000000000 -0500
-+++ new/jmeter  2003-03-16 05:10:32.000000000 -0500
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+
-+/opt/jmeter/bin/jmeter "$@"
-diff -Nur jakarta-jmeter-1.8.1/jmeter-server new/jmeter-server
---- jakarta-jmeter-1.8.1/jmeter-server  1969-12-31 19:00:00.000000000 -0500
-+++ new/jmeter-server   2003-03-16 05:10:46.000000000 -0500
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+/opt/jmeter/bin/jmeter-server "$@"
diff --git a/app-benchmarks/jmeter/jmeter-1.8.1.ebuild b/app-benchmarks/jmeter/jmeter-1.8.1.ebuild
deleted file mode 100644
index e807e8ba057e..000000000000
--- a/app-benchmarks/jmeter/jmeter-1.8.1.ebuild
+++ /dev/null
@@ -1,33 +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/jmeter/jmeter-1.8.1.ebuild,v 1.12 2004/06/24 21:28:19 agriffis Exp $
-
-inherit eutils
-
-MY_P=jakarta-${P}
-S=${WORKDIR}/${MY_P}
-DOWNLOAD="v1.8/${MY_P}.tgz"
-DESCRIPTION="Load test and measure performance on HTTP/FTP services, and databases."
-HOMEPAGE="http://jakarta.apache.org/jmeter/index.html"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-jmeter/release/${DOWNLOAD}"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="doc"
-
-DEPEND=">=dev-java/sun-jdk-1.3.1"
-RDEPEND=">=dev-java/sun-jdk-1.3.1"
-
-src_compile () {
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_install () {
-	DIROPTIONS="--mode=0775"
-	dodir /opt/${PN}
-	cp -ar bin/ lib/ ${D}/opt/${PN}/
-	dobin jmeter jmeter-server
-	dodoc LICENSE README
-	use doc && dohtml -r docs/*
-}