Adding metadata

10 files changed, 82 insertions, 442 deletions

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index caa33d505a88..3ae886c05c09 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,2 +1,2 @@
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-DIST commons-logging-1.3.0_pre20230317.tar.gz 184981 BLAKE2B 00d171a8345907dc2686d1eff1130b7fd1ef653c8f2a7c6b5e45e6522f3d195ba695d93371add97a2d459451e3757ef9ec21f483f0cd37a6bcbb98e76e1b446f SHA512 737058214bfa86c11c2d7b450132a15824652c80ffae6208c3a8fc2386e7b2c7c61b39fd2b75008373f611e4bbed26e851f98f910d3e6f33df4f85f35c0a5462
+DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index 3fb433092d18..548d30669d48 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -5,14 +5,13 @@ EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="commons-logging:commons-logging:1.3.0"
-# Not yet supported, see https://bugs.gentoo.org/839681
-# JAVA_TESTING_FRAMEWORKS="junit-vintage"
+JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
 HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
-MY_COMMIT="058cf5ee350cd83d1ab28b000ad6be903ca160c5"
+MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1"
 SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
@@ -52,7 +51,6 @@ src_prepare() {
 
 	if use !log4j; then
 		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
-		rm -r src/test/java/org/apache/commons/logging/log4j || die
 	fi
 }
 
@@ -84,19 +82,41 @@ src_compile() {
 	popd > /dev/null || die
 }
 
-# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407
-# src_test() {
-# 	JAVA_TEST_EXTRA_ARGS=(
-# 		-Dtestclasses="commons-logging-tests.jar"
-# 		-Dcommons-logging="commons-logging.jar"
-# 		-Dcommons-logging-api="commons-logging-api.jar"
-# 		-Dcommons-logging-adapters="commons-logging-adapters.jar"
-# 	)
-# 	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-# 	JAVA_TEST_SRC_DIR="src/test/java"
-# 	if use log4j; then
-# 		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
-# 	fi
-# 	JAVA_TEST_EXTRA_ARGS+=" -Dservlet-api=$(java-pkg_getjars javax-servlet-api-2.5)"
-# 	java-pkg-simple_src_test
-# }
+https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407
+src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
+	rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
+	rm -r src/test/java/org/apache/commons/logging/log4j || die
+
+	JAVA_TEST_EXCLUDES=(
+		org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing
+		org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+	)
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)"
+		-Dcommons-logging="commons-logging.jar"
+		-Dcommons-logging-api="commons-logging-api.jar"
+		-Dcommons-logging-adapters="commons-logging-adapters.jar"
+		-Dtestclasses="target/test-classes"
+	)
+	if use log4j; then
+		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+	fi
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar
+}
diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index b9fd445b7721..80f92183ca7c 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -10,6 +10,7 @@
 	</longdescription>
  <upstream>
   <bugs-to>https://issues.apache.org/jira/projects/LOGGING/issues/</bugs-to>
+  <doc>https://commons.apache.org/proper/commons-logging/guide.html</doc>
  </upstream>
  <use>
   <flag name="avalon-framework">Add optional support for avalon-framework</flag>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 99c4ac2ac81d..6adf8d98b5fa 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,14 +1,3 @@
