gentoo resync : 12.05.2022

3 files changed, 4 insertions, 112 deletions

diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index 3c47d516e6a3..d8cea9441c1a 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,5 +1,3 @@
-DIST woodstox-core-6.2.7.tar.gz 5250524 BLAKE2B 3f5be53a459e8999cb53b3e89398bd94439815dd58cc30df7e1b71b9e98ef94b7704d04ae20401d39afff67210e423a4c5a148909a3a7ed750f7e0e24146c24a SHA512 0e2e11607c26d97509708523c4617d9e75fc529fbf5294b25deba5ca570797692e31e65621c77e7c4d9bdf0b3dee4b3c4fe0486a1e23d19dc41035d7d710668e
 DIST woodstox-core-6.2.8.tar.gz 5250255 BLAKE2B 69e45da9c7e09652ffc45b366359ae12954ad0450157d8639833d41600958d10ff1203502c926f0f23cd3e3d03dbc83378a9614e5eb19367fb60fad1232f4dd8 SHA512 c5af386891ab63fb2efc8510353e35c20fa157048631c809ed3d7e070b377ef5c21ffb1b7a0f9e597113db714ebc778951ac8a8e049c3d8291a89c3a0e7a044e
-EBUILD woodstox-core-6.2.7.ebuild 3569 BLAKE2B 1e9392272233dbe42a3cd4ae8735de1731526a35018ce6180a5049785e23e5735b930d250fdbeba57640af26584a51ddc17d2d073f8299188e4549b57c13c319 SHA512 58bdcc159675fd5bad2037e24e4fa694b4ca8a227a649f241f6d5acda4ca35f3b2f8f89cd15309c06f7c0e54bd32f3eb709a0ca11486ec5638e4de792048e01a
-EBUILD woodstox-core-6.2.8.ebuild 3021 BLAKE2B e9442b0ed14f543cb80e752c30c6d8b06b5847217b52472c4c6d42b2249e707ae650a2935d68131876c63e7d394078c8b8726e78e4f528111e1905559a5dfe67 SHA512 5e5031208a0bb7e4018945f56bfecfa358de928f95ef5206f6824aa386828504f80486b703cfdcfe0cee1ceb168076223246f99c344ac009dd2832b22ebeb1b9
+EBUILD woodstox-core-6.2.8-r1.ebuild 3010 BLAKE2B 3d26fc576b274efadbbb614c0b75309d5339dc6fa7eab5f467401365aeccd39c6dbc7ae625d1cfe0c4f9aac9baaa7407bcc98015ac0a6917476b5e05809676ca SHA512 23b4ce56d445aa7a47c6f4aa4be55e58170ec334c17466634601c0bf68a69d50327700803c6bc23af5260ff26e988f1c53b6aab57b9780fe0301a7063364377e
 MISC metadata.xml 308 BLAKE2B f2c06b12854fb8659cf5b265400a53de6b0b10753da1438362a410f7831cab326887b09fb23b9678fe4939a7d33480fcdc6f2295c975e4fed021e2597e5349ce SHA512 9cc92aafb6c2e2c0226d2f59675a381f311028d149a731c5dbbb388d7174a9f69d6b47fc49d3ed60f8fc7af84b0b999c4dea5eb13477c21024f75e90736ca0a3
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild
deleted file mode 100644
index be656d0b16aa..000000000000
--- a/dev-java/woodstox-core/woodstox-core-6.2.7.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/woodstox/archive/refs/tags/woodstox-core-6.2.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.2.7.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.2.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
-HOMEPAGE="https://github.com/FasterXML/woodstox"
-SRC_URI="https://github.com/FasterXML/woodstox/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# net.java.dev.msv:msv-core:2013.6.1 -> !!!artifactId-not-found!!!
-# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-# relaxngDatatype:relaxngDatatype:20020414 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
-	dev-java/msv:0
-	dev-java/relaxng-datatype:0
-	dev-java/stax2-api:0
-	dev-java/xsdlib:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.felix:org.osgi.core:1.4.0 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/osgi-core-api:0"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/woodstox-${P}"
-
-JAVA_CLASSPATH_EXTRA="osgi-core-api"
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# Upstream: Tests run: 864, Failures: 0, Errors: 0, Skipped: 0
-	# "No tests found in ..."
-	wstxtest.vstream.BaseValidationTest
-	wstxtest.BaseWstxTest
-	stax2.vstream.BaseStax2ValidationTest
-	stax2.BaseStax2Test
-	stax2.wstream.BaseWriterTest
-	org.codehaus.stax.test.BaseStaxTest
-	org.codehaus.stax.test.wstream.BaseWriterTest
-	org.codehaus.stax.test.stream.BaseStreamTest
-	# "... has no public constructor"
-	wstxtest.stream.BaseStreamTest
-	wstxtest.wstream.BaseWriterTest
-	stax2.vwstream.BaseOutputTest
-	org.codehaus.stax.test.vstream.BaseVStreamTest
-	org.codehaus.stax.test.evt.BaseEventTest
-	# Upstream does not run these:
-	failing.TestBasicSax
-	failing.TestExtLocationInfo91
-	failing.TestRelaxNG
-	failing.TestW3CDefaultValues
-	failing.TestW3CDefaultValues
-	failing.TestW3CSchemaComplexTypes
-	failing.TestW3CSchemaTypes
-	failing.TestW3CSchemaTypes
-)
-
-src_prepare() {
-	default
-
-	#rc/moditect/module-info.java:32: error: package com.ctc.wstx.shaded.msv.relaxng_datatype does not exist
-	#    provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl;
-	#                                                     ^
-	#src/moditect/module-info.java:32: error: package com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl does not exist
-	#    provides com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory with com.ctc.wstx.shaded.msv_core.datatype.xsd.ngimpl.DataTypeLibraryImpl
-	sed -e '/com.ctc.wstx.shaded.msv/d' \
-		-e '/org.codehaus.stax2.validation/d' \
-		-i "src/moditect/module-info.java" || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild b/dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild
index d547050265ff..53a600676959 100644
--- a/dev-java/woodstox-core/woodstox-core-6.2.8.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
@@ -41,13 +41,13 @@ CP_DEPEND="
 # test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	dev-java/osgi-core-api:0"
 
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
-DOCS=( LICENSE {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
 
 S="${WORKDIR}/woodstox-${P}"