gentoo auto-resync : 16:12:2022 - 21:37:19

16 files changed, 48 insertions, 16 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 69e305fd3ba6..7e0804eeb414 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index b9c663a93ed5..6ea69d5293e5 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,3 +1,5 @@
 DIST coursier-bin-2.1.0_rc2.gz 21077153 BLAKE2B 19ff645670b3f94162672b669063491f10e4ae8aee645fe0205f4f0dc80e9380ab045c665cdca792d93f1723348c8d267b01bfabc4db5014765757417d1cdc6e SHA512 9b822f8642a10afe7933c8f7bf246aea73b42e0d6ef5db0f9e4f9edee96a31a3d00111a8e1ba2e77898135131b6158dd3be5ca5ba3bac9ca95866aef881e5b80
+DIST coursier-bin-2.1.0_rc3.gz 21120545 BLAKE2B 55d4236c408b9883d49fa64ed79f269fc935171abe161c3bef8e92da396f12881c9cf7750dd8e8d5b955c390cfb29304a8406c3db702c3a477219acbf0c0b989 SHA512 1a31d7ced6c8c1137b6e330723c90e12f010a815592a4e11129c7bd5611528edc62166415937c6fa5dc92732b277bce1b971e6dee27f9b1350ac71b4b7afc290
 EBUILD coursier-bin-2.1.0_rc2.ebuild 670 BLAKE2B c596581520bb6dbefff42ed78c10bf3419c69b71e94678ff382680e60b029790934f25123390953b6127a3d82d4a0746963aaa7ac14e177e248c31dad33f4c9f SHA512 7a4f03558dc0d98a7b6ec5cacc0d07693407c49706ef1def77558b4aae1a232f57f5afe30afceb618b685431a2c8aeffc5dce2d955a5be05c2c2ba72b391bcda
+EBUILD coursier-bin-2.1.0_rc3.ebuild 670 BLAKE2B c596581520bb6dbefff42ed78c10bf3419c69b71e94678ff382680e60b029790934f25123390953b6127a3d82d4a0746963aaa7ac14e177e248c31dad33f4c9f SHA512 7a4f03558dc0d98a7b6ec5cacc0d07693407c49706ef1def77558b4aae1a232f57f5afe30afceb618b685431a2c8aeffc5dce2d955a5be05c2c2ba72b391bcda
 MISC metadata.xml 329 BLAKE2B c2e27cd10921c61cd06ac3d92c90fe1f7bb509d81b1cbdcb3cb51dc2ba6f2097713120f58a28d5750a60e800e7248e9aec3c455b92de9e6c7cc94427876ccc5e SHA512 77d12f0c7125ff3cbaa4cd159a838dbd2bd266c8fa1292533267cdf7e1a858f16b9eadb6efc55218df028426616d556cdc8a6664c7cfc4c9cf482f750bc9587b
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.0_rc3.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.0_rc3.ebuild
new file mode 100644
index 000000000000..32691c5ffc9b
--- /dev/null
+++ b/dev-java/coursier-bin/coursier-bin-2.1.0_rc3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+get_orig_coursier_pv() {
+	local orig_pv=$(ver_rs 3 -)
+	orig_pv=${orig_pv/rc/RC}
+	orig_pv=${orig_pv/pre/M}
+	echo "${orig_pv}"
+}
+
+DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
+HOMEPAGE="https://get-coursier.io/"
+SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-8"
+
+QA_FLAGS_IGNORED="usr/bin/coursier"
+QA_TEXTRELS="usr/bin/coursier"
+
+src_install() {
+	newbin "${P}" coursier
+}
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 761aaadf4467..b228eafe1df0 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,5 @@
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
 DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a SHA512 81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572
 EBUILD jakartaee-migration-1.0.4.ebuild 2979 BLAKE2B 1213e1b55b6822382c81fe9d8643b6ad6c55a5ef1ad204f732fafabec6d914f9b2b04c70ef6ec4af26e9e39026f96a67a64f0f23ff2bf81d2b3c4a43e582a1b8 SHA512 9740c0f632d1c6d9102806bca98eb87ee8728aff425515af033a5c6cb895af7ca500a347a51a943ae52dcfe5f3955bbc7a181b916c399336761f87ac61a2918d
