Dropped old revisions with newer revisions with equivalent keywords.

Package-Manager: portage-2.1.2_rc1-r5

7 files changed, 4 insertions, 241 deletions

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 0c1463924f0e..1ae24e9107c7 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -9,18 +9,10 @@ EBUILD batik-1.5-r1.ebuild 1686 RMD160 6dd184a0106563d7cf092814d87ce0c1d67663ce
 MD5 27c9131fa5594d04df1ece531e4bfb65 batik-1.5-r1.ebuild 1686
 RMD160 6dd184a0106563d7cf092814d87ce0c1d67663ce batik-1.5-r1.ebuild 1686
 SHA256 2424ac69c7e50ff6e1ba89e3d4974a036cbfcef11c67b898334b9a6dbfdb4ce7 batik-1.5-r1.ebuild 1686
-EBUILD batik-1.5.1-r4.ebuild 1741 RMD160 5921da903dc9f1f5d6d1ca8bd38af53b04325e44 SHA1 32b028e01a740d02b34953080ff36ebc3fccd799 SHA256 89975ff3c0a589cc11bcde2e9db6b37f27d9cdf491a48e7cb965c5578863f7dd
-MD5 bffb4388d027802acf6320832574f113 batik-1.5.1-r4.ebuild 1741
-RMD160 5921da903dc9f1f5d6d1ca8bd38af53b04325e44 batik-1.5.1-r4.ebuild 1741
-SHA256 89975ff3c0a589cc11bcde2e9db6b37f27d9cdf491a48e7cb965c5578863f7dd batik-1.5.1-r4.ebuild 1741
 EBUILD batik-1.5.1-r5.ebuild 1614 RMD160 c82641a327edd149a7199f7b4f49ac791ffb0f34 SHA1 0d53876260c92c6dbd66550527845350bf002760 SHA256 bd692ccba47dc2f128b160b42baf4012008c718873bd8fc0b196b90e82635694
 MD5 b28b725279cea602833bbf86576ac1ee batik-1.5.1-r5.ebuild 1614
 RMD160 c82641a327edd149a7199f7b4f49ac791ffb0f34 batik-1.5.1-r5.ebuild 1614
 SHA256 bd692ccba47dc2f128b160b42baf4012008c718873bd8fc0b196b90e82635694 batik-1.5.1-r5.ebuild 1614
-EBUILD batik-1.5.ebuild 1737 RMD160 a2acb1642be640ff081af48a7e0e28911aaf9378 SHA1 198b04fd219a729b8d04fbb39ea279a2630c7bb1 SHA256 dd0cc7b382849587d9c1ccd0aee71c13ddbe7193034197bfb31e92f6a06a2e12
-MD5 0885e58cf7c67a6e9865282188090810 batik-1.5.ebuild 1737
-RMD160 a2acb1642be640ff081af48a7e0e28911aaf9378 batik-1.5.ebuild 1737
-SHA256 dd0cc7b382849587d9c1ccd0aee71c13ddbe7193034197bfb31e92f6a06a2e12 batik-1.5.ebuild 1737
 EBUILD batik-1.6-r1.ebuild 1748 RMD160 b20a6df86b00a79a3d3474eb65ae992613cac82a SHA1 1fc9a728d781dc72f8e510fce0a70c436fffff24 SHA256 a8e8d60da0f1c8b1781e41fb24072107eb5c5b9078c224831033b76a671a59d7
 MD5 ac00b4cb8beff1792ab6d3761114f79a batik-1.6-r1.ebuild 1748
 RMD160 b20a6df86b00a79a3d3474eb65ae992613cac82a batik-1.6-r1.ebuild 1748
@@ -29,33 +21,20 @@ EBUILD batik-1.6-r2.ebuild 2117 RMD160 e87bee84134271f7f0862d990f9b6370a910eba2
 MD5 9c07b4ad619d8d4c7b0eca6252a47b11 batik-1.6-r2.ebuild 2117
 RMD160 e87bee84134271f7f0862d990f9b6370a910eba2 batik-1.6-r2.ebuild 2117
 SHA256 661c6d663278a2c80e77f90e797b3167c01cf9754f9a70a5e33e0de47d1d45cf batik-1.6-r2.ebuild 2117
