Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-compress/, dev-java/commons-compress/files/
Date: Mon, 31 May 2021 06:36:23
Message-Id: 1622442963.0be6a4c29b55b2dcf9195c2d868a287c7876e2e3.fordfrog@gentoo
1 commit: 0be6a4c29b55b2dcf9195c2d868a287c7876e2e3
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 31 06:36:03 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Mon May 31 06:36:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be6a4c2
7
8 dev-java/commons-compress: removed obsolete 1.10
9
10 Closes: https://bugs.gentoo.org/689386
11 Package-Manager: Portage-3.0.19, Repoman-3.0.3
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 dev-java/commons-compress/Manifest | 1 -
15 .../commons-compress/commons-compress-1.10.ebuild | 65 -----
16 dev-java/commons-compress/files/MANIFEST.MF | 24 --
17 dev-java/commons-compress/files/build.xml | 269 ---------------------
18 4 files changed, 359 deletions(-)
19
20 diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
21 index cbff7f678be..9ce212e7e1b 100644
22 --- a/dev-java/commons-compress/Manifest
23 +++ b/dev-java/commons-compress/Manifest
24 @@ -1,2 +1 @@
25 -DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910
26 DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
27
28 diff --git a/dev-java/commons-compress/commons-compress-1.10.ebuild b/dev-java/commons-compress/commons-compress-1.10.ebuild
29 deleted file mode 100644
30 index 5670329df83..00000000000
31 --- a/dev-java/commons-compress/commons-compress-1.10.ebuild
32 +++ /dev/null
33 @@ -1,65 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=5
38 -
39 -JAVA_PKG_IUSE="doc source test"
40 -
41 -inherit java-pkg-2 java-ant-2
42 -
43 -DESCRIPTION="Java API for working with archive files"
44 -HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
45 -LICENSE="Apache-2.0"
46 -SLOT="0"
47 -KEYWORDS="amd64 ~arm64 x86"
48 -IUSE=""
49 -
50 -CDEPEND="dev-java/xz-java:0"
51 -
52 -RDEPEND="
53 - ${CDEPEND}
54 - >=virtual/jre-1.6"
55 -
56 -DEPEND="
57 - ${CDEPEND}
58 - >=virtual/jdk-1.6
59 - test? (
60 - dev-java/junit:4
61 - dev-java/ant-junit:0
62 - dev-java/hamcrest-core:1.3
63 - )"
64 -
65 -S="${WORKDIR}/${P}-src"
66 -
67 -JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
68 -EANT_GENTOO_CLASSPATH="xz-java"
69 -EANT_BUILD_TARGET="compile package"
70 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,hamcrest-core-1.3"
71 -
72 -# Dubious tests.
73 -JAVA_RM_FILES=(
74 - src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
75 -)
76 -
77 -java_prepare() {
78 - cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
79 -
80 - # osgi stuff mvn ant:ant doesn't handle
81 - mkdir -p target/osgi || die "Failed to create target dir"
82 - cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
83 -
84 - if ! use test; then
85 - find -name "*.jar" -delete || die "Failed to remove test resources"
86 - fi
87 -}
88 -
89 -src_test() {
90 - EANT_TEST_TARGET="compile-tests test" \
91 - java-pkg-2_src_test
92 -}
93 -
94 -src_install() {
95 - java-pkg_newjar "target/${PN}-1.1.jar"
96 - use doc && java-pkg_dojavadoc target/site/apidocs
97 - use source && java-pkg_dosrc src/main/java/*
98 -}
99
100 diff --git a/dev-java/commons-compress/files/MANIFEST.MF b/dev-java/commons-compress/files/MANIFEST.MF
101 deleted file mode 100644
102 index ab91795ef62..00000000000
103 --- a/dev-java/commons-compress/files/MANIFEST.MF
104 +++ /dev/null
105 @@ -1,24 +0,0 @@
106 -Manifest-Version: 1.0
107 -Export-Package: org.apache.commons.compress.changes;version="1.1",org.
108 - apache.commons.compress.archivers.ar;version="1.1",org.apache.commons
109 - .compress.archivers.jar;version="1.1",org.apache.commons.compress.arc
110 - hivers.cpio;version="1.1",org.apache.commons.compress.archivers.zip;v
111 - ersion="1.1",org.apache.commons.compress.archivers;version="1.1",org.
112 - apache.commons.compress.archivers.tar;version="1.1",org.apache.common
113 - s.compress.compressors.bzip2;version="1.1",org.apache.commons.compres
114 - s.compressors;version="1.1",org.apache.commons.compress.utils;version
115 - ="1.1",org.apache.commons.compress.compressors.gzip;version="1.1"
116 -Tool: Bnd-0.0.255
117 -Bundle-Name: Commons Compress
118 -Created-By: 1.7.0-ea (Oracle Corporation)
119 -Bundle-Vendor: The Apache Software Foundation
120 -Bundle-Version: 1.1
121 -Bnd-LastModified: 1311506267618
122 -Bundle-ManifestVersion: 2
123 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
124 -Bundle-Description: Commons Compress defines an API for working with c
125 - ompression and archive formats. These include: bzip2, gzip and ar, c
126 - pio, jar, tar, zip.
127 -Bundle-SymbolicName: org.apache.commons.compress
128 -Bundle-DocURL: http://commons.apache.org/compress/
129 -
130
131 diff --git a/dev-java/commons-compress/files/build.xml b/dev-java/commons-compress/files/build.xml
132 deleted file mode 100644
133 index f42093f8386..00000000000
134 --- a/dev-java/commons-compress/files/build.xml
135 +++ /dev/null
136 @@ -1,269 +0,0 @@
137 -<?xml version="1.0" encoding="UTF-8"?>
138 -
139 -<!-- ====================================================================== -->
140 -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
141 -<!-- ====================================================================== -->
142 -
143 -<!-- ====================================================================== -->
144 -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
145 -<!-- ====================================================================== -->
146 -<!-- -->
147 -<!-- Any modifications will be overwritten. -->
148 -<!-- -->
149 -<!-- Generated by Maven Ant Plugin on 7/24/11 12:42 PM -->
150 -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
151 -<!-- -->
152 -<!-- ====================================================================== -->
153 -
154 -<project name="commons-compress-from-maven" default="package" basedir=".">
155 -
156 - <!-- ====================================================================== -->
157 - <!-- Build environment properties -->
158 - <!-- ====================================================================== -->
159 -
160 - <property file="${user.home}/.m2/maven.properties"/>
161 - <property file="maven-build.properties"/>
162 -
163 - <property name="maven.build.finalName" value="commons-compress-1.1"/>
164 - <property name="maven.build.dir" value="target"/>
165 - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
166 - <property name="maven.build.srcDir.0" value="src/main/java"/>
167 - <property name="maven.build.resourceDir.0" value="."/>
168 - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
169 - <property name="maven.build.testDir.0" value="src/test/java"/>
170 - <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
171 - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
172 - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
173 -
174 - <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
175 - <property name="maven.settings.offline" value="false"/>
176 - <property name="maven.settings.interactiveMode" value="true"/>
177 -
178 - <!-- ====================================================================== -->
179 - <!-- Defining classpaths -->
180 - <!-- ====================================================================== -->
181 -
182 - <path id="build.classpath"/>
183 - <path id="build.test.classpath">
184 - <pathelement location="junit.jar"/>
185 - </path>
186 -
187 - <!-- ====================================================================== -->
188 - <!-- Cleaning up target -->
189 - <!-- ====================================================================== -->
190 -
191 - <target name="clean" description="Clean the output directory">
192 - <delete dir="${maven.build.dir}"/>
193 - </target>
194 -
195 - <!-- ====================================================================== -->
196 - <!-- Compilation target -->
197 - <!-- ====================================================================== -->
198 -
199 - <target name="compile" depends="get-deps" description="Compile the code">
200 - <mkdir dir="${maven.build.outputDir}"/>
201 - <javac destdir="${maven.build.outputDir}"
202 - encoding="iso-8859-1"
203 - nowarn="false"
204 - debug="true"
205 - optimize="false"
206 - deprecation="true"
207 - target="1.4"
208 - verbose="false"
209 - fork="false"
210 - source="1.4">
211 - <src>
212 - <pathelement location="${maven.build.srcDir.0}"/>
213 - </src>
214 - <classpath refid="build.classpath"/>
215 - </javac>
216 - <mkdir dir="${maven.build.outputDir}/META-INF"/>
217 - <copy todir="${maven.build.outputDir}/META-INF">
218 - <fileset dir="${maven.build.resourceDir.0}">
219 - <include name="NOTICE.txt"/>
220 - <include name="LICENSE.txt"/>
221 - </fileset>
222 - </copy>
223 - </target>
224 -
225 - <!-- ====================================================================== -->
226 - <!-- Test-compilation target -->
227 - <!-- ====================================================================== -->
228 -
229 - <target name="compile-tests"
230 - depends="compile"
231 - description="Compile the test code"
232 - unless="maven.test.skip">
233 - <mkdir dir="${maven.build.testOutputDir}"/>
234 - <javac destdir="${maven.build.testOutputDir}"
235 - encoding="iso-8859-1"
236 - nowarn="false"
237 - debug="true"
238 - optimize="false"
239 - deprecation="true"
240 - target="1.4"
241 - verbose="false"
242 - fork="false"
243 - source="1.4">
244 - <src>
245 - <pathelement location="${maven.build.testDir.0}"/>
246 - </src>
247 - <classpath>
248 - <path refid="build.test.classpath"/>
249 - <pathelement location="${maven.build.outputDir}"/>
250 - </classpath>
251 - </javac>
252 - <copy todir="${maven.build.testOutputDir}">
253 - <fileset dir="${maven.build.testResourceDir.0}"/>
254 - </copy>
255 - </target>
256 -
257 - <!-- ====================================================================== -->
258 - <!-- Run all tests -->
259 - <!-- ====================================================================== -->
260 -
261 - <target name="test"
262 - depends="compile-tests, junit-missing"
263 - unless="junit.skipped"
264 - description="Run the test cases">
265 - <mkdir dir="${maven.test.reports}"/>
266 - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
267 - <sysproperty key="basedir" value="."/>
268 - <formatter type="xml"/>
269 - <formatter type="plain" usefile="false"/>
270 - <classpath>
271 - <path refid="build.test.classpath"/>
272 - <pathelement location="${maven.build.outputDir}"/>
273 - <pathelement location="${maven.build.testOutputDir}"/>
274 - </classpath>
275 - <batchtest todir="${maven.test.reports}" unless="test">
276 - <fileset dir="${maven.build.testDir.0}">
277 - <include name="**/Test*.java"/>
278 - <include name="**/*Test.java"/>
279 - <include name="**/*TestCase.java"/>
280 - <exclude name="**/*Abstract*Test.java"/>
281 - <exclude name="**/*Abstract*TestCase.java"/>
282 - </fileset>
283 - </batchtest>
284 - <batchtest todir="${maven.test.reports}" if="test">
285 - <fileset dir="${maven.build.testDir.0}">
286 - <include name="**/${test}.java"/>
287 - <exclude name="**/*Abstract*Test.java"/>
288 - <exclude name="**/*Abstract*TestCase.java"/>
289 - </fileset>
290 - </batchtest>
291 - </junit>
292 - </target>
293 -
294 - <target name="test-junit-present">
295 - <available classname="junit.framework.Test" property="junit.present"/>
296 - </target>
297 -
298 - <target name="test-junit-status"
299 - depends="test-junit-present">
300 - <condition property="junit.missing">
301 - <and>
302 - <isfalse value="${junit.present}"/>
303 - <isfalse value="${maven.test.skip}"/>
304 - </and>
305 - </condition>
306 - <condition property="junit.skipped">
307 - <or>
308 - <isfalse value="${junit.present}"/>
309 - <istrue value="${maven.test.skip}"/>
310 - </or>
311 - </condition>
312 - </target>
313 -
314 - <target name="junit-missing"
315 - depends="test-junit-status"
316 - if="junit.missing">
317 - <echo>=================================== WARNING ===================================</echo>
318 - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
319 - <echo>===============================================================================</echo>
320 - </target>
321 -
322 - <!-- ====================================================================== -->
323 - <!-- Javadoc target -->
324 - <!-- ====================================================================== -->
325 -
326 - <target name="javadoc" description="Generates the Javadoc of the application">
327 - <javadoc sourcepath="${maven.build.srcDir.0}"
328 - packagenames="*"
329 - destdir="${maven.reporting.outputDirectory}/apidocs"
330 - access="protected"
331 - old="false"
332 - verbose="false"
333 - encoding="iso-8859-1"
334 - version="true"
335 - use="true"
336 - author="true"
337 - splitindex="false"
338 - nodeprecated="false"
339 - nodeprecatedlist="false"
340 - notree="false"
341 - noindex="false"
342 - nohelp="false"
343 - nonavbar="false"
344 - serialwarn="false"
345 - charset="ISO-8859-1"
346 - source="1.4"
347 - linksource="true"
348 - breakiterator="false">
349 - <link href="http://java.sun.com/javase/6/docs/api/"/>
350 - <tag name="Immutable"
351 - description="This class is immutable"/>
352 - <tag name="NotThreadSafe"
353 - description="This class is not thread-safe"/>
354 - <tag name="ThreadSafe"
355 - description="This class is thread-safe"/>
356 - </javadoc>
357 - </target>
358 -
359 - <!-- ====================================================================== -->
360 - <!-- Package target -->
361 - <!-- ====================================================================== -->
362 -
363 - <target name="package" depends="compile,test" description="Package the application">
364 - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
365 - compress="true"
366 - index="false"
367 - manifest="target/osgi/MANIFEST.MF"
368 - basedir="${maven.build.outputDir}"
369 - excludes="**/package.html">
370 - </jar>
371 - </target>
372 -
373 - <!-- ====================================================================== -->
374 - <!-- A dummy target for the package named after the type it creates -->
375 - <!-- ====================================================================== -->
376 -
377 - <target name="jar" depends="package" description="Builds the jar for the application"/>
378 -
379 - <!-- ====================================================================== -->
380 - <!-- Download dependencies target -->
381 - <!-- ====================================================================== -->
382 -
383 - <target name="test-offline">
384 - <condition property="maven.mode.offline">
385 - <equals arg1="${maven.settings.offline}" arg2="true"/>
386 - </condition>
387 - </target>
388 -
389 - <target name="get-deps"
390 - depends="test-offline"
391 - description="Download all dependencies"
392 - unless="maven.mode.offline">
393 - <mkdir dir="${maven.repo.local}"/>
394 - <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
395 - <get src="http://repository.apache.org/snapshots/junit/junit/3.8.2/junit-3.8.2.jar"
396 - dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"
397 - usetimestamp="false"
398 - ignoreerrors="true"/>
399 - <get src="http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar"
400 - dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"
401 - usetimestamp="false"
402 - ignoreerrors="true"/>
403 - </target>
404 -
405 -</project>