gentoo auto-resync : 30:11:2023 - 11:00:41

14 files changed, 46 insertions, 296 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6e9357a653cb..87f69e51d021 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 70c45b693919..2b10bfb44360 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,8 +1,5 @@
 AUX commons-daemon-1.3.1-Make.patch 508 BLAKE2B a7645b93b44f15b4ebb9a0864a3c467999bcb0becf006f2806f897a26435140017384fb8cf14151e3a7b969c9397c4047f47e2a35f53904a9a013d5f085ab04c SHA512 f01c485a0832aef27b1fa6b681c7f66096a0206d6e75e702e32bd6131eb1ea4d85fb363d12eb6d29c386d2af773ca0ff17f14ea7a6ebc8469e641b0760e9a82f
-DIST commons-daemon-1.3.3-src.tar.gz 290415 BLAKE2B c9c175ba52cef25ce6d1b56c7466aa5e775ed1ac3ca7c710c3519574c35e8a66ff5846313de8da594511ad411e802b7e0b647cbfd66a50abaaa0d39574a4e103 SHA512 ec246e2c05d66408374ba56b3715b13f8f24f89af11fa00c2381dc19c188f1b6228f19351c97d5774808a804b83fdbdfb8f537d099db062c39ffd281c142ee77
-DIST commons-daemon-1.3.3-src.tar.gz.asc 873 BLAKE2B 01fc7ec60393f2077a2bbf80aacb1a03b821cb52f88d87010f26a5811e2695d08b7c01193d00c2fb1a28bb875b63a5a0a935feadf7c1f00c4799aafa32592804 SHA512 c42b36acd45665daeda06a59006f05fd9846817e4e1065ef89dfedef060216ecce0316d06400437e4fb5138cf41c2fe52790cd5da9306c64e3000a3765bad2a2
 DIST commons-daemon-1.3.4-src.tar.gz 290834 BLAKE2B be57fbf89cad23fb4108e97b8e75d8380ff5b286068edfed65cd3539971375949ec80fd5aeece50a6498642f60e26498eb37ea3778f503d7498662ae79ecd14e SHA512 bb36d88bc21a5777245012b2a73ee0e764b85715731f54cc4ff09343e95ccb18fc6c68b3ae9c680fb45a60c7ef5ed0f9e40991c2c03246dd7f8dd65031eddf24
 DIST commons-daemon-1.3.4-src.tar.gz.asc 873 BLAKE2B f7886e67e2cfb0211d3271d79c251d07e5b0d7f7819566891e838619021ab9e3f468e3647f2f901d41a6d00f12b30adfa2d16f828ac5ce526666caab30ab8001 SHA512 eae6b01844bf5c49a95a60f4b59e0b989488728edb209252779f83e33ea3eeb53900a5fdeee5d953b231b241ba14a27c77967bdd3fe5acf2d9c6da50c225c79b