-EBUILD batik-1.6.ebuild 1902 RMD160 8180fc34c69deecd054aaecef9861207016e9339 SHA1 93b9a03a570c236b50184f1a786f44cb1e990e03 SHA256 dcccea44ba6daf34bfe8ff1571c42cbc54a1e18755609fd42d1e3f8784264128
-MD5 cd4b24ea97b4274f83a8eeb198a99fba batik-1.6.ebuild 1902
-RMD160 8180fc34c69deecd054aaecef9861207016e9339 batik-1.6.ebuild 1902
-SHA256 dcccea44ba6daf34bfe8ff1571c42cbc54a1e18755609fd42d1e3f8784264128 batik-1.6.ebuild 1902
-MISC ChangeLog 5296 RMD160 19e11213f130c630e63c593f8e18e7880e79419b SHA1 4e056c6ac744aea515e33d2ef3256660e1fa161b SHA256 dd6315fd0194bad82aeda992a758e900cde437d9ee5f9aa740d6a7c078f48f03
-MD5 da558eb46c30d9767418a02a8140f4f1 ChangeLog 5296
-RMD160 19e11213f130c630e63c593f8e18e7880e79419b ChangeLog 5296
-SHA256 dd6315fd0194bad82aeda992a758e900cde437d9ee5f9aa740d6a7c078f48f03 ChangeLog 5296
+MISC ChangeLog 5483 RMD160 f075526f0848377eba44b8c00706bfbaae341635 SHA1 a899aac205231241880aef198eff088dfb9a5265 SHA256 9f5c1c3d1e665dddaac941c7e01554432938c3237b6472a35a4378002a6106cf
+MD5 a6487c74a2d0bf6f4717273a9fa1039f ChangeLog 5483
+RMD160 f075526f0848377eba44b8c00706bfbaae341635 ChangeLog 5483
+SHA256 9f5c1c3d1e665dddaac941c7e01554432938c3237b6472a35a4378002a6106cf ChangeLog 5483
 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 235
-RMD160 1169bcbdd3d33beb761c37e507b50d53659c5fdc files/digest-batik-1.5 235
-SHA256 081093a7b101fa3f0e3d7cae1b13c47949e854834df9b0ca79a2efb53966b49f files/digest-batik-1.5 235
 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 5f96dd3170804651dd65f8168f11f8ce files/digest-batik-1.5.1-r4 244
-RMD160 fa3b91aa2695af72ffb67587ddbadcc0b3ec82f5 files/digest-batik-1.5.1-r4 244
-SHA256 f15fadb4983f29c69373234862ac79f1bacfbff6fb18d07c1efc95415a6b4c11 files/digest-batik-1.5.1-r4 244
 MD5 5f96dd3170804651dd65f8168f11f8ce files/digest-batik-1.5.1-r5 244
 RMD160 fa3b91aa2695af72ffb67587ddbadcc0b3ec82f5 files/digest-batik-1.5.1-r5 244
 SHA256 f15fadb4983f29c69373234862ac79f1bacfbff6fb18d07c1efc95415a6b4c11 files/digest-batik-1.5.1-r5 244
-MD5 a45d68c5a0fb6b3d0d8fe09004e11f54 files/digest-batik-1.6 238
-RMD160 a8b135fbba15d2a4e26ab586e896f20323a16255 files/digest-batik-1.6 238
-SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/digest-batik-1.6 238
 MD5 a45d68c5a0fb6b3d0d8fe09004e11f54 files/digest-batik-1.6-r1 238
 RMD160 a8b135fbba15d2a4e26ab586e896f20323a16255 files/digest-batik-1.6-r1 238
 SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/digest-batik-1.6-r1 238