-EBUILD jakartaee-migration-1.0.6.ebuild 2983 BLAKE2B 26d39afc5ea17cd43b7a02d2ced809a6a12833e24eb52a38d5f00646ce866a59e2ac9ca8cb7c64f00c427145cdfdf5e2c9a43ff4504d6634971812fcd76778bc SHA512 f4c66332e5e88bc2b5744d933ef78add9b105adea7b7388fe55f0f0f1a037219c7de631eabad21ffcb953db8f82f75a07b6eb7260ab13d046a26e688d73143b6
+EBUILD jakartaee-migration-1.0.6.ebuild 2982 BLAKE2B 515935ead5a0f7bdc727e459bc63d2512aca0e7b3267fcea078717f04c7f1bf72bb4652a0ca43590352106646fc76e33ab16f544f9e255ffd295381fd69df8c3 SHA512 873dbde9202b7688dc4e48d2ee7f460e28c116c96cb7cc09ee6a4513d83c9360e04fc833ba72524217bb2c0e951d945803b3405ba6d6a4296c3e80f8022059fa
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
index 1c9731c85b44..8e03edd54b96 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://tomcat.apache.org"
 SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 3f496b73f83f..3a98a7cb58da 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -2,4 +2,4 @@ DIST mill-bin-0.10.10 71059080 BLAKE2B acca082500d69ad87031dda36df363db38a555918
 DIST mill-bin-0.10.9 71023828 BLAKE2B 6cd71ad3a293b92957b504b850110103290f0017416c370f6de172247e96a42daffe94f7460325bff89b3136e3890eddb0ff7857418a0166327684e785a8e956 SHA512 494ad57e036180a285e44ff24ab8a7070b1b444e4267eb9ea76823f3717db4ca7bcab17013932764ed04fd7127272d87fef08cb59bc43ae257a76fdd715581e9
 EBUILD mill-bin-0.10.10.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
 EBUILD mill-bin-0.10.9.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
-MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
+MISC metadata.xml 462 BLAKE2B 33fc9bc7b46cf529c83a5f554abf0ac46f109b72e9060b45c442aaae815c0845a0d5c8aa799ad369a75b5749e6499458763ca1913e88cae0d07fb6233e6badf6 SHA512 bd8831c79f4f164f509ee6415ef922fee49d40282d655785ec289f06da0e4735f3857041911236f2c7cf319f72458807ee5fb8a008e31774d90f03634161a2d2
diff --git a/dev-java/mill-bin/metadata.xml b/dev-java/mill-bin/metadata.xml
index 9cf287216c24..f8f99d4f8310 100644
--- a/dev-java/mill-bin/metadata.xml
+++ b/dev-java/mill-bin/metadata.xml
@@ -8,6 +8,6 @@
 	<upstream>
 		<remote-id type="github">com-lihaoyi/mill</remote-id>
 		<bugs-to>https://github.com/com-lihaoyi/mill/issues</bugs-to>
-		<changelog>https://github.com/paul-j-lucas/cdecl/releases</changelog>
+		<changelog>https://github.com/com-lihaoyi/mill/releases</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 947a39719dd7..c4583e9add57 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -14,11 +14,11 @@ DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd84
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 EBUILD tomcat-el-api-10.0.27-r1.ebuild 1081 BLAKE2B 6857d00f026a30c1ead3172c2ef5e14bc3ad1ecb654664fb497592fefec76348fdf2ff33be25b3dcb0053cc12a7eb7370be6df54e2a8e95d73fd7e73a4ec60db SHA512 4486b915b1fec57e9ae076377267c9232d20a47d835144173157fb2bb25682c93e846add000e7d9cc1b00c74d1c9526fdbcb10fe7e5ae7242f4d37945b78799d
 EBUILD tomcat-el-api-10.1.1.ebuild 1078 BLAKE2B 102936dff87a81ba38b59eb82a4e6643021278e203d5a1f929d0d59affe5664b28c9be24b71e87a19c67547c33d20717a1bdd4d1d688336978cbb46ec7db1603 SHA512 d5b14c813a66af8ef01b30b515f524c1adfedace4b82fa6b8761cd9c7c8ffcee3522ad063d0a7432f9482501af532dff71123602e1cd43a0a4d8c3f429ec5a4d
-EBUILD tomcat-el-api-10.1.2.ebuild 1378 BLAKE2B 8a81c24f9ef4ad38ccb2bbd79e0ac11c08c913a50f48c2e0d81a37e6bb894f3527b02606f4bd43ec63ecf3dfd865ba77e48b4ff4e49da1934959caf98e401bdd SHA512 da1ff8e697ee12f3a7325ad51c9cccd04f739d9c2af8627e8b6d0e15799b486f16f9aad58dbfddd6c0f0fcf1f9d33bd6ddb2a4de8cd236bf1284c1acadce5450
+EBUILD tomcat-el-api-10.1.2.ebuild 1374 BLAKE2B 17b60391fd43e9a788a846b6ab803edc4df33073dd2f5a9c317409b71f1e3ec97a7f80285f533889484c03dbd4c783b093547f49c91d4c01fd7c1a7260176a7c SHA512 c128cd5d425aaba434bb46cb7aa4514751de7a2e59f8c40652cdd124f545c564efefff3ca71c8bba309f60bc525bec50d7a47f101c20d5cc85fe82f912786482
 EBUILD tomcat-el-api-10.1.4.ebuild 1378 BLAKE2B 3eceda8178c020a0b56f12d084a877a6ef576876c34ef7bf04ee33a261b6fdc59c43c656cdc49abe059d71889dc3698dd20ce1856c9c74af101e949eb61d3287 SHA512 b4f83e63e448a4f16003b589b105694847a20e4b02a4b34f220d08af00f86ed2cf3bf41f6970cdfb068a599325e22efb545ab74ceb09512d10b37b1fa4edf59f
 EBUILD tomcat-el-api-8.5.83-r1.ebuild 1074 BLAKE2B 0265263b3c8ffb18c4f298f37825077154ff548e36a02817752826d603c35e1b47b58d099253d5f8b23e5c194c2157947970faa52459809c0136fdbb00a3193d SHA512 bb5dfb679a825e5d7cc69d37871ef541dab45d3c234d39baf373745528c5dbeaf5388b3c63407d606cda053a07ae867f25347f88dda7acaf6f49467020fcb61a
 EBUILD tomcat-el-api-8.5.84.ebuild 1374 BLAKE2B 49636903311ea08eecc21383ba28668f85a0b81e9a2e7769ab851e512886a4365a7870d6c7e54a12bf18ad0b2f36130cf601c776aa7ff4963c23486752a71ca2 SHA512 ae9e51bab4ef27768e8a5a4b04a53ea9c8b000db7020bc939c19a363b638c905df7385c8d4f5dfaeb7c53b8592d022c80f5047e6fea5d2d9b6dbefdfd28302bb
 EBUILD tomcat-el-api-9.0.68-r1.ebuild 1074 BLAKE2B 6c7857d992e45f72ea22e6aa1cbd149ab0e163418ebf49d576b0f2fcb0ab5c47f63993bb8ac892611205d33a1895128892d4e570c513b252120665b347b87d66 SHA512 988472477469d03e307ff4c36461ac024d76e8e7e05cb209dc5111f9d118aead88a41e930583b1a5bb56f45de7fd7dbcf6203d51fc271a1435870d62ca5d7a1a
-EBUILD tomcat-el-api-9.0.69.ebuild 1374 BLAKE2B d31798630a337c614b052a07a6ab144f0678efab63f56b627be30e99c2be05b3175d296a72f1bd81807cbeb3fd305858d0c15205eaed2bd626ea03309b9da01b SHA512 56b991c2cdfb78a987dc93845c960ba4de8cbb09d2c27c3e1465320ce534810f9aa8bafad1c68b711f6cb3cb6a1bc84c7baf05be06e0efa1954708146bdbc259
+EBUILD tomcat-el-api-9.0.69.ebuild 1370 BLAKE2B 8b3c6bcd5e8edda4430349201a7b2f280fb6daea01734b0e8a5106e28c60a08f09f5808d19744a9bc4018cef2edf9f4be8b56db244e2c4c755f8bb841be5e30f SHA512 56f1239bb98176d4acf9cce473f77c023ea1fd429dd5e2d7cd8ad8170ddf10a634ac9752cb9a01a6d93a043284835aa4f2f524a1f7802eb6ac2d1f93fa040a67
 EBUILD tomcat-el-api-9.0.70.ebuild 1374 BLAKE2B 71e22d407a445273ff2bcb6b19d5c33fdb01863db702b0a9b98d51db3234d50e915a068391149272e173b2bdfc9a4b9b4aacef889a4f982a4fa09b5271012709 SHA512 395529457fb65eb99c25bb049fb6207d4079e6ea4532b7cf52c9af1343ada44902f544416c8ae894758d232bbb01b68beecfc56e65d924a3757a2fa83446abf0
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild
index c878a2711301..5bf204df801f 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-11:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild
index 0a1f771e5a4c..65d6ed3d1862 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 09f95230151f..d7cedce843ce 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -14,11 +14,11 @@ DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd84
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1124 BLAKE2B 156423a2485711c72c10edf6617587872ec1ce3f89d4e1722f1969089b90d96cd49153cf9139437a4d08a8980243059a35c27be20345339ff99861bb77fee663 SHA512 e717a54ac7176b45f5a55eed7063a9cc6fa7457029a68f5a3eafd461cd1586d6fb2a36d02d9b98bd0b139232786670680bc2f4f3e8ac91ac82041e20d6e2dc79
 EBUILD tomcat-jsp-api-10.1.1.ebuild 1121 BLAKE2B 28281e634eae4990fda6afdcc45b451eb2fa397ba8f0ef26c0403a67618c1062a77002c051729c9238bfde185be4878bfcca113ff55d36cee3aaa0b9a5082686 SHA512 b476387af9ceeea788ecf9e54243e60533aec90d0f6609b4c86d9bc9860f9bf07d6cf8460ea508be28c1190a9d18c5f4bfb3af1dd3a735150ae80e81b61054b4
-EBUILD tomcat-jsp-api-10.1.2.ebuild 1421 BLAKE2B 386285f7b823c7babcf7626af895d4d403dd2a31c6b6a220188251da2227ec180d657a01f5f37ddd32806b5672c66f64e02809d0d0308d00695cb9aefbafd348 SHA512 995e9e4293fbb5e9c6503c0bb2b8e85ebfeaa0bb4155c04df91e49f8d61cb2c58fc0f43b6b05aa26e63e08a38ec1f4d484145cd28c582d1b45899c0b1d2b4777
+EBUILD tomcat-jsp-api-10.1.2.ebuild 1417 BLAKE2B ba8f0659b764d412c055e82c10974db38c93d7d33e85aeaaa4886b8b54738ff2ee6e6ec452f42fb3ff61b6cf8ec011f5fedadd3567f67ca536b75170a49e5e2b SHA512 a06ca64936cf9246c23d0c5d3e16eaee14446f739cbaaeeecee9691d155b45dd9d056ed12e4174d0b8c6f199c989d6ef1e94c7e0e47f2b51df0d624b76457a82
 EBUILD tomcat-jsp-api-10.1.4.ebuild 1421 BLAKE2B 5772c460b91398713fc37a32cf88b0d13b179090ea5fc76b5aea12b9b21e3f9e222eaffbe9feccac6d02c23dbecbcf682d4bde5f377544d4f9cb41f73d928ef2 SHA512 6d35f8506e603445a7a90b284d34ee5faede6a27f49ac9a3528f327b0a42ba594ddc522a0debecd4c1440ca20a45ea95410f85ec12aa969340abe91a5fa6fdbb
 EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1117 BLAKE2B 5d9eb8bd7e2e79e2f4e7e37d3e9a41ab87a375a9aa72b1a73bead1335a730c3a9c5d3b60526e4b87d7e46f0d25f70b251002b1ecccfe3df40cf9bb96e0dd0d7b SHA512 abadc559103fb67928be0f0a62cdff998248f5843284011556a08c3aaa5f06ba5764cb2e6448a8de05c3dfeff5d276d201c900fa434a145ba6914106839fda5f
 EBUILD tomcat-jsp-api-8.5.84.ebuild 1417 BLAKE2B ba676748e8426dab6b0cecfeaf857c59d5b2e8c40882ec72028b8c67a39e377f82256254e5109805068a9eb0521c9183bb867d3d4c43376ef0d98044bde24839 SHA512 3e9b09aa9c3ff00ac6f52d7087c87fd745727ad595ce3083977aa7df6207bd068e5e51a7235f7ce230f5e45abf3b7d2d296bba70b4f3e37bc8fa5ff6b7223ef1
 EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1117 BLAKE2B 80e7bc1fad34ae43c7d84a5caf0fee14d40d2b162398ede8b0eb1faf9f6e7ba5f48765186bb68922dcd163a5a2b4fa6a90b2bd044d530fd331785d7d783c49a2 SHA512 41af601effda53de446251bab678b846b6508fe5e92d2d03d7966f51095d4d907f302ac0c8dee6356b4af35dfd3802f326423515e559313b737d9b573c7f6336