-EBUILD commons-daemon-1.3.3.ebuild 1603 BLAKE2B cc17c63a19444bef2320389855d569e57c5e8b03d0456b2edfa21ed90c8eb42ae7f5edb7090e4ae0f4eeceb295decef5ea88aea58241a7990c54d279f868c65a SHA512 b2461e068a6a88fcabc404c04802e7e9f6d3568ae5d385d875d67443d9c01ec7803744f521e52e0ca44bfe9290a9ac4abd060666e65afb7ee6c12d0a297729bd
 EBUILD commons-daemon-1.3.4.ebuild 1480 BLAKE2B 9e028b172140611de19ccbf8aad46383d9b684275b0507fa9a1a03a2985a4205fbd91d78cb04d7ca41c72ca40e1de5e32996e5b66bcc16b934be520cddd6fbe5 SHA512 d13ff71c28c35b5c505dec7d372055f7c6126ad696851dbbf27a86922014a3d533d4dde66a4c7710e3d411d5a17d3848b5225b046ab048e6576003e427bdfe57
 MISC metadata.xml 693 BLAKE2B 327524cf8db429b89ebf8e16745b6125fdfef850402000b1ddefa96254aa827a1fa8a2bd61af3ac219b26f0fd14f7c6d9718462f095ef1264b6119ccbc21f9be SHA512 ab8232bbc9d93e5c3f056f3230f3cf4bd095dbf8985a25094b8ba541679814d4dc10e3a211537397577f30d3d84d3335a0d512b26ca82b14a58f3994b6954810
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild
deleted file mode 100644
index 839625a12d88..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.3.3.ebuild
-
-EAPI=8
-
-# No tests because "package org.junit.jupiter.api does not exist"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-daemon:commons-daemon:1.3.3"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs verify-sig
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/commons/daemon/source/${P}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( PROPOSAL.html )
-PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	pushd src/native/unix || die
-		./configure
-		emake AR="$(tc-getAR)"
-	popd
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dobin src/native/unix/jsvc
-}
diff --git a/dev-java/osgi-service-log/Manifest b/dev-java/osgi-service-log/Manifest
new file mode 100644
index 000000000000..95197ef47f40
--- /dev/null
+++ b/dev-java/osgi-service-log/Manifest
@@ -0,0 +1,3 @@
+DIST org.osgi.service.log-1.3.0-sources.jar 12012 BLAKE2B 005f7e71b2a16bee5b097ffd207667d59a0743bb278669c59e6cf56c183a8dd063190ddff2071c2945c41410fbb86c4534ad7116fb56d4d621bbbbc0659b54ef SHA512 06757188027245690b0655105acd94534844d2e118b9ec4ab7ac0c910fcebb22dcf0fd53e20ad053b4c6e97461bfe4ffddf1b2b11045f2659518afec0baef105
+EBUILD osgi-service-log-1.3.0.ebuild 743 BLAKE2B 560cdb913418bb559c6b0ddccdde1222636446d98f024128bb855bb17220f1643539c4bb69699e5c8ff9b0e238a42001eff020d70686ffe52a4184ca0257a8c2 SHA512 12bf3f4e590853f21c970a5bab8a1a375ada01bb44779b1f3f38bde56c241a2882a587eaaace5da20b9678bb44727d98d19f166966b0e3e0f0043bd272e325c1
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/osgi-service-log/metadata.xml b/dev-java/osgi-service-log/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/osgi-service-log/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild
new file mode 100644
index 000000000000..39b9905b5a80
--- /dev/null
+++ b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:org.osgi.service.log:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Companion Code for org.osgi.service.log"
+HOMEPAGE="https://www.osgi.org/"
+SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/${PV}/org.osgi.service.log-${PV}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="dev-java/osgi-core:0"
+
+DEPEND="${CP_DEPEND}
+	dev-java/osgi-annotation:0
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.osgi.service.log"
+JAVA_CLASSPATH_EXTRA="osgi-annotation"
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 5859fe47c168..40d0761d3fd9 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,5 +1,3 @@
-DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e
 DIST plexus-classworlds-2.7.0.tar.gz 60221 BLAKE2B 8adbad24c057982dd3da6ce221175cf0b3e6585316de02434214d7d470b24220edaa94f4191cb2febfc4e3006a78cd3be5cc0f793438a5009ee20ef8c602768b SHA512 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f
