gentoo resync : 12.05.2022

3 files changed, 26 insertions, 28 deletions

diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 79ebdca3dd81..5468474998c7 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,5 +1,4 @@
-DIST jackson-module-jakarta-xmlbind-2.13.0.tar.gz 1841327 BLAKE2B 41b4f92979274265901fb5facd16169ee38d792f8cbd38fbadecb7cd9cdc836b0b42b3cc5a7372af92c77cb5a08ac8d33a9c9c51b6e499ad3dbb8b1dc204a406 SHA512 6c076eaaf7713ed82d60bb48492747bcdd09d8eedf73aae521b446cc5944ce3c2d01ce942f00cab85a1139b5383afc78142aab32093fc9b8e8bf5b743534d2a4
 DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
-EBUILD jackson-module-jakarta-xmlbind-2.13.0.ebuild 3120 BLAKE2B a34ddf77f92c3fed0c3bba60cc6980cdd051faaf1cc61a76bf7701774b2894c90e05d0650ee9967b40298b82f4a3a7f69c4922c017037e50cc87c87214d758e3 SHA512 4960fd3b384ae104c540136dfec05e5daeabee250a73f3608f2f27345456bc7f1a28a2b244a85c7f4e400e8d742d527f425532146932e0430c51c76a40e75fb6
-EBUILD jackson-module-jakarta-xmlbind-2.13.2.ebuild 2796 BLAKE2B 52af590cdb6d8e379588dae413ac2ff1bc6ed16d65567cca4a6ba8d6bf665514f2bae3b36678fc089c660d4cd7ce3200953c12485170d66179522bc2ea7158d4 SHA512 d619aee9e10759f19a77d9b3560767bea3db164dd366ff42bffb9fb6cd53e62902d8826207e7ed757326164fad0aeb18361561ce7596a6e7556e8c84d37bddac
+EBUILD jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild 2797 BLAKE2B 3fb3ebfbe0db71fa162703af10d62a18c3b32bc7875199cf4c555467c4af855ba3188f33f99c8fb66a4ec2f1d80a5d4944bb36f5b8e9873a25bb514993a5a6ae SHA512 e682ffdfa4022ef9d1fabf2cd07a5842d802cdb121eaf26e58004755f7b553fbdd79a23d7b3fe5920e9e5b93e43b7e263e26bf68ddb3caadbf35d190abc7333c
+EBUILD jackson-module-jakarta-xmlbind-2.13.2.ebuild 2792 BLAKE2B cc25393d71497d490dd6156a9ae1121959b09cc8d13b9a839f38a435c495ec4e01d8da6e4e7dc2c35309156b4f3a068c886fe5a7642eeab7dcf5a47ce4541334 SHA512 3ac9d6ea9bd1facb0496aad8c687543ca1e7edf432a0dde014c5530acede124b1df4d9bd3e8a17d228bbc678a9e4a67f6750a6dc3c2433d60199c4840484218c
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
index e93391f95948..bc1ab00b11a4 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.0.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
@@ -2,39 +2,39 @@
 # 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/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-xmlbind-annotations-2.13.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.2.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.0"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
 HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
-SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # We don't have jaxb-runtime:3.0.1
 RESTRICT="test"
 
 # Common dependencies
 # POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.0 -> >=dev-java/jackson-annotations-2.13.0:2
-# com.fasterxml.jackson.core:jackson-core:2.13.0 -> >=dev-java/jackson-core-2.13.0:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.0 -> >=dev-java/jackson-databind-2.13.0:0
-# jakarta.activation:jakarta.activation-api:1.2.1 -> >=dev-java/jakarta-activation-api-1.2.2:1
+# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
+# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
 # jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
 
 CP_DEPEND="
-	dev-java/jackson-annotations:2
-	dev-java/jackson-core:0
-	dev-java/jackson-databind:0
+	~dev-java/jackson-annotations-${PV}:2
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}.2:0
 	dev-java/jakarta-activation-api:1
 	dev-java/jaxb-api:3
 "
@@ -44,15 +44,19 @@ CP_DEPEND="
 # test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
 # test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
 
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
 #	test? (
 #		!!!groupId-not-found!!!
 #	)
 #"
 
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../README.md )
 
 S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
 
@@ -71,14 +75,9 @@ src_prepare() {
 		-e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
 		"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
 		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
+}
 
-	# This is an ugly hack, but ...
-	#	src/moditect/module-info.java:13: error: cannot find symbol
-	#	        com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindModule;
-	#	                                                    ^
-	#	  symbol:   class JakartaXmlBindModule
-	#	  location: package com.fasterxml.jackson.module.jakarta.xmlbind
-	sed -e '/JakartaXmlBindModule/d' \
-		-e '/provides/d' \
-		-i src/moditect/module-info.java || die
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
 }
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
index 642e074deac8..18d572895a82 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have jaxb-runtime:3.0.1
 RESTRICT="test"