-EBUILD tomcat-jsp-api-9.0.69.ebuild 1417 BLAKE2B a1c84669f61683e0e9754be12ea28c06d522b52f19a249951685b23d57af2ff61ed87c1eceb1832549f3e6a1f1f75b81c77e34c5bc19bad41b64ea84d179ae6b SHA512 b2f9be6528fddfd656102edc0a6e2eadbb97404ff13fb6e86902eab56ed7395308bc85c7fa76f9e7ec157518d033d4908815857e095e88913b3ed61a6ed93128
+EBUILD tomcat-jsp-api-9.0.69.ebuild 1413 BLAKE2B b81c654811aac7c51ff8cf86d248a1987f87f7ce050fb895c540d9f1ad3de1e451274414a628d3ae630dadf72ea1fc042408661b18e55d6a4f2bbd2e9e2caad2 SHA512 be68c3f765ae98787e30f0cf567e320ffc38e343b44077dccb91fe5a30fba1d7d32fbbf1bb418d9bc97ec5f6f4aac65b643a0bcec62d69289b1ab56bbf80bb6e
 EBUILD tomcat-jsp-api-9.0.70.ebuild 1417 BLAKE2B e11354fe4234fc6c75a4243d5475b0635d5aa18281f52c694ff0dc96612a2a25ea8b10efd518d53e256263ec6d9b2b7cb2aeefd93e398cdf41880fe812061a64 SHA512 122aac311a2f54db5a8f95ad3a29615d82a4efdf720c60ff2800c7973a37ddddfb89d5895987118d4a4f806f55b3424d341b8edfacf82cf099b0bb6267413cf0
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild
index 8ed840e8e5e8..30e80c0e6e49 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:5.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild
index 15e31b866629..05278d35e31a 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:3.0
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 48b4f3a8e6e7..f5f2d1d356f1 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -21,7 +21,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd84
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1171 BLAKE2B 2e49a8a90f7936385988b221b6a1dd540590bac31a0969f38727441d7f6448236c82b6345f713b285834fcb3a4407fcb661889fe0f95b8d54f35d33d961f33f9 SHA512 cefdd4b9433d4cc16a4c6ba38752911a278bd97a78161755b98b96eb0280826b46300dc0ef26591ae9f28a2df47fcac58bf64b96064008c2cd2e5a4997435655
 EBUILD tomcat-servlet-api-10.1.1.ebuild 1168 BLAKE2B ec65a3778cbc678f576e564fbb99ca990f99bfc6f02eea04beb6525e54e1b7a64fdbbf621df0af3106dfd6f8f0e9508c49e0c31c2f04aecce75138b7cf410cfc SHA512 6b6c241894e17a37eecee863454e98d56a274bafe3ef913aeb139d7aec1f906488a4485604f5178ed404d35a3953c1dd62b51e97c9a8de66b477deb2d5f38695
