gentoo resync : 20.03.2022

6 files changed, 21 insertions, 80 deletions

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index b35fef8675ac..71b7551da274 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,19 +1,16 @@
 AUX ecj-4.10 342 BLAKE2B c69e9a66c9239e7ff4b7b35a4dcddec7cdec02ccf782862a0428e7e4d720dc22a931b58d40db5027e186a6129d0598702d9a95b1fc85ac38957ab6769377054b SHA512 c5ed672288d957ff52d6b44e2758dd589aba050e5915ebc1be92c112ef91c7506051893ac03f08115e9a75e16f91a68d26837e8e8e1e84c6bdb5fd8f4b953474
 AUX ecj-4.13 348 BLAKE2B 8c591be42a3f2fbe414ca7f8ea3546d99bf5bf88c65a802992ddf7eed4da4642f245215b44b64e1781de33550f48459a5288feb58fd079214a59f5d3a4537c51 SHA512 2a318687de82cdd314e5a7036a59ee6638d4983c8cd1458574fba01eedd589fa265b5ebefd1bdb4a9d0e0488d39fcc71e164598d66d9423431b4293b068de8fa
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
-AUX ecj-4.21 372 BLAKE2B 49bc78d97c7daedcc314ee8db84871527ae6147b3e8d54c1cbb9f66917615090b6f487cf3aa1773743f7d1a3ae9d2be0c784b5111fcd07e340f5122176af8876 SHA512 5d81f895793db33405acd5c1572e733ed142cd6dedf0e3c5e10c0747e94f872b61254d1ed610d91c100ce1a6d2eebcaf2e8cfa2fb822fc5247f28449e2d89109
-AUX ecj-4.4 314 BLAKE2B 9855d136e85d003ef85e2b0e854d0ea6d29ee37e4221ca612d1ed6c51f89e6f2268f9082dd946468119129240166394122f54618e1a6a799dded0eeb9f0046cc SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678
+AUX ecj-4.22 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf49dc2b9a8397de773a75fafb821cfc5e65d16203d7969982275b8cd0b8941be9ccca5d200 SHA512 f687c6105029f6b46191277e88a6d16b9d814bca5dfb9ddc6dcc306db49a97052e04be8aeb52b82a9e512645b4eb47614ec046f53b398de19e0e27405314baa2
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
 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.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
+DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1248 BLAKE2B 717f74dc7cb1b13d18eac10ffc03db609a90d7a7db908b02475295e2595bef41049dc32b2384012e2d01be90df8937aa13d1620c77fcd3f38c95f5db499064fc SHA512 41b887ad6b860053405f7b4ed11f7a66f7cb9cafc898ee4e4b1680afea411327b291412b1d33d1dab5de6ee1eb6a1c6464d21bdf8859463a8f6d110dbd660149
 EBUILD ant-eclipse-ecj-4.13.ebuild 1253 BLAKE2B 97cbbb46a34ba3b400299517102a7d932f8f3b9114ae028ec65d7b2a30e663721db924fe78f993494244df2da88c908358afdf5210984668ebe4fa076775dbb7 SHA512 a8f641a3305ee1220786ff9a82597f4a21a0b2664633d60cd42d5aa9d98b24cf7e7bd63b4c828515191d127177b9645535dd7c275ad5c2b1a9ce723a003188ee
-EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1266 BLAKE2B 91e0bab867d845e389e632cc5e8f022880427f8d62f9f1e437a53c3f75f5589ad4baf0f426adf7458d8143484705a2c6f197e326629505191d55b45e07f134b7 SHA512 df2930273cb0d7f0577727d84c15fcb352d6bb9f1fe2765e4980c9eb6f2a866116b37a51ab561161cb12e5cbe58d5ff683db0fa3ce584003065d51ffd03d428d
-EBUILD ant-eclipse-ecj-4.21.ebuild 1279 BLAKE2B 7207d92f341c3a8172df5e8b177e5d21503ce7af90a664c87fffa20f8e25dc352d04f7ca98c2a1d09cfb9755fa7d58350efbb7fb57daf52a2c9b98158bf9d0f2 SHA512 e96b498e8668eb8b82352f07fea65ad63c177539ba4fde0684b84c883bc40fe1c3e3c3b54eb81d0b4cead1b26d12c2f13ae3ebd1de701c71685002faad9fb56e
-EBUILD ant-eclipse-ecj-4.4.2.ebuild 1246 BLAKE2B 442e1a0d37606743e6536018d5918cea9f7764847bf2550963a76e2bb097492101ddf28f30604929cad7bcbe9c2ee7b5981a4b441a61c95b37d79a71383c5b9a SHA512 8cf0b12134b7c52b4dfc8a0bf946ca20a39eaf459e29f01a6ef24ac25de659b33af7322a6d3d679a989df6f6139543492ff53e43afcbfdf2e2341053f7716a9d
+EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 6176f4208828b43831ebcf6a9cb552fdc815fd17aa28e44ea155738ff68584361f83894b6b22d69cb776f425b9f2a144caa554883551ad596a46e3e8d43fc285 SHA512 f177439d504325d9cf25302d873c92bd1f53ad4418ee08fc5b4b84aedcd8f89831584a833c5944a2d7c44df85ad8a047eeebce1025b494722232fe871ca6bd8f
+EBUILD ant-eclipse-ecj-4.22.ebuild 1422 BLAKE2B a61913fa08c0ead3742a7699624a7aae99e428f72996b370765db1ef7952adb96b1000f528e1f5d5ac13e97070ced630d67762bd0be1ad63f84f29839705eac7 SHA512 57fc3e388f5f71a5bd5a01b4891d4192d7297faba5c5f991e9298070d572ed135bb4d0fd201df861696c863547880691aff58529bd924803f62382bb369b646a
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1247 BLAKE2B 43d30d904d98149ab9d91ea66c3c0a53837010572de25c7b0e0bfdd8b0f4c230c4385c8b156a1a2cf3b77b1e9282c813a448934515953a300da76c4a20788880 SHA512 39e4e0870c2fa5151c77cac1b60a929f4959d68012219d584e8aa395a1983140f86775328f872694addd69ef6a25283265a4dec526bb224eb5335a5f5d6292e8
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
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 8dfdbb8d8264..5957b5aefbe2 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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=""
 
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
index 0b394b88d26a..21b3dfc5b0d8 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple prefix
 
-DMF="R-${PV}-202109060500"
+DMF="R-${PV}-202111241800"
 
 DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
 HOMEPAGE="http://www.eclipse.org/"
@@ -15,19 +15,18 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV
 
 LICENSE="EPL-1.0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT=$(ver_cut 1-2)
+SLOT="4.22"
 IUSE=""
 
-CDEPEND="
-	~dev-java/eclipse-ecj-${PV}:${SLOT}
-	dev-java/ant-core:0
-"
+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:*
-"
+	>=virtual/jre-11:*"
 DEPEND="${CDEPEND}
-	>=virtual/jdk-11:*
-"
+	>=virtual/jdk-11:*"
 BDEPEND="app-arch/unzip"
 
 JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
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..000000000000
--- 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}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.21 b/dev-java/ant-eclipse-ecj/files/ecj-4.22
index 1db5895e6426..5bbcc318d9ba 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.21
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -1,7 +1,7 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.21"
+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"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16"
+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.15,ant-eclipse-ecj-4.21"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.22,ant-eclipse-ecj-4.22"
 GENERATION="2"
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..000000000000
--- 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"