-DIST icedtea-3.19-aarch32-3.19.0.tar.xz 7199408 BLAKE2B c079eb55ca198f2d34b73e6ef80f1507e50e9ad2140d1af86c64da54e6b85d1345fed347d207205806a86728afde37ab3ae13830625da4d488d6db4bc841ff28 SHA512 9f364c0d51eb57168009ca08d74b598e553885d42f11df0fc1ac563e6a5234207a85fddf3fe315b3ac4cbdf8b50bcfdfd1bbb4fdea5e6f8b6988624cbe6c0b33
-DIST icedtea-3.19-corba-3.19.0.tar.xz 948912 BLAKE2B 888443236851c96934f9513ae28e1908cb49d4fc211426f78ddf9a31a9815c382d38a196ddc69c7e9573b840fc5533c95a55ded3a3bc3d6f55a8d25ac2587fea SHA512 9127268d519dd95fc5eeb6904b54dab3bb5472610e26c2b691a7306d25169dc82ce6de26ec3fe396a7f19726f73c5597fbf79d33027d905a3a1533316c4a3f1a
-DIST icedtea-3.19-hotspot-3.19.0.tar.xz 7113752 BLAKE2B 4a5603e64e4df6e7e0beebc762bc73868d736367540dac332196e736e1de371b63c9f3b7f1c167450536b6e195befee10136515027774fde789e90ade198020e SHA512 5995a905f9e886d9b2138f112ad9e03ce580f646f58601e354ebc5e0f2fc3f37b61847e64f258e9c31ab479e0e617604fb21d990c33b906d4cd1853fe9f1a0fa
-DIST icedtea-3.19-jaxp-3.19.0.tar.xz 2267888 BLAKE2B b64d615813e42e55eafda4374a8959b24b47614a158dc88d4ff188c09d6cc6f6d23ec6ae613ebdc52bd7fc02bcd8b96e517f163bf397b94eb36e68af9f7a7285 SHA512 78cfb56662e6b76632b746ff3b53496a7fa82daf2fe24d0988eda0552758f6c71d434ececd50fc7baf2e4e8a03b4febe8d489b2b6e1ac791c07170d72f7a881e
-DIST icedtea-3.19-jaxws-3.19.0.tar.xz 2277616 BLAKE2B 5fbca1daed96ef603e9605b9d2565c0a6be92771c862bda45c8cb532cd493d9f1e46f008a070ff6276ba68378427e5e82d0f5efd6a1098db7ff14a29a5854d1a SHA512 fca97468d4e73f7b5d345edf35422ea5a417cba2d1441656d2ab2ffdeb814a2641c2bc732b8e76a9a62566f95e1ef2a2d6281a3a6f8bffa900549f6ed6e86444
-DIST icedtea-3.19-jdk-3.19.0.tar.xz 40689020 BLAKE2B f85005bef6d2c22b57fffe5b403278dfd18b8a244da0b8e4f6d7ce574dd2d14da453d14ec02c131697b639f8155962755ef924690ae9fb5aa302ba84bf140a56 SHA512 aa8fdb3d2f43a54bc39f9f243392fcf161d3ad0f568681f0baccc8c99ab667d621b905fd4f32b0787107ab70f402978e0cf06b364a625c05a8358e86c0080a14
-DIST icedtea-3.19-langtools-3.19.0.tar.xz 2080888 BLAKE2B 06d9a2efb9bbad4e47b8f3f19d6b51eae5bc88b652175fe7a8fa98e72fc01a547c1db4efef7e0c2f9b8d0e27ba8f6f4b9ff6fe59197da39bdb8b77c60cec4057 SHA512 b96e24fe6e03e3522f3ccab956539fc518f9d4fd24d0c476c42c76fac1adee7cc367f9ca451f6dc97877f5bc28bc5d8810fedddf69548781c6429cae348ab736
-DIST icedtea-3.19-nashorn-3.19.0.tar.xz 2326776 BLAKE2B 5dfb09fffbec8f36eccaa81cea8e539004f523c35eef566330c9067f1136f54e4aa313bddc3093e3ec17a7d2d37298f92750286a6f601ce9bf4dbe6ed9f77ff5 SHA512 d831c844c5cf5fb778cf34f25dca855ba7c7dea9d72c6b59b402a7e19e3d3a2b7aa5b57d218f549aa82c1a1a733f450c3ed78820b2930e1c7d17eb08dd9dec7a
-DIST icedtea-3.19-openjdk-3.19.0.tar.xz 365128 BLAKE2B 8abc4d77d961810df0ac8a1c5fcc4eea0e0cc888b4471b987d708569116cba4871d37fdb9e7d115f5b2bb387e73e71593e04bad2d3ed2e33ab2938192251506a SHA512 90dea98d26279a5d0a5869a8d53234bc27a4fdcb0682ebc3baba1670ccca2035e41d24d0d67a7ee5d9304058516136c11177eb8190edb35f03ce8b8f63e56357
-DIST icedtea-3.19-shenandoah-3.19.0.tar.xz 7286788 BLAKE2B d1df26c9c25930a19ad1acad3c3a7b249456c1732981b5aa9f77f847c7e0c53010a7eea646ea0b63293985af238309c72320b0ac71678c0ca88c211d2adb601d SHA512 7db3b3f9c3e42fef50f1a84e9db1d1c2b5322f15ea26e7f0bcbbae8011365faf7f0ad4bf0bcf861c2d5eb1fe2845d57f9355b1b2e0203558f47a3564ae4709a0
-DIST icedtea-3.19.0.tar.xz 1568996 BLAKE2B 0ded447c674aa5dbfba690652de474b13f2107c221e0a7a9d98912ac374efbd44093c482abc5e4d4dcde0f9712020d8bdd9de98b347145217e719edf801e9afc SHA512 27d7c4c8e025a2c9320c0a47f3c521f51b49bf55d021c7a08aea9b7cb3d522cfc3e10d438b837669eeb5d427e950e7643c5ce4f817567d5e9fe39b56cdce8835
 DIST icedtea-3.21-aarch32-3.21.0.tar.xz 7207712 BLAKE2B bb9001aa31011fd0b29141caa1ba48344f2ca08e5dbe69cb3501a4830886d02b7a8782336a84273aad2ea721f26db2d3f51cdc72a9eccde1ad45a2790fb2caf1 SHA512 fc44c3c59164f6904ad92e04cb8023f39e82d6a2704fb5a91bf84d41066183ca6140273fa4c13d08a0dda47f263bd2d7d5138a5c45f205c58f649e6b87f15a9e
 DIST icedtea-3.21-corba-3.21.0.tar.xz 949700 BLAKE2B b845a46b5dcb22545073f894fbc5464e014f8f0e02e0cc66bccda0db6bd5566908a886823189ecf476847adb7f3fa5c009814e54c69d65a3a4a6c3cfc692564d SHA512 55110b92c6eddeb29eab97cbe644d8cc171a489b9fa806c81e4af88a1e5e3e6776fb97371715782935222944464f68e7d6783c46bd0d0de5659123f46c577a7a
 DIST icedtea-3.21-hotspot-3.21.0.tar.xz 7121192 BLAKE2B 64813c6a71405c5c093792dadf8613361a056b590fa4fa7453887ac5eb1eda1da63777a2f1e529e50eefe033d6f7f757d3235d53ba8f0f45d40dad6f0c215334 SHA512 678f6c53db5858ba828e063eeeddb727dbeb0586ff26a4287f9735dc01ad00ddcd9f41fa65343b81d5f5c512a944f47a447d4bdc929ca26ba78a68a7e3dfc1cd
