Remove batik:1.6, depends on jdk 1.4 and there are no more reverse deps. Moved to java-overlay.

(Portage version: 2.2_rc42/cvs/Linux x86_64)

5 files changed, 7 insertions, 232 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 01f7eb4277e4..2c0c3dafd196 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/batik
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.62 2009/07/23 13:14:44 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.63 2009/10/03 20:36:55 caster Exp $
+
+  03 Oct 2009; Vlastimil Babka <caster@gentoo.org> -batik-1.6-r3.ebuild,
+  -batik-1.6-r4.ebuild, -files/batik-1.6-dont-copy-deps.patch,
+  -files/batik-1.6-jikes.patch:
+  Remove batik:1.6, depends on jdk 1.4 and there are no more reverse deps.
+  Moved to java-overlay.
 
   23 Jul 2009; Alistair Bush <ali_bush@gentoo.org> batik-1.6-r3.ebuild:
   Constrain jython dependency so it doesn't pulling 2.5 slot.
diff --git a/dev-java/batik/batik-1.6-r3.ebuild b/dev-java/batik/batik-1.6-r3.ebuild
deleted file mode 100644
index cdcfc2deae46..000000000000
--- a/dev-java/batik/batik-1.6-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 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.9 2009/07/23 13:14:44 ali_bush Exp $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-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 ~ia64 ppc ~ppc64 x86"
-IUSE="doc python tcl"
-
-CDEPEND="=dev-java/rhino-1.5*
-	>=dev-java/xerces-2.7.1
-	=dev-java/xml-commons-external-1.3*
-	python? ( || ( =dev-java/jython-2.2* =dev-java/jython-2.1* ) )
-	tcl? ( dev-java/jacl )"
-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}"
-
-	epatch "${FILESDIR}/${P}-jikes.patch"
-	epatch "${FILESDIR}/${P}-dont-copy-deps.patch"
-
-	java-ant_ignore-system-classes
-
-	cd lib
-	rm -f *.jar build/*.jar
-
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from xerces-2
-	# Can't make rhino optional because
-	# apps/svgbrowser needs it
-	java-pkg_jar-from rhino-1.5
-	use python && java-pkg_jar-from jython
-	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)
-}
-
-src_install() {
-	java-pkg_dojar ${P}/batik*.jar
-
-	cd ${P}/lib
-
-	# 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}
-		dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
-	done
-
-	cd "${S}"
-	dodoc README || die "dodoc failed"
-	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
-
-	# pwd fixes bug #116976
-	java-pkg_dolauncher batik-${SLOT} --pwd "/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
-}
diff --git a/dev-java/batik/batik-1.6-r4.ebuild b/dev-java/batik/batik-1.6-r4.ebuild
deleted file mode 100644
index b8977776ee30..000000000000
--- a/dev-java/batik/batik-1.6-r4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r4.ebuild,v 1.4 2009/07/19 14:02:16 nixnut Exp $
-
-JAVA_PKG_IUSE="doc"
-EAPI=2
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-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 ~ia64 ppc ~ppc64 x86"
-IUSE="python tcl"
-
-CDEPEND="dev-java/rhino:1.5
-	dev-java/xerces:2
-	dev-java/xml-commons-external:1.3
-	python? ( dev-java/jython:0 )
-	tcl? ( dev-java/jacl:0 )
-	dev-java/ant-core"
-DEPEND="=virtual/jdk-1.4*
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-S="${WORKDIR}/xml-${PN}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-jikes.patch"
-	epatch "${FILESDIR}/${P}-dont-copy-deps.patch"
-
-	java-ant_ignore-system-classes
-	java-ant_rewrite-classpath contrib/rasterizertask/build.xml
-	cd lib
-	rm -f *.jar build/*.jar
-
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from xerces-2
-	# Can't make rhino optional because
-	# apps/svgbrowser needs it
-	java-pkg_jar-from rhino-1.5
-	use python && java-pkg_jar-from jython
-	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)
-}
-
-src_install() {
-	java-pkg_dojar ${P}/batik*.jar
-
-	cd ${P}/lib
-
-	# 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}
-		dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
-	done
-
-	cd "${S}"
-	dodoc README || die "dodoc failed"
-	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
-
-	# pwd fixes bug #116976
-	java-pkg_dolauncher batik-${SLOT} --pwd "/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
-}
diff --git a/dev-java/batik/files/batik-1.6-dont-copy-deps.patch b/dev-java/batik/files/batik-1.6-dont-copy-deps.patch
deleted file mode 100644
index 5397b6e294c4..000000000000
--- a/dev-java/batik/files/batik-1.6-dont-copy-deps.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- build.xml	2007-01-08 11:44:12.000000000 +0100
-+++ build.xml	2007-01-08 11:46:19.000000000 +0100
-@@ -457,11 +457,13 @@
-                                rasterizer-jar,
-                                rasterizer-ext-jar,
-                                ttf2svg-jar">
-+	<!--
-     <copy todir="${build}/lib">
-       <fileset dir="${lib}">
-         <include name="*.jar"/>
-       </fileset>
-     </copy>
-+	-->
-   </target>
- 
- 
diff --git a/dev-java/batik/files/batik-1.6-jikes.patch b/dev-java/batik/files/batik-1.6-jikes.patch
deleted file mode 100644
index 25e3751e99aa..000000000000
--- a/dev-java/batik/files/batik-1.6-jikes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru xml-batik/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java xml-batik-patched/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java
---- xml-batik/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java	2004-08-18 03:14:08.000000000 -0400
-+++ xml-batik-patched/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java	2005-08-09 19:18:20.000000000 -0400
-@@ -33,12 +33,12 @@
-          *            should be remembered so it can be returned by
-          *            <tt>lruGet</tt>.  
-          */
--		public  void    lruSet(LRUNode nde);
-+		public  void    lruSet(LRUCache.LRUNode nde);
-         /**
-          * Called to get the LRU node for this object.  Should return the
-          * node passed in to lruSet.
-          */
--		public  LRUNode lruGet();
-+		public  LRUCache.LRUNode lruGet();
-         /**
-          * Called to inform the object that it is no longer in the cache.
-          */
-diff -ru xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java xml-batik-patched/sources/org/apache/batik/script/rhino/RhinoInterpreter.java
---- xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java	2005-03-29 05:48:02.000000000 -0500
-+++ xml-batik-patched/sources/org/apache/batik/script/rhino/RhinoInterpreter.java	2005-08-09 19:16:33.000000000 -0400
-@@ -418,7 +418,7 @@
-         public Object get(ScriptableObject so) {
-             Context ctx = Context.getCurrentContext();
-             if (ctx == null ) return null;
--            return ((ExtendedContext)ctx).getInterpreter().objects.get(name);
-+            return ((RhinoInterpreter.ExtendedContext)ctx).getInterpreter().objects.get(name);
-         }
-     }
-     // The method to use for getting the value from the