[gentoo-commits] repo/gentoo:master commit in: dev-java/batik/

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     559cca9d8919f426d7cb1f7998c8d4e9fa3ee476
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 18:30:06 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 18:30:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=559cca9d

dev-java/batik: remove vulnerable version.

Bug: https://bugs.gentoo.org/616476
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-java/batik/Manifest            |   1 -
 dev-java/batik/batik-1.8-r3.ebuild | 124 -------------------------------------
 2 files changed, 125 deletions(-)

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index b6aab4243ba..105be6a4e52 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,2 +1 @@
-DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
 DIST batik-src-1.9.tar.gz 16748072 SHA256 bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952 WHIRLPOOL b389ec0d38e16d4619f0a1e933c357a018e0ae2a0c04900caf53f398180c5a2ca031bd8909ef50aeb2db5c12dd6981cb5d1ec466e4c5fbc0379d0c325f039b25

diff --git a/dev-java/batik/batik-1.8-r3.ebuild b/dev-java/batik/batik-1.8-r3.ebuild
deleted file mode 100644
index 68d9e0c96d6..00000000000
--- a/dev-java/batik/batik-1.8-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-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.8"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="
-	dev-java/xalan:0
-	dev-java/rhino:1.6
-	dev-java/xml-commons-external:1.3
-	dev-java/xmlgraphics-commons:2
-	python? (
-		dev-java/jython:2.7
-	)
-	tcl? (
-		dev-java/jacl:0
-	)
-	dev-java/ant-core:0"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	xml-commons-external-1.3
-	xmlgraphics-commons-2
-	xalan
-	rhino-1.6
-"
-
-java_prepare() {
-	# bug #318323
-	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
-
-	# Add some missing imports to avoid a compiling issue.
-	# https://bugs.gentoo.org/show_bug.cgi?id=551952
-	# https://issues.apache.org/jira/browse/BATIK-1123
-	local imports=()
-	imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
-	imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
-	for import in ${imports[@]}; do
-		einfo "Fixing missing import in ${import}"
-		sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die
-		eend $?
-	done
-
-	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
-	if use amd64 ; then
-		export ANT_OPTS="-Xmx1g"
-	else
-		export ANT_OPTS="-Xmx256m"
-	fi
-
-	eant jars all-jar $(use_doc)
-	cd contrib/rasterizertask || die
-	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
-
-	# batik-all-1.8.jar is a all-in-one jar that contains all other jars.
-	# We don't want to package it.
-	# No actually we do. See bug 556062.
-	# cd "${S}"/"${P}/lib" || die
-	# rm -v ${PN}-all-${PV}.jar || die
-}
-
-src_install() {
-	batik_unversion_jars() {
-		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
-
-	# pwd fixes 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
-	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
-}