summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-08-06 15:25:32 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-08-06 15:25:32 +0000
commit37055aca62fdac477894d68138d0708d02972f06 (patch)
tree7fd2cece74fc21e9de1fd94c1e486534dbc82d83 /app-benchmarks
parentStable on alpha, bug 556522 (diff)
downloadhistorical-37055aca62fdac477894d68138d0708d02972f06.tar.gz
historical-37055aca62fdac477894d68138d0708d02972f06.tar.bz2
historical-37055aca62fdac477894d68138d0708d02972f06.zip
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> Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x93491BB8
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/jmeter/ChangeLog8
-rw-r--r--app-benchmarks/jmeter/Manifest17
-rw-r--r--app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild78
3 files changed, 101 insertions, 2 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/Manifest b/app-benchmarks/jmeter/Manifest
index a6141dcd58a9..0fd8cfddb77d 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,5 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST jakarta-jmeter-2.0.1_src.tgz 5368483 SHA256 8dc7b0ff680af721adeeab198f7dc99f5e376df04c2504291564cfaccdcf5f36 SHA512 221a9d1ed19407ab0b863443827f8b6d7f179ef27227defc3c71ab4ccb5981bbb82f239206993590500a9adf2444cdcefb219dcb28afe6488659a2be19374b08 WHIRLPOOL 07a980e7f46da636d760a0c62ba42de653fda3417cc2442fc34d5e13b46291b3a3f0c49fd05a93bdebb7d8968c5a77e643a59094fdf619d0dc24e048a9e5f762
EBUILD jmeter-2.0.1-r4.ebuild 1590 SHA256 cf55746e72fa287791fa2aa4aeb02a4209ccdf92b5844eb72e9aaeb617310c3a SHA512 b977e4d7dd8ef285e1fdca4e87154c38d6f489236b6fac3045687b1c64e4f66c07f6d554eea860232e9fced3b1dc9b62107ebcae73bc3d3b314dba3f7340be83 WHIRLPOOL 19017cb1b30ab8cd734d78d01d341b401fd84c9f3eeb9ebfb090e79be54ff4f00e96b31a6b141f3b295e1ec96d42ce9b459e061185769911483b31f91ff6a338
EBUILD jmeter-2.0.1-r5.ebuild 1911 SHA256 5dedfa4270db9965e72f0975ce9e1ce73c610b40e7ce0b1aea04fc5540726228 SHA512 8d9360d36725eae9b7b7724b51794f1786b975dd96fc94d78c00afb1bd4fb14e222e7b06cc582d24ebedb16a8883b85f67ecb5d607ab0f194f64c5307f3bebab WHIRLPOOL 09f570c49e6fdf988058e128db431075985c43cef88dc3c3ff0c6da92ba67b49726560c1147d0ba51bd270332efb136a43fff2a2778288f586394d4d87e33595
-MISC ChangeLog 6204 SHA256 a29fbf7f4c26f6c8bd99b35aae31b3ef64f66b3311f378f12372851a03d998a5 SHA512 8f0d66e2e0771628172f86cc0584edc55bb3b826ceae8a499d31b5d4b98a6556a98489194fb372550717fac1504ce97273645c68e189291ddc8019c01e1b73c1 WHIRLPOOL fd5996cdd7d7869f1bf860cdf1871f0279b3e871cb264bf5c365ee963b135c97acb6b55b94c26c1f3fa16c67ae66dbcfcf1cccb84570aac7ba2571369dd50d01
+EBUILD jmeter-2.0.1-r6.ebuild 1931 SHA256 38d25f8f94f768f0e695acdab82f46e982b6ad09f3ed4717322bd20034f24c85 SHA512 ff321e84ca68832491f4c731b5cd7490cf942ea734841c0b297defc901d2aaa66a3074c31a40de2314123e13dc06b9351d602d92e9ed5acb1a2b0a52add2b9b7 WHIRLPOOL 127873598a660d835203fc6565b83e31aa61b8de971f98742f7b871ecc005c2f553b2d580f987a3c8118c14a83ef17d951659d731395596e24fbf93a7d09de9d
+MISC ChangeLog 6476 SHA256 b1d0d7d49629d28d367325f9bd28767a24062884d5376ba5954119d21b863dbe SHA512 9672746bae503735d1deb5e5ab19da6bf4f8224bd1e13dc18cb18b3bdcdf42751d19a558dcd9c3fd5711fd79658b2e9b0f32186ed6a071db65f46a25d6d7e104 WHIRLPOOL 93d7ed7c7e204c857fc1f89d06fb2b69abd026a7808b2b52db590b1a0371efa1482424699736639b056ec5ca693b401a01f8bf86132ae53d7bdb2bbb728d0d4e
MISC metadata.xml 236 SHA256 c755e62b7460ace6f5ef778fe94701f7b2e7c431a721631b4784e4a41baf4af9 SHA512 ba9f8cce787493242e2bc8c03d80bd6bc57f0bcf8af6c0ddf6b99f26783bda0b889b4e50f0d4815b870f6faa68bc468422fc7d6b99e30d76244eab235cc0e5ff WHIRLPOOL 45f2538d70eb1fc012110366ff1a3b1bbb91dd7f128ba4dc650c811f297fe644dda0638721f8007f3afe0469923a9a2597d50d752f7edbdd98f5f043376c6850
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVw4qZAAoJEJGRpfGTSRu4WrAH/37LXOAr5oIfFOLjZh+J0c0f
++Ln2gKw5y/TqTGxun58Q5Z7oxZuz9UtYjUFC2ODeoSFo3M6fXFK4cc6+CfhDAmNY
+ixcNCE2DQt6+V8EgLL7o+fYCrXoIaKRuf1JZKMsOfeWVqWKs6LQBIitabd3MzKXY
++rOjovRDzDSPYOFSoXqLyqPW+q3N/rGsuBn5UoH2bLCVS2lI7D0VUeHaWGXcoGpL
+KKKfqjlSALmvLrV7gS/8TuKwD543JOXxhHdlnr88u1RAjd5aPXErW8a6AP/jh6pN
+Qwcvsb/5GmLEmObCGZZRo8HnTeeOba1aJY6N5VGbJIHD82MLn1ZV1HU6iBtnxjw=
+=pET5
+-----END PGP SIGNATURE-----
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/*
+}