gentoo auto-resync : 22:03:2024 - 13:00:51

3 files changed, 2 insertions, 125 deletions

diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index fde4d061757f..2447485e9bf4 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,10 +1,8 @@
 AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
-DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
 DIST commons-compress-1.26.0-src.tar.gz 54670636 BLAKE2B e29adcab9a10a7d4ada3624afb0d674a592fbd76d93badea833af355415a4e4adb1f954a2986cc9d1ae78dc84cd0380de0f21366cf7ae582e9d89f2cb2cea943 SHA512 9348e2792d67fe977cbfcede80ab95de96e582c3f7239e16e99360decac4e7703f57d4cfec9535cd4a0f884319df851eb5e44214ba8c3dd321cc6ea67f9d1abb
 DIST commons-compress-1.26.0-src.tar.gz.asc 488 BLAKE2B 0b51158ad0eeb91c8ecad1a6d87afd482ddaae7c6d4fd1d86b586886b1d6ba4073d9e6846a84334593676f1a6bb337b250009ddfc0f67838bab38238cd5d2a4c SHA512 31080e6fba38574d84b0af09450eba3c0b4b2781c50e432d5ce0e128a8b3edd105ad75908177c1aa8942d68a095d47e7f3f4d141c8f2227828b294f3da6b343c
 DIST commons-compress-1.26.1-src.tar.gz 54843710 BLAKE2B 84c4c1363a4396a06773a8c120f5f32d98fceaa139e33a2a27df79a9aea41b8084a93a5735b0c4cd17fa88c404060af2336ab20f127acceb0da948ff170164c3 SHA512 096c94344a9bbcd021a3cce0869456cf6d22ca5136b63de017922d7c3de5d94b591961fe550201b654f9dc90b2cd8f32ef9bf1e507fddfb2e2f7c33bddc790c4
 DIST commons-compress-1.26.1-src.tar.gz.asc 488 BLAKE2B 4df27d6d7ab226eb87ca6b7691c677b95d59c2d37f44ced6a5c0586aefa2506c9a635d869fd181526149416c228a8859a961386ca98519dc080709a55d9264c9 SHA512 b9533d63f961022ca42e79f8aed91a6c4b8a91cb0f3aa095a4ffa2202ed87d171f6c0d32babfbd730eb0c250be2331da4bd12e5251f7e7076f78536d20d96ced
-EBUILD commons-compress-1.21-r1.ebuild 4337 BLAKE2B bdde5ecec9736c68e7809fb173e89c2524c0603ee0b9088e11fe958685ed0e3c8fe41518fb11e555bb8ee933fcdda042fc944f6e06f413de0df5a0bd88e92694 SHA512 be83cd009b19e77c15b488742a646db3311a1f632b32d8da7eedd64ec3d468427d35304308ae03304760d4c3666f244a9df68179382001eeea6c9a06c91a06cf
-EBUILD commons-compress-1.26.0-r1.ebuild 1343 BLAKE2B 9deb3684f512752ef8e335c063509f464def190dc035a0216c95cc449c61419c4a334ba15a3f87797a316f22bfd22f38d8e925d91d84f662f9dcf9faca604f84 SHA512 1ff5cb694418802bcc067e6edc7882abbbe37911fa7c5d078fad5390a236514a73841c863b40a422034be00e31ecf2704380cff537ef65d6ebb0641600277567
+EBUILD commons-compress-1.26.0-r1.ebuild 1341 BLAKE2B 85ddf9f5e226669d9eef5ae7d23f0db9f34b87d89a1e35219898bf98f516cdee5508865aff05c4250dfd54c90638d23675da1c010a435d1f3ea1dd7e29335f3c SHA512 4985b05053b4ed3e7802db592674ed551c88f67eee48efa1fcd6bc62792c043253de8f10df6d44d8c74d50a4cd33568d80df98d4afd65624fcf3e0123235179b
 EBUILD commons-compress-1.26.1.ebuild 1311 BLAKE2B a79f18019a9a3db0971847376af23bc7a38cb58e2883e90e6489f65ed0d23d89199b37142d6fa01cbca7d6cf0003d3bd30d4d5476c97f20fb081cfca80302154 SHA512 6b80d0c1ccdde1b10def9c85c1971c3249a2b412db3e8fbee2b3688178ea5f8fa0415376e2a79291fcc98f586747a39210de7804540a2cd5b8913027b9f66cd5
 MISC metadata.xml 325 BLAKE2B 9edddb431124415fe343c5fcfbef16627943a28d12f4bba89559a577e1a2b2eed63a866521f47c504c102c1f5f01cd014c6e453940347ae0bd8e3ebfc5cae68f SHA512 54562f74ac55704a1f09b8dc4d78c5620ba61197e71350d770bddbeafe53c2faaad6d900d284cc265be555d378022b228c6a14b0606f540e2faa16b3df27e939
diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
deleted file mode 100644
index 40cf830dd60a..000000000000
--- a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
+++ /dev/null
@@ -1,121 +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://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-compress:1.21"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
-SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# asm:asm:3.2 -> !!!groupId-not-found!!!
-# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.5:0
-# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0
-# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-
-CP_DEPEND="
-	dev-java/asm:9
-	dev-java/brotli-dec:0
-	dev-java/xz-java:0
-	dev-java/zstd-jni:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.osgi:osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: pom.xml
-# test? com.github.marschall:memoryfilesystem:2.1.0 -> >=dev-java/memoryfilesystem-2.3.0:0
-# test? javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> >=dev-java/felix-framework-7.0.5:0
-# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
-# test? org.mockito:mockito-core:3.11.1 -> >=dev-java/mockito-4.6.1:4
-# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!!
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.36:0
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	dev-java/osgi-core:0
-	test? (
-		dev-java/felix-framework:0
-		dev-java/hamcrest:0
-		dev-java/javax-inject:0
-		dev-java/memoryfilesystem:0
-		dev-java/mockito:4
-		dev-java/slf4j-api:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asm7+.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
-JAVA_CLASSPATH_EXTRA="osgi-core"
-JAVA_ENCODING="iso-8859-1"
-JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="memoryfilesystem,javax-inject,junit-4,felix-framework,hamcrest,mockito-4,slf4j-api"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default
-	# error: package org.ops4j.pax.exam does not exist
-	# removing it costs 2 tests
-	rm src/test/java/org/apache/commons/compress/OsgiITest.java || die
-
-	# java.io.FileNotFoundException: couldn't find zstandard.testdata.zst
-	# pom.xml lines 420-422
-	tar xf src/test/resources/zstd-tests.tar \
-		-C src/test/resources || die "cannot unpack zstd-tests.tar"
-
-	# pom.xml lines 518-520
-	tar xjf src/test/resources/zip64support.tar.bz2 \
-		-C src/test/resources || die "cannot unpack zip64support.tar.bz2"
-
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/zstd-jni/" )
-}
-
-JAVA_TEST_EXCLUDES=(
-	# No runnable methods
-	org.apache.commons.compress.archivers.TestArchiveStreamProvider
-	org.apache.commons.compress.compressors.TestCompressorStreamProvider
-
-	# fails without useful message
-	org.apache.commons.compress.compressors.DetectCompressorTestCase # has 8 tests
-
-	# These tests pass but they prevent printing test messages::
-#	org.apache.commons.compress.compressors.pack200.Pack200UtilsTest # has 2 tests
-#	org.apache.commons.compress.compressors.FramedSnappyTestCase # has 5 tests
-#	org.apache.commons.compress.compressors.XZTestCase # has 4 tests
-#	org.apache.commons.compress.compressors.Pack200TestCase # has 15 tests
-#	org.apache.commons.compress.harmony.pack200.tests.PackingOptionsTest # has 12 tests
-#	org.apache.commons.compress.harmony.pack200.tests.ArchiveTest # has 9 tests
-#	org.apache.commons.compress.harmony.unpack200.tests.ArchiveTest # has 13 tests
-)
diff --git a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild b/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
index 5b6ff5107212..f229ec9ba6d4 100644
--- a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"