Version bump to fix bug #146593. Thanks to Kenneth Prugh <ken69267@gentoo.org> for his hard work in the bug.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

3 files changed, 136 insertions, 2 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 5cbdeddf12db..bcf1acef290a 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xom
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.55 2010/04/24 16:56:04 grobian Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.56 2011/03/13 05:17:21 serkan Exp $
+
+*xom-1.2.6 (13 Mar 2011)
+
+  13 Mar 2011; Serkan Kaba <serkan@gentoo.org> +xom-1.2.6.ebuild,
+  +files/xom-1.2.6.patch:
+  Version bump to fix bug #146593. Thanks to Kenneth Prugh
+  <ken69267@gentoo.org> for his hard work in the bug.
 
   24 Apr 2010; Fabian Groffen <grobian@gentoo.org> xom-1.0-r7.ebuild:
   Marked ~sparc-solaris ~x86-solaris, bug #314093
diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch
new file mode 100644
index 000000000000..3187e437306b
--- /dev/null
+++ b/dev-java/xom/files/xom-1.2.6.patch
@@ -0,0 +1,49 @@
+diff -Nur XOM/build.xml XOM_patched/build.xml
+--- XOM/build.xml	2010-06-21 06:03:14.000000000 +0300
++++ XOM_patched/build.xml	2011-03-13 07:05:01.000000000 +0200
+@@ -21,7 +21,6 @@
+ subject line. The XOM home page is http://www.xom.nu/
+ -->
+ <project name="XOM" default="help" basedir=".">
+-
+     <description>
+       Build XOM
+     </description>
+@@ -71,7 +70,7 @@
+     <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
+ 
+     <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
+-    <property name="parser.jar"     value="${lib.dir}/dtd-xercesImpl.jar"/>
++    <property name="parser.jar"     value="${lib.dir}/xercesImpl.jar"/>
+     <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
+     <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
+     <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
+@@ -226,7 +225,7 @@
+            encoding="UTF-8"
+     	   fork="true"
+            includeAntRuntime="false"
+-           excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
++excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/">
+        <classpath refid="compile.class.path"/>
+     </javac>
+     <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
+@@ -323,7 +322,7 @@
+ 
+   <target name="jar" depends="compile" description="Create xom.jar">
+   	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+-  	        classpath="${lib.dir}/jarjar-1.0.jar"/>
++  	        classpath="${lib.dir}/jarjar.jar"/>
+     <jarjar jarfile="${build.dir}/${name}-${version}.jar"
+          basedir="${build.dest}"
+          index="no"
+@@ -862,8 +861,8 @@
+   </target>
+ 
+ 
+-  <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
+-    <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
++  <target name="compile-jaxen" description="Compile Jaxen">
++    <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main"
+            destdir="${build.dir}/jaxen-classes"
+            debug="${debug}"
+            optimize="${optimize}"
diff --git a/dev-java/xom/xom-1.2.6.ebuild b/dev-java/xom/xom-1.2.6.ebuild
new file mode 100644
index 000000000000..73c4de9fb4f9
--- /dev/null
+++ b/dev-java/xom/xom-1.2.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.2.6.ebuild,v 1.1 2011/03/13 05:17:21 serkan Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+JAXEN_V="1.1.3"
+JAXEN_P="jaxen-${JAXEN_V}"
+
+DESCRIPTION="A new XML object model."
+HOMEPAGE="http://cafeconleche.org/XOM/index.html"
+SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
+	http://dist.codehaus.org/jaxen/distributions/${JAXEN_P}-src.tar.gz"
+# Bundled jaxen as its moved under XOM's namespace
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="dev-java/xerces:2
+		dev-java/xml-commons-external:1.3
+		examples? ( dev-java/servletapi:2.4 )"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		dev-java/jarjar:1
+		${COMMON_DEPEND}"
+
+S="${WORKDIR}/XOM"
+
+# Test require network access to pass
+# They need a redirected http document on public web
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}.patch"
+
+	# Delete test files as they aren't installed
+	rm -vr src/nu/xom/tests || die
+
+	# Delete bundled jars
+	rm -v *.jar lib/*.jar || die
+
+	# Delete bundled classes
+	find . -name "*.class" -delete -print || die
+
+	# Move bundled jaxen to where the build.xml expects it
+	mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die
+
+	java-pkg_jar-from --into lib/ xml-commons-external-1.3
+	java-pkg_jar-from --into lib/ xerces-2
+	java-pkg_jar-from --build-only --into lib/ jarjar-1
+	# tagsoup is only needed to run betterdoc but we use the pregenerated ones
+}
+
+src_compile() {
+	local ant_flags="-Ddebug=off"
+	use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+
+	ejavac src15/nu/xom/JDK15XML1_0Parser.java -d classes15
+
+	ANT_TASKS="jarjar-1" eant jar ${ant_flags}\
+		$(use examples && echo samples)
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use examples && java-pkg_dojar build/xom-samples.jar
+	dodoc Todo.txt || die
+
+	use doc && java-pkg_dojavadoc apidocs/
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
+}