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/saaj/files/, profiles/, dev-java/odfdom/, dev-java/saaj/, ...
Date: Fri, 14 May 2021 08:53:57
Message-Id: 1620982404.9ba1eecddf6f1117f503da242b41128d525684b2.fordfrog@gentoo
1 commit: 9ba1eecddf6f1117f503da242b41128d525684b2
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 14 08:53:24 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 08:53:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba1eecd
7
8 dev-java/odfdom: removed + dev-java/saaj
9
10 Closes: https://bugs.gentoo.org/782667
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/odfdom/Manifest | 1 -
14 dev-java/odfdom/files/build-0.8.6.xml | 270 ---------------------
15 dev-java/odfdom/metadata.xml | 8 -
16 dev-java/odfdom/odfdom-0.8.6-r1.ebuild | 65 -----
17 dev-java/saaj/Manifest | 1 -
18 .../files/saaj-1.3.19-java-5-bootclasspath.patch | 13 -
19 dev-java/saaj/metadata.xml | 8 -
20 dev-java/saaj/saaj-1.3.19-r2.ebuild | 74 ------
21 profiles/package.mask | 6 -
22 9 files changed, 446 deletions(-)
23
24 diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
25 deleted file mode 100644
26 index 061451ad38e..00000000000
27 --- a/dev-java/odfdom/Manifest
28 +++ /dev/null
29 @@ -1 +0,0 @@
30 -DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0
31
32 diff --git a/dev-java/odfdom/files/build-0.8.6.xml b/dev-java/odfdom/files/build-0.8.6.xml
33 deleted file mode 100644
34 index a2750f73a11..00000000000
35 --- a/dev-java/odfdom/files/build-0.8.6.xml
36 +++ /dev/null
37 @@ -1,270 +0,0 @@
38 -<?xml version="1.0" encoding="UTF-8"?>
39 -
40 -<!-- ====================================================================== -->
41 -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
42 -<!-- ====================================================================== -->
43 -
44 -<!-- Any modifications will be overwritten. -->
45 -<!-- -->
46 -<!-- Generated by Maven Ant Plugin on 1/17/11 1:59 AM -->
47 -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
48 -<!-- -->
49 -<!-- Also contains some hand made modifications -->
50 -<!-- -->
51 -<!-- ====================================================================== -->
52 -
53 -<project name="odfdom-java-from-maven" default="package" basedir=".">
54 -
55 - <!-- ====================================================================== -->
56 - <!-- Build environment properties -->
57 - <!-- ====================================================================== -->
58 -
59 - <property file="maven-build.properties"/>
60 -
61 - <property name="maven.build.finalName" value="odfdom"/>
62 - <property name="maven.build.version" value="0.8.6"/>
63 - <property name="maven.build.odfversion" value="1.2"/>
64 - <property name="maven.build.dir" value="target"/>
65 - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
66 - <property name="maven.build.srcDir.0" value="src/main/java"/>
67 - <property name="maven.build.resourceDir.0" value="src/main/resources"/>
68 - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
69 - <property name="maven.build.testDir.0" value="src/test/java"/>
70 - <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
71 - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
72 - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
73 -
74 - <property name="maven.repo.local" value="lib"/>
75 - <property name="maven.settings.offline" value="false"/>
76 - <property name="maven.settings.interactiveMode" value="true"/>
77 -
78 - <!-- ====================================================================== -->
79 - <!-- Defining classpaths -->
80 - <!-- ====================================================================== -->
81 -
82 - <path id="build.classpath">
83 - <fileset dir="lib">
84 - <include name="xercesImpl-2.9.1.jar"/>
85 - <include name="xml-apis-1.3.04.jar"/>
86 - </fileset>
87 - </path>
88 - <path id="build.test.classpath">
89 - <fileset dir="lib">
90 - <include name="xercesImpl-2.9.1.jar"/>
91 - <include name="xml-apis-1.3.04.jar"/>
92 - <include name="junit-4.5.jar"/>
93 - <include name="hamcrest-core.jar"/>
94 - </fileset>
95 - </path>
96 -
97 - <!-- ====================================================================== -->
98 - <!-- Cleaning up target -->
99 - <!-- ====================================================================== -->
100 -
101 - <target name="clean" description="Clean the output directory">
102 - <delete dir="${maven.build.dir}"/>
103 - </target>
104 -
105 - <!-- ====================================================================== -->
106 - <!-- Compilation target -->
107 - <!-- ====================================================================== -->
108 -
109 - <target name="compile" description="Compile the code">
110 - <mkdir dir="${maven.build.outputDir}"/>
111 - <javac destdir="${maven.build.outputDir}"
112 - nowarn="false"
113 - debug="true"
114 - optimize="false"
115 - deprecation="true"
116 - target="1.5"
117 - verbose="false"
118 - fork="false"
119 - memoryMaximumSize="512m"
120 - memoryInitialSize="1024m"
121 - source="1.5">
122 - <src>
123 - <pathelement location="${maven.build.srcDir.0}"/>
124 - </src>
125 - <classpath refid="build.classpath"/>
126 - </javac>
127 - <copy todir="${maven.build.outputDir}">
128 - <fileset dir="${maven.build.resourceDir.0}"/>
129 - </copy>
130 - </target>
131 -
132 - <!-- ====================================================================== -->
133 - <!-- Test-compilation target -->
134 - <!-- ====================================================================== -->
135 -
136 - <target name="compile-tests"
137 - depends="compile"
138 - description="Compile the test code"
139 - unless="maven.test.skip">
140 - <mkdir dir="${maven.build.testOutputDir}"/>
141 - <javac destdir="${maven.build.testOutputDir}"
142 - nowarn="false"
143 - debug="true"
144 - optimize="false"
145 - deprecation="true"
146 - target="1.5"
147 - verbose="false"
148 - fork="false"
149 - memoryMaximumSize="512m"
150 - memoryInitialSize="1024m"
151 - source="1.5">
152 - <src>
153 - <pathelement location="${maven.build.testDir.0}"/>
154 - </src>
155 - <classpath>
156 - <path refid="build.test.classpath"/>
157 - <pathelement location="${maven.build.outputDir}"/>
158 - </classpath>
159 - </javac>
160 - <copy todir="${maven.build.testOutputDir}">
161 - <fileset dir="${maven.build.testResourceDir.0}"/>
162 - </copy>
163 - <copy todir="${maven.build.outputDir}">
164 - <fileset dir="${maven.build.testResourceDir.0}"/>
165 - </copy>
166 - </target>
167 -
168 - <!-- ====================================================================== -->
169 - <!-- Run all tests -->
170 - <!-- ====================================================================== -->
171 -
172 - <target name="test"
173 - depends="compile-tests, junit-missing"
174 - unless="junit.skipped"
175 - description="Run the test cases">
176 - <mkdir dir="${maven.test.reports}"/>
177 - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
178 - <sysproperty key="basedir" value="."/>
179 - <sysproperty key="odfdom.version" value="${maven.build.version}"/>
180 - <formatter type="xml"/>
181 - <formatter type="plain" usefile="false"/>
182 - <classpath>
183 - <path refid="build.test.classpath"/>
184 - <pathelement location="${maven.build.outputDir}"/>
185 - <pathelement location="${maven.build.testOutputDir}"/>
186 - </classpath>
187 - <batchtest todir="${maven.test.reports}" unless="test">
188 - <fileset dir="${maven.build.testDir.0}">
189 - <include name="**/Test*.java"/>
190 - <include name="**/*Test.java"/>
191 - <include name="**/*TestCase.java"/>
192 - <exclude name="**/*Abstract*Test.java"/>
193 - </fileset>
194 - </batchtest>
195 - <batchtest todir="${maven.test.reports}" if="test">
196 - <fileset dir="${maven.build.testDir.0}">
197 - <include name="**/${test}.java"/>
198 - <exclude name="**/*Abstract*Test.java"/>
199 - </fileset>
200 - </batchtest>
201 - </junit>
202 - </target>
203 -
204 - <target name="test-junit-present">
205 - <available classname="junit.framework.Test" property="junit.present"/>
206 - </target>
207 -
208 - <target name="test-junit-status"
209 - depends="test-junit-present">
210 - <condition property="junit.missing">
211 - <and>
212 - <isfalse value="${junit.present}"/>
213 - <isfalse value="${maven.test.skip}"/>
214 - </and>
215 - </condition>
216 - <condition property="junit.skipped">
217 - <or>
218 - <isfalse value="${junit.present}"/>
219 - <istrue value="${maven.test.skip}"/>
220 - </or>
221 - </condition>
222 - </target>
223 -
224 - <target name="junit-missing"
225 - depends="test-junit-status"
226 - if="junit.missing">
227 - <echo>=================================== WARNING ===================================</echo>
228 - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
229 - <echo>===============================================================================</echo>
230 - </target>
231 -
232 - <!-- ====================================================================== -->
233 - <!-- Javadoc target -->
234 - <!-- ====================================================================== -->
235 -
236 - <target name="javadoc" description="Generates the Javadoc of the application">
237 - <javadoc sourcepath="${maven.build.srcDir.0}"
238 - packagenames="*"
239 - destdir="${maven.reporting.outputDirectory}/apidocs"
240 - access="protected"
241 - old="false"
242 - verbose="false"
243 - version="true"
244 - use="true"
245 - author="true"
246 - splitindex="true"
247 - windowtitle="ODFDOM API v0.8.6 - http://odftoolkit"
248 - nodeprecated="false"
249 - nodeprecatedlist="false"
250 - notree="false"
251 - noindex="false"
252 - nohelp="false"
253 - nonavbar="false"
254 - serialwarn="false"
255 - charset="ISO-8859-1"
256 - linksource="false"
257 - breakiterator="false"
258 - maxmemory="1024m">
259 - <doctitle>&lt;![CDATA[ODFDOM]]&gt;</doctitle>
260 - <link href="http://java.sun.com/javase/6/docs/api/"/>
261 - <link href="http://xerces.apache.org/xerces-j/apiDocs/"/>
262 - </javadoc>
263 - </target>
264 -
265 - <!-- ====================================================================== -->
266 - <!-- Package target -->
267 - <!-- ====================================================================== -->
268 -
269 - <target name="package" depends="compile,test" description="Package the application">
270 - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
271 - compress="true"
272 - index="true"
273 - basedir="${maven.build.outputDir}"
274 - excludes="**/package.html">
275 - <manifest>
276 - <attribute name="Main-Class"
277 - value="org.odftoolkit.odfdom.JarManifest"/>
278 - <attribute name="version" value="${maven.build.version}"/>
279 - <section name="ODFDOM">
280 - <attribute name="ODFDOM-Built-By" value="Gentoo"/>
281 - <attribute name="ODFDOM-Built-Date" value="${TODAY}"/>
282 - <attribute name="ODFDOM-Name" value="odfdom"/>
283 - <attribute name="ODFDOM-Supported-Odf-Version" value="${maven.build.odfversion}"/>
284 - <attribute name="ODFDOM-Version" value="${maven.build.version}"/>
285 - <attribute name="ODFDOM-Website" value="http://odftoolkit.org"/>
286 - </section>
287 - </manifest>
288 - </jar>
289 - </target>
290 -
291 - <!-- ====================================================================== -->
292 - <!-- A dummy target for the package named after the type it creates -->
293 - <!-- ====================================================================== -->
294 -
295 - <target name="jar" depends="package" description="Builds the jar for the application"/>
296 -
297 - <!-- ====================================================================== -->
298 - <!-- Download dependencies target -->
299 - <!-- ====================================================================== -->
300 -
301 - <target name="test-offline">
302 - <condition property="maven.mode.offline">
303 - <equals arg1="${maven.settings.offline}" arg2="true"/>
304 - </condition>
305 - </target>
306 -
307 -</project>
308
309 diff --git a/dev-java/odfdom/metadata.xml b/dev-java/odfdom/metadata.xml
310 deleted file mode 100644
311 index 952a4b9b605..00000000000
312 --- a/dev-java/odfdom/metadata.xml
313 +++ /dev/null
314 @@ -1,8 +0,0 @@
315 -<?xml version="1.0" encoding="UTF-8"?>
316 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
317 -<pkgmetadata>
318 - <maintainer type="project">
319 - <email>java@g.o</email>
320 - <name>Java</name>
321 - </maintainer>
322 -</pkgmetadata>
323
324 diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
325 deleted file mode 100644
326 index 1555263da73..00000000000
327 --- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
328 +++ /dev/null
329 @@ -1,65 +0,0 @@
330 -# Copyright 1999-2020 Gentoo Authors
331 -# Distributed under the terms of the GNU General Public License v2
332 -
333 -EAPI=7
334 -
335 -JAVA_PKG_IUSE="doc source test"
336 -
337 -inherit java-pkg-2 java-ant-2
338 -
339 -DESCRIPTION="The ODFDOM reference implementation, written in Java"
340 -HOMEPAGE="http://odftoolkit.org/projects/odfdom"
341 -SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${P}-sources.zip -> ${P}-sources.zip"
342 -LICENSE="Apache-2.0"
343 -SLOT="0"
344 -KEYWORDS="~amd64 ~x86-linux ~sparc-solaris ~x86-solaris"
345 -
346 -CDEPEND="dev-java/xerces:2
347 - dev-java/xml-commons-external:1.4"
348 -
349 -BDEPEND="app-arch/unzip"
350 -RDEPEND=">=virtual/jre-1.5
351 - ${CDEPEND}"
352 -DEPEND=">=virtual/jdk-1.5
353 - ${CDEPEND}
354 - test? (
355 - dev-java/ant-junit4:0
356 - dev-java/hamcrest-core:0
357 - dev-java/junit:4
358 - )"
359 -
360 -S="${WORKDIR}/${P}-sources"
361 -
362 -EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4"
363 -EANT_BUILD_TARGET="package"
364 -EANT_JAVADOC_TARGET="javadoc"
365 -EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
366 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
367 -JAVA_ANT_REWRITE_CLASSPATH="yes"
368 -
369 -src_prepare() {
370 - cp "${FILESDIR}/build-${PV}.xml" build.xml || die
371 -
372 - mkdir lib || die
373 -
374 - # These tests fail.
375 - rm -v src/test/java/org/odftoolkit/odfdom/doc/DocumentCreationTest.java \
376 - src/test/java/org/odftoolkit/odfdom/doc/PresentationTest.java \
377 - src/test/java/org/odftoolkit/odfdom/doc/ImageTest.java \
378 - src/test/java/org/odftoolkit/odfdom/incubator/meta/MetaDocumentStatisticTest.java \
379 - src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java \
380 - || die
381 -
382 - default
383 -}
384 -
385 -src_test() {
386 - EANT_EXTRA_ARGS="" java-pkg-2_src_test
387 -}
388 -
389 -src_install() {
390 - java-pkg_dojar target/odfdom.jar
391 -
392 - dodoc README.txt LICENSE.txt
393 - use doc && java-pkg_dojavadoc target/site/apidocs
394 -}
395
396 diff --git a/dev-java/saaj/Manifest b/dev-java/saaj/Manifest
397 deleted file mode 100644
398 index a0aea94b63b..00000000000
399 --- a/dev-java/saaj/Manifest
400 +++ /dev/null
401 @@ -1 +0,0 @@
402 -DIST saaj-1.3.19.tar.bz2 2266558 BLAKE2B ea198273be03e8c01d66c2b088df99761eee46e264ac80987845af0fe8fb3992f5dfdd323a5e719241759c31dcc1da0d52cf4506eef1577d2e617eda0565bf29 SHA512 12a439e296117abeac5de4694f2efec74c7f2b15cd86cb8759bfba6867f68dfe6c2f5b86ac2f8884eb86dddb3221e19f6c47c976cbcedcebe28570b51280ef71
403
404 diff --git a/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch b/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
405 deleted file mode 100644
406 index 9b92b18944c..00000000000
407 --- a/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
408 +++ /dev/null
409 @@ -1,13 +0,0 @@
410 ---- a/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
411 -+++ b/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
412 -@@ -83,7 +83,9 @@
413 - * @return The DataFlavors.
414 - */
415 - public DataFlavor[] getTransferDataFlavors() {
416 -- return (DataFlavor[]) Arrays.copyOf(flavor, flavor.length);
417 -+ DataFlavor[] copyOf = new DataFlavor[flavor.length];
418 -+ System.arraycopy(flavor, 0, copyOf, 0, flavor.length);
419 -+ return copyOf;
420 - }
421 -
422 - /**
423
424 diff --git a/dev-java/saaj/metadata.xml b/dev-java/saaj/metadata.xml
425 deleted file mode 100644
426 index 37998bf4074..00000000000
427 --- a/dev-java/saaj/metadata.xml
428 +++ /dev/null
429 @@ -1,8 +0,0 @@
430 -<?xml version="1.0" encoding="UTF-8"?>
431 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
432 -<pkgmetadata>
433 - <maintainer type="project">
434 - <email>java@g.o</email>
435 - <name>Java</name>
436 - </maintainer>
437 -</pkgmetadata>
438
439 diff --git a/dev-java/saaj/saaj-1.3.19-r2.ebuild b/dev-java/saaj/saaj-1.3.19-r2.ebuild
440 deleted file mode 100644
441 index 5fb094560cf..00000000000
442 --- a/dev-java/saaj/saaj-1.3.19-r2.ebuild
443 +++ /dev/null
444 @@ -1,74 +0,0 @@
445 -# Copyright 1999-2018 Gentoo Foundation
446 -# Distributed under the terms of the GNU General Public License v2
447 -
448 -EAPI=6
449 -
450 -JAVA_PKG_IUSE="examples source test"
451 -
452 -inherit java-pkg-2 java-ant-2
453 -
454 -DESCRIPTION="SOAP with Attachments API for Java"
455 -HOMEPAGE="https://saaj.dev.java.net/"
456 -
457 -# svn export https://svn.java.net/svn/saaj~svn/tags/saaj-impl-1.3.19 saaj-1.3.19
458 -# tar cjf saaj-1.3.19.tar.bz2 saaj-1.3.19
459 -SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
460 -
461 -LICENSE="CDDL"
462 -SLOT="0"
463 -KEYWORDS="amd64 x86"
464 -
465 -# saaj-api only for java 5
466 -CDEPEND="
467 - dev-java/mimepull:0
468 - dev-java/xerces:2
469 - dev-java/xml-commons-external:1.4
470 - java-virtuals/saaj-api:0"
471 -
472 -RDEPEND="
473 - ${CDEPEND}
474 - >=virtual/jre-1.6"
475 -
476 -# servlet-api 2.5 for java 5. 3.0 is java 6.
477 -DEPEND="
478 - ${CDEPEND}
479 - >=virtual/jdk-1.6
480 - test? (
481 - dev-java/ant-junit:0
482 - dev-java/xalan:0
483 - java-virtuals/servlet-api:2.5
484 - )"
485 -
486 -PATCHES=( "${FILESDIR}"/${P}-java-5-bootclasspath.patch )
487 -
488 -HTML_DOCS=( docs )
489 -
490 -src_prepare() {
491 - default
492 -
493 - java-pkg_clean
494 -
495 - # YES! There's nothing like using com.sun...internal ! YAY!
496 - find src -name '*.java' -exec sed -i \
497 - -e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
498 - -e 's,com.sun.org.apache.xalan.internal.xsltc.trax,org.apache.xalan.xsltc.trax,g' \
499 - {} + || die
500 -}
501 -
502 -JAVA_ANT_REWRITE_CLASSPATH="yes"
503 -
504 -EANT_GENTOO_CLASSPATH="mimepull,saaj-api,xerces-2,xml-commons-external-1.4"
505 -
506 -EANT_TEST_TARGET="test-all"
507 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},servlet-api-2.5,xalan"
508 -
509 -src_test() {
510 - java-pkg-2_src_test
511 -}
512 -
513 -src_install() {
514 - java-pkg_newjar build/lib/saaj-impl.jar ${PN}.jar
515 - use examples && java-pkg_doexamples samples
516 - use source && java-pkg_dosrc src/java/*
517 - einstalldocs
518 -}
519
520 diff --git a/profiles/package.mask b/profiles/package.mask
521 index a019112810d..9a5c998d95c 100644
522 --- a/profiles/package.mask
523 +++ b/profiles/package.mask
524 @@ -659,12 +659,6 @@ media-video/orion
525 # Removal on 2021-06-01. Bug #782904.
526 x11-themes/gtk-engines-aurora
527
528 -# Miroslav Šulc <fordfrog@g.o> (2021-04-14)
529 -# java libraries not used by any other package,
530 -# masked for removal
531 -dev-java/odfdom
532 -dev-java/saaj
533 -
534 # Jonas Stein <jstein@g.o> (2021-04-14)
535 # Open bugs, dead upstream.
536 # Removal on 2021-06-01. Bug #782730.