Version bump of commons-jexl to 2.1.1 (wrt #480432).

Dependency of picard (#491816) et al.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 197 insertions, 4 deletions

diff --git a/dev-java/commons-jexl/ChangeLog b/dev-java/commons-jexl/ChangeLog
index 91d9b7c43426..74f29847e821 100644
--- a/dev-java/commons-jexl/ChangeLog
+++ b/dev-java/commons-jexl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-jexl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/ChangeLog,v 1.10 2011/12/19 12:22:54 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/ChangeLog,v 1.11 2013/11/24 14:46:46 ercpe Exp $
+
+*commons-jexl-2.1.1 (24 Nov 2013)
+
+  24 Nov 2013; Johann Schmitz <ercpe@gentoo.org> +commons-jexl-2.1.1.ebuild,
+  +files/2.1.1-build.xml:
+  Version bump of commons-jexl to 2.1.1 (wrt #480432). Dependency of picard
+  (#491816) et al.
 
   19 Dec 2011; Ralph Sennhauser <sera@gentoo.org> commons-jexl-1.1.ebuild:
   Fix homepage wrt #202445. Fix unquoted variables to please repoman.
@@ -45,4 +52,3 @@
   +commons-jexl-1.0.ebuild:
   Initial import. Ebuild based on the contribution by Vibhav Garg
   <vibhavgarg@gmail.com>. Fixes #70671
-
diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
index 513e0d2344e1..ddf6d4234428 100644
--- a/dev-java/commons-jexl/Manifest
+++ b/dev-java/commons-jexl/Manifest
@@ -1,5 +1,8 @@
 AUX 1.1-test-target.patch 607 SHA256 1483e77c6ae7a0ca1f12ac95074392b925543b2009693dbaa02d6dbd7571868a SHA512 cd01b044ca4e4671b6419ea17cd6a316ab7ff709a08d2999d8b34881b814a48470fe495b2d6c468a5738f1284dbe9e1aabc8d5effbc0a86f210f9757893a3668 WHIRLPOOL 992aeee2335a62bb45e088a4968efdbc43bd3d10d960fd349a988cf85ec4168dddd55bab8b5b6d601ae9a87eabcbc68cad5e5b00ca0ad787594988a2e985bfef
+AUX 2.1.1-build.xml 5742 SHA256 34c5c0c629941e89d6daecbc54e7a0916b69e2eea3a76d9a8253555f2cb8f038 SHA512 f19df3e608bdb85681e90e3e331b1920e9c9be2fa43da38cb9eecc9c569d0254ed5a75dd10962442477e076495bf63e902204f49545140a86c5392a4c6bd78ad WHIRLPOOL 220ff865be03038fa5b8ac918ef33f5cf8e947aa384dd164b138e29b22be383b58ce70553ed7549594584b7696e3b34fa4271bfeaee47cc379b3411f7e8cae11
 DIST commons-jexl-1.1-src.tar.gz 128030 SHA256 62026d0cb3edecaadfdee1cf3dfe70a27b7f7ae70a219d7cb7c0f37db57877d5 SHA512 d403e945060385c4546cf173af9ec4a795c074a9b56aacdf16f301b875c9f78b47a91fdfb84059805a082466d8a4a371bcb6ef6336e6ba806272ad8e2cce9e13 WHIRLPOOL e2ed6bac38718a0daab839d5bfd22ed33bf4c701fcdf3632fee294b6ff479b661b5d179d5119944035485213e035962e06149767f0426c3ac99db8869d5fa325
+DIST commons-jexl-2.1.1-src.tar.gz 208559 SHA256 5f06cfec88f0ce1bc51958e9ec1410af7029f2a5eb2e0b167d5d71bec43027aa SHA512 259c0956bb10f102cb3d860b1c99d3d2b2bc5d705e4160f743fa774640ed8c1ee6f3aad518a8a69e8f94a164b21cb2ae26e47cd3e81e92a086a3c3f753befacb WHIRLPOOL d4a7a56cd7b5aeb0d568b3c23b763268a651da9b2fcb76c6188469dd617993a5939f4ab0ea91efd6df2f3ad9daafdddcff046693a4ecfe5585ce95abe68ed6e4
 EBUILD commons-jexl-1.1.ebuild 1231 SHA256 139195f2bf13d574ec2165f15b419632e0eaf81136a00106c4eb8f87bbaf2481 SHA512 a9f2718d3cfd41b3c2a23458863b05fa3e42b1a9a6301eb2fb09d1babce7595ca55fdfedc2c89f29666892b0904e377bbf98954366e1ae0abe94083e269f94ed WHIRLPOOL af8a4a13c49394bb6604a454c8f183dc8e4e866ccf5407436e69ae29cfa9798b8779c571addaa7a6e25e4f45b6603f8879bf01e545eb5da015ee1d239fbb3f0e
-MISC ChangeLog 1651 SHA256 439ef98809332198b2f2e0884c25f13ba4121ca78e9922995ca0297a41138ce5 SHA512 b1d70d372f9c1f8dbf106ae347f1ca3aa18254282a305009456f612dd1af1b17ca7c6ce39e0bbcfd48747395c0a9407ff8bef77a3612564e9e4ed10b753164b3 WHIRLPOOL 818a171437f35b66ea0c9162752eb96b7ff99e4db501b1320b389fb72f9a64a57086d40d346222e94a74a973502c328cd3e5109ec3b7402575c6689a7ad0be4e
+EBUILD commons-jexl-2.1.1.ebuild 1594 SHA256 e82f79e5f7bf7bd722f49394ce2ed70a8c7977774770da69d48444e7cd4459c7 SHA512 c7f1773d531cebb6540b9589d284779d95fba82500ad14e27a5676ea8f020a1542549b3d27621f1df759a752fdd7c8b5b5331cdd8530f1c0c581466a20bf2504 WHIRLPOOL e27e00ba8a5417906bcea4ff7d11a5c50e8af1c6cff4cce891774dfb527410705c617cbc24a04013faa8734c6801b9076f2388163c0d8e7369d9ac702d9bce76
+MISC ChangeLog 1885 SHA256 ab332cf0c623b8daa63d97e699b5ddb7542ddb3f5b1362d77682cac90e1e6fb8 SHA512 f5b51edb10a3449a723bc9af8e796e8083a041777f394c6669345c97fbbe5039ef0e2f444c0e826921d09cb8f3cbc2e130928206873f5a7a9ea36c5890972224 WHIRLPOOL 2acb0e29e01e29d4f6a709412ac6349574bc4495bc26bff7f3e5f79392c35c4617ebf9250cf9b78a5e1f366313b6162b380044a3bb35c81f85c3188f046966e1
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
new file mode 100644
index 000000000000..96019e8f77bc
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild,v 1.1 2013/11/24 14:46:46 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Expression language engine, can be embedded in applications and frameworks."
+HOMEPAGE="http://commons.apache.org/jexl/"
+SRC_URI="mirror://apache/commons/jexl/source/${P}-src.tar.gz"
+
+CDEPEND="dev-java/commons-logging:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	>=dev-java/javacc-5
+	test? ( dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PV}-build.xml build.xml || die
+
+	# these two calls is what the "jjtree-javacc" goal in the pom.xml does 
+	jjtree -OUTPUT_DIRECTORY="${S}/src/main/java/org/apache/commons/jexl2/parser/" \
+		src/main/java/org/apache/commons/jexl2/parser/Parser.jjt \
+		|| die "Code generation via jjtree failed"
+	javacc -OUTPUT_DIRECTORY="${S}/src/main/java/org/apache/commons/jexl2/parser/" \
+		src/main/java/org/apache/commons/jexl2/parser/Parser.jj \
+		|| die "Parser.java code generation via javacc failed"
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+	use source && java-pkg_dosrc "${S}"/src/main/java/*
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/commons-jexl/files/2.1.1-build.xml b/dev-java/commons-jexl/files/2.1.1-build.xml
new file mode 100644
index 000000000000..d0bf54ef3571
--- /dev/null
+++ b/dev-java/commons-jexl/files/2.1.1-build.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>

+

+<project name="commons-jexl-from-maven" default="package" basedir=".">

+	<property file="${user.home}/.m2/maven.properties" />

+	<property file="maven-build.properties" />

+

+	<property name="maven.build.finalName" value="commons-jexl" />

+	<property name="maven.build.dir" value="target" />

+	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />

+	<property name="maven.build.srcDir.0" value="src/main/java" />

+	<property name="maven.build.resourceDir.0" value="src/main/resources" />

+	<property name="maven.build.resourceDir.1" value="." />

+	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />

+	<property name="maven.build.testDir.0" value="src/test/java" />

+	<property name="maven.build.testResourceDir.0" value="src/test/resources" />

+	<property name="maven.build.testResourceDir.1" value="." />

+	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />

+	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />

+

+	<property name="maven.repo.local" value="${user.home}/.m2/repository" />

+	<property name="maven.settings.offline" value="false" />

+	<property name="maven.settings.interactiveMode" value="true" />

+

+	<path id="build.classpath"/>

+	<path id="build.test.classpath" />

+

+	<target name="clean" description="Clean the output directory">

+		<delete dir="${maven.build.dir}" />

+	</target>

+

+	<target name="compile" description="Compile the code">

+		<mkdir dir="${maven.build.outputDir}" />

+		<javac destdir="${maven.build.outputDir}" encoding="iso-8859-1" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">

+			<src>

+				<pathelement location="${maven.build.srcDir.0}" />

+			</src>

+			<classpath refid="build.classpath" />

+		</javac>

+		<copy todir="${maven.build.outputDir}">

+			<fileset dir="${maven.build.resourceDir.0}" />

+		</copy>

+		<mkdir dir="${maven.build.outputDir}/META-INF" />

+	</target>

+

+	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">

+		<mkdir dir="${maven.build.testOutputDir}" />

+		<javac destdir="${maven.build.testOutputDir}" encoding="iso-8859-1" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">

+			<src>

+				<pathelement location="${maven.build.testDir.0}" />

+			</src>

+			<classpath>

+				<path refid="build.test.classpath" />

+				<pathelement location="${maven.build.outputDir}" />

+			</classpath>

+		</javac>

+		<mkdir dir="${maven.build.testOutputDir}/META-INF" />

+	</target>

+

+	<target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">

+		<mkdir dir="${maven.test.reports}" />

+		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">

+			<sysproperty key="basedir" value="." />

+			<formatter type="xml" />

+			<formatter type="plain" usefile="false" />

+			<classpath>

+				<path refid="build.test.classpath" />

+				<pathelement location="${maven.build.outputDir}" />

+				<pathelement location="${maven.build.testOutputDir}" />

+			</classpath>

+			<batchtest todir="${maven.test.reports}" unless="test">

+				<fileset dir="${maven.build.testDir.0}">

+					<include name="**/*Test.java" />

+					<exclude name="**/*Abstract*Test.java" />

+				</fileset>

+			</batchtest>

+			<batchtest todir="${maven.test.reports}" if="test">

+				<fileset dir="${maven.build.testDir.0}">

+					<include name="**/${test}.java" />

+					<exclude name="**/*Abstract*Test.java" />

+				</fileset>

+			</batchtest>

+		</junit>

+	</target>

+

+	<target name="test-junit-present">

+		<available classname="junit.framework.Test" property="junit.present" />

+	</target>

+

+	<target name="test-junit-status" depends="test-junit-present">

+		<condition property="junit.missing">

+			<and>

+				<isfalse value="${junit.present}" />

+				<isfalse value="${maven.test.skip}" />

+			</and>

+		</condition>

+		<condition property="junit.skipped">

+			<or>

+				<isfalse value="${junit.present}" />

+				<istrue value="${maven.test.skip}" />

+			</or>

+		</condition>

+	</target>

+

+	<target name="junit-missing" depends="test-junit-status" if="junit.missing">

+		<echo>=================================== WARNING ===================================</echo>

+		<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>

+		<echo>===============================================================================</echo>

+	</target>

+

+	<target name="javadoc" description="Generates the Javadoc of the application">

+		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" encoding="iso-8859-1" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" source="1.5" linksource="true" breakiterator="false">

+		</javadoc>

+	</target>

+

+	<target name="package" depends="compile,test" description="Package the application">

+		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html">

+		</jar>

+	</target>

+

+	<target name="jar" depends="package" description="Builds the jar for the application" />

+

+	<target name="test-offline">

+		<condition property="maven.mode.offline">

+			<equals arg1="${maven.settings.offline}" arg2="true" />

+		</condition>

+	</target>

+</project>