gentoo auto-resync : 08:06:2024 - 00:08:11

6 files changed, 3 insertions, 76 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1a15b0a102cd..1180bf72f875 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 22a807331eef..b5323c4c2a5d 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,17 +1,14 @@
-AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
 AUX ecj-4.20 365 BLAKE2B a7fcb25e74cb19f1b61b940f63b2db0d54c34381a030d0c4e9ec825e3bdc2580d18bee1d9dbf9e3943f5ee8767aa17672cddae8a313201ac22c0d5256b8c2555 SHA512 4a1c4fe7640880ddc0735cec79873ee9e8cc2f430ddd8b4676974f669f5097e46cbcda9b50668df48cb0f3ce39a169934ece785aabfd59af697c44f255951dd9
 AUX ecj-4.26 390 BLAKE2B 42e06c8114370763caeee14aee4e4471ba5781f2257abab6ba69ff8657946681e06994804b5ba5d23547b066e8784bdda3bc2ba254ae357f98d234bd4da7a415 SHA512 9b29d5e650ec30e9d493d48c29820dbb2de79fa1cc897de3ccfc2558814a882e5ba0a35567d1fbcea11b050a2ced7b48f2c53a97a9f420ef81e715ab5156f9e0
 AUX ecj-4.27 365 BLAKE2B 02271871307577f036952560f15bcd6261179d637892894c6b3fe7b5422e6f5c9b8967895a1df2a628f59824b7a3bc685d41ac4ce312c517b71510e0d55c5c7c SHA512 46509e4c5532f36f2f12c062ed5ab3ea8b0edd71893d9523499f5df46b6357b77f24cf244171ac2f7648b0771d80df29998060bdc5f1f74aa628c15a22463c41
 AUX ecj-4.30 402 BLAKE2B e95fd45bcd60440c8b11fc8f0e34eaf40674cd004939ffcaea392f3e899f9afaae7bf1dd21525099a93012338363a4a1450d69645aa9bb91153a41dc25985e6e SHA512 50623fe3dff25d0451e4dbb8e1ab14c7f5eb566adc999eeb1612b1d4e2672a5289f6a2383a40465884d26b702efc9cd7d099843c8ea4af5d23511dfa1cae5e67
 AUX ecj-4.31 383 BLAKE2B 9e24fde1df96bb18397386d2a371b8a5b6b2501cfb460379c1ce2e14ebb31ee5d80863643b47e46dd01763a9b104cb5097b283d8b2d13ae6158ffa10d906d235 SHA512 4a636356192836067d67096af43cbf1811cba211a7918e4ce27ef87cd192e6bc0246febd9278a78682aa504b215f8524de8779d920b15eea87c677496059f13b
 AUX eclipse-ecj-4.31-java21.patch 736 BLAKE2B dbf787118caeeff454b75e9a1f0e6c66cc3c636ad5271694778901f35d2835303273889f70c4463370bb69e02d120c965ae123c980b485b2e9a3886cec7fbc1f SHA512 03b8e67dc30f802d956dbaa262452ede4b880317193127ad45ccf3829ba15bbbf1239c7aff253c3bc3d358cb2c9bea6a342fa0518338691bfae4dad9d20b5f37
-DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.20.jar 2255761 BLAKE2B 42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2 SHA512 fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
 DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
 DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45 SHA512 3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430
