gentoo resync : 28.04.2021

3 files changed, 88 insertions, 9 deletions

diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index 33ea1e18a893..dc9fd435e23e 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,4 +1,6 @@
 AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f
+DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
 DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209
+EBUILD joda-time-2.10.10-r1.ebuild 1956 BLAKE2B 508bd4cb9e23db7dbfe5562c46c11373cea5fa16034b3976ce31c94b3bd29be4e253c39f8c0d54514faa2d1bea8c506e6f5855a542c162c4e61d0c684c26fa6b SHA512 04f796eb9f496b6161c76005571b8e8aaec916249d32469e8d9abdecc1375666fd816b19679e3157257eb02606a31bf15fc875821f568b3bd3ed1c9af64db938
 EBUILD joda-time-2.7-r1.ebuild 1907 BLAKE2B 3a7d17a4e108eee44161a1cfe148e799e3307fa18e86322626d8a825a7eea1f59c3c5cbaa9183e431a7619c487538507a68f98c22c67f4ea8ad6c178c5b5a58b SHA512 edbaa5dfbcafd27a1899d1759f4488dacb7b007e7f3061eb0ab4ff5eca0be8ba36df0b758d7fead35497e3cabaec91ba483ee656a6a59b4c92ba5cf5a50ac977
-MISC metadata.xml 384 BLAKE2B 298d00eca8bdd34de1a3c30a423051cd62923963b1d239640690cf12c3ddbbe661bfaa689f1b225a968747bcc7d3b28aa53ccd90fa406322aeaa3e1f3703f4a6 SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089
+MISC metadata.xml 496 BLAKE2B 1305c141e2009564578f1028c915296d4a1d12c75b350bb2d37e3e5e4fba89631ed750c58944285a493b7b3590d76ba6b72cae1dd711e3a021226c5b1b6e6944 SHA512 b411a78e0160f6866682e6f5df59b9e06835250710182a66e5f4d1527f81820f88ac1a8d13e93021a05161b8b72587205404902db97afa2a239d1fe7bc8a84f6
diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
new file mode 100644
index 000000000000..c1d6e61dba70
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom joda-time-2.10.10/pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.10.10.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="joda-time:joda-time:2.10.10"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Date and time library to replace JDK date handling"
+HOMEPAGE="https://www.joda.org/joda-time/"
+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 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: ${P}/pom.xml
+# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.1:0
+
+CDEPEND="
+	dev-java/joda-convert:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="joda-convert"
+JAVA_SRC_DIR="${P}/src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"${P}/src/main/java"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="${P}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"${P}/src/test/resources"
+)
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Generate the missing "org/joda/time/tz/data/ZoneInfoMap"
+	# Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427
+	"$(java-config -J)" \
+		-cp ${PN}.jar \
+		org.joda.time.tz.ZoneInfoCompiler \
+		-src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \
+		-dst "${P}/src/main/resources/org/joda/time/tz/data" \
+		africa \
+		antarctica \
+		asia \
+		australasia \
+		europe \
+		northamerica \
+		southamerica \
+		etcetera \
+		backward
+
+	java-pkg_addres ${PN}.jar "${P}"/src/main/resources || die
+}
diff --git a/dev-java/joda-time/metadata.xml b/dev-java/joda-time/metadata.xml
index 78620eff5573..b64115a9a19c 100644
--- a/dev-java/joda-time/metadata.xml
+++ b/dev-java/joda-time/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">JodaOrg/joda-time</remote-id>
-    <remote-id type="sourceforge">joda-time</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">JodaOrg/joda-time</remote-id>
+		<remote-id type="sourceforge">joda-time</remote-id>
+		<bugs-to>https://github.com/JodaOrg/joda-time/issues</bugs-to>
+		<doc>https://www.joda.org/joda-time/userguide.html</doc>
+	</upstream>
 </pkgmetadata>