gentoo resync : 29.12.2022

3 files changed, 2 insertions, 72 deletions

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index a16a8e359205..ba4a295cf3b7 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,7 +1,5 @@
 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
 EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
-EBUILD eclipse-ecj-4.22.ebuild 1695 BLAKE2B 2628143984d6915cf4ebad4b5194909d4f5ab742bbfb5beeec03741b9ad4654762fd5e7b8429be2bf082dc5978dae0d85c2a8e902566c8bb98da956793015721 SHA512 a613f6cb111f2ed21aa66d91ca93cb3c21f28daf3ac93208701749cce4d7445603b53c872b920ae0350fb7cf396f93e0dc0f20aedf979ad319ad1705f44e1bf6
-EBUILD eclipse-ecj-4.5.1.ebuild 1629 BLAKE2B bfeed649e040db43497aa5e204d5eefcf997bcf57cfbad18745bf43b8196ac60e8e13b8641841935b85b6417790f404c85044fc66e36f83ed5cb7e528065faab SHA512 37a7ff7eb2ee2e072a1315285a2a5f3ea60637afd69ac6636904d5fe76353300ac2f4d94b06d43ba56e41547a6e99585f881e2c3b22e423f849151e109adbef4
+EBUILD eclipse-ecj-4.22-r1.ebuild 1695 BLAKE2B b2b32ae1ab916157ace35130eb2819272804c3473c9f9d422000591febc82a96579e0724b8f74901af6eb6a26945c7365edc20d73ddb398ccea63f90a0a47b6c SHA512 93ccf992f4e343964e1fd7f41079616217720e949922494c91de55547f10eef41589fe283e428ecacb78c4fb85ac56a409cf2afea016abeb0d2fbd4a4e4dadc7
 MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index 12eec977d83f..82bd5d06ebf2 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEP="
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-11:*"
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-11:*
+	>=virtual/jdk-17:*
 	app-arch/unzip"
 PDEPEND="
 	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
deleted file mode 100644
index 2aed82b6859b..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-
-MY_PN="ecj"
-DMF="R-${PV}-201509040015"
-
-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 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.5"
-IUSE="+ant"
-
-COMMON_DEP="
-	app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	app-arch/unzip"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-java_prepare() {
-	# 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
-}