diff --git a/dev-java/icedtea/icedtea-3.21.0-r1.ebuild b/dev-java/icedtea/icedtea-3.21.0-r1.ebuild
deleted file mode 100644
index 8d2fdf85dc68..000000000000
--- a/dev-java/icedtea/icedtea-3.21.0-r1.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 2021-2023 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-SLOT="8"
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
-
-ICEDTEA_VER=$(ver_cut 1-3)
-ICEDTEA_BRANCH=$(ver_cut 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-
-CORBA_TARBALL="${PV}.tar.xz"
-JAXP_TARBALL="${PV}.tar.xz"
-JAXWS_TARBALL="${PV}.tar.xz"
-JDK_TARBALL="${PV}.tar.xz"
-LANGTOOLS_TARBALL="${PV}.tar.xz"
-OPENJDK_TARBALL="${PV}.tar.xz"
-NASHORN_TARBALL="${PV}.tar.xz"
-HOTSPOT_TARBALL="${PV}.tar.xz"
-SHENANDOAH_TARBALL="${PV}.tar.xz"
-AARCH32_TARBALL="${PV}.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	https://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax_kernel +pch libressl
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP=">=net-print/cups-1.2.12"
-
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite
-"
-
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )
-"
-
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )
-"
-
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/openjdk-bin:8
-		dev-java/openjdk:8
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	<sys-devel/make-4.4
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		openjdk-8 openjdk-bin-8
-		icedtea-8 icedtea-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# GCC10/-fno-common handling, #723102
-	if [[ $(gcc-major-version) -ge 10 ]]; then
-		append-flags -fcommon
-		append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
-	fi
-	# this patch helps with gcc10 as well
-	# since build system unpacks tarballs itself, this is a way to force makefile
-	# to apply our patch. it expects relative path inside source, so we can't specify
-	# ${FILESDIR} directly.
-	mkdir -v gentoo_patches || die
-	cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
-	export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter #nowarn
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	# force bash for now https://bugs.gentoo.org/722292
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.19.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild
index e19fa9025183..acef020df09f 100644
--- a/dev-java/icedtea/icedtea-3.19.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.21.0.ebuild
@@ -1,9 +1,16 @@
-# Copyright 2021 Liguros Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
 EAPI=7
 SLOT="8"
 
-inherit check-reqs  flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
+inherit check-reqs  flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils
 
 ICEDTEA_VER=$(ver_cut 1-3)
 ICEDTEA_BRANCH=$(ver_cut 1-2)
@@ -62,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax_kernel +pch libressl
+	jamvm +jbootstrap kerberos pax-kernel pch
 	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
@@ -140,13 +147,12 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	app-arch/zip
 	app-misc/ca-certificates
 	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
+	dev-libs/openssl:0
 	sys-apps/attr
 	sys-apps/lsb-release
 	x11-libs/libXt
 	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 
 PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
@@ -324,7 +330,7 @@ src_configure() {
 		$(use_enable doc docs) \
 		$(use_enable kerberos system-kerberos) \
 		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable sctp system-sctp) \
 		$(use_enable smartcard system-pcsc) \
 		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 1167ea4aac59..9cb1355a2015 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
  <maintainer type="person">
   <email>gnu_andrew@member.fsf.org</email>
   <name>Andrew John Hughes</name>
