[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-02-19 Thread Miroslav Šulc
commit: 5d1786ac4296958c4107ec70dfddd807dc689b8e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Feb 17 22:52:12 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Feb 19 09:07:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1786ac

dev-java/xerces: drop 2.12.2-r1

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r1.ebuild | 68 -
 1 file changed, 68 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild 
b/dev-java/xerces/xerces-2.12.2-r1.ebuild
deleted file mode 100644
index c74ab4cdedaa..
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.2"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html;
-SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
-   verify-sig? ( 
https://downloads.apache.org/xerces/j/source/Xerces-J-src.${PV}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-   dev-java/xml-commons-external:1.4
-   dev-java/xml-commons-resolver:0"
-
-# JDK 11+ already privides the following file and the compilation
-# fails if xerces provides it too. On contrary, compilation on 1.8
-# fails if we don't provide the file because it's not part of 1.8.
-# By restricting compilation to 1.8 and providing the file we build
-# a jar that should work both on 1.8 and also on the newer versions
-# of JDK.
-# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
-DEPEND="
-   ${CP_DEPEND}
-   virtual/jdk:1.8"
-
-RDEPEND="
-   ${CP_DEPEND}
-   >=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xerces-j )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xerces-j.apache.org.asc"
-
-DOCS=( LICENSE NOTICE README 
{LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt )
-HTML_DOCS=( 
{LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html )
-
-S="${WORKDIR}/${P//./_}"
-
-JAVA_SRC_DIR="src"
-JAVA_RESOURCE_DIRS="resources"
-
-src_prepare() {
-   java-pkg-2_src_prepare
-   # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
-   mkdir -p "resources/META-INF/services"|| die
-   pushd "src" > /dev/null || die
-   find -type f \
-   \( -name 'javax.xml.*Factory' \
-   -or -name '*DOMImplementationSourceList' \
-   -or -name 'org.xml.sax.driver' \) \
-   | xargs mv -t ../resources/META-INF/services || die
-   find -type f \
-   ! -name '*.java' \
-   ! -name 'manifest.xerces' \
-   ! -name 'package.html' \
-   ! -name '*Configuration' \
-   ! -name '*DOMImplementationSourceImpl' \
-   | xargs cp --parent -t ../resources || die
-   popd > /dev/null || die
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-02-17 Thread Sam James
commit: 1c6798101e667f974c3252b30776e56ffe1d3e6e
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 17 21:15:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 17 21:15:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c679810

dev-java/xerces: Stabilize 2.12.2-r2 ppc64, #924728

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild 
b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index f433398e373e..6aed07e1a9e0 100644
--- a/dev-java/xerces/xerces-2.12.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-02-16 Thread Sam James
commit: c22f9ccac8609aa4e08bbc903cae667402a500ef
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 16 21:28:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 16 21:28:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22f9cca

dev-java/xerces: Stabilize 2.12.2-r2 arm64, #924728

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild 
b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index ad366fa66c47..f433398e373e 100644
--- a/dev-java/xerces/xerces-2.12.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-02-16 Thread Sam James
commit: 1f935d6f0eea5d737e54c867b953ccfc32e78eb5
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 16 19:22:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 16 19:22:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f935d6f

dev-java/xerces: Stabilize 2.12.2-r2 amd64, #924728

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild 
b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index 0d07186232bd..ad366fa66c47 100644
--- a/dev-java/xerces/xerces-2.12.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-02-16 Thread Sam James
commit: 136ec3fea7b79c3915a7b99d6e8607dbae6a524c
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 16 19:22:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 16 19:22:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136ec3fe

dev-java/xerces: Stabilize 2.12.2-r2 x86, #924728

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild 
b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index f065497b997e..0d07186232bd 100644
--- a/dev-java/xerces/xerces-2.12.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-01-18 Thread Miroslav Šulc
commit: fa9bf95a553dfc3bb9d80da139855f567377a881
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Jan 18 09:24:21 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jan 18 10:29:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9bf95a

dev-java/xerces: set JAVADOC_ARGS="-source 8"

Closes: https://bugs.gentoo.org/922332
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34878
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild 
b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index 4a694d86e922..f065497b997e 100644
--- a/dev-java/xerces/xerces-2.12.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -37,6 +37,7 @@ HTML_DOCS=( 
{LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.
 
 S="${WORKDIR}/${P//./_}"
 
+JAVADOC_ARGS="-source 8" #922332
 JAVA_SRC_DIR="src"
 JAVA_RESOURCE_DIRS="resources"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-01-17 Thread Miroslav Šulc
commit: b70d3e827752ad24b82115d826a45f486e47846c
Author: neeshy  tfwno  gf>
AuthorDate: Sat Jul 22 17:37:38 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 17 09:30:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70d3e82

dev-java/xerces: build against java >=8

Signed-off-by: Nima Sadeghi  tfwno.gf>
Closes: https://github.com/gentoo/gentoo/pull/34853
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r2.ebuild | 68 +
 1 file changed, 68 insertions(+)

diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild 
b/dev-java/xerces/xerces-2.12.2-r2.ebuild
new file mode 100644
index ..aa988db5789b
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.2"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html;
+SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
+   verify-sig? ( 
https://downloads.apache.org/xerces/j/source/Xerces-J-src.${PV}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="
+   dev-java/xml-commons-external:1.4
+   dev-java/xml-commons-resolver:0"
+
+# JDK 11+ already privides the following file and the compilation
+# fails if xerces provides it too. On contrary, compilation on 1.8
+# fails if we don't provide the file because it's not part of 1.8.
+# By restricting compilation to 1.8 and providing the file we build
+# a jar that should work both on 1.8 and also on the newer versions
+# of JDK.
+# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
+DEPEND="
+   ${CP_DEPEND}
+   >=virtual/jdk-1.8:*"
+
+RDEPEND="
+   ${CP_DEPEND}
+   >=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xerces-j )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xerces-j.apache.org.asc"
+
+DOCS=( LICENSE NOTICE README 
{LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt )
+HTML_DOCS=( 
{LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html )
+
+S="${WORKDIR}/${P//./_}"
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+   java-pkg-2_src_prepare
+   # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+   mkdir -p "resources/META-INF/services"|| die
+   pushd "src" > /dev/null || die
+   find -type f \
+   \( -name 'javax.xml.*Factory' \
+   -or -name '*DOMImplementationSourceList' \
+   -or -name 'org.xml.sax.driver' \) \
+   | xargs mv -t ../resources/META-INF/services || die
+   find -type f \
+   ! -name '*.java' \
+   ! -name 'manifest.xerces' \
+   ! -name 'package.html' \
+   ! -name '*Configuration' \
+   ! -name '*DOMImplementationSourceImpl' \
+   | xargs cp --parent -t ../resources || die
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2024-01-17 Thread Miroslav Šulc
commit: ec4267af1ead5e442d41f4337ff1805d2ea56db3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jan 17 09:34:52 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 17 09:35:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4267af

dev-java/xerces: dropped 2.12.2-r2 to unstable & removed obsolete comment

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r2.ebuild | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild 
b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index aa988db5789b..4a694d86e922 100644
--- a/dev-java/xerces/xerces-2.12.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,19 +15,12 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4
dev-java/xml-commons-resolver:0"
 
-# JDK 11+ already privides the following file and the compilation
-# fails if xerces provides it too. On contrary, compilation on 1.8
-# fails if we don't provide the file because it's not part of 1.8.
-# By restricting compilation to 1.8 and providing the file we build
-# a jar that should work both on 1.8 and also on the newer versions
-# of JDK.
-# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
 DEPEND="
${CP_DEPEND}
>=virtual/jdk-1.8:*"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2023-10-28 Thread Miroslav Šulc
commit: 88da036ecb84b739f354147d7d21dce07343de32
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Oct 27 10:51:26 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Oct 28 08:22:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88da036e

dev-java/xerces: drop 2.12.2

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.2.ebuild | 57 
 1 file changed, 57 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.2.ebuild 
b/dev-java/xerces/xerces-2.12.2.ebuild
deleted file mode 100644
index 74142d24ba0b..
--- a/dev-java/xerces/xerces-2.12.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html;
-SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
-   dev-java/xml-commons-external:1.4
-   dev-java/xml-commons-resolver:0"
-
-# JDK 11+ already privides the following file and the compilation
-# fails if xerces provides it too. On contrary, compilation on 1.8
-# fails if we don't provide the file because it's not part of 1.8.
-# By restricting compilation to 1.8 and providing the file we build
-# a jar that should work both on 1.8 and also on the newer versions
-# of JDK.
-# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
-DEPEND="
-   ${CP_DEPEND}
-   virtual/jdk:1.8"
-
-RDEPEND="
-   ${CP_DEPEND}
-   >=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README 
{LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt )
-HTML_DOCS=( 
{LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html )
-
-S="${WORKDIR}/${P//./_}"
-
-JAVA_SRC_DIR="src"
-JAVA_RESOURCE_DIRS="resources"
-
-src_prepare() {
-   default
-   mkdir "${JAVA_RESOURCE_DIRS}" || die
-   cp -r "${JAVA_SRC_DIR}/org" "${JAVA_RESOURCE_DIRS}" || die
-   find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + 
|| die
-   rm 
"${JAVA_RESOURCE_DIRS}"/org/apache/xerces/{dom/org.apache.xerces.dom.DOMImplementationSourceImpl,xs/datatypes/package.html,parsers/org*}
 || die
-}
-
-src_install() {
-   default # https://bugs.gentoo.org/789582
-   java-pkg-simple_src_install
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2023-10-26 Thread Arthur Zamarin
commit: 9955f64e702c08ff0fea3dcff2488c692a558014
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Oct 26 18:23:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Oct 26 18:23:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9955f64e

dev-java/xerces: Stabilize 2.12.2-r1 ppc64, #915876

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild 
b/dev-java/xerces/xerces-2.12.2-r1.ebuild
index 18cd0cf52411..abac899d801f 100644
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2023-10-17 Thread Sam James
commit: d35d425b2bc6349098da6833b1fb313b5fc591df
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 17 07:58:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 17 07:58:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d35d425b

dev-java/xerces: Stabilize 2.12.2-r1 arm64, #915876

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild 
b/dev-java/xerces/xerces-2.12.2-r1.ebuild
index c336947c7467..9069bff1fc85 100644
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2023-10-17 Thread Sam James
commit: 83f82f375ac3813db4c04dea23ac3b20f05dcfdb
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 17 07:57:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 17 07:57:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83f82f37

dev-java/xerces: Stabilize 2.12.2-r1 amd64, #915876

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild 
b/dev-java/xerces/xerces-2.12.2-r1.ebuild
index d21f43579ee1..c336947c7467 100644
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2023-10-17 Thread Sam James
commit: 30f572fa091abdee6574f7b4c704f5cc12cee686
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 17 07:58:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 17 07:58:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f572fa

dev-java/xerces: Stabilize 2.12.2-r1 x86, #915876

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild 
b/dev-java/xerces/xerces-2.12.2-r1.ebuild
index 9069bff1fc85..18cd0cf52411 100644
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2023-09-16 Thread Miroslav Šulc
commit: 13d73e6bdb2863a113a5cbc65cbe3ef4dbc1d27f
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Sep  7 13:46:50 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Sep 16 11:53:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d73e6b

dev-java/xerces: add verify-sig

Also adjusts misplaced resources.

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/32809
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/Manifest|  1 +
 dev-java/xerces/xerces-2.12.2-r1.ebuild | 68 +
 2 files changed, 69 insertions(+)

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index a536128f8645..768ed441fa44 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1 +1,2 @@
 DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B 
f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f
 SHA512 
e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
+DIST Xerces-J-src.2.12.2.tar.gz.asc 849 BLAKE2B 
58faca219413b5b13ded6bedb16acca5ffe53a6890c2ea6ec6f5b2b19b46b179bd74b225e608b936b0d6abad24b947930da24339256137a291e5bc863a11c416
 SHA512 
77cc480b9eff693ab7b5fe4c8a8963cbd53e895dd130bc0ef3fbaebce6d64e59c068806f10bbf650f51a4fb132a49d24c869c8a01e9922bf792bb479602b9846

diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild 
b/dev-java/xerces/xerces-2.12.2-r1.ebuild
new file mode 100644
index ..d21f43579ee1
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.2"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html;
+SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
+   verify-sig? ( 
https://downloads.apache.org/xerces/j/source/Xerces-J-src.${PV}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+   dev-java/xml-commons-external:1.4
+   dev-java/xml-commons-resolver:0"
+
+# JDK 11+ already privides the following file and the compilation
+# fails if xerces provides it too. On contrary, compilation on 1.8
+# fails if we don't provide the file because it's not part of 1.8.
+# By restricting compilation to 1.8 and providing the file we build
+# a jar that should work both on 1.8 and also on the newer versions
+# of JDK.
+# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
+DEPEND="
+   ${CP_DEPEND}
+   virtual/jdk:1.8"
+
+RDEPEND="
+   ${CP_DEPEND}
+   >=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xerces-j )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xerces-j.apache.org.asc"
+
+DOCS=( LICENSE NOTICE README 
{LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt )
+HTML_DOCS=( 
{LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html )
+
+S="${WORKDIR}/${P//./_}"
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+   java-pkg-2_src_prepare
+   # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+   mkdir -p "resources/META-INF/services"|| die
+   pushd "src" > /dev/null || die
+   find -type f \
+   \( -name 'javax.xml.*Factory' \
+   -or -name '*DOMImplementationSourceList' \
+   -or -name 'org.xml.sax.driver' \) \
+   | xargs mv -t ../resources/META-INF/services || die
+   find -type f \
+   ! -name '*.java' \
+   ! -name 'manifest.xerces' \
+   ! -name 'package.html' \
+   ! -name '*Configuration' \
+   ! -name '*DOMImplementationSourceImpl' \
+   | xargs cp --parent -t ../resources || die
+   popd > /dev/null || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/files/

2022-03-10 Thread Florian Schmaus
commit: 8fbd0f4fffd04911511c73940ac2ce98b3a966a9
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Mar  7 07:28:33 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Mar 10 08:11:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fbd0f4f

dev-java/xerces: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24433
Signed-off-by: Florian Schmaus  gentoo.org>

 .../xerces/files/xerces-2.12.0-overrides.patch | 66 --
 1 file changed, 66 deletions(-)

diff --git a/dev-java/xerces/files/xerces-2.12.0-overrides.patch 
b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
deleted file mode 100644
index 2e31002065e3..
--- a/dev-java/xerces/files/xerces-2.12.0-overrides.patch
+++ /dev/null
@@ -1,66 +0,0 @@
 a/org/apache/html/dom/HTMLIFrameElementImpl.java   2019-04-17 
18:08:03.187783332 +
-+++ b/org/apache/html/dom/HTMLIFrameElementImpl.java   2019-04-17 
18:09:38.640274335 +
-@@ -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.java2019-04-17 
19:14:06.833172177 +
-+++ b/org/apache/html/dom/HTMLFrameElementImpl.java2019-04-17 
19:14:56.755428976 +
-@@ -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 +
-+++ b/org/apache/html/dom/HTMLObjectElementImpl.java   2019-04-17 
19:19:23.691802087 +
-@@ -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;
-+}
- 
- }
- 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2022-03-06 Thread Florian Schmaus
commit: 610e8e15e38b5c213227f1dabdcddfdf60e66095
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Mar  6 16:29:41 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Mar  6 17:07:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610e8e15

dev-java/xerces: Drop 2.12.0-r1

Closes: https://bugs.gentoo.org/831155
Bug: https://bugs.gentoo.org/831979
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24424
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/xerces/Manifest|  1 -
 dev-java/xerces/xerces-2.12.0-r1.ebuild | 55 -
 2 files changed, 56 deletions(-)

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 4e618abdbb6b..a536128f8645 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,2 +1 @@
 DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B 
f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f
 SHA512 
e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
-DIST xerces-2.12.0.jar 2113705 BLAKE2B 
4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7
 SHA512 
21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb

diff --git a/dev-java/xerces/xerces-2.12.0-r1.ebuild 
b/dev-java/xerces/xerces-2.12.0-r1.ebuild
deleted file mode 100644
index 60f2bd89f71a..
--- a/dev-java/xerces/xerces-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.0"
-
-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/xml-commons-resolver:0
-   dev-java/xml-commons-external:1.4"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.8:*"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="org"
-JAVA_RESOURCE_DIRS="resources"
-
-JAVA_GENTOO_CLASSPATH="
-   xml-commons-resolver
-   xml-commons-external-1.4"
-
-S="${WORKDIR}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-overrides.patch"
-)
-
-src_prepare() {
-   default
-   mkdir "${JAVA_RESOURCE_DIRS}" || die
-   cp -r "${JAVA_SRC_DIR}" "${JAVA_RESOURCE_DIRS}" || die
-   find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + 
|| die
-   rm 
"${JAVA_RESOURCE_DIRS}"/org/apache/xerces/{dom/org.apache.xerces.dom.DOMImplementationSourceImpl,xs/datatypes/package.html,parsers/org*}
 || die
-
-   java-pkg-2_src_prepare
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2022-03-06 Thread Agostino Sarubbo
commit: 0d95b309869204853f33fa7f7a233f6bd9de2c21
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  6 08:51:56 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  6 08:51:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d95b309

dev-java/xerces: ppc64 stable wrt bug #834614

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/xerces/xerces-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2.ebuild 
b/dev-java/xerces/xerces-2.12.2.ebuild
index 719609daaa4d..1a52c0d15261 100644
--- a/dev-java/xerces/xerces-2.12.2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2022-03-06 Thread Sam James
commit: d7d2e45de1ff0d1cc840639f15d040c52c49fe22
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  6 08:06:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  6 08:06:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d2e45d

dev-java/xerces: Stabilize 2.12.2 arm64, #834614

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2.ebuild 
b/dev-java/xerces/xerces-2.12.2.ebuild
index aa97b423d524..719609daaa4d 100644
--- a/dev-java/xerces/xerces-2.12.2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2022-03-05 Thread Jakov Smolić
commit: b0f2194ced8a2437c65396e0a974fc178e9458fc
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Mar  5 09:23:40 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Mar  5 09:23:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f2194c

dev-java/xerces: Stabilize 2.12.2 x86, #834614

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/xerces/xerces-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2.ebuild 
b/dev-java/xerces/xerces-2.12.2.ebuild
index 00125438e2c5..aa97b423d524 100644
--- a/dev-java/xerces/xerces-2.12.2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2022-03-05 Thread Jakov Smolić
commit: 18c4e00dc3f7cb50cbceda5563eebdfc42c2617a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Mar  5 09:23:36 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Mar  5 09:23:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c4e00d

dev-java/xerces: Stabilize 2.12.2 amd64, #834614

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/xerces/xerces-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.2.ebuild 
b/dev-java/xerces/xerces-2.12.2.ebuild
index 3f22459212e4..00125438e2c5 100644
--- a/dev-java/xerces/xerces-2.12.2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
dev-java/xml-commons-external:1.4



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2022-02-03 Thread Miroslav Šulc
commit: 743111a72f39a1b24f87bd1b2fc32ef707b41407
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Feb  2 17:30:03 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb  3 12:00:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743111a7

dev-java/xerces: Bump to 2.12.2

Closes: https://bugs.gentoo.org/831155
Bug: https://bugs.gentoo.org/831979
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/Manifest |  1 +
 dev-java/xerces/metadata.xml | 11 ---
 dev-java/xerces/xerces-2.12.2.ebuild | 57 
 3 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index e5aebc17815c..aad1076613c2 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,2 +1,3 @@
+DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B 
f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f
 SHA512 
e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 
4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7
 SHA512 
21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
 DIST xerces-2.12.1.jar 2149927 BLAKE2B 
b02c518754bcab1da9200122b398496c273a84c07a60945c0eea5524a230f5f4815b619685fc41bf48a124f9147803b9452d5d0105b57d535c9c666c52196571
 SHA512 
2c4ce274904eda6eb4b0b8800dc8383bc6504e215eb9603c45a25c32335651c8ea4d69539b984c048c1974d2aed3d852fff168eb44e2a9b1087ded578394b849

diff --git a/dev-java/xerces/metadata.xml b/dev-java/xerces/metadata.xml
index 6021501589e0..ad8d1c3e6d98 100644
--- a/dev-java/xerces/metadata.xml
+++ b/dev-java/xerces/metadata.xml
@@ -1,8 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   j...@gentoo.org
-   Java
-
+   
+   j...@gentoo.org
+   Java
+   
+   
+   Xerces2 provides high performance, fully compliant XML parsers 
in the Apache Xerces family. This new version of Xerces continues to build upon 
the Xerces Native Interface (XNI), a complete framework for building parser 
components and configurations that is extremely modular and easy to program. 
The Apache Xerces2 parser is the reference implementation of XNI but other 
parser components, configurations, and parsers can be written using the Xerces 
Native Interface. For complete design and implementation documents, refer to 
the XNI Manual. Xerces2 provides fully conforming XML Schema 1.0 and 1.1 
processors. An experimental implementation of the "XML Schema Definition 
Language (XSD): Component Designators (SCD) Candidate Recommendation (January 
2010)" is also provided for evaluation. For more information, refer to the XML 
Schema page. Xerces2 also provides a complete implementation of the Document 
Object Model Level 3 Core and Load/Save W3C Recommendations and provides a 
complete impl
 ementation of the XML Inclusions (XInclude) W3C Recommendation. It also 
provides support for OASIS XML Catalogs v1.1. Xerces2 is able to parse 
documents written according to the XML 1.1 Recommendation, except that it does 
not yet provide an option to enable normalization checking as described in 
section 2.13 of this specification. It also handles namespaces according to the 
XML Namespaces 1.1 Recommendation, and will correctly serialize XML 1.1 
documents if the DOM level 3 load/save APIs are in use.
+   
 

diff --git a/dev-java/xerces/xerces-2.12.2.ebuild 
b/dev-java/xerces/xerces-2.12.2.ebuild
new file mode 100644
index ..3f22459212e4
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html;
+SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+   dev-java/xml-commons-external:1.4
+   dev-java/xml-commons-resolver:0"
+
+# JDK 11+ already privides the following file and the compilation
+# fails if xerces provides it too. On contrary, compilation on 1.8
+# fails if we don't provide the file because it's not part of 1.8.
+# By restricting compilation to 1.8 and providing the file we build
+# a jar that should work both on 1.8 and also on the newer versions
+# of JDK.
+# the file: 

[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2022-02-03 Thread Miroslav Šulc
commit: 80c00b937ad6968617149b560678177c3eaef33b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Feb  2 17:36:53 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb  3 12:00:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c00b93

dev-java/xerces: Drop 2.12.1

Closes: https://bugs.gentoo.org/783417
Closes: https://bugs.gentoo.org/782697
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/Manifest |  1 -
 dev-java/xerces/xerces-2.12.1.ebuild | 42 
 2 files changed, 43 deletions(-)

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index aad1076613c2..4e618abdbb6b 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,3 +1,2 @@
 DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B 
f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f
 SHA512 
e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 
4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7
 SHA512 
21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
-DIST xerces-2.12.1.jar 2149927 BLAKE2B 
b02c518754bcab1da9200122b398496c273a84c07a60945c0eea5524a230f5f4815b619685fc41bf48a124f9147803b9452d5d0105b57d535c9c666c52196571
 SHA512 
2c4ce274904eda6eb4b0b8800dc8383bc6504e215eb9603c45a25c32335651c8ea4d69539b984c048c1974d2aed3d852fff168eb44e2a9b1087ded578394b849

diff --git a/dev-java/xerces/xerces-2.12.1.ebuild 
b/dev-java/xerces/xerces-2.12.1.ebuild
deleted file mode 100644
index 0d5e000fae02..
--- a/dev-java/xerces/xerces-2.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="xercesImpl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xerces.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/xml-commons-resolver:0"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-11:*"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-11:*"
-
-JAVA_SRC_DIR="org"
-
-JAVA_GENTOO_CLASSPATH="xml-commons-resolver"
-
-S="${WORKDIR}"
-
-src_prepare() {
-   default
-
-   rm -rv "org/w3c" || die
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-07-09 Thread Miroslav Šulc
commit: 2ecd3c8e3c41138a24c6870c279acbb5bb1bb8da
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Jul  8 19:19:22 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul  9 13:51:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecd3c8e

dev-java/xerces: fix missing properties

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/21319/commits/21ebfc28c0de4a6a4709582d3ecb6a48680c2e11
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.0-r1.ebuild | 57 +
 1 file changed, 57 insertions(+)

diff --git a/dev-java/xerces/xerces-2.12.0-r1.ebuild 
b/dev-java/xerces/xerces-2.12.0-r1.ebuild
new file mode 100644
index 000..d91487c5f49
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.0"
+
+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_RESOURCE_DIRS="resources"
+
+JAVA_GENTOO_CLASSPATH="
+   xjavac-1
+   xml-commons-resolver
+   xml-commons-external-1.4"
+
+S="${WORKDIR}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-overrides.patch"
+)
+
+src_prepare() {
+   default
+   mkdir "${JAVA_RESOURCE_DIRS}" || die
+   cp -r "${JAVA_SRC_DIR}" "${JAVA_RESOURCE_DIRS}" || die
+   find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + 
|| die
+   rm 
"${JAVA_RESOURCE_DIRS}"/org/apache/xerces/{dom/org.apache.xerces.dom.DOMImplementationSourceImpl,xs/datatypes/package.html,parsers/org*}
 || die
+
+   java-pkg-2_src_prepare
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-07-09 Thread Miroslav Šulc
commit: 68d3d603523b0fc1ee900a6b1e0d1dcaa64dd9e5
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jul  9 13:49:59 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul  9 13:51:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d3d603

dev-java/xerces: eapi7, min java 1.8, dropped unused dep in 2.12.0-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.0-r1.ebuild | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.0-r1.ebuild 
b/dev-java/xerces/xerces-2.12.0-r1.ebuild
index d91487c5f49..60f2bd89f71 100644
--- a/dev-java/xerces/xerces-2.12.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="xerces:xercesImpl:2.12.0"
@@ -17,26 +17,24 @@ 
SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.ja
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+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"
+   >=virtual/jre-1.8:*"
 
 DEPEND="
${CDEPEND}
-   >=virtual/jdk-1.6"
+   >=virtual/jdk-1.8:*"
 
 JAVA_SRC_DIR="org"
 JAVA_RESOURCE_DIRS="resources"
 
 JAVA_GENTOO_CLASSPATH="
-   xjavac-1
xml-commons-resolver
xml-commons-external-1.4"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-07-09 Thread Miroslav Šulc
commit: 75286bb352304907f2846f4d97388fcc5982e48e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jul  9 13:50:54 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul  9 13:51:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75286bb3

dev-java/xerces: removed obsolete and broken 2.12.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.0.ebuild | 52 
 1 file changed, 52 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.0.ebuild 
b/dev-java/xerces/xerces-2.12.0.ebuild
deleted file mode 100644
index 638b1ea00e7..000
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.0"
-
-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}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-overrides.patch"
-)
-
-src_prepare() {
-   default
-
-   java-pkg-2_src_prepare
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-21 Thread Sam James
commit: 409f0a29abe8d343260037281297460d21740505
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 09:44:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 18:50:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=409f0a29

dev-java/xerces: drop epatch

Signed-off-by: Sam James  gentoo.org>

 dev-java/xerces/xerces-2.12.0.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.0.ebuild 
b/dev-java/xerces/xerces-2.12.0.ebuild
index f6999004625..638b1ea00e7 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -41,8 +41,12 @@ JAVA_GENTOO_CLASSPATH="
 
 S="${WORKDIR}"
 
+PATCHES=(
+   "${FILESDIR}/${P}-overrides.patch"
+)
+
 src_prepare() {
default
 
-   epatch "${FILESDIR}/${P}-overrides.patch"
+   java-pkg-2_src_prepare
 }



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-18 Thread Miroslav Šulc
commit: 308d76043b56e9b03b3fa088e2c53a141b36af02
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Apr 18 05:44:07 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Apr 18 08:11:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308d7604

dev-java/xerces: min java 11

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20434
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.1.ebuild 
b/dev-java/xerces/xerces-2.12.1.ebuild
index 75f4ab17163..0d5e000fae0 100644
--- a/dev-java/xerces/xerces-2.12.1.ebuild
+++ b/dev-java/xerces/xerces-2.12.1.ebuild
@@ -12,7 +12,7 @@ MY_PN="xercesImpl"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Xerces Java XML parser"
-HOMEPAGE="https://xml.apache.org/xerces2-j/index.html;
+HOMEPAGE="https://xerces.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"
@@ -23,11 +23,11 @@ CDEPEND="dev-java/xml-commons-resolver:0"
 
 RDEPEND="
${CDEPEND}
-   >=virtual/jre-1.8:*"
+   >=virtual/jre-11:*"
 
 DEPEND="
${CDEPEND}
-   >=virtual/jdk-1.8:*"
+   >=virtual/jdk-11:*"
 
 JAVA_SRC_DIR="org"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-13 Thread Miroslav Šulc
commit: c0de3b2d89d146879647ec78d5016eacc4a62625
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Apr 13 18:42:23 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 13 18:42:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0de3b2d

dev-java/xerces: fixed MAVEN_ID in 2.12.1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.1.ebuild 
b/dev-java/xerces/xerces-2.12.1.ebuild
index 3a5a6d3972f..75f4ab17163 100644
--- a/dev-java/xerces/xerces-2.12.1.ebuild
+++ b/dev-java/xerces/xerces-2.12.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.0"
+MAVEN_ID="xerces:xercesImpl:2.12.1"
 
 inherit java-pkg-2 java-pkg-simple
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-13 Thread Miroslav Šulc
commit: 7b6a5548532ede4310edcb7fe6a34dcd032f58be
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Apr 13 12:51:00 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 13 13:16:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6a5548

dev-java/xerces: bump to 2.12.1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/Manifest |  1 +
 dev-java/xerces/xerces-2.12.1.ebuild | 42 
 2 files changed, 43 insertions(+)

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index ecb391145d4..e5aebc17815 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1 +1,2 @@
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 
4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7
 SHA512 
21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
+DIST xerces-2.12.1.jar 2149927 BLAKE2B 
b02c518754bcab1da9200122b398496c273a84c07a60945c0eea5524a230f5f4815b619685fc41bf48a124f9147803b9452d5d0105b57d535c9c666c52196571
 SHA512 
2c4ce274904eda6eb4b0b8800dc8383bc6504e215eb9603c45a25c32335651c8ea4d69539b984c048c1974d2aed3d852fff168eb44e2a9b1087ded578394b849

diff --git a/dev-java/xerces/xerces-2.12.1.ebuild 
b/dev-java/xerces/xerces-2.12.1.ebuild
new file mode 100644
index 000..3a5a6d3972f
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.0"
+
+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/xml-commons-resolver:0"
+
+RDEPEND="
+   ${CDEPEND}
+   >=virtual/jre-1.8:*"
+
+DEPEND="
+   ${CDEPEND}
+   >=virtual/jdk-1.8:*"
+
+JAVA_SRC_DIR="org"
+
+JAVA_GENTOO_CLASSPATH="xml-commons-resolver"
+
+S="${WORKDIR}"
+
+src_prepare() {
+   default
+
+   rm -rv "org/w3c" || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-13 Thread Miroslav Šulc
commit: 164ec483382d128778316c2e185f2481b95b544b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Apr 13 12:54:01 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 13 13:16:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164ec483

dev-java/xerces: remove obsolete

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20364
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.0-r1.ebuild | 43 -
 1 file changed, 43 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.0-r1.ebuild 
b/dev-java/xerces/xerces-2.12.0-r1.ebuild
deleted file mode 100644
index 398636f173d..000
--- a/dev-java/xerces/xerces-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xerces:xercesImpl:2.12.0"
-
-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/xml-commons-resolver:0"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.8:*"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="org"
-
-JAVA_GENTOO_CLASSPATH="xml-commons-resolver"
-
-S="${WORKDIR}"
-
-src_prepare() {
-   default
-
-   eapply "${FILESDIR}/${P}-overrides.patch"
-   rm -rv "org/w3c" || die
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-13 Thread Miroslav Šulc
commit: 7c4d97cd1a4d34ab28baad3f9d10c3e6a67b0f21
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Apr 13 12:19:45 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 13 12:20:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c4d97cd

dev-java/xerces: removed unneeded dep from 2.12.0-r1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.0-r1.ebuild | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-java/xerces/xerces-2.12.0-r1.ebuild 
b/dev-java/xerces/xerces-2.12.0-r1.ebuild
index 03dafc950f4..398636f173d 100644
--- a/dev-java/xerces/xerces-2.12.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.0-r1.ebuild
@@ -19,9 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-CDEPEND="
-   dev-java/xjavac:1
-   dev-java/xml-commons-resolver:0"
+CDEPEND="dev-java/xml-commons-resolver:0"
 
 RDEPEND="
${CDEPEND}
@@ -33,9 +31,7 @@ DEPEND="
 
 JAVA_SRC_DIR="org"
 
-JAVA_GENTOO_CLASSPATH="
-   xjavac-1
-   xml-commons-resolver"
+JAVA_GENTOO_CLASSPATH="xml-commons-resolver"
 
 S="${WORKDIR}"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-13 Thread Miroslav Šulc
commit: c64513b0e06a47bfc44af38a5937b37d201fb71e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Apr 13 10:58:03 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 13 12:20:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64513b0

dev-java/xerces: EAPI 7

Also drop dev-java/xml-commons-external

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20363
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.0-r1.ebuild | 47 +
 1 file changed, 47 insertions(+)

diff --git a/dev-java/xerces/xerces-2.12.0-r1.ebuild 
b/dev-java/xerces/xerces-2.12.0-r1.ebuild
new file mode 100644
index 000..03dafc950f4
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.0"
+
+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"
+
+RDEPEND="
+   ${CDEPEND}
+   >=virtual/jre-1.8:*"
+
+DEPEND="
+   ${CDEPEND}
+   >=virtual/jdk-1.8:*"
+
+JAVA_SRC_DIR="org"
+
+JAVA_GENTOO_CLASSPATH="
+   xjavac-1
+   xml-commons-resolver"
+
+S="${WORKDIR}"
+
+src_prepare() {
+   default
+
+   eapply "${FILESDIR}/${P}-overrides.patch"
+   rm -rv "org/w3c" || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2021-04-13 Thread Miroslav Šulc
commit: e5820e23ed179688d45608e96516fadc9872f976
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Apr 10 10:38:35 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 13 09:23:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5820e23

dev-java/xerces: MAVEN_ID

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/20353/commits/4c3b38f07a250884414feef60939903dcb2e9df4
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/xerces/xerces-2.12.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.0.ebuild 
b/dev-java/xerces/xerces-2.12.0.ebuild
index 92df4f503cd..f6999004625 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.0"
 
 inherit java-pkg-2 java-pkg-simple
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2019-05-17 Thread Aaron Bauman
commit: 94a0683cb70374cd1a66811f40a0e423628f3ce1
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat May 18 01:07:23 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat May 18 01:07:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a0683c

dev-java/xerces: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 dev-java/xerces/xerces-2.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.0.ebuild 
b/dev-java/xerces/xerces-2.12.0.ebuild
index 22087385139..92df4f503cd 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.ja
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="
dev-java/xjavac:1



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2019-04-26 Thread Georgy Yakovlev
commit: 020f7423d810f8e55ae6daae0e23a72ed7065c86
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Apr 26 08:20:17 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Apr 26 16:38:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020f7423

dev-java/xerces: stabilise for amd64.

... and the remaining arches using the ALLARCHES policy.

Closes: https://bugs.gentoo.org/683350
Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-java/xerces/xerces-2.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.12.0.ebuild 
b/dev-java/xerces/xerces-2.12.0.ebuild
index 1e27c4ffd23..22087385139 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.ja
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CDEPEND="
dev-java/xjavac:1



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/

2019-04-26 Thread Georgy Yakovlev
commit: 114672fc1bf0174a8ee16360e8de6b5a090c87de
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Apr 26 16:34:28 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Apr 26 16:38:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114672fc

dev-java/xerces: clean up old

Closes: https://github.com/gentoo/gentoo/pull/11829
Bug: https://bugs.gentoo.org/683350
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Patrice Clement  gentoo.org>
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-java/xerces/Manifest   |  1 -
 .../xerces/files/xerces-2.11.0-build.xml.patch | 46 
 dev-java/xerces/xerces-2.11.0-r2.ebuild| 61 --
 3 files changed, 108 deletions(-)

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 4c869cdd241..ecb391145d4 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,2 +1 @@
-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.11.0-build.xml.patch 
b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
deleted file mode 100644
index 61afcddad9a..000
--- a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Author: Ralph Sennhauser 
-
-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:
-   
- 
-   
--  
--
--  
--
--  
-+  
- 
-   
-   
-   
-   
--  
- 
-  
-   
-@@ -247,7 +242,7 @@ Authors:
- 
- 
--
-+
- 
- 
- 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: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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/

2019-04-17 Thread Patrice Clement
commit: 836a2c5ac06a69de6e9354b0a969f50c190b4ba5
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Apr 17 19:25:27 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Apr 17 19:28:27 2019 +
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  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 000..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 +
 b/org/apache/html/dom/HTMLIFrameElementImpl.java   2019-04-17 
18:09:38.640274335 +
+@@ -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.java2019-04-17 
19:14:06.833172177 +
 b/org/apache/html/dom/HTMLFrameElementImpl.java2019-04-17 
19:14:56.755428976 +
+@@ -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 +
 b/org/apache/html/dom/HTMLObjectElementImpl.java   2019-04-17 
19:19:23.691802087 +
+@@ -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 000..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"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2019-04-14 Thread Patrice Clement
commit: 3e252a10a89b63357680f0afb2afe5afaac2d2fe
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Apr 14 19:26:27 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Apr 14 19:27:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e252a10

dev-java/xerces: update xjavac dependency.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --force

 dev-java/xerces/xerces-2.11.0-r2.ebuild | 61 +
 1 file changed, 61 insertions(+)

diff --git a/dev-java/xerces/xerces-2.11.0-r2.ebuild 
b/dev-java/xerces/xerces-2.11.0-r2.ebuild
new file mode 100644
index 000..b714513a784
--- /dev/null
+++ b/dev-java/xerces/xerces-2.11.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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: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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2019-04-14 Thread Patrice Clement
commit: 6e5bb54146b853e1f1b563321d6d7354ee11977e
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Apr 14 19:27:04 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Apr 14 19:27:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5bb541

dev-java/xerces: stable for amd64.

... the remaining arches using the ALLARCHES policy.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --force

 dev-java/xerces/xerces-2.11.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.11.0-r2.ebuild 
b/dev-java/xerces/xerces-2.11.0-r2.ebuild
index b714513a784..e0289d295c8 100644
--- a/dev-java/xerces/xerces-2.11.0-r2.ebuild
+++ b/dev-java/xerces/xerces-2.11.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE=""
 
 # they are missing from the upstream tarball"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2019-04-14 Thread Patrice Clement
commit: 9642ce67beffb708464f3eceac11847133226f4a
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Apr 14 19:27:23 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Apr 14 19:27:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9642ce67

dev-java/xerces: clean up old.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-java/xerces/xerces-2.11.0-r1.ebuild | 61 -
 dev-java/xerces/xerces-2.11.0.ebuild| 58 ---
 2 files changed, 119 deletions(-)

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 5a696217d55..000
--- 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 ec1b7dadb09..000
--- 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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2018-03-01 Thread Michał Górny
commit: 37651bd9e0d0c0ef2a27fb14c9d74ebeca5dd8ac
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Mar  1 08:43:49 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar  1 08:46:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37651bd9

dev-java/xerces: Dekeyword *-fbsd

 dev-java/xerces/xerces-2.11.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/xerces/xerces-2.11.0.ebuild 
b/dev-java/xerces/xerces-2.11.0.ebuild
index 005197c35e0..ec1b7dadb09 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2017-07-13 Thread Alexis Ballier
commit: 60a3bdda764940c3b0bb5c82cd7147364dda2730
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jul 13 17:24:07 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jul 13 17:27:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a3bdda

dev-java/xerces: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/xerces/xerces-2.11.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild 
b/dev-java/xerces/xerces-2.11.0-r1.ebuild
index ba148040517..5a696217d55 100644
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.11.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 # they are missing from the upstream tarball"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2017-04-08 Thread Patrice Clement
commit: a4b49c0af36ed813563ef9b41ec80277ae4f569d
Author: Harri Nieminen  gmail  com>
AuthorDate: Tue Apr  4 13:22:27 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Apr  8 21:52:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b49c0a

dev-java/xerces: fix toolong DESCRIPTION.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-java/xerces/xerces-2.11.0-r1.ebuild | 4 ++--
 dev-java/xerces/xerces-2.11.0.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild 
b/dev-java/xerces/xerces-2.11.0-r1.ebuild
index 54739f5f82e..ba148040517 100644
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ 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 in the Apache Xerces family"
+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"
 

diff --git a/dev-java/xerces/xerces-2.11.0.ebuild 
b/dev-java/xerces/xerces-2.11.0.ebuild
index d0881708a70..005197c35e0 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -9,7 +9,7 @@ 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 in the Apache Xerces family"
+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"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2017-01-29 Thread Fabian Groffen
commit: 73c386c919e1569059f99ea61d47b9e9b4cd97e1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 29 15:51:15 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 29 15:51:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c386c9

dev-java/xerces: dropped ~x64-freebsd ~x86-freebsd

Package-Manager: portage-2.3.3

 dev-java/xerces/xerces-2.11.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/xerces/xerces-2.11.0.ebuild 
b/dev-java/xerces/xerces-2.11.0.ebuild
index 6306656..7ab611b 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ 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-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/

2015-12-02 Thread Patrice Clement
commit: 14834cb8733b545f2cf564ea09b0ae3a6d4fd413
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Dec  2 16:25:34 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Dec  2 16:25:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14834cb8

dev-java/xerces: EAPI 5 version bump.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/xerces/xerces-2.11.0-r1.ebuild | 62 +
 1 file changed, 62 insertions(+)

diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild 
b/dev-java/xerces/xerces-2.11.0-r1.ebuild
new file mode 100644
index 000..935e6dd
--- /dev/null
+++ b/dev-java/xerces/xerces-2.11.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 in the Apache Xerces family"
+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 ~ppc ~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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/

2015-12-02 Thread Patrice Clement
commit: 95e1895408b48bda1b14d45072d89523dd4388d3
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Dec  2 16:19:49 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Dec  2 16:19:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e18954

dev-java/xerces: Remove vulnerable version. Fixes security bug 519502.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/xerces/Manifest |  1 -
 dev-java/xerces/files/xerces-1.3.1-build.xml | 64 
 dev-java/xerces/files/xerces-2.3.0-gentoo.patch  | 61 --
 dev-java/xerces/files/xerces-2.9.0-gentoo.patch  | 21 
 dev-java/xerces/files/xerces-2.9.0-no_dom3.patch | 20 
 dev-java/xerces/files/xerces-2.9.1-gentoo.patch  | 21 
 dev-java/xerces/files/xerces-2.9.1-no_dom3.patch | 20 
 dev-java/xerces/xerces-1.3.1-r2.ebuild   | 39 ---
 8 files changed, 247 deletions(-)

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index ac71250..9bc9f72 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,2 +1 @@
-DIST Xerces-J-src.1.3.1.tar.gz 900263 SHA256 
d59f57ef4ec540f75b4b79aeef20e85ccb4f2c3b516dc995f1fc88f526f5f1e1 SHA512 
2a7990a63d0ff3c491af4e5d7480583378dbcd8ce6042d4be6e87e53aa1012f2f0e709e7e0cde1ec9b930822a1e386550a899a1ef29a01267806dbfe595a9d64
 WHIRLPOOL 
ecc7abc65c6b22e8e749e5f2ccc5b45d3b99d0439f2a020cfda2c4db5958ce66df743a978df475ee855f07129c8ef801d2c8cd97635738c1df404873d4287e9a
 DIST Xerces-J-src.2.11.0.tar.gz 1792762 SHA256 
f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680 SHA512 
de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
 WHIRLPOOL 
891a1a04dd781c3dd4c01f295679b069dca9ae7126b3a4e3ab0e9da8ae6bd00e62e97b606acb233d3cd7b0da21012a6aa4f8339b42d26e251440d01057d24973

diff --git a/dev-java/xerces/files/xerces-1.3.1-build.xml 
b/dev-java/xerces/files/xerces-1.3.1-build.xml
deleted file mode 100644
index d688a62..000
--- a/dev-java/xerces/files/xerces-1.3.1-build.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-  
-
-   
-   
-   
-   
-
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-
-   
-
-
-
-
-

diff --git a/dev-java/xerces/files/xerces-2.3.0-gentoo.patch 
b/dev-java/xerces/files/xerces-2.3.0-gentoo.patch
deleted file mode 100644
index 08f95ed..000
--- a/dev-java/xerces/files/xerces-2.3.0-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -urpN xerces-2_3_0.orig/build.sh xerces-2_3_0/build.sh
 xerces-2_3_0.orig/build.sh 2005-01-15 15:14:51.682424232 +0100
-+++ xerces-2_3_0/build.sh  2005-01-15 16:22:11.299309120 +0100
-@@ -19,7 +19,7 @@ uname | grep WIN && CLPATHSEP=\;
- 
- # Keep this classpath to the minimum required to run ant
- # Application dependent classpaths are specified in build.xml 
--LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar"
-+LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/ant-launcher.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar"
- ANT_HOME=./tools
- 
- echo Building with classpath \"$LOCALCLASSPATH\"
-diff -urpN xerces-2_3_0.orig/build.xml xerces-2_3_0/build.xml
 xerces-2_3_0.orig/build.xml2005-01-15 15:14:51.682424232 +0100
-+++ xerces-2_3_0/build.xml 2005-01-15 16:38:48.751673312 +0100
-@@ -173,7 +173,6 @@ Copyright:
- 
- 
--
- 
- 
- 
- 
--
--
-+
-+
- 
- 
-@@ -221,16 +220,7 @@ Copyright:
-debug="${debug}"
-deprecation="${deprecation}"
-optimize="${optimize}"
--   includeAntRuntime="false"
--   includeJavaRuntime="false"
--   excludes="org/xml/sax/** 
--javax/xml/parsers/**
--org/w3c/dom/*
--org/w3c/dom/events/**
--org/w3c/dom/html/**
--org/w3c/dom/ranges/**
--org/w3c/dom/traversal/**"
--   />
-+ classpath="tools/xml-apis.jar" />
-   
- 
-   

diff --git a/dev-java/xerces/files/xerces-2.9.0-gentoo.patch