gentoo auto-resync : 15:04:2024 - 12:04:02

4 files changed, 2 insertions, 214 deletions

diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 2447485e9bf4..bafcce7ee3f0 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,8 +1,4 @@
-AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
-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.26.0-r1.ebuild 1341 BLAKE2B 85ddf9f5e226669d9eef5ae7d23f0db9f34b87d89a1e35219898bf98f516cdee5508865aff05c4250dfd54c90638d23675da1c010a435d1f3ea1dd7e29335f3c SHA512 4985b05053b4ed3e7802db592674ed551c88f67eee48efa1fcd6bc62792c043253de8f10df6d44d8c74d50a4cd33568d80df98d4afd65624fcf3e0123235179b
-EBUILD commons-compress-1.26.1.ebuild 1311 BLAKE2B a79f18019a9a3db0971847376af23bc7a38cb58e2883e90e6489f65ed0d23d89199b37142d6fa01cbca7d6cf0003d3bd30d4d5476c97f20fb081cfca80302154 SHA512 6b80d0c1ccdde1b10def9c85c1971c3249a2b412db3e8fbee2b3688178ea5f8fa0415376e2a79291fcc98f586747a39210de7804540a2cd5b8913027b9f66cd5
+EBUILD commons-compress-1.26.1.ebuild 1307 BLAKE2B 65146a3dec16edfe680b003199565da76945b8b2481103e03f99220641ed5270e27cb0ee14b3e64969b6c47501f68640ca6df1a48a912e9259110b0492420349 SHA512 3c5a9ea89a8b1997e4053cc89150a6334bbfa32ad4e7bf985395efb98f34a64835d47115d4cf5b67a7bdce939a8eca6ba43b8bb72fc24c5a71e875a1a227203a
 MISC metadata.xml 325 BLAKE2B 9edddb431124415fe343c5fcfbef16627943a28d12f4bba89559a577e1a2b2eed63a866521f47c504c102c1f5f01cd014c6e453940347ae0bd8e3ebfc5cae68f SHA512 54562f74ac55704a1f09b8dc4d78c5620ba61197e71350d770bddbeafe53c2faaad6d900d284cc265be555d378022b228c6a14b0606f540e2faa16b3df27e939
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
deleted file mode 100644
index f229ec9ba6d4..000000000000
--- a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Not ready for running tests, https://bugs.gentoo.org/839681
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-compress:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-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
-	verify-sig? ( https://downloads.apache.org/commons/compress/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-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 )"
-CP_DEPEND="
-	dev-java/asm:9
-	dev-java/brotli-dec:0
-	dev-java/commons-codec:0
-	>=dev-java/commons-io-2.15.1:1
-	dev-java/commons-lang:3.6
-	dev-java/xz-java:0
-	dev-java/zstd-jni:0
-"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*
-	dev-java/osgi-core:0"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-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"
diff --git a/dev-java/commons-compress/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
index b51066f5a17e..c8764e448be2 100644
--- a/dev-java/commons-compress/commons-compress-1.26.1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
@@ -17,7 +17,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 )"
diff --git a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch b/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
deleted file mode 100644
index e20fa89787dc..000000000000
--- a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 7709c8be97147e8d5c5d7fa42d076504931ba9e0 Mon Sep 17 00:00:00 2001
-From: Stephan Blecher <token_github@blecher.at>
-Date: Tue, 10 Aug 2021 14:39:21 +0200
-Subject: [PATCH] COMPRESS-582: update harmony to ASM >= 7.0
-
----
- pom.xml                                       |  5 +--
- .../harmony/pack200/Pack200ClassReader.java   |  2 +-
- .../compress/harmony/pack200/Segment.java     | 35 +++++++++++++++----
- .../harmony/pack200/tests/ArchiveTest.java    |  0
- 4 files changed, 32 insertions(+), 10 deletions(-)
- mode change 100644 => 100755 src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
-
-diff --git a/pom.xml b/pom.xml
-index 28f50f06a..1c6844d24 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -78,6 +78,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
-     <commons.jacoco.version>0.8.7</commons.jacoco.version>
-     <commons.japicmp.version>0.15.3</commons.japicmp.version>
-     <commons.javadoc.version>3.3.0</commons.javadoc.version>
-+    <asm.version>7.0</asm.version>
-   </properties>
- 
-   <issueManagement>
-@@ -119,9 +120,9 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
- 
-     <!-- Pack200 -->
-     <dependency>
--      <groupId>asm</groupId>
-+      <groupId>org.ow2.asm</groupId>
-       <artifactId>asm</artifactId>
--      <version>3.2</version>
-+      <version>${asm.version}</version>
-       <optional>true</optional>
-     </dependency>
- 
-diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-index 2a017bc01..7022b7b30 100644
---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-@@ -40,7 +40,7 @@ public int readUnsignedShort(final int index) {
-         // Doing this to check whether last load-constant instruction was ldc (18) or ldc_w (19)
-         // TODO: Assess whether this impacts on performance
-         final int unsignedShort = super.readUnsignedShort(index);
--        if (b[index - 1] == 19) {
-+        if (index > 0 && b[index - 1] == 19) {
-             lastUnsignedShort = unsignedShort;
-         } else {
-             lastUnsignedShort = Short.MIN_VALUE;
-diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-index 0609aa4c2..1bc73a018 100644
---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-@@ -32,12 +32,20 @@
- import org.objectweb.asm.FieldVisitor;
- import org.objectweb.asm.Label;
- import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
- import org.objectweb.asm.Type;
- 
-+
- /**
-  * A Pack200 archive consists of one or more Segments.
-  */
--public class Segment implements ClassVisitor {
-+public class Segment extends ClassVisitor {
-+
-+     public static int ASM_API = Opcodes.ASM4; /* see https://asm.ow2.io/javadoc/org/objectweb/asm/Opcodes.html#ASM4 */
-+     
-+    public Segment() {
-+        super(ASM_API);
-+    }
- 
-     private SegmentHeader segmentHeader;
-     private CpBands cpBands;
-@@ -255,8 +263,12 @@ public void visitEnd() {
-      *
-      * It delegates to BcBands for bytecode related visits and to ClassBands for everything else.
-      */
--    public class SegmentMethodVisitor implements MethodVisitor {
--
-+    public class SegmentMethodVisitor extends MethodVisitor {
-+        
-+        public SegmentMethodVisitor() {
-+            super(ASM_API);
-+        }
-+        
-         @Override
-         public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
-             return new SegmentAnnotationVisitor(MetadataBandGroup.CONTEXT_METHOD, desc, visible);
-@@ -427,7 +439,7 @@ public ClassBands getClassBands() {
-     /**
-      * SegmentAnnotationVisitor implements <code>AnnotationVisitor</code> to visit Annotations found in a class file.
-      */
--    public class SegmentAnnotationVisitor implements AnnotationVisitor {
-+    public class SegmentAnnotationVisitor extends AnnotationVisitor {
- 
-         private int context = -1;
-         private int parameter = -1;
-@@ -443,17 +455,20 @@ public ClassBands getClassBands() {
-         private final List nestPairN = new ArrayList();
- 
-         public SegmentAnnotationVisitor(final int context, final String desc, final boolean visible) {
-+            super(ASM_API);
-             this.context = context;
-             this.desc = desc;
-             this.visible = visible;
-         }
- 
-         public SegmentAnnotationVisitor(final int context) {
-+            super(ASM_API);
-             this.context = context;
-         }
- 
-         public SegmentAnnotationVisitor(final int context, final int parameter, final String desc,
-             final boolean visible) {
-+            super(ASM_API);
-             this.context = context;
-             this.parameter = parameter;
-             this.desc = desc;
-@@ -478,7 +493,7 @@ public AnnotationVisitor visitAnnotation(String name, final String desc) {
-             nameRU.add(name);
-             nestTypeRS.add(desc);
-             nestPairN.add(Integer.valueOf(0));
--            return new AnnotationVisitor() {
-+            return new AnnotationVisitor(context, av) {
-                 @Override
-                 public void visit(final String name, final Object value) {
-                     final Integer numPairs = (Integer) nestPairN.remove(nestPairN.size() - 1);
-@@ -552,7 +567,7 @@ public void visitEnum(String name, final String desc, final String value) {
-         }
-     }
- 
--    public class ArrayVisitor implements AnnotationVisitor {
-+    public class ArrayVisitor extends AnnotationVisitor {
- 
-         private final int indexInCaseArrayN;
-         private final List caseArrayN;
-@@ -561,6 +576,8 @@ public void visitEnum(String name, final String desc, final String value) {
-         private final List T;
- 
-         public ArrayVisitor(final List caseArrayN, final List T, final List nameRU, final List values) {
-+            super(ASM_API);
-+
-             this.caseArrayN = caseArrayN;
-             this.T = T;
-             this.nameRU = nameRU;
-@@ -612,7 +629,11 @@ public void visitEnum(final String name, final String desc, final String value)
-      * SegmentFieldVisitor implements <code>FieldVisitor</code> to visit the metadata relating to fields in a class
-      * file.
-      */
--    public class SegmentFieldVisitor implements FieldVisitor {
-+    public class SegmentFieldVisitor extends FieldVisitor {
-+
-+        public SegmentFieldVisitor() {
-+            super(ASM_API);
-+        }
- 
-         @Override
-         public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
-diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
-old mode 100644
-new mode 100755