gentoo auto-resync : 12:11:2022 - 03:31:11

20 files changed, 28 insertions, 28 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1c778886bf9b..6ecfc244806f 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 977ecde22ff4..e4c2e354cc14 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -6,5 +6,5 @@ DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2
 DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
 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 1424 BLAKE2B b54f3778c93a14b4db29b1a80eb12cf1f69eb139db4003aea7136083bf0bc9cdfe2f60914a4bd8924dedd0479b93940488d5206a7bafc744981a865c047804ca SHA512 e3eb3e24194a22baeda5fbf814a74b2408076672cc63da37c3b90960f90fcd832f59e9110565705c579c2e0cb31cd59fca634ef944ff8eda529c66a31714474f
+EBUILD ant-eclipse-ecj-4.25.ebuild 1423 BLAKE2B 7766f8237d685cf501fbb0be0cc3122dbc2cb074007d59937b52d06c1e60adf8ac50094d8a930d9ec9b31f8d496969ee98888a173980616ecd4bfde084a1181c SHA512 6061f492452514c6ca2acfe0350e0757257c0cad273a13a122d872cdcfb2767abb4f6aa93840ccd7ed36226473fd6de95fdeff8d30f2932c9bb22eb2b19478a4
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
index 0d981d39a2f3..68b185c4ceca 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.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.25"
 IUSE=""
 
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 9be886f82780..6df89c94341c 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -3,5 +3,5 @@ DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2
 DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
 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 1695 BLAKE2B 82ee2cc81a26882bd5fbe107dbe70a4c469c8a943f99e0f04f30efa6a6f11e061ceeaf22d79e0e7519a34254c77e081a79f1ec80a060bf0ff645ef1a49117228 SHA512 2df447371659055cfe9af39a250a0e4f94d063bf854d5584c8a042db9574342091d81c77b745b2327c21a8c802800f7704943d0aa262c26244ae5d313bc448c1
+EBUILD eclipse-ecj-4.25.ebuild 1694 BLAKE2B e7a3747da20347847282ec2275c05128c48c910fccb51abf0609a1e621b9e0d7ca84485bcc55beb08d5cd31722dc619f700f2a1443ae8b8761c0c84de29aa2d7 SHA512 f3d6c3da79be824c191a80edd5f514f7efa2dc33b45ce52bde02e55e17dd21384345a0517508519ac80f14c5020c1f672986ed168c531eb4258db23fe132a3e4
 MISC metadata.xml 657 BLAKE2B ed8b1b4598051b4191bad5e92df382f1e0910f7aa6888d9df4dedef6929a3d8933c2951c98e8f8af8750f176ff541608d8db5d311e06c721b14ce1703a95a00e SHA512 ad91b4e46f609db5c5abc145feaea99dc0e6f4297ee1f6532ff1001a991775679e8f53ef91e823d61a614e6d77fbc18637469ea1869d8f82bab352a69c6fbdaf
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
index 6cbe1264075f..e10697904fa0 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.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.25"
 IUSE="+ant"
 
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 17d40eb7e76c..ac58c6c68438 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -3,9 +3,9 @@ DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-el-api-10.0.27-r1.ebuild 1083 BLAKE2B e51a48c2be8b7e9fb5ace64339b274f933fb881fc00ea31e2d203d91b7478a2b7fc3079671e8fcabb001b7f6fc05b23620ca3f18e7ee7248643955df8c114825 SHA512 a1fd45e8cbcbee6e832cfda7728255d3d1059118bedfce148b616d0983f8160bbf8566e2589d633bcf51649af81a131e89a0e2ac6ddda8529f705543cc61f791
+EBUILD tomcat-el-api-10.0.27-r1.ebuild 1082 BLAKE2B e3ab23bc75c3a22df153d579fa2df8ba8caab9e0ff89f9c91845aca77daf487c6716714e5cbb158b9514a42ea48d84d22ec6eecf173630c7bd09905d8c8ffb4f SHA512 d1198a7e8850448fd4fa9b88e956555d1c1ffca9b02548c8c977d95af7ecb293b62fbe51a50f08c0916f177b34ffe006e21f023b7bffc5cc2681945749965d5e
 EBUILD tomcat-el-api-10.1.0.ebuild 1082 BLAKE2B adc315817fed7b3e6a1a45b27b25b0e957c429635afd31e49175c82cbaa47b5a4174bab46e41dd82d01e60a682fc81b42d96284a5a7512759f67afcd74343a52 SHA512 6d282345502bb66b6382b4fa3d8ccdb6ed76433a82a434affb05b455eead27c4665e5ee1481ea55317d2d9b5b887da63b298cdfc4536bb3e2508b1e76451cf3b
