commit: 5776e4441e70b5695f57230978afd1fc9a6115b9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu May 5 16:25:30 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon May 9 17:21:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5776e444
dev-java/batik: drop 1.9 Closes: https://bugs.gentoo.org/831112 Closes: https://bugs.gentoo.org/833406 Closes: https://bugs.gentoo.org/831105 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/batik/Manifest | 1 - dev-java/batik/batik-1.9.ebuild | 109 ------------------------ dev-java/batik/files/batik-1.9-ImportInfo.patch | 10 --- 3 files changed, 120 deletions(-) diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest index 33f7b1515575..4ac30465bd11 100644 --- a/dev-java/batik/Manifest +++ b/dev-java/batik/Manifest @@ -1,2 +1 @@ DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815 SHA512 689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb -DIST batik-src-1.9.tar.gz 16748072 BLAKE2B 4e23c0de3d56ba130c5bc9ef80a01549e8c11ab4db3b1ac5dae8525cf0a3a8b7f4df3161c12f1f0df9c74229aaf2034fb6c9c2f91b7fc7407a0af580d144e606 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952 diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild deleted file mode 100644 index 2e905bf8073d..000000000000 --- a/dev-java/batik/batik-1.9.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc" - -inherit java-pkg-2 java-ant-2 epatch - -DESCRIPTION="Java based SVG toolkit" -HOMEPAGE="https://xmlgraphics.apache.org/batik/"; -SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="1.9" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="doc python tcl" - -CDEPEND=" - tcl? ( dev-java/jacl:0 ) - python? ( dev-java/jython:2.7 ) - dev-java/xalan:0 - dev-java/rhino:1.6 - dev-java/ant-core:0 - dev-java/xmlgraphics-commons:2 - dev-java/xml-commons-external:1.3" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_GENTOO_CLASSPATH=" - xml-commons-external-1.3 - xmlgraphics-commons-2 - rhino-1.6 - xalan" - -src_prepare() { - default - - # See bug 318323. - local file - for file in build.xml contrib/rasterizertask/build.xml; do - java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m - done - - # See bug 628812. - use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch" - - cd lib || die - rm -v *.jar build/*.jar || die - use python && java-pkg_jar-from jython-2.7 - use tcl && java-pkg_jar-from jacl -} - -src_compile() { - # Fails to build on amd64 without this - export ANT_OPTS="-Xmx256m" - use amd64 && export ANT_OPTS="-Xmx1g" - - eant jars all-jar $(use_doc) - cd contrib/rasterizertask || die - eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc) -} - -src_install() { - batik_unversion_jars() { - local jar - for jar in batik-*.jar; do - newj="${jar%-*}.jar" - java-pkg_newjar ${jar} ${newj} - done - } - - # First unversion jars in ${P}/lib - cd "${S}/${P}/lib" || die - batik_unversion_jars - - # Then, only those in ${P} - cd "${S}/${P}" || die - batik_unversion_jars - - # Proceed with documentation installation - cd "${S}" || die - dodoc README CHANGES - use doc && java-pkg_dojavadoc "${P}/docs/javadoc" - - # See bug #116976. - java-pkg_dolauncher "batik-${SLOT}" \ - --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \ - --main org.apache.batik.apps.svgbrowser.Main - - # To find these lsjar batik-${SLOT} | grep Main.class - local launcher - for launcher in ttf2svg slideshow svgpp rasterizer; do - java-pkg_dolauncher batik-${launcher}-${SLOT} \ - --main org.apache.batik.apps.${launcher}.Main - done - - # Install and register the ant task. - java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar - java-pkg_register-ant-task -} diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch deleted file mode 100644 index 103b99e1b967..000000000000 --- a/dev-java/batik/files/batik-1.9-ImportInfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java 2017-10-28 17:24:11.401276868 +0000 -+++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java 2017-10-28 17:27:13.314255999 +0000 -@@ -20,6 +20,7 @@ - - import java.net.URL; - -+import org.apache.batik.script.ImportInfo; - import org.apache.batik.script.Interpreter; - import org.apache.batik.script.InterpreterFactory; -