-EBUILD eclipse-ecj-4.15-r1.ebuild 1494 BLAKE2B 8c7d98c6ceb4dca4c9a15a51f7b2ac78f4c017413e6b7adbb5902e36124eca2279f8e84f01b0b2a1c3c0443f4cfa395860301698f399b2bba3e3d518688bf45d SHA512 6f4cdf61faaeb8ff2ec9e99ec81fc4076c1515439b3cc4a9d769e32f7416ab78b6dca7ecc65b55ad9fcef53f4f187bc3c0173d0cd1c050dedf4975b6b7980dca
 EBUILD eclipse-ecj-4.20.ebuild 1595 BLAKE2B 4a50fc15445c4f181bfeddff056bc4bb98c6b5283e0708e67acad46d1a73b1490cc77aeaa69f12703383c08ef04a7fba6a97da10961cc3674c5205aba5b9501f SHA512 78f1fbe161290048f71c19df3b0a941e12215cb7c23a31f773af0d9b6a876efd23cf8138793a108fe515bdc3b70b22227e7d3f59c7c9eb3da23a7f2073b27722
 EBUILD eclipse-ecj-4.26-r2.ebuild 1824 BLAKE2B dea06a3376512b90d00b46241d110a0853b5e31f37bea1c149b5ad08478f8b63ea0c6d028c8abe8d2120a19d673747c63ee3bcc0313155fa28d5c8a9fc179174 SHA512 10ee16cda0c1e202fcec23b0c547725c3a357afb0e95e6b0030d7430b2ae1836287b438b203906f4014b478492763700fba5bc9250ae791e44b1d74ffc98ec97
 EBUILD eclipse-ecj-4.27-r1.ebuild 1836 BLAKE2B d94d7a885cfe64ddb4b3f43d22b5cda07a1f05e5e6036752f258d555d20ec844c59b7b9190d011d3ec8c0d9b69d18ad9e950432f9ad938fb6161d26ae048beb3 SHA512 8974f5c5ddb45a11060a83d48416bd0483bca7e11020adb93ae17ebee7c80075610ed53dc0b48d013af9c3f322cb107e3e763a37a0020be671eedf289a7a0333
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
deleted file mode 100644
index 63723662da43..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 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}-202003050155"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
-SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
-S="${WORKDIR}"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-SLOT="4.15"
-
-BDEPEND="
-	app-arch/unzip
-	app-arch/zip
-"
-COMMON_DEP="app-eselect/eselect-java"
-DEPEND="${COMMON_DEP}
-	>=dev-java/ant-1.10.14:0
-	>=virtual/jdk-11:*"
-RDEPEND="${COMMON_DEP}
-	!dev-java/ant-eclipse-ecj:4.15
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
-JAVA_CLASSPATH_EXTRA="ant"
-JAVA_JAR_FILENAME="ecj.jar"
-JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
-JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
-JAVA_RESOURCE_DIRS="res"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	find org META-INF -type f \
-		! -name '*.java' \
-		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
-}
-
-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}
-}
-
-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/files/ecj-4.15 b/dev-java/eclipse-ecj/files/ecj-4.15
deleted file mode 100644
index f943dedcc19b..000000000000
--- a/dev-java/eclipse-ecj/files/ecj-4.15
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.15*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15"
-GENERATION="2"
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 62fb941b87a4..bac2fc50f0be 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,3 +1,3 @@
 DIST javatoolkit-0.6.7.tar.bz2 24514 BLAKE2B 5da4c95ac561b71a3019c265a5233eb825f5f57ae35e1dfefccc2fc26a5c967dcf562c321ff61f6ad4d702f4f656927cf21fa32eadb2454b18444505ba16ae91 SHA512 34e9e9d08ed486f57bbb33bed437ff7e4bbdcb6ff8f57c338e787db0ca5688a27eaf9e21f47b5d245279c58cbdaeab0d61b469b3f176ab37a18f122123c885d0
-EBUILD javatoolkit-0.6.7-r1.ebuild 764 BLAKE2B e97c65b931c406623071097f52fd094d1d187014df797b53dc8718f9e97d81146e86c65da923abab38a09c789baf5a6ca8c8cbaca9e865b6272cd9fd56c9fd32 SHA512 132878521df7f592b806c396af5f20237d6dfb6abea4bb7fafe90ad94577b0fd073387853258c6b22b62552e6f8eb1f824754e98bc0f580ccedf6bda8b5e2b01
+EBUILD javatoolkit-0.6.7-r1.ebuild 815 BLAKE2B d1f5f43f266eb62042cf43ac0e88bc7e5d47464c6ec378636f1bbe5c21df4cc83f28fd004c511adc301e2efdca81cf5377725b7a8eb6391f4bb6d269c84faf5f SHA512 7a633c4b7baf21941d6d2109e877c14f5d41b1fa5c65e48b3f0cf9d1bfbdb228fac219283079d1a528d791b2924952ac6163fc0cb960aea08f993c57721667d4
 MISC metadata.xml 400 BLAKE2B 748187af36d7fa0cfb430e8b853ff76739291b8f96cf6dde2d086e3433a07f4dcd486b763dbc7f89493027a8ef83750621d3a53ca07a8cd74d78f308a7a1ef42 SHA512 36fda254bdc3a8a53656e7b6fabf72bec16e94529a895c11340bcc97b554d7daa7673568cab72376dfa4ecbb8267fb63c5b14e8ae304c33002ccde0fd9b8fc0a
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
index 71d14029e93b..c1e3431b5381 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
@@ -17,6 +17,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
 	distutils-r1_python_prepare_all