gentoo auto-resync : 11:11:2022 - 09:29:30

6 files changed, 4 insertions, 49 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e7cea2ae72cb..617372335645 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jaxws-api/Manifest b/dev-java/jaxws-api/Manifest
index 96fcc5871172..869b4e10f77e 100644
--- a/dev-java/jaxws-api/Manifest
+++ b/dev-java/jaxws-api/Manifest
@@ -1,3 +1,3 @@
 DIST jaxws-api-2.3.3.tar.gz 173806 BLAKE2B 416294f78f4fdb00e8ac6a285b0820d5e7c5938b700d9efffdbac76dd37c4940bb6f4a88a1bce9f3da8ef156e56ea1f858bcba041763f0397c5f7a8b08297b2a SHA512 7663dd7a9169dbe9b7d869e318add1b3a41ea5246500afb4f1d1374f4b89a71de6a68af413b8037374c4e6fb4fa4acb8524d197eebdef6bceeee8339818905b7
-EBUILD jaxws-api-2.3.3.ebuild 834 BLAKE2B 65a4c81b5d640544912f01bcb6c21bf319165bb49a3855ae1f739cb22b875dccdf0c26045a9933fa15f6732992ed604f62a7fe89a933892f79c170ae4c0b1040 SHA512 ec36e11c36943c0bd7991dd8a0112b01753624462b6f4772ea551e346c54a369ce8c9510649fa191ce1ade209169a24ae0d677a56e1f70d7cbe8f58c9fde6cae
+EBUILD jaxws-api-2.3.3.ebuild 838 BLAKE2B aabc17e0a86fa2c2b6b287b1104805f6f089931a4e2013a4a3038424c11fdb74234fb72721d490dfbf067302cea40069d4419bbdc46cfcdd236c461d47ba4bba SHA512 220253b737353ffdde39e4d6cdb542e9242248fc40a4887e02ceb35b64d4433d9f7cd0719ce69712b72976b5498f1afca76f3ef8741967d608e3c0e70bfea63f
 MISC metadata.xml 370 BLAKE2B e86939098ed46b852efc0f844950e57b7a400e08033714fb630d4e4a8464a760b473ff58ad80fb8e729b43c2dc004505f4e944c793c81f0d0d63e4d92b978f31 SHA512 3692c24526b7343fcdaa55968be2fe74eb0e323cb0a9a5bb999dfa66d71818da5c4984057510900656a87aa63cda74822da0110b0053a111ef797868672e2305
diff --git a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
index 5705c7a8f2f5..f9b7430e6ad9 100644
--- a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
+++ b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jax-ws-api/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD" # "BSD-3 Clause"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND="
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index d637420174de..67f1a47a3300 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,8 +1,6 @@
 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.12.0.tar.gz 111963 BLAKE2B d4b8c8c4ca68ed8dae3b4906e3163fa5e8e8ea8f4b993386d7fa605e0188dd43462550ae4833ab9dbfe68c24e15cf6d19a6f444ca57f666fdfe8b29734fd32f7 SHA512 b1ba12981e7379f5b07a29749c7640906c02f72f52158921d0ac02abf69c9c8c2dc753f4462ff0afa5807852a06f59a6da9ed9357ae7dc0303b0377a0e3da854
-DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
 EBUILD jmock-1.2.0-r2.ebuild 961 BLAKE2B 66253c0e57e4a2d44378f457e41a613fe8ea76c6c7f8760178ed706bc9b29ff2be3392d52997da22b3cdcef3d845ea4e606a639a9660ba64dc45a91edff9811c SHA512 37f94cfa6c76d6eb5a5053959c68a0e38e9acf6d1f8ada58f022fb79cd84d4c11a7e91acf09950dd86978395ccfad536b28efaf8f9ab923501edf3549ccd8c39
-EBUILD jmock-2.12.0.ebuild 2624 BLAKE2B 5ada29c6bcee045669e4e2be0649354a5ffd82426ea1bcd3b9dce7414f2be777ae0ec7a4c45267197f05d9b84b926a1bf039a11359cac5fc45a3dcc0c70f20f6 SHA512 4abb6d0886be9c8f3df531f6ce3bfb0606c6d85b56dc980f371c21caef3cffd9b7737731f9f0cdd0bd72ade5f3bbf91d4e7ad173df40f2e6edca97d22a63a608
-EBUILD jmock-2.6.1-r1.ebuild 825 BLAKE2B 5e066e2552eceb12ce383abf78f52573636db5c22ef94c2769fdeb48493d5256d68d5183313faa5fc9ef01b91415df0747c2f2ab4479342a949f83467f80dab7 SHA512 52e29c763963f8afce59474aeb77a06aa67695d4cbfb12b08e064813f216445a402b520b497305d7554f00386973c3313a6b00b926d991bf481a7fd15d620c18
+EBUILD jmock-2.12.0.ebuild 2623 BLAKE2B 0cce2974a9f6e5fc8ae098da6f4d92f0a41631a09b94bfa2711af0c39adbe3823e02d874473ea42fad6d33df93460254bd7100c79f049c761d632313afe0cf0a SHA512 062470a99840ceac65148e8263d3e736db8fa46941f039e5ddbd9ac7e98d14ef0d4fc72b511324c1535ecffdaba97afd5423d2001f77b982b26782d961c1caae
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jmock/jmock-2.12.0.ebuild b/dev-java/jmock/jmock-2.12.0.ebuild
index d426c13de2eb..a258ba6eeffd 100644
--- a/dev-java/jmock/jmock-2.12.0.ebuild
+++ b/dev-java/jmock/jmock-2.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-developers/${PN}-library/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	dev-java/asm:9
diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild
deleted file mode 100644
index a61fb1719ea3..000000000000
--- a/dev-java/jmock/jmock-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-}