-EBUILD plexus-classworlds-2.6.0.ebuild 1826 BLAKE2B 3d895c77d5f78322e5aa01c67de9510d9d954f8c6d2e218ed915217bcb0aa39eceb560e776e5e1b66c138bc04fd8c3abc6bbc69d6f2f0c51e8c42b2d12503c07 SHA512 8750a0a72ca0cf670a520414925e0e094963840f0e946d0da719ef8932cb9d84ff9807af22de7e843acc9af113f5dd42b48d54c73b961be3e2cd4bf44662e8c5
 EBUILD plexus-classworlds-2.7.0.ebuild 1514 BLAKE2B 0635a4156f91d8c23b996b4ab0c581783cd091d83b263e8e2e724a5979ad905c332072e8da451d885675d94a973d9670ea1cb00f1501f0744bf8d6ee553a2ece SHA512 34d0c6ad19d745b95e2b5e11db58475a72bf305d3338089c1ad7ce50cbd06285b5b2dd4dda78aecf231fed27405e1f92f0af20cfa5b6f2cc26c3deeccba180a1
 MISC metadata.xml 336 BLAKE2B 8a6a080ce1eb0fb9a9adb254c3ae535954cff1dd74eac0c2ac469b75398425fa4b2dff2373c04df1cfb57f3234724fe520bbfb3b42e6a941dfd6d60ec9846caa SHA512 3dd3629ddf804686af7d70c202009b5a594ceb0d12efd5e96e2bf6732891c8000c41fea3e2aefaab3037cd81b3129d1fe81deaa3e01005a446a94b221f193e3b
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
deleted file mode 100644
index d5eca2023894..000000000000
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.codehaus.plexus:plexus-classworlds:2.6.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The class loader framework of the Plexus project"
-HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
-SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/commons-logging
-		dev-java/xml-commons-external:1.4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
-JAVA_SRC_DIR="src/main/java/"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/test-data"
-JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
-
-src_prepare() {
-	default
-	# Ignore one test case testing the presence of ant-core
-	sed \
-		-e '/testConfigure_Valid/i @Ignore' \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-i src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java || die
-}
-
-src_test(){
-	mkdir -p target/test-lib || die
-	# https://github.com/codehaus-plexus/plexus-classworlds/blob/plexus-classworlds-2.6.0/pom.xml#L159-L161
-	ln -s "$(java-pkg_getjars --build-only xml-commons-external-1.4)" \
-		target/test-lib/xml-apis-1.3.02.jar || die
-	# symlinking works only if java-pkg_getjars finds only one file
-	# but commons-logging has  multiple jar files.
-	ln -s "${SYSROOT}"/usr/share/commons-logging/lib/commons-logging.jar \
-		target/test-lib/commons-logging-1.0.3.jar || die
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index bd150df2516b..ea3aa2c02a94 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -11,14 +11,10 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6
 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
 DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
-DIST swt-4.28-gtk-linux-aarch64.zip 3836289 BLAKE2B 3460e8bcde76cae74d3fba94198b2f0a6b8ed21c4f123003a216421db4af03686f43a26ce00cf4c59c56f8a31b88626482ae5f13f2e92c06e2147658fa482aeb SHA512 d91ff48ca384de057d70f3a886691193bd88960c6da0e37fb4ef695c32399c0d3ab87f6174075e5637046e7b2b22a73e4b03e0133a2bdb7ee584d4fa53baa11c
-DIST swt-4.28-gtk-linux-ppc64le.zip 3860453 BLAKE2B 8de275767f1bd0b68a58744804c71314760fb3d56a396db32917376583830bb0307b5169f0f8c56a200180aaf7e871a1ab01e2ed682c16a49d2d236d1ae3bc3a SHA512 56d7f82b249924966184be29d4cdac454308169247b5c7819b77f592eef7f434ba5e913d95688411667940c354cb9d9db023935925914053e04117a654e2ad91
-DIST swt-4.28-gtk-linux-x86_64.zip 3856600 BLAKE2B 6725d0a261444d113af74e36d8bc451d2a8f3fbecb13f137877d4ac3acf427944b4eeb782967bddbd30c0af88ab0c8976020731c2c70c318012053ccdde83b17 SHA512 81c42fc08432c031f8c2d862fde5ac59c96ff0b70109fb1a65b00c22f136c696d7aa9ec02416660cb71691f3c9d36de553a68315cb4e9aeee86290114e69a829
 DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17
 DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b
 DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e
 EBUILD swt-3.7.2-r3.ebuild 4286 BLAKE2B 40e4b69caa7d503bbe4a832a7b3d685fc88c6469a10bad3321b33f97959e46f4af4677afaac824526c97f683a43644e4f0fd7c45b47ba360a3e9c5f18c01edc6 SHA512 517cd181329938b7bf6108713827c29825410e3053b38c3971cfbdeacc7012c3385717e130d244f7e02d96dc18d7349d52656df552c26a452d903d2be1bee995
 EBUILD swt-4.10-r2.ebuild 4528 BLAKE2B 71b929a9ca02b5918314b5bf2631aa374c089d3a749e645c84865266f1cc5eebc2de5cea17471834fc329012276722c6a922c9d9266d9c9f24c45362af3b5b9b SHA512 5d7bf83a2c1b664e5e2b76336b35100eed8eef45986dc896ef5751b50431b34cfe99d9084ecae547e54dc5b250fc793fe7dd5f8c52294c442f193c2acabec480
-EBUILD swt-4.28-r1.ebuild 3375 BLAKE2B 4e04bbad648ff47d9c849398a85e34ae9916136b9a806f1d2f3b7713594e99784d1672d3fb7847f05a9fefcc0d225e51cc556ad64080ed3bb18bcb9de288025f SHA512 c2e62961fb9895d9039764406df595d794074062e325e4942927cb68d30c2c1174efac2b5fbed14580b0fcace48aa7526465700014bbf21c4ae12fae7139e024
 EBUILD swt-4.29.ebuild 3440 BLAKE2B ac5dabbbcace7d28eb352a8851a0f1dd1ed72f3285215b639221c99db118c831524f563162876be9cca02ce21bd8b2d8a0b90f2983a68000cdbca562ce2c6d73 SHA512 7b1eacbda33353ab91d7deeb73889e9245664862c6c279def64a60a351f91b0b917223a4da9af2279416d1a2992383587a1427f15188b7ef6ecd1e62b7f465c5
 MISC metadata.xml 761 BLAKE2B f70a4d3ff5fcfad5705772396957664e700bd3ffe9580ac141c5faa11e24562b0cbc199a2f49d61d6a2a08058374dc1b7bfd9ae258e4a692e5b3c340f478da25 SHA512 1e8b8ceb30071c8271365a2d515e094c11ab569c4fee7b7f905d5de0a7613518320a1912b2b958d816e04d9876ed75425e16de9a35e1d6be6466888e08a420b3
diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.28-r1.ebuild
deleted file mode 100644
index 8868a156b623..000000000000
--- a/dev-java/swt/swt-4.28-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202306050440"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/swt/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.27"
-KEYWORDS="amd64 arm64 ppc64"
-IUSE="cairo opengl webkit"
-
-COMMON_DEP="
-	app-accessibility/at-spi2-core:2
-	dev-libs/glib
-	x11-libs/gtk+:3
-	x11-libs/libXtst
-	cairo? ( x11-libs/cairo )
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? (
-		net-libs/webkit-gtk:4.1
-	)"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-11:*[-headless-awt]
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-HTML_DOCS=( about.html )
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="src"
-
-PATCHES=(
-	"${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch"
-)
-
-src_unpack() {
-	default
-	unpack "./src.zip"
-}
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-	# .css stuff is essential at least for running net-p2p/biglybt
-	unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die
-	java-pkg_clean
-	mkdir src || die "mkdir failed"
-	mv org src || die "moving java sources failed"
-	find src -type f ! -name '*.java' | xargs \
-		cp  --parent -t resources -v || die "copying resources failed"
-	cp version.txt resources || die "adding version.txt failed"
-}
-
-src_compile() {
-	append-cflags -fcommon # https://bugs.gentoo.org/707838
-
-	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"
-	export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)"
-	${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
-	fi
-
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	java-pkg_sointo "/usr/$(get_libdir)/swt"
-	java-pkg_doso *.so
-}
diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest
index 421588b3d79b..4e77bda05d9d 100644
--- a/dev-java/validation-api/Manifest
+++ b/dev-java/validation-api/Manifest
@@ -1,5 +1,3 @@
-DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0
 DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
