[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-compress/, dev-java/commons-compress/files/
commit: 8b91b5b15cf475f5a593aa616b7f4a6fb5fe6430
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Apr 14 19:06:09 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Apr 14 20:25:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b91b5b1
dev-java/commons-compress: drop 1.26.0-r1
Bug: https://bugs.gentoo.org/924996
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-compress/Manifest | 2 -
.../commons-compress-1.26.0-r1.ebuild | 44 --
.../files/commons-compress-1.21-asm7+.patch| 164 -
3 files changed, 210 deletions(-)
diff --git a/dev-java/commons-compress/Manifest
b/dev-java/commons-compress/Manifest
index 752307f08507..531be855daa7 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,4 +1,2 @@
-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
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..
--- 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/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..
--- 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
-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
-+++
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-compress/, dev-java/commons-compress/files/
commit: 67f37a4652c157fd4e616cbb052f725d84dd3315
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Oct 12 06:51:38 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Oct 12 06:51:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f37a46
dev-java/commons-compress: bump to 1.21
Bug: https://bugs.gentoo.org/802078
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-compress/Manifest | 1 +
.../commons-compress/commons-compress-1.21.ebuild | 73 +
.../files/commons-compress-1.21-asm7+.patch| 164 +
3 files changed, 238 insertions(+)
diff --git a/dev-java/commons-compress/Manifest
b/dev-java/commons-compress/Manifest
index 9ce212e7e1b..5de04003112 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1 +1,2 @@
DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B
5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6
SHA512
1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
+DIST commons-compress-1.21-sources.tar.gz 15165800 BLAKE2B
3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a
SHA512
8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
diff --git a/dev-java/commons-compress/commons-compress-1.21.ebuild
b/dev-java/commons-compress/commons-compress-1.21.ebuild
new file mode 100644
index 000..3d5ac30baec
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.21.ebuild
@@ -0,0 +1,73 @@
+# 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://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=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-compress:1.21"
+
+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 ->
${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~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.4: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
+
+CDEPEND="
+ dev-java/asm:9
+ >=dev-java/brotli-dec-0.1.2:0
+ >=dev-java/xz-java-1.9:0
+ >=dev-java/zstd-jni-1.5.0.4:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.osgi:org.osgi.core:6.0.0 -> !!!artifactId-not-found!!!
+# POM: pom.xml
+# test? com.github.marschall:memoryfilesystem:2.1.0 -> !!!groupId-not-found!!!
+# test? javax.inject:javax.inject:1 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.framework:7.0.0 ->
!!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.mockito:mockito-core:3.11.1 ->
!!!suitable-mavenVersion-not-found!!!
+# 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.30:0
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+ "${FILESDIR}/${P}-asm7+.patch"
+)
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="asm-9,zstd-jni,brotli-dec,xz-java"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+ default
+}
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
new file mode 100644
index 000..e20fa89787d
--- /dev/null
+++ b/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
@@ -0,0 +1,164 @@
+From 7709c8be97147e8d5c5d7fa42d076504931ba9e0 Mon Sep 17 00:00:00 2001
+From: Stephan Blecher
+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 +-
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-compress/, dev-java/commons-compress/files/
commit: 0be6a4c29b55b2dcf9195c2d868a287c7876e2e3
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon May 31 06:36:03 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon May 31 06:36:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be6a4c2
dev-java/commons-compress: removed obsolete 1.10
Closes: https://bugs.gentoo.org/689386
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/commons-compress/Manifest | 1 -
.../commons-compress/commons-compress-1.10.ebuild | 65 -
dev-java/commons-compress/files/MANIFEST.MF| 24 --
dev-java/commons-compress/files/build.xml | 269 -
4 files changed, 359 deletions(-)
diff --git a/dev-java/commons-compress/Manifest
b/dev-java/commons-compress/Manifest
index cbff7f678be..9ce212e7e1b 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,2 +1 @@
-DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B
7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e
SHA512
1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910
DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B
5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6
SHA512
1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
diff --git a/dev-java/commons-compress/commons-compress-1.10.ebuild
b/dev-java/commons-compress/commons-compress-1.10.ebuild
deleted file mode 100644
index 5670329df83..000
--- a/dev-java/commons-compress/commons-compress-1.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/;
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND="dev-java/xz-java:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- dev-java/hamcrest-core:1.3
- )"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
-EANT_GENTOO_CLASSPATH="xz-java"
-EANT_BUILD_TARGET="compile package"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,hamcrest-core-1.3"
-
-# Dubious tests.
-JAVA_RM_FILES=(
-
src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
-)
-
-java_prepare() {
- cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
-
- # osgi stuff mvn ant:ant doesn't handle
- mkdir -p target/osgi || die "Failed to create target dir"
- cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy
manifest"
-
- if ! use test; then
- find -name "*.jar" -delete || die "Failed to remove test
resources"
- fi
-}
-
-src_test() {
- EANT_TEST_TARGET="compile-tests test" \
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "target/${PN}-1.1.jar"
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-compress/files/MANIFEST.MF
b/dev-java/commons-compress/files/MANIFEST.MF
deleted file mode 100644
index ab91795ef62..000
--- a/dev-java/commons-compress/files/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.commons.compress.changes;version="1.1",org.
- apache.commons.compress.archivers.ar;version="1.1",org.apache.commons
- .compress.archivers.jar;version="1.1",org.apache.commons.compress.arc
- hivers.cpio;version="1.1",org.apache.commons.compress.archivers.zip;v
- ersion="1.1",org.apache.commons.compress.archivers;version="1.1",org.
- apache.commons.compress.archivers.tar;version="1.1",org.apache.common
- s.compress.compressors.bzip2;version="1.1",org.apache.commons.compres
- s.compressors;version="1.1",org.apache.commons.compress.utils;version
- ="1.1",org.apache.commons.compress.compressors.gzip;version="1.1"
-Tool: Bnd-0.0.255
-Bundle-Name: Commons Compress
-Created-By: 1.7.0-ea (Oracle Corporation)
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.1
-Bnd-LastModified: 1311506267618
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Commons Compress defines an API for working with c
- ompression and archive formats. These include: bzip2, gzip and ar, c
- pio,