@@ -24,9 +20,7 @@
  <longdescription>
 		The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software 	build tools along with additional tools such as a browser plugin and Web Start support via NetX.
 	</longdescription>
- <upstream>
-  <remote-id type="cpe">cpe:/a:redhat:icedtea</remote-id>
- </upstream>
+ 
  <use>
   <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
   <flag name="cups">Link against the CUPS library at compile time, rather than using it dynamically at runtime.</flag>
@@ -34,7 +28,7 @@
   <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
   <flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
-  <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+  <flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag>
   <flag name="pch">Build using pre-compiled headers.</flag>
   <flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
   <flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag>
@@ -42,5 +36,5 @@
   <flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
   <flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
  </use>
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
index fba4a36aaf1c..d6cc763ea968 100644
--- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
+++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
@@ -1,5 +1,5 @@
---- a/make_linux.mak	2010-06-08 17:30:58.000000000 +0000
-+++ b/make_linux.mak	2010-08-09 22:48:01.515433721 +0000
+--- a/make_linux.mak
++++ b/make_linux.mak
 @@ -66,7 +66,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
@@ -124,8 +124,8 @@
  
  glx.o: glx.c 
  	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- a/make_freebsd.mak	2010-06-08 17:30:58.000000000 +0000
-+++ b/make_freebsd.mak	2010-08-09 22:50:26.173246263 +0000
+--- a/make_freebsd.mak
++++ b/make_freebsd.mak
 @@ -64,7 +64,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
diff --git a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
index 09bed21d58f8..cb70122aa411 100644
--- a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
+++ b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
@@ -1,6 +1,5 @@
-diff -Naur a/make_linux.mak b/make_linux.mak
---- a/make_linux.mak	2019-01-07 14:08:00.269147198 +0100
-+++ b/make_linux.mak	2019-01-07 14:10:28.645155241 +0100
+--- a/make_linux.mak
++++ b/make_linux.mak
 @@ -101,7 +101,7 @@
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
index fffbc910c521..c8ea6322f8a1 100644
--- a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
+++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
@@ -1,7 +1,6 @@
-diff -Naur a/make_linux.mak b/make_linux.mak
---- a/make_linux.mak	2019-01-07 14:08:00.269147198 +0100
-+++ b/make_linux.mak	2019-01-07 14:10:28.645155241 +0100
-@@ -98,7 +98,7 @@
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -98,7 +98,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
@@ -10,7 +9,16 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
  		$(SWT_DEBUG) \
-@@ -130,13 +130,13 @@
+@@ -111,7 +111,7 @@ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+ 
+ # Treat all warnings as errors. If your new code produces a warning, please
+ # take time to properly understand and fix/silence it as necessary.
+-CFLAGS += -Werror
++# CFLAGS += -Werror
+ 
+ ifndef NO_STRIP
+ 	# -s = Remove all symbol table and relocation information from the executable.
+@@ -130,13 +130,13 @@ all: make_swt make_atk make_glx make_webkit
  make_swt: $(SWT_LIB) $(SWTPI_LIB)
  
  $(SWT_LIB): $(SWT_OBJECTS)
@@ -26,7 +34,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  swt.o: swt.c swt.h
  	$(CC) $(CFLAGS) -c swt.c
-@@ -169,7 +169,7 @@
+@@ -169,7 +169,7 @@ gtk4_stats.o: gtk4_stats.c gtk4_structs.h gtk4.h gtk4_stats.h swt.h
  make_cairo: $(CAIRO_LIB)
  
  $(CAIRO_LIB): $(CAIRO_OBJECTS)
@@ -35,7 +43,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  cairo.o: cairo.c cairo.h swt.h
  	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
  make_awt:$(AWT_LIB)
  
  $(AWT_LIB): $(AWT_OBJECTS)
@@ -44,7 +52,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  #
  # Atk lib
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ $(AWT_LIB): $(AWT_OBJECTS)
  make_atk: $(ATK_LIB)
  
  $(ATK_LIB): $(ATK_OBJECTS)
@@ -53,7 +61,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  atk.o: atk.c atk.h
  	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
  make_webkit: $(WEBKIT_LIB)
  
  $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
@@ -62,16 +70,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  webkitgtk.o: webkitgtk.c webkitgtk_custom.h
  	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c
-# @@ -217,7 +217,7 @@
-#  make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
-#  
-#  $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
-# -	$(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
-# +	$(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
-#  
-#  webkitgtk_extension.o : webkitgtk_extension.c
-#  	$(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^
-@@ -229,7 +229,7 @@
+@@ -229,7 +229,7 @@ webkitgtk_custom.o: webkitgtk_custom.c
  make_glx: $(GLX_LIB)
  
  $(GLX_LIB): $(GLX_OBJECTS)