gentoo resync : 20.03.2021

6 files changed, 103 insertions, 10 deletions

diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index d03e1566b721..c5c74e6f7e83 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,6 +1,8 @@
-AUX jmock-1.2.0-AbstractMo.patch 1189 BLAKE2B d10edde92384c86c2cbf9605cffcf25aa0acbd073e8803b88cccca2b4b94839e28458cb02f647cb492615836e7df02562329fb6135876c2a39fe5bb8fa7766bd SHA512 b4d59d16c2c513031b3b36fc2bdf4526cee8bfa405cac4c2c76d850289a835ba6e57d4e042ed4afe2814a217dcc1493afe80af9fd17fa066d1ada96af6dfa663
+AUX jmock-1.2.0-AbstractMo.patch 1193 BLAKE2B b822ccada923c92a421294549ffb9f02fffeffbd7a57bdc79e0749147a361ad2cd0fed6b5b63166d21078684b235312393fb7af63a3b293d0e8a7a1f18fa70eb SHA512 53ac2c2f603aa8685aa18737b96a05fa590ed9bda8208dc06ceca159eed7dcb609a01cfb113597fad335f5ceed89d796e448c4deaffd3076a29d57c6ed8f15ed
 DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
 DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
-EBUILD jmock-1.2.0-r1.ebuild 971 BLAKE2B ebd8861dc5e02c85c98289f2820a7be9f006f97ee62fce32c7c45880bfaaa03745f78677408a1c6aac383bfa7e85e2ea26f0166c59bcdf8e541171b63575d6c7 SHA512 1450db05391b0241bf95f78824092d5bf4657632155f28a70d47cfd79510526399c7b1351a58318b9723b22f17f34e44d8a4bad6f2f17c4135a12d29e7fd92d0
-EBUILD jmock-2.6.1.ebuild 828 BLAKE2B c76836b50142234275461ef7e3801bf2d4e698f63d826496db984dd514234278b6307d49d340e5941ad3cdf00e4a0307c3ca17fef9409344668417fccf345242 SHA512 13a6f4ef2997353cb0761d5da4fc571324cd401375a54fdb629135ae09cfca077d6ba266a681bb1d737ca3c927707bb64dea79599e825095793485b0e51314f7
+EBUILD jmock-1.2.0-r1.ebuild 963 BLAKE2B 53c60bdddb516f45f903006554fe3db2069b8a0f22508849f1af907e8e6489a5928b80e0491ef1cd793cf629d224559224852f1b016d46256296ed5ef5c8c7cf SHA512 a9b123f34046856f913ecfa0fdf70f243b4e0914a56746a95af2738aca3c17756f4c3319978bb7070157be0460c8f59478c8801bafd089572cf9383ddef06117
+EBUILD jmock-1.2.0-r2.ebuild 965 BLAKE2B 4d3a87e9f269319f352a8abbe56102fed3f51f7a531a1ecdf3c07dff064814f507d2bb8c078eed2d929bf789dc8f014fe09736d0d71da70c0fa78e3a3c4a6d2c SHA512 d25b8b8de0e4efbb709616ee9d7d7a6be36fe80f39b80e386222bd46f99171d55a7ab0b544a78c522882cc97e5e7405f8521d0a9d3b013509ad11e7a31530329
+EBUILD jmock-2.6.1-r1.ebuild 827 BLAKE2B f2866e65ae2a8d260827802c36196c6de59b1fc5a2a40e1f07263e0670b9ba143cb751468144a68dc16a427c15d64607ae3743cd09353d4c6485d4b7dfe14215 SHA512 dafa81e697fa9ce57547ac75d72787b6dbdaff3b227c06be7e6f08c06bd4e208c6c2fcfb538f9bacf5ca2a6da96f83a68f53f57ae24dfaccd28f1258f9b15877
+EBUILD jmock-2.6.1.ebuild 820 BLAKE2B 0041aabe995530a8105d30a7914629446f722c1508da4307234f746278a578e5fe2c42716822f4e2ee0980c0ef6882515615934dee7b05d208f7c8f021eae6dc SHA512 8a41af0316631b30d9b891eb7cc153ec0fdcad09786f807f657e1e2a5c1170f25004103dff1ffcf99f54cc63097beb2fd0b299e86f226c531b9ca593e61c3f03
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
index 1e3a939d26d3..75b5195c37a2 100644
--- a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
+++ b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
@@ -1,5 +1,5 @@
---- src/org/jmock/expectation/AssertMo.java.orig	2015-08-28 10:15:13.490000000 +0000
-+++ src/org/jmock/expectation/AssertMo.java	2015-08-28 10:15:22.206000000 +0000
+--- a/src/org/jmock/expectation/AssertMo.java.orig	2015-08-28 10:15:13.490000000 +0000
++++ b/src/org/jmock/expectation/AssertMo.java	2015-08-28 10:15:22.206000000 +0000
 @@ -73,15 +73,15 @@
          assertTrue("Should not have verified", threwException);
      }
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index 62eb3c443dfb..3d0abb03985f 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://www.${PN}.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://www.jmock.org/"
+SRC_URI="http://${PN}.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://jmock.org/"
 
 LICENSE="BSD"
 SLOT="1.0"
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..f30beade3c05
--- /dev/null
+++ b/dev-java/jmock/jmock-1.2.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for testing Java code using mock objects"
+HOMEPAGE="http://jmock.org/"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit"
+
+PATCHES=(
+	# This patch isn't changing the behaviour if jmock per se.
+	# Only the formatting is altered.
+	"${FILESDIR}"/${P}-AbstractMo.patch
+)
+
+src_unpack() {
+	unpack ${A}
+	unzip "${P}"/jmock-core-"${PV}".jar -d src || die
+	mv src "${P}" || die
+}
+
+src_prepare() {
+	default
+	find -name "*.class" -delete || die
+	rm *.jar || die
+}
diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..150ebf8f03ce
--- /dev/null
+++ b/dev-java/jmock/jmock-2.6.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for testing Java code using mock objects"
+HOMEPAGE="http://jmock.org"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/hamcrest-library:1.3
+	dev-java/junit:4"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3,junit-4"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unzip ${P}.jar -d src || die
+	rm *.jar || die
+}
+
+src_prepare() {
+	default
+	find -name "*.class" -delete || die
+}
diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
index 750c4115862f..6761ae6b5229 100644
--- a/dev-java/jmock/jmock-2.6.1.ebuild
+++ b/dev-java/jmock/jmock-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://www.jmock.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://www.jmock.org"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://jmock.org"
 
 LICENSE="BSD"
 SLOT="2"