[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: ac7240f46448a4b91a5eca3882480217f22bed1d
Author: Sam James gentoo org>
AuthorDate: Fri Apr 19 09:56:13 2024 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 19 10:38:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7240f4
dev-java/ant: switch to smaller distfile
Contents are identical.
Signed-off-by: Sam James gentoo.org>
dev-java/ant/Manifest | 4 ++--
dev-java/ant/ant-1.10.14-r3.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a5c99e19154a..4fdf2d20cd0a 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,2 +1,2 @@
-DIST apache-ant-1.10.14-src.tar.gz 4692736 BLAKE2B
b07a2e61fecd4f10056ca2688615ccf02c551bba0f5749f50c2be710e90306e8044b7c557359300654d93971d94520e92f593da44b1c20626db4701d499cddff
SHA512
435f97a276d88a86022c5f0680f3c2a16dc36be95adac3d797a2609d96921840a57393c8f5ef8313193146115bd6a87bd4790a4a272c44f7beec892fd6528c10
-DIST apache-ant-1.10.14-src.tar.gz.asc 833 BLAKE2B
d9a4b4b3cb22762f25b34651dc81c2f13af38e73fdca27bc2de562539cd8f1692744ac5ccf535a2c61d3035a129f30bafac133872f9ba0ed7b259393b0f4cdf6
SHA512
ff2e79c991f68a5c38c0b47556ca5f5301c1a8be219a9eddf8d2e17b09eed7f0426770c2dc18114ea432f0200ac824d71da633ad7881025692ce5ad4baa899ee
+DIST apache-ant-1.10.14-src.tar.xz 3779488 BLAKE2B
40091c208c795d03b8f34656594cbf6c414f345cdacf637ece89a19a3ab0373cd8d65c342e0c4603569f9120f8f99a0b2eae8df874e6183649b39d7b88c614b8
SHA512
52936dfceb808a11dc842d2dc957a031508689270b59a2a6e3589f40465f6fa1aae87b189737cdd83eadfaf41b0c3f1ba2579bbd07591153107a5a27422521bd
+DIST apache-ant-1.10.14-src.tar.xz.asc 833 BLAKE2B
4f8b1bb8bbd6d77b6e9eedf86818d42bb448e1b394e00590163e96967e36fe8e8e73e3f4fbf3b5bd1dab51cf69a39b99409bd8604cb7695cd6ae875ff13344a9
SHA512
2b91eda436210247ba39b82ba8aa1859051cf9baaf8ac8b551052e7986aeaa03c8b594347b8a734e08d12d8e270e29bf89b814562550a418abd0d2393ad4ac66
diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild
b/dev-java/ant/ant-1.10.14-r3.ebuild
index e79a4cbf5562..e0ad3fce1fed 100644
--- a/dev-java/ant/ant-1.10.14-r3.ebuild
+++ b/dev-java/ant/ant-1.10.14-r3.ebuild
@@ -14,8 +14,8 @@ inherit java-pkg-2 java-pkg-simple verify-sig prefix
DESCRIPTION="Java-based build tool similar to 'make' that uses XML
configuration files"
HOMEPAGE="https://ant.apache.org/;
-SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.gz
- verify-sig? (
https://downloads.apache.org/ant/source/apache-${P}-src.tar.gz.asc )"
+SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.xz
+ verify-sig? (
https://downloads.apache.org/ant/source/apache-${P}-src.tar.xz.asc )"
S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
commit: 3d1925ec6763f68571ad8ebafd5712ded2102d2a
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Mar 12 21:21:03 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Apr 16 07:48:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1925ec
dev-java/ant-contrib: switch to dev-java/ant
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/35723/commits/5bd77e9d5ae28d7598f1cda12969f7d8962999cb
Signed-off-by: Miroslav Šulc gentoo.org>
...ild => ant-contrib-1.0_beta6_pre20201123-r2.ebuild} | 18 +++---
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
similarity index 76%
rename from dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
rename to dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
index 38db7e73b27e..172467ec6ed4 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri
https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz
--slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild
ant-contrib-1.0_beta6_pre20201123.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
@@ -14,8 +11,9 @@ inherit java-pkg-2 java-pkg-simple
MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net;
+HOMEPAGE="https://ant-contrib.sourceforge.net/;
SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
@@ -34,7 +32,7 @@ RESTRICT="test"
# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
CDEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/ant-ivy:2
dev-java/bcel:0
dev-java/commons-httpclient:3
@@ -49,20 +47,18 @@ CDEPEND="
DEPEND="${CDEPEND}
>=virtual/jdk-1.8:*
test? (
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0[junit4]
)"
RDEPEND="${CDEPEND}
>=virtual/jre-1.8:*"
-S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
-
#
JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant"
JAVA_TEST_SRC_DIR="test/src"
JAVA_TEST_RESOURCE_DIRS="test/resources"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
commit: 5cc09eb3ba8239c94e5ab8cb93d81eb966f13e90
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Mar 12 20:40:18 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Apr 15 10:15:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc09eb3
dev-java/ant-ivy: switch to dev-java/ant
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/35723/commits/8d6551f1f1e71c422722e9353d8b5351772f8979
Signed-off-by: Miroslav Šulc gentoo.org>
...ivy-2.5.0-r1.ebuild => ant-ivy-2.5.0-r2.ebuild} | 31 +++---
dev-java/ant-ivy/metadata.xml | 4 +--
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
similarity index 94%
rename from dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
rename to dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
index fff42019b905..0158c70768f5 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi
DESCRIPTION="Ivy is a free java based dependency manager"
HOMEPAGE="https://ant.apache.org/ivy/;
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz;
LICENSE="Apache-2.0"
SLOT="2"
@@ -21,7 +21,7 @@ PROPERTIES="test_network"
RESTRICT="test"
CDEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/bcpg:0
dev-java/bcprov:0
dev-java/httpcomponents-client
@@ -31,10 +31,7 @@ CDEPEND="
dev-java/jsch:0
dev-java/jsch-agent-proxy:0
test? (
- dev-java/ant-junit:0
- dev-java/ant-junit4:0
- dev-java/ant-junitlauncher:0
- dev-java/ant-testutil:0
+ >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil]
dev-java/hamcrest-core:1.3
dev-java/hamcrest-library:1.3
dev-java/xmlunit:1
@@ -50,12 +47,28 @@ DOCS=( LICENSE NOTICE README.adoc )
S="${WORKDIR}/apache-ivy-${PV}"
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_GENTOO_CLASSPATH="
+ ant
+ bcpg
+ bcprov
+ httpcomponents-client-4
+ commons-vfs-2
+ httpcore
+ jakarta-oro-2.0
+ jsch
+ jsch-agent-proxy
+"
JAVA_MAIN_CLASS="org.apache.ivy.Main"
JAVA_SRC_DIR="src/java"
JAVA_RESOURCE_DIRS="resources/java"
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_GENTOO_CLASSPATH="
+ ant
+ hamcrest-core-1.3
+ hamcrest-library-1.3
+ junit-4
+ xmlunit-1
+"
JAVA_TEST_SRC_DIR="test-src/java"
JAVA_TEST_RESOURCE_DIRS="test"
JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index 91e2ba1cf10c..84db44eaed66 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -16,7 +16,7 @@
apache/ant-ivy
- https://ant.apache.org/ivy/history/2.5.0
- https://issues.apache.org/jira/browse/IVY
+ https://ant.apache.org/ivy/history/2.5.0/
+ https://issues.apache.org/jira/browse/IVY
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-log4j/, profiles/
commit: 481f30d93f0179c49bec8d5333f40f1b7f3ad274
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:58 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481f30d9
dev-java/ant-apache-log4j: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-apache-log4j/Manifest| 2 --
.../ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild| 15 ---
dev-java/ant-apache-log4j/metadata.xml| 8
profiles/package.mask | 1 -
4 files changed, 26 deletions(-)
diff --git a/dev-java/ant-apache-log4j/Manifest
b/dev-java/ant-apache-log4j/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-apache-log4j/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
deleted file mode 100644
index b7f808b7f60d..
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="log4j-12-api-2"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-
-DEPEND="dev-java/log4j-12-api:2"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/metadata.xml
b/dev-java/ant-apache-log4j/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-apache-log4j/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 3d7d679c86be..ab70a0068ef5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -289,7 +289,6 @@ dev-java/ant-eclipse-ecj
# Unused java libraries. The ant tasks are now provided by dev-java/ant.
# Removal on 2024-04-09.
dev-java/ant-apache-regexp
-dev-java/ant-apache-log4j
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, profiles/, dev-java/ant-eclipse-ecj/
commit: 5e310caf6cb80bc892d9b85a6837feb3b9ed4ae4
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:51:20 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e310caf
dev-java/ant-eclipse-ecj: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 2 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild | 50
.../ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild| 53 --
dev-java/ant-eclipse-ecj/files/ecj-4.15| 7 ---
dev-java/ant-eclipse-ecj/files/ecj-4.26| 7 ---
dev-java/ant-eclipse-ecj/metadata.xml | 15 --
profiles/package.mask | 4 --
7 files changed, 138 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
deleted file mode 100644
index aa67f4731d80..
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
-DIST ecjsrc-4.26.jar 2347137 BLAKE2B
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
SHA512
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
deleted file mode 100644
index 86295bc01b6a..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202003050155"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.15"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-11:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- default
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
deleted file mode 100644
index 478ef5996a68..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202211231800"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.26"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-17:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- default
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-xalan2/, profiles/
commit: ca2b41274660834f6bc95919d399a88b721eb4c8
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:57 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2b4127
dev-java/ant-apache-xalan2: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-apache-xalan2/Manifest| 2 --
.../ant-apache-xalan2-1.10.9.ebuild| 22 --
dev-java/ant-apache-xalan2/metadata.xml| 8
profiles/package.mask | 1 -
4 files changed, 33 deletions(-)
diff --git a/dev-java/ant-apache-xalan2/Manifest
b/dev-java/ant-apache-xalan2/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-apache-xalan2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
deleted file mode 100644
index a46ac087c870..
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-
-DEPEND="dev-java/xalan:0
- dev-java/xalan-serializer:0"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- ant-tasks_src_unpack all
- java-pkg_jar-from xalan-serializer
-}
diff --git a/dev-java/ant-apache-xalan2/metadata.xml
b/dev-java/ant-apache-xalan2/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-apache-xalan2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index e55dafbaf0cf..3d7d679c86be 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -290,7 +290,6 @@ dev-java/ant-eclipse-ecj
# Removal on 2024-04-09.
dev-java/ant-apache-regexp
dev-java/ant-apache-log4j
-dev-java/ant-apache-xalan2
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-swing/, profiles/
commit: 6cee6f6398a3097883c40aed3add0ff82dfc2160 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 13 14:49:55 2024 + Commit: Michał Górny gentoo org> CommitDate: Sat Apr 13 14:54:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cee6f63 dev-java/ant-swing: Remove last-rited pkg Signed-off-by: Michał Górny gentoo.org> dev-java/ant-swing/Manifest| 2 -- dev-java/ant-swing/ant-swing-1.10.9.ebuild | 15 --- dev-java/ant-swing/metadata.xml| 8 profiles/package.mask | 1 - 4 files changed, 26 deletions(-) diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest deleted file mode 100644 index dccd735d44ed.. --- a/dev-java/ant-swing/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild deleted file mode 100644 index c8dfb08b3aa2.. --- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -# No extra dependencies are needed. -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -DESCRIPTION="Apache Ant's optional tasks for Swing" - -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/dev-java/ant-swing/metadata.xml b/dev-java/ant-swing/metadata.xml deleted file mode 100644 index 4221e170cbc0.. --- a/dev-java/ant-swing/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - -https://www.gentoo.org/dtd/metadata.dtd;> - - - j...@gentoo.org - Java - - diff --git a/profiles/package.mask b/profiles/package.mask index c8aa93da1330..f1a00f4020ee 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -292,7 +292,6 @@ dev-java/ant-apache-regexp dev-java/ant-apache-log4j dev-java/ant-apache-xalan2 dev-java/ant-commons-logging -dev-java/ant-swing # Eray Aslan (2024-03-10) # Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-junit4/
commit: cc6983b90f7ed30bf64b9b1f68de4fe147435fc1
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:54 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6983b9
dev-java/ant-junit4: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-junit4/Manifest | 2 --
dev-java/ant-junit4/ant-junit4-1.10.9.ebuild | 37
dev-java/ant-junit4/metadata.xml | 8 --
3 files changed, 47 deletions(-)
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-junit4/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
deleted file mode 100644
index 9eef99a67149..
--- a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="dev-java/junit:4
- ~dev-java/ant-junit-${PV}"
-
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
-
-src_prepare() {
- default
-
- java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
-}
-
-src_install() {
- # No registration as ant-task, would be loaded together with ant-junit.
- java-pkg_dojar build/lib/ant-junit4.jar
-
- # As we dont't want to depend on and-junit in package.env, because it
depends
- # on junit:0. Instead, we "steal" its jar and record it to our
package.env as
- # if it belongs to this package's classpath.
- java-pkg_getjar --build-only ant-junit ant-junit.jar
- java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
-}
diff --git a/dev-java/ant-junit4/metadata.xml b/dev-java/ant-junit4/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-junit4/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-junitlauncher/
commit: 2c505f61da762f2b94b8fb8618b9637f18c59817 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 13 14:49:51 2024 + Commit: Michał Górny gentoo org> CommitDate: Sat Apr 13 14:54:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c505f61 dev-java/ant-junitlauncher: Remove last-rited pkg Signed-off-by: Michał Górny gentoo.org> dev-java/ant-junitlauncher/Manifest| 2 -- dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild | 12 dev-java/ant-junitlauncher/metadata.xml| 8 3 files changed, 22 deletions(-) diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest deleted file mode 100644 index dccd735d44ed.. --- a/dev-java/ant-junitlauncher/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b -DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4 diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild deleted file mode 100644 index 2b8d03f2e629.. --- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ANT_TASK_JDKVER=1.8 -ANT_TASK_JREVER=1.8 -ANT_TASK_DEPNAME="" - -inherit ant-tasks - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" diff --git a/dev-java/ant-junitlauncher/metadata.xml b/dev-java/ant-junitlauncher/metadata.xml deleted file mode 100644 index 4221e170cbc0.. --- a/dev-java/ant-junitlauncher/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - -https://www.gentoo.org/dtd/metadata.dtd;> - - - j...@gentoo.org - Java - -
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-testutil/, profiles/
commit: e015ee8d27243538d790fb3bd8ff8b8c0a4cea3b
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:52 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e015ee8d
dev-java/ant-testutil: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-testutil/Manifest | 2 --
dev-java/ant-testutil/ant-testutil-1.10.9.ebuild | 37
dev-java/ant-testutil/metadata.xml | 8 -
profiles/package.mask| 1 -
4 files changed, 48 deletions(-)
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-testutil/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
deleted file mode 100644
index 1f1b85e2d3ba..
--- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-solaris"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8
- >=dev-java/junit-4.11:4
- ~dev-java/ant-swing-${PV}
- ~dev-java/ant-junit4-${PV}
- ~dev-java/ant-junitlauncher-${PV}"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8"
-
-# The build system builds much more than it actually packages, so there are
many
-# build-only deps, but since those are quite common, it wasn't worth to patch
it.
-
-src_unpack() {
- ant-tasks_src_unpack base
- java-pkg_jar-from --build-only
junit-4,ant-junit4,ant-junitlauncher,ant-swing
- java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
- eant test-jar
-}
diff --git a/dev-java/ant-testutil/metadata.xml
b/dev-java/ant-testutil/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-testutil/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index e6f121d4929e..c8aa93da1330 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -293,7 +293,6 @@ dev-java/ant-apache-log4j
dev-java/ant-apache-xalan2
dev-java/ant-commons-logging
dev-java/ant-swing
-dev-java/ant-testutil
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-commons-logging/, profiles/
commit: 07897ba13cd30407f91a3f694648f2d4f7c53437
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:56 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07897ba1
dev-java/ant-commons-logging: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-commons-logging/Manifest | 2 --
.../ant-commons-logging/ant-commons-logging-1.10.9.ebuild | 14 --
dev-java/ant-commons-logging/metadata.xml | 8
profiles/package.mask | 1 -
4 files changed, 25 deletions(-)
diff --git a/dev-java/ant-commons-logging/Manifest
b/dev-java/ant-commons-logging/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-commons-logging/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
deleted file mode 100644
index ce6a50054a6c..
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/metadata.xml
b/dev-java/ant-commons-logging/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-commons-logging/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index f1a00f4020ee..e55dafbaf0cf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -291,7 +291,6 @@ dev-java/ant-eclipse-ecj
dev-java/ant-apache-regexp
dev-java/ant-apache-log4j
dev-java/ant-apache-xalan2
-dev-java/ant-commons-logging
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-jai/, profiles/
commit: 4bdeae7f50e9cccad905668d0d7e8b15c82fad0c
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:50 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdeae7f
dev-java/ant-jai: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-jai/Manifest | 2 --
dev-java/ant-jai/ant-jai-1.10.9.ebuild | 16
dev-java/ant-jai/metadata.xml | 8
profiles/package.mask | 1 -
4 files changed, 27 deletions(-)
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-jai/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-jai/ant-jai-1.10.9.ebuild
b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
deleted file mode 100644
index 3a2873b650bb..
--- a/dev-java/ant-jai/ant-jai-1.10.9.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86"
-
-# Unmigrated, has textrels and there's also some source one now too.
-DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jai/metadata.xml b/dev-java/ant-jai/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-jai/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index c442cd59e53d..e6f121d4929e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -294,7 +294,6 @@ dev-java/ant-apache-xalan2
dev-java/ant-commons-logging
dev-java/ant-swing
dev-java/ant-testutil
-dev-java/ant-jai
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-javamail/, profiles/
commit: b7570a76b945941e03b385b0b2922234f399f659
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:44 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7570a76
dev-java/ant-javamail: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-javamail/Manifest | 2 --
dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild | 18 --
dev-java/ant-javamail/metadata.xml | 8
profiles/package.mask | 1 -
4 files changed, 29 deletions(-)
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-javamail/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
deleted file mode 100644
index c02f16c20d31..
--- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
- dev-java/gnu-jaf:1
- dev-java/javax-mail:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/metadata.xml
b/dev-java/ant-javamail/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-javamail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 90ac337c0c20..0bb4eff3e729 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -299,7 +299,6 @@ dev-java/ant-commons-net
dev-java/ant-apache-bsf
dev-java/ant-jmf
dev-java/ant-apache-oro
-dev-java/ant-javamail
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-oro/, profiles/
commit: fa7a0405ef00ceba88fccd23b807ef94784eb828
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:45 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7a0405
dev-java/ant-apache-oro: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-apache-oro/Manifest | 2 --
dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild | 15 ---
dev-java/ant-apache-oro/metadata.xml | 8
profiles/package.mask| 1 -
4 files changed, 26 deletions(-)
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-apache-oro/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
deleted file mode 100644
index 4fa3ab36eac0..
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/metadata.xml
b/dev-java/ant-apache-oro/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-apache-oro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 0bb4eff3e729..1b8cc3ae0ae3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -298,7 +298,6 @@ dev-java/ant-jai
dev-java/ant-commons-net
dev-java/ant-apache-bsf
dev-java/ant-jmf
-dev-java/ant-apache-oro
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-junit/, profiles/
commit: a925b8529af8a98d2e0182f341311befca623fcf
Author: Michał Górny gentoo org>
AuthorDate: Sat Apr 13 14:49:43 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Apr 13 14:54:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a925b852
dev-java/ant-junit: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
dev-java/ant-junit/Manifest| 2 --
dev-java/ant-junit/ant-junit-1.10.9.ebuild | 24
dev-java/ant-junit/metadata.xml| 8
profiles/package.mask | 3 ---
4 files changed, 37 deletions(-)
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-junit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-junit/ant-junit-1.10.9.ebuild
b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
deleted file mode 100644
index cea7fdca5bc1..
--- a/dev-java/ant-junit/ant-junit-1.10.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x64-solaris"
-
-DEPEND="
- dev-java/junit:0
- dev-java/junit:4
-"
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4"
-
-src_compile() {
- eant jar-junit
-}
diff --git a/dev-java/ant-junit/metadata.xml b/dev-java/ant-junit/metadata.xml
deleted file mode 100644
index 4221e170cbc0..
--- a/dev-java/ant-junit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index a7430b141db6..90ac337c0c20 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -293,16 +293,13 @@ dev-java/ant-apache-log4j
dev-java/ant-apache-xalan2
dev-java/ant-commons-logging
dev-java/ant-swing
-dev-java/ant-junit4
dev-java/ant-testutil
-dev-java/ant-junitlauncher
dev-java/ant-jai
dev-java/ant-commons-net
dev-java/ant-apache-bsf
dev-java/ant-jmf
dev-java/ant-apache-oro
dev-java/ant-javamail
-dev-java/ant-junit
# Eray Aslan (2024-03-10)
# Mask experimental software
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 9747881549610f09466271a9ab2bcea66beba152 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 06:40:27 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 12 06:44:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97478815 dev-java/ant: restore blocker Blockers have to be kept for at least 2 years after the relevant packages are gone, ideally longer, because you don't know what state a user is upgrading from or through. Reported both by Flow and on the forums at https://forums.gentoo.org/viewtopic-p-8819323.html. Bug: https://bugs.gentoo.org/922774 Fixes: 36e7245281a7afed509161d26cf1a4ffe55c5688 Signed-off-by: Sam James gentoo.org> dev-java/ant/ant-1.10.14-r3.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild index d1d0486dd712..e79a4cbf5562 100644 --- a/dev-java/ant/ant-1.10.14-r3.ebuild +++ b/dev-java/ant/ant-1.10.14-r3.ebuild @@ -76,6 +76,7 @@ RDEPEND=" !dev-java/ant-apache-log4j !dev-java/ant-apache-xalan2 !dev-java/ant-commons-logging + !
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 2620ae941fdc1bc9883232b4c01f69f3356844bc
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Feb 26 13:54:27 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Mar 10 21:10:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2620ae94
dev-java/ant: drop 1.10.9
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant/ant-1.10.9.ebuild | 47 --
1 file changed, 47 deletions(-)
diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild
deleted file mode 100644
index e68c9948a493..
--- a/dev-java/ant/ant-1.10.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML
configuration files"
-HOMEPAGE="https://ant.apache.org/;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend
jmf
- +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing
testutil xz"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
- ~dev-java/ant-core-${PV}
- ~dev-java/ant-junit-${PV}
- ~dev-java/ant-apache-xalan2-${PV}
- antlr? ( ~dev-java/ant-antlr-${PV} )
- bcel? ( ~dev-java/ant-apache-bcel-${PV} )
- bsf? ( ~dev-java/ant-apache-bsf-${PV} )
- commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
- commonsnet? ( ~dev-java/ant-commons-net-${PV} )
- jai? ( ~dev-java/ant-jai-${PV} )
- javamail? ( ~dev-java/ant-javamail-${PV} )
- jdepend? ( ~dev-java/ant-jdepend-${PV} )
- jmf? ( ~dev-java/ant-jmf-${PV} )
- jsch? ( ~dev-java/ant-jsch-${PV} )
- junit? ( ~dev-java/ant-junit-${PV} )
- junit4? ( ~dev-java/ant-junit4-${PV} )
- junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
- log4j? ( ~dev-java/ant-apache-log4j-${PV} )
- oro? ( ~dev-java/ant-apache-oro-${PV} )
- regexp? ( ~dev-java/ant-apache-regexp-${PV} )
- resolver? ( ~dev-java/ant-apache-resolver-${PV} )
- swing? ( ~dev-java/ant-swing-${PV} )
- testutil? ( ~dev-java/ant-testutil-${PV} )
- X? ( ~dev-java/ant-swing-${PV} )
- xz? ( ~dev-java/ant-xz-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 36e7245281a7afed509161d26cf1a4ffe55c5688
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Feb 27 11:20:43 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Mar 10 21:10:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e72452
dev-java/ant: drop PDEPEND, handle all ant-tasks unconditional
After chenging the JAVA_ANT_E_DEPEND value in java-ant-2.eclass we no
longer need to PDEPEND on dev-java/ant-core.
We also remove the non-existing RDEPEND on pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
.../ant/{ant-1.10.14-r2.ebuild => ant-1.10.14-r3.ebuild} | 16 +++-
dev-java/ant/metadata.xml| 1 +
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild
b/dev-java/ant/ant-1.10.14-r3.ebuild
similarity index 96%
rename from dev-java/ant/ant-1.10.14-r2.ebuild
rename to dev-java/ant/ant-1.10.14-r3.ebuild
index 9a6c7aacc165..d1d0486dd712 100644
--- a/dev-java/ant/ant-1.10.14-r2.ebuild
+++ b/dev-java/ant/ant-1.10.14-r3.ebuild
@@ -20,9 +20,9 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
- junitlauncher log4j oro regexp resolver testutil xalan xz"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x64-solaris"
+IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail
javamail jdepend
+ jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing
testutil xalan xz"
# At least 10 test cases would fail without network
PROPERTIES="test_network"
@@ -71,9 +71,7 @@ DEPEND="
)
xz? ( dev-java/xz-java:0 )
"
-PDEPEND="~dev-java/ant-core-${PV}:0"
RDEPEND="
- !https://www.netrexx.org/downloads.nsp and states:
# "IBM's last NetRexx release, suitable for JVM versions 1.5
and below [...]"
# $(use netrexx && echo ant-netrexx) #
src/etc/poms/ant-netrexx/pom.xml
- ant-swing # no dependencies
+ $(use swing && echo ant-swing) # no dependencies
$(use testutil && echo ant-testutil)
$(use xz && echo ant-xz)
)
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index fbae5fba582e..1c03ec86e251 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -12,6 +12,7 @@
(dev-java/bsf)
Enable commons-logging Ant tasks
Enable commons-net Ant tasks
+Enable imageio Ant tasks
Enable JAI (Java Imaging) Ant task
Enable Jakartamail Ant task
Enable JavaMail Ant task
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 741d4790f8f688a04715b447481adc57c1d888b1
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Feb 26 13:59:33 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Mar 10 21:10:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741d4790
dev-java/ant-core: drop 1.10.9-r5
Bug: https://bugs.gentoo.org/802165
Closes: https://bugs.gentoo.org/202276
Closes: https://bugs.gentoo.org/850430
Closes: https://bugs.gentoo.org/829815
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-core/Manifest | 2 -
dev-java/ant-core/ant-core-1.10.9-r5.ebuild | 159
2 files changed, 161 deletions(-)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
deleted file mode 100644
index dccd735d44ed..
--- a/dev-java/ant-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B
2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704
SHA512
aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B
afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa
SHA512
7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
deleted file mode 100644
index 40333bc9a9d1..
--- a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.ant:ant:1.10.9"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML
configuration files"
-HOMEPAGE="https://ant.apache.org/;
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x64-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}
- doc? (
- dev-java/bcel:0
- dev-java/bsf:2.3
- dev-java/commons-logging:0
- dev-java/commons-net:0
- dev-java/jakarta-activation-api:1
- dev-java/jakarta-regexp:1.4
- dev-java/jakarta-oro:2.0
- dev-java/jdepend:0
- dev-java/jsch:0
- dev-java/log4j-12-api:2
- dev-java/javax-mail:0
- dev-java/sun-jai-bin:0
- dev-java/xalan:0
- dev-java/xml-commons-resolver:0
- dev-java/xz-java:0
- )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${WORKDIR}/${PV}-build.patch"
- "${WORKDIR}/${PV}-launch.patch"
-)
-
-src_prepare() {
- default
-
- eprefixify "${S}/src/script/ant"
-
- # Fixes bug 556008.
- java-ant_xml-rewrite -f build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- # See bug #196080 for more details.
- java-ant_bsfix_one build.xml
- java-pkg-2_src_prepare
-
- # Remove JDK9+ stuff
- einfo "Removing JDK9+ classes (Jmod and Link)"
- rm
"${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
-}
-
-src_compile() {
- export ANT_HOME=""
- # Avoid error message that package ant-core was not found
- export ANT_TASKS="none"
-
- local bsyscp
-
- # This ensures that when building ant with bootstrapped ant,
- # only the source is used for resolving references, and not
- # the classes in bootstrapped ant but jikes in kaffe has issues with
this...
- if ! java-pkg_current-vm-matches kaffe; then
- bsyscp="-Dbuild.sysclasspath=ignore"
- fi
-
- CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal ||
- die "build failed"
-
- if use doc; then
- # All Java packages imported by the source files need to
present in
- # the classpath, otherwise it would be
https://bugs.gentoo.org/780531
- local doc_deps=(
- bcel
- bsf-2.3
- commons-logging
- commons-net
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: e3c35c1f7761be2131f1b2fa835bb6bebc9e3282
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Mar 10 09:15:37 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Mar 10 21:10:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c35c1f
dev-java/ant-core: re-add unstable keywords
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
index b26b93661c3c..c69d378ddc71 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x64-solaris"
DEPEND="
~dev-java/ant-${PV}:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: f428deaf50f0ca67af95432514f23cc032d4f514
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Mar 10 08:53:11 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Mar 10 08:53:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f428deaf
dev-java/ant-core: Stabilize 1.10.14 x86, #922766
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
index 9d093f51c4dd..b26b93661c3c 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
~dev-java/ant-${PV}:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 45779300e852897e5e580e154cab4198e409845d
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Mar 10 08:53:10 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Mar 10 08:53:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45779300
dev-java/ant: Stabilize 1.10.14-r2 x86, #922766
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/ant/ant-1.10.14-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild
b/dev-java/ant/ant-1.10.14-r2.ebuild
index 15e5f18bcc6d..9a6c7aacc165 100644
--- a/dev-java/ant/ant-1.10.14-r2.ebuild
+++ b/dev-java/ant/ant-1.10.14-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
junitlauncher log4j oro regexp resolver testutil xalan xz"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 7535b6b30406bc7768fc72aa692b5e2d316b1912
Author: Sam James gentoo org>
AuthorDate: Sun Mar 3 06:11:16 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 3 06:11:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7535b6b3
dev-java/ant-core: Stabilize 1.10.14 arm64, #922766
Signed-off-by: Sam James gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
index db4cfbb97de3..9d093f51c4dd 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
DEPEND="
~dev-java/ant-${PV}:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 99d53ac326683d70f90d864bd05827a667ca9e1e
Author: Sam James gentoo org>
AuthorDate: Sun Mar 3 06:11:15 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 3 06:11:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d53ac3
dev-java/ant: Stabilize 1.10.14-r2 arm64, #922766
Signed-off-by: Sam James gentoo.org>
dev-java/ant/ant-1.10.14-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild
b/dev-java/ant/ant-1.10.14-r2.ebuild
index 86d121ae7f7e..15e5f18bcc6d 100644
--- a/dev-java/ant/ant-1.10.14-r2.ebuild
+++ b/dev-java/ant/ant-1.10.14-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
junitlauncher log4j oro regexp resolver testutil xalan xz"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: fe7e9f0bd18d6cdb26ac0696dec67d7f11cb338c
Author: Sam James gentoo org>
AuthorDate: Sun Feb 25 23:06:31 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 25 23:06:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7e9f0b
dev-java/ant-core: Stabilize 1.10.14 ppc64, #922766
Signed-off-by: Sam James gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
index 06844430df56..db4cfbb97de3 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
DEPEND="
~dev-java/ant-${PV}:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 4ad610064d829d09f3e1127dfd636b1dcdc50296
Author: Sam James gentoo org>
AuthorDate: Sun Feb 25 23:06:30 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 25 23:06:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad61006
dev-java/ant: Stabilize 1.10.14-r2 ppc64, #922766
Signed-off-by: Sam James gentoo.org>
dev-java/ant/ant-1.10.14-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild
b/dev-java/ant/ant-1.10.14-r2.ebuild
index ade50d31059b..86d121ae7f7e 100644
--- a/dev-java/ant/ant-1.10.14-r2.ebuild
+++ b/dev-java/ant/ant-1.10.14-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
junitlauncher log4j oro regexp resolver testutil xalan xz"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: a2a093601f8e2c93b6aab79f196eb7135fd901cd
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Feb 25 19:19:37 2024 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Feb 25 19:19:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a09360
dev-java/ant-core: Stabilize 1.10.14 amd64, #922766
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
index 4894ae3382bf..06844430df56 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
DEPEND="
~dev-java/ant-${PV}:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 74bfcd565618315b01c1b1928f0f5abee96c315d
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Feb 25 19:19:36 2024 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Feb 25 19:19:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74bfcd56
dev-java/ant: Stabilize 1.10.14-r2 amd64, #922766
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/ant/ant-1.10.14-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild
b/dev-java/ant/ant-1.10.14-r2.ebuild
index c06cf4bd6631..ade50d31059b 100644
--- a/dev-java/ant/ant-1.10.14-r2.ebuild
+++ b/dev-java/ant/ant-1.10.14-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
junitlauncher log4j oro regexp resolver testutil xalan xz"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: cdc11496e40e896aa34ce4f71af6f3b19b22f6f9
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Feb 20 00:03:50 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Feb 20 10:22:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc11496
dev-java/ant: adjust conditional dependency
Closes: https://bugs.gentoo.org/925013
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35432
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant/{ant-1.10.14-r1.ebuild => ant-1.10.14-r2.ebuild} | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant/ant-1.10.14-r1.ebuild
b/dev-java/ant/ant-1.10.14-r2.ebuild
similarity index 98%
rename from dev-java/ant/ant-1.10.14-r1.ebuild
rename to dev-java/ant/ant-1.10.14-r2.ebuild
index 1df865e20886..c06cf4bd6631 100644
--- a/dev-java/ant/ant-1.10.14-r1.ebuild
+++ b/dev-java/ant/ant-1.10.14-r2.ebuild
@@ -45,7 +45,10 @@ DEPEND="
commonsnet? ( dev-java/commons-net:0 )
jai? ( dev-java/sun-jai-bin:0 )
jakartamail? ( dev-java/jakarta-mail:0 )
- javamail? ( dev-java/javax-mail:0 )
+ javamail? (
+ dev-java/jakarta-activation-api:1
+ dev-java/javax-mail:0
+ )
jdepend? ( >=dev-java/jdepend-2.10-r1:0 )
jsch? ( dev-java/jsch:0 )
junit4? ( dev-java/junit:4 )
@@ -293,7 +296,7 @@ src_compile() {
taskdeps ant-commons-net commons-net
taskdeps ant-jai sun-jai-bin
taskdeps ant-jakartamail jakarta-mail
- taskdeps ant-javamail javax-mail
+ taskdeps ant-javamail 'javax-mail jakarta-activation-api-1'
taskdeps ant-jdepend jdepend
taskdeps ant-jsch jsch
taskdeps ant-junit junit-4 ant-junit/src/resources
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: ba021a3e8b9cf2c4825891561ad8a03688df4177
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Jan 25 16:57:21 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 26 01:26:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba021a3e
dev-java/ant-core: Keyword 1.10.14 x86, #922765
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
index 6084381556eb..4894ae3382bf 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
DEPEND="
~dev-java/ant-${PV}:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 22e564d8fa9f4cf34dd9916e365ff8a2a541892d
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Jan 25 16:36:07 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 26 01:26:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e564d8
dev-java/ant-core: Keyword 1.10.14 ppc64, #922765
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
index be672e0f7aa2..6084381556eb 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
DEPEND="
~dev-java/ant-${PV}:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 0fdf46ba1949163c66a69793a227624ffab31a87
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Jan 25 16:57:20 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 26 01:26:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fdf46ba
dev-java/ant: Keyword 1.10.14-r1 x86, #922765
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-java/ant/ant-1.10.14-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant/ant-1.10.14-r1.ebuild
b/dev-java/ant/ant-1.10.14-r1.ebuild
index c42e5fe70790..1df865e20886 100644
--- a/dev-java/ant/ant-1.10.14-r1.ebuild
+++ b/dev-java/ant/ant-1.10.14-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
junitlauncher log4j oro regexp resolver testutil xalan xz"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 23fef30c0362a3f9b9fe3ef7700137e8728db81e
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Jan 25 16:36:06 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 26 01:26:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23fef30c
dev-java/ant: Keyword 1.10.14-r1 ppc64, #922765
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
dev-java/ant/ant-1.10.14-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant/ant-1.10.14-r1.ebuild
b/dev-java/ant/ant-1.10.14-r1.ebuild
index a76c380e0571..c42e5fe70790 100644
--- a/dev-java/ant/ant-1.10.14-r1.ebuild
+++ b/dev-java/ant/ant-1.10.14-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
junitlauncher log4j oro regexp resolver testutil xalan xz"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 14c2a1176deeac1b017dc40f90ea968eaff74524
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed Jan 24 10:07:08 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Jan 24 10:48:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c2a117
dev-java/ant: soft block all internal 1.10.9 ant-tasks
Closes: https://bugs.gentoo.org/922810
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34985
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant/ant-1.10.14-r1.ebuild | 21 +
1 file changed, 21 insertions(+)
diff --git a/dev-java/ant/ant-1.10.14-r1.ebuild
b/dev-java/ant/ant-1.10.14-r1.ebuild
index a18ee50e36b4..a76c380e0571 100644
--- a/dev-java/ant/ant-1.10.14-r1.ebuild
+++ b/dev-java/ant/ant-1.10.14-r1.ebuild
@@ -71,6 +71,27 @@ DEPEND="
PDEPEND="~dev-java/ant-core-${PV}:0"
RDEPEND="
!=virtual/jre-1.8:*
"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 4ec336471ed5734e0e4e022712a17f85e0375622
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Jan 23 15:27:08 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 23 18:50:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec33647
dev-java/ant: soft-block https://bugs.gentoo.org/922774
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34976
Signed-off-by: Sam James gentoo.org>
dev-java/ant/{ant-1.10.14.ebuild => ant-1.10.14-r1.ebuild} | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-java/ant/ant-1.10.14.ebuild
b/dev-java/ant/ant-1.10.14-r1.ebuild
similarity index 99%
rename from dev-java/ant/ant-1.10.14.ebuild
rename to dev-java/ant/ant-1.10.14-r1.ebuild
index 57167d57a761..a18ee50e36b4 100644
--- a/dev-java/ant/ant-1.10.14.ebuild
+++ b/dev-java/ant/ant-1.10.14-r1.ebuild
@@ -69,7 +69,10 @@ DEPEND="
xz? ( dev-java/xz-java:0 )
"
PDEPEND="~dev-java/ant-core-${PV}:0"
-RDEPEND=">=virtual/jre-1.8:*"
+RDEPEND="
+ !=virtual/jre-1.8:*
+"
DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW )
PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/files/
commit: 8e71593bfd6ec4899f9b95c5f1354df0409fdcc5 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Jan 23 12:41:33 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 18:50:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e71593b dev-java/ant: reduce file size of ant-1.10.14-JavaTest.patch 'files/ant-1.10.14-JavaTest.patch' exceeds 20.0 KiB in size; 22.3 KiB total Bug: https://bugs.gentoo.org/922775 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Sam James gentoo.org> dev-java/ant/files/ant-1.10.14-JavaTest.patch | 270 +- 1 file changed, 1 insertion(+), 269 deletions(-) diff --git a/dev-java/ant/files/ant-1.10.14-JavaTest.patch b/dev-java/ant/files/ant-1.10.14-JavaTest.patch index 1c291c71e5f3..9143cba43ca2 100644 --- a/dev-java/ant/files/ant-1.10.14-JavaTest.patch +++ b/dev-java/ant/files/ant-1.10.14-JavaTest.patch @@ -1,272 +1,4 @@ -There were 12 failures: -1) testExcepting(org.apache.tools.ant.taskdefs.JavaTest) -java.lang.AssertionError: -Expected: a string containing "Exception raised inside called program" - but: was "Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath - at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141) - at org.apache.tools.ant.taskdefs.Java.run(Java.java:892) - at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232) - at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136) - at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109) - at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299) - at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99) - at org.apache.tools.ant.Task.perform(Task.java:350) - at org.apache.tools.ant.Target.execute(Target.java:449) - at org.apache.tools.ant.Target.performTasks(Target.java:470) - at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401) - at org.apache.tools.ant.Project.executeTarget(Project.java:1374) - at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197) - at org.apache.tools.ant.taskdefs.JavaTest.testExcepting(JavaTest.java:246) - at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) - at java.base/java.lang.reflect.Method.invoke(Method.java:580) - at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) - at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) - at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61) - at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) - at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) - at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:54) - at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258) - at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) - at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100) - at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103) - at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63) - at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) - at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) - at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) - at org.junit.runners.ParentRunner.run(ParentRunner.java:413) - at org.junit.runners.Suite.runChild(Suite.java:128) - at org.junit.runners.Suite.runChild(Suite.java:27) - at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) - at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) - at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) - at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) - at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) - at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) - at org.junit.runners.ParentRunner.run(ParentRunner.java:413) - at
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/files/, dev-java/ant/
commit: 9098e1e1174f7f4eef989a538e29a8469e816363
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Dec 24 18:38:07 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Jan 23 09:42:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9098e1e1
dev-java/ant: add 1.10.14 - CVE-2021-36373, CVE-2021-36374
Starting from version 1.10.14, dev-java/ant provides itself ant.jar and
ant-launcher.jar instead of having them symlinked from dev-java/ant-core.
Jar files of ant-tasks and optionally their javadoc get installed
conditionally according to their USE flags. Those which have no compile
dependencies are installed unconditionally
Closes: https://bugs.gentoo.org/921269
Bug: https://bugs.gentoo.org/850430
Bug: https://bugs.gentoo.org/802165
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant/Manifest | 2 +
dev-java/ant/ant-1.10.14.ebuild | 369 +++
dev-java/ant/files/1.10.9-launch.patch | 361 +++
dev-java/ant/files/ant-1.10.14-AntTest.patch| 28 ++
dev-java/ant/files/ant-1.10.14-AntlibTest.patch | 40 +++
dev-java/ant/files/ant-1.10.14-JavaTest.patch | 370
dev-java/ant/files/ant-1.10.14-LinkTest.patch | 87 ++
dev-java/ant/files/ant-1.10.14-PathTest.patch | 30 ++
8 files changed, 1287 insertions(+)
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
new file mode 100644
index ..a5c99e19154a
--- /dev/null
+++ b/dev-java/ant/Manifest
@@ -0,0 +1,2 @@
+DIST apache-ant-1.10.14-src.tar.gz 4692736 BLAKE2B
b07a2e61fecd4f10056ca2688615ccf02c551bba0f5749f50c2be710e90306e8044b7c557359300654d93971d94520e92f593da44b1c20626db4701d499cddff
SHA512
435f97a276d88a86022c5f0680f3c2a16dc36be95adac3d797a2609d96921840a57393c8f5ef8313193146115bd6a87bd4790a4a272c44f7beec892fd6528c10
+DIST apache-ant-1.10.14-src.tar.gz.asc 833 BLAKE2B
d9a4b4b3cb22762f25b34651dc81c2f13af38e73fdca27bc2de562539cd8f1692744ac5ccf535a2c61d3035a129f30bafac133872f9ba0ed7b259393b0f4cdf6
SHA512
ff2e79c991f68a5c38c0b47556ca5f5301c1a8be219a9eddf8d2e17b09eed7f0426770c2dc18114ea432f0200ac824d71da633ad7881025692ce5ad4baa899ee
diff --git a/dev-java/ant/ant-1.10.14.ebuild b/dev-java/ant/ant-1.10.14.ebuild
new file mode 100644
index ..57167d57a761
--- /dev/null
+++ b/dev-java/ant/ant-1.10.14.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+ org.apache.ant:ant:${PV}
+ org.apache.ant:ant-launcher:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig prefix
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML
configuration files"
+HOMEPAGE="https://ant.apache.org/;
+SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.gz
+ verify-sig? (
https://downloads.apache.org/ant/source/apache-${P}-src.tar.gz.asc )"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch
junit junit4
+ junitlauncher log4j oro regexp resolver testutil xalan xz"
+
+# At least 10 test cases would fail without network
+PROPERTIES="test_network"
+RESTRICT="test"
+
+REQUIRED_USE="
+ junit4? ( junit )
+ test? ( bsf )
+ testutil? ( junit )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
+# jdk-11:* because it needs java/util/spi/ToolProvider, available since Java 9.
+DEPEND="
+ >=virtual/jdk-11:*
+ bcel? ( dev-java/bcel:0 )
+ bsf? ( dev-java/bsf:2.3 )
+ commonslogging? ( dev-java/commons-logging:0 )
+ commonsnet? ( dev-java/commons-net:0 )
+ jai? ( dev-java/sun-jai-bin:0 )
+ jakartamail? ( dev-java/jakarta-mail:0 )
+ javamail? ( dev-java/javax-mail:0 )
+ jdepend? ( >=dev-java/jdepend-2.10-r1:0 )
+ jsch? ( dev-java/jsch:0 )
+ junit4? ( dev-java/junit:4 )
+ junit? ( dev-java/junit:4 )
+ junitlauncher? ( dev-java/junit:5[vintage] )
+ log4j? ( dev-java/log4j-12-api:2 )
+ oro? ( dev-java/jakarta-oro:2.0 )
+ regexp? ( dev-java/jakarta-regexp:1.4 )
+ resolver? ( dev-java/xml-commons-resolver:0 )
+ test? (
+ dev-java/antunit:0
+ dev-java/bsf:2.3[javascript]
+ dev-java/bsh:0
+ dev-java/hamcrest-library:1.3
+ dev-java/xerces:2
+ )
+ xalan? (
+ dev-java/xalan:0
+ dev-java/xalan-serializer:0
+ )
+ xz? ( dev-java/xz-java:0 )
+"
+PDEPEND="~dev-java/ant-core-${PV}:0"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW )
+PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 6eb34f53b4055c0e8b4c0fdb95a3d86c2fbfed96 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Dec 24 10:11:26 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Jan 23 09:42:33 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb34f53 dev-java/ant: more USE flags to metadata.xml Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/ant/metadata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml index 927b0498a3da..fbae5fba582e 100644 --- a/dev-java/ant/metadata.xml +++ b/dev-java/ant/metadata.xml @@ -13,6 +13,7 @@ Enable commons-logging Ant tasks Enable commons-net Ant tasks Enable JAI (Java Imaging) Ant task +Enable Jakartamail Ant task Enable JavaMail Ant task Enable Jdepend Ant tasks Enable JMF (Java Media Framework) Ant tasks @@ -26,6 +27,7 @@ Enable Apache Resolver Ant tasks Enable Swing Ant tasks Enable optional test util classes +Enable Apache Xalan2 Ant tasks Enable XZ Ant tasks
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: d3e32af191491a385fea63c285d0eade85d329c1
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Dec 26 10:47:11 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Jan 23 09:42:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e32af1
dev-java/ant-core: compatibility symlink, add 1.10.14
Some packages still depend on dev-java/ant-core just for getting ant.jar
into their classpath. Starting from version 1.10.14 ant-core is no longer
used as a regular package. Instead, ant.jar is provided by dev-java/ant.
This version of dev-java/ant-core provides only the package.env file to
register the compatibility symlink /usr/share/ant-core/lib/ant.jar which
is provided by dev-java/ant.
Delete this package at the end of transition period after adjusting
JAVA_ANT_E_DEPEND in java-ant-2.eclass when all reverse dependencies
have switched to dev-java/ant.
Bug: https://bugs.gentoo.org/802165
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 26 ++
1 file changed, 26 insertions(+)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild
b/dev-java/ant-core/ant-core-1.10.14.ebuild
new file mode 100644
index ..be672e0f7aa2
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="Compatibility link to ant-core for >=dev-java/ant-1.10.14"
+HOMEPAGE="https://ant.apache.org/;
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="
+ ~dev-java/ant-${PV}:0
+ >=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_compile() { :; }
+
+src_install() {
+ java-pkg_regjar /usr/share/ant-core/lib/ant.jar
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-bsf/
commit: f0fde37cd58d86211a613b453d2f480128e2b817
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Jan 4 09:04:16 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Jan 4 12:29:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0fde37c
dev-java/ant-apache-bsf: drop python flag
jython was removed with commit #e4d717fb45
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34635
Signed-off-by: Miroslav Šulc gentoo.org>
.../{ant-apache-bsf-1.10.9.ebuild => ant-apache-bsf-1.10.9-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild
similarity index 83%
rename from dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
rename to dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild
index f6ba1618b0fe..04cdcf48579c 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ inherit ant-tasks
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
IUSE="python javascript tcl"
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
+DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?]"
RDEPEND="${DEPEND}"
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: f08ffdc068486820c01506309d941b9c3d172964 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Dec 11 09:05:11 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 11 19:21:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08ffdc0 dev-java/ant-core: add github upstream metadata Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/ant-core/metadata.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml index 4221e170cbc0..d0bcffb03628 100644 --- a/dev-java/ant-core/metadata.xml +++ b/dev-java/ant-core/metadata.xml @@ -5,4 +5,9 @@ j...@gentoo.org Java + + https://bz.apache.org/bugzilla/enter_bug.cgi?product=Ant + https://ant.apache.org/manual/ + apache/ant +
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/
commit: 95cacf358c4a8cf3f747e82d3af83aab422c9a41 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Dec 11 09:09:02 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 11 19:21:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cacf35 dev-java/ant: add github upstream metadata Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/34231 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/ant/metadata.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml index 219a679d237b..927b0498a3da 100644 --- a/dev-java/ant/metadata.xml +++ b/dev-java/ant/metadata.xml @@ -28,4 +28,9 @@ Enable optional test util classes Enable XZ Ant tasks + +https://bz.apache.org/bugzilla/enter_bug.cgi?product=Ant +https://ant.apache.org/manual/ +apache/ant +
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-testutil/
commit: d1d8d43fc1ae0c6f18a037275843fc9b7e4480e3 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 10 10:04:07 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 10 10:04:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d8d43f dev-java/ant-testutil: Keyword 1.10.9 arm, #919663 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/ant-testutil/ant-testutil-1.10.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild index bb2cee641200..1f1b85e2d3ba 100644 --- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild +++ b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild @@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8 inherit ant-tasks DESCRIPTION="Apache Ant's optional test utility classes" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" CDEPEND="dev-java/ant-core:0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-swing/
commit: a3da24bbe225ec11f00fa58a42e6eba30a832f37 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 10 10:04:08 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 10 10:04:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3da24bb dev-java/ant-swing: Keyword 1.10.9 arm, #919663 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/ant-swing/ant-swing-1.10.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild index 44a3c4cc8671..c8dfb08b3aa2 100644 --- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild +++ b/dev-java/ant-swing/ant-swing-1.10.9.ebuild @@ -12,4 +12,4 @@ inherit ant-tasks DESCRIPTION="Apache Ant's optional tasks for Swing" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-swing/
commit: 034b4da10bde4b71df16a6eba428aee5f5eaf934 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 10 10:01:52 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 10 10:01:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034b4da1 dev-java/ant-swing: Keyword 1.10.9 arm64, #919663 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/ant-swing/ant-swing-1.10.9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild index e204f8e1393e..44a3c4cc8671 100644 --- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild +++ b/dev-java/ant-swing/ant-swing-1.10.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,4 +12,4 @@ inherit ant-tasks DESCRIPTION="Apache Ant's optional tasks for Swing" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-testutil/
commit: b339565a37bea5b3442cfdfa9c9aa0116b6ff90a Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 10 10:01:51 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 10 10:01:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b339565a dev-java/ant-testutil: Keyword 1.10.9 arm64, #919663 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/ant-testutil/ant-testutil-1.10.9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild index 23d1ace04929..bb2cee641200 100644 --- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild +++ b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8 inherit ant-tasks DESCRIPTION="Apache Ant's optional test utility classes" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" CDEPEND="dev-java/ant-core:0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: 0ecd6a1cbd27662cbefe91b037b0e84da17e4a4c
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Nov 24 12:18:10 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Nov 24 12:52:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ecd6a1c
dev-java/ant-eclipse-ecj: drop 4.27
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33966
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild| 51 --
dev-java/ant-eclipse-ecj/files/ecj-4.27| 7 ---
3 files changed, 59 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index b59cc023f485..aa67f4731d80 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,3 +1,2 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.26.jar 2347137 BLAKE2B
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
SHA512
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
-DIST ecjsrc-4.27.jar 2301849 BLAKE2B
77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95
SHA512
689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
deleted file mode 100644
index 015b0f144035..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202303020300"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.27"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-17:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.27
b/dev-java/ant-eclipse-ecj/files/ecj-4.27
deleted file mode 100644
index 7b66f97ff0c7..
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.27
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.27"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.27*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18
19 20 21"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20
21"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.27,ant-eclipse-ecj-4.27"
-GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: ea1bca6fc232c49f2c473a3d56fdfc6d84488e89
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Nov 20 17:15:59 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Nov 24 11:14:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1bca6f
dev-java/ant-eclipse-ecj: drop 4.29
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33916
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild| 51 --
dev-java/ant-eclipse-ecj/files/ecj-4.29| 7 ---
3 files changed, 59 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index 3166accfca73..b59cc023f485 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.26.jar 2347137 BLAKE2B
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
SHA512
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
DIST ecjsrc-4.27.jar 2301849 BLAKE2B
77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95
SHA512
689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
-DIST ecjsrc-4.29.jar 2319437 BLAKE2B
2ce2432a80c725a169337737908bc8d1fb531e57380e05e069558463ffece2f4851635796550d14c3383c1e365c06802937618dd3ddd90472a541f1ca491dc91
SHA512
d9ead697d8e880b3bc537117446453d21f648a0bcbe3044123acfd7c9118dae12211ebba1efc4a0fe890ea25d80634da09792398caea7121c87c084eb921e78f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
deleted file mode 100644
index 15e5b9477ade..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202309031000"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.29"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-17:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.29
b/dev-java/ant-eclipse-ecj/files/ecj-4.29
deleted file mode 100644
index 4cb14c005ddf..
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.29
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.29"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.29*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18
19 20 21"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20
21"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.29,ant-eclipse-ecj-4.29"
-GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
commit: d586bf56034bbdfe249733eb90413edb99fb0406
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Nov 18 20:16:34 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Nov 20 07:40:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d586bf56
dev-java/ant-eclipse-ecj: add 4.29
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33894
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 +
.../ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild| 51 ++
dev-java/ant-eclipse-ecj/files/ecj-4.29| 7 +++
3 files changed, 59 insertions(+)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index b59cc023f485..3166accfca73 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.26.jar 2347137 BLAKE2B
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
SHA512
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
DIST ecjsrc-4.27.jar 2301849 BLAKE2B
77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95
SHA512
689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
+DIST ecjsrc-4.29.jar 2319437 BLAKE2B
2ce2432a80c725a169337737908bc8d1fb531e57380e05e069558463ffece2f4851635796550d14c3383c1e365c06802937618dd3ddd90472a541f1ca491dc91
SHA512
d9ead697d8e880b3bc537117446453d21f648a0bcbe3044123acfd7c9118dae12211ebba1efc4a0fe890ea25d80634da09792398caea7121c87c084eb921e78f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
new file mode 100644
index ..15e5b9477ade
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.29.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202309031000"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.29"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+ dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+ >=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ # Remove everything but the Ant component.
+ find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.29
b/dev-java/ant-eclipse-ecj/files/ecj-4.29
new file mode 100644
index ..4cb14c005ddf
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.29
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.29"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.29*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18
19 20 21"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20
21"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.29,ant-eclipse-ecj-4.29"
+GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: e60cdb461e1777d6ef4481896ef606007257beff
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Nov 18 20:10:14 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Nov 20 07:40:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60cdb46
dev-java/ant-eclipse-ecj: add 4.27
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 +
.../ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild| 51 ++
dev-java/ant-eclipse-ecj/files/ecj-4.27| 7 +++
3 files changed, 59 insertions(+)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index aa67f4731d80..b59cc023f485 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,2 +1,3 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.26.jar 2347137 BLAKE2B
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
SHA512
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
+DIST ecjsrc-4.27.jar 2301849 BLAKE2B
77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95
SHA512
689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
new file mode 100644
index ..015b0f144035
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.27.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202303020300"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="4.27"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+ dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+ >=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ # Remove everything but the Ant component.
+ find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.27
b/dev-java/ant-eclipse-ecj/files/ecj-4.27
new file mode 100644
index ..7b66f97ff0c7
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.27
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.27"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.27*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18
19 20 21"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20
21"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.27,ant-eclipse-ecj-4.27"
+GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 342d9f72d06aaeb487868e4802dd304d087f4117
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Nov 18 20:38:02 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Nov 20 07:40:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342d9f72
dev-java/ant-eclipse-ecj: update SRC_URI
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
index 84f3cb357c3b..478ef5996a68 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -11,7 +11,7 @@ DMF="R-${PV}-202211231800"
DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 741a827c995f01173233eb459ddb7fb434a8b627
Author: Sam James gentoo org>
AuthorDate: Tue Jul 18 17:20:22 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 18 17:20:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741a827c
dev-java/ant-eclipse-ecj: Keyword 4.15-r1 arm64, #906822
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 862088b18ee7..d2fbd988988e 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="4.15"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 5941414eed035cd7ec92a66005c0d721058cf2ce
Author: Sam James gentoo org>
AuthorDate: Tue Jul 18 17:20:46 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 18 17:20:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5941414e
dev-java/ant-eclipse-ecj: Keyword 4.26 arm, #906822
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
index bb79434825c6..84f3cb357c3b 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="4.26"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: a4b0b84523de8927ef3cfdb1de4fc192d2903bae
Author: Sam James gentoo org>
AuthorDate: Tue Jul 18 17:20:23 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 18 17:20:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b0b845
dev-java/ant-eclipse-ecj: Keyword 4.26 arm64, #906822
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
index 6d6f07db4551..bb79434825c6 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="4.26"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 4708b167747ac6257779c3ef0c0ad57ded0a0e2c
Author: Sam James gentoo org>
AuthorDate: Tue Jul 18 17:20:45 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 18 17:20:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4708b167
dev-java/ant-eclipse-ecj: Keyword 4.15-r1 arm, #906822
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index d2fbd988988e..86295bc01b6a 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="4.15"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
commit: f3dd1c0fd0113fe0af9b0b16227e746facb17384
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun May 21 07:49:07 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 21 07:56:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3dd1c0f
dev-java/ant-eclipse-ecj: drop 4.22-r2, 4.25
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 2 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild | 53 --
.../ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild| 53 --
dev-java/ant-eclipse-ecj/files/ecj-4.22| 7 ---
dev-java/ant-eclipse-ecj/files/ecj-4.25| 7 ---
5 files changed, 122 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index ca4978dfd113..aa67f4731d80 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,4 +1,2 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
-DIST ecjsrc-4.22.jar 2358194 BLAKE2B
e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7
SHA512
cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
-DIST ecjsrc-4.25.jar 2340770 BLAKE2B
e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776
SHA512
b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
DIST ecjsrc-4.26.jar 2347137 BLAKE2B
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
SHA512
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
deleted file mode 100644
index a2d55cda8ca1..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202111241800"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.22"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-17:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- default
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
deleted file mode 100644
index 22c9edfdafa4..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202208311800"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.25"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-# though technically both could
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: dcf51aa5ffeeb036986fbc93836d38439185dcfa
Author: Sam James gentoo org>
AuthorDate: Thu Feb 16 06:03:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 16 06:03:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf51aa5
dev-java/ant-eclipse-ecj: Stabilize 4.26 amd64, #894528
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
index 3d1bcdeef390..2d18443083ef 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.26"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: b5300f45ceb4612738db24765eaeab515bd300ed
Author: Sam James gentoo org>
AuthorDate: Thu Feb 16 06:03:29 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 16 06:03:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5300f45
dev-java/ant-eclipse-ecj: Stabilize 4.26 x86, #894528
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
index 749502b069a2..3d1bcdeef390 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.26"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: ea9e89146066ca7b0bc9166dd3c1397087ea0606
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jan 15 09:41:28 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jan 15 09:50:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9e8914
dev-java/ant-eclipse-ecj: bump to 4.26
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 +
.../ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild| 53 ++
dev-java/ant-eclipse-ecj/files/ecj-4.26| 7 +++
3 files changed, 61 insertions(+)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index 00234773ac65..ca4978dfd113 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B
e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7
SHA512
cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
DIST ecjsrc-4.25.jar 2340770 BLAKE2B
e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776
SHA512
b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
+DIST ecjsrc-4.26.jar 2347137 BLAKE2B
22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534
SHA512
e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
new file mode 100644
index ..749502b069a2
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202211231800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.26"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+ dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+ >=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+ default
+
+ # Remove everything but the Ant component.
+ find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
+
+ rm build.xml || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.26
b/dev-java/ant-eclipse-ecj/files/ecj-4.26
new file mode 100644
index ..950088453264
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.26
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18
19"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.26,ant-eclipse-ecj-4.26"
+GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: d8fabeb21cedc2b7ed97ea589e9e3829f94e7a41
Author: Sam James gentoo org>
AuthorDate: Sat Nov 12 02:39:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 12 02:39:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8fabeb2
dev-java/ant-eclipse-ecj: Stabilize 4.25 amd64, #880871
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
index 68b185c4ceca..22c9edfdafa4 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.25"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: b3f65f032b769b9dea04fd8371e9ace12d813ed6
Author: Sam James gentoo org>
AuthorDate: Fri Nov 11 21:16:10 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 11 21:16:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f65f03
dev-java/ant-eclipse-ecj: Stabilize 4.25 x86, #880871
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
index 0d981d39a2f3..68b185c4ceca 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.25"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
commit: 9fb1c83e22a53f4a2e7d6cf55166ee6152d2f0c3
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Oct 11 18:22:47 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Oct 11 18:25:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb1c83e
dev-java/ant-eclipse-ecj: bump to 4.25
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 +
.../ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild| 53 ++
dev-java/ant-eclipse-ecj/files/ecj-4.25| 7 +++
3 files changed, 61 insertions(+)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index 8445570a7ca7..00234773ac65 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,2 +1,3 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B
e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7
SHA512
cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
+DIST ecjsrc-4.25.jar 2340770 BLAKE2B
e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776
SHA512
b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
new file mode 100644
index ..0d981d39a2f3
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202208311800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.25"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+ dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+ >=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+ default
+
+ # Remove everything but the Ant component.
+ find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
+
+ rm build.xml || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.25
b/dev-java/ant-eclipse-ecj/files/ecj-4.25
new file mode 100644
index ..b1f3ece05dd7
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.25
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.25,ant-eclipse-ecj-4.25"
+GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
commit: 041050f4566d75669767b7bd18f7d8572bf39b37
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Oct 11 18:24:08 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Oct 11 18:25:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=041050f4
dev-java/ant-eclipse-ecj: forcing reinstall of fixed ecj-4.22 file
Signed-off-by: Miroslav Šulc gentoo.org>
.../{ant-eclipse-ecj-4.22-r1.ebuild => ant-eclipse-ecj-4.22-r2.ebuild} | 0
dev-java/ant-eclipse-ecj/files/ecj-4.22 | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
similarity index 100%
rename from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
rename to dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22
b/dev-java/ant-eclipse-ecj/files/ecj-4.22
index 5bbcc318d9ba..57e76b76c539 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.22
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -1,5 +1,5 @@
JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.22*"
SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 338436e01bc5f4306016a21a64b1d79bbaf56e78
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 5 07:28:45 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 5 07:28:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=338436e0
dev-java/ant-eclipse-ecj: x86 stable wrt bug #856427
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
index 2c7d8a416caa..a2d55cda8ca1 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.22"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 3694260d26f4ec52679e041bdce554d8836577c6
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 5 06:00:54 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 5 06:00:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3694260d
dev-java/ant-eclipse-ecj: amd64 stable wrt bug #856427
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
index 786880f955b6..2c7d8a416caa 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/;
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.22"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/
commit: 3866480495014d649cf24acfff2a41b894bd44cd
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Jun 19 17:43:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jun 20 02:50:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38664804
dev-java/ant-eclipse-ecj: adjust filename
Closes: https://bugs.gentoo.org/853082
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25979
Signed-off-by: Sam James gentoo.org>
dev-java/ant-eclipse-ecj/files/{ecj-4.22-r1 => ecj-4.22} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1
b/dev-java/ant-eclipse-ecj/files/ecj-4.22
similarity index 100%
rename from dev-java/ant-eclipse-ecj/files/ecj-4.22-r1
rename to dev-java/ant-eclipse-ecj/files/ecj-4.22
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/, dev-java/ant-eclipse-ecj/files/
commit: 5e2230441f0c6fa0c6869032a4ace0e3b6f4ab31
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed Jun 1 06:31:07 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Jun 2 06:20:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e223044
dev-java/ant-eclipse-ecj: drop 4.5.1, 4.22
Closes: https://bugs.gentoo.org/835390
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild| 53 --
.../ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild | 48
dev-java/ant-eclipse-ecj/files/ecj-4.22| 7 ---
dev-java/ant-eclipse-ecj/files/ecj-4.5 | 7 ---
5 files changed, 116 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index e75203b23696..8445570a7ca7 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,3 +1,2 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B
e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7
SHA512
cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
-DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B
6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36
SHA512
ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
deleted file mode 100644
index 1fc9f8bb2347..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202111241800"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="https://www.eclipse.org/;
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.22"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0"
-# though technically both could be set to 1.8 and it would
-# compile using jdk 11+, it would not compile using jdk 1.8
-# because eclipse ecj has min jdk 11
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*"
-DEPEND="${CDEPEND}
- >=virtual/jdk-11:*"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- default
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
deleted file mode 100644
index 8260b02e4de7..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201509040015"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.5"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- >=dev-java/ant-core-1.7"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.7"
-DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.7"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-java_prepare() {
- # Remove everything but the Ant component.
- find org -type f ! -path
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: ebf1a8c251eefb23889ac984b0b033e4957df894
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun May 15 11:27:40 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon May 30 08:36:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf1a8c2
dev-java/ant-eclipse-ecj: virtual/jdk-11:*" -> -17:*
Bug: https://bugs.gentoo.org/831559
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Florian Schmaus gentoo.org>
.../ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild | 53 ++
dev-java/ant-eclipse-ecj/files/ecj-4.22-r1 | 7 +++
2 files changed, 60 insertions(+)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
new file mode 100644
index ..786880f955b6
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202111241800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.22"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+ dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+ >=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+ default
+
+ # Remove everything but the Ant component.
+ find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
+
+ rm build.xml || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1
b/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1
new file mode 100644
index ..5bbcc318d9ba
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.22,ant-eclipse-ecj-4.22"
+GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: b24498c7e502a18bac9b4f42e94bf479bb96a34c
Author: Florian Schmaus gentoo org>
AuthorDate: Sat May 21 18:17:55 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sat May 21 18:17:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24498c7
dev-java/ant-core: lower min Java to 8 again
Turns out that raising ant-core's min Java requirement to 9, while
fixing bug #831290, renders ant unable to build pure Java 8 packages (of
which we have a few, most prominently jna), see bug #846782.
We go back to Java 8 again, until we find a better solution.
Bug: https://bugs.gentoo.org/846782
Bug: https://bugs.gentoo.org/831290
Signed-off-by: Florian Schmaus gentoo.org>
.../ant-core/{ant-core-1.10.9-r4.ebuild => ant-core-1.10.9-r5.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r4.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
similarity index 99%
rename from dev-java/ant-core/ant-core-1.10.9-r4.ebuild
rename to dev-java/ant-core/ant-core-1.10.9-r5.ebuild
index 9efad621827e..f7540588ca05 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r4.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND=">=virtual/jdk-1.9:*"
+CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
doc? (
dev-java/bcel:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: c9826d526b71e87c2ec94a7ea7dce4952cd8a79f
Author: Florian Schmaus gentoo org>
AuthorDate: Fri May 20 08:20:06 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri May 20 08:45:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9826d52
dev-java/ant-core: raise minimum Java version to 9
While Ant runs on Java 8, it is hit by API changes of ByteBuffer.flip():
The flip() method returns Buffer in Java 8 and ByteBuffer in Java 9. If
Ant is now emerged and build using Java 8, and then run with Java 9 (or
higher), a NoSuchMethodError is potentially thrown invoking ant:
BUILD FAILED
/var/tmp/portage/net-vpn/i2p-1.6.1/work/i2p-1.6.1/build.xml:1634:
java.lang.NoSuchMethodError: java.nio.CharBuffer.flip()Ljava/nio/CharBuffer;
at
org.apache.tools.ant.util.ReaderInputStream.(ReaderInputStream.java:81)
at
org.apache.tools.ant.util.ReaderInputStream.(ReaderInputStream.java:66)
at
org.apache.tools.ant.util.ReaderInputStream.(ReaderInputStream.java:118)
at
org.apache.tools.ant.util.ReaderInputStream.(ReaderInputStream.java:93)
at
org.apache.tools.ant.taskdefs.Concat$ConcatResource.getInputStream(Concat.java:421)
at
org.apache.tools.ant.util.ResourceUtils.copyUsingStreams(ResourceUtils.java:766)
at
org.apache.tools.ant.util.ResourceUtils.copyResource(ResourceUtils.java:437)
at org.apache.tools.ant.taskdefs.Concat.execute(Concat.java:802)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
at org.apache.tools.ant.Task.perform(Task.java:350)
at org.apache.tools.ant.Target.execute(Target.java:449)
at org.apache.tools.ant.Target.performTasks(Target.java:470)
at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
at
org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
at org.apache.tools.ant.Project.executeTargets(Project.java:1264)
at org.apache.tools.ant.Main.runBuild(Main.java:827)
at org.apache.tools.ant.Main.startAnt(Main.java:223)
at org.apache.tools.ant.launch.Launcher.run(Launcher.java:284)
Raising the minimum required Java version to 9 fixes this.
Closes: https://bugs.gentoo.org/839093
Signed-off-by: Florian Schmaus gentoo.org>
.../ant-core/{ant-core-1.10.9-r3.ebuild => ant-core-1.10.9-r4.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r4.ebuild
similarity index 99%
rename from dev-java/ant-core/ant-core-1.10.9-r3.ebuild
rename to dev-java/ant-core/ant-core-1.10.9-r4.ebuild
index f7540588ca05..9efad621827e 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r4.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND=">=virtual/jdk-1.8:*"
+CDEPEND=">=virtual/jdk-1.9:*"
DEPEND="${CDEPEND}
doc? (
dev-java/bcel:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 91b99620c8467babedf053d46ab92a42352cb4e8 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed May 11 08:05:33 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Thu May 12 18:23:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b99620 dev-java/ant-core: MAVEN_ID Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/25439 Signed-off-by: Florian Schmaus gentoo.org> dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild index 6ceeeb9e569f..f7540588ca05 100644 --- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild +++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild @@ -9,6 +9,7 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP="true" # Rewriting build.xml files for the testcases has no use at the moment. JAVA_PKG_BSFIX_ALL="no" JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.ant:ant:1.10.9" inherit java-pkg-2 java-ant-2 prefix
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 38410f1ebecca52179e8ccc20bb1db7a1d5593b0
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed May 11 06:51:30 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed May 11 07:33:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38410f1e
dev-java/ant-eclipse-ecj: update HOMEPAGE, SRC_URI
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25437
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild | 4 ++--
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 30383fea53f5..449a22d33932 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -10,8 +10,8 @@ inherit java-pkg-2 java-pkg-simple prefix
DMF="R-${PV}-202003050155"
DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
index 21b3dfc5b0d8..1fc9f8bb2347 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
@@ -10,8 +10,8 @@ inherit java-pkg-2 java-pkg-simple prefix
DMF="R-${PV}-202111241800"
DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+HOMEPAGE="https://www.eclipse.org/;
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
commit: 57dcc8f4528c5745ef59fe3ceaededa8f37537a1
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu May 5 19:13:14 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri May 6 06:15:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57dcc8f4
dev-java/ant-ivy: drop 2.5.0
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0.ebuild | 182 --
1 file changed, 182 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
deleted file mode 100644
index 4e3633fe3296..
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.ivy:ivy:2.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple java-osgi
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/;
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-CDEPEND="
- dev-java/ant-core:0
- dev-java/bcpg:0
- dev-java/bcprov:0
- dev-java/commons-httpclient:4
- dev-java/commons-vfs:2
- dev-java/httpcore:0
- dev-java/jakarta-oro:2.0
- dev-java/jsch:0
- dev-java/jsch-agent-proxy:0
- test? (
- dev-java/ant-junit:0
- dev-java/ant-junit4:0
- dev-java/ant-junitlauncher:0
- dev-java/ant-testutil:0
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/xmlunit:1
- )"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README.adoc )
-
-S="${WORKDIR}/apache-ivy-${PV}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,commons-httpclient-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
-JAVA_MAIN_CLASS="org.apache.ivy.Main"
-JAVA_SRC_DIR="src/java"
-JAVA_RESOURCE_DIRS="resources/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
-JAVA_TEST_SRC_DIR="test-src/java"
-JAVA_TEST_RESOURCE_DIRS="test"
-JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
-
-# according to 57,60 build-release.xml
-#
https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
-JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true
-Divy.home=/tmp -D/offline=true"
-
-# Several tests require a certain treatment to "generate-bundles":
-#
https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
-#
-#
-# The procedure is coded in
https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
-# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
-# So the failing tests will be excluded, saved for a later attempt.
-#
-# Not excluding any test classes results in "Tests run: 1109, Failures: 98"
-# Excluding those test classes listed below leads to "OK (812 tests)"
-JAVA_TEST_EXCLUDES=(
- #
https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
- # test.class.pattern = *Test
- "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
- "org.apache.ivy.core.TestPerformance" # not in scope
- "org.apache.ivy.util.TestXmlHelper" # not in scope
- "org.apache.ivy.TestFixture" # not in scope
- "org.apache.ivy.TestHelper" # not in scope
- #
https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
- #
- "org.apache.ivy.util.url.AbstractURLHandlerTest"
- "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
- "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
- # following excluded tests cause test failures
- "org.apache.ivy.ant.BuildOBRTaskTest" #
Tests run: 3, Failures: 2
- "org.apache.ivy.core.deliver.DeliverTest" #
Tests run: 1, Failures: 1
- "org.apache.ivy.core.module.descriptor.IvyMakePomTest" #
Tests run: 1, Failures: 1
- "org.apache.ivy.core.settings.XmlSettingsParserTest" #
Tests run: 29, Failures: 1
- "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" #
Tests run: 3, Failures: 1
- "org.apache.ivy.osgi.obr.OBRResolverTest" #
Tests run: 16, Failures: 16
- "org.apache.ivy.osgi.repo.BundleRepoTest" #
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
commit: d06a7a840233c687855ac4ba8b7e7c06cc415a0a
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu May 5 18:04:05 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu May 5 18:04:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06a7a84
dev-java/ant-ivy: Stabilize 2.5.0-r1 ppc64, #842708
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
index 9fc18455b438..fff42019b905 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
PROPERTIES="test_network"
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
commit: 8329efcd749ffef6c8b99ed62f285545f2eea5e3
Author: Jakov Smolić gentoo org>
AuthorDate: Thu May 5 09:53:42 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu May 5 09:53:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8329efcd
dev-java/ant-ivy: Stabilize 2.5.0-r1 x86, #842708
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
index 179f28f370f6..9fc18455b438 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
PROPERTIES="test_network"
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
commit: 580313acb301dfe608295876a2bc85fa18c3c2e5
Author: Jakov Smolić gentoo org>
AuthorDate: Thu May 5 09:52:46 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu May 5 09:52:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580313ac
dev-java/ant-ivy: Stabilize 2.5.0-r1 amd64, #842708
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
index cb8092656c67..179f28f370f6 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
PROPERTIES="test_network"
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: 6905ec7bf09a1dd2faf8bb83cca42b4a968fdf57
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun May 1 16:10:45 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 1 16:34:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6905ec7b
dev-java/ant-eclipse-ecj: drop 4.10-r1, 4.13
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25277
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 2 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild | 48 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild| 50 --
dev-java/ant-eclipse-ecj/files/ecj-4.10| 7 ---
dev-java/ant-eclipse-ecj/files/ecj-4.13| 7 ---
5 files changed, 114 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index 03ff7d5e8f22..e75203b23696 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,5 +1,3 @@
-DIST ecjsrc-4.10.jar 2036945 BLAKE2B
cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092
SHA512
e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
-DIST ecjsrc-4.13.jar 2074963 BLAKE2B
d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1
SHA512
f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B
e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7
SHA512
cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B
6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36
SHA512
ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
deleted file mode 100644
index 720f27959e1a..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201812060815"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.10"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- >=dev-java/ant-core-1.7"
-RDEPEND="${CDEPEND}
- >=virtual/jre-11"
-DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-11"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-java_prepare() {
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
deleted file mode 100644
index a7881b3908e8..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201909161045"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
commit: db3aaa98f9cc425b339f97ba8bc0491f921eefda
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Apr 1 10:10:23 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Apr 5 09:01:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3aaa98
dev-java/ant-ivy: Switch to httpcomponents-client, restrict to jdk:1.8
dev-java/httpcomponents-client was in
slot 4 of dev-java/commons-httpclient before.
Restrict to jdk:1.8 as it would fail with jdk-17
src/java/org/apache/ivy/util/FileUtil.java:49: error: cannot find symbol
import static java.util.jar.Pack200.newUnpacker;
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24848
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 184 +++
1 file changed, 184 insertions(+)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
new file mode 100644
index ..cb8092656c67
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.ivy:ivy:2.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple java-osgi
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/;
+SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/bcpg:0
+ dev-java/bcprov:0
+ dev-java/httpcomponents-client
+ dev-java/commons-vfs:2
+ dev-java/httpcore:0
+ dev-java/jakarta-oro:2.0
+ dev-java/jsch:0
+ dev-java/jsch-agent-proxy:0
+ test? (
+ dev-java/ant-junit:0
+ dev-java/ant-junit4:0
+ dev-java/ant-junitlauncher:0
+ dev-java/ant-testutil:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/xmlunit:1
+ )"
+
+# Restrict to jdk:1.8 since java.util.jar.Pack200 was removed.
+DEPEND="${CDEPEND}
+ virtual/jdk:1.8"
+RDEPEND="${CDEPEND}
+ virtual/jre:1.8"
+
+DOCS=( LICENSE NOTICE README.adoc )
+
+S="${WORKDIR}/apache-ivy-${PV}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_MAIN_CLASS="org.apache.ivy.Main"
+JAVA_SRC_DIR="src/java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_SRC_DIR="test-src/java"
+JAVA_TEST_RESOURCE_DIRS="test"
+JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
+
+# according to 57,60 build-release.xml
+#
https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
+JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true
-Divy.home=/tmp -D/offline=true"
+
+# Several tests require a certain treatment to "generate-bundles":
+#
https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
+#
+#
+# The procedure is coded in
https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
+# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
+# So the failing tests will be excluded, saved for a later attempt.
+#
+# Not excluding any test classes results in "Tests run: 1109, Failures: 98"
+# Excluding those test classes listed below leads to "OK (812 tests)"
+JAVA_TEST_EXCLUDES=(
+ #
https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
+ # test.class.pattern = *Test
+ "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
+ "org.apache.ivy.core.TestPerformance" # not in scope
+ "org.apache.ivy.util.TestXmlHelper" # not in scope
+ "org.apache.ivy.TestFixture" # not in scope
+ "org.apache.ivy.TestHelper" # not in scope
+ #
https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
+ #
+ "org.apache.ivy.util.url.AbstractURLHandlerTest"
+ "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
+ "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
+ # following excluded tests cause test failures
+ "org.apache.ivy.ant.BuildOBRTaskTest" #
Tests run: 3, Failures: 2
+ "org.apache.ivy.core.deliver.DeliverTest" #
Tests run: 1, Failures: 1
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 3c846f881452347f7c4b03ba44b3960f8cd0512f
Author: Jakov Smolić gentoo org>
AuthorDate: Wed Mar 30 11:08:45 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed Mar 30 11:08:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c846f88
dev-java/ant-eclipse-ecj: Stabilize 4.15-r1 x86, #835417
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 5957b5aefbe2..30383fea53f5 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/;
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.15"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-log4j/
commit: af8fd38b56733c112d5617e65fac312081db8443
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Mar 28 08:22:36 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Mar 29 06:06:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8fd38b
dev-java/ant-apache-log4j: Drop 1.10.9
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24788
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild | 15 ---
1 file changed, 15 deletions(-)
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
deleted file mode 100644
index d30b5fb9410a..
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-log4j/
commit: deb91134e76d543e632a4bd69196abdefe7741a9
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 28 06:52:45 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 28 06:52:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb91134
dev-java/ant-apache-log4j: x86 stable wrt bug #835504
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
index 4bec07068b8b..c48b772e49be 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j-12-api-2"
inherit ant-tasks
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/log4j-12-api:2"
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-log4j/
commit: 32d9377249fc01db91cd6c864d7f80149f56f68b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Mar 27 06:24:43 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Mar 27 06:24:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d93772
dev-java/ant-apache-log4j: amd64 stable wrt bug #835504
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
index 4450b56942d3..4bec07068b8b 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j-12-api-2"
inherit ant-tasks
-KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/log4j-12-api:2"
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-log4j/
commit: d444cb2365c02da19b54ee7e12f37ab614d3e24f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Mar 26 19:48:32 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Mar 26 19:48:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d444cb23
dev-java/ant-apache-log4j: ppc64 stable wrt bug #835504
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
index 89617f7176fe..4450b56942d3 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j-12-api-2"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/log4j-12-api:2"
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 8d405f429ce717a0a0683ba2f43bfd2315b1f1c8
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Mar 22 11:34:36 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Mar 22 17:47:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d405f42
dev-java/ant-core: Drop 1.10.9
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24707
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/ant-core/ant-core-1.10.9.ebuild | 109 ---
1 file changed, 109 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild
b/dev-java/ant-core/ant-core-1.10.9.ebuild
deleted file mode 100644
index 86eeb87ed9ba..
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML
configuration files"
-HOMEPAGE="https://ant.apache.org/;
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${WORKDIR}/${PV}-build.patch"
- "${WORKDIR}/${PV}-launch.patch"
-)
-
-src_prepare() {
- default
-
- eprefixify "${S}/src/script/ant"
-
- # Fixes bug 556008.
- java-ant_xml-rewrite -f build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- # See bug #196080 for more details.
- java-ant_bsfix_one build.xml
- java-pkg-2_src_prepare
-
- # Remove JDK9+ stuff
- einfo "Removing JDK9+ classes (Jmod and Link)"
- rm
"${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
-}
-
-src_compile() {
- export ANT_HOME=""
- # Avoid error message that package ant-core was not found
- export ANT_TASKS="none"
-
- local bsyscp
-
- # This ensures that when building ant with bootstrapped ant,
- # only the source is used for resolving references, and not
- # the classes in bootstrapped ant but jikes in kaffe has issues with
this...
- if ! java-pkg_current-vm-matches kaffe; then
- bsyscp="-Dbuild.sysclasspath=ignore"
- fi
-
- CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
- $(use_doc javadocs) || die "build failed"
-}
-
-src_install() {
- dodir /usr/share/ant/lib
-
- for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
- java-pkg_dojar build/lib/${jar}
- dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
- done
-
- dobin src/script/ant
-
- dodir /usr/share/${PN}/bin
- for each in antRun antRun.pl runant.pl runant.py ; do
- dobin "${S}/src/script/${each}"
- dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
- done
- dosym ../${PN}/bin /usr/share/ant/bin
-
- insinto /usr/share/${PN}
- doins -r dist/etc
- dosym ../${PN}/etc /usr/share/ant/etc
-
- echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
- doenvd "${T}/20ant"
-
- dodoc NOTICE README WHATSNEW KEYS
-
- if use doc; then
- dodoc -r manual/*
- java-pkg_dojavadoc --symlink manual/api build/javadocs
- fi
-
- use source && java-pkg_dosrc src/main/*
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 36c9c568992f4f981a82de9b1868bef5b56682c0
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Mar 22 11:25:30 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Mar 22 11:25:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c9c568
dev-java/ant-core: ppc64 stable wrt bug #835500
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index f3900c689f26..6ceeeb9e569f 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@
SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: d013a51e9c108968182cc446351d0e1edccc4aee
Author: Jakov Smolić gentoo org>
AuthorDate: Tue Mar 22 09:26:51 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Tue Mar 22 09:26:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d013a51e
dev-java/ant-core: Stabilize 1.10.9-r3 x86, #835500
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index 194912140473..f3900c689f26 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@
SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: ca90e6b39b2740e43d0a7583c96e5288f5909cfd
Author: Jakov Smolić gentoo org>
AuthorDate: Tue Mar 22 09:26:17 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Tue Mar 22 09:26:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca90e6b3
dev-java/ant-core: Stabilize 1.10.9-r3 amd64, #835500
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index a165bea4858b..194912140473 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@
SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 1746c2caf877e7b678a5028ecff4bfcfb8899ff1
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Mar 22 08:37:38 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Mar 22 08:37:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1746c2ca
dev-java/ant-core: Stabilize 1.10.9-r3 arm64, #835500
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index 5e02bb8b0df4..a165bea4858b 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@
SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-javamail/
commit: 7cc3e5c8205f53f1a277bacb40366694f34fa513
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Mar 3 08:02:25 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Mar 3 08:02:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc3e5c8
dev-java/ant-javamail: removed obsolete 1.10.9
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-javamail/ant-javamail-1.10.9.ebuild | 18 --
1 file changed, 18 deletions(-)
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
deleted file mode 100644
index 5619e69090d8..
--- a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
- dev-java/gnu-jaf:1
- dev-java/oracle-javamail:0"
-RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-javamail/
commit: 895965180913d15ab5a792942cfe9eb58244d766 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Mar 3 07:34:08 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Mar 3 07:34:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89596518 dev-java/ant-javamail: ppc64 stable wrt bug #834481 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild index c4985d27dd91..b48933c6f765 100644 --- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild +++ b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild @@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" ) inherit ant-tasks -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # needs some classes from javax.activation.* which are not in jdk 11 DEPEND="virtual/jdk:1.8
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: 280adf70b9686e0ae923c6ee7a1e3c0a5d1d1951
Author: Miroslav Šulc gentoo org>
AuthorDate: Wed Mar 2 20:42:26 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Mar 2 20:52:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280adf70
dev-java/ant-eclipse-ecj: dropped 4.21
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild| 54 --
dev-java/ant-eclipse-ecj/files/ecj-4.21| 7 ---
3 files changed, 62 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index 92d1bdc98603..03ff7d5e8f22 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,6 +1,5 @@
DIST ecjsrc-4.10.jar 2036945 BLAKE2B
cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092
SHA512
e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
DIST ecjsrc-4.13.jar 2074963 BLAKE2B
d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1
SHA512
f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
-DIST ecjsrc-4.21.jar 2264087 BLAKE2B
2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a
SHA512
ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
DIST ecjsrc-4.22.jar 2358194 BLAKE2B
e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7
SHA512
cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B
6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36
SHA512
ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
deleted file mode 100644
index 0b394b88d26a..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-202109060500"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT=$(ver_cut 1-2)
-IUSE=""
-
-CDEPEND="
- ~dev-java/eclipse-ecj-${PV}:${SLOT}
- dev-java/ant-core:0
-"
-RDEPEND="${CDEPEND}
- >=virtual/jre-11:*
-"
-DEPEND="${CDEPEND}
- >=virtual/jdk-11:*
-"
-BDEPEND="app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-src_prepare() {
- default
-
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.21
b/dev-java/ant-eclipse-ecj/files/ecj-4.21
deleted file mode 100644
index 1db5895e6426..
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.21
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.21"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/, dev-java/ant-eclipse-ecj/
commit: 0d0521c9173b629632b9ba9329759e1db5cf5305
Author: Miroslav Šulc gentoo org>
AuthorDate: Wed Mar 2 20:38:43 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Mar 2 20:52:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0521c9
dev-java/ant-eclipse-ecj: bump to 4.22
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 +
.../ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild| 53 ++
dev-java/ant-eclipse-ecj/files/ecj-4.22| 7 +++
3 files changed, 61 insertions(+)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index 73b44b992ff9..92d1bdc98603 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -2,4 +2,5 @@ DIST ecjsrc-4.10.jar 2036945 BLAKE2B
cf9e50e53dac970a0b6b1231024a4efdc9adc92e025
DIST ecjsrc-4.13.jar 2074963 BLAKE2B
d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1
SHA512
f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.21.jar 2264087 BLAKE2B
2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a
SHA512
ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
+DIST ecjsrc-4.22.jar 2358194 BLAKE2B
e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7
SHA512
cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B
6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36
SHA512
ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
new file mode 100644
index ..21b3dfc5b0d8
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202111241800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/;
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.22"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+ dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+ >=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-11:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+ default
+
+ # Remove everything but the Ant component.
+ find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
+
+ rm build.xml || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22
b/dev-java/ant-eclipse-ecj/files/ecj-4.22
new file mode 100644
index ..5bbcc318d9ba
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.22,ant-eclipse-ecj-4.22"
+GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-javamail/
commit: c348f1f70adc0367b482f8b27df47fa0b28fe92b Author: Jakov Smolić gentoo org> AuthorDate: Wed Mar 2 08:44:23 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Mar 2 08:44:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c348f1f7 dev-java/ant-javamail: Stabilize 1.10.9-r1 amd64, #834481 Signed-off-by: Jakov Smolić gentoo.org> dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild index 4168b32358bc..15be40427537 100644 --- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild +++ b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild @@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" ) inherit ant-tasks -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # needs some classes from javax.activation.* which are not in jdk 11 DEPEND="virtual/jdk:1.8
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-javamail/
commit: a47fb7080673bdce442e9664686651bb8ceba27a Author: Jakov Smolić gentoo org> AuthorDate: Wed Mar 2 08:44:50 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Mar 2 08:44:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47fb708 dev-java/ant-javamail: Stabilize 1.10.9-r1 x86, #834481 Signed-off-by: Jakov Smolić gentoo.org> dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild index 15be40427537..c4985d27dd91 100644 --- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild +++ b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild @@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" ) inherit ant-tasks -KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # needs some classes from javax.activation.* which are not in jdk 11 DEPEND="virtual/jdk:1.8
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-apache-log4j/
commit: 950be69f338f50dc237dee30c23bd05a661c7989
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Jan 1 08:49:31 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Feb 24 09:48:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950be69f
dev-java/ant-apache-log4j: Switch to log4j-12-api:2
ant-tasks.eclass: EAPI 8 is not supported yet.
Closes: https://bugs.gentoo.org/830922
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24106
Signed-off-by: Miroslav Šulc gentoo.org>
.../ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild| 15 +++
1 file changed, 15 insertions(+)
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
new file mode 100644
index ..89617f7176fe
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="log4j-12-api-2"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/log4j-12-api:2"
+RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/files/
commit: 6d57a116403d919c186b86b3b7f5b26650208097 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Feb 23 17:21:53 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Feb 24 09:28:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d57a116 dev-java/ant-eclipse-ecj: remove unused file Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/24330 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/ant-eclipse-ecj/files/ecj-4.4 | 7 --- 1 file changed, 7 deletions(-) diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.4 b/dev-java/ant-eclipse-ecj/files/ecj-4.4 deleted file mode 100644 index 36fef918e57b.. --- a/dev-java/ant-eclipse-ecj/files/ecj-4.4 +++ /dev/null @@ -1,7 +0,0 @@ -JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.4" -PACKAGE="=dev-java/ant-eclipse-ecj-4.4*" -SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7" -SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7" -ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter" -ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.4,ant-eclipse-ecj-4.4" -GENERATION="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/
commit: 5c4841b38679b8debb5af29f773fcf81cbe03475
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Feb 18 21:27:18 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Feb 19 09:44:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4841b3
dev-java/ant-eclipse-ecj: Drop 4.4.2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-eclipse-ecj/Manifest | 1 -
.../ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild | 48 --
2 files changed, 49 deletions(-)
diff --git a/dev-java/ant-eclipse-ecj/Manifest
b/dev-java/ant-eclipse-ecj/Manifest
index c7a2c4f75045..73b44b992ff9 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -2,5 +2,4 @@ DIST ecjsrc-4.10.jar 2036945 BLAKE2B
cf9e50e53dac970a0b6b1231024a4efdc9adc92e025
DIST ecjsrc-4.13.jar 2074963 BLAKE2B
d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1
SHA512
f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
DIST ecjsrc-4.15.jar 2166228 BLAKE2B
794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297
SHA512
ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.21.jar 2264087 BLAKE2B
2e5da35829a8a7f907e154dbb093bb496e799088d1d4694c7c9b8ceb5bac9affaac4c4fb3a347bdb49afde7f0143220d1ac27ea4ab369770150e316cf56bae9a
SHA512
ab940d18f1d5fcbeef3b903a7d719ce6b1dd900d87be08f7a916d6a7d65d8b83b44332dea1642c8d75e2baac3ba8dc27faef659e365cee5f500db99aa9675ce7
-DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B
402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07
SHA512
53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B
6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36
SHA512
ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
deleted file mode 100644
index 72245b3883f7..
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201502041700"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/;
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.4"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- >=dev-java/ant-core-1.7"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
-DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-java_prepare() {
- # Remove everything but the Ant component.
- find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" !
-name "JDTCompilerAdapter.java" -delete || die
-
- rm build.xml || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die
"jar update failed"
-}
-
-src_install() {
- java-pkg-simple_src_install
- insinto /usr/share/java-config-2/compiler
- doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 74e792668ba568d285725e9446c1b4d39a76d2d2
Author: Miroslav Šulc gentoo org>
AuthorDate: Sat Feb 19 09:19:55 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Feb 19 09:25:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e79266
dev-java/ant-core: 1.10.9-r2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r2.ebuild | 158
1 file changed, 158 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
deleted file mode 100644
index 8ff88e179ea9..
--- a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML
configuration files"
-HOMEPAGE="https://ant.apache.org/;
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}
- doc? (
- dev-java/bcel:0
- dev-java/bsf:2.3
- dev-java/commons-logging:0
- dev-java/commons-net:0
- dev-java/jakarta-activation-api:1
- dev-java/jakarta-regexp:1.4
- dev-java/jakarta-oro:2.0
- dev-java/jdepend:0
- dev-java/jsch:0
- dev-java/log4j:0
- dev-java/javax-mail:0
- dev-java/sun-jai-bin:0
- dev-java/xalan:0
- dev-java/xml-commons-resolver:0
- dev-java/xz-java:0
- )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${WORKDIR}/${PV}-build.patch"
- "${WORKDIR}/${PV}-launch.patch"
-)
-
-src_prepare() {
- default
-
- eprefixify "${S}/src/script/ant"
-
- # Fixes bug 556008.
- java-ant_xml-rewrite -f build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- # See bug #196080 for more details.
- java-ant_bsfix_one build.xml
- java-pkg-2_src_prepare
-
- # Remove JDK9+ stuff
- einfo "Removing JDK9+ classes (Jmod and Link)"
- rm
"${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
-}
-
-src_compile() {
- export ANT_HOME=""
- # Avoid error message that package ant-core was not found
- export ANT_TASKS="none"
-
- local bsyscp
-
- # This ensures that when building ant with bootstrapped ant,
- # only the source is used for resolving references, and not
- # the classes in bootstrapped ant but jikes in kaffe has issues with
this...
- if ! java-pkg_current-vm-matches kaffe; then
- bsyscp="-Dbuild.sysclasspath=ignore"
- fi
-
- CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal ||
- die "build failed"
-
- if use doc; then
- # All Java packages imported by the source files need to
present in
- # the classpath, otherwise it would be
https://bugs.gentoo.org/780531
- local doc_deps=(
- bcel
- bsf-2.3
- commons-logging
- commons-net
- jakarta-activation-api-1
- jakarta-oro-2.0
- jakarta-regexp-1.4
- jdepend
- jsch
- log4j
- javax-mail
- sun-jai-bin
- xalan
- xml-commons-resolver
- xz-java
- )
- for dep in "${doc_deps[@]}"; do
- java-pkg_jar-from --build-only --into lib/optional/
"${dep}"
- done
- # This file imports netrexx.lang.Rexx, which is not available
- # from ::gentoo. Fortunately, there is not a dev-java/ant-*
- # package for it, so even if we could generate documentation
- # for it, it would be irrelevant
- rm
src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java ||
- die "Failed to remove Java source file blocking Javadoc
generation"
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: e61498c775c4925d46c06c5f2384d48d24c7d3ac
Author: Yuan Liao gmail com>
AuthorDate: Thu Feb 17 18:22:28 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Feb 19 09:25:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61498c7
dev-java/ant-core: Switch to log4j-12-api:2
Closes: https://bugs.gentoo.org/831715
Signed-off-by: Yuan Liao gmail.com>
Closes:
https://github.com/gentoo/gentoo/pull/24261/commits/26f95069c6aefc34dfa5e8cadcc944f6635d38f7
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 158
1 file changed, 158 insertions(+)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
new file mode 100644
index ..5e02bb8b0df4
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML
configuration files"
+HOMEPAGE="https://ant.apache.org/;
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}
+ doc? (
+ dev-java/bcel:0
+ dev-java/bsf:2.3
+ dev-java/commons-logging:0
+ dev-java/commons-net:0
+ dev-java/jakarta-activation-api:1
+ dev-java/jakarta-regexp:1.4
+ dev-java/jakarta-oro:2.0
+ dev-java/jdepend:0
+ dev-java/jsch:0
+ dev-java/log4j-12-api:2
+ dev-java/javax-mail:0
+ dev-java/sun-jai-bin:0
+ dev-java/xalan:0
+ dev-java/xml-commons-resolver:0
+ dev-java/xz-java:0
+ )"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${WORKDIR}/${PV}-build.patch"
+ "${WORKDIR}/${PV}-launch.patch"
+)
+
+src_prepare() {
+ default
+
+ eprefixify "${S}/src/script/ant"
+
+ # Fixes bug 556008.
+ java-ant_xml-rewrite -f build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ # See bug #196080 for more details.
+ java-ant_bsfix_one build.xml
+ java-pkg-2_src_prepare
+
+ # Remove JDK9+ stuff
+ einfo "Removing JDK9+ classes (Jmod and Link)"
+ rm
"${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
+}
+
+src_compile() {
+ export ANT_HOME=""
+ # Avoid error message that package ant-core was not found
+ export ANT_TASKS="none"
+
+ local bsyscp
+
+ # This ensures that when building ant with bootstrapped ant,
+ # only the source is used for resolving references, and not
+ # the classes in bootstrapped ant but jikes in kaffe has issues with
this...
+ if ! java-pkg_current-vm-matches kaffe; then
+ bsyscp="-Dbuild.sysclasspath=ignore"
+ fi
+
+ CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal ||
+ die "build failed"
+
+ if use doc; then
+ # All Java packages imported by the source files need to
present in
+ # the classpath, otherwise it would be
https://bugs.gentoo.org/780531
+ local doc_deps=(
+ bcel
+ bsf-2.3
+ commons-logging
+ commons-net
+ jakarta-activation-api-1
+ jakarta-oro-2.0
+ jakarta-regexp-1.4
+ jdepend
+ jsch
+ log4j-12-api-2
+ javax-mail
+ sun-jai-bin
+ xalan
+ xml-commons-resolver
+ xz-java
+ )
+ for dep in "${doc_deps[@]}"; do
+ java-pkg_jar-from --build-only --into lib/optional/
"${dep}"
+ done
+ # This file imports netrexx.lang.Rexx, which is not available
+ # from ::gentoo. Fortunately, there is not a dev-java/ant-*
+ # package for it, so even if we could generate documentation
+ # for it, it would be irrelevant
+ rm
[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
commit: 4aba550072ebec9355bda94608ff0aa33a73d0dc
Author: Yuan Liao gmail com>
AuthorDate: Thu Jan 27 00:40:30 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Feb 3 06:55:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aba5500
dev-java/ant-core: Enable USE="doc" on all architectures for 1.10.9-r2
Closes: https://bugs.gentoo.org/831424
Signed-off-by: Yuan Liao gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24007
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r2.ebuild | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
index d43683dda998..8ff88e179ea9 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
@@ -23,12 +23,9 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Some dependencies for building Javadoc are unavailable on these architectures
-REQUIRED_USE="doc? ( !arm !arm64 )"
-
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
- doc? ( !arm? ( !arm64? (
+ doc? (
dev-java/bcel:0
dev-java/bsf:2.3
dev-java/commons-logging:0
@@ -44,7 +41,7 @@ DEPEND="${CDEPEND}
dev-java/xalan:0
dev-java/xml-commons-resolver:0
dev-java/xz-java:0
- ) ) )"
+ )"
RDEPEND="${CDEPEND}"
S="${WORKDIR}/${MY_P}"
