1 |
commit: 9e646ac7a38a7ae9f591dcd98ecd34710b951d84 |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Sun May 16 15:23:46 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 16 18:31:06 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e646ac7 |
7 |
|
8 |
dev-java/xom: remove obsolete |
9 |
|
10 |
Closes: https://bugs.gentoo.org/784095 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
12 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/20839/commits/fae3639075885a5c007b2814e7dbfe96263c40a3 |
14 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
15 |
|
16 |
dev-java/xom/Manifest | 3 - |
17 |
dev-java/xom/files/xom-1.2.6.patch | 49 -------------- |
18 |
dev-java/xom/files/xom-strip-fallback-parser.patch | 18 ----- |
19 |
dev-java/xom/xom-1.2.10.ebuild | 79 ---------------------- |
20 |
dev-java/xom/xom-1.3.2.ebuild | 42 ------------ |
21 |
5 files changed, 191 deletions(-) |
22 |
|
23 |
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest |
24 |
index 2a4c459fafe..8c636006829 100644 |
25 |
--- a/dev-java/xom/Manifest |
26 |
+++ b/dev-java/xom/Manifest |
27 |
@@ -1,4 +1 @@ |
28 |
-DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309 |
29 |
-DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680 |
30 |
-DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4 |
31 |
DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262 |
32 |
|
33 |
diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch |
34 |
deleted file mode 100644 |
35 |
index 3187e437306..00000000000 |
36 |
--- a/dev-java/xom/files/xom-1.2.6.patch |
37 |
+++ /dev/null |
38 |
@@ -1,49 +0,0 @@ |
39 |
-diff -Nur XOM/build.xml XOM_patched/build.xml |
40 |
---- XOM/build.xml 2010-06-21 06:03:14.000000000 +0300 |
41 |
-+++ XOM_patched/build.xml 2011-03-13 07:05:01.000000000 +0200 |
42 |
-@@ -21,7 +21,6 @@ |
43 |
- subject line. The XOM home page is http://www.xom.nu/ |
44 |
- --> |
45 |
- <project name="XOM" default="help" basedir="."> |
46 |
-- |
47 |
- <description> |
48 |
- Build XOM |
49 |
- </description> |
50 |
-@@ -71,7 +70,7 @@ |
51 |
- <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/> |
52 |
- |
53 |
- <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/> |
54 |
-- <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/> |
55 |
-+ <property name="parser.jar" value="${lib.dir}/xercesImpl.jar"/> |
56 |
- <property name="xslt.jar" value="${lib.dir}/xalan.jar"/> |
57 |
- <property name="serializer.jar" value="${lib.dir}/serializer.jar"/> |
58 |
- <property name="tagsoup.jar" value="${lib2.dir}/tagsoup-1.2.jar"/> |
59 |
-@@ -226,7 +225,7 @@ |
60 |
- encoding="UTF-8" |
61 |
- fork="true" |
62 |
- includeAntRuntime="false" |
63 |
-- excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> |
64 |
-+excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/"> |
65 |
- <classpath refid="compile.class.path"/> |
66 |
- </javac> |
67 |
- <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/> |
68 |
-@@ -323,7 +322,7 @@ |
69 |
- |
70 |
- <target name="jar" depends="compile" description="Create xom.jar"> |
71 |
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" |
72 |
-- classpath="${lib.dir}/jarjar-1.0.jar"/> |
73 |
-+ classpath="${lib.dir}/jarjar.jar"/> |
74 |
- <jarjar jarfile="${build.dir}/${name}-${version}.jar" |
75 |
- basedir="${build.dest}" |
76 |
- index="no" |
77 |
-@@ -862,8 +861,8 @@ |
78 |
- </target> |
79 |
- |
80 |
- |
81 |
-- <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen"> |
82 |
-- <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main" |
83 |
-+ <target name="compile-jaxen" description="Compile Jaxen"> |
84 |
-+ <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main" |
85 |
- destdir="${build.dir}/jaxen-classes" |
86 |
- debug="${debug}" |
87 |
- optimize="${optimize}" |
88 |
|
89 |
diff --git a/dev-java/xom/files/xom-strip-fallback-parser.patch b/dev-java/xom/files/xom-strip-fallback-parser.patch |
90 |
deleted file mode 100644 |
91 |
index 49a324ef2da..00000000000 |
92 |
--- a/dev-java/xom/files/xom-strip-fallback-parser.patch |
93 |
+++ /dev/null |
94 |
@@ -1,18 +0,0 @@ |
95 |
-Author: Ralph Sennhauser <sera@g.o> |
96 |
- |
97 |
-Don't build and install fallback parser relying on internel classes of |
98 |
-SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119 |
99 |
- |
100 |
---- /tmp/build.xml |
101 |
-+++ /tmp/build.xml |
102 |
-@@ -235,10 +235,6 @@ |
103 |
- <echo file="${build.dest}/nu/xom/version.txt">${version}</echo> |
104 |
- |
105 |
- <copy file="${build.src}/nu/xom/compositions.dat" tofile="${build.dest}/nu/xom/compositions.dat" /> |
106 |
-- |
107 |
-- <!-- This file requires Java 1.5 to generate so we compile it with a |
108 |
-- different target and copy it over here. --> |
109 |
-- <copy file="classes15/nu/xom/JDK15XML1_0Parser.class" tofile="${build.dest}/nu/xom/JDK15XML1_0Parser.class"/> |
110 |
- </target> |
111 |
- |
112 |
- |
113 |
|
114 |
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild |
115 |
deleted file mode 100644 |
116 |
index 434b57752e5..00000000000 |
117 |
--- a/dev-java/xom/xom-1.2.10.ebuild |
118 |
+++ /dev/null |
119 |
@@ -1,79 +0,0 @@ |
120 |
-# Copyright 1999-2021 Gentoo Authors |
121 |
-# Distributed under the terms of the GNU General Public License v2 |
122 |
- |
123 |
-EAPI="5" |
124 |
- |
125 |
-JAVA_PKG_IUSE="doc examples source" |
126 |
- |
127 |
-inherit java-pkg-2 java-ant-2 |
128 |
- |
129 |
-JAXEN_V="1.1.6" |
130 |
-JAXEN_P="jaxen-${JAXEN_V}" |
131 |
- |
132 |
-DESCRIPTION="A new XML object model" |
133 |
-HOMEPAGE="http://cafeconleche.org/XOM/index.html" |
134 |
-# Bundled jaxen as its moved under XOM's namespace |
135 |
-SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz |
136 |
- http://dist.codehaus.org/jaxen/distributions/${JAXEN_P}-src.tar.gz" |
137 |
- |
138 |
-LICENSE="LGPL-2" |
139 |
-SLOT="0" |
140 |
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" |
141 |
- |
142 |
-COMMON_DEPEND="dev-java/xerces:2 |
143 |
- dev-java/xml-commons-external:1.3 |
144 |
- examples? ( java-virtuals/servlet-api:2.4 )" |
145 |
- |
146 |
-RDEPEND=">=virtual/jre-1.4 |
147 |
- ${COMMON_DEPEND}" |
148 |
- |
149 |
-DEPEND=">=virtual/jdk-1.4 |
150 |
- dev-java/jarjar:1 |
151 |
- ${COMMON_DEPEND}" |
152 |
- |
153 |
-S="${WORKDIR}/XOM" |
154 |
- |
155 |
-# Test require network access to pass. |
156 |
-# They need a redirected http document on public web. |
157 |
-RESTRICT="test" |
158 |
- |
159 |
-java_prepare() { |
160 |
- epatch "${FILESDIR}/${PN}-1.2.6.patch" |
161 |
- epatch "${FILESDIR}/${PN}-strip-fallback-parser.patch" #399119 |
162 |
- |
163 |
- # Delete test files as they aren't installed |
164 |
- rm -vr src/nu/xom/tests || die |
165 |
- |
166 |
- # Delete bundled jars |
167 |
- rm -v *.jar lib/*.jar || die |
168 |
- |
169 |
- # Delete bundled classes |
170 |
- find . -name "*.class" -delete -print || die |
171 |
- |
172 |
- # Move bundled jaxen to where the build.xml expects it |
173 |
- mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die |
174 |
- |
175 |
- java-pkg_jar-from --into lib/ xml-commons-external-1.3 |
176 |
- java-pkg_jar-from --into lib/ xerces-2 |
177 |
- java-pkg_jar-from --build-only --into lib/ jarjar-1 |
178 |
- |
179 |
- # Tagsoup is only needed to run betterdoc but we use the pregenerated ones. |
180 |
-} |
181 |
- |
182 |
-src_compile() { |
183 |
- local ant_flags="-Ddebug=off" |
184 |
- use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servlet-api-2.4 servlet-api.jar)" |
185 |
- |
186 |
- ANT_TASKS="jarjar-1" eant jar ${ant_flags}\ |
187 |
- $(use examples && echo samples) |
188 |
-} |
189 |
- |
190 |
-src_install() { |
191 |
- java-pkg_newjar build/${P}.jar ${PN}.jar |
192 |
- use examples && java-pkg_dojar build/xom-samples.jar |
193 |
- dodoc Todo.txt |
194 |
- |
195 |
- use doc && java-pkg_dojavadoc apidocs/ |
196 |
- use source && java-pkg_dosrc src/* |
197 |
- use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples |
198 |
-} |
199 |
|
200 |
diff --git a/dev-java/xom/xom-1.3.2.ebuild b/dev-java/xom/xom-1.3.2.ebuild |
201 |
deleted file mode 100644 |
202 |
index b7321e970a2..00000000000 |
203 |
--- a/dev-java/xom/xom-1.3.2.ebuild |
204 |
+++ /dev/null |
205 |
@@ -1,42 +0,0 @@ |
206 |
-# Copyright 1999-2021 Gentoo Authors |
207 |
-# Distributed under the terms of the GNU General Public License v2 |
208 |
- |
209 |
-EAPI=6 |
210 |
- |
211 |
-JAVA_PKG_IUSE="doc source" |
212 |
- |
213 |
-inherit java-pkg-2 java-pkg-simple |
214 |
- |
215 |
-DESCRIPTION="XML Object Model" |
216 |
-HOMEPAGE="http://cafeconleche.org/XOM/index.html" |
217 |
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar" |
218 |
- |
219 |
-LICENSE="LGPL-2" |
220 |
-SLOT="0" |
221 |
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" |
222 |
- |
223 |
-CDEPEND=" |
224 |
- dev-java/xerces:2 |
225 |
- dev-java/jaxen:1.1 |
226 |
- dev-java/xml-commons-external:1.3" |
227 |
- |
228 |
-RDEPEND=" |
229 |
- ${CDEPEND} |
230 |
- >=virtual/jre-1.6" |
231 |
- |
232 |
-DEPEND=" |
233 |
- ${CDEPEND} |
234 |
- >=virtual/jdk-1.6" |
235 |
- |
236 |
-JAVA_GENTOO_CLASSPATH=" |
237 |
- xerces-2 |
238 |
- jaxen-1.1 |
239 |
- xml-commons-external-1.3" |
240 |
- |
241 |
-JAVA_SRC_DIR="nu" |
242 |
- |
243 |
-src_prepare() { |
244 |
- default |
245 |
- |
246 |
- rm -r nu/xom/integrationtests/ || die |
247 |
-} |