From 2f047a2c1a10ba7abcede034af2eec638f290404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakov=20Smoli=C4=87?= Date: Sun, 13 Feb 2022 10:10:17 +0100 Subject: [PATCH] dev-java/commons-jexl: treeclean MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakov Smolić --- dev-java/commons-jexl/Manifest | 2 - .../commons-jexl/commons-jexl-1.1-r1.ebuild | 48 ------- .../commons-jexl/commons-jexl-2.1.1.ebuild | 59 -------- .../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(-) delete mode 100644 dev-java/commons-jexl/Manifest delete mode 100644 dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild delete mode 100644 dev-java/commons-jexl/commons-jexl-2.1.1.ebuild delete mode 100644 dev-java/commons-jexl/files/1.1-test-target.patch delete mode 100644 dev-java/commons-jexl/files/2.1.1-build.xml delete mode 100644 dev-java/commons-jexl/metadata.xml diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest deleted file mode 100644 index 15a1b1ffd3e4a..0000000000000 --- 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 25ef0baa46ac0..0000000000000 --- 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 56f6b9d70a551..0000000000000 --- 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_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 deleted file mode 100644 index 54a3d3e9bce08..0000000000000 --- a/dev-java/commons-jexl/files/1.1-test-target.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 @@ - - - -- -+ - - - diff --git a/dev-java/commons-jexl/files/2.1.1-build.xml b/dev-java/commons-jexl/files/2.1.1-build.xml deleted file mode 100644 index d0bf54ef3571f..0000000000000 --- a/dev-java/commons-jexl/files/2.1.1-build.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/commons-jexl/metadata.xml b/dev-java/commons-jexl/metadata.xml deleted file mode 100644 index 6021501589e0b..0000000000000 --- a/dev-java/commons-jexl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/profiles/package.mask b/profiles/package.mask index 185cb2286090b..856622a985d23 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -227,7 +227,6 @@ dev-db/oracle-instantclient-sqlplus # Removal in 30 days. app-emulation/edumips64 dev-java/appframework -dev-java/commons-jexl # Ulrich Müller (2022-01-15) # Pretest versions, masked for testing.