gentoo resync : 16.04.2018

3 files changed, 2 insertions, 100 deletions

diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 9bef71ed39e9..aecca257cda8 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,6 +3,5 @@ AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
-EBUILD saxon-9.2.0.6-r2.ebuild 1966 BLAKE2B 305d50270c2603fa68dac2f6a43a3d1c6ee9ad0d7d964bc6974364fa5faa907e76643add8a25e8057bf69d521c0721678ebe05a1c17873ad585fb2a311273a95 SHA512 1485a7ae386034895a82f2ac638fd843df9c913cda57fa78b982b5b9900053fb4f57935cdcb33038ecc874908f68f90c4a1b7142c8b41591da35782c3013491d
-EBUILD saxon-9.2.0.6.ebuild 2191 BLAKE2B a383bf6d0e8cde78e45945ec028fa2fe5ff0a21051b4a05eb325147c88adc0376b6c250339da2fbcc99a8495d3975845aa832cd22c2cb235e4747cee333ba70d SHA512 c20b14dbad9faf4306a7ac0a1ccb3c49388197521185e4d6bbc3b9bfed9535432105cb3645071ba4ca0ed2faf1a7e40b2f6cbcf1e48abf1d6e305a28fcc29f85
+EBUILD saxon-9.2.0.6-r2.ebuild 1965 BLAKE2B a6fc49263e9322f3172a97a85721c614157449f3f9582ac9a74a5649c28078fda0588bd4ae3dea4367aae8f7b06eba69b64dcd13bac690303088755ba8298eef SHA512 204c2924bf4a4e9610a8b3e1377c47185129d92f714358df1f41c8a5191b15f9d86e74ac32af3c36232b411e1273ba870b74da464d5b76efeb1d3df941e07b9c
 MISC metadata.xml 311 BLAKE2B fdce161da5c8394b66ee6b1bcebbccd863cd5e70291afab04400c4d806afc955f803b5c5aa15601157f2784e434baf505dcbebdbff9817fe960961f8108d3b63 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126
diff --git a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
index 8851b65890bb..d538db728ef6 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CDEPEND="
 	dev-java/xom:0
diff --git a/dev-java/saxon/saxon-9.2.0.6.ebuild b/dev-java/saxon/saxon-9.2.0.6.ebuild
deleted file mode 100644
index 9cb4a84da3ce..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~arm ppc64 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
-}