-EBUILD tomcat-el-api-10.1.1.ebuild 1080 BLAKE2B 6f1658221ba75f58e408d2b4ba54e5d3c51660d75d6ec85deaf8af1a2f8ab72082c94a6ed28bb758ac047e66ef04dc3110e37fc3a3a5d884fe4caf252ae865dc SHA512 b6946ca7d5148796a9ba0bc4e08e8807221122e0c4f1dede82e7bb120b465b14c38eacc2c36adc55e4b662c117d57e660d2ed979bd1acc833c379303ebe65a79
-EBUILD tomcat-el-api-8.5.83-r1.ebuild 1076 BLAKE2B 95a963dd26e723c14846046392e48219c25a6a30f80bd9e06f95a29e727e7d781292b26b9e76cf999fbe5996566166b347cb8ef78bab13980edeb70414c548a2 SHA512 bbfa84df56ad08ba552c02caa5cb3291075313cd1b92a87d70e177356fbbdd44446b5d6ddebb0bd9d58b12e4d054c00be08e640248e7fbbb272bdf5a549c3402
-EBUILD tomcat-el-api-9.0.68-r1.ebuild 1076 BLAKE2B 5d77f535cdeb48dbe3b3840ea051ccb0429f0f72cd40088285c33fff777e93bf1dd62d438977cd8220c662a37966e4634435ae50624a8b0980a17436a5011d26 SHA512 592dbe7ae237e46365491624648f1e3631d0762c41d65956f847e3d47615b86b735ab0ed4f7a194b21368bc9b5ca38bad0455db70fce1f2eeb8fae7e97c02332
+EBUILD tomcat-el-api-10.1.1.ebuild 1079 BLAKE2B 5f3e82a4dd4d9fa42d4d926bd0a7244888be6663f91fd733dcc6ea3ad419f5b03238685e3271c7e8f113b7248c5277a3950a3ee78f1f344e860f90d67f988e0e SHA512 33dc2897df3fd52ed7f8b2a5cdd646198a595137eed847b97dd94c19c9b2ec0a913b5a4ef45b6530cd34531083af77e3a488484fb1866e2e9a555410f501ed0f
+EBUILD tomcat-el-api-8.5.83-r1.ebuild 1075 BLAKE2B cf00a380adf5f15c5144a54dcf6109bf6a9609bbeadfc647e25bd592dd502bf3c765965e44152c359e91eda7c682257c6e3ec25e6fb6fec228964a944e5a24ea SHA512 116536d0310d6a6e020cf773991917c5fa6996b5a950e955ee2f57f87682fde9193d82f8b4bdcaded914827bffb0b78b9d5b7a1b08f6902f419d6907423e7ebc
+EBUILD tomcat-el-api-9.0.68-r1.ebuild 1075 BLAKE2B 39156983cb5f2c1a20b2df52fec6f401496531626e6635ce35b8d3545d777353b13672bdf87ec835fd6147e1c7427c63c729752a9118dad1e2fc937689c7572a SHA512 c7a42de01bc4ced6bd6036b1b007cdc223a8f6d757de22ed667ec0c7c5e3d8a8e12cd4ac576088f760dfb36743de8d9767b8b4d33239cedaccbec693c7d6d392
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
index 1ee34dfb4b81..25430da1b258 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
@@ -14,7 +14,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"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
index af1b9927da30..41a70a360455 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
@@ -14,7 +14,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-8.5.83-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
index 8bdadadd51dd..59af388465f1 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
@@ -14,7 +14,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-el-api/tomcat-el-api-9.0.68-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
index eca7208580da..ba265fe14333 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
@@ -14,7 +14,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 57d12f4b55ca..ecb5d0152859 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -3,9 +3,9 @@ DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1126 BLAKE2B 9f7389f56ebcdbe0653944c86402ed6dd0a5210e659dcd8e58d7a48a02b0149bfe64d44fba246f8cce25a91c794892c4fed4c8169254a22e4699611eb3bfeaa6 SHA512 66af30cc54b4b098c23ef15affff0ccb5c28d776c580b9515d405785b7d6dc44e2343ac31de1c031794c34eb9e0bf0e872d718cc4bb206eb25aaa089a45ac0e5
+EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1125 BLAKE2B 01e4c1ee7c5e375d2ed9c2b6be5557a5bcf593db18be2e9c0919b8cdbebec3d8cb57867a68b0aaa25617aed79df5580d38c381edcaffcb43e32fdcbfd69adc0e SHA512 8545d3d0904a3dc0c09e26db55cd2f6b3706a5661dceb744525f27e9ff5b5fe336aad9d21cf755a6a37baf47275d29a84941754395a0652078c6dcd70bffaa76
 EBUILD tomcat-jsp-api-10.1.0.ebuild 1125 BLAKE2B 5c59fe6a146a1540ee6bacdb34d80b3d171f97a7c902b5cbb0e7a49fb04f2d6baaec3561dabb3a7c95d9411629bf5b0ed654535d09bd59553b2653a3456695a7 SHA512 3162b038a1dcce3557941f850e430f55d95acdbaa9916c4b5c59cb12f9afebb9bad2fbdedfb59e3cbdfb43f409dea9baaa5051ce5f94a48d889a54d091b9595b
