* [gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/
@ 2015-12-02 16:20 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2015-12-02 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 95e1895408b48bda1b14d45072d89523dd4388d3
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 2 16:19:49 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Dec 2 16:19:49 2015 +0000
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 <monsieurp <AT> 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..0000000
--- a/dev-java/xerces/files/xerces-1.3.1-build.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="xerces" default="jar">
- <!-- some properties -->
- <property name="src.dir" value="src" />
- <property name="build.dir" value="build" />
- <property name="docs.dir" value="docs" />
- <property name="dist.dir" value="dist" />
- <property name="jarfile" value="${dist.dir}/xerces.jar" />
- <property name="target.jdk" value="1.3" />
-
- <!-- init -->
- <target name="init">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${build.dir}" />
- <mkdir dir="${docs.dir}" />
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- source="${target.jdk}"
- target="${target.jdk}" />
-
- <copy todir="${build.dir}">
- <fileset dir="${src.dir}">
- <exclude name="**/*.java" />
- </fileset>
- </copy>
- </target>
-
- <!-- build the jar file -->
- <target name="jar" depends="compile">
- <jar jarfile="${jarfile}" basedir="${build.dir}" />
- </target>
-
- <!-- generate javadocs -->
- <target name="docs" depends="init">
- <javadoc sourcepath="${src.dir}"
- packagenames="org.* , javax.*"
- destdir="${docs.dir}"
- author="true"
- version="true"
- use="true"
- windowtitle="${ant.project.name} API" />
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${docs.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <!-- zip the sources -->
- <target name="sourcezip">
- <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
- <zipfileset dir="${src.dir}" />
- </zip>
- </target>
-
-</project>
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..0000000
--- 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.xml 2005-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:
- <copy file="${src.dir}/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration"
- tofile="${build.dest}/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration"/>
-
-- <!-- copy src files -->
- <copy todir="${build.src}">
- <fileset
- dir="${src.dir}"
-@@ -187,8 +186,8 @@ Copyright:
- org/apache/xerces/dom3/ls/**">
- </fileset>
- </copy>
--
-- <!-- now deal with API's: -->
-+
-+ <!-- now deal with API's:
- <unzip src="${src.apis.zip}" dest="${build.src}">
- <patternset
- includes="org/xml/sax/**
-@@ -200,7 +199,7 @@ Copyright:
- org/w3c/dom/traversal/**"
- />
- </unzip>
--
-+ -->
- <!-- substitute tokens as needed -->
- <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
- token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
-@@ -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" />
- </target>
-
- <!-- =================================================================== -->
diff --git a/dev-java/xerces/files/xerces-2.9.0-gentoo.patch b/dev-java/xerces/files/xerces-2.9.0-gentoo.patch
deleted file mode 100644
index 61445ea..0000000
--- a/dev-java/xerces/files/xerces-2.9.0-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urpN xerces-2_6_2.old/build.xml xerces-2_6_2/build.xml
---- xerces-2_6_2.old/build.xml 2004-02-20 19:58:14.000000000 +0100
-+++ xerces-2_6_2/build.xml 2005-01-15 14:41:08.603978904 +0100
-@@ -190,7 +190,7 @@ Copyright:
- </fileset>
- </copy>
-
-- <!-- now deal with API's: -->
-+ <!-- now deal with API's:
- <unzip src="${src.apis.zip}" dest="${build.src}">
- <patternset
- includes="org/xml/sax/**
-@@ -202,7 +202,7 @@ Copyright:
- org/w3c/dom/traversal/**"
- />
- </unzip>
--
-+ -->
- <!-- substitute tokens as needed -->
- <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
- token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
diff --git a/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch b/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch
deleted file mode 100644
index 8f485ad..0000000
--- a/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru xerces-2_7_1/build.xml xerces-2_7_1-patched/build.xml
---- xerces-2_7_1/build.xml 2005-07-26 16:09:07.000000000 -0400
-+++ xerces-2_7_1-patched/build.xml 2005-12-08 23:51:32.000000000 -0500
-@@ -442,16 +442,6 @@
- additionalparam='${additional.param}'
- />
- <mkdir dir='${build.dir}/docs/javadocs/other'/>
-- <javadoc packagenames='org.apache.html.*,
-- org.apache.wml.*,
-- org.apache.xml.serialize.*'
-- locale='en_US'
-- sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/other'
-- author='true' version='true'
-- windowtitle='Other Classes' doctitle='Other Classes'
-- bottom='${copyright}'
-- additionalparam='${additional.param}'
-- />
- </target>
-
- <!-- =================================================================== -->
diff --git a/dev-java/xerces/files/xerces-2.9.1-gentoo.patch b/dev-java/xerces/files/xerces-2.9.1-gentoo.patch
deleted file mode 100644
index 61445ea..0000000
--- a/dev-java/xerces/files/xerces-2.9.1-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urpN xerces-2_6_2.old/build.xml xerces-2_6_2/build.xml
---- xerces-2_6_2.old/build.xml 2004-02-20 19:58:14.000000000 +0100
-+++ xerces-2_6_2/build.xml 2005-01-15 14:41:08.603978904 +0100
-@@ -190,7 +190,7 @@ Copyright:
- </fileset>
- </copy>
-
-- <!-- now deal with API's: -->
-+ <!-- now deal with API's:
- <unzip src="${src.apis.zip}" dest="${build.src}">
- <patternset
- includes="org/xml/sax/**
-@@ -202,7 +202,7 @@ Copyright:
- org/w3c/dom/traversal/**"
- />
- </unzip>
--
-+ -->
- <!-- substitute tokens as needed -->
- <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
- token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
diff --git a/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch b/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch
deleted file mode 100644
index 8f485ad..0000000
--- a/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru xerces-2_7_1/build.xml xerces-2_7_1-patched/build.xml
---- xerces-2_7_1/build.xml 2005-07-26 16:09:07.000000000 -0400
-+++ xerces-2_7_1-patched/build.xml 2005-12-08 23:51:32.000000000 -0500
-@@ -442,16 +442,6 @@
- additionalparam='${additional.param}'
- />
- <mkdir dir='${build.dir}/docs/javadocs/other'/>
-- <javadoc packagenames='org.apache.html.*,
-- org.apache.wml.*,
-- org.apache.xml.serialize.*'
-- locale='en_US'
-- sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/other'
-- author='true' version='true'
-- windowtitle='Other Classes' doctitle='Other Classes'
-- bottom='${copyright}'
-- additionalparam='${additional.param}'
-- />
- </target>
-
- <!-- =================================================================== -->
diff --git a/dev-java/xerces/xerces-1.3.1-r2.ebuild b/dev-java/xerces/xerces-1.3.1-r2.ebuild
deleted file mode 100644
index 2f50c14..0000000
--- a/dev-java/xerces/xerces-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-S=${WORKDIR}/xerces-${PV//./_}
-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="http://archive.apache.org/dist/xml/xerces-j/old_xerces1/Xerces-J-src.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="1.3"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3
- >=dev-java/xalan-2.5.2"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- cp "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-EANT_DOC_TARGET="docs"
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
-
- dodoc README STATUS || die
- dohtml Readme.html || die
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc "${S}/src/org"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/
@ 2019-04-17 19:28 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2019-04-17 19:28 UTC (permalink / raw
To: gentoo-commits
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"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/
@ 2019-04-26 16:39 Georgy Yakovlev
0 siblings, 0 replies; 3+ messages in thread
From: Georgy Yakovlev @ 2019-04-26 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 114672fc1bf0174a8ee16360e8de6b5a090c87de
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 16:34:28 2019 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 16:38:49 2019 +0000
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 <monsieurp <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> 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..00000000000
--- a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Don't reference non existing jar in taskdef. #351394
-Don't let user properties leak into build env.
-Don't bundle stuff from xml-commons-external.
-
---- a/build.xml
-+++ b/build.xml
-@@ -39,18 +39,13 @@ Authors:
- <property name="tools.dir" value="./tools"/>
-
- <!-- enable compilation under JDK 1.4 and above -->
-- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
-- <classpath>
-- <pathelement location="${tools.dir}/bin/xjavac.jar"/>
-- </classpath>
-- </taskdef>
-+ <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
-
- <!-- Allow properties following these statements to be overridden -->
- <!-- Note that all of these don't have to exist. They've just been defined
- incase they are used. -->
- <property file="build.properties"/>
- <property file=".ant.properties"/>
-- <property file="${user.home}/.ant.properties"/>
- <property file="default.properties"/>
-
- <target name="init">
-@@ -247,7 +242,7 @@ Authors:
- <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
- tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
-
-- <!-- now deal with API's: -->
-+ <!-- now deal with API's:
- <unzip src="${src.apis.zip}" dest="${build.src}">
- <patternset
- includes="org/xml/sax/**
-@@ -269,7 +264,7 @@ Authors:
- org/w3c/dom/views/**
- org/w3c/dom/xpath/**"
- />
-- </unzip>
-+ </unzip> -->
-
- <!-- substitute tokens as needed -->
- <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
diff --git a/dev-java/xerces/xerces-2.11.0-r2.ebuild b/dev-java/xerces/xerces-2.11.0-r2.ebuild
deleted file mode 100644
index e0289d295c8..00000000000
--- a/dev-java/xerces/xerces-2.11.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-26 16:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-26 16:39 [gentoo-commits] repo/gentoo:master commit in: dev-java/xerces/, dev-java/xerces/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2019-04-17 19:28 Patrice Clement
2015-12-02 16:20 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox