Version bump and add missing dependency to ant-core.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 129 insertions, 2 deletions

diff --git a/dev-java/xmlc/ChangeLog b/dev-java/xmlc/ChangeLog
index cb65d6d75487..8a022382d430 100644
--- a/dev-java/xmlc/ChangeLog
+++ b/dev-java/xmlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xmlc
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.11 2008/07/27 16:04:31 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.12 2009/01/31 18:30:09 serkan Exp $
+
+  31 Jan 2009; Serkan Kaba <serkan@gentoo.org> ChangeLog:
+  Version bump and add missing dependency to ant-core.
 
   27 Jul 2008; Petteri Räty <betelgeuse@gentoo.org> -xmlc-2.2.5.ebuild,
   -xmlc-2.2.5-r1.ebuild:
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
new file mode 100644
index 000000000000..58c3db7f62ae
--- /dev/null
+++ b/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch
@@ -0,0 +1,53 @@
+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/xmlc-2.3.1.ebuild b/dev-java/xmlc/xmlc-2.3.1.ebuild
new file mode 100644
index 000000000000..c4c382f3cd40
--- /dev/null
+++ b/dev-java/xmlc/xmlc-2.3.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/xmlc-2.3.1.ebuild,v 1.1 2009/01/31 18:30:09 serkan 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
+	dev-java/ant-core:0"
+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 ~ppc ~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 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
+}