gentoo resync : 29.12.2022

3 files changed, 2 insertions, 69 deletions

diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index fe9c883b837f..13ce0b49fc27 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,4 +1,3 @@
 DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
-EBUILD xmlgraphics-commons-2.7-r1.ebuild 2099 BLAKE2B 29fb7aa42f6475cf5dceafe9b07b4ebdf0d713d666182e3b3e0ef6dd1e3b624e3ba98d917cfb5d74a46b42e797eff5f664364f6f4b206450a7b229cbc38354d5 SHA512 363ad46823ebd9fa7d218aa790ea429e97b3160478d85f866bec1a4345eb79d3f34e8809e1a6645f8a15d8743ce59f2bdca11a1985c771d4f706743b01f4436b
-EBUILD xmlgraphics-commons-2.7.ebuild 1820 BLAKE2B 3622f63c6571d09b621507b4f2a3e641e29f3e38a0bf1c6d6971d6c703518980c2d08de4e7f901b636c42890016150ed78a11f166957b940c77b6cfa8e3a8b73 SHA512 4a891359802ed69d9844415cdd3f7022a16fed7affe236ad807d68276d9b4b9cbcb9b888a9d94c8c4d3a45c0bd5eb22002aeca751882feaa82c09add7640070f
+EBUILD xmlgraphics-commons-2.7-r1.ebuild 2095 BLAKE2B 58a8aa16af88bd0cb888efa1e79b21c9601b09e2d6fc408da27062270dddd0ed41c37c6451050bcdc05fbedbe12d89f09cb5142f4dd62cb1aa57e44135ab1126 SHA512 30e5b801298c0bce4e6aed077226fdbc9cd4c558a24046a552b5df2372926c0906a3d3f15a6c4cfe3c98ce797d60042202fe63e19c493b5a8ebfb55583de2ec3
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
index 2bc679b79fbe..967964f74e06 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.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"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
deleted file mode 100644
index da5532327d1f..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
+++ /dev/null
@@ -1,66 +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 mirror://apache/xmlgraphics/commons/source/2.7-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.7.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.7"
-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"
-
-# Tests don't even compile with that old mockito version.
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:1.3.2 -> >=dev-java/commons-io-2.11.0:1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:2.28.2 -> !!!suitable-mavenVersion-not-found!!!
-# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:0
-		dev-java/xml-commons-resolver:0
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README )
-
-S="${WORKDIR}/${P}"
-
-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"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}