gentoo resync : 20.03.2022

4 files changed, 48 insertions, 47 deletions

diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
index acec986b79ae..1fb6ce484419 100644
--- a/dev-java/mchange-commons/Manifest
+++ b/dev-java/mchange-commons/Manifest
@@ -1,5 +1,5 @@
 DIST mchange-commons-0.2.10.tar.gz 218657 BLAKE2B f073aac7a560c31ea71c4114c5128de55d4b384c9579f649e0ca28c1257be64d22bce406b241f3b7665c5ec0e4cdc64c079c0f27f328e54803612abae43aef42 SHA512 098712b3b61d74a832699b6c92c75fdb243260400c1180511b5299a25553660750261ff8c2cf322350afd3d4b84fdf9900c26123b56add0f772e26e4f3ed8d7b
-DIST mchange-commons-java-0.2.10.zip 773768 BLAKE2B abfcc70e109431afcc514e80a2dc3585a90de07f8cb800d0a9807b72ad10f0488ad0a8b7a641c3de7a91029e3d6b25590985df85e592d90d0af42728389d7e28 SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9
-EBUILD mchange-commons-0.2.10-r1.ebuild 807 BLAKE2B f0c69fadee10ef03e35d1349ea7183d8cdd95c628cadae5f788550687f2743c4d5a6a49cdeae1c393613c774ab068cc8ca4c7bc7e7c01e7358b085da3e17e129 SHA512 09a9efdafe38296488b74de2ef42ecb324ca80e67f0222a24b2d6c33168b0eec05256effa5480ccd89563e2958ea927fac07b84cca52e1f0260c71694a827b82
-EBUILD mchange-commons-0.2.10.ebuild 775 BLAKE2B db834708c256a68a2c40460920c153e5c29c7c51bbc37143f61226893d0f31074437f148574680dc71dd4dd2a381b7357ecaefdb8bba8ec7af0272a6445bbcff SHA512 53445826420dbfbfbe553f3e6460c58012b9a79ee0fd28173e79c4ce4ff1c571947133b56e4a71159b69ca868cd5837a3b1585426064b520b649523460411584
+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
 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
index bbae432a3666..6df76356d302 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/swaldman/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz -
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="doc source"
 
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
deleted file mode 100644
index da085079a41a..000000000000
--- a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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/${MY_P}.zip"
-
-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.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.6"
-
-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
new file mode 100644
index 000000000000..8e2886a930c9
--- /dev/null
+++ b/dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom src/main/maven/pom.xml --download-uri https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild mchange-commons-0.2.20.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.mchange:mchange-commons-java:0.2.20"
+#	JAVA_TESTING_FRAMEWORKS=""
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="a library of arguably useful Java utilities."
+HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
+SRC_URI="https://github.com/swaldman/${PN}-java/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/log4j-api:2
+	dev-java/log4j-12-api:2
+	dev-java/log4j-core:2
+	dev-java/slf4j-api:0
+	dev-java/typesafe-config:0"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/mchange-commons-java-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+#	# https://github.com/swaldman/mchange-commons-java/blob/master/build.sbt#L29-L31
+#	JAVA_TEST_GENTOO_CLASSPATH=""
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS="src/test/resources"