[gentoo-commits] proj/java:master commit in: dev-java/saxon/

[gentoo-commits] proj/java:master commit in: dev-java/saxon/

[James Le Cuirot]

commit:     c480e9b790dc3a21d6a3c9e726190348734715c6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Aug  6 20:31:02 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 21:34:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=c480e9b7

[dev-java/saxon] Sync with tree, copyright, EAPI bump, keywords

 dev-java/saxon/Manifest                            |  2 +-
 .../{saxon-8.8.ebuild => saxon-8.8-r1.ebuild}      | 43 +++++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 93a410e..06ed897 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -1 +1 @@
-DIST saxon-resources8-8.zip 9722198 SHA256 8ab114ccbb875a43adfd9e541044e5d02ee71b6095cd3960459770c9c0d705e9
+DIST saxon-resources8-8.zip 9722198 SHA256 8ab114ccbb875a43adfd9e541044e5d02ee71b6095cd3960459770c9c0d705e9 SHA512 e33e3925eab7eeda774aa1a3af0d5e9f6dda23b25ba2370a14bf55cf96a74d57e9c6926bce69357b6b47bbbc882e6163f3c789fba85fd76fd41f7f9b0f038c65 WHIRLPOOL 71f36a335c943b704230cf46f7cd1b831ac2d8455f521f0c8a39004e86edc404f55a25034201dabdcbf7aa5efd3fb5a9ad977b0c1d47a17f08bad9b97cac7d6e

diff --git a/dev-java/saxon/saxon-8.8.ebuild b/dev-java/saxon/saxon-8.8-r1.ebuild
similarity index 60%
rename from dev-java/saxon/saxon-8.8.ebuild
rename to dev-java/saxon/saxon-8.8-r1.ebuild
index f636d04..bd4280b 100644
--- a/dev-java/saxon/saxon-8.8.ebuild
+++ b/dev-java/saxon/saxon-8.8-r1.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/saxon-8.4b-r1.ebuild,v 1.2 2006/07/22 21:34:41 nelchael Exp $
+# $Header: $
 
-inherit versionator java-pkg-2 eutils java-ant-2
+EAPI=5
 
-DESCRIPTION="The SAXON package is a collection of tools for processing XML documents: XSLT processor, XSL library, parser."
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tools for processing XML documents: XSLT processor, XSL library, parser"
 MY_PV=$(replace_all_version_separators -)
 SRC_URI="mirror://sourceforge/${PN}/${PN}-resources${MY_PV}.zip"
 HOMEPAGE="http://saxon.sourceforge.net/"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc source"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples source"
 
 COMMON_DEP="
-	dev-java/xom
-	~dev-java/jdom-1.0
-	=dev-java/dom4j-1*"
-
+	dev-java/xom:0
+	dev-java/jdom:1.0
+	dev-java/dom4j:1
+"
 # Uses javax.xml.stream that is included
 # starting with 1.6. Could also integrate
 # support using dev-java/jsr173 I guess
@@ -34,21 +36,19 @@ DEPEND=">=virtual/jdk-1.6
 S=${WORKDIR}
 
 src_unpack() {
-	unpack ${A}
+	default
 
-	cp ${FILESDIR}/build-8.8.xml build.xml || die
-
-	mkdir src
-	cd src
+	mkdir src && cd src || die
 	unpack ./../source.zip
-	#Nuking the .NET stuff until I have the time to make it work
-	rm -r net/sf/saxon/dotnet || die
+}
+
+java_prepare() {
+	cp -i "${FILESDIR}/build-8.8.xml" build.xml || die
 
-	#epatch ${FILESDIR}/${PN}-8.4b-jikes.patch
+	#Nuking the .NET stuff until I have the time to make it work
+	rm -r src/net/sf/saxon/dotnet || die
 
-	cd "${S}"
-	#rm -v lib/*.jar
-	mkdir lib && cd lib
+	mkdir lib && cd lib || die
 	java-pkg_jarfrom jdom-1.0
 	java-pkg_jarfrom xom
 	java-pkg_jarfrom dom4j-1
@@ -63,5 +63,6 @@ src_install() {
 		java-pkg_dojavadoc dist/doc/api
 	fi
 
+	use examples && java-pkg_doexamples samples
 	use source && java-pkg_dosrc src/net
 }