gentoo auto-resync : 13:10:2022 - 01:41:21

4 files changed, 2 insertions, 181 deletions

diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index 8b737dfbeb3b..c40925bdb472 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,8 +1,4 @@
 AUX joda-time-2.11.0-test.patch 577 BLAKE2B 072cb890960ae26fef7297e7e7af18ab36f5f2ed3d94f370e1ba4d873c3625ed291ead37b05ad8ac0b53da04c2bd0bef4e7b2e4039a450f6466d58d1f0fec1a8 SHA512 77430e5d0829b1de0d621956731f896c644fb4529b6f3e0fe741266661c7b027a3a3bbe0747875a74746c18f4bb7e31eff185121b21de9cdd5e2210aab5e673f
-DIST joda-time-2.10.14.tar.gz 1055876 BLAKE2B c70ad0724ad5e6d6f6a158ed05eb9711095cd353bf72a43a3edaa8ce36db1f92e0c18cd2e2b73c34e4126962d0ef97bf83844f9de924df8aadce7d38ffdb7975 SHA512 061c341c35f5187422fe402500384f5933c1eb0c77963f65b5295b8f9b479adf29f944269173d9a93e4a288c583777b21f085afe4c5da6c695f14801636f0fc1
-DIST joda-time-2.11.0.tar.gz 1055531 BLAKE2B 98b64e0419a1b7379d3467d012a1162afedb537048c86f8e9069ef5e21649dfe01d458a8e74ccb5dc052940b6edd2eba73ad86ae25bc20d3e62ec73a7a56a605 SHA512 357c8b3d1cc1cdd164cf2486a55ab9489db43c4243f140da5c21ee84bc3a801f51e2e2c2a257dbe2d2ce41bc33c676854136eddf3606ed7da69dcd3a10b2d010
 DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3
-EBUILD joda-time-2.10.14.ebuild 2174 BLAKE2B c4809145324538d170986b0e14884554837175f39f27a871ee740cf9b2a881fdc453389e298744f28c8c93bda53da12cd28a28c3d089f1dab064e9a8d98b1afe SHA512 0eff6cd6eb595eb2026f0531d74eb02cd0bfab85bfa1253e65a00d09cdb04a6a7e86b3d0189e101e2a15c0382ac91d67b02d874d5c05dc64770965ad5a2cf3e9
-EBUILD joda-time-2.11.0.ebuild 2652 BLAKE2B 7021a8b46e3c6a935204f9154d0bd131a641257c5cb1a9de54ee048a9cc994600fd17839da7cbc12730938e9df80d74708bc84ecb6600991879b6c2cb486e3b7 SHA512 87f85c66aa3ae560200bc5a3320c86983796989042f145f79c753d2362cfc4c9b9cd545661880bfcd922acd60d9803bdb104cdffd7c5d0058030d5320ed32cad
-EBUILD joda-time-2.11.2.ebuild 2659 BLAKE2B f589eea6ec81b3c3c5f9786caf92a10d4add0b6fe58f9d1cc88dfd2c6a2685558a48d71191b4db67430c935210ba94ac1cd5bb99140685e97b6285448b1f902d SHA512 05864c5673df7d5f58fd5a5f1d5a806bdfcad2316637accbb6bca0d51d5eab0bba24be8947c5decf11f676134e6a1c6d94f3aed1513e8f887994dd63c7be74be
+EBUILD joda-time-2.11.2.ebuild 2658 BLAKE2B 2ea77fcaed4c5e7248d1a75867fba1418493b9a7054396131b2cb36f1cf5077574fa38dde749876e638076b5f28eb4b3bd79a505977c1054f592061930bccd80 SHA512 ea7b170d88c4152bec1d951c68f6fd87e75b16f3b2ac0c470b4d2504e0d7b9ecefd8d8b0a29073b132df6e7819ec39d8ef361e48a34eea8dc0ed2e0f9399f488
 MISC metadata.xml 497 BLAKE2B 96303e9c4ee30156cb9f6dc9260155270fbc3aece7c8dcfb1fd796e69ed4ee2f3ec91030f016dcdd53f411a5c216c3d41dd68ea45079c036e0ee55d529548fd2 SHA512 9f5a300ca1ee6a68e555393879c61c6898c5ba22f0cdd83d83c1411d3009af7478ddb0e1087bc88d695b2bab162c4cc62952d3fc29b4902a857db95c2fc2f130
diff --git a/dev-java/joda-time/joda-time-2.10.14.ebuild b/dev-java/joda-time/joda-time-2.10.14.ebuild
deleted file mode 100644
index c1c4f5c954e5..000000000000
--- a/dev-java/joda-time/joda-time-2.10.14.ebuild
+++ /dev/null
@@ -1,80 +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/JodaOrg/joda-time/archive/v2.10.14.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.10.14.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="joda-time:joda-time:2.10.1r40"
-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/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 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
-
-CP_DEPEND="
-	>=dev-java/joda-convert-2.2.2-r2:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/res"
-JAVA_AUTOMATIC_MODULE_NAME="org.joda.time"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-	# move .properties files to JAVA_RESOURCE_DIRS
-	mkdir -p src/main/res
-	cp -r src/main/{java/*,res} || die
-	find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die
-}
-
-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 "src/main/res/org/joda/time/tz/data" \
-		africa \
-		antarctica \
-		asia \
-		australasia \
-		europe \
-		northamerica \
-		southamerica \
-		etcetera \
-		backward
-
-	# add org/joda/time/tz to the jar file
-	jar -uf joda-time.jar -C src/main/res org/joda/time/tz/data || die
-}
diff --git a/dev-java/joda-time/joda-time-2.11.0.ebuild b/dev-java/joda-time/joda-time-2.11.0.ebuild
deleted file mode 100644
index f9c720bebe0a..000000000000
--- a/dev-java/joda-time/joda-time-2.11.0.ebuild
+++ /dev/null
@@ -1,95 +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/JodaOrg/joda-time/archive/v2.11.0.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.11.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="joda-time:joda-time:2.11.0"
-JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit edo 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/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-# Common dependencies
-# POM: pom.xml
-# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.2:0
-
-CP_DEPEND="dev-java/joda-convert:0"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-PATCHES=(
-	# Enable tests for jdk-11 in
-	# src/test/java/org/joda/time/TestDateTimeZone.java
-	"${FILESDIR}/joda-time-2.11.0-test.patch"
-)
-
-DOCS=( NOTICE.txt README.md RELEASE-NOTES.txt )
-
-S="${WORKDIR}/${P}"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.joda.time"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/res"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_RUN_ONLY="org.joda.time.TestAllPackages"
-
-src_prepare() {
-	default
-	# move .properties files to JAVA_RESOURCE_DIRS
-	mkdir -p src/main/res
-	cp -r src/main/{java/*,res} || die
-	find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die
-}
-
-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
-	edo "$(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
-}
-
-src_test() {
-	# There are test failures in
-	# src/test/java/org/joda/time/TestDateTimeZone.java
-	# with jdk higher than 11
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -le 11 ; then
-		java-pkg-simple_src_test
-	else
-		einfo "Tests restricted to <=jdk-11"
-	fi
-}
diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild
index 0355f10d8a13..5141590c79a3 100644
--- a/dev-java/joda-time/joda-time-2.11.2.ebuild
+++ b/dev-java/joda-time/joda-time-2.11.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml