commit: 43ca78d3fd660f50e62cd9a140dc4d86257aeefe Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Oct 3 22:09:54 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Oct 3 22:12:31 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ca78d3
app-benchmarks/jmeter: Remove last-rited pkg Closes: https://bugs.gentoo.org/158498 app-benchmarks/jmeter/Manifest | 1 - app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild | 59 --------------------- app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild | 71 ------------------------- app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild | 77 ---------------------------- app-benchmarks/jmeter/metadata.xml | 11 ---- profiles/package.mask | 6 --- 6 files changed, 225 deletions(-) diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest deleted file mode 100644 index 474fbe03258..00000000000 --- a/app-benchmarks/jmeter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jakarta-jmeter-2.0.1_src.tgz 5368483 SHA256 8dc7b0ff680af721adeeab198f7dc99f5e376df04c2504291564cfaccdcf5f36 SHA512 221a9d1ed19407ab0b863443827f8b6d7f179ef27227defc3c71ab4ccb5981bbb82f239206993590500a9adf2444cdcefb219dcb28afe6488659a2be19374b08 WHIRLPOOL 07a980e7f46da636d760a0c62ba42de653fda3417cc2442fc34d5e13b46291b3a3f0c49fd05a93bdebb7d8968c5a77e643a59094fdf619d0dc24e048a9e5f762 diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild deleted file mode 100644 index b943e3afd8f..00000000000 --- a/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 - sys-apps/sed - ${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}" - sed -i -e 's/%//g' bin/jmeter || die "Unable to sed." - 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() { - diropts --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/* -} diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild deleted file mode 100644 index 5047d9fcdbc..00000000000 --- a/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source examples" - -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" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="beanshell" - -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 - sys-apps/sed - ${COMMON_DEP}" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" - -S=${WORKDIR}/jakarta-${P} - -java_prepare() { - sed -i -e 's/%//g' bin/jmeter || die "Unable to sed." - cd "${S}/lib" || die - # 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 - - find "${S}"/src -name "*.java" | xargs sed -i -e 's:\benum\b:enumx:g' || die # fix for bug #514662 -} - -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() { - diropts --mode=0775 - dodir /opt/${PN} - local dest="${D}/opt/${PN}/" - cp -pPR bin/ lib/ "${dest}" || die - if use doc; then - cp -pPR printable_docs "${dest}" || die "Failed to install docs" - fi - dodoc README - - echo "PATH=\"/opt/${PN}/bin\"" > "${T}/90${PN}" || die - doenvd "${T}/90${PN}" || die "failed to install env.d file" - - use doc && dohtml -r docs/* - use source && java-pkg_dosrc src/* - use examples && java-pkg_doexamples xdocs/demos/* -} diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild deleted file mode 100644 index d68977f85f3..00000000000 --- a/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source examples" - -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" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="beanshell" - -CDEPEND=" - beanshell? ( - dev-java/bsh:0 - ) - dev-java/bsf:2.3 - dev-java/junit:0 - dev-java/oracle-javamail:0" -DEPEND="virtual/jdk:1.7 - doc? ( - dev-java/velocity:0 - ) - dev-java/ant-nodeps - sys-apps/sed - ${CDEPEND}" -RDEPEND="virtual/jre:1.7 - ${CDEPEND}" - -JAVA_ANT_ENCODING="ISO-8859-1" - -S=${WORKDIR}/jakarta-${P} - -java_prepare() { - sed -i -e 's/%//g' bin/jmeter || die "Unable to sed." - cd "${S}/lib" || die - # 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 oracle-javamail - java-pkg_filter-compiler jikes - - find "${S}"/src -name "*.java" | xargs sed -i -e 's:\benum\b:enumx:g' || die # fix for bug #514662 -} - -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() { - diropts --mode=0775 - dodir /opt/${PN} - local dest="${D}/opt/${PN}/" - cp -pPR bin/ lib/ "${dest}" || die - if use doc; then - cp -pPR printable_docs "${dest}" || die "Failed to install docs" - fi - dodoc README - - echo "PATH=\"/opt/${PN}/bin\"" > "${T}/90${PN}" || die - doenvd "${T}/90${PN}" || die "failed to install env.d file" - - use doc && dohtml -r docs/* - use source && java-pkg_dosrc src/* - use examples && java-pkg_doexamples xdocs/demos/* -} diff --git a/app-benchmarks/jmeter/metadata.xml b/app-benchmarks/jmeter/metadata.xml deleted file mode 100644 index 0e34f6bf758..00000000000 --- a/app-benchmarks/jmeter/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Java</name> -</maintainer> -<use> - <flag name="beanshell">Enable BeanShell scripting support</flag> -</use> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 80145bf8841..b94ba6e5ebb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -246,12 +246,6 @@ dev-java/javax-mail dev-java/sun-javamail java-virtuals/javamail -# James Le Cuirot <[email protected]> (29 Aug 2017) -# Old and holding up the removal of Java 7. Still alive upstream but -# new versions have proven too tricky to package under our current -# infrastructure. It may return one day. Removal in 30 days. -app-benchmarks/jmeter - # Anthony G. Basile <[email protected]> (27 Aug 2017) # Upstream is no longer providing public patches sys-kernel/hardened-sources
