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.

Package-Manager: portage-2.1.4

5 files changed, 20 insertions, 103 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/Manifest b/dev-java/batik/Manifest
index f35fc72b464c..d1040f73093a 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX batik-1.6-dont-copy-deps.patch 425 RMD160 9d3b0eeacd146c7211404a264d89f78aa8fc5231 SHA1 fc5737e3b1c05ebdfda5e7e646bc3645ccd036b5 SHA256 47a51f54506512eeddd9efda60981205fcb10c207ecfbcd2cd8335db71099dc1
 MD5 30b134a8c59785d39db060b46f4dd256 files/batik-1.6-dont-copy-deps.patch 425
 RMD160 9d3b0eeacd146c7211404a264d89f78aa8fc5231 files/batik-1.6-dont-copy-deps.patch 425
@@ -9,34 +6,19 @@ AUX batik-1.6-jikes.patch 1738 RMD160 dad6e19c6be0ab4acddbe591212c1d3bdbbb7ea8 S
 MD5 88405976cca078c6468469f91d2ff161 files/batik-1.6-jikes.patch 1738
 RMD160 dad6e19c6be0ab4acddbe591212c1d3bdbbb7ea8 files/batik-1.6-jikes.patch 1738
 SHA256 6aeb43feae39c7805abbc439e64f1db3d7696727e9d97cb443baa980b9f83355 files/batik-1.6-jikes.patch 1738
-DIST batik-src-1.5.zip 9234151 RMD160 0e3e4fc4be5e08acbec26e632ead0e27bf5ce28e SHA1 39c1878da1123b0ae0fe4d36fe74305595f3ad02 SHA256 64a6c80eeb908eb15a7e13353c81246dde4e8a538f533dc637d389134e97fc7c
 DIST batik-src-1.6.zip 10199668 RMD160 a6d32d881827fa47b294c57442b2e0efd87caf85 SHA1 d04ece76f29aad2a4ae1773b161f41a15011f61b SHA256 e1c69fb68e4b6710c246f44157bc4f3f021bdb2f2cedb8112bc025e3a4877a2c
-EBUILD batik-1.5-r1.ebuild 1700 RMD160 658c833d358c96862fc665bc44b784e73628d353 SHA1 c7cb1545a09da386fe1e4cd7c0a57706a208e560 SHA256 d17137269cad5aac8da0f194d50e7abf471347b4f03476c3fed452d495c9e575
-MD5 7ce642017ec8f7d1a605896ccf8aadbe batik-1.5-r1.ebuild 1700
-RMD160 658c833d358c96862fc665bc44b784e73628d353 batik-1.5-r1.ebuild 1700
-SHA256 d17137269cad5aac8da0f194d50e7abf471347b4f03476c3fed452d495c9e575 batik-1.5-r1.ebuild 1700
-EBUILD batik-1.6-r3.ebuild 2182 RMD160 d26085f1c9b04003f4ab9d1de87f02d847d43c52 SHA1 656afb7700692f1f17ddeef7eff894670add7137 SHA256 09e35b534cbef6214eea28684815c450313379f43a1f1079ec0ed04e5830e74c
-MD5 f6193ef6a32deefd1bfe5b1d84c56d5d batik-1.6-r3.ebuild 2182
-RMD160 d26085f1c9b04003f4ab9d1de87f02d847d43c52 batik-1.6-r3.ebuild 2182
-SHA256 09e35b534cbef6214eea28684815c450313379f43a1f1079ec0ed04e5830e74c batik-1.6-r3.ebuild 2182
-MISC ChangeLog 7082 RMD160 b9ed8dfdc698e801c0a1e3ad396cfe03d8e242b1 SHA1 870e232635a079aee04459e6ed92cf8366d6746c SHA256 1e1eadd2116006f18fa3f7f5c0daa0cbeb11feb0f0f4797ab32656df335050ad
-MD5 fe4cc717e0a6b3bbda7549b83e9b8552 ChangeLog 7082
-RMD160 b9ed8dfdc698e801c0a1e3ad396cfe03d8e242b1 ChangeLog 7082
-SHA256 1e1eadd2116006f18fa3f7f5c0daa0cbeb11feb0f0f4797ab32656df335050ad ChangeLog 7082
+EBUILD batik-1.6-r3.ebuild 2180 RMD160 32386b576e8436f22a5e9671dc58d64b53f261ad SHA1 a43f49ea2f24fd24728e417015cdcb5d0b1be303 SHA256 a76231d175d6fe7ce5ebafec83ec7e4628af81fbb95b82e1f44f1ddedf514f5b
+MD5 61a7cf8241acfbec3f33a668eb431c37 batik-1.6-r3.ebuild 2180
+RMD160 32386b576e8436f22a5e9671dc58d64b53f261ad batik-1.6-r3.ebuild 2180
+SHA256 a76231d175d6fe7ce5ebafec83ec7e4628af81fbb95b82e1f44f1ddedf514f5b batik-1.6-r3.ebuild 2180
+MISC ChangeLog 7316 RMD160 b5cd10b868f983d290103866872ed4ded0b83bfe SHA1 15d98248f0e2797c0304be39916ed2b171cbeb06 SHA256 490445b9916868e08d3633a91261da301f2fc5d5362bbe1e68aaac8aa5870346
+MD5 e606928970df329b65010c0824162684 ChangeLog 7316
+RMD160 b5cd10b868f983d290103866872ed4ded0b83bfe ChangeLog 7316
+SHA256 490445b9916868e08d3633a91261da301f2fc5d5362bbe1e68aaac8aa5870346 ChangeLog 7316
 MISC metadata.xml 374 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 SHA1 5626acb9b3091acbf59b8d69c0ba46f525ee0ce5 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437
 MD5 370ede5daee1ae9d1bb9251a8f581a13 metadata.xml 374
 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 metadata.xml 374
 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 metadata.xml 374
-MD5 17708dc861fcdab5267187a4f85e2428 files/digest-batik-1.5-r1 235
-RMD160 1169bcbdd3d33beb761c37e507b50d53659c5fdc files/digest-batik-1.5-r1 235
-SHA256 081093a7b101fa3f0e3d7cae1b13c47949e854834df9b0ca79a2efb53966b49f files/digest-batik-1.5-r1 235
 MD5 a45d68c5a0fb6b3d0d8fe09004e11f54 files/digest-batik-1.6-r3 238
 RMD160 a8b135fbba15d2a4e26ab586e896f20323a16255 files/digest-batik-1.6-r3 238
 SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/digest-batik-1.6-r3 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHPEB4cxLzpIGCsLQRAuZfAJ4gupFx6mdHybzC3RVBmnis4YQIPwCgiZDB
-48fHztAbObt+l9Mtmm8InCA=
-=x17J
------END PGP SIGNATURE-----
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