gentoo resync : 14.07.2018

6 files changed, 261 insertions, 0 deletions

diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
new file mode 100644
index 000000000000..fc83aa01cc88
--- /dev/null
+++ b/dev-java/commons-jexl/Manifest
@@ -0,0 +1,7 @@
+AUX 1.1-test-target.patch 607 BLAKE2B 93abe546683310bb4ac0937a4a1ee9ebe8f7f72e5e21bc6c9fbec16d2bf0c90a1b9e7cb53fa95a77bd759c7caf6f0148ace69a7d381e7c66324ebfe18480eefb SHA512 cd01b044ca4e4671b6419ea17cd6a316ab7ff709a08d2999d8b34881b814a48470fe495b2d6c468a5738f1284dbe9e1aabc8d5effbc0a86f210f9757893a3668
+AUX 2.1.1-build.xml 5742 BLAKE2B 900957b362f993314f47b09cbfd2f86c641b685be795c837e8af676a632b28b6638debaffe6208fc62b87d7f9df7bfb701ce69aaeb6b0c0602b25e1a78e9c16b SHA512 f19df3e608bdb85681e90e3e331b1920e9c9be2fa43da38cb9eecc9c569d0254ed5a75dd10962442477e076495bf63e902204f49545140a86c5392a4c6bd78ad
+DIST commons-jexl-1.1-src.tar.gz 128030 BLAKE2B 9694077640cf54e9621a2860fbfa5eae8c7135447e39b64147180db1b859f68b2fe610f161ceca71a432fe2216ebac2386e00ea3ba7e27bd687736a5aa39e95c SHA512 d403e945060385c4546cf173af9ec4a795c074a9b56aacdf16f301b875c9f78b47a91fdfb84059805a082466d8a4a371bcb6ef6336e6ba806272ad8e2cce9e13
+DIST commons-jexl-2.1.1-src.tar.gz 208559 BLAKE2B 031095ab8549f295e99048873ebc5eee2ebce2e79bdef28afec4ea3adef051cc397ca8740b3d9c2a2c02c51555b3ab3b7c79c0222368fdf6c652e4ed2369d7e4 SHA512 259c0956bb10f102cb3d860b1c99d3d2b2bc5d705e4160f743fa774640ed8c1ee6f3aad518a8a69e8f94a164b21cb2ae26e47cd3e81e92a086a3c3f753befacb
+EBUILD commons-jexl-1.1-r1.ebuild 1085 BLAKE2B 38dcda95f91f900a9d5ab4fafaba57f0840599cfba0741582ab1a78300da4a4f651cf5d1d2e8d176c0f5aa7f5f0abf0d5e48abd7037f74fa90e1093b345cd99b SHA512 96f6a5e42eabac7408059b0fd9fe229135857afc377a9d5b8626cc06bc1ef81c13cc0a7d18377231f3534705a3167538a7e72b480478faaa01a20dffe7f0f240
+EBUILD commons-jexl-2.1.1.ebuild 1563 BLAKE2B 7cae693c0acd225a5e318d0ac191ff24d955ed3cf16ba0ba75f596af07682d32af75331db21017746b16dd61a4527f3bbe31f95f55f1cc72bed4b5bca3e38b27 SHA512 f0a13af541986aa9bb54148d88716f2e8fdb4ed2ce17eca0d163c71e8cc1cca7cab1412ddc768ddc505417e03703bb9a1a5ea177aeefa3c58f54586614c7c266
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
new file mode 100644
index 000000000000..236a5c1dcd70
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/jakarta/commons/jexl/source/${P}-src.tar.gz"
+
+CDEPEND="dev-java/commons-logging
+		dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit )
+	${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	# https://issues.apache.org/jira/browse/JEXL-31
+	epatch "${FILESDIR}/${PV}-test-target.patch"
+
+	mkdir -p target/lib && cd target/lib
+	java-pkg_jar-from junit junit.jar
+	java-pkg_jar-from commons-logging
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}*.jar
+	dodoc RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc "${S}"/src/java/*
+}
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..56f6b9d70a55
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	>=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"
+
+# Dubious tests.
+JAVA_RM_FILES=(
+	src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
+)
+
+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_test() {
+	java-pkg-2_src_test
+}
+
+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/*
+}
diff --git a/dev-java/commons-jexl/files/1.1-test-target.patch b/dev-java/commons-jexl/files/1.1-test-target.patch
new file mode 100644
index 000000000000..54a3d3e9bce0
--- /dev/null
+++ b/dev-java/commons-jexl/files/1.1-test-target.patch
@@ -0,0 +1,12 @@
+diff -ur commons-jexl-1.1-src.old/build.xml commons-jexl-1.1-src/build.xml
+--- commons-jexl-1.1-src.old/build.xml	2006-12-26 19:39:18.000000000 +0200
++++ commons-jexl-1.1-src/build.xml	2006-12-26 19:39:34.000000000 +0200
+@@ -62,7 +62,7 @@
+       </fileset>

+     </copy>

+   </target>

+-  <target name="jar" description="o Create the jar" depends="compile,test">

++  <target name="jar" description="o Create the jar" depends="compile">

+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}" manifest="src/conf/MANIFEST.MF">

+     </jar>

+   </target>

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>

diff --git a/dev-java/commons-jexl/metadata.xml b/dev-java/commons-jexl/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/commons-jexl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>