Revbump to fix build with jdom:1.0 and update to EAPI 5.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 164 insertions, 15 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/Manifest b/dev-java/werken-xpath/Manifest
index 941e060a6440..f53ecdbae9cf 100644
--- a/dev-java/werken-xpath/Manifest
+++ b/dev-java/werken-xpath/Manifest
@@ -2,27 +2,23 @@
 Hash: SHA256
 
 AUX werken-xpath-0.9.4_beta-gentoo.patch 1313 SHA256 588fef298eda7cddb53ec9a29bc996200e79887dd7024edbb72438a330fccea3 SHA512 bc1dea4402c1a4b4d99cdac96502ab7134613a9584f491c46abf194158c1524366037f086d250ca8cebb1972e298dd943a4af5919107af2b54863d4400e39bfe WHIRLPOOL 0bee1cabb67f676ce16b98dbb2b24b2eea80a1a8bca568a1c3eef1236062c62bd298977ac8faaae2c21aac32891c8b725b4456dc186c2c9d7a9e781faf7f1d8b
+AUX werken-xpath-0.9.4_beta-jdom-1.0.patch 2325 SHA256 c6f1f7ff2b866a2563ad10edf54a24abfee9793a2478750827dd8eb8bd12a387 SHA512 29c3d85870d0c49b36823ba633c9a3440a5c61f140c0827aee7b78c3a241a97f3cf5e285d43deed2f85487cb38b9682b4298d1dfd3934c038ca1be90dbb086bc WHIRLPOOL dc8fd009ab49f356a27ec7389cae499b8bbde9209c10a75fcc3bc47c3c063fdcd29f4fc07a51a61097fe53e520cdde970277a178f52646645467c1c65720d5b1
 AUX werken-xpath-0.9.4_beta-jpp-compile.patch 1189 SHA256 8ccdde529f4b236ecd6793f3baf80e99d057eec4fad97bb130c9ba1ab3444d0b SHA512 e7dbb75305a22463f7a3a975ca21002fb9aa19fcaff8cff07890a74cadcde292023d8e714c801019e1cd42c1f69270f7ae31c547feabfae2d4972dc99d5719a4 WHIRLPOOL ae468268e72ce63de8cb34d86009bcb59684ce4fe5b948131dcc3bacbfb13c17b2f96f393249bd8704db71710e5049db90097977a9c69ab423ed68981ccd24d7
 AUX werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 SHA256 4c8301b7fa31a8c999b3021c46526045f12e178b8bad230fbcd3b00cc5cd98b7 SHA512 de979a742d7d8f7fbcc68613ba4697fc4a4dc7d146d86712d71ae09c4e0b6f09c27361bd80743534aa5f2e864def2c5b8a09bd1d6fa2e15a852b74b73ff616c6 WHIRLPOOL 8a61c1285e880ae603ed1ca645661163b4a036f6f18dbee54f40296f2b791bd2191119d6676fff708d874e984551aff901ce6d1b5d2e0f2cbd7cc2026f1b19d1
 AUX werken-xpath-0.9.4_beta-jpp-tests.patch 353 SHA256 79297e31ea4b45ecdaa67df4bb8816b8dd416bc577c1f5406008954cab5e327c SHA512 80adb52ad882970be6177cd1f8ea3ece8fbd3388b02b1c1766f3c5c869c42e358be9682fdd4a189225158d75d59b558ac0cfe55d8e9530de383ef86b654c99e4 WHIRLPOOL b3afbe5249463b395e4219d934114245a876739ec8421f16f9302f4a0c3d42bc7ba902056fd5d38fac495735208a2411f3a2a76d7ef7121f0f9a3156fdcf77ac
 DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 SHA256 e0d649230f3fa07f0860a355adde20e1ee08ba1a7809f00cb938b9b0dc3f76f3 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d WHIRLPOOL 2593fa630fcb50cbbeaf627c09682ee9822e938b845c53b6413600413a74b9b6b9417368273ebd258707ee3434a3ba8347a046ed27a0f94290687a246d38734e
 EBUILD werken-xpath-0.9.4_beta-r1.ebuild 1956 SHA256 a63a0916101de59260ba1726c23ce70e65297fc39ae4a91cc5888729883f42bb SHA512 7931631a58c33474d492e5d908224d1f00eced74afed56adcfea06f9c5bcb59a8f2a9a403d4b7d5a7ecd3a46b97a5ba5aca888ab6de30e68ab607b794a605cec WHIRLPOOL bf931b74a31c273879c0e9727e19d382ff6120d41f4ec3ec4671db5a53957e6f4c89ca4c6e1f025f7895132c52df7b6a0da6d2aaf3ca71a184ee58aab14be7c2
-MISC ChangeLog 2566 SHA256 70b7165995211e8e5ab774b5925da3c8314f7fd0685dd8929f8d15e81886da30 SHA512 f5299a68c14c35f750ace0b58de73c218fa0a4dac81bb1e0e60c974b7873e7424e8101515f0c911330d79f2fee4bfec87a70015ca0ae1a87442816206ea19496 WHIRLPOOL 1682f4637516c58e494c0e3cf65ec0e4a8fd955aeb61620531fc9f9d726b5706ba7b70f4b687222dc0ce3e66c190841033c87e19146c37901eaa2f7efe8a4d2e
+EBUILD werken-xpath-0.9.4_beta-r2.ebuild 1555 SHA256 cc627daa03b3791246c77c1efe9d0c3cf3a0c021ad5e4a8a99322cc9b505de77 SHA512 7e58a3e547672a8cbc03193fa05f5563716146c4606689aeb98c96cef2a215f80d2a074c183ef851b857862814a96f669837b3e5388ff7f2278cfb095b37427f WHIRLPOOL 006c758431c2a9dd7b952f2aa891a4cd6dcf55ff250c9ab61e419cbf2159592dea3da4a7712326f9121350dafc411f92f7cc0dfa882ca06035fe1b5ca9ccef58
+MISC ChangeLog 2811 SHA256 97327470a9c75a5a36ddbe2668447a519089c1c4f903393fcd99a6cc62602bac SHA512 a97139bc853320cb535da83671a74c1228b450b27434ab64b00c7a0e20d3bacc28b5b5d66a3a3b8b101e519ccb00024512556a12706ad8f9347ca6c2c7185c06 WHIRLPOOL 9cbd5ee1c705be8d255185367da752ab233ba8365835c3506a8459ad1e4a13613345aa9af06279eae38d22b969de03121a069014fcd98c9184e3f0ab88fa705c
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4zcxAAoJEDxpGckxwJCBYOgP/RxjyWi7bkUnvJcIj2Nk97vf
-93R7qHHd8jQGA4TmDc3xB2d9JxO/BOCqXwPFwNs8qCrnVBRGsa694Turea7aF36Y
-XK4KYFuSnIk+kTy4Yrx5JSSuCZfZCEXl3WhAKqnEngxI6hwIKu0a/mysXyONFDrA
-6zhCAHou7nHgOP+q9r56rSZ/75sdsxbp680CDos5Q8GNXVwt9Z2s0EHcHytgJrRe
-pozTnX7GGadFafPjZV1KaY4BbPm+qLRsx5mg1Uv6eIdr2uUhJYHoJqAuanCYywiI
-mXfjEmZsOzfvJDwEzUYnmEBeqneYKWGJU87sb0fvSpeKH0JUkj7x38MFdZGk/cr3
-LQgEZg8UI8uGLrWZwY+9ucPDQHmrbuncArhBUuQNMxuX8NHzJdl6a9yofu0OkVVH
-uHujQX+FxOia6dZiqcTFjkmYXtb0NhFdra6F+iw4628krPSYI8ZxADrUK/WTEVLi
-WIYVeISmgGJsSlZwwrQbt+jetGnHw1gUtSm24UImRnpXzj7pKebdI9zLTgl3ux0C
-Bz+mP3u8soPDaGLAs/oHV2IAitztktbCLgWQcUm3DbFRhN0FGbNQtl6bFM0umg51
-FLkWXUvHtqvjan8Ef15yqAf/KP0RvIjxTHsiZkYodRx5InwtKJbU90JlD2YouzTh
-fGI/mYtj+zYkrhLdQ5HL
-=1SdM
+iQEcBAEBCAAGBQJRUSe8AAoJEEqz6FtPBkyjjNgH/A7H/JkfmughcBthOOaz4WuB
+aC5/yhmNM80KqGjfAEkG8fsuu7iMgZl+HzPKAJSB1g96fJ6MZPf9aTi8j6rVrCQz
+hRUi09O8JAh7bfH/jWwMj2NI633bN9bXPCsGykSEUZyiO9urLd9HsR1Zc91NyzWw
+HgID/R8BNWiTRpybuVHChPG3NAgI8qdReZIi4nVArJyWRZy6J5WIEyi6Wp8k6O2Y
+qqLjCikP0zsBpMH80vGlgpH++PJpxPE2YL7fvb0ZINKMUSmQsnC8VYlel6XsctRm
+t2fAHcuIjf6s+g77FFLFXWRSQscvof684mVYYa6RpvibJpvI+Dk7cIp8GB+PGpA=
+=4uM4
 -----END PGP SIGNATURE-----
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/*
+}