gentoo resync : 27.03.2021

4 files changed, 4 insertions, 48 deletions

diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index c5c74e6f7e83..35f92ca58471 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -2,7 +2,6 @@ AUX jmock-1.2.0-AbstractMo.patch 1193 BLAKE2B b822ccada923c92a421294549ffb9f02ff
 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 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
+EBUILD jmock-1.2.0-r2.ebuild 962 BLAKE2B 6f3efbe2f5e130cac8cd6ce577900104687a3a8d505219fa9d0dee1ba5d2f5332665fee00d88dc637ee53ce3ac77755e56543078306c4780cd2c01b289a7a2d5 SHA512 a6faa57521218c27a9de6a7e5b53ef0267f449bed94f16227d69a379c1dbb6621ab4891e20e63aa3b8d3dedf33a04a7aec3fc9ac515e9ec0fbcb9230e968273d
+EBUILD jmock-2.6.1-r1.ebuild 825 BLAKE2B 5e066e2552eceb12ce383abf78f52573636db5c22ef94c2769fdeb48493d5256d68d5183313faa5fc9ef01b91415df0747c2f2ab4479342a949f83467f80dab7 SHA512 52e29c763963f8afce59474aeb77a06aa67695d4cbfb12b08e064813f216445a402b520b497305d7554f00386973c3313a6b00b926d991bf481a7fd15d620c18
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild
index f30beade3c05..caf03adf8377 100644
--- a/dev-java/jmock/jmock-1.2.0-r2.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild
index 150ebf8f03ce..a61fb1719ea3 100644
--- a/dev-java/jmock/jmock-2.6.1-r1.ebuild
+++ b/dev-java/jmock/jmock-2.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CDEPEND="dev-java/hamcrest-core:1.3
 	dev-java/hamcrest-library:1.3
diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
deleted file mode 100644
index 6761ae6b5229..000000000000
--- a/dev-java/jmock/jmock-2.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-
-DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://jmock.org"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE=""
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/hamcrest-library:1.3
-	dev-java/junit:4"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	app-arch/unzip"
-
-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() {
-	find -name "*.class" -delete || die
-}