Remove security vulnerable 1.5 (bug #206651) as it turned out nothing depends on it anymore. Fix quoting and don't dodoc LICENSE in 1.6.

(Portage version: 2.1.4)

4 files changed, 12 insertions, 77 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index f329d703c426..89e50f22b93b 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/batik
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.53 2007/11/15 12:50:04 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.54 2008/01/20 22:27:27 caster Exp $
+
+  20 Jan 2008; Vlastimil Babka <caster@gentoo.org> -batik-1.5-r1.ebuild,
+  batik-1.6-r3.ebuild:
+  Remove security vulnerable 1.5 (bug #206651) as it turned out nothing
+  depends on it anymore. Fix quoting and don't dodoc LICENSE in 1.6.
 
   15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> -batik-1.6-r1.ebuild,
   -batik-1.6-r2.ebuild:
diff --git a/dev-java/batik/batik-1.5-r1.ebuild b/dev-java/batik/batik-1.5-r1.ebuild
deleted file mode 100644
index db66a0d265d0..000000000000
--- a/dev-java/batik/batik-1.5-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5-r1.ebuild,v 1.8 2007/02/14 10:42:29 corsair Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java based toolkit for applications or applets that want to use images in the Scalable Vector Graphics (SVG) format for various purposes, such as viewing, generation or manipulation."
-SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
-HOMEPAGE="http://xml.apache.org/batik/"
-IUSE="doc"
-LICENSE="Apache-1.1"
-SLOT="1.5"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
-
-CDEPEND="=dev-java/rhino-1.5*
-	>=dev-java/xerces-2.7.1
-	=dev-java/xml-commons-external-1.3*
-	dev-java/jython"
-DEPEND="=virtual/jdk-1.4*
-	dev-java/ant-core
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-S="${WORKDIR}/xml-${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-
-	rm -f *.jar build/*.jar
-
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from rhino-1.5
-	java-pkg_jar-from jython
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	ANT_OPTS=-Xmx256m eant jars all-jar
-}
-
-src_install() {
-	java-pkg_dojar ${P}/batik*.jar
-
-	cd ${P}/lib
-	rm {js,x*}.jar
-
-	# needed because batik expects this layout:
-	# batik.jar lib/*.jar
-	# there are hardcoded classpaths in the manifest :(
-	dodir /usr/share/${PN}-${SLOT}/lib/lib/
-	for jar in *.jar
-	do
-		java-pkg_dojar ${jar}
-		rm -f ${jar}
-		dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
-	done
-
-	cd "${S}"
-	dodoc README LICENSE || die "dodoc failed"
-	use doc && java-pkg_dohtml -r ${P}/docs/
-
-	java-pkg_dolauncher ${PN}-${SLOT} --main org.apache.batik.apps.svgbrowser.Main
-}
diff --git a/dev-java/batik/batik-1.6-r3.ebuild b/dev-java/batik/batik-1.6-r3.ebuild
index 160280be53be..0f8255aa8410 100644
--- a/dev-java/batik/batik-1.6-r3.ebuild
+++ b/dev-java/batik/batik-1.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.7 2007/11/11 06:38:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.8 2008/01/20 22:27:27 caster Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -31,8 +31,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-jikes.patch
-	epatch ${FILESDIR}/${P}-dont-copy-deps.patch
+	epatch "${FILESDIR}/${P}-jikes.patch"
+	epatch "${FILESDIR}/${P}-dont-copy-deps.patch"
 
 	java-ant_ignore-system-classes
 
@@ -75,7 +75,7 @@ src_install() {
 	done
 
 	cd "${S}"
-	dodoc README LICENSE || die "dodoc failed"
+	dodoc README || die "dodoc failed"
 	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
 
 	# pwd fixes bug #116976
diff --git a/dev-java/batik/files/digest-batik-1.5-r1 b/dev-java/batik/files/digest-batik-1.5-r1
deleted file mode 100644
index 4a7dcb5351fa..000000000000
--- a/dev-java/batik/files/digest-batik-1.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94d3e981014a5ed6f8c0e3fd80be3033 batik-src-1.5.zip 9234151
-RMD160 0e3e4fc4be5e08acbec26e632ead0e27bf5ce28e batik-src-1.5.zip 9234151
-SHA256 64a6c80eeb908eb15a7e13353c81246dde4e8a538f533dc637d389134e97fc7c batik-src-1.5.zip 9234151