gentoo resync : 22.12.2021

4 files changed, 78 insertions, 4 deletions

diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index 2f71b022d44b..447342903765 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,4 +1,6 @@
 AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce
 DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451
-EBUILD joda-convert-1.3.1-r1.ebuild 937 BLAKE2B fac1da48190698adab6b76f1f3bf9f83f43f13e07d1fab52062e8650309e7b59547a1692d2e71e49b23b249a781c987df706efe87a55ff9ba39970ac837e9b3c SHA512 389b9b40b38b2d7a720ddf63d57e293d47912ad40b1725bc2cd6c5dbe635843bc7ea558447da79cbe3faf55933e2998fbb3edecb3268435a57429aa6bce2fe86
-MISC metadata.xml 319 BLAKE2B 8effac0f7bbb056b42b58598eb277775583ec45ca172e3ddd743dd9ae5845f90fa966f7e87771b48548dd48bc7ec87527c83774419866f2dc6c8ec5bd40153ce SHA512 a01502a0e630c0665e38c7b5af500022fef3cff85b68ba4fecd6adb8cfc5e85c919990d63750c824409d973fc506c1bf2a0351cb97ad1f4b74ca6e10ad5784bf
+DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
+EBUILD joda-convert-1.3.1-r1.ebuild 942 BLAKE2B 96596d5ed6b726d26d1fd810899d670aa0a16deb1f7435408fd3c815a7903fbe5bf1ec3c703099bc5a0b673a2842fa1e210f8be9eca927a91fe14219a74487a5 SHA512 4235f69d1569e7876eae13ac7552df5c393658574a7f4d936f3b6371a973ec2d7af12bb1a673f38cdbf3c6aa5cce6e010a4630f9fe895298fb611ac40262b9ec
+EBUILD joda-convert-2.2.2.ebuild 2014 BLAKE2B 9f00473e39b592a3d5508709cd14ca639ccf851bd95a8f17cb14b6b5a4e17dfaa480c9a68d76adb107e64786ad7740ad663cc4a7f5808b56e48a35f7b2a76369 SHA512 a80345d746b73e9c281b892ed299677c8fbcb376ab70014061665139cc144ac0bd8b265d75cc8769d5eafaa2450185918adac5062ce4bd84020395447d6c305b
+MISC metadata.xml 390 BLAKE2B 50a8eb1f9935a4b0bc775f4c5f069df312da8aec16f6aeb6fb9c66df41f1af3ad4b3a06697e7a2d660275f6cdb19571b99b6d2a9d7418c7d4d9cb177e7660769 SHA512 da06cf231ded50201b189737b5021486c4ec324f6f7e6eb5df1ed2f1ae67a29bd529d4f108eb904c6820994c960c7c6523d69f70378f5d928286736c4ce78cc0
diff --git a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
index 03fe03d70345..97c617bf57a4 100644
--- a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="virtual/jdk:1.8
 	test? (
diff --git a/dev-java/joda-convert/joda-convert-2.2.2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2.ebuild
new file mode 100644
index 000000000000..6472c40d5e36
--- /dev/null
+++ b/dev-java/joda-convert/joda-convert-2.2.2.ebuild
@@ -0,0 +1,71 @@
+# 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/JodaOrg/joda-convert/archive/refs/tags/v2.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild joda-convert-2.2.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.joda:joda-convert:2.2.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library to convert Objects to and from String"
+HOMEPAGE="https://www.joda.org/joda-convert/"
+SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.google.guava:guava:31.0.1-jre -> !!!suitable-mavenVersion-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:20
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+#	JAVA_RESOURCE_DIRS=""
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-20,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# Upstream: Tests run: 186, Failures: 0, Errors: 0, Skipped: 0
+	# All following: No runnable methods
+	org.joda.convert.test1.Test1Class
+	org.joda.convert.test1.Test1Interface
+	org.joda.convert.test2.Test2Class
+	org.joda.convert.test2.Test2Factory
+	org.joda.convert.test2.Test2Interface
+	org.joda.convert.test3.Test3Class
+	org.joda.convert.test3.Test3Factory
+	org.joda.convert.test3.Test3Interface
+	org.joda.convert.test3.Test3SuperClass
+	org.joda.convert.test4.Test4Class
+	org.joda.convert.test4.Test4Factory
+	org.joda.convert.test4.Test4Interface
+	org.joda.convert.TestRenameHandlerBadInit
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
index e96bce731a65..9286c1123b77 100644
--- a/dev-java/joda-convert/metadata.xml
+++ b/dev-java/joda-convert/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">joda-convert</remote-id>
+		<remote-id type="github">JodaOrg/joda-convert</remote-id>
+		<bugs-to>https://github.com/JodaOrg/joda-convert/issues</bugs-to>
 	</upstream>
 </pkgmetadata>