-EBUILD tomcat-servlet-api-10.1.2.ebuild 1468 BLAKE2B 67d55f97786e2e4f191b8d9b76ec902b1d362e43f178f2f9b5afd49d70dfd0fa06ecbe519e0fa48cf7592438ddef6119f4917de642bd2380bc9af64b152276a0 SHA512 f654acecda8b6bef951d896355762bb95b2c59a37ea1fece08d0ae611b7bca43c6f363fce7405a87c6cc3df8df3dba3ba9a4d8408e274bf40b035e4d0ec4ff4c
+EBUILD tomcat-servlet-api-10.1.2.ebuild 1464 BLAKE2B f15c08f22b4a8f0317b5487cab9f2d4624fe575730cc648f12cd448681e700559ed4075fdf291be40db6510ad72092758b5c36a9eb8e9522996b04e84b87e2cb SHA512 46bd926b649995861f42196aeec6b44c3e4e80c75417a3b0977630c04bec5145e8134ae5118cc18c44f0640c79c2c7a0d9e01282426417c13da87c227fbc182e
 EBUILD tomcat-servlet-api-10.1.4.ebuild 1468 BLAKE2B 1c120380e8ab778805d7c63fee68e8fbef0b9102a5b24cd0262357f19572c1644251d8e552bc5e2d8d41b710a4c73bd8f35057083f82208f02ba123b9183e1c9 SHA512 bc2887d2850edd8eaa3db5ad533dc3d87f9f3043f4b1aebea050dc2c91f164b533000e962352a75c9ed9adad86664054846e527e7bec35abca22dd4f59ae2386
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
@@ -30,6 +30,6 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
 EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1324 BLAKE2B 079d3ad08580256a30a3d359818e940be01f962be2019c7468f17c1bf6a4e8c8f685056ad4d08419175c4d5983333332b07117ecc07326df63c2de5083ee0cf7 SHA512 122bf1cb7a4ef88481888715d878c5c4bbb117e2214b28722173e60ddf6458e377487679312755105e360bb94b261b77e496f80bcde0e1a8e402794cf8a1cca8
 EBUILD tomcat-servlet-api-8.5.84.ebuild 1624 BLAKE2B 64e617c79ba7facfe16b6e80421035c2281425a796bfffc80f7d2b99ff422fb0082d096aec56f3a80c700a748bb9d375a4909f91870263c56e0dc44dc2a6a876 SHA512 1198f5406abad645cb90baafe36781d17efcc76901fc46b3cd38efdc4dd3037a7fb7411c62849f3b57a0c568785cb719dfd3edff98f11057ba20a1157cfab57e
 EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1164 BLAKE2B 89ee54e02f25080b1faa6e2279dbda2394e7efd74465818afb9d6da5a21ff0b6d8dbc0e3e7ba6ebafb8e0979ef7e3950cc4de9e2242df10b67521f1cad1531b0 SHA512 c32dc63e1dfffcb4ddaa3869a9e5b7ead54005f2d316593a0b1ec6dd98014321e9c7f3144830a924ecf88ba9e2cfdc446a76ab47166ed78efd4e4c49e63dbf03
-EBUILD tomcat-servlet-api-9.0.69.ebuild 1464 BLAKE2B bb7a34bb8c3103c7506e789957a200cec40a2b7677846bd0aa07c446e38dd29c6ae440b72728a5f82b7599c1411ddcd698cb6471a554b54fb74419f230d7760f SHA512 7f9e8ff1e074e40b1bae69a983d5ee22326b4c0251281d5142b0ff1f0ccc1dbcff2798594b7b4067b3d7288644a5453f049453621a8826e9595db0268977f2ee
+EBUILD tomcat-servlet-api-9.0.69.ebuild 1460 BLAKE2B e103a08116a7e081120a825bca0572b111be20aa98d9413358b77cc6314a9125618e0c3f9ca5302b89c6ca96dbb824a93c007a9a89160a207660b23ce9f5f5f2 SHA512 be6d8afe287e047f9aa8330d652ae9f197b3c26e741d7896e8b811b22b7b23fe7cd349ac410fc321a8ba76f6d1c19b3f147d5953b61764b27814fb91bf604122
 EBUILD tomcat-servlet-api-9.0.70.ebuild 1464 BLAKE2B 19849693c5fdd62fe9902181042378d185694978e0419099d4b75d019fead7d626400e6d95b0d363bf12bb665e924527ffff66bca5a997ebc0ebaf2ace679943 SHA512 b092f1512ca679821efac75a13468e8e3b495fd1815eb6eb0f2874dc4a9fadbabf9735abc9a76634555e313ca124e555b1b4482fc154ec464410f6f7ab7f7899
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild
index 52b5decd1a17..38370ea2c1d9 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="6.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild
index afd2f770ec07..41bdf40eb8a2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"