-EBUILD validation-api-1.0.0-r1.ebuild 539 BLAKE2B 2eb46d14555772c0181c639252d910179ba7917fd1535f6ce09184c238b23c4b3109b93f20e5b94f01baa8b7731835473bf34aa450b910005e8611596f3a7b23 SHA512 36a355a4d55438c1ffbbebbadb7f76897642dd475263830bbfc3a1202433a5af0557e4df704067cacf3e331ad6eaa20a19813e918dc611fb29eb52653345a459
-EBUILD validation-api-1.1.0-r1.ebuild 515 BLAKE2B 60665418083080f9af951a191d55443e562b6d98e9c99f21cc6e07bc6fb822e066f6b9552b1366cd30312babb0d2a6bded06ad7247aed4aaf27d1effdfb461c4 SHA512 8dfd0a0a3e533ac37b7a28d95552d834fac0c53d564bdb420395dff4af57a466b84be36e678dd0a9d5aa00637fda0f3fd29522e55711305b066d54a036f6783c
-MISC metadata.xml 333 BLAKE2B 6d2e9f632e3437764648efce2592d860443f7b111735f99e00c4cdbd30cab6e7e15331eb53e91a69210b31bccfdc30a971afdd86f7cf0a454398a47b329ca9cc SHA512 c21940ac74456a04e60b0c066e9fa0a8dad3389de817b1e52c7dec9afde96604e3786e554486e76887d107c04c9de4bad37fc73725593b80247810771cfdbb0b
+EBUILD validation-api-1.1.0-r2.ebuild 506 BLAKE2B b99842dda91513fb1b36da75d03055f4b3804071b0ea45ba9c1d8dcfa58651665ff2113f2a0d222354bdf03f6b50e7a0811608856f0ffdba51df821cda4587ff SHA512 890a0b7617b0a0c5028b494908fde522e60514a38c0e8fc6b8f621f128927a274507a9bed2bc4e8b841d9e36b7421808e25bdf1804aeacd0422dfac5fb7477cf
+MISC metadata.xml 322 BLAKE2B ffa34b5530377af2e862b9ca61f5c306f0a7c1273388aed1dfec5004a3504801b40cae39bd832f5b16937792b5cafba7aca59394416683ad2a2d8791aac49dc4 SHA512 28d948c0e11628f83274bd90570fdfde2ec7435e3a9478625dea239ed2fbb4c650fb71672aa99ee51a0f4ce5677723e9f36a77ee769316e015324d6ec5eef317
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
index 8d626a41d89c..535a0cd95681 100644
--- a/dev-java/validation-api/metadata.xml
+++ b/dev-java/validation-api/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/beanvalidation-api</remote-id>
+		<remote-id type="github">jakartaee/validation</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
deleted file mode 100644
index 316ac36886b4..000000000000
--- a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="https://beanvalidation.org/"
-SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r2.ebuild
index 1f63794e937b..fe8bd82bedc9 100644
--- a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.1.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,8 +15,6 @@ LICENSE="Apache-2.0"
 SLOT="1.0"
 KEYWORDS="amd64 x86"
 
-IUSE=""
-
 BDEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.8"
 DEPEND=">=virtual/jdk-1.8"