7 files changed, 6 insertions, 6 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4e654e630ac8..db5339a9da6a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index c61eb4810769..233e27a0a464 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -14,7 +14,7 @@ EBUILD tomcat-el-api-10.0.27-r1.ebuild 1081 BLAKE2B 6857d00f026a30c1ead3172c2ef5
 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-8.5.84.ebuild 1370 BLAKE2B 34bacef959f8b2ffeae59deeac238c6ea7c13c587e29ce1ca648fabd5eaf331903c2056390feda0f603c2652414b12955af2727efb01184cd8c81365f26269f9 SHA512 cfbfbd055abd5a30836268389bb16aac872fef7c3a9f9fe249c08c994681f075e4bcc49f6e09d89eb67e7492c22098b9e9c19d1e7f026619f13e5284891b3ec7
 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-8.5.84.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.84.ebuild
index 19c8e403f1e4..423a3c4c9060 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-8.5.84.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.84.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 d330284c8a57..34af5311760f 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -14,7 +14,7 @@ EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1124 BLAKE2B 156423a2485711c72c10edf6617
 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-8.5.84.ebuild 1413 BLAKE2B b8bbb03d477442ddbd45f7b234bcc985b1b1f37d4ad07caf66a25d8db7b48dca1e3a1c21198a445730c82aec7a37baebab6eafeedaa7997d416166cf2b3032c3 SHA512 4dd898389dded9ddf958a931d4843d22806eee262c78128d3ce5ed961ff6c8f2be36bd256cc03ee57066ba729e3ef920ff31fd8a651b5c3a67a05386b0579359
 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-8.5.84.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.84.ebuild
index 2e2c3ccf79cd..9195888ec738 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.84.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.84.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 82b5f13e32bd..66ff94c1725c 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -25,7 +25,7 @@ EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 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-8.5.84.ebuild 1620 BLAKE2B aa001d0cb52ec13e07f6c5e7b2512a770c46c17e3f29d99a90d0c2170adabba96d6ab20ab4f6b7447331911c0c5848df1f962b8067b8a9f92cd8e2dc5b5053f3 SHA512 e12ef8bf6cccca578ae5d099e0b3c391a7bb3d6a6b096f3a05b9c3041b15bc44150c99a2e0546b54e3738ea70f20c0f21de4959d94186949aa5751e28baeeff7
 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-8.5.84.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.84.ebuild
index d84a51e0b43c..70e28219afe1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.84.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.84.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"
 
 # we can't use the exact same version of el as tomcat 9 implements the same slot and
 # it would prevent from installing both tomcat 8.5 and 9 at the same time