summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-03-26 04:44:40 +0000
committerTim Harder <radhermit@gentoo.org>2013-03-26 04:44:40 +0000
commitd8849209302b8861b2ea9e3a2d8dbaa887a45cdc (patch)
tree08c2a5baf0841cd95154ff374e0a157beedc69df /dev-java
parentfixing more nova deps (diff)
downloadgentoo-2-d8849209302b8861b2ea9e3a2d8dbaa887a45cdc.tar.gz
gentoo-2-d8849209302b8861b2ea9e3a2d8dbaa887a45cdc.tar.bz2
gentoo-2-d8849209302b8861b2ea9e3a2d8dbaa887a45cdc.zip
Revbump to fix build with jdom:1.0 and update to EAPI 5.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/werken-xpath/ChangeLog9
-rw-r--r--dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch86
-rw-r--r--dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild60
3 files changed, 154 insertions, 1 deletions
diff --git a/dev-java/werken-xpath/ChangeLog b/dev-java/werken-xpath/ChangeLog
index e2ddecc7ec0b..9ce2537db276 100644
--- a/dev-java/werken-xpath/ChangeLog
+++ b/dev-java/werken-xpath/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/werken-xpath
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.16 2013/01/01 19:18:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.17 2013/03/26 04:44:39 radhermit Exp $
+
+*werken-xpath-0.9.4_beta-r2 (26 Mar 2013)
+
+ 26 Mar 2013; Tim Harder <radhermit@gentoo.org>
+ +werken-xpath-0.9.4_beta-r2.ebuild,
+ +files/werken-xpath-0.9.4_beta-jdom-1.0.patch:
+ Revbump to fix build with jdom:1.0 and update to EAPI 5.
01 Jan 2013; Ulrich Müller <ulm@gentoo.org>
werken-xpath-0.9.4_beta-r1.ebuild:
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch
new file mode 100644
index 000000000000..099f7110a5da
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jdom-1.0.patch
@@ -0,0 +1,86 @@
+--- werken.xpath/src/com/werken/xpath/ElementNamespaceContext.java
++++ werken.xpath/src/com/werken/xpath/ElementNamespaceContext.java
+@@ -62,12 +62,12 @@
+
+ lineage.push(_element);
+
+- Element elem = _element.getParent();
++ Element elem = _element.getParentElement();
+
+ while (elem != null)
+ {
+ lineage.push(elem);
+- elem = elem.getParent();
++ elem = elem.getParentElement();
+ }
+
+ List nsList = null;
+--- werken.xpath/src/com/werken/xpath/impl/ParentStep.java
++++ werken.xpath/src/com/werken/xpath/impl/ParentStep.java
+@@ -28,7 +28,7 @@
+ {
+ if ( node instanceof Element )
+ {
+- return ((Element)node).getParent();
++ return ((Element)node).getParentElement();
+ }
+
+ return null;
+@@ -50,7 +50,7 @@
+
+ if ( each instanceof Element )
+ {
+- parent = ((Element)each).getParent();
++ parent = ((Element)each).getParentElement();
+
+ if (parent != null)
+ {
+--- werken.xpath/src/com/werken/xpath/util/Partition.java
++++ werken.xpath/src/com/werken/xpath/util/Partition.java
+@@ -67,7 +67,7 @@
+
+ public static List followingSiblings(Element node)
+ {
+- Element parent = node.getParent();
++ Element parent = node.getParentElement();
+
+ if (parent == null)
+ {
+@@ -95,7 +95,7 @@
+
+ public static List preceedingSiblings(Element node)
+ {
+- Element parent = node.getParent();
++ Element parent = node.getParentElement();
+
+ if (parent == null)
+ {
+@@ -137,7 +137,7 @@
+ results.addAll( Partition.descendants( each ) );
+ }
+
+- Element parent = node.getParent();
++ Element parent = node.getParentElement();
+
+ if (parent != null)
+ {
+@@ -170,7 +170,7 @@
+ results.addAll( Partition.descendants( each ) );
+ }
+
+- Element parent = node.getParent();
++ Element parent = node.getParentElement();
+
+ if (parent != null)
+ {
+--- werken.xpath/test/src/com/werken/xpath/test/Driver.java
++++ werken.xpath/test/src/com/werken/xpath/test/Driver.java
+@@ -47,7 +47,7 @@
+
+ System.out.println("Using test-cases in [" + args[0] + "]");
+
+- File dataDir = driverXML.getParentFile();
++ File dataDir = driverXML.getParentElementFile();
+
+ Driver driver = Driver(dataDir,
+ driverXML);
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild
new file mode 100644
index 000000000000..f6c7c032f233
--- /dev/null
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild,v 1.1 2013/03/26 04:44:39 radhermit Exp $
+
+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:1.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-1.0"
+
+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/*
+}