diff --git a/dev-java/batik/batik-1.5.1-r4.ebuild b/dev-java/batik/batik-1.5.1-r4.ebuild
deleted file mode 100644
index c5a48e44f321..000000000000
--- a/dev-java/batik/batik-1.5.1-r4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r4.ebuild,v 1.10 2006/10/05 15:09:37 gustavoz Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Batik is a Java(tm) technology 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."
-HOMEPAGE="http://xml.apache.org/batik/"
-SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-1.1"
-SLOT="1.5.1"
-KEYWORDS="x86 ppc amd64"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.3
-	=dev-java/rhino-1.5*
-	>=dev-java/xerces-2.6
-	dev-java/xml-commons"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core"
-
-S=${WORKDIR}/xml-batik
-
-src_unpack() {
-	unzip -q ${DISTDIR}/${A}
-
-	cd ${S}/lib && rm -f *.jar
-	java-pkg_jar-from rhino-1.5
-	java-pkg_jar-from xerces-2
-}
-
-src_compile() {
-	export ANT_OPTS=-Xmx256m
-	local antflags="jars all-jar"
-	ant ${antflags} || die "compile problem"
-}
-
-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 classpathes in the manifest :(
-	for jar in *.jar
-	do
-		java-pkg_dojar ${jar}
-		rm -f ${jar}
-		ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
-	done
-
-	cd ${S}
-	cp -pPR ${P}/lib ${D}${DESTTREE}/share/${PN}-${SLOT}/lib/
-
-	dodoc README
-	use doc && java-pkg_dohtml -r ${P}/docs/
-
-	echo "#!/bin/sh" > ${PN}${SLOT}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik-1.5.1,xerces-2,xml-commons,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}${SLOT}
-	dobin ${PN}${SLOT}
-
-}
diff --git a/dev-java/batik/batik-1.5.ebuild b/dev-java/batik/batik-1.5.ebuild
deleted file mode 100644
index 69474146f32e..000000000000
--- a/dev-java/batik/batik-1.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.ebuild,v 1.19 2006/10/05 15:09:37 gustavoz Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Batik is a Java(tm) technology 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://apache/xml/batik/${PN}-src-${PV}.zip"
-HOMEPAGE="http://xml.apache.org/batik/"
-IUSE="doc"
-LICENSE="Apache-1.1"
-SLOT="1.5"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND=">=virtual/jre-1.3
-	=dev-java/rhino-1.5*
-	>=dev-java/xerces-2.6
-	dev-java/xml-commons"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core"
-
-S=${WORKDIR}/xml-batik
-
-src_unpack() {
-	jar xf ${DISTDIR}/${PN}-src-${PV}.zip
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from rhino-1.5
-}
-
-src_compile() {
-	export ANT_OPTS=-Xmx256m
-	local antflags="jars all-jar"
-	ant ${antflags} || die "compile problem"
-}
-
-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 classpathes in the manifest :(
-	for jar in *.jar
-	do
-		java-pkg_dojar ${jar}
-		rm -f ${jar}
-		ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
-	done
-
-	cd ${S}
-	cp -ra ${P}/lib ${D}${DESTTREE}/share/${PN}-${SLOT}/lib/
-
-	dodoc README LICENSE
-	use doc && java-pkg_dohtml -r ${P}/docs/
-
-	echo "#!/bin/sh" > ${PN}${SLOT}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik-1.5,xerces-2,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}${SLOT}
-	dobin ${PN}${SLOT}
-
-}
diff --git a/dev-java/batik/batik-1.6.ebuild b/dev-java/batik/batik-1.6.ebuild
deleted file mode 100644
index f8c4f59407dc..000000000000
--- a/dev-java/batik/batik-1.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6.ebuild,v 1.4 2006/10/05 15:09:37 gustavoz Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="A Java toolkit to use images in the Scalable Vector Graphics (SVG) format for various purposes, such as viewing, generation or manipulation."
-HOMEPAGE="http://xml.apache.org/batik/"
-SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.6"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc jikes"
-
-RDEPEND=">=virtual/jre-1.3
-	=dev-java/rhino-1.5*
-	>=dev-java/xerces-2.6
-	dev-java/xml-commons"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core"
-
-S=${WORKDIR}/xml-batik
-
-src_unpack() {
-	unpack ${A}
-
-	use jikes && epatch ${FILESDIR}/${P}-jikes.patch
-
-	cd ${S}/lib && rm -f *.jar
-	java-pkg_jar-from rhino-1.5
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from xml-commons
-}
-
-src_compile() {
-	local antflags="jars all-jar"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	# Fails to build on amd64 without this
-	ANT_OPTS="${ANT_OPTS} -Xmx1g" \
-		ant ${antflags} || die "compile problem"
-}
-
-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 classpathes in the manifest :(
-	for jar in *.jar
-	do
-		java-pkg_dojar ${jar}
-		rm -f ${jar}
-		ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
-	done
-
-	cd ${S}
-	cp -pPR ${P}/lib ${D}${DESTTREE}/share/${PN}-${SLOT}/lib/
-
-	dodoc README
-	use doc && java-pkg_dohtml -r ${P}/docs/api xdocs/*
-
-	echo "#!/bin/sh" > ${PN}${SLOT}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p	batik-1.6,xml-commons,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}${SLOT}
-	dobin ${PN}${SLOT}
-
-}
diff --git a/dev-java/batik/files/digest-batik-1.5 b/dev-java/batik/files/digest-batik-1.5
deleted file mode 100644
index 4a7dcb5351fa..000000000000
--- a/dev-java/batik/files/digest-batik-1.5
+++ /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
diff --git a/dev-java/batik/files/digest-batik-1.5.1-r4 b/dev-java/batik/files/digest-batik-1.5.1-r4
deleted file mode 100644
index 2f5945fa538a..000000000000
--- a/dev-java/batik/files/digest-batik-1.5.1-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a3ba8b76dcef9415216d6a5b9685a9c batik-src-1.5.1.zip 11474737
-RMD160 48d76d859b761ae2720863d2213f4c7e5827e134 batik-src-1.5.1.zip 11474737
-SHA256 242c2aed9661466687cc014bf4c46ba9776bce115c09d637b5aaf917c4e97959 batik-src-1.5.1.zip 11474737
diff --git a/dev-java/batik/files/digest-batik-1.6 b/dev-java/batik/files/digest-batik-1.6
deleted file mode 100644
index 16f71a451358..000000000000
--- a/dev-java/batik/files/digest-batik-1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b65e12f520f8342605f700204c96cd2b batik-src-1.6.zip 10199668
-RMD160 a6d32d881827fa47b294c57442b2e0efd87caf85 batik-src-1.6.zip 10199668
-SHA256 e1c69fb68e4b6710c246f44157bc4f3f021bdb2f2cedb8112bc025e3a4877a2c batik-src-1.6.zip 10199668