Revbump, strip out fallback parser to allow building wiht other JVMs than

SUN/Oracles. #399119
Use java-virtuals/servlet-api instead of dev-java/servletapi. #398689

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 2d6752181dda..1a3a42a4a571 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/xom
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.59 2012/01/01 14:51:59 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.60 2012/01/29 09:57:39 sera Exp $
+
+*xom-1.2.6-r1 (29 Jan 2012)
+
+  29 Jan 2012; Ralph Sennhauser <sera@gentoo.org> +xom-1.2.6-r1.ebuild,
+  +files/xom-strip-fallback-parser.patch:
+  Revbump, strip out fallback parser to allow building wiht other JVMs than
+  SUN/Oracles. #399119
+  Use java-virtuals/servlet-api instead of dev-java/servletapi. #398689
 
   01 Jan 2012; Ralph Sennhauser <sera@gentoo.org> xom-1.0-r6.ebuild,
   xom-1.0-r7.ebuild, xom-1.2.6.ebuild:
diff --git a/dev-java/xom/files/xom-strip-fallback-parser.patch b/dev-java/xom/files/xom-strip-fallback-parser.patch
new file mode 100644
index 000000000000..49a324ef2dad
--- /dev/null
+++ b/dev-java/xom/files/xom-strip-fallback-parser.patch
@@ -0,0 +1,18 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Don't build and install fallback parser relying on internel classes of
+SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119
+
+--- /tmp/build.xml
++++ /tmp/build.xml
+@@ -235,10 +235,6 @@
+   	<echo file="${build.dest}/nu/xom/version.txt">${version}</echo>
+ 
+     <copy file="${build.src}/nu/xom/compositions.dat" tofile="${build.dest}/nu/xom/compositions.dat" />
+-
+-    <!-- This file requires Java 1.5 to generate so we compile it with a 
+-         different target and copy it over here. -->
+-    <copy file="classes15/nu/xom/JDK15XML1_0Parser.class" tofile="${build.dest}/nu/xom/JDK15XML1_0Parser.class"/>
+   </target>
+ 
+ 
diff --git a/dev-java/xom/xom-1.2.6-r1.ebuild b/dev-java/xom/xom-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..0081984c845d
--- /dev/null
+++ b/dev-java/xom/xom-1.2.6-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/01/29 09:57:39 sera Exp $
+
+EAPI="4"
+
+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 ~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? ( java-virtuals/servlet-api: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"
+	epatch "${FILESDIR}/${PN}-strip-fallback-parser.patch" #399119
+
+	# 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	servlet-api-2.4 servlet-api.jar)"
+
+	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
+
+	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
+}