gentoo auto-resync : 12:03:2024 - 12:46:41

8 files changed, 6 insertions, 153 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9d3fe2431319..5cdfb1c2b1e7 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 278ca320c4da..1512634dac76 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -6,5 +6,5 @@ AUX ant-1.10.14-LinkTest.patch 4329 BLAKE2B d4165d378dd63cab2a9d813c9d26c1ef7404
 AUX ant-1.10.14-PathTest.patch 1114 BLAKE2B 870f35f250b4cd31317972c09f4a90eb26b71a8f198d1e96a085f99e0d6e41fd06c0598bcdae35c400aa8ba9b65e52b7dc0d7119308c60c8573a185907f2b7ba SHA512 9847fb3f6f3c2a37ac1e483ca7ac5685cc3d296b92ae35816fc4c58bb4de57d89196c50fabfa546efbec2303ea360066658507be0b4bdaeae3d5ff00e023f498
 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
-EBUILD ant-1.10.14-r3.ebuild 13056 BLAKE2B 10d9035afc8e89f418deafede5119eb1942eb40f13b88944ba85455fe0ba861a84b1fbeda703a838f1f7743672a5db9e46911c8f72f00f8f2d3957e8de801960 SHA512 9fdd8664f751c606cffc8836c7ea551a0b397ffe0b043556251ebaa3224b4b3a427095cf3ba53801ef6c4caa89627c89ff9df86816582d7805e08ac764eb748e
+EBUILD ant-1.10.14-r3.ebuild 13085 BLAKE2B 8fbc97644369036322bd6a54a27f97becf8b2b5433c03fc6a5c2132f88e0642b7ce986412f6c4d5428d0e2ddb19fbc440b43d6a74743cf36fc0cde340c1c5cd2 SHA512 e1679abab70ec459a87fc4845dc852a7ccedeac30e7b73497df6a217c7ac4c79b817c2a3c0549c4ed3211d1a545f41104d5a5ef2ddf05ea79d75aec34a3c4ba8
 MISC metadata.xml 1928 BLAKE2B b48dbca1bf2ab76b0107466c68489722f4ceed5fa53f2a26d983dfd36c74efad96fce9f58d0e6bb5ba1e02d8e44135bcf96bd77b2db7491fd260da907c02fbab SHA512 9313f5e0914d9c64482c4897e659313480630316ca29b57190e976248a63a17b3c293198f82d4143bd25be0766cd4ce9556d2489d76adf74b0203a9dc4998726
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
+	!<dev-java/ant-core-1.10.14
 	!dev-java/ant-swing
 	!dev-java/ant-junit4
 	!dev-java/ant-testutil
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ae045f58f402..00700329e1e6 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -4,9 +4,7 @@ AUX ecj-4.30 402 BLAKE2B e95fd45bcd60440c8b11fc8f0e34eaf40674cd004939ffcaea392f3
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
-EBUILD eclipse-ecj-4.15-r1.ebuild 1470 BLAKE2B fb4ab6095f503f5fa943662004dab08d171616879950a32f784b5db915b7c8d4fbaa4ade23a2f8a0a1eef057d9ddb4007bdccffe58745baf056cef04254bdaec SHA512 019d440dd4e57bbe02954b6b35162cca763bb014096d13180c58d5e17d05da92d20b5222803cca2c44d129b712ee2b6c8155d27caa48abcc5899085a6ba096f3
-EBUILD eclipse-ecj-4.15.ebuild 1736 BLAKE2B c2bb6e3bf06c39d5633c9db215b9ff3047c83c6fb3377281e91e6eae40418e3a34154f7afa3c19edee5411ef08794fcb8fc84e1f2f9eb3c8d0e376bf69c99296 SHA512 b9db554f95148e810076ad3d86abd5f76a4a9942e33def4e31753847e59a7b682088456b7b20e9a1e7a4dc199a7687bd3ea8dfae4fdf691950a737ef2a4f31b6
-EBUILD eclipse-ecj-4.26-r2.ebuild 1800 BLAKE2B 61bbf7dff405680613b3cc04bc6882c396bd35888c2f170d8bd992923a8a9d8368e2984d299a62fde127629bd3bcfe8c4baa5d5782c85d778ee4a57728ae7a06 SHA512 c7076e5d9db3ed851193d8cc3a94e10b90fe3ca418bb4d5f269bacae5f8ec939c4110066e3d0c1efbb5353bcf44af4a018a2a67ed9e4aa14d1ab60bd0f955170
-EBUILD eclipse-ecj-4.26.ebuild 1691 BLAKE2B 108efc14612f98445a7d8c16145fbb493e15ff39f79feef992ff46dd64a07354b181c6f385f0a6a1282ea5b23c96e65646ce1d326ef43e06e89d4d5ef6a22f09 SHA512 2ff8e9c4337d594e5ef72cdc97451330e42ea47e1df3e18d827adadad07407eed6e7e70fe9a3688e7b41faff966f5d6716c5705dafb9fbcb5c43ec41887b57f0
+EBUILD eclipse-ecj-4.15-r1.ebuild 1469 BLAKE2B 53b1b66884af0137998d4ef9429dfc55fffbf25e524e0f3232326e101f79a92aae211598fc9325c0b68f97b6cef22d8034d9eee8f3c07f3fe8df3a32da32873f SHA512 9680872cc1a183d1e45eab18929ca211d1aa8f9174ea4a49ddef2ca5a2f042dba36fac7b74b36d47995d46525a2a83076cf0b4dae83c6f03d46a64464e95024f
+EBUILD eclipse-ecj-4.26-r2.ebuild 1799 BLAKE2B 6ddf7a6394b83267619cdc9124de4677e6537e38c86de05c3fb6521ebcd44ef39f81c85cafe303b4e8fa9b1a7e0e0389308d4dc0dc2d38a0fdfce8d8e17d2bc1 SHA512 b571687d63759b351388051bc1001fd12b506659035d73ef2c3af6b227408e1987f488d9540f6c4af82f5757e8bd5e9ee4b065c68a1022916544e0e5e14c574e
 EBUILD eclipse-ecj-4.30-r1.ebuild 2258 BLAKE2B 41ecb0bdf6ab8b3dd2539521561b7d9e9e4a660837bd5309a0c57409a03ccc7ba2c2a2648b92cb3d82c588a2ba092dde5d0e78ddb2fffdd969938bc2b13d7703 SHA512 807b63fcfcac8379f9605b2773f49778d6ee504f7950505bf45510eb1ca10b83f70bcccd5b893a87bbd5489b5fa7754b1a7f2995167709fc665d041b248112c5
 MISC metadata.xml 747 BLAKE2B 734d84847d4c2670a042e4636188d5c0e6f333a653933fa9365ae87477adc439a9a77362307b144c72077b68cfa6e9e8068989f021147ea9fa68a86a989f4c62 SHA512 22d6f55ee210dc62f7463692726b82b4ea30a67fe4debb6860fab53b227b7254874b8c3364add8ff9d9b62dc3e35b500b61faa7f999fa61460b2a94d56759cc0
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
index 36f278a4dca6..a1e33e84d946 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.15"
 
 BDEPEND="
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
deleted file mode 100644
index fbd6934fc695..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
+++ /dev/null
@@ -1,74 +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
-
-MY_PN="ecj"
-DMF="R-${PV}-202003050155"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.15"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core:0"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-11
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_PKG_WANT_SOURCE="1.8"
-JAVA_PKG_WANT_TARGET="1.8"
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_GENTOO_CLASSPATH="ant-core"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-src_prepare() {
-	default
-
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	# JavaCore is not distributed in the jar
-	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
-		-e 's|JavaCore.getOptions()||g' \
-		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index d8bef250aefc..2cde3036d250 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="4.26"
 
 BDEPEND="
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
deleted file mode 100644
index 4ad6e3222bb1..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ /dev/null
@@ -1,72 +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
-
-MY_PN="ecj"
-DMF="R-${PV}-202211231800"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="4.26"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java
-	dev-java/ant-core:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-11:*"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-17:*
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-JAVA_GENTOO_CLASSPATH="ant-core"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-src_prepare() {
-	default
-
-	# These have their own package.
-	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -r org/eclipse/jdt/internal/antadapter || die
-
-	# JavaCore is not distributed in the jar
-	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
-		-e 's|JavaCore.getOptions()||g' \
-		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}