gentoo resync : 29.12.2022

5 files changed, 109 insertions, 4 deletions

diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 4e1ed65cee79..9416dd57ee54 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,5 +1,9 @@
 DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
 DIST mockito-4.4.0.tar.gz 1030274 BLAKE2B 41b64456b8bf083f69889fdf7fb891a0bb790af8eb897fd0ba5ceca47050944fec102c33badcf6a68621a9fadc33439405b9ca307794f865637c3143c474ba3d SHA512 f0f4c3f585aad63a357d8b8f924124961e7fffdf95607945ae073ab32a05be6ff08794d3edfc60dea21b65ef7c827a4872315c2372d6a9aa822cf8700a08025f
+DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6
+DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7
 EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1
-EBUILD mockito-4.4.0.ebuild 1238 BLAKE2B 1e7ec3663d07e3eaa70b452a8f91fe19dc3a357e7d2203fd0464d6773d4b4b0b577f0494af57af86c2c767c5edb8c633e2a65c3b54be54cd6577c331e4560732 SHA512 f9054dce19d3ba277c00c937296df0e454b96cfb92c22e4771811ed4e80ee12c60db38f1a6cc7b75b7a3153f30a460d2cd848ff7caa535c1869db733ecfeb407
-MISC metadata.xml 369 BLAKE2B 020d7c2b9c3074a24bb20151033dcf3deec8c5b27b9aa42da5d1aec9e25a8e405ff13d79fe3491110f22dba9ab7840305a65f523ac35a6882f5c6b9b18cbce13 SHA512 699c652ccd5437fa7449fc8433d3760a9b515db6bdc692ca88166757abbe8330cda485cd8c545cd95c844507400bfc7a1576310275609cf0100bd245ff8a8ca8
+EBUILD mockito-4.4.0.ebuild 1234 BLAKE2B 3b0d2fb7e8632c09c532d0a47b199bbf5159c855854d4ecaf36b72804e39bad146a38c5966e30a2199458e296a750a14357175f9b3be79e09ac6f1f1f1a226b6 SHA512 adfb0bf0c83078cd8a9bca1917c99f3128c0b8e876359a170d5d16f15cbfb3805484dd42acc8b63a76bfd8b9dd49d5f2b90cd30c6e4ffe74265d74089a09818e
+EBUILD mockito-4.6.0.ebuild 1237 BLAKE2B d1617ef96068aa664e3f1b75ff6d9128682c36c6a20c0aa1f291a283a5ccd63c45809bbf0a80271f2a6179ea44a04e437e611578e98a648c768bd750f861f1db SHA512 1f99f9ddb864787c3c6d9c7c613d24f61475122f7da98869a65bc0978f3bb1a48de118389c862a7368b6ed7af5523cdf8f216e44e31b683eaa183316c7225778
+EBUILD mockito-4.6.1.ebuild 957 BLAKE2B 3894338d4b760bcdb9e3394122a5bc581e234eb3241af9415804f1af2d0a97ad10292663973374f4185d25eac5309b502d214ae95dc96b7c853601bfd1bdb169 SHA512 f5203b10e1f2a8389923d14ca3926b4dfdb4aa76a12428d3d6e88d37286614be5fecd887d39637b2f1c45fa35ea55017392e6abb39eb159640d50b99c11968b3
+MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/metadata.xml b/dev-java/mockito/metadata.xml
index cb23ba0fb054..a48a1160ecfd 100644
--- a/dev-java/mockito/metadata.xml
+++ b/dev-java/mockito/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">mockito</remote-id>
 		<remote-id type="github">mockito/mockito</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/mockito/mockito-4.4.0.ebuild b/dev-java/mockito/mockito-4.4.0.ebuild
index f8a554b3ba6b..676fcb4d2985 100644
--- a/dev-java/mockito/mockito-4.4.0.ebuild
+++ b/dev-java/mockito/mockito-4.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://codeload.github.com/mockito/mockito/tar.gz/v${PV} -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}-core-${PV}.pom
diff --git a/dev-java/mockito/mockito-4.6.0.ebuild b/dev-java/mockito/mockito-4.6.0.ebuild
new file mode 100644
index 000000000000..f586f9b27a4f
--- /dev/null
+++ b/dev-java/mockito/mockito-4.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests not enabled, wants junit-jupiter.
+# "${S}/settings.gradle.kts"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.mockito:mockito-core:4.6.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mockito mock objects library core API and implementation"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${PN}-core-${PV}.pom
+# net.bytebuddy:byte-buddy:1.12.8 -> >=dev-java/byte-buddy-1.12.8:0
+# net.bytebuddy:byte-buddy-agent:1.12.8 -> >=dev-java/byte-buddy-agent-1.12.8:0
+
+CP_DEPEND="
+	dev-java/byte-buddy:0
+	dev-java/byte-buddy-agent:0
+	dev-java/junit:4
+	dev-java/objenesis:0
+	dev-java/opentest4j:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+# Runtime dependencies
+# POM: ${PN}-core-${PV}.pom
+# org.objenesis:objenesis:3.2 -> >=dev-java/objenesis-3.2:0
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/mockito/mockito-4.6.1.ebuild b/dev-java/mockito/mockito-4.6.1.ebuild
new file mode 100644
index 000000000000..6b2aaec5f590
--- /dev/null
+++ b/dev-java/mockito/mockito-4.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests not enabled, wants junit-jupiter.
+# "${S}/settings.gradle.kts"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.mockito:mockito-core:4.6.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mockito mock objects library core API and implementation"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/byte-buddy:0
+	dev-java/byte-buddy-agent:0
+	dev-java/objenesis:0
+	dev-java/opentest4j:0
+"
+
+DEPEND="
+	dev-java/junit:4
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="junit:4"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs # https://bugs.gentoo.org/789582
+}