[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/, profiles/, dev-java/commons-jexl/files/
commit: 2f047a2c1a10ba7abcede034af2eec638f290404
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Feb 13 09:10:17 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Feb 13 09:11:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f047a2c
dev-java/commons-jexl: treeclean
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/commons-jexl/Manifest| 2 -
dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild | 48
dev-java/commons-jexl/commons-jexl-2.1.1.ebuild | 59 --
dev-java/commons-jexl/files/1.1-test-target.patch | 12 --
dev-java/commons-jexl/files/2.1.1-build.xml | 127 --
dev-java/commons-jexl/metadata.xml| 8 --
profiles/package.mask | 1 -
7 files changed, 257 deletions(-)
diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
deleted file mode 100644
index 15a1b1ffd3e4..
--- a/dev-java/commons-jexl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
deleted file mode 100644
index 25ef0baa46ac..
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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
- 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
deleted file mode 100644
index 56f6b9d70a55..
--- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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_doj
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/
commit: b23c2c64469f84586a9a9dce844e2295549c3238
Author: Patrice Clement gentoo org>
AuthorDate: Tue Oct 6 11:33:07 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Oct 6 15:34:38 2015 +
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 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/
commit: b571b9c899ea072cd1740fe7df6fc83fe97e1cae
Author: Patrice Clement gentoo org>
AuthorDate: Tue Oct 6 11:33:49 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Oct 6 15:34:44 2015 +
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 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..000
--- 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/
commit: caa358952ba33e7a570736d976661e39105f4715
Author: Patrice Clement gentoo org>
AuthorDate: Tue Oct 6 11:24:56 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Oct 6 15:34:25 2015 +
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 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-jexl/
commit: d2cecfdd549fcdc6422678001a478da0cf03e5f4
Author: Patrice Clement gentoo org>
AuthorDate: Tue Oct 6 11:32:26 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Oct 6 15:34:33 2015 +
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 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 000..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/*
+}
