[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
-}