13 files changed, 179 insertions, 582 deletions
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index 58259b00cd12..719bf090c35f 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1 +1,2 @@
 DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
+DIST httpcomponents-core-4.4.14-src.tar.gz.asc 215 BLAKE2B 52aae4a503ff720f87538283c9215b7a8be9d5d2744c5ad6e86c7d44924ba18e8ef8d55af570543c2d52f20ce8a3918266773c274382e2c495087cd3e247232a SHA512 0824d3adecc5d1cbaf19dbb8674fd192b9d04cff9091475e5e55a18f6012ef11c2d0829d643e1003e8e18f9d2f0964ee0402a7b0e2e3f21b34dcb0676e1392e9
diff --git a/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch
new file mode 100644
index 000000000000..5c722c5e714d
--- /dev/null
+++ b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch
@@ -0,0 +1,55 @@
+There was 1 failure:
+1) testRequestTargetHostFallback(org.apache.http.protocol.TestStandardInterceptors)
+org.mockito.exceptions.base.MockitoException: 
+Mockito cannot mock this class: class java.net.InetAddress
+Mockito can only mock visible & non-final classes.
+If you're not sure why you're getting this error, please report to the mailing list.
+	at org.apache.http.protocol.TestStandardInterceptors.testRequestTargetHostFallback(TestStandardInterceptors.java:372)
+	... 31 trimmed
+Caused by: org.mockito.cglib.core.CodeGenerationException: java.lang.reflect.InvocationTargetException-->null
+	at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:238)
+	at org.mockito.cglib.proxy.Enhancer.createHelper(Enhancer.java:378)
+	at org.mockito.cglib.proxy.Enhancer.createClass(Enhancer.java:318)
+	at org.mockito.internal.creation.jmock.ClassImposterizer.createProxyClass(ClassImposterizer.java:110)
+	at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:62)
+	at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:56)
+	at org.mockito.internal.creation.CglibMockMaker.createMock(CglibMockMaker.java:23)
+	at org.mockito.internal.util.MockUtil.createMock(MockUtil.java:26)
+	at org.mockito.internal.MockitoCore.mock(MockitoCore.java:51)
+	at org.mockito.Mockito.mock(Mockito.java:1243)
+	at org.mockito.Mockito.mock(Mockito.java:1120)
+	... 33 more
+Caused by: java.lang.reflect.InvocationTargetException
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:118)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.mockito.cglib.core.ReflectUtils.defineClass(ReflectUtils.java:385)
+	at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:220)
+	... 43 more
+Caused by: java.lang.IncompatibleClassChangeError: class $java.net.InetAddress$$EnhancerByMockitoWithCGLIB$$d2bd6316 cannot inherit from sealed class java.net.InetAddress
+	at java.base/java.lang.ClassLoader.defineClass1(Native Method)
+	at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1027)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	... 46 more
+
+FAILURES!!!
+Tests run: 665,  Failures: 1
+
+--- a/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
++++ b/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
+@@ -44,6 +44,7 @@ import org.apache.http.message.BasicHttpRequest;
+ import org.apache.http.message.BasicHttpResponse;
+ import org.junit.Assert;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.mockito.Mockito;
+ 
+ public class TestStandardInterceptors {
+@@ -365,7 +366,7 @@ public class TestStandardInterceptors {
+         Assert.assertEquals("somehost:8080", header.getValue());
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRequestTargetHostFallback() throws Exception {
+         final HttpContext context = new BasicHttpContext(null);
+         final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
diff --git a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild
new file mode 100644
index 000000000000..f554a2b55b78
--- /dev/null
+++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild
@@ -0,0 +1,56 @@
+# 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_ID="org.apache.httpcomponents:httpcore:4.4.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache HttpComponents Core (blocking I/O)"
+HOMEPAGE="https://hc.apache.org/httpcomponents-core-5.2.x/"
+SRC_URI="https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz
+	verify-sig? (
+		https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz.asc
+	)"
+S="${WORKDIR}/httpcore"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-core.hc.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )"
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/commons-logging:0
+		dev-java/mockito:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	# https://bugs.gentoo.org/923603
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.net=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+		eapply "${FILESDIR}/httpcore-4.4.14-skipFailingTest.patch"
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
deleted file mode 100644
index ff51d1ba0fdb..000000000000
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Core (blocking I/O)"
-HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga"
-SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: httpcore/pom.xml
-# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? (
-		dev-java/commons-logging:0
-		dev-java/mockito:0
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcore"
-
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 052b7f5e2744..95e67ccfac14 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,2 +1 @@
-DIST icu-74.2.tar.gz 65888936 BLAKE2B 81d5acddbfc58a859906cb61660b6f230b88f4a1b1cfd56838843e9445b5858d3dd4888707026340581322143f6a4b7b81f53b6431fd5d4cc3fb90531c4d82fb SHA512 728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c
 DIST icu4j-75.1.tar.gz 65866291 BLAKE2B ae9a2a8f9bf6f38a08c46c4c3695fa4096c831beab1af5b654e86c9d681eb32be727930aeb1fd866fe9f93a96abe807fd353d108b5fe7a4d8203ee33cc16d971 SHA512 08f8fce8a4dd85706d9f7c57fd021ba15c403ab2da33d9a122d7cb441e0e148deebf245a661e4ef53a30bfa8b7622c63035946fd8966be3927af322275b87ca3
diff --git a/dev-java/icu4j/icu4j-74.2-r1.ebuild b/dev-java/icu4j/icu4j-74.2-r1.ebuild
deleted file mode 100644
index df2c5aa4daba..000000000000
--- a/dev-java/icu4j/icu4j-74.2-r1.ebuild
+++ /dev/null
@@ -1,193 +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 test"
-MAVEN_PROVIDES="
-	com.ibm.icu:icu4j:${PV}
-	com.ibm.icu:icu4j-charset:${PV}
-	com.ibm.icu:icu4j-localespi:${PV}
-"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="https://icu.unicode.org"
-SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz"
-S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
-
-LICENSE="icu"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/junitparams:0 )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md )
-HTML_DOCS=( ../{APIChangeReport,readme}.html )
-
-src_compile() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar"
-
-	einfo "Compiling icu4j.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu"
-	JAVA_JAR_FILENAME="icu4j.jar"
-	JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
-	JAVA_RESOURCE_DIRS=(
-		collate/src/main/resources
-		core/src/main/resources
-		currdata/src/main/resources
-		langdata/src/main/resources
-		regiondata/src/main/resources
-		translit/src/main/resources
-	)
-	JAVA_SRC_DIR=(
-		collate/src/main/java
-		core/src/main/java
-		currdata/src/main/java
-		langdata/src/main/java
-		regiondata/src/main/java
-		translit/src/main/java
-	)
-	java-pkg-simple_src_compile
-	rm -r target || die
-
-	einfo "Compiling icu4j-charset.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
-	JAVA_JAR_FILENAME="icu4j-charset.jar"
-	JAVA_MAIN_CLASS=""
-	JAVA_RESOURCE_DIRS=( charset/src/main/resources )
-	JAVA_SRC_DIR=( charset/src/main/java )
-	java-pkg-simple_src_compile
-	rm -r target || die
-
-	einfo "Compiling icu4j-localespi.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
-	JAVA_JAR_FILENAME="icu4j-localespi.jar"
-	JAVA_RESOURCE_DIRS=( localespi/src/main/resources )
-	JAVA_SRC_DIR=( localespi/src/main/java )
-	java-pkg-simple_src_compile
-	rm -r target || die
-
-	# javadocs
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		JAVA_SRC_DIR=(
-			collate/src/main/java
-			core/src/main/java
-			currdata/src/main/java
-			langdata/src/main/java
-			regiondata/src/main/java
-			translit/src/main/java
-			charset/src/main/java
-			localespi/src/main/java
-		)
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test () {
-	# TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest
-	export LC_ALL="en_US.UTF-8" TZ="US/Pacific"
-
-	JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams"
-
-	einfo "Compiling framework-tests.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework"
-	JAVA_JAR_FILENAME="framework-tests.jar"
-	JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll"
-	JAVA_RESOURCE_DIRS=( framework/src/test/resources )
-	JAVA_SRC_DIR=( framework/src/test/java )
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar"
-
-	einfo "Testing core aka icu4j.jar"
-	JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
-	JAVA_TEST_SRC_DIR="core/src/test/java"
-	pushd "${JAVA_TEST_SRC_DIR}" || die
-		# exclude invalid tests, not run by "mvn test"
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*Test*.java" \
-			! -name "ChineseTestCase.java" \
-			! -name "DataDrivenNumberFormatTestUtility.java" \
-			! -name "*Helper.java" \
-			! -name "ModuleTest.java" \
-			! -name "*Sample.java" \
-			! -name "TestCase.java" \
-			! -name "*TestData*.java" \
-			! -name "*TestFmwk.java" \
-			! -name "TestMessages.java" \
-			! -name "TestUtils.java" \
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-
-	einfo "Creating core-tests.jar"
-	jar cvf core-tests.jar -C target/test-classes .
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar"
-	JAVA_TEST_RUN_ONLY=""
-
-	einfo "Testing collate"
-	JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources"
-	JAVA_TEST_SRC_DIR="collate/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing translit"
-	JAVA_TEST_EXCLUDES=(
-		# Invalid test classes, No runnable methods
-		com.ibm.icu.dev.test.TestBoilerplate
-		com.ibm.icu.dev.test.translit.TestUtility
-	)
-	JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources"
-	JAVA_TEST_SRC_DIR="translit/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing charset"
-	JAVA_TEST_RESOURCE_DIRS=""
-	JAVA_TEST_SRC_DIR="charset/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing common_tests"
-	# "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail.
-	# coverage tests fail because test handlers for the parametrized tests
-	# are not defined so the tests are broken and cannot succeed
-	JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest )
-	JAVA_TEST_RESOURCE_DIRS=""
-	JAVA_TEST_SRC_DIR="common_tests/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing localespi"
-	JAVA_TEST_RESOURCE_DIRS=""
-	JAVA_TEST_SRC_DIR="localespi/src/test/java"
-	# Invalid test classes, No runnable methods
-	JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil )
-	# https://bugs.gentoo.org/827212, "mvn test" does not run it at all
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" != "1.8" ]] ; then
-		java-pkg-simple_src_test
-	fi
-}
-
-src_install() {
-	default
-	java-pkg_dojar "icu4j.jar"
-	java-pkg_dojar "icu4j-charset.jar"
-	java-pkg_dojar "icu4j-localespi.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	if use source; then
-		java-pkg_dosrc "classes"
-	fi
-}
diff --git a/dev-java/icu4j/icu4j-75.1.ebuild b/dev-java/icu4j/icu4j-75.1.ebuild
index 5b53626e6551..bae11e47634a 100644
--- a/dev-java/icu4j/icu4j-75.1.ebuild
+++ b/dev-java/icu4j/icu4j-75.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
 
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 7158eea18442..7568a27ebea4 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,2 +1,3 @@
 DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
 DIST apache-maven-3.9.6-bin.tar.gz 9410508 BLAKE2B 2a99f002912e6c0fcf9f78f0553553898cf39c17bd7c8b58269c8a7d061c425c62a2f557a686fd2b1f114ef1f47aab6e9b318555235bb436e8c7e5c8b1a0dd9d SHA512 706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
