1 |
commit: 114672fc1bf0174a8ee16360e8de6b5a090c87de |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 26 16:34:28 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 26 16:38:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114672fc |
7 |
|
8 |
dev-java/xerces: clean up old |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/11829 |
11 |
Bug: https://bugs.gentoo.org/683350 |
12 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
13 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
15 |
|
16 |
dev-java/xerces/Manifest | 1 - |
17 |
.../xerces/files/xerces-2.11.0-build.xml.patch | 46 ---------------- |
18 |
dev-java/xerces/xerces-2.11.0-r2.ebuild | 61 ---------------------- |
19 |
3 files changed, 108 deletions(-) |
20 |
|
21 |
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest |
22 |
index 4c869cdd241..ecb391145d4 100644 |
23 |
--- a/dev-java/xerces/Manifest |
24 |
+++ b/dev-java/xerces/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411 |
27 |
DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 61afcddad9a..00000000000 |
32 |
--- a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch |
33 |
+++ /dev/null |
34 |
@@ -1,46 +0,0 @@ |
35 |
-Author: Ralph Sennhauser <sera@g.o> |
36 |
- |
37 |
-Don't reference non existing jar in taskdef. #351394 |
38 |
-Don't let user properties leak into build env. |
39 |
-Don't bundle stuff from xml-commons-external. |
40 |
- |
41 |
---- a/build.xml |
42 |
-+++ b/build.xml |
43 |
-@@ -39,18 +39,13 @@ Authors: |
44 |
- <property name="tools.dir" value="./tools"/> |
45 |
- |
46 |
- <!-- enable compilation under JDK 1.4 and above --> |
47 |
-- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"> |
48 |
-- <classpath> |
49 |
-- <pathelement location="${tools.dir}/bin/xjavac.jar"/> |
50 |
-- </classpath> |
51 |
-- </taskdef> |
52 |
-+ <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/> |
53 |
- |
54 |
- <!-- Allow properties following these statements to be overridden --> |
55 |
- <!-- Note that all of these don't have to exist. They've just been defined |
56 |
- incase they are used. --> |
57 |
- <property file="build.properties"/> |
58 |
- <property file=".ant.properties"/> |
59 |
-- <property file="${user.home}/.ant.properties"/> |
60 |
- <property file="default.properties"/> |
61 |
- |
62 |
- <target name="init"> |
63 |
-@@ -247,7 +242,7 @@ Authors: |
64 |
- <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties" |
65 |
- tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/> |
66 |
- |
67 |
-- <!-- now deal with API's: --> |
68 |
-+ <!-- now deal with API's: |
69 |
- <unzip src="${src.apis.zip}" dest="${build.src}"> |
70 |
- <patternset |
71 |
- includes="org/xml/sax/** |
72 |
-@@ -269,7 +264,7 @@ Authors: |
73 |
- org/w3c/dom/views/** |
74 |
- org/w3c/dom/xpath/**" |
75 |
- /> |
76 |
-- </unzip> |
77 |
-+ </unzip> --> |
78 |
- |
79 |
- <!-- substitute tokens as needed --> |
80 |
- <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" |
81 |
|
82 |
diff --git a/dev-java/xerces/xerces-2.11.0-r2.ebuild b/dev-java/xerces/xerces-2.11.0-r2.ebuild |
83 |
deleted file mode 100644 |
84 |
index e0289d295c8..00000000000 |
85 |
--- a/dev-java/xerces/xerces-2.11.0-r2.ebuild |
86 |
+++ /dev/null |
87 |
@@ -1,61 +0,0 @@ |
88 |
-# Copyright 1999-2019 Gentoo Authors |
89 |
-# Distributed under the terms of the GNU General Public License v2 |
90 |
- |
91 |
-EAPI=5 |
92 |
-JAVA_PKG_IUSE="doc examples source" |
93 |
- |
94 |
-inherit eutils versionator java-pkg-2 java-ant-2 |
95 |
- |
96 |
-DIST_PN="Xerces-J" |
97 |
-SRC_PV="$(replace_all_version_separators _ )" |
98 |
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers" |
99 |
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html" |
100 |
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz" |
101 |
- |
102 |
-LICENSE="Apache-2.0" |
103 |
-SLOT="2" |
104 |
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" |
105 |
-IUSE="" |
106 |
- |
107 |
-# they are missing from the upstream tarball" |
108 |
-RESTRICT="test" |
109 |
- |
110 |
-CDEPEND=" |
111 |
- dev-java/xml-commons-external:1.4 |
112 |
- >=dev-java/xml-commons-resolver-1.2:0" |
113 |
- |
114 |
-RDEPEND=" |
115 |
- ${CDEPEND} |
116 |
- >=virtual/jre-1.6" |
117 |
- |
118 |
-DEPEND=" |
119 |
- ${CDEPEND} |
120 |
- >=virtual/jdk-1.6 |
121 |
- dev-java/xjavac:1" |
122 |
- |
123 |
-S="${WORKDIR}/${PN}-${SRC_PV}" |
124 |
- |
125 |
-java_prepare() { |
126 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
127 |
-} |
128 |
- |
129 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
130 |
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc" |
131 |
- |
132 |
-EANT_ANT_TASKS="xjavac-1" |
133 |
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4" |
134 |
-EANT_DOC_TARGET="javadocs" |
135 |
-# known small bug - javadocs use custom taglets, which come as bundled jar in |
136 |
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead. |
137 |
-EANT_EXTRA_ARGS="-Dadditional.param=" |
138 |
- |
139 |
-src_install() { |
140 |
- java-pkg_dojar build/xercesImpl.jar |
141 |
- |
142 |
- dodoc README NOTICE |
143 |
- dohtml Readme.html |
144 |
- |
145 |
- use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2 |
146 |
- use examples && java-pkg_doexamples samples |
147 |
- use source && java-pkg_dosrc src/org |
148 |
-} |