gentoo resync : 20.03.2022

3 files changed, 2 insertions, 79 deletions

diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index d53b0ebb1229..5fd20ec46321 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,5 +1,3 @@
-DIST xmlgraphics-commons-2.6-src.tar.gz 2718577 BLAKE2B 7be3565d2224adcb1a804a089f6f52810852117a7c13129822bd1a9f27f7c10abf186b5b7d703c0351ef76d50ddb741fae65094af35d2037044ad56220989dfe SHA512 bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd
 DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
-EBUILD xmlgraphics-commons-2.6.ebuild 2254 BLAKE2B 7ca08e13c790345faa8fe692f990d57844acfe3783c85c5bab81ca76d2228fade803134af6730f3d729410b7e52547b620b5a8e023049b9935d2fc49be73b2b3 SHA512 c43bcf61fff6a28b5acf844165ad3f574b23ed59cf77984b3accfc00da07158793a0123316e88c2840919971b698d044c340418d92c67b90ff93b4b148fe9c98
-EBUILD xmlgraphics-commons-2.7.ebuild 1824 BLAKE2B 0d4c08f0640e149b8f6ea258abb91d1e1a5f847608e635bbe818c51ab3cfeb7712a094ee18e48577ff2b585d14e93dde2e3b981af167fc9b918404554ac3797a SHA512 311c751a03dfdfe42ad74dced141743ac2239b57e2d767821ea09d4a44753d188662d130fc64469fb1913baaac88909de8d2b24046b8ed2e8c59026edc0a6e48
+EBUILD xmlgraphics-commons-2.7.ebuild 1820 BLAKE2B 3622f63c6571d09b621507b4f2a3e641e29f3e38a0bf1c6d6971d6c703518980c2d08de4e7f901b636c42890016150ed78a11f166957b940c77b6cfa8e3a8b73 SHA512 4a891359802ed69d9844415cdd3f7022a16fed7affe236ad807d68276d9b4b9cbcb9b888a9d94c8c4d3a45c0bd5eb22002aeca751882feaa82c09add7640070f
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild
deleted file mode 100644
index b0f4e8365620..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom /var/tmp/portage/dev-java/xmlgraphics-commons-2.6/work/xmlgraphics-commons-2.6/pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.6-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.6.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.6"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML Graphics Commons"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: /var/tmp/portage/dev-java/${P}/work/${P}/pom.xml
-# commons-io:commons-io:1.3.2 -> >=dev-java/commons-io-2.8.0:1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CDEPEND="
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: /var/tmp/portage/dev-java/${P}/work/${P}/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.8.5 -> >=dev-java/mockito-1.9.5:0
-# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:0
-		dev-java/xml-commons-resolver:0
-	)
-"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( LICENSE NOTICE README )
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="commons-io-1,commons-logging"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,xml-commons-resolver"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-# Tests run: 189,  Failures: 12
-JAVA_TEST_EXCLUDES=(
-	"org.apache.xmlgraphics.xmp.XMPParserTestCase"
-	"org.apache.xmlgraphics.image.codec.tiff.TIFFImageEncoderTestCase"
-	"org.apache.xmlgraphics.image.loader.impl.ImageLoaderImageIOTestCase"
-	"org.apache.xmlgraphics.ps.dsc.ListenerTestCase"
-	"org.apache.xmlgraphics.io.XmlSourceUtilTestCase"
-)
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
index 62a758d133f1..da5532327d1f 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Tests don't even compile with that old mockito version.
 RESTRICT="test"