-EBUILD tomcat-jsp-api-10.1.1.ebuild 1123 BLAKE2B 2b02ef7659b22b7741ac391f37032225428c93959fa3b972e555c7fe703dfee60c81b42414aa16156edcc016bb51e34b0953f58ca570f4dafa9595488e3f0d81 SHA512 48e1fa5cc249295eeb3715e2492ee00330532ee0b832d2a7f62e46d11547f50be50873c5f2dc7213cff7575b31dce05111a129fe93b4425cd2d4373098e4eef8
-EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1119 BLAKE2B 80e064c062f9d95fed34ede531dcfba8616b016e6a4d77f39de7aab366dea3d9db88d4329a360928ed3944af49da475fd6ff93bd8467eb1ccd6591045e8e3c83 SHA512 4913e904d36c2542a88eb32135f37e4a60af9f19c43151232c225e83f9abc1b6035635e0c7891d6a975099f7ca5b27c6ddd1b0f700d3cce4a102d401b86aa238
-EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1119 BLAKE2B 06d9e661ced0f06fb1b7d137894b2bd4583a2bca641def0e1b3a52db11db377a9e3b238784820d171c47a7246be9ab618c90c8ca802f54e6b3daddd17b3cfb25 SHA512 f98c09e991aef980d536915f8b2c17a0233523f55119e8ace5cf7579b2667b85ff46d679dbec59b7a5c5c9f7b286b02d0e76dbe4e92f332b7cddbfd78bc326ef
+EBUILD tomcat-jsp-api-10.1.1.ebuild 1122 BLAKE2B 9ce26dc7c3474cf0304dd7545453939688f36321d68c040b70392e9722c18eb865c511c593caf5ebfc335576f96beb7036704a857fec630638c25f5be15a4631 SHA512 357de0e27c33d644e86b191840edadf9f0964453078134e8fdde1a96254f9f341d4254c27618618f9511a6be05efcc738e2594b368b355cdb31993d72d09f4b1
+EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1118 BLAKE2B 09c64ba37155dd9c202468adfdd3336808516ab0366dece9523ae8f056c6e3de32a1b12b400145db46f31c5b2e3ca6151f38d6c6d9f0486dd3d3c627ab660ee5 SHA512 eda47f3e527f94bbcd9c2f6f9c9095e91ca20232f439e3354e2fc0ce22c84f549b90499180771096154fa1cb8986f17015afedc381afc95269d6774d25d96588
+EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1118 BLAKE2B 808b81b02e9bc2aed8d2ad71027bd70d0df05c475fb6461d753254a8bdd4ab98481b6fe00c6bec7db546a7828acabf5df92911afd864b70c42b89fa23bc73b1d SHA512 9d08f074a985c7adb3f68e8e7e348f428d97fe6cdcc0017c913a8a863ebec85bb98e143e174f8d5f508d1366e8e273369fd99ae37b844719834d02aeb9c98437
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
index 7a69a2c92b06..a58ca4b310b7 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
@@ -14,7 +14,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"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:4.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
index 22f57cc4a51a..f2517df2876a 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
@@ -14,7 +14,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-8.5.83-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
index e0c1409e1b89..f7a2a6eadc9c 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
@@ -14,7 +14,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-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
index 635058338fad..d744926afba1 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
@@ -14,7 +14,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 bcc08b86e107..51ea4cb33c13 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -14,15 +14,15 @@ DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c
 DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 EBUILD tomcat-servlet-api-10.0.26.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
-EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1173 BLAKE2B 2bde09380d45e4c7066bbb83f6cc89b891a53294882058d9e850f46a98a72741a2a9d8f2430d4143f5a1a61bc5f447e615a2376dc736fc6c3adf5b2aa6aac452 SHA512 61b7a0fb1d4c66297db96f6e6b03fad8700b23081b2c2c50de360c014c8a8b357a71fb89ee18f7a2d58397393cb2066bb7bac23cfe23641e7b05d4c8e3a5c945
+EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1172 BLAKE2B 8da897452fa331bb40cb9cf5b95563abf6845e79be2e9484be90d67505ce21622874da30af708c1da2a42f3e2ae0e8253a69330b8afc3b739783f5d8360ebe63 SHA512 99d069b42dcf1f926bde0e51e152a59338be02e3145c98ab6e76f1b2174e93a0b807e77425082d68ee7b9af6c36f90ecb6223c6deda4027d7f2308eaadd1614f
 EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
-EBUILD tomcat-servlet-api-10.1.1.ebuild 1170 BLAKE2B b0db6284a5bf321dc272f68622b982560b6e845df7ef6f1acc9969e65eb2e6feab16bd5c3457e48626f6548d77c7eab2132a79ec235dc4f6d0003bcd9f982b2a SHA512 7cc04dfe018515be23085cb49c6334bf1f935b8461a87c184349887660b440b37ccfb26e83690192c41dec7bacf3de76d41f08ea72bf9e2f1c300dc378039605
+EBUILD tomcat-servlet-api-10.1.1.ebuild 1169 BLAKE2B fe96fa170d2f84781ca7cba89db6244f0cbd87a6cd9da200dabe17ca784dcbec4ee6974af7ab4d22bc877e2ba595fe19990f8e02fadb1c47b8cad4bfb867290c SHA512 5cac843254102464bf1b8d08fe645816e984b34e0f70f1eeb0e3eee339f6484006197c7ecc0145271e2922fe1e86737ce1e990d85b3e4b83ec43794897416325
 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
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1326 BLAKE2B ac0c1dc5ea23bb0b7ccdb19b0fc6071dcf2f1903b3e0a4280fae253a9a1c8ba4c4bab4c9223de72d19ad7e1e833ebcf4954658c175bb5d4c1dcba85206d0f53d SHA512 9759bcae0f968978f6a79951032bbbc0eab020d166b7dce80235f1a4ac418a341a2df4dd9f350fe94c939238344b1fb07fd6c0ca14221d356941dee70a4b1ae6
+EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1325 BLAKE2B 4f3b205b147964264edeb07314fe3e731680908d90db2ecf696969ecddb93eb0889021fa43a19dfa9734c9c829b9ba5b47948ed91539374d2fb6204b59b1bbc6 SHA512 4fad8cbfa6802ff57df8462830923d641c55a988407a612db215e10a09611225b5b7a29f2448617a12e48e0cb77a3c5ca27822092fc7a216e9f6c45ab111e795
 EBUILD tomcat-servlet-api-9.0.67.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1166 BLAKE2B 060877a6405ddb140c01efd63db61bce05b6fd0e95c3d029adca849e6ea9983c88e14b1eaa293e9d816e35c3284c58d35df463db23ed8359361293aae038280c SHA512 8e11df73a21ebded3028e0ff945ec11a678346410514de680ed2dab59cf4ecc8fdd8d41ee4f4427ccc8909c8c5f05998e8b153657b7fc587489adc25c98d59f5
+EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1165 BLAKE2B eb32c1af1f0fa23f9ba56f040cb47763f622360746aadc63573e48aa1aa2daad93bac59c1182b3ff792825e3445dea099833baeb01649af6d6ed465aced89a9d SHA512 677eae6a195bd6dec5c12a9ac3124012bd8893651478e61a3d83e78c2b2a320ba6c65f2092c51f66cc5a1c6fbecb0b5c5ddad9e1ae3a8ac28f53209ad1a2c7f5
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
index b065669c2c02..538eb8b86d4d 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
@@ -14,7 +14,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"
 
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:4.0"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
index c82165af313c..dbd0b6f8cb9a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
@@ -14,7 +14,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-8.5.83-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
index 96a9844f8dc6..1fe708fe2364 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
@@ -14,7 +14,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
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
index 096f58bb7447..03b8140fd930 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
@@ -14,7 +14,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"