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

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

[Patrice Clement]

commit:     f33a8cbb44e3a576355729dba3a47d3e731a4c9e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 09:03:51 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 09:03:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33a8cbb

dev-java/xmlc: Removal. Fixes bug 561954.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/xmlc/Manifest                         |  1 -
 dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch | 53 --------------------
 dev-java/xmlc/metadata.xml                     | 10 ----
 dev-java/xmlc/xmlc-2.3.1-r1.ebuild             | 69 --------------------------
 4 files changed, 133 deletions(-)

diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest
deleted file mode 100644
index b3039a9..0000000
--- a/dev-java/xmlc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmlc-src-2.3.1.zip 8147268 SHA256 b95b422fc143c8bd2d61706d70ab4985431d5155b88df528951fc6f0c76b1b04 SHA512 377ec4d57373038e550b2f1902b019e413aeddc8b80f297898156a17c1fa437948b1e1f9302ca82f6b46fc8114a96f32bef9d27f68662fcf4fae1e7c3a52c16a WHIRLPOOL 819526aca87805a545237720b39fadbf3cb9f19bfab5acd38a24a084a0406ac7ece1b0d83b76cbe9fbd18286b45e846832afe58dfbc52cc6fb3c8d6c315d461e

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
deleted file mode 100644
index 58c3db7..0000000
--- a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
---- xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties	2007-04-22 00:40:58.000000000 +0300
-+++ xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties	2009-01-31 20:00:27.000000000 +0200
-@@ -37,7 +37,7 @@
- # Comma seperated list of libraries (or more exactly, include patterns) this
- # module depends on for building.
- # They are searched relative to ${lib.dir}
--module.depends=xmlc.jar
-+module.depends=xmlc.jar,ant.jar
- 
- # Javadoc settings
- javadoc.packages=org.enhydra.*
-diff -Nur xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml
---- xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml	2007-11-04 01:07:36.000000000 +0200
-+++ xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml	2009-01-31 20:13:12.000000000 +0200
-@@ -148,15 +148,12 @@
- 	  description="Build the module .jar file">
-   	<tstamp/>
-   	<delete file="${module.jar}"/>
--  	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/>
--  	<jarjar jarfile="${module.jar}"><!-- index="true"-->
-+  	<jar jarfile="${module.jar}"><!-- index="true"-->
-       <fileset file="${dist.root}/../LICENSE-xmlc"/>
-       <fileset dir="${build.classes}" />
-       <fileset dir="${src.dir}"
- 	    includes="${module.lib.extra.includes}"
- 	    excludes="${module.lib.extra.excludes}" />
--      <zipfileset src="${build.lib.dir}/asm.jar"/>
--      <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/>
-       <manifest>
-         <attribute name="Built-By" value="${user.name}"/>
-         <attribute name="Built-On" value="${TODAY}"/>
-@@ -171,18 +168,13 @@
-           <attribute name="Implementation-Vendor" value="OW2 Consortium"/>
-           <attribute name="Implementation-Vendor-Id" value="org.ow2"/>
-           <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>
--        </section>
--      	<section name="org/enhydra/xml/xmlc/deferredparsing/asm/">
--          <attribute name="Implementation-Title" value="ASM"/>
--          <attribute name="Implementation-Version" value="3.1"/> 
--          <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
--      	</section>
-+        </section>
-       </manifest>
-       <!--indexjars>
-         <fileset dir="${dist.root}/lib" includes="*.jar"/>
-         <fileset dir="${dist.root}/build-lib" includes="*.jar"/>
-       </indexjars-->
--    </jarjar>
-+    </jar>
-   </target>
- 
-   <target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip"

diff --git a/dev-java/xmlc/metadata.xml b/dev-java/xmlc/metadata.xml
deleted file mode 100644
index 88da383..0000000
--- a/dev-java/xmlc/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-<longdescription>
-Enhydra XMLC is the presentation technology that supports the needs of 
-designers, developers and architects alike, delivering what JSP cannot - strict 
-separation of markup and logic in a true object view of dynamic presentations.
-</longdescription>
-</pkgmetadata>

diff --git a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild b/dev-java/xmlc/xmlc-2.3.1-r1.ebuild
deleted file mode 100644
index 1d93761..0000000
--- a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Open Source Java/XML Presentation Compiler"
-HOMEPAGE="http://xmlc.objectweb.org/"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip
-	http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/ant-core:0
-	dev-java/asm:3
-	dev-java/gnu-regexp:1
-	dev-java/log4j:0
-	dev-java/nekohtml:0
-	dev-java/xerces:2
-	dev-java/xml-commons-external:1.4
-	dev-java/xml-commons-resolver:0
-	java-virtuals/servlet-api:2.5"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	# get rid of jarjar, and add ant.jar to the taskdef module's classpath
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_BUILD_TARGET="all-libs"
-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"
-
-src_install() {
-	# the rest of jars are included in all-runtime
-	java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar
-	java-pkg_register-ant-task
-
-	newdoc xmlc/modules/xmlc/README.XMLC README || die
-	dodoc xmlc/modules/xmlc/ChangeLog || die
-	dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \
-		xmlc/bugs/bugs.html || die
-
-	# move the generated documentation around
-	if use doc; then
-		mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die
-		mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die
-		mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die
-		java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation"
-	fi
-}