Version bump, fixes bug #130568. Thanks to Juan J. García de Soria, Michael Jinks and Hanno Meyer-Thurow.

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

5 files changed, 182 insertions, 74 deletions

diff --git a/dev-java/saxon/ChangeLog b/dev-java/saxon/ChangeLog
index 217eae1545d1..ce1967c0c84e 100644
--- a/dev-java/saxon/ChangeLog
+++ b/dev-java/saxon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/saxon
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.36 2007/06/17 15:24:26 wltjr Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.37 2010/03/28 17:35:21 caster Exp $
+
+*saxon-9.2.0.6 (28 Mar 2010)
+
+  28 Mar 2010; Vlastimil Babka <caster@gentoo.org> +files/9.2-build.xml,
+  -files/build-6.5.2.xml, +files/9.2-edition.properties,
+  +saxon-9.2.0.6.ebuild:
+  Version bump, fixes bug #130568. Thanks to Juan J. García de Soria,
+  Michael Jinks and Hanno Meyer-Thurow.
 
   17 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org> saxon-6.5.5.ebuild:
   Stable on amd64, bug #180572. Removed older version
diff --git a/dev-java/saxon/files/9.2-build.xml b/dev-java/saxon/files/9.2-build.xml
new file mode 100644
index 000000000000..3bd9a64d4fe5
--- /dev/null
+++ b/dev-java/saxon/files/9.2-build.xml
@@ -0,0 +1,72 @@
+<!-- simple generic build file -->
+
+<project name="saxon" default="all" basedir=".">
+
+  <!-- Properties -->
+
+  <property name="name" value="saxon"/>
+  <property name="src" value="src"/>
+  <property name="build" value="build"/>
+  <property name="build.classes" value="${build}/classes"/>
+  <property name="build.doc" value="${build}/api"/>
+  <property name="build.lib" value="${build}/lib"/>
+  <property name="j2se.javadoc" value="http://java.sun.com/javase/@JDK@/docs/api"/>
+  <property name="jdom.javadoc" value="/usr/share/jdom-@JDOM@/api"/>
+
+  <!-- Targets -->
+
+  <!-- Prepare build directories -->
+  <target name="prepare">
+    <mkdir dir="${src}"/>
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build.classes}"/>
+    <mkdir dir="${build.lib}"/>
+    <mkdir dir="${build.doc}"/>
+    <copy todir="${src}">
+      <fileset dir="." includes="com/**,org/**,net/**"/>
+    </copy>
+  </target>
+
+  <!-- Kill all the created directories -->
+  <target name="clean">
+    <delete dir="${build}"/>
+    <delete dir="${src}"/>
+  </target>
+
+  <!-- Build classes -->
+  <target name="classes" depends="prepare">
+    <javac srcdir="${src}" destdir="${build.classes}" encoding="ISO-8859-1"/>
+  </target>
+
+  <!-- Build jar archives -->
+
+  <target name="jar" depends="classes">
+    <jar jarfile="${build.lib}/${name}.jar"
+         basedir="${build.classes}">
+      <manifest>
+        <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- Build the full JavaDocs -->
+  <target name="javadoc" depends="prepare">
+    <javadoc sourcepath="${src}"
+            destdir="${build.doc}"
+            doctitle="${name} JavaDoc"
+            windowtitle="${name} JavaDoc"
+            package="true"
+            author="true"
+            version="true"
+            packagenames="net.sf.saxon.*,org.w3c.xsl.*"
+            encoding="ISO-8859-1"
+      >
+      <link href="${j2se.javadoc}"/>
+      <link href="${jdom.javadoc}"/>
+    </javadoc>
+  </target>
+
+  <!-- Build everything -->
+  <target name="all" depends="jar,javadoc"/>
+
+</project>
diff --git a/dev-java/saxon/files/9.2-edition.properties b/dev-java/saxon/files/9.2-edition.properties
new file mode 100644
index 000000000000..bb5acee0b19c
--- /dev/null
+++ b/dev-java/saxon/files/9.2-edition.properties
@@ -0,0 +1,2 @@
+config=net.sf.saxon.Configuration
+platform=net.sf.saxon.java.JavaPlatform
diff --git a/dev-java/saxon/files/build-6.5.2.xml b/dev-java/saxon/files/build-6.5.2.xml
deleted file mode 100644
index 77e849d44e1f..000000000000
--- a/dev-java/saxon/files/build-6.5.2.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <compnerd@gentoo.org>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="project.name" value="saxon6.5"/>
-   <property name="pkg" value="${package.name}"/>
-   <property name="all.jar" value="${project.name}.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-	<path id="lib.classpath">
-		<fileset dir="lib">
-			<include name="**/*.jar"/>
-		</fileset>
-	</path>
-
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-	  <mkdir dir="${build}/META-INF/services"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}" classpathref="lib.classpath"/>
-   </target>
-
-   <target name="manifest" depends="init">
-	   <manifest file="${build}/META-INF/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-	  <echo file="${build}/META-INF/services/javax.xml.xpath.XPathFactory" message="net.sf.saxon.xpath.XPathFactory"/>
-	  <echo file="${build}/META-INF/services/javax.xml.transform.TransformerFactory" message="net.sf.saxon.transform.TransformerFactoryImpl"/>
-   </target>
-  
-   <target name="jar-saxon6.5" depends="compile,manifest">
-      <jar jarfile="${dist}/${all.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-         <fileset dir="${build}">
-			<include name="com/**"/>
-			<include name="javax/**"/>
-			<include name="org/**"/>
-			<include name="META-INF/services/javax.xml.transform.TransformFactory"/>
-			<include name="META-INF/services/javax.xml.parsers.SAXParserFactory"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="jar" depends="jar-saxon6.5"/>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath">
-      	<fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/dev-java/saxon/saxon-9.2.0.6.ebuild b/dev-java/saxon/saxon-9.2.0.6.ebuild
new file mode 100644
index 000000000000..2e6445b03cc8
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/saxon-9.2.0.6.ebuild,v 1.1 2010/03/28 17:35:21 caster Exp $
+
+EAPI="3"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV="$(replace_all_version_separators -)"
+
+DESCRIPTION="A XSLT and XQuery Processor"
+HOMEPAGE="http://saxon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
+
+LICENSE="MPL-1.0"
+SLOT="9"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+# virtual/jdk slot for external javadoc
+JDK_VER="6"
+# dev-java/jdom slot for external javadoc
+JDOM_VER="1.0"
+# dev-java/dom4j slot
+DOM4J_VER="1"
+
+CDEPEND="dev-java/ant-core
+	dev-java/dom4j:${DOM4J_VER}
+	dev-java/jdom:${JDOM_VER}
+	dev-java/xom"
+RDEPEND=">=virtual/jre-1.${JDK_VER}
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.${JDK_VER}
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+# prepare eclass variables
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+src_unpack() {
+	unpack "${A}"
+
+	### fedora-inspired remove
+
+	# deadNET
+	rm -rv net/sf/saxon/dotnet
+
+	# Depends on XQJ (javax.xml.xquery)
+	rm -rv net/sf/saxon/xqj
+
+	# This requires a EE edition feature (com.saxonica.xsltextn)
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java
+}
+
+java_prepare() {
+	# <major>.<minor> version
+	local version="$(get_version_component_range 1-2)"
+
+	# generate build.xml with external javadoc links
+	sed -e "s:@JDK@:${JDK_VER}:" \
+		-e "s:@JDOM@:${JDOM_VER}:" \
+		< "${FILESDIR}/${version}-build.xml" \
+		> "${S}/build.xml" \
+		|| die "build.xml generation failed!"
+
+	# prepare creates the dir for properties
+	eant prepare
+
+	# properties
+	cp -v \
+		"${FILESDIR}/${version}-edition.properties" \
+		"${S}/build/classes/edition.properties"
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars dom4j-${DOM4J_VER},jdom-${JDOM_VER},xom)"
+	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
+	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
+	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
+
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc build/api
+
+	use source && java-pkg_dosrc src
+}