From 5ba3825727f5e287176eba510a46d084be710ed8 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 18 Oct 2015 14:24:55 +0100
Subject: 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
---
 .../werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild | 60 ----------------------
 .../werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild | 58 +++++++++++++++++++++
 2 files changed, 58 insertions(+), 60 deletions(-)
 delete mode 100644 dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild
 create mode 100644 dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild

(limited to 'dev-java/werken-xpath')

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-r3.ebuild
deleted file mode 100644
index 709ed3e0219d..000000000000
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-antlr"
-
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_PN=${PN/-/.}
-MY_PV=$(replace_version_separator 3 '-')
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="W3C XPath-Rec implementation for DOM4J"
-HOMEPAGE="http://sourceforge.net/projects/werken-xpath/"
-SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
-# This tarball was acquired from jpackage's src rpm of the package by the same name
-
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-COMMON_DEP="
-	dev-java/jdom:0
-	>=dev-java/antlr-2.7.7:0[java]"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}
-
-EANT_BUILD_TARGET="package"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="antlr,jdom"
-
-java_prepare() {
-	# Courtesy of JPackages :)
-	epatch "${FILESDIR}"/${P}-jpp-compile.patch
-	epatch "${FILESDIR}"/${P}-jpp-jdom.patch
-	epatch "${FILESDIR}"/${P}-jpp-tests.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# API updates to support jdom:1.0
-	epatch "${FILESDIR}"/${P}-jdom-1.0.patch
-
-	cd "${S}"/lib
-	# In here we have ant starter scripts
-	rm -fr bin
-	rm -f *.jar
-}
-
-src_install() {
-	java-pkg_newjar build/${MY_PN}.jar
-
-	dodoc README TODO LIMITATIONS
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
new file mode 100644
index 000000000000..7a8d9b9e4cf5
--- /dev/null
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-antlr"
+
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_PN=${PN/-/.}
+MY_PV=$(replace_version_separator 3 '-')
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="W3C XPath-Rec implementation for DOM4J"
+HOMEPAGE="http://sourceforge.net/projects/werken-xpath/"
+SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
+# This tarball was acquired from jpackage's src rpm of the package by the same name
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+COMMON_DEP="
+	dev-java/jdom:0
+	>=dev-java/antlr-2.7.7-r7:0"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_PN}
+
+EANT_BUILD_TARGET="package"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="antlr,jdom"
+
+java_prepare() {
+	# Courtesy of JPackages :)
+	epatch "${FILESDIR}"/${P}-jpp-compile.patch
+	epatch "${FILESDIR}"/${P}-jpp-jdom.patch
+	epatch "${FILESDIR}"/${P}-jpp-tests.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	# API updates to support jdom-1
+	epatch "${FILESDIR}"/${P}-jdom-1.0.patch
+
+	java-pkg_clean
+	rm -rv lib/bin || die
+}
+
+src_install() {
+	java-pkg_newjar build/${MY_PN}.jar
+
+	dodoc README TODO LIMITATIONS
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc src/*
+}
-- 
cgit v1.2.3-65-gdbad