Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 6 insertions, 114 deletions

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index f054e0db92f6..8543829866a8 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/jmeter
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.39 2014/08/05 07:59:55 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.40 2015/03/28 23:21:24 mrueg Exp $
+
+  28 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -jmeter-2.0.1-r2.ebuild,
+  -jmeter-2.0.1-r3.ebuild:
+  Remove old.
 
   05 Aug 2014; Patrick Lauer <patrick@gentoo.org> jmeter-2.0.1-r2.ebuild,
   jmeter-2.0.1-r3.ebuild, jmeter-2.0.1-r4.ebuild, jmeter-2.0.1-r5.ebuild:
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild
deleted file mode 100644
index e4ec94808dc3..000000000000
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r2.ebuild,v 1.6 2014/08/05 07:59:55 patrick Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases"
-HOMEPAGE="http://jmeter.apache.org/"
-SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
-COMMON_DEP="
-	beanshell? ( dev-java/bsh )
-	>=dev-java/bsf-2.3
-	=dev-java/junit-3.8*
-	dev-java/sun-javamail"
-DEPEND=">=virtual/jdk-1.4
-	doc? ( >=dev-java/velocity-1.4 )
-	dev-java/ant-nodeps
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="beanshell doc"
-
-S=${WORKDIR}/jakarta-${P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-	# FIXME replace all bundled jars bug #63309
-	# then rm -f *.jar
-	use beanshell && java-pkg_jar-from bsh
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from junit
-	java-pkg_jar-from sun-javamail
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	local tasks="ant-nodeps"
-	use doc && tasks="${tasks} velocity"
-	ANT_TASKS="${tasks}" eant package $(use_doc docs-all) || die "compile problem"
-}
-
-src_install() {
-	DIROPTIONS="--mode=0775"
-	dodir /opt/${PN}
-	local dest="${D}/opt/${PN}/"
-	cp -pPR bin/ lib/ printable_docs/ "${dest}"
-	if use doc; then
-		cp -pPR printable_docs "${dest}" || die "Failed to install docs"
-	fi
-	dodoc README || die
-	use doc && java-pkg_dohtml -r docs/*
-}
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild
deleted file mode 100644
index 938a30e2f132..000000000000
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r3.ebuild,v 1.4 2014/08/05 07:59:55 patrick Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases"
-HOMEPAGE="http://jmeter.apache.org/"
-SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
-COMMON_DEP="
-	beanshell? ( dev-java/bsh )
-	>=dev-java/bsf-2.3
-	=dev-java/junit-3.8*
-	java-virtuals/javamail"
-DEPEND=">=virtual/jdk-1.4
-	doc? ( >=dev-java/velocity-1.4 )
-	dev-java/ant-nodeps
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="beanshell doc"
-
-S=${WORKDIR}/jakarta-${P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-	# FIXME replace all bundled jars bug #63309
-	# then rm -f *.jar
-	use beanshell && java-pkg_jar-from bsh
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from junit
-	java-pkg_jar-from --virtual javamail
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	local tasks="ant-nodeps"
-	use doc && tasks="${tasks} velocity"
-	ANT_TASKS="${tasks}" eant package $(use_doc docs-all) || die "compile problem"
-}
-
-src_install() {
-	DIROPTIONS="--mode=0775"
-	dodir /opt/${PN}
-	local dest="${D}/opt/${PN}/"
-	cp -pPR bin/ lib/ printable_docs/ "${dest}"
-	if use doc; then
-		cp -pPR printable_docs "${dest}" || die "Failed to install docs"
-	fi
-	dodoc README || die
-	use doc && dohtml -r docs/*
-}