6 files changed, 10 insertions, 180 deletions
diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index f31671a562a1..c8ced9c5dffd 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/antlr
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.33 2005/12/29 23:44:38 compnerd Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.34 2006/01/23 06:07:40 karltk Exp $
+
+  23 Jan 2006; Karl Trygve Kalleberg <karltk@gentoo.org>
+  -antlr-2.7.5-r1.ebuild:
+  Removed old revision.
 
   29 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   antlr-2.7.5-r2.ebuild:
diff --git a/dev-java/antlr/antlr-2.7.5-r1.ebuild b/dev-java/antlr/antlr-2.7.5-r1.ebuild
deleted file mode 100644
index 5691ca70972a..000000000000
--- a/dev-java/antlr/antlr-2.7.5-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.5-r1.ebuild,v 1.2 2005/12/13 19:03:06 compnerd Exp $
-
-inherit gnuconfig java-pkg mono distutils multilib
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr.org/"
-SRC_URI="http://www.antlr.org/download/${P}.tar.gz"
-
-LICENSE="ANTLR"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc debug examples java mono nocxx python source"
-
-RDEPEND="java? ( >=virtual/jdk-1.2 dev-java/java-config )
-		 mono? ( dev-lang/mono dev-util/pkgconfig )
-		 python? ( dev-lang/python )
-		 source? ( app-arch/zip )"
-DEPEND="${RDEPEND}
-		!dev-util/pccts
-		>=virtual/jdk-1.2
-		>=sys-apps/sed-4
-		  sys-apps/findutils"
-
-src_compile() {
-	gnuconfig_update
-
-	local myconf=
-	if use nocxx ; then
-		myconf="--disable-cxx"
-	else
-		myconf="--enable-cxx"
-	fi
-
-	econf $(use_enable java) \
-		  $(use_enable python) \
-		  $(use_enable mono csharp) \
-		  $(use_enable debug) \
-		  $(use_enable examples) \
-		  ${myconf} \
-		  --enable-verbose || die "configure failed"
-
-	emake || die "compile failed"
-
-	sed -e "s|@prefix@|/usr/|" \
-		-e 's|@exec_prefix@|${prefix}|' \
-		-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
-		-e 's|@libs@|-r:\$\{libdir\}/antlr.astframe.dll -r:\$\{libdir\}/antlr.runtime.dll|' \
-		-e "s|@VERSION@|${PV}|" \
-		${FILESDIR}/antlr.pc.in > ${S}/antlr.pc
-
-	cat > antlr.sh <<-EOF
-	#!/bin/sh
-	ANTLR_JAR=\$(java-config -p antlr)
-	\$(java-config -J) -cp \$ANTLR_JAR antlr.Tool \$*
-	EOF
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe ${S}/scripts/antlr-config
-	newexe ${S}/antlr.sh antlr
-
-	if ! use nocxx ; then
-		cd ${S}/lib/cpp
-		einstall || die "failed to install C++ files"
-	fi
-
-	# The jar is needed at all times
-	java-pkg_dojar ${S}/antlr/antlr.jar
-
-	if use java ; then
-		use source && java-pkg_dosrc ${S}/antlr
-		use doc && java-pkg_dohtml -r doc/*
-	fi
-
-	if use mono ; then
-		cd ${S}/lib
-
-		dodir /usr/$(get_libdir)/antlr/
-		insinto /usr/$(get_libdir)/antlr/
-
-		doins antlr.astframe.dll
-		doins antlr.runtime.dll
-
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins ${S}/antlr.pc
-	fi
-
-	if use python ; then
-		cd ${S}/lib/python
-		distutils_src_install
-	fi
-
-	if use examples ; then
-		find ${S}/examples -iname Makefile\* -exec rm \{\} \;
-
-		dodir /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-
-		! use cxx && doins -r ${S}/examples/cpp
-		use java && doins -r ${S}/examples/java
-		use mono && doins -r ${S}/examples/csharp
-		use python && doins -r ${S}/examples/python
-	fi
-
-	newdoc ${S}/README.txt README
-}
diff --git a/dev-java/antlr/files/digest-antlr-2.7.5-r1 b/dev-java/antlr/files/digest-antlr-2.7.5-r1
deleted file mode 100644
index 933fddaf1fc2..000000000000
--- a/dev-java/antlr/files/digest-antlr-2.7.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ef201f29283179c8e5ab618529cac78 antlr-2.7.5.tar.gz 1636304
diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 9d6aeda58d17..2ad85b7d3902 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/batik
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.30 2006/01/08 18:21:16 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.31 2006/01/23 06:02:59 karltk Exp $
+
+  23 Jan 2006; Karl Trygve Kalleberg <karltk@gentoo.org> -batik-1.5.ebuild:
+  Removed old revision.
 
   08 Jan 2006; Joshua Nichols <nichoj@gentoo.org> batik-1.5.ebuild:
   Marked stable on amd64.
diff --git a/dev-java/batik/batik-1.5.ebuild b/dev-java/batik/batik-1.5.ebuild
deleted file mode 100644
index 25f77277a03e..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.16 2006/01/08 18:21:16 nichoj 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 ~sparc 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/files/digest-batik-1.5 b/dev-java/batik/files/digest-batik-1.5
deleted file mode 100644
index 75f845fbef96..000000000000
--- a/dev-java/batik/files/digest-batik-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94d3e981014a5ed6f8c0e3fd80be3033 batik-src-1.5.zip 9234151