gentoo resync : 28.04.2019

6 files changed, 116 insertions, 169 deletions

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 242b0ad063c0..0dea478d7872 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,5 +1,4 @@
-AUX xerces-2.11.0-build.xml.patch 1685 BLAKE2B e7fe7be5efe89a5c6d19ed885e0a6ceb8acdafab6137a320b7733d37768d3ca19d301539c1e750353fb15bc4dd3739f52cd099d92479ac8bdd7a995b1356e53d SHA512 e0b1b195104d65e12a25fb6f6a39e8de5f91b1c258b8cca18fae781802e20fe0cdfe4049968ef7411a2f18aad3ac562f655dbb57b62b5b502ef8ee3a1f3f7db7
-DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
-EBUILD xerces-2.11.0-r1.ebuild 1528 BLAKE2B facae44fa13b7c1fb5faf512969ed4f026d9d236d10d8a51f56f89efaa95e569cdaaf1f2257acfa31cf3e8b31aaad159428394e8166b4ba408030b85c4274258 SHA512 d5b7a351bc08e75185fca0f63298887906642b09e57172e41e7ddad0f001954ff8029c7366416b40a8a71d48d7e2e15324b276c0a2176e7db3eed33c7a158027
-EBUILD xerces-2.11.0.ebuild 1646 BLAKE2B 58ea1cdd93ca0a65fd4dd1d3d8d6f52addf69f70e71bff5c4ae1226d0b9e82468dab3a9b7a9a48e9feb4e90eb84ac53a1934e288d3a37d334497ad9bdf42660e SHA512 63dbfdc7236c78028157c902f510d386b1dfedb66a32bfaed3f9a5d09c227d722b36fbad9391f1cac3881ee0f60a54755752bb6fd9323808ac47e5397fb871d1
+AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
+DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
+EBUILD xerces-2.12.0.ebuild 852 BLAKE2B 7c83c58d2d170c7df692eeca7cc729aadc123a994b8abedc379be3bc85677e90dec14c1a1096349de6136dec597cfc6862dc284156038364164b491a4f421b73 SHA512 dc34eb8b10d1cf1bda87346387abbcc67e26d24a462a386e3fbc56ceb6227f8ec58abaae431ea217bff990865f7f15ba336b5134639d05d4d898905958fe59ee
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
deleted file mode 100644
index 61afcddad9a4..000000000000
--- a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Don't reference non existing jar in taskdef. #351394
-Don't let user properties leak into build env.
-Don't bundle stuff from xml-commons-external.
-
---- a/build.xml
-+++ b/build.xml
-@@ -39,18 +39,13 @@ Authors:
-   <property name="tools.dir" value="./tools"/>

- 

-   <!-- enable compilation under JDK 1.4 and above -->

--  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">

--    <classpath>

--      <pathelement location="${tools.dir}/bin/xjavac.jar"/>

--    </classpath>

--  </taskdef>

-+  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>

- 

-   <!-- Allow properties following these statements to be overridden -->

-   <!-- Note that all of these don't have to exist.  They've just been defined

-        incase they are used. -->

-   <property file="build.properties"/>

-   <property file=".ant.properties"/>

--  <property file="${user.home}/.ant.properties"/>

-   <property file="default.properties"/>  

-  

-   <target name="init">

-@@ -247,7 +242,7 @@ Authors:
-     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"

-       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>

- 

--    <!-- now deal with API's:  -->

-+    <!-- now deal with API's:

-     <unzip src="${src.apis.zip}" dest="${build.src}">

-         <patternset

-             includes="org/xml/sax/** 

-@@ -269,7 +264,7 @@ Authors:
-                 org/w3c/dom/views/**

-                 org/w3c/dom/xpath/**"

-         />

--    </unzip>

-+    </unzip>  -->

-     

-     <!-- substitute tokens as needed -->

-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

diff --git a/dev-java/xerces/files/xerces-2.12.0-overrides.patch b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
new file mode 100644
index 000000000000..2e31002065e3
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
@@ -0,0 +1,66 @@
+--- a/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:08:03.187783332 +0000
++++ b/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:09:38.640274335 +0000
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;

+ 

+ import org.w3c.dom.html.HTMLIFrameElement;

++import org.w3c.dom.Document;

+ 

+ /**

+  * @xerces.internal

+@@ -161,6 +162,11 @@
+         super( owner, name );

+     }

+ 

++    @Override

++    public Document getContentDocument()

++    {

++        return null;

++    }

+ 

+ }

+ 

+--- a/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:06.833172177 +0000
++++ b/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:56.755428976 +0000
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;

+ 

+ import org.w3c.dom.html.HTMLFrameElement;

++import org.w3c.dom.Document;

+ 

+ /**

+  * @xerces.internal

+@@ -138,6 +139,11 @@
+         super( owner, name );

+     }

+   

++    @Override

++    public Document getContentDocument()

++    {

++        return null;

++    }

+ 

+ }

+ 

+--- a/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:17:26.624199895 +0000
++++ b/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:19:23.691802087 +0000
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;

+ 

+ import org.w3c.dom.html.HTMLObjectElement;

++import org.w3c.dom.Document;

+ 

+ /**

+  * @xerces.internal

+@@ -251,6 +252,11 @@
+         super( owner, name );

+     }

+ 

++    @Override

++    public Document getContentDocument()

++    {

++        return null;

++    }

+ 

+ }

+ 

diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild b/dev-java/xerces/xerces-2.11.0-r1.ebuild
deleted file mode 100644
index 5a696217d556..000000000000
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 java-ant-2
-
-DIST_PN="Xerces-J"
-SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/xml-commons-external:1.4
-	>=dev-java/xml-commons-resolver-1.2:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	>=dev-java/xjavac-20110814:1"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
-EANT_DOC_TARGET="javadocs"
-# known small bug - javadocs use custom taglets, which come as bundled jar in
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
-EANT_EXTRA_ARGS="-Dadditional.param="
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc README NOTICE
-	dohtml Readme.html
-
-	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
deleted file mode 100644
index ec1b7dadb09a..000000000000
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 java-ant-2
-
-DIST_PN="Xerces-J"
-SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-COMMON_DEP="
-	dev-java/xml-commons-external:1.4
-	>=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	>=dev-java/xjavac-20110814:1"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
-EANT_DOC_TARGET="javadocs"
-# known small bug - javadocs use custom taglets, which come as bundled jar in
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
-EANT_EXTRA_ARGS="-Dadditional.param="
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc README NOTICE
-	dohtml Readme.html
-
-	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild
new file mode 100644
index 000000000000..220873851392
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xercesImpl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xml.apache.org/xerces2-j/index.html"
+SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+
+CDEPEND="
+	dev-java/xjavac:1
+	dev-java/xml-commons-resolver:0
+	dev-java/xml-commons-external:1.4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="org"
+
+JAVA_GENTOO_CLASSPATH="
+	xjavac-1
+	xml-commons-resolver
+	xml-commons-external-1.4"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${P}-overrides.patch"
+}