+DIST apache-maven-3.9.7-bin.tar.gz 9581488 BLAKE2B 2cdf5c06cf59913314bc50813f37061d6db3413991511588889863ddbedb590fc601247c9e25a31eca2d4d12a1e7fa4b3ca39575cd096c11c220346014ffa65b SHA512 f64913f89756264f2686e241f3f4486eca5d0dfdbb97077b0efc389cad376053824d58caa35c39648453ca58639f85335f9be9c8f217bfdb0c2d5ff2a9428fac
diff --git a/dev-java/maven-bin/maven-bin-3.9.7.ebuild b/dev-java/maven-bin/maven-bin-3.9.7.ebuild
new file mode 100644
index 000000000000..d30a1ed61465
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.9.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+HOMEPAGE="https://maven.apache.org/"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="3.9"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}"
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
deleted file mode 100644
index eb993b82f314..000000000000
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="3.7"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="cairo opengl"
-
-COMMON_DEPEND="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/jdk:1.8
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/lib.*/libswt-.*.so"
-
-PATCHES=(
-	# Fix Makefiles to respect flags and work with --as-needed
-	"${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
-)
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-src_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	case ${ARCH} in
-		ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
-		*)       eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
-	esac
-
-	default
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	docinto html
-	dodoc about.html
-}
diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild
index dc1cb9be2255..18bc97088217 100644
--- a/dev-java/swt/swt-3.7.2-r4.ebuild
+++ b/dev-java/swt/swt-3.7.2-r4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="3.7"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="cairo opengl"
 
 BDEPEND="
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
deleted file mode 100644
index 4e117a49acf6..000000000000
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.10"
-KEYWORDS="amd64 ppc64"
-IUSE="cairo opengl webkit"
-
-COMMON_DEP="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.32
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? (
-		net-libs/webkit-gtk:4
-	)"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.8:*[-headless-awt]
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-)
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-src_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Apply patches
-	default
-
-	# Define missing g_thread_supported() to be already started.
-	sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
-
-	# Webext is also in the library directory
-	sed -i 's|findResource([^,]\+|findResource("swt"|' \
-		"${S}"/src/org/eclipse/swt/browser/WebKit.java || die
-}
-
-src_compile() {
-	append-cflags -fcommon # https://bugs.gentoo.org/707838
-
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local JAWTSO="libjawt.so"
-	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
-
-	for libpath in "${ldpaths[@]}"; do
-		if [[ -f "${libpath}/${JAWTSO}" ]]; then
-			export AWT_LIB_PATH="${libpath}"
-			break
-		# this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
-		elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
-			export AWT_LIB_PATH="${libpath}/$(tc-arch)"
-			break
-		fi
-	done
-
-	if [[ -z "${AWT_LIB_PATH}" ]]; then
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	export SWT_PTR_CFLAGS=-DJNI64
-
-	# Bug #461784, g_thread_init is deprecated since glib-2.32.
-	append-cflags -DNO__1g_1thread_1init
-
-	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building WebKit component"
-		${make} make_webkit make_webkit2extension
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-	unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	local swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	remove_from_manifest() {
-		local subpkg=$1
-		sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	}
-	use cairo || remove_from_manifest cairo
-	use opengl || remove_from_manifest opengl.glx
-	use webkit || remove_from_manifest webkit
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo "/usr/$(get_libdir)/swt"
-	java-pkg_doso *.so
-
-	dodoc about.html
-}
diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r3.ebuild
index da97a0a165ab..5b0d33375cad 100644
--- a/dev-java/swt/swt-4.10-r3.ebuild
+++ b/dev-java/swt/swt-4.10-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.10"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 IUSE="cairo opengl webkit"
 
 BDEPEND="