gentoo resync : 29.12.2022

6 files changed, 49 insertions, 106 deletions

diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index b7e53fc7c9ef..125149fb1794 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,7 +1,7 @@
 DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
 DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72dc38e77f0348eaa767b56e2c5fbb7df88c3b0c794cfc7eaad3d839550a197288dab59520a63562f083388764c0 SHA512 16d62a1fd6045a57f1d215227ce75860340c286eb0986b1086a0312dbc8ca8119b25533c42fe54f367231ec1c34795fec6a9355417f71ce826ee28d5fb6cf9fe
-EBUILD jaxb-api-2.3.3-r1.ebuild 1535 BLAKE2B 029a11d2436bc4594c2c8dada183331431ac42fdf7e6c380fc4397086784e24561742dc1d4164a85dcb79ac0fafe48758863d31b07d5dbec199f4d52d38efabb SHA512 b60a357fe7e7e9d788cb34eee2a2f98b792e5bd4eeb56fc9e25186fce890def4895b2012cb18b878fbabce756e460bdf59c3367678b267984d6772fbaa0e8704
-EBUILD jaxb-api-2.3.3.ebuild 1786 BLAKE2B 677c14dcf9c7b350c71ee541ca2f3c873bfbd4dcbe06e6e2ae6242574612b78cfb62459286f2747c55b57168a1b1b5e1a77c336a85a7b057fb5aa3cb237a7dca SHA512 50e54d9ba94020606b0074a4da951c8d487c1c5e884c4d585880a73824a014b5188b275537d09954a3e1aa225424b0d0bfb55a77f0813f0562dcf85aab956139
-EBUILD jaxb-api-3.0.1-r1.ebuild 1141 BLAKE2B a73ebcc3494456a487462d27c4dc3cf3383a2d79534ab208c83346791f82fcf08cd06bbae221de59ee503d7b3607c8e9f2cc2faa26ded586b33ad3f3196977c7 SHA512 eb37dc0efe9c58f641dff72cd5325ca5e1a34b6d1cbbcba350551c4e46718090783d3b56ce82dc18b1e9ca3198f9ef9b1ce2dd30333e8997f40c3373d469d606
-EBUILD jaxb-api-3.0.1.ebuild 1153 BLAKE2B c9ba7c100acff5546a1a84c7d4c44459218bba27d183df4b17f51f61396ecbc4b1f1bcbcfdef146c607c5bd2474233116b12bd713c999af83fbf7cd311fe6a52 SHA512 36e32cb358e10716831a33daa388c2fce8012c0cac637e20fcd412e946df8a4395f64db46cf5a82ebbf77d40a2d861cf0fd37fd4cc59c41c0cc36ac90b1dc955
+DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175
+EBUILD jaxb-api-2.3.3-r1.ebuild 1531 BLAKE2B 8c3fe2631bb4c08cec81d96f8ae1a632740eee3e822e5ba16d703f8f792e594834175d2681eeedc28647d5c3f49947fc405bc57b915441203bb113419f31d948 SHA512 90a9f418a8c15a21d88076370bda6b757648fdfbbcd9c1eaf137de7f0d72d0aff7f6b326919f0f14f668e006d28c0a9fc0b60f594b252050f9032f681b1767f6
+EBUILD jaxb-api-3.0.1-r1.ebuild 1116 BLAKE2B 0699bde40ccb4198c76f1df7c6de9be8e4f7d555a66e733c05d5942677cb208598b47aa73f2a3691a3b5c5ef6c19ff5e9e37135eb648f87628b39a6e11ed1138 SHA512 d93aba658f98491ba3d9f8d6a24fc1831848096f93ea5c6500dbac61b431087eedb18c16e943a43bd26846e8bb45e1ae5f7dfcbbdf87b146c869cdcda83e0dc3
+EBUILD jaxb-api-4.0.0.ebuild 1022 BLAKE2B 2aa8ff74a22096e18772d380bf6d76fea9feee4bca84600855de5c2342ca62f2105261ec39ebda7be2da0c4e8177607b1fcf92d46878f7d7d6dd044924bff3e1 SHA512 b6532ee64d244aac60500a0e08c236f900121397438b6e1150beb817b82cefa2e7264844e8c81581ed0b73a967984a06b988d3b3119f6a95af25e2610ad04d49
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
index 8e24eccaf3cd..179eb6a32e3c 100644
--- a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
deleted file mode 100644
index 9fa240685dea..000000000000
--- a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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 https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/2.3.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-2.3.3.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
-SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# jakarta.activation:jakarta.activation-api:1.2.2 -> >=dev-java/jakarta-activation-api-2.0.1:0
-# jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 -> >=dev-java/jaxb-api-2.3.3:0
-
-CDEPEND="dev-java/jakarta-activation-api:1"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README}.md )
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
-JAVA_GENTOO_CLASSPATH_EXTRA="jaxb-api.jar"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../${PN}-test/src/test/java"
-JAVA_TEST_RESOURCE_DIRS="../${PN}-test/src/test/resources"
-
-src_test() {
-	# Suppress tests for vm_version 1.8 (too many test failures)
-	# see https://bugs.gentoo.org/796995
-	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-simple_src_install
-}
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
index 6b3427db5392..9167a5edd809 100644
--- a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
@@ -12,12 +12,12 @@ MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
 SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
deleted file mode 100644
index 857f9ebaa6e0..000000000000
--- a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
+++ /dev/null
@@ -1,40 +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 pom.xml --download-uri https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/3.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-3.0.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api"
-SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
-
-CDEPEND="dev-java/jakarta-activation:2"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="jakarta-activation-2"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
new file mode 100644
index 000000000000..a49e2c851b71
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
@@ -0,0 +1,42 @@
+# 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="jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta XML Binding API"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="dev-java/jakarta-activation:2"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="api/src/main/java"
+JAVA_RESOURCE_DIRS="api/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="jaxb-api-test/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="jaxb-api-test/src/test/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}