ercpe 14/07/12 11:08:48 Modified: ChangeLog Added: jmeter-2.0.1-r5.ebuild Log: Bumped to EAPI=5, fixed compilation issues with 1.7 (bug #514662), fixed installation of documentation (#282219), add /opt/jmeter/bin to PATH via env.d (bug #238564) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path 1.38 app-benchmarks/jmeter/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/jmeter/ChangeLog?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/jmeter/ChangeLog?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/jmeter/ChangeLog?r1=1.37&r2=1.38 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ChangeLog 19 Dec 2011 13:06:31 -0000 1.37 +++ ChangeLog 12 Jul 2014 11:08:48 -0000 1.38 @@ -1,6 +1,13 @@ # ChangeLog for app-benchmarks/jmeter -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.37 2011/12/19 13:06:31 sera Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.38 2014/07/12 11:08:48 ercpe Exp $ + +*jmeter-2.0.1-r5 (12 Jul 2014) + + 12 Jul 2014; Johann Schmitz <er...@gentoo.org> +jmeter-2.0.1-r5.ebuild: + Bumped to EAPI=5, fixed compilation issues with 1.7 (bug #514662), fixed + installation of documentation (#282219), add /opt/jmeter/bin to PATH via env.d + (bug #238564) 19 Dec 2011; Ralph Sennhauser <s...@gentoo.org> jmeter-2.0.1-r2.ebuild, jmeter-2.0.1-r3.ebuild, jmeter-2.0.1-r4.ebuild: @@ -150,4 +157,3 @@ NOTE: This application requires Sun's JDK, and will not work correctly if you currently have your user environment set to use IBM's JDK, or another. - 1.1 app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r5.ebuild?rev=1.1&content-type=text/plain Index: jmeter-2.0.1-r5.ebuild =================================================================== # 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-r5.ebuild,v 1.1 2014/07/12 11:08:48 ercpe 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" 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() { 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/* }
