1 |
commit: f33a8cbb44e3a576355729dba3a47d3e731a4c9e |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 2 09:03:51 2015 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 2 09:03:51 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33a8cbb |
7 |
|
8 |
dev-java/xmlc: Removal. Fixes bug 561954. |
9 |
|
10 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
11 |
|
12 |
dev-java/xmlc/Manifest | 1 - |
13 |
dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch | 53 -------------------- |
14 |
dev-java/xmlc/metadata.xml | 10 ---- |
15 |
dev-java/xmlc/xmlc-2.3.1-r1.ebuild | 69 -------------------------- |
16 |
4 files changed, 133 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest |
19 |
deleted file mode 100644 |
20 |
index b3039a9..0000000 |
21 |
--- a/dev-java/xmlc/Manifest |
22 |
+++ /dev/null |
23 |
@@ -1 +0,0 @@ |
24 |
-DIST xmlc-src-2.3.1.zip 8147268 SHA256 b95b422fc143c8bd2d61706d70ab4985431d5155b88df528951fc6f0c76b1b04 SHA512 377ec4d57373038e550b2f1902b019e413aeddc8b80f297898156a17c1fa437948b1e1f9302ca82f6b46fc8114a96f32bef9d27f68662fcf4fae1e7c3a52c16a WHIRLPOOL 819526aca87805a545237720b39fadbf3cb9f19bfab5acd38a24a084a0406ac7ece1b0d83b76cbe9fbd18286b45e846832afe58dfbc52cc6fb3c8d6c315d461e |
25 |
|
26 |
diff --git a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch |
27 |
deleted file mode 100644 |
28 |
index 58c3db7..0000000 |
29 |
--- a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch |
30 |
+++ /dev/null |
31 |
@@ -1,53 +0,0 @@ |
32 |
-diff -Nur xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties |
33 |
---- xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties 2007-04-22 00:40:58.000000000 +0300 |
34 |
-+++ xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties 2009-01-31 20:00:27.000000000 +0200 |
35 |
-@@ -37,7 +37,7 @@ |
36 |
- # Comma seperated list of libraries (or more exactly, include patterns) this |
37 |
- # module depends on for building. |
38 |
- # They are searched relative to ${lib.dir} |
39 |
--module.depends=xmlc.jar |
40 |
-+module.depends=xmlc.jar,ant.jar |
41 |
- |
42 |
- # Javadoc settings |
43 |
- javadoc.packages=org.enhydra.* |
44 |
-diff -Nur xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml |
45 |
---- xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml 2007-11-04 01:07:36.000000000 +0200 |
46 |
-+++ xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml 2009-01-31 20:13:12.000000000 +0200 |
47 |
-@@ -148,15 +148,12 @@ |
48 |
- description="Build the module .jar file"> |
49 |
- <tstamp/> |
50 |
- <delete file="${module.jar}"/> |
51 |
-- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/> |
52 |
-- <jarjar jarfile="${module.jar}"><!-- index="true"--> |
53 |
-+ <jar jarfile="${module.jar}"><!-- index="true"--> |
54 |
- <fileset file="${dist.root}/../LICENSE-xmlc"/> |
55 |
- <fileset dir="${build.classes}" /> |
56 |
- <fileset dir="${src.dir}" |
57 |
- includes="${module.lib.extra.includes}" |
58 |
- excludes="${module.lib.extra.excludes}" /> |
59 |
-- <zipfileset src="${build.lib.dir}/asm.jar"/> |
60 |
-- <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/> |
61 |
- <manifest> |
62 |
- <attribute name="Built-By" value="${user.name}"/> |
63 |
- <attribute name="Built-On" value="${TODAY}"/> |
64 |
-@@ -171,18 +168,13 @@ |
65 |
- <attribute name="Implementation-Vendor" value="OW2 Consortium"/> |
66 |
- <attribute name="Implementation-Vendor-Id" value="org.ow2"/> |
67 |
- <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/> |
68 |
-- </section> |
69 |
-- <section name="org/enhydra/xml/xmlc/deferredparsing/asm/"> |
70 |
-- <attribute name="Implementation-Title" value="ASM"/> |
71 |
-- <attribute name="Implementation-Version" value="3.1"/> |
72 |
-- <attribute name="Implementation-Vendor" value="France Telecom R&D"/> |
73 |
-- </section> |
74 |
-+ </section> |
75 |
- </manifest> |
76 |
- <!--indexjars> |
77 |
- <fileset dir="${dist.root}/lib" includes="*.jar"/> |
78 |
- <fileset dir="${dist.root}/build-lib" includes="*.jar"/> |
79 |
- </indexjars--> |
80 |
-- </jarjar> |
81 |
-+ </jar> |
82 |
- </target> |
83 |
- |
84 |
- <target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip" |
85 |
|
86 |
diff --git a/dev-java/xmlc/metadata.xml b/dev-java/xmlc/metadata.xml |
87 |
deleted file mode 100644 |
88 |
index 88da383..0000000 |
89 |
--- a/dev-java/xmlc/metadata.xml |
90 |
+++ /dev/null |
91 |
@@ -1,10 +0,0 @@ |
92 |
-<?xml version="1.0" encoding="UTF-8"?> |
93 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
94 |
-<pkgmetadata> |
95 |
-<herd>java</herd> |
96 |
-<longdescription> |
97 |
-Enhydra XMLC is the presentation technology that supports the needs of |
98 |
-designers, developers and architects alike, delivering what JSP cannot - strict |
99 |
-separation of markup and logic in a true object view of dynamic presentations. |
100 |
-</longdescription> |
101 |
-</pkgmetadata> |
102 |
|
103 |
diff --git a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild b/dev-java/xmlc/xmlc-2.3.1-r1.ebuild |
104 |
deleted file mode 100644 |
105 |
index 1d93761..0000000 |
106 |
--- a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild |
107 |
+++ /dev/null |
108 |
@@ -1,69 +0,0 @@ |
109 |
-# Copyright 1999-2012 Gentoo Foundation |
110 |
-# Distributed under the terms of the GNU General Public License v2 |
111 |
-# $Id$ |
112 |
- |
113 |
-EAPI="4" |
114 |
- |
115 |
-JAVA_PKG_IUSE="doc" |
116 |
- |
117 |
-inherit java-pkg-2 java-ant-2 |
118 |
- |
119 |
-MY_P="${PN}-src-${PV}" |
120 |
-DESCRIPTION="Open Source Java/XML Presentation Compiler" |
121 |
-HOMEPAGE="http://xmlc.objectweb.org/" |
122 |
-SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip |
123 |
- http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip" |
124 |
- |
125 |
-LICENSE="LGPL-2.1" |
126 |
-SLOT="0" |
127 |
-KEYWORDS="amd64 ppc x86" |
128 |
-IUSE="" |
129 |
- |
130 |
-COMMON_DEP=" |
131 |
- dev-java/ant-core:0 |
132 |
- dev-java/asm:3 |
133 |
- dev-java/gnu-regexp:1 |
134 |
- dev-java/log4j:0 |
135 |
- dev-java/nekohtml:0 |
136 |
- dev-java/xerces:2 |
137 |
- dev-java/xml-commons-external:1.4 |
138 |
- dev-java/xml-commons-resolver:0 |
139 |
- java-virtuals/servlet-api:2.5" |
140 |
-RDEPEND=">=virtual/jre-1.4 |
141 |
- ${COMMON_DEP}" |
142 |
-DEPEND=">=virtual/jdk-1.4 |
143 |
- app-arch/unzip |
144 |
- ${COMMON_DEP}" |
145 |
- |
146 |
-S="${WORKDIR}/${MY_P}/" |
147 |
- |
148 |
-java_prepare() { |
149 |
- find -name '*.jar' -exec rm -v {} + || die |
150 |
- |
151 |
- # get rid of jarjar, and add ant.jar to the taskdef module's classpath |
152 |
- epatch "${FILESDIR}/${P}-build.xml.patch" |
153 |
-} |
154 |
- |
155 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
156 |
- |
157 |
-EANT_BUILD_TARGET="all-libs" |
158 |
-EANT_GENTOO_CLASSPATH="xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3,xml-commons-external-1.4,xml-commons-resolver,servlet-api-2.5,ant-core" |
159 |
- |
160 |
-src_install() { |
161 |
- # the rest of jars are included in all-runtime |
162 |
- java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar |
163 |
- java-pkg_register-ant-task |
164 |
- |
165 |
- newdoc xmlc/modules/xmlc/README.XMLC README || die |
166 |
- dodoc xmlc/modules/xmlc/ChangeLog || die |
167 |
- dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \ |
168 |
- xmlc/bugs/bugs.html || die |
169 |
- |
170 |
- # move the generated documentation around |
171 |
- if use doc; then |
172 |
- mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die |
173 |
- mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die |
174 |
- mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die |
175 |
- java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation" |
176 |
- fi |
177 |
-} |