[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/

[Patrice Clement]

commit:     d2cecfdd549fcdc6422678001a478da0cf03e5f4
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 11:32:26 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 15:34:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2cecfdd

dev-java/commons-jexl: EAPI 5 bump.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

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 0000000..5e0eafc
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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/*
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/

[Patrice Clement]

commit:     b571b9c899ea072cd1740fe7df6fc83fe97e1cae
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 11:33:49 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 15:34:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b571b9c8

dev-java/commons-jexl: Clean up old.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/commons-jexl/commons-jexl-1.1.ebuild | 52 ---------------------------
 1 file changed, 52 deletions(-)

diff --git a/dev-java/commons-jexl/commons-jexl-1.1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1.ebuild
deleted file mode 100644
index 8f01544..0000000
--- a/dev-java/commons-jexl/commons-jexl-1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils 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-3*"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	${CDEPEND}"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# https://issues.apache.org/jira/browse/JEXL-31
-	epatch "${FILESDIR}/1.1-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/*
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/

[Patrice Clement]

commit:     b23c2c64469f84586a9a9dce844e2295549c3238
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 11:33:07 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 15:34:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23c2c64

dev-java/commons-jexl: Stable for amd64. Stable for ppc+x86 using the ALLARCHES policy.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
index 5e0eafc..424d1f5 100644
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND=">=virtual/jdk-1.6
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/

[Patrice Clement]

commit:     caa358952ba33e7a570736d976661e39105f4715
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 11:24:56 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 15:34:25 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa35895

dev-java/commons-jexl: Stable for amd64. Stable for x86 using the ALLARCHES policy. Disable dubious tests.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/commons-jexl/commons-jexl-2.1.1.ebuild | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
index b38d155..22b774f 100644
--- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,23 +14,28 @@ SRC_URI="mirror://apache/commons/jexl/source/${P}-src.tar.gz"
 
 CDEPEND="dev-java/commons-logging:0"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.5
+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"
+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
 
@@ -43,15 +48,13 @@ java_prepare() {
 		|| 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/*
 }
-
-src_test() {
-	java-pkg-2_src_test
-}