From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 31 May 2021 20:59:14 +0100
Subject: gentoo resync : 31.05.2021

---
 dev-java/commons-compress/Manifest                 |   6 +-
 .../commons-compress/commons-compress-1.10.ebuild  |  65 -----
 .../commons-compress/commons-compress-1.20.ebuild  |   2 +-
 dev-java/commons-compress/files/MANIFEST.MF        |  24 --
 dev-java/commons-compress/files/build.xml          | 269 ---------------------
 5 files changed, 2 insertions(+), 364 deletions(-)
 delete mode 100644 dev-java/commons-compress/commons-compress-1.10.ebuild
 delete mode 100644 dev-java/commons-compress/files/MANIFEST.MF
 delete mode 100644 dev-java/commons-compress/files/build.xml

(limited to 'dev-java/commons-compress')

diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 94b4d3b62183..900bd497b180 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,7 +1,3 @@
-AUX MANIFEST.MF 1222 BLAKE2B a7ec1ac35802d24cbc9ce95d3974004d89e6233aa41f95a33733b08dc447c54bbd6da2a3a01ef2d46cee303578a4dd116704e7e1dc551af1212b0b3ed891ea1e SHA512 048b09aa2ae2e20c8b5b0e116eb49fd680634e9b654d5026004e32a39bec4e5b669afcadea8338764a157f70cc0c3fdb5d2ce98513bfeae267be7ae02935381d
-AUX build.xml 11340 BLAKE2B 9a0366053069ca9d060257887cbe70a9de8e8796894975b00b0c25fb96b80d84e83e371debb619efbfbd244f31a0214d7487f38611f8532da838a971b5b8d528 SHA512 09abd59212021ac20fae760ce127546bde53e40e2ed0db26a0a93417c681e46b038d1940964e55fd46a8f7db44b5ea2666459d75358ee1dd5882895c803e0c89
-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
-EBUILD commons-compress-1.10.ebuild 1498 BLAKE2B 753e2e3e8cc14f90ccadcdfc82f73dc5af6d54d7db6ad81b28465c235895325119df88e03028b214427a6642c05aa4b8b4554a5572dcf71dceebdb61bfef42a9 SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537
-EBUILD commons-compress-1.20.ebuild 1082 BLAKE2B 2d4fb689d8bd3fbd7963d63ea1b6a352090ae449973d62b01fb7aa47bccecdeddfd9cde1af683c64407013f3a20e863b9b42cb81f53531e5a12063f2be002ad9 SHA512 5d92f1a8c76d9e984c0398ff940527399b3fdd80e506bedcbbbf174ddc5f0c2dad9725d3964bf1147811e3434b710cad76181d65bfdd413429b97deeb3bba054
+EBUILD commons-compress-1.20.ebuild 1080 BLAKE2B 7f8ec8fd6bc9dd45e53cf4766a419bb2f74c9d3aad7de3641bdbc0c86cc67719e592dfb64583bc0a3df51f3b2b37264eade555133c4cf249a38b10a02bff6053 SHA512 a8f6cff1e9332f5ff83e58f01a6900dd81dcf51e190cc447fb92b0fd02f31583278b5d70aaa50ba114b4c04cffbce8af7d08db3ab2c0da7aacfe1fa1df628e00
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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 5670329df835..000000000000
--- 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/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild
index 111044934f93..2895ec27d09a 100644
--- a/dev-java/commons-compress/commons-compress-1.20.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.20.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
 SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND="
 	dev-java/brotli-dec:0
diff --git a/dev-java/commons-compress/files/MANIFEST.MF b/dev-java/commons-compress/files/MANIFEST.MF
deleted file mode 100644
index ab91795ef624..000000000000
--- 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, jar, tar, zip.
-Bundle-SymbolicName: org.apache.commons.compress
-Bundle-DocURL: http://commons.apache.org/compress/
-
diff --git a/dev-java/commons-compress/files/build.xml b/dev-java/commons-compress/files/build.xml
deleted file mode 100644
index f42093f83866..000000000000
--- a/dev-java/commons-compress/files/build.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 7/24/11 12:42 PM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-compress-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="commons-compress-1.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="."/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="junit.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.4" 
-           verbose="false" 
-           fork="false" 
-           source="1.4">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.4" 
-           verbose="false" 
-           fork="false" 
-           source="1.4">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-          <exclude name="**/*Abstract*TestCase.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-          <exclude name="**/*Abstract*TestCase.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="iso-8859-1" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.4" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://java.sun.com/javase/6/docs/api/"/>
-      <tag name="Immutable" 
-               description="This class is immutable"/>
-      <tag name="NotThreadSafe" 
-               description="This class is not thread-safe"/>
-      <tag name="ThreadSafe" 
-               description="This class is thread-safe"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         manifest="target/osgi/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
-- 
cgit v1.2.3