14 files changed, 16 insertions, 16 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 02ff44b0b30d..2de59c3e8a13 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 422a21d2592f..8e239ae5feaf 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -9,5 +9,5 @@ DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d46
 EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
 EBUILD ant-eclipse-ecj-4.22-r2.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
 EBUILD ant-eclipse-ecj-4.25.ebuild 1422 BLAKE2B 92bb07a71d76ff089d0c7f478fe307d70855a95c1172f5a4fce14b3ddfb34b046af52b052dd50930de9101a5337dab625baa4e7b85de64fa76c7c1339d0451ec SHA512 2fc3b7fb3d50fe5411992ca8315e30ff348f7f8ebe5cc103c3d9c1b75f8dd666091580243807cff952d57c741a43d3090ea6d945986b935d5f56ec5458776fdd
-EBUILD ant-eclipse-ecj-4.26.ebuild 1424 BLAKE2B 489c78dfdc6db00d5c887ea39f79f01a4de3182ca4812e06708228975d1182e31a21fc4f4f218163e7b0bd6493c13ca238c343e1c65119b23a1d502f40e079a6 SHA512 a71f95184455bd2fa68403b6e1182deb78e3ca6633a7c485cb62a1128edf119d64637659fa051ef69a9239b6d88f6ccc202dce5a2d4c01256d5bf3ffd1f9b4f0
+EBUILD ant-eclipse-ecj-4.26.ebuild 1422 BLAKE2B b8e54cbee42f4917aca0b7fd7307e6729e7f63b22570e2571a1600c8c7ac39e276a632d1726d9f2fabb43096897b7657fdc1d23ed5517f8e6cc2fa961a7b9245 SHA512 8b75d516b979456db34aa57d4a53b3d97044e7b191ee86052a00d9cda9e9e8bbaac3195e5c40a3eaa3a69bb928e19dc027a1a863e4b50661e0cf8cf0b84d2a00
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
index 749502b069a2..2d18443083ef 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/"
 SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.26"
 IUSE=""
 
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 69ab62dfb307..b28e418fbe6f 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -5,5 +5,5 @@ DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d46
 EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
 EBUILD eclipse-ecj-4.22-r1.ebuild 1693 BLAKE2B 4b19af6eef3b9626b1451391c09836c764232352071cac79e82064c2a4a9be93b6f689845f38e8ff2c191c81e7a3a230f7927cd1fdb19115a99265f1720dbe5d SHA512 27e74aee2c6c828ed686ef17a82976f3ec6841d878384af29b10c8ee91792446153603cd8e5383b669564122f334310846ce7a72d592b2361ac02a60e64b65d4
 EBUILD eclipse-ecj-4.25.ebuild 1693 BLAKE2B f8aa316f2e366fcf65564005f11c256c3b52608b027981ef93dc344aaba0ab1a7bbd8bc0ccc7b0ddb026c1f1fdafbc5764014069ac6802739382f1b6b0234209 SHA512 9d178cc5e5ec4f5ca35badf455186dd4071ab5b67a53536b9f03ef73c66320c5cdb064b39e3dbc3771a63ad69a8071dc6d8311d682b35b1889ada2c7a3c71e8e
