Version bump, fixes bug #130568. Thanks to Juan J. García de Soria, Michael Jinks...
authorVlastimil Babka <caster@gentoo.org>
Sun, 28 Mar 2010 17:35:22 +0000 (17:35 +0000)
committerVlastimil Babka <caster@gentoo.org>
Sun, 28 Mar 2010 17:35:22 +0000 (17:35 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

dev-java/saxon/ChangeLog
dev-java/saxon/Manifest
dev-java/saxon/files/9.2-build.xml [new file with mode: 0644]
dev-java/saxon/files/9.2-edition.properties [new file with mode: 0644]
dev-java/saxon/files/build-6.5.2.xml [deleted file]
dev-java/saxon/saxon-9.2.0.6.ebuild [new file with mode: 0644]

index 217eae1545d177b603f3e2f8e51b177b233bb084..ce1967c0c84e84ae9e62a8f3c9ae230be3a131ee 100644 (file)
@@ -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
index e555101822a3112d9db4a4c767112d4d5f4d132f..d81312fc2cbcfbb09e2758c0cb7151d00c2c3e19 100644 (file)
@@ -1,10 +1,13 @@
-AUX build-6.5.2.xml 2394 RMD160 2540b4adff11c56d915cf563680caf23c656a583 SHA1 5e0fc0a0fe2c861dd7ac09543eb021e9c09fc558 SHA256 bc80a97b80b35e6105ab21b9894376efc0cf070f18532c193adb7f96591ececc
+AUX 9.2-build.xml 2061 RMD160 ef4cd9f1b3dc31fc26e9067c4efe0b0d564656ab SHA1 4daaab9fa70cc3cb7025abd4e7770fd6bf10ede1 SHA256 b319aec150c2ce260518e41eec4e8b164f0f49793f86a00f96b962cfe9fc60d2
+AUX 9.2-edition.properties 74 RMD160 ffc727ae4209396e6e50ac0e7988dba238f3d4ab SHA1 c8e2532ded7298fc8ca858bb667d397131d131ca SHA256 b520d14d6e7f6180efac9b992b598653a025a077e919bdbedc35c4165b78af3c
 AUX build-6.5.5.xml 2087 RMD160 885fd3071c4bff4b2b532962bff24b2ede6e7552 SHA1 256ac8bc32a62cc52283e91cb358065324a19089 SHA256 2037c4ac4840dbafedd3a7321840c2f2691784cb26241b1daa76332325b98279
 AUX build-8.4b.xml 4213 RMD160 fff7c1d2e66cdd86a41390ce4284fb141d4bd9e1 SHA1 32b281b62be73107a365f67fef48b8ec114d06c9 SHA256 8539556510bd074cb18780c7790b26ebc2a7780b24a11662fee4b8ee34f8e787
 AUX saxon-8.4b-jikes.patch 795 RMD160 8812654ba27cc693fd3182fea686d4b22115ed2d SHA1 b1b16a03f49ef4931d50c60a3210faf4aa3d4b4f SHA256 ae63fd5548fc4ceaa5bf34b8f5ad3602c6c272479fbc0903a1fb4a8000b374dd
 DIST saxon6-5-5.zip 3346162 RMD160 6d9ab0b603c4bb6b27affcbc8cad56bd3c02b96a SHA1 15e25fcf561ff173751ae992f2608f6f2e6204ed SHA256 a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4
 DIST saxonb8-4.zip 7266831 RMD160 9da35b8bdc632f1e758bdc101110ebe06b66f4f9 SHA1 a2a411f91bcfd054bfc7dfe4a59f20e4edb4fda7 SHA256 c47f0f88c765d246a3e6666228db050fba5089bc8eff426d1b23ef807d1c7ff0
+DIST saxonhe9-2-0-6source.zip 2942625 RMD160 6d3933089d9a556e194d98d2cc2c1a197da38444 SHA1 e8c0f3a45f842d32a4da8252364ddf2ff85e22f6 SHA256 4f15659cf8bb537b4b20f63cf060bf56f39453ab520fa912b2e9fe87e90a972e
 EBUILD saxon-6.5.5.ebuild 1321 RMD160 13141fb85faaa6c815d12bdec3899c4f6020aeb1 SHA1 d07e69d74d4d375b806bf469b2dcd142fab0d91e SHA256 4b7a6917a0722db8b8d851ae8e7f72431735ccc3e00766e19f72be28f31f4268
 EBUILD saxon-8.4b-r3.ebuild 1602 RMD160 bc76ccb29803612df7066704fb6e63bc1155cade SHA1 f5a39d5ab82fb2ce1894c84b029a8ae542e22f08 SHA256 0e382ad3a60767419ce07752ed15cfe20a27f7b7042105be1d2d0abd82835cf2
-MISC ChangeLog 3896 RMD160 658b2bf48ab2c134a77c0c13854975e64cac6798 SHA1 3d4389dafcebdabf578515dd8f4c79307f6d25b2 SHA256 36058c0344a1af43616f646375dc51ef2cc73455efffa35719d52a45d078b27c
+EBUILD saxon-9.2.0.6.ebuild 2299 RMD160 7d37fba01154b8bcf3e26c7646e8aaec79dbbc0f SHA1 d0b59faa0db989a9d80a6f5666996b8dd80095a4 SHA256 1b65df803a80b5dbf6e7ca32ee71a9b608943f4e6225c8050cda507e96315081
+MISC ChangeLog 4194 RMD160 adbc6c5365789f8e281b5250c7501a5dddf19a14 SHA1 1bd18750a54081021eda2d0279bcabf0983ef671 SHA256 487cf153f9ee95893402f1e3fb15ddabea2d859599f8f88804c2f4dc38501c3e
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/saxon/files/9.2-build.xml b/dev-java/saxon/files/9.2-build.xml
new file mode 100644 (file)
index 0000000..3bd9a64
--- /dev/null
@@ -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 (file)
index 0000000..bb5acee
--- /dev/null
@@ -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 (file)
index 77e849d..0000000
+++ /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 (file)
index 0000000..2e6445b
--- /dev/null
@@ -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
+}