Remove java-virtuals/javamail and replace it with oracle-javamail. Also set up a hard dependency on virtual/{jdk,jre}:1.7. Fixes bug 521474 and 521474.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

2 files changed, 85 insertions, 1 deletions

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index 8543829866a8..65d5d258bf97 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/jmeter
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.41 2015/08/06 15:25:24 monsieurp Exp $
+
+*jmeter-2.0.1-r6 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org> +jmeter-2.0.1-r6.ebuild:
+  Remove java-virtuals/javamail and replace it with oracle-javamail. Also set up
+  a hard dependency on virtual/{jdk,jre}:1.7. Fixes bug 521474 and 521474.
 
   28 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -jmeter-2.0.1-r2.ebuild,
   -jmeter-2.0.1-r3.ebuild:
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild
new file mode 100644
index 000000000000..f05d73797a2b
--- /dev/null
+++ b/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 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-r6.ebuild,v 1.1 2015/08/06 15:25:24 monsieurp Exp $
+
+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() {
+	DIROPTIONS="--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/*
+}