gentoo resync : 14.07.2018

8 files changed, 317 insertions, 0 deletions

diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest
new file mode 100644
index 000000000000..09ad09addb20
--- /dev/null
+++ b/dev-java/werken-xpath/Manifest
@@ -0,0 +1,8 @@
+AUX werken-xpath-0.9.4_beta-gentoo.patch 1313 BLAKE2B 77a304e9d140ab67e1d32d0fc91c5c62562d623f47491a724bb9807d29d97aa8e00d659c1c4151710884150e0d29a5cec53f3c9a8dc3ce00318cb0bc27507397 SHA512 bc1dea4402c1a4b4d99cdac96502ab7134613a9584f491c46abf194158c1524366037f086d250ca8cebb1972e298dd943a4af5919107af2b54863d4400e39bfe
+AUX werken-xpath-0.9.4_beta-jdom-1.0.patch 2325 BLAKE2B f3a7f3b02830cbb3705f501bed9fe135b37e75ca9f07e927b83490e25047c5863e9108a2c630680888b41b2e71ce0e8892f76ffb2c613ca862828cfbd1fbc61f SHA512 29c3d85870d0c49b36823ba633c9a3440a5c61f140c0827aee7b78c3a241a97f3cf5e285d43deed2f85487cb38b9682b4298d1dfd3934c038ca1be90dbb086bc
+AUX werken-xpath-0.9.4_beta-jpp-compile.patch 1189 BLAKE2B ae2c82957a0651084f918a79407418b18191876a7113f9ffe9968ebe24e89eb2fd368571997605e68473836caf21dfbfa96e9d0c3ae78a420cc2585590e06c13 SHA512 e7dbb75305a22463f7a3a975ca21002fb9aa19fcaff8cff07890a74cadcde292023d8e714c801019e1cd42c1f69270f7ae31c547feabfae2d4972dc99d5719a4
+AUX werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 BLAKE2B 619f023176c841c876a7d0e7fd181b686a2d42b815ea3caa7973ed94bfe8ad5cc1264890e5032ef017aaa548b317c28d9e709101a2599ccee5bca9d5b65081e3 SHA512 de979a742d7d8f7fbcc68613ba4697fc4a4dc7d146d86712d71ae09c4e0b6f09c27361bd80743534aa5f2e864def2c5b8a09bd1d6fa2e15a852b74b73ff616c6
+AUX werken-xpath-0.9.4_beta-jpp-tests.patch 353 BLAKE2B 2b941351292a8fadb8b48ad3c3836cf9420db30fcf1a449a9d53aecd7f724ff76d7cbbf80fddd7330adbf3a7d98ac42b6ed3155a4fd266e1f01caed1fcc1163c SHA512 80adb52ad882970be6177cd1f8ea3ece8fbd3388b02b1c1766f3c5c869c42e358be9682fdd4a189225158d75d59b558ac0cfe55d8e9530de383ef86b654c99e4
+DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 BLAKE2B 4dde7f4be8c4cf401d1edb69b96d6ffffd4c3d53c75194db04a7351ee0ffd90d94bc59855d14dd45162cd2f4b29b02b373ecb4f7a00bf267ed58e2c1e7aece33 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d
+EBUILD werken-xpath-0.9.4_beta-r4.ebuild 1355 BLAKE2B 24fbe9aa3e66fe735ce9997a07e7cd0c85001aefd1cd884cf5b30131cb59591024a799953d17b45efcdca4dd7ff5ac1212066a9ab8b2ea61359f707e7de05cda SHA512 9872d9584539c631629f213e60fae1da24d96487dba38cc6e1fa818ef585ec07767b4415f771c4890b76ad98fa06d9274adcf24744a38c06e65857d974358270
+MISC metadata.xml 318 BLAKE2B be2cb60066e3fbccd9201112d37d447b49de3fd37a9c42a287f0b7f7b7466efdbe9c179f0ced41d7af9b0119be17328a234997377dfefb481596355fa1c3838c SHA512 64e77592f9351e55f3775ec892c2d0b6967ddd0f98cac9ae4b75f023cf24be1cc3df514062ccd5d247f8202d33b71965fb09878dee0c07edfc84734cdebe11b3
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch
new file mode 100644
index 000000000000..1cd61fc818ad
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-gentoo.patch
@@ -0,0 +1,35 @@
+diff -ru werken.xpath/build.xml werken.xpath-patched/build.xml
+--- werken.xpath/build.xml	2000-11-19 21:45:16.000000000 -0500
++++ werken.xpath-patched/build.xml	2005-07-14 21:14:01.000000000 -0400
+@@ -49,6 +49,9 @@
+     <!-- JDK1.1 collections -->
+     <property name="coll.import" value="com.sun.java.util.collections"/>
+     <available classname="${coll.import}.Collection" property="coll.present"/>
++	<path id="lib.classpath">
++		<fileset dir="${lib.dir}" includes="**/*.jar"/>
++	</path>
+   </target>
+ 
+   <!-- =================================================================== -->
+@@ -174,7 +177,8 @@
+     <javac srcdir="${build.src}"
+            destdir="${build.dest}"
+            debug="${debug}"
+-           optimize="${optimize}">
++           optimize="${optimize}"
++		   classpathref="lib.classpath">
+     </javac>
+   </target>
+ 
+diff -ru werken.xpath/src/com/werken/xpath/Test.java werken.xpath-patched/src/com/werken/xpath/Test.java
+--- werken.xpath/src/com/werken/xpath/Test.java	2000-10-23 23:45:32.000000000 -0400
++++ werken.xpath-patched/src/com/werken/xpath/Test.java	2005-07-14 21:22:42.000000000 -0400
+@@ -57,7 +57,7 @@
+       System.err.println("Results :: " + results);
+ 
+     }
+-    catch (JDOMException jde)
++    catch (Exception jde)
+     {
+       jde.printStackTrace(System.err);
+     }
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/files/werken-xpath-0.9.4_beta-jpp-compile.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch
new file mode 100644
index 000000000000..516158f63083
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-compile.patch
@@ -0,0 +1,24 @@
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/Op.java werken.xpath/src/com/werken/xpath/impl/Op.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/Op.java	2000-08-27 03:16:03.000000000 +0300
++++ werken.xpath/src/com/werken/xpath/impl/Op.java	2003-03-02 01:44:52.000000000 +0200
+@@ -19,7 +19,7 @@
+   public final static Op GT        = new Op(">");
+   public final static Op LT_EQUAL  = new Op("<=");
+   public final static Op GT_EQUAL  = new Op(">=");
+-  public final static Op MOD       = new Op("%");;
++  public final static Op MOD       = new Op("%");
+   public final static Op DIV       = new Op("/");
+   public final static Op PLUS      = new Op("+");
+   public final static Op MINUS     = new Op("-");
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java	2000-10-31 22:20:56.000000000 +0200
++++ werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java	2003-03-02 01:45:04.000000000 +0200
+@@ -175,7 +175,7 @@
+       }
+     }
+ 
+-    return aggregateResults;;
++    return aggregateResults;
+   }
+ 
+   private List applyPredicates(List nodeSet,
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch
new file mode 100644
index 000000000000..ba2b268f1c89
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-jdom.patch
@@ -0,0 +1,86 @@
+diff -Nru werken.xpath.orig/src/com/werken/xpath/function/StringFunction.java werken.xpath/src/com/werken/xpath/function/StringFunction.java
+--- werken.xpath.orig/src/com/werken/xpath/function/StringFunction.java	2000-10-24 06:30:00.000000000 +0300
++++ werken.xpath/src/com/werken/xpath/function/StringFunction.java	2003-03-02 01:56:03.000000000 +0200
+@@ -71,7 +71,7 @@
+ 
+   public static String evaluate(Element elem)
+   {
+-    List content = elem.getMixedContent();
++    List content = elem.getContent();
+ 
+     Iterator contentIter = content.iterator();
+     Object each = null;
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/NodeTypeStep.java werken.xpath/src/com/werken/xpath/impl/NodeTypeStep.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/NodeTypeStep.java	2000-10-26 04:09:41.000000000 +0300
++++ werken.xpath/src/com/werken/xpath/impl/NodeTypeStep.java	2003-03-02 01:56:03.000000000 +0200
+@@ -84,16 +84,16 @@
+     {
+       if ( isAbsolute() )
+       {
+-        results.addAll(  applyToNodes( ((Element)node).getDocument().getMixedContent() ) );
++        results.addAll(  applyToNodes( ((Element)node).getDocument().getContent() ) );
+       }
+       else
+       {
+-        results.addAll( applyToNodes( ((Element)node).getMixedContent() ) );
++        results.addAll( applyToNodes( ((Element)node).getContent() ) );
+       }
+     }
+     else if ( node instanceof Document )
+     {
+-      results.addAll( applyToNodes( ((Document)node).getMixedContent() ) );
++      results.addAll( applyToNodes( ((Document)node).getContent() ) );
+     }
+ 
+     return results;
+diff -Nru werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java
+--- werken.xpath.orig/src/com/werken/xpath/impl/UnAbbrStep.java	2000-10-31 22:20:56.000000000 +0200
++++ werken.xpath/src/com/werken/xpath/impl/UnAbbrStep.java	2003-03-02 01:56:03.000000000 +0200
+@@ -227,7 +227,7 @@
+ 
+     if ( node instanceof Element )
+     {
+-      List children = ((Element)node).getMixedContent();
++      List children = ((Element)node).getContent();
+       
+       results.addAll( applyTo( children,
+                                support,
+@@ -235,7 +235,7 @@
+     }
+     else if ( node instanceof Document )
+     {
+-      List children = ((Document)node).getMixedContent();
++      List children = ((Document)node).getContent();
+       
+       results.addAll( applyTo( children,
+                                support,
+@@ -256,7 +256,7 @@
+ 
+     if ( node instanceof Element )
+     {
+-      List children = ((Element)node).getMixedContent();
++      List children = ((Element)node).getContent();
+       
+       results.addAll( applyTo( children,
+                                support,
+@@ -264,7 +264,7 @@
+     }
+     else if ( node instanceof Document )
+     {
+-      List children = ((Document)node).getMixedContent();
++      List children = ((Document)node).getContent();
+ 
+       results.addAll( applyTo( children,
+                                support,
+diff -Nru werken.xpath.orig/test/src/com/werken/xpath/test/Driver.java werken.xpath/test/src/com/werken/xpath/test/Driver.java
+--- werken.xpath.orig/test/src/com/werken/xpath/test/Driver.java	2000-11-09 19:43:30.000000000 +0200
++++ werken.xpath/test/src/com/werken/xpath/test/Driver.java	2003-03-02 01:56:55.000000000 +0200
+@@ -412,7 +412,7 @@
+                     elemID = "";
+                 }
+ 
+-                resultNode.addAttribute("id", elemID);
++                resultNode.setAttribute("id", elemID);
+                 node.addContent( resultNode );
+                 results.addContent( node );
+             }
diff --git a/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
new file mode 100644
index 000000000000..d26e6185aff3
--- /dev/null
+++ b/dev-java/werken-xpath/files/werken-xpath-0.9.4_beta-jpp-tests.patch
@@ -0,0 +1,10 @@
+--- runtests.sh~	2000-10-31 23:42:01.000000000 +0200
++++ runtests.sh	2003-03-02 01:59:55.000000000 +0200
+@@ -9,6 +9,6 @@
+ XPATH_CP=./build/werken.xpath.jar
+ TEST_CP=./build/test/classes/
+ 
+-CP=$ANTLR_CP:$JDOM_CP:$XPATH_CP:$TEST_CP:$XERCES_CP
++CP=$ANTLR_CP:$JDOM_CP:$XPATH_CP:$TEST_CP:$XERCES_CP:$CLASSPATH
+ 
+ java -classpath $CP $TEST_DRIVER $TESTS_XML
diff --git a/dev-java/werken-xpath/metadata.xml b/dev-java/werken-xpath/metadata.xml
new file mode 100644
index 000000000000..93f0dea9b7f9
--- /dev/null
+++ b/dev-java/werken-xpath/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">werken-xpath</remote-id>
+	</upstream>
+</pkgmetadata>
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..904444297829
--- /dev/null
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="https://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 x86"
+
+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/*
+}