Fixed invalid vm parameters in start script. see Bug #211953.

Package-Manager: portage-2.1.4.4

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index 3a318baa7a88f669cd2f93d79dcaf25fe1e27c86..ad34f636e4c196c829f110450164032790f48084 100644 (file)
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/jmeter
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.32 2008/01/10 21:58:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.33 2008/03/05 10:30:56 ali_bush Exp $
+
+*jmeter-2.0.1-r4 (05 Mar 2008)
+
+  05 Mar 2008; Alistair Bush <ali_bush@gentoo.org> +jmeter-2.0.1-r4.ebuild:
+  Fixed invalid vm parameters in start script. see Bug #211953.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org> jmeter-2.0.1-r2.ebuild,
   jmeter-2.0.1-r3.ebuild:
@@ -8,7 +13,7 @@
 
 *jmeter-2.0.1-r3 (20 Nov 2007)
 
-  20 Nov 2007; <alistair@gentoo.org> +jmeter-2.0.1-r3.ebuild:
+  20 Nov 2007; <ali_bush@gentoo.org> +jmeter-2.0.1-r3.ebuild:
   Bumping to support javamail virtual.
 
   29 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> -jmeter-1.9.1.ebuild:

diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index 318b94c8f45c9b21e81e04d090e2ee807210d8d5..09ff32057067433534aacb07c9935a964191f12a 100644 (file)
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,5 +1,6 @@
 DIST jakarta-jmeter-2.0.1_src.tgz 5368483 RMD160 ec4db77dfd2205115e8206548da34db80dec24ea SHA1 69242001ab710b6a255bda72cfef329131f1cb3f SHA256 8dc7b0ff680af721adeeab198f7dc99f5e376df04c2504291564cfaccdcf5f36
 EBUILD jmeter-2.0.1-r2.ebuild 1519 RMD160 a5ff40465b210a4d6d770c46ec0e7115d81f6b35 SHA1 5b820486bc42d8a4f1a6ffe778e9b33c190fc3cd SHA256 f07d9ea72386628aff3719025f71db491eeb4d17e3a16d788643c0663e7ccb03
 EBUILD jmeter-2.0.1-r3.ebuild 1518 RMD160 092363703733e41c5df55d7ac06e03495fb923cb SHA1 039e7cdddd9e5f0b06d15dbb537db1f56907ab45 SHA256 97a9aa72ff5afda0508222f3af79059ee31dab704c37133e49bf5c0426caf808
-MISC ChangeLog 4988 RMD160 3f8177655a72308958a983ca5ab16ee045da5cc0 SHA1 153628526ff68c323cbee4ce7dc235ebad6ce96c SHA256 1d0bba59a3a33a835be2c3710a3ddb2cf7e8527ea437193b3f401bedea6461cf
+EBUILD jmeter-2.0.1-r4.ebuild 1601 RMD160 a6fd7444fc6f28a0071a912e681d775209aeb163 SHA1 da9e137544891e97010dec39877d537fcf72d1d0 SHA256 a1e1b3c1428089501579ff646bc36fa9c10450b244a277dbfa37c52e67678b24
+MISC ChangeLog 5163 RMD160 c628ab051797fbd2a3311f19b004ee4e62dafa00 SHA1 0f16ad705f5ec665e7665331ff902584141a6d58 SHA256 a4117f3a3c099d934235e3bc13400f300f6c93f91057d0ee2de5a335671b5f84
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9

diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild
new file mode 100644 (file)
index 0000000..15d9bef
--- /dev/null
+++ b/app-benchmarks/jmeter/jmeter-2.0.1-r4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 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-r4.ebuild,v 1.1 2008/03/05 10:30:56 ali_bush Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases."
+HOMEPAGE="http://jakarta.apache.org/jmeter"
+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() {
+       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/*
+}