gentoo resync : 06.04.2022

3 files changed, 2 insertions, 47 deletions

diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
index 1fb6ce484419..9450c084b276 100644
--- a/dev-java/mchange-commons/Manifest
+++ b/dev-java/mchange-commons/Manifest
@@ -1,5 +1,3 @@
-DIST mchange-commons-0.2.10.tar.gz 218657 BLAKE2B f073aac7a560c31ea71c4114c5128de55d4b384c9579f649e0ca28c1257be64d22bce406b241f3b7665c5ec0e4cdc64c079c0f27f328e54803612abae43aef42 SHA512 098712b3b61d74a832699b6c92c75fdb243260400c1180511b5299a25553660750261ff8c2cf322350afd3d4b84fdf9900c26123b56add0f772e26e4f3ed8d7b
 DIST mchange-commons-0.2.20.tar.gz 231274 BLAKE2B f13d82d8a9f67a81c0fe69bd2d59e4ee88100c21067e454ba81ba5b5f60761c2352e8f2303c12e1ab0d54027ae9e7daca76f4e8308417a8e933d5a4c8cc0ad73 SHA512 d9019ca73f77f3f629c54bb65416f92b0a2c2fe5b23ef32cc48b4a951d505d8ba89f0ab71654b8e5d5983e4237c5c4e15c529abbb91ef0abdbff989806c2e44f
-EBUILD mchange-commons-0.2.10-r1.ebuild 804 BLAKE2B 691dfddfcb78346e6032d98acc9846a0e606f60c588ceb6fdaa8f2b5287653a1cd9a92c73b4161e055bafbc1e97f440fe874f46920fa37c2451d331a9c18a132 SHA512 c1398a4b55fe890961d6e2ebc63b38d59d9f7f1d6f0d78d0a4e123e5ab3c3de9a1c187cb9a203d294e4ed4fa6a29c3c0cf18be6ef73546dd79a98e6c3dc8ffcc
-EBUILD mchange-commons-0.2.20.ebuild 1347 BLAKE2B d8e8a3d19c4fb712febaae966c181fdb4951bd9a4db2d61197771982b64087c3f00b93ebd0b252abcdd22c02507e21d664bf321bb0ff61918381861e31d1f48f SHA512 b0f4a0779f5755c11f0b81ced62e3d2b31c8922b3894d3d44add475994f0845cde1c25252f58e1de84489f26119870f00c17aa4bf54d7e1a0827ec786a4dd4ac
+EBUILD mchange-commons-0.2.20.ebuild 1344 BLAKE2B 7113783f8c8d611ef638aec6ab5ef42ac588a9c16a8b3e146750384ebe2ac391bbd9ad24f9cd7f1094ba6e6e5007f2cb2552792e8e195b889c08a9e1f73fc34e SHA512 54d7256acc4386eed1f86d0c7c11035bfc5ab9b6314380901faeab2a27345e6d8051c9efcc2268a0ffc305381a55fe06c4bd66488449bb5028875f1d502fe122
 MISC metadata.xml 341 BLAKE2B 12a8c6400c7e33d2c48d1421066d1f653f0ad0055743be43fe646824a111c879d9e94baea50a6837e4b58584e06d733d83070e60ce92e12957878265edfc8266 SHA512 9a31c179d0086aa0b461544594472f6ecae3fb0c4aa1585c8dcf49ab20f5b9dd1aa48e435cc1195d5f5509ece1a231a644264e4c91ceefc6bf87d99c2566122a
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
deleted file mode 100644
index 6df76356d302..000000000000
--- a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="a library of arguably useful Java utilities"
-HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
-SRC_URI="https://github.com/swaldman/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE="doc source"
-
-CDEPEND="
-	dev-java/log4j:0
-	dev-java/slf4j-api:0
-	dev-java/typesafe-config:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-JAVA_SRC_DIR="src/main"
-
-JAVA_GENTOO_CLASSPATH="
-	log4j
-	slf4j-api
-	typesafe-config"
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
index 8e2886a930c9..9ad7bcf8724b 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/swaldman/${PN}-java/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="EPL-1.0 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/log4j-api:2