gentoo resync : 12.05.2022

5 files changed, 4 insertions, 146 deletions

diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 3437a391ef33..fc77c65fa859 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -2,8 +2,6 @@ AUX 9.2-build.xml 2061 BLAKE2B fb4e505f9308caf2300b7a1159ff20a973576d974544b1be0
 AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13a97b2994496dd80e1c4e3cac893b35f813bccf4e0a877c7c3f1a6c5c12a9c6005b82efb2c42a70a49e93dc SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02
 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 880 BLAKE2B 2916359129a0460531c31e5b7d511ba1685bc685b569e5c76d342423b3ecf5c8a357840cf45f4e0d92cc3954ce7bb457da51dcd06cdc55d5fe4ba2657a2efabd SHA512 978932d30eb0374bd527e40bb6be7a27c59c64c60e105bd815778a40d1cddd6f99ad70ed35371fe00637878951797969db3fdb9b1e2f492612c1286ac2dad50e
-EBUILD saxon-6.5.5-r3.ebuild 995 BLAKE2B ad6be49a087782483cb99b00d3ea5ea7a531aab08efbf5bb7585b11ec3c6aaf982d6d8eff92037e99b8aa3a0b97e8736bd791743ebe13d86060e4a098e4f201e SHA512 143033c03b7937b53ab03387de72d4b9338b01b2af92807ab3c72e2e7a0fe5eb4a3413ecc14c5eee32f9c7da3a607eb37ba08d14bfae58b3d359d806698c13a4
-EBUILD saxon-9.2.0.6-r2.ebuild 1977 BLAKE2B da97c782b3c1654b5baf8833de0c5e007f40b55780cc02a4eef056991cf1d250c9f82237615642ba71c30acb7d3bb4146f0ad01c314070b058dcdc9b14ec03ac SHA512 88cd0d289c424aea55ca46abee3cfe6f16a9e73976a68c23c2c84431cdbe151cef36f476ab14c10ac8f7c47afb5ba023a4db5548c1a21fffece73b6cf7ddb5b6
-EBUILD saxon-9.2.0.6-r3.ebuild 1950 BLAKE2B de14cd32ee61d1c7016f276634b63d77b21eaff832c15cfe2d380c0769eeba04621a97cfa33d71a8ce3c3394930482f08fe69871b00028f6fafc691244313deb SHA512 fd1ed9458b8de7b9ea7e05bbb07b72a96162594350391eef5de212d5d933635cb392be466ccc56c0b147c4a0a578615b7d57c2099895b88a99921fcb0248288a
+EBUILD saxon-6.5.5-r3.ebuild 993 BLAKE2B 96ab5a23fc57bd1ece66cb1c8a851f6f67acefed4a58efd62f129ac06c2044377a0ab414e664359e4f17edce3359f26eb3ca391447a34fd1b68a97027a4e6df8 SHA512 dec6f8838700af7285308dd7bbeca3bdd36bb4b1feb7e82a697c48302d59b46aa2f2a87d6632cce852be900d44eacda5c62ae96ea67f0d6ba400a9ec37478f3b
+EBUILD saxon-9.2.0.6-r3.ebuild 1948 BLAKE2B b58f35ba01f73ea74fdb609535549d6b18face2ed0a338916efb8c06f26a4fb1c523717edfae4ef056d58908c0b34adebcc7111f910d15823fc7ea4c0f419941 SHA512 b27825c39664b21d23330bf9011d8b1f57543117dd58f28689aa2e642f6a03bf253e3504d684f1626835dac17581442ec5770f08885844ae373b3daa20c67eeb
 MISC metadata.xml 312 BLAKE2B 819738845b7b0a9a9fcc19e4997fdfdaf55b820253d58ea32b1fac35dab2b5760e4cdadd38607b54df2f3bc2b10eee0d747d59c6785ecb3f1b3ca3a68e428be7 SHA512 f798aabc41fc786a18b25c42ac3201b8f2d3e665397f53bc1988531f8ea75ce0d8517af43dadf6fac433d8f689f25dc7f6593c83d941feac5a2d14fe58c82fd1
diff --git a/dev-java/saxon/saxon-6.5.5-r2.ebuild b/dev-java/saxon/saxon-6.5.5-r2.ebuild
deleted file mode 100644
index e33a43038e65..000000000000
--- a/dev-java/saxon/saxon-6.5.5-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple versionator
-
-MY_P="${PN}$(replace_all_version_separators -)"
-
-DESCRIPTION="Set of tools for processing XML documents"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://saxon.sourceforge.net/"
-
-LICENSE="MPL-1.1"
-SLOT="6.5"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jdom:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="jdom"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	unpack ${A}
-	unzip -qq source.zip -d src || die "failed to unpack"
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples samples
-}
diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild
index 49603d408175..f104b7ae35ad 100644
--- a/dev-java/saxon/saxon-6.5.5-r3.ebuild
+++ b/dev-java/saxon/saxon-6.5.5-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
 
 LICENSE="MPL-1.1"
 SLOT="6.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="dev-java/jdom:0"
 
diff --git a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
deleted file mode 100644
index 4332edc035b1..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/xom:0
-	dev-java/jdom:0
-	dev-java/dom4j:1
-	dev-java/ant-core"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-# prepare eclass variables
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-src_prepare() {
-	default
-
-	# Fedora-inspired removal.
-
-	# deadNET.
-	rm -rv net/sf/saxon/dotnet || die
-
-	# Depends on XQJ (javax.xml.xquery).
-	rm -rv net/sf/saxon/xqj || die
-
-	# This requires a EE edition feature (com.saxonica.xsltextn).
-	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
-
-	# <major>.<minor> version
-	local version="$(get_version_component_range 1-2)"
-
-	# generate build.xml with external javadoc links
-	sed -e "s:@JDK@:1.6:" \
-		-e "s:@JDOM@:1:" \
-		< "${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" || die
-}
-
-src_compile() {
-	local gcp="$(java-pkg_getjars dom4j-1,jdom,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
-}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
index a1b75f2207b4..f2a12503a449 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV/
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="
 	dev-java/xom:0