commit: 9ba1eecddf6f1117f503da242b41128d525684b2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri May 14 08:53:24 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri May 14 08:53:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba1eecd
dev-java/odfdom: removed + dev-java/saaj Closes: https://bugs.gentoo.org/782667 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/odfdom/Manifest | 1 - dev-java/odfdom/files/build-0.8.6.xml | 270 --------------------- dev-java/odfdom/metadata.xml | 8 - dev-java/odfdom/odfdom-0.8.6-r1.ebuild | 65 ----- dev-java/saaj/Manifest | 1 - .../files/saaj-1.3.19-java-5-bootclasspath.patch | 13 - dev-java/saaj/metadata.xml | 8 - dev-java/saaj/saaj-1.3.19-r2.ebuild | 74 ------ profiles/package.mask | 6 - 9 files changed, 446 deletions(-) diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest deleted file mode 100644 index 061451ad38e..00000000000 --- a/dev-java/odfdom/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0 diff --git a/dev-java/odfdom/files/build-0.8.6.xml b/dev-java/odfdom/files/build-0.8.6.xml deleted file mode 100644 index a2750f73a11..00000000000 --- a/dev-java/odfdom/files/build-0.8.6.xml +++ /dev/null @@ -1,270 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> -<!-- ====================================================================== --> - -<!-- Any modifications will be overwritten. --> -<!-- --> -<!-- Generated by Maven Ant Plugin on 1/17/11 1:59 AM --> -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> -<!-- --> -<!-- Also contains some hand made modifications --> -<!-- --> -<!-- ====================================================================== --> - -<project name="odfdom-java-from-maven" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <property file="maven-build.properties"/> - - <property name="maven.build.finalName" value="odfdom"/> - <property name="maven.build.version" value="0.8.6"/> - <property name="maven.build.odfversion" value="1.2"/> - <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="src/main/resources"/> - <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="lib"/> - <property name="maven.settings.offline" value="false"/> - <property name="maven.settings.interactiveMode" value="true"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <fileset dir="lib"> - <include name="xercesImpl-2.9.1.jar"/> - <include name="xml-apis-1.3.04.jar"/> - </fileset> - </path> - <path id="build.test.classpath"> - <fileset dir="lib"> - <include name="xercesImpl-2.9.1.jar"/> - <include name="xml-apis-1.3.04.jar"/> - <include name="junit-4.5.jar"/> - <include name="hamcrest-core.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}"/> - <javac destdir="${maven.build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - memoryMaximumSize="512m" - memoryInitialSize="1024m" - source="1.5"> - <src> - <pathelement location="${maven.build.srcDir.0}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.0}"/> - </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}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.5" - verbose="false" - fork="false" - memoryMaximumSize="512m" - memoryInitialSize="1024m" - source="1.5"> - <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> - <copy todir="${maven.build.outputDir}"> - <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="."/> - <sysproperty key="odfdom.version" value="${maven.build.version}"/> - <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"/> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.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" - version="true" - use="true" - author="true" - splitindex="true" - windowtitle="ODFDOM API v0.8.6 - http://odftoolkit"; - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - charset="ISO-8859-1" - linksource="false" - breakiterator="false" - maxmemory="1024m"> - <doctitle><![CDATA[ODFDOM]]></doctitle> - <link href="http://java.sun.com/javase/6/docs/api/"/> - <link href="http://xerces.apache.org/xerces-j/apiDocs/"/> - </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="true" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Main-Class" - value="org.odftoolkit.odfdom.JarManifest"/> - <attribute name="version" value="${maven.build.version}"/> - <section name="ODFDOM"> - <attribute name="ODFDOM-Built-By" value="Gentoo"/> - <attribute name="ODFDOM-Built-Date" value="${TODAY}"/> - <attribute name="ODFDOM-Name" value="odfdom"/> - <attribute name="ODFDOM-Supported-Odf-Version" value="${maven.build.odfversion}"/> - <attribute name="ODFDOM-Version" value="${maven.build.version}"/> - <attribute name="ODFDOM-Website" value="http://odftoolkit.org"/> - </section> - </manifest> - </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> - -</project> diff --git a/dev-java/odfdom/metadata.xml b/dev-java/odfdom/metadata.xml deleted file mode 100644 index 952a4b9b605..00000000000 --- a/dev-java/odfdom/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>j...@gentoo.org</email> - <name>Java</name> - </maintainer> -</pkgmetadata> diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild deleted file mode 100644 index 1555263da73..00000000000 --- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="The ODFDOM reference implementation, written in Java" -HOMEPAGE="http://odftoolkit.org/projects/odfdom"; -SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${P}-sources.zip -> ${P}-sources.zip" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86-linux ~sparc-solaris ~x86-solaris" - -CDEPEND="dev-java/xerces:2 - dev-java/xml-commons-external:1.4" - -BDEPEND="app-arch/unzip" -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.5 - ${CDEPEND} - test? ( - dev-java/ant-junit4:0 - dev-java/hamcrest-core:0 - dev-java/junit:4 - )" - -S="${WORKDIR}/${P}-sources" - -EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4" -EANT_BUILD_TARGET="package" -EANT_JAVADOC_TARGET="javadoc" -EANT_EXTRA_ARGS="-Dmaven.test.skip=true" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4" -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_prepare() { - cp "${FILESDIR}/build-${PV}.xml" build.xml || die - - mkdir lib || die - - # These tests fail. - rm -v src/test/java/org/odftoolkit/odfdom/doc/DocumentCreationTest.java \ - src/test/java/org/odftoolkit/odfdom/doc/PresentationTest.java \ - src/test/java/org/odftoolkit/odfdom/doc/ImageTest.java \ - src/test/java/org/odftoolkit/odfdom/incubator/meta/MetaDocumentStatisticTest.java \ - src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java \ - || die - - default -} - -src_test() { - EANT_EXTRA_ARGS="" java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/odfdom.jar - - dodoc README.txt LICENSE.txt - use doc && java-pkg_dojavadoc target/site/apidocs -} diff --git a/dev-java/saaj/Manifest b/dev-java/saaj/Manifest deleted file mode 100644 index a0aea94b63b..00000000000 --- a/dev-java/saaj/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST saaj-1.3.19.tar.bz2 2266558 BLAKE2B ea198273be03e8c01d66c2b088df99761eee46e264ac80987845af0fe8fb3992f5dfdd323a5e719241759c31dcc1da0d52cf4506eef1577d2e617eda0565bf29 SHA512 12a439e296117abeac5de4694f2efec74c7f2b15cd86cb8759bfba6867f68dfe6c2f5b86ac2f8884eb86dddb3221e19f6c47c976cbcedcebe28570b51280ef71 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 deleted file mode 100644 index 9b92b18944c..00000000000 --- a/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java -+++ b/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java -@@ -83,7 +83,9 @@ - * @return The DataFlavors. - */ - public DataFlavor[] getTransferDataFlavors() { -- return (DataFlavor[]) Arrays.copyOf(flavor, flavor.length); -+ DataFlavor[] copyOf = new DataFlavor[flavor.length]; -+ System.arraycopy(flavor, 0, copyOf, 0, flavor.length); -+ return copyOf; - } - - /** diff --git a/dev-java/saaj/metadata.xml b/dev-java/saaj/metadata.xml deleted file mode 100644 index 37998bf4074..00000000000 --- a/dev-java/saaj/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>j...@gentoo.org</email> - <name>Java</name> - </maintainer> -</pkgmetadata> diff --git a/dev-java/saaj/saaj-1.3.19-r2.ebuild b/dev-java/saaj/saaj-1.3.19-r2.ebuild deleted file mode 100644 index 5fb094560cf..00000000000 --- a/dev-java/saaj/saaj-1.3.19-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="examples source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="SOAP with Attachments API for Java" -HOMEPAGE="https://saaj.dev.java.net/"; - -# svn export https://svn.java.net/svn/saaj~svn/tags/saaj-impl-1.3.19 saaj-1.3.19 -# tar cjf saaj-1.3.19.tar.bz2 saaj-1.3.19 -SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"; - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="amd64 x86" - -# saaj-api only for java 5 -CDEPEND=" - dev-java/mimepull:0 - dev-java/xerces:2 - dev-java/xml-commons-external:1.4 - java-virtuals/saaj-api:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -# servlet-api 2.5 for java 5. 3.0 is java 6. -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6 - test? ( - dev-java/ant-junit:0 - dev-java/xalan:0 - java-virtuals/servlet-api:2.5 - )" - -PATCHES=( "${FILESDIR}"/${P}-java-5-bootclasspath.patch ) - -HTML_DOCS=( docs ) - -src_prepare() { - default - - java-pkg_clean - - # YES! There's nothing like using com.sun...internal ! YAY! - find src -name '*.java' -exec sed -i \ - -e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \ - -e 's,com.sun.org.apache.xalan.internal.xsltc.trax,org.apache.xalan.xsltc.trax,g' \ - {} + || die -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -EANT_GENTOO_CLASSPATH="mimepull,saaj-api,xerces-2,xml-commons-external-1.4" - -EANT_TEST_TARGET="test-all" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},servlet-api-2.5,xalan" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar build/lib/saaj-impl.jar ${PN}.jar - use examples && java-pkg_doexamples samples - use source && java-pkg_dosrc src/java/* - einstalldocs -} diff --git a/profiles/package.mask b/profiles/package.mask index a019112810d..9a5c998d95c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -659,12 +659,6 @@ media-video/orion # Removal on 2021-06-01. Bug #782904. x11-themes/gtk-engines-aurora -# Miroslav Šulc <fordf...@gentoo.org> (2021-04-14) -# java libraries not used by any other package, -# masked for removal -dev-java/odfdom -dev-java/saaj - # Jonas Stein <jst...@gentoo.org> (2021-04-14) # Open bugs, dead upstream. # Removal on 2021-06-01. Bug #782730.
