From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 18 Oct 2015 13:24:55 +0000 (+0100)
Subject: dev-java/werken-xpath: Depend on new split antlr-2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5ba3825727f5e287176eba510a46d084be710ed8;p=gentoo.git

dev-java/werken-xpath: Depend on new split antlr-2

I tried to bump to 0.9.5 but it's really not worth the hassle. This
project died in 2001 and I wish we could get rid of it.

Package-Manager: portage-2.2.20.1
---

diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
similarity index 86%
rename from dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild
rename to dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
index 709ed3e0219d..7a8d9b9e4cf5 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 COMMON_DEP="
 	dev-java/jdom:0
-	>=dev-java/antlr-2.7.7:0[java]"
+	>=dev-java/antlr-2.7.7-r7:0"
 DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.4
@@ -42,13 +42,11 @@ java_prepare() {
 	epatch "${FILESDIR}"/${P}-jpp-tests.patch
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 
-	# API updates to support jdom:1.0
+	# API updates to support jdom-1
 	epatch "${FILESDIR}"/${P}-jdom-1.0.patch
 
-	cd "${S}"/lib
-	# In here we have ant starter scripts
-	rm -fr bin
-	rm -f *.jar
+	java-pkg_clean
+	rm -rv lib/bin || die
 }
 
 src_install() {