-EBUILD eclipse-ecj-4.26.ebuild 1695 BLAKE2B a7b1dab0385420d20b3127501e3a55d3e2fab801c80ffa4c1e237936ca35433703cdb0c992235ae949f6692328c22ddd9aedb17d84c4564ed9661cf78ca7ed02 SHA512 6a311a15f3ec9a1246271d34bae8f78b545e4e219baee8e0d91bd8c34b193f20ff4e2312360dad7c62bf416c7540e61ad8fa28813d8f55ea5269116e5638df53
+EBUILD eclipse-ecj-4.26.ebuild 1693 BLAKE2B 86b7cf9cf8adfaae807828bcc9a65dd9783bcd886dace6ab47819e6e8f0dc64497ac51312632a0d597f93fac2c203c3b2e3d9b3a8b120c3c76e5c833f9ba4a73 SHA512 05bca27bf56ee0dc5bfd9ead8248a37b6436f005646912a5e1d36af5d093a01be0050f86c5721e372f2bda648ecf5aee0e2fa6a3afc8fc133afeea0035da9aa3
 MISC metadata.xml 657 BLAKE2B ed8b1b4598051b4191bad5e92df382f1e0910f7aa6888d9df4dedef6929a3d8933c2951c98e8f8af8750f176ff541608d8db5d311e06c721b14ce1703a95a00e SHA512 ad91b4e46f609db5c5abc145feaea99dc0e6f4297ee1f6532ff1001a991775679e8f53ef91e823d61a614e6d77fbc18637469ea1869d8f82bab352a69c6fbdaf
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
index d4a38077e777..9db35c0f173d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.eclipse.org/"
 SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.26"
 IUSE="+ant"
 
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index cc40922a84e4..808378caf6e5 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -11,9 +11,9 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 EBUILD tomcat-el-api-10.1.4.ebuild 1374 BLAKE2B 4296a5b0314ecb8bf78fcba7c536a182e1abf4a52a89d18532b6a8083552926cb94f301bec141c85008d49f5aa12277c2b0807867fa882115f349bf3b11b7c9b SHA512 b1812d67e3405123bb2ad21469268df419141f75f1a9bb23da6ace7bea9a9f740c08301b0dc06c54525359c7dc3ef8767bf58f1c4dba923207285c1d6f50d367
-EBUILD tomcat-el-api-10.1.5.ebuild 1377 BLAKE2B b01ab3221fba37a7a7554b5ed4e4d76e9871004886bff60a18b1e5f3cd352ee37c0168e2c61de1941744d18d8d7e5b7e238befed540b50086d6f6005c022f3a3 SHA512 895225af78d6382206d9522ad0f372985b93cb41a616738f734248c31e4922986f64a9087bf6315ecada582fb4a96776413d4070ab4704fca8c1f39a60fbb926
+EBUILD tomcat-el-api-10.1.5.ebuild 1374 BLAKE2B da44f5b089f5b92bc5b6fdcef7ffbbcc7388cb872188d60ae657cfcdf72d31e33b559715ec71956e0f6b3d7104f54f1006a137c1714d8592f12f4883147ea009 SHA512 3bd49602d10d8e095f6914ea1d5dd3ddda28fdba98ac8049de35642fe8fbc23d2aea35200678c8cd7a555196663959fabda25286be5a7b6b80e64e279ca51430
 EBUILD tomcat-el-api-8.5.84.ebuild 1370 BLAKE2B 34bacef959f8b2ffeae59deeac238c6ea7c13c587e29ce1ca648fabd5eaf331903c2056390feda0f603c2652414b12955af2727efb01184cd8c81365f26269f9 SHA512 cfbfbd055abd5a30836268389bb16aac872fef7c3a9f9fe249c08c994681f075e4bcc49f6e09d89eb67e7492c22098b9e9c19d1e7f026619f13e5284891b3ec7
 EBUILD tomcat-el-api-8.5.85.ebuild 1374 BLAKE2B 95b7f6a842eb6124d0eab88af050f1b9fa0775250df03d0abfcaab8bc8e79e80121619b6ba18776746720ae159cf2f0146267107300fa5ffa4364bff380c3120 SHA512 4fdf7597b51c8fa348fd3ddf483c768a385f3cc037bfb76f996f347c132cb58f9f9ebbf0156ccfc52dbdbb9af04168b8ab3d30814463497d5537844aa10075f5
 EBUILD tomcat-el-api-9.0.70.ebuild 1370 BLAKE2B f218b5ce0baf1563b88edff9a1720353367ecfe16907a880dabd9be2e88ede18eacd6fed334982a1f9c2902e0db5068eb75a6ac28059c59b4843d4fb102a8988 SHA512 7742cb95728b30becf186873b61a362cea048b9504a9ff993a1bf838afdaac7d7df85097639118d9bb61cd817f7c84701061fd6922a5225f0533f904345662c7
-EBUILD tomcat-el-api-9.0.71.ebuild 1373 BLAKE2B 469899e8afea8bb16f2b4887b7d110031276ac0e4ed57998e113409b327229d446de622b006e79e5d38287def945a4eeb65af7a9212bb6c848c0fc56d548c7e9 SHA512 6c3dcee13a46313347c78b5d19f6b9786bb930ea81c66a70aa90158e55bcc713d7a1cf3bf9ca99bf5964f8bb72dca234238dfd12495eb6da2e3308136556c8ab
+EBUILD tomcat-el-api-9.0.71.ebuild 1370 BLAKE2B 8cea3eb051ad2a2fc4543888b6e5673932b97e87bdf0601f52c8232367776ad0481156cc4681d28db7689461829a1092a186b135f3f0607cbf19f134b187e43f SHA512 ed379cdec5989e0f50b9c861d9024b455961d2f38200af52fc741f8321ac3f401332b76e5b279759ba93ceaa687becac1fe3bd498b8243fe237555a80d9bc4c3
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild
index cdb891e075b7..67f6f75d4bd9 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.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.71.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
index f3e1cd764c74..7f5b502ea765 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.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 5e20fddc4a12..a52103de1df7 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -11,9 +11,9 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 EBUILD tomcat-jsp-api-10.1.4.ebuild 1417 BLAKE2B 03236d9990abcf733d8eb1cdd16deac9d38fbed148aef64ffde58c9f3564bf272fa0228a5ed11f3eb4c9a9e60b7250af0bf68deb608c9dba4f93fcd9a5eff078 SHA512 f10d63de0ea589d81d08c6c5cdd0961539096f4e5b1d946b49367f70cc304f2005630bceb8a08022cb9b80aa3110a90895f7e5dc6a1df1b68989f87197042725
-EBUILD tomcat-jsp-api-10.1.5.ebuild 1420 BLAKE2B 0b25cb720bce1d594f8e32548922fcea208a212a497a59b3ec41c9fe998336f8681650f13a97d1ab6f784a24ca3c218dd9496a51fb12542af2c2d98dd8a4d6a0 SHA512 c9c63cd518da26823675f89523d351ab466d048e5518f5721af2777b85211c096fca20e33e8a692491c0ea08d8c9920b1c5458d8f7a4a2db413e218856bf30a6
+EBUILD tomcat-jsp-api-10.1.5.ebuild 1417 BLAKE2B 5197ba88a576dee17469d700d5adc1967c2760db4418c9110e8db4176200635c4b0736c861e2e32c48d9e87511156da42d1b931f4412bc62b6f537e7c56092ed SHA512 41e68bb4bdd27e8c299fc29293f972abb7fb9626d8c62e8f4420cd21c51e4a7e1ee65d8aa7d9cf34299e562c9ef705ccaf6329444c1f0da425cd8e1d9f2d36d2
 EBUILD tomcat-jsp-api-8.5.84.ebuild 1413 BLAKE2B b8bbb03d477442ddbd45f7b234bcc985b1b1f37d4ad07caf66a25d8db7b48dca1e3a1c21198a445730c82aec7a37baebab6eafeedaa7997d416166cf2b3032c3 SHA512 4dd898389dded9ddf958a931d4843d22806eee262c78128d3ce5ed961ff6c8f2be36bd256cc03ee57066ba729e3ef920ff31fd8a651b5c3a67a05386b0579359
 EBUILD tomcat-jsp-api-8.5.85.ebuild 1417 BLAKE2B b5f7318f885d8cd792e4bd05ee7d0611b5e42514c99adbb89395dd39f6031bd0dc6015a4f1024d6fcb8bc40cf76e07e7590db89674788e6c88d6f701d2557b27 SHA512 0d780b14b3f7063f559209acb8cf080e7db1f58c012c2dac6ba1eab64ac15859ac03cc242895c1f41f4e07b5f9882f821f8cb248a9871a855700054f50d9f589
 EBUILD tomcat-jsp-api-9.0.70.ebuild 1413 BLAKE2B 3695a4ee4b5365c8716e6cf465556e29920893f8361d2b015a091ee8984d7d38483dc44a4b55ea9d77ea9f561d4dfee2cd159a2d4ac4a5926b4a2e86fd21797f SHA512 153f9e1adea22e21250077e471c1d2d524659da13055a6be5f2f507a928773a933171e66384a8b3591336eb2c2b83cc30f6bbaede56b97099f15f2aeb18376bc
-EBUILD tomcat-jsp-api-9.0.71.ebuild 1416 BLAKE2B b9e09ee791e818365a556ce282ca1195fa15a6a1d6f6da455f4cffe497eb1fc0c7093ac751956ffdc6bb2508c8f5e84369f45762bd951b0d2d24e3e37503fc0d SHA512 14ba469fa6bfd20e45f1e0a82dc90b5e1dffa05119ce0729eeadddc8519b9895292240fdfd7df73c9ba4fd9f840addbc00d4b37985b30f6c2f3036f37a966484
+EBUILD tomcat-jsp-api-9.0.71.ebuild 1413 BLAKE2B ae56ef540e45ff1b87badf3f1be94dd75382c6bd2e4f32cddb5be57577aa80e70bfecbd54ee4e6e205c3b5eea3b3220d6db4c56c43b0eb863407197ddff12401 SHA512 2f80daaf5cfd4dac63e89746496c1763289364accd8bfc89fdeb7319375dd12cb4c746162fa2b195ec8226f49aced0025eb2701320427e6ce5591695fe4f153a
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild
index 23bc126a8e82..a3829a2074ca 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.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.71.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
index be2085c88695..f8ae3bc3aa43 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.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 236fd5848cb8..ddeb0a895d16 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -18,7 +18,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 EBUILD tomcat-servlet-api-10.1.4.ebuild 1464 BLAKE2B 8bf04e73c0e534bdff1d35f25d171b716a6416c179230b4e99f2731de3ac0336e3203e81bbea7b8dcdece2e79983126833a2836252b320edf931e5978d6220f6 SHA512 c88981bb5e3b7ccc2e97874a1703b3a40bcd7879653358c749680abdb6896be621ee0fd6fb9c6ca6d59fbce08aa5d5d9b6462167e5d0920227e3be28397f6d30
-EBUILD tomcat-servlet-api-10.1.5.ebuild 1467 BLAKE2B 48868536a12a61ea3ccd27e251734959607e0b9f64cf6ab91da94d65ce3dcf1657cb3090a70c430728d9097feb1ebc9b989a245bddbfc7d2503e77dd036d6e16 SHA512 e06520e4af991aa03cffb7488016d9fe7306560921399793b14feae7528c780c6e678184be5bf2fb7dd1a303580e790e78dee5331c520bce524ec8bb80372d28
+EBUILD tomcat-servlet-api-10.1.5.ebuild 1464 BLAKE2B e33a866c18dae4d049e0e6e52035a83bd84112bd0ae83cfe900fb1dd0ab3b04a5730d1f829b3749fb2d96a367a6815cceca81d8b1f9aabc363f62dbab6abd943 SHA512 3db2184a609ea5af1e05a2152c6bac038c615debcb41f65e1e9b73429b9934cec8dba5b9c3c4c4cb46870df8f0194c70f73c4f2fc79f800ae7fa6c41c90004c9
 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
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
@@ -26,5 +26,5 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
 EBUILD tomcat-servlet-api-8.5.84.ebuild 1620 BLAKE2B aa001d0cb52ec13e07f6c5e7b2512a770c46c17e3f29d99a90d0c2170adabba96d6ab20ab4f6b7447331911c0c5848df1f962b8067b8a9f92cd8e2dc5b5053f3 SHA512 e12ef8bf6cccca578ae5d099e0b3c391a7bb3d6a6b096f3a05b9c3041b15bc44150c99a2e0546b54e3738ea70f20c0f21de4959d94186949aa5751e28baeeff7
 EBUILD tomcat-servlet-api-8.5.85.ebuild 1624 BLAKE2B 3b3e351187dbb4a02b0151f906f4b43caddcbe5236b1be1fc6cfd01d1255babe44ef7e29680ac832c1405f6a747ca3b109be6b7de4659267537e1a5865988b93 SHA512 03d349d1eb87ca353cf52dc063a14a817746f1cdefd7247d28121806fb8cdf4d3f855b9ac1505e0e04656a0fe619027a1dd8f64af2142cf4c7ea4f67d70e3083
 EBUILD tomcat-servlet-api-9.0.70.ebuild 1460 BLAKE2B c330792fab85ca2b354b65ac58b5423f81e80ff7cf646e26fce93b552af9bb6b89dce92a821c97f2a2371a33462d213b64fb601c1fa50217b41dccd2abc0829a SHA512 1915129e4a4d72e8f155b537d0fb0e0ed03e4cf507ee9c091d9b0a16f5910af0a69f703d22b59b5099445910e74d8267ab375ce69d9ea91cdbebd5b9ee8e0e21
-EBUILD tomcat-servlet-api-9.0.71.ebuild 1463 BLAKE2B b508f970f95171b5dde4150f02aa2faa2629143c44f088849a2406ceecd08bf283ce217f4496737e72dda089d946a6844cf1d5d00bf06784ac34f46c2c0db5be SHA512 1d58627352b013a632baf7c66d5f8d662b47ac8cda24bb27ee56e73bd3ba71da4483bfde393071e6896779e0670b154114122785e2f3b9ce6a6b09384ad69830
+EBUILD tomcat-servlet-api-9.0.71.ebuild 1460 BLAKE2B b505ff56ecc48f03e22171242182bcf0f40580b7ad9d7baed0ddd3d2aa38e8af96c98d8ccacf5b29804ec623db3c9de807b0d5e7e1a1cd69170911ff4ea1ac07 SHA512 fec96a7163cc3b9efaefc61a5c59bf43bad121d8eff80adfb73730125c5d0ac16abfed90a1eaafb1f461aca60eb4405d5e283797bebc805ab8aed29a8377a03b
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild
index 2193344956b2..2824090700ad 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.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.71.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild
index a2fab4ae1582..fee6378b5064 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.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"