commit: 836a2c5ac06a69de6e9354b0a969f50c190b4ba5 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Wed Apr 17 19:25:27 2019 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Apr 17 19:28:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836a2c5a
dev-java/xerces: version bump. * Fetch sources from maven.org. * Clear QA warnings. * Switch build process to java-pkg-simple. * Knock together a patch to add missing overrides in required classes. * EAPI 6 bump whilst we're at it. Bug: https://bugs.gentoo.org/683350 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-java/xerces/Manifest | 1 + .../xerces/files/xerces-2.12.0-overrides.patch | 66 ++++++++++++++++++++++ dev-java/xerces/xerces-2.12.0.ebuild | 47 +++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest index 8cf2dfb6b44..4c869cdd241 100644 --- a/dev-java/xerces/Manifest +++ b/dev-java/xerces/Manifest @@ -1 +1,2 @@ DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411 +DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb 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 00000000000..2e31002065e --- /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.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild new file mode 100644 index 00000000000..1e27c4ffd23 --- /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" +}
