Version bump and migration to gen-2 eclasses, bug #168655. Dropped ppc due to nekohtml dep.

Package-Manager: portage-2.1.4.1

4 files changed, 134 insertions, 3 deletions

diff --git a/dev-java/xmlc/ChangeLog b/dev-java/xmlc/ChangeLog
index 94867730cd3d..b57aed658c48 100644
--- a/dev-java/xmlc/ChangeLog
+++ b/dev-java/xmlc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xmlc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.5 2007/02/21 23:47:28 peper Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.6 2008/02/02 11:53:03 caster Exp $
+
+*xmlc-2.3 (02 Feb 2008)
+
+  02 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  +files/xmlc-2.3-build.xml.patch, +xmlc-2.3.ebuild:
+  Version bump and migration to gen-2 eclasses, bug #168655. Dropped ppc due
+  to nekohtml dep.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest
index 56a31dcc3be4..aea696aab17e 100644
--- a/dev-java/xmlc/Manifest
+++ b/dev-java/xmlc/Manifest
@@ -1,5 +1,8 @@
+AUX xmlc-2.3-build.xml.patch 2607 RMD160 c44551fe87dd8d0236311ed13cf11f935d76435a SHA1 96f9fb902bc9904240f2116b3eefdc51f6c578c8 SHA256 a5430931c4890230caae03d5dcfd439ee62ec7aeddaff805251cfef0eee57922
 DIST xmlc-src-2.2.5.zip 7849442 RMD160 9721942b1cfd09dfbe6ff754f49b66fdc3b61cd4 SHA1 4bd181a099f191799e42c26fb9be71864fcd74bf SHA256 a716ab73afc9af84ee1161ed1bc5ffbe38d61eb7d177fb5b714de2a7015bf391
+DIST xmlc-src-2.3.zip 8089379 RMD160 8eda969549572abe1728f45c32221b369619de78 SHA1 e6b8a874a747a311c5fbfefea3d5677e4f8ac13c SHA256 570aa044bc5d081dd2ef9f08763909fa98add74493a4a5bd69972aadcc358227
 EBUILD xmlc-2.2.5-r1.ebuild 2423 RMD160 39f766cfcd4d1199f4bbb6b8a2da10d62b38edfc SHA1 af9dec8f84fb93c5685e0d93d1e6bef5845a170f SHA256 6c69a5896d569a9ae3cf690f8f73de6275f559afda48659cdd53cad2c80e27b4
 EBUILD xmlc-2.2.5.ebuild 1464 RMD160 92e4448bf5e2d2b4f631883ce13e72c9152e0811 SHA1 549b4dd7e3443ebcd78e97ae29462ee5270541a7 SHA256 bf6b431bd35b6fdbf554b7a41cc26d94835818bc2456f95566552facd5f1d701
-MISC ChangeLog 930 RMD160 0ef5a5a1e7ab295a287f9c6c8b9101241736d07f SHA1 be0f54bf5b3f8a6ba3ad5f52398591bb6b61200a SHA256 f232219375a1c8fa3c329b1eea31006bcc761a15bb7ead8f6e6d93e03d9d212e
+EBUILD xmlc-2.3.ebuild 2074 RMD160 e7d86adda134582146aaa55a06710ca6feaefa0e SHA1 9b974a7a79a9f62e6023461bff6c04f863ce4ff6 SHA256 d3cd4aebd68d0f6c527c4c611692a8debd4407ae4517135c6621f2454abd0bad
+MISC ChangeLog 1157 RMD160 12d458665ee2c8fbb494ed33bb7e048efb76713e SHA1 902e24e64372615c0e1d234c9a3541b833cdad3a SHA256 014a9cf609ca01efb22c38f8b5e4d5ae624302bd338b60517a5d6f435d636d4f
 MISC metadata.xml 426 RMD160 e794d7d9a128851eb1f2043e3f6d6d0de99b83be SHA1 235213947ed35c258258541adbe8a025787a4e8d SHA256 3d312d61b3c8f1ebb6fb30f2521cd3bcc2ed1256c4329ed1bfee343b8186172d
diff --git a/dev-java/xmlc/files/xmlc-2.3-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3-build.xml.patch
new file mode 100644
index 000000000000..125fd3862a58
--- /dev/null
+++ b/dev-java/xmlc/files/xmlc-2.3-build.xml.patch
@@ -0,0 +1,51 @@
+diff -Naur xmlc-src-2.3.orig/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3/xmlc/modules/taskdef/build-default.properties
+--- xmlc-src-2.3.orig/xmlc/modules/taskdef/build-default.properties	2007-04-22 00:40:58.000000000 +0200
++++ xmlc-src-2.3/xmlc/modules/taskdef/build-default.properties	2008-02-02 10:41:25.000000000 +0100
+@@ -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 -Naur xmlc-src-2.3.orig/xmlc/modules/xmlc/build.xml xmlc-src-2.3/xmlc/modules/xmlc/build.xml
+--- xmlc-src-2.3.orig/xmlc/modules/xmlc/build.xml	2007-04-23 00:08:08.000000000 +0200
++++ xmlc-src-2.3/xmlc/modules/xmlc/build.xml	2008-02-02 10:32:19.000000000 +0100
+@@ -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 destfile="${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}"/>

+@@ -172,17 +169,12 @@
+           <attribute name="Implementation-Vendor-Id" value="org.objectweb"/>

+           <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.0"/> 

+-          <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>

+-      	</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/xmlc-2.3.ebuild b/dev-java/xmlc/xmlc-2.3.ebuild
new file mode 100644
index 000000000000..806f8beed139
--- /dev/null
+++ b/dev-java/xmlc/xmlc-2.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/xmlc-2.3.ebuild,v 1.1 2008/02/02 11:53:03 caster Exp $
+
+EAPI="1"
+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"
+
+COMMON_DEP="dev-java/xerces:2
+	dev-java/gnu-regexp:1
+	java-virtuals/servlet-api:2.3
+	dev-java/log4j:0
+	dev-java/xml-commons-resolver:0
+	dev-java/nekohtml:0
+	dev-java/asm:3"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# get rid of jarjar, and add ant.jar to the taskdef module's classpath
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	cd "${S}"/release/build-lib/ || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3
+	java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar
+	java-pkg_jar-from --virtual servlet-api-2.3 servlet.jar
+	java-pkg_jar-from --build-only ant-core ant.jar
+}
+
+EANT_BUILD_TARGET="all-libs"
+
+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
+}