gentoo auto-resync : 11:11:2022 - 21:30:43

18 files changed, 52 insertions, 24 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 27fc941def51..1c778886bf9b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 6bcc4e004782..08c5155c3f60 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,5 +1,7 @@
 DIST mill-bin-0.10.7 65704975 BLAKE2B bd6cb205f58ef51eb43f45f5980de0dc1afbfb3b0a56ce81c541e88cae5d3cdcb65efcaffb90bd3a7b53a33410b26873d9db3a4863edf564a1ccb10c7be34e71 SHA512 9323212fd773de602ec8dbd1bf776169b402e9c60decc424b258254cc293cb4675a4caeb18addf853a7b1bdf0555cb3377e97a0dcf491b87286777c77c4232b5
 DIST mill-bin-0.10.8 65855208 BLAKE2B 4d165055a00f0373387064b98b8bf3548854213ad7a7317d7a8a03264fece5e882eb1705c45176e312a9444ab3e9f741ec638792e187a7e1b0941e1ac0862bd1 SHA512 9864c70b8a32f1ab451e07ab6e91f6fd9bf20e2cf400edca999c7585316696d90f446f68842413ae552c71f782d1687df5679857748dcc20c8d6bc7d38255b81
+DIST mill-bin-0.10.9 71023828 BLAKE2B 6cd71ad3a293b92957b504b850110103290f0017416c370f6de172247e96a42daffe94f7460325bff89b3136e3890eddb0ff7857418a0166327684e785a8e956 SHA512 494ad57e036180a285e44ff24ab8a7070b1b444e4267eb9ea76823f3717db4ca7bcab17013932764ed04fd7127272d87fef08cb59bc43ae257a76fdd715581e9
 EBUILD mill-bin-0.10.7.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
 EBUILD mill-bin-0.10.8.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
+EBUILD mill-bin-0.10.9.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
 MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
diff --git a/dev-java/mill-bin/mill-bin-0.10.9.ebuild b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
new file mode 100644
index 000000000000..e8485c57dfd6
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://com-lihaoyi.github.io/mill/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 668f53ff7841..17d40eb7e76c 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 1085 BLAKE2B 239bfc2e6138a76b292aa480e1f8b85824de37e25f1119b8b5c4f8a5512f5b94a6ed19b2378b0cda06ef5214eb81d8409b5dc7dce73d7663c1f029433946e20c SHA512 2a7257c8223b48fe88cd28eb781b5a4cd1509d49df3e2bd7f0495256a3ec940166f45b71f37a0bae6ee7f4ae2c9f935c23df64210708fc544b017568d62c8714
+EBUILD tomcat-el-api-10.0.27-r1.ebuild 1083 BLAKE2B e51a48c2be8b7e9fb5ace64339b274f933fb881fc00ea31e2d203d91b7478a2b7fc3079671e8fcabb001b7f6fc05b23620ca3f18e7ee7248643955df8c114825 SHA512 a1fd45e8cbcbee6e832cfda7728255d3d1059118bedfce148b616d0983f8160bbf8566e2589d633bcf51649af81a131e89a0e2ac6ddda8529f705543cc61f791
 EBUILD tomcat-el-api-10.1.0.ebuild 1082 BLAKE2B adc315817fed7b3e6a1a45b27b25b0e957c429635afd31e49175c82cbaa47b5a4174bab46e41dd82d01e60a682fc81b42d96284a5a7512759f67afcd74343a52 SHA512 6d282345502bb66b6382b4fa3d8ccdb6ed76433a82a434affb05b455eead27c4665e5ee1481ea55317d2d9b5b887da63b298cdfc4536bb3e2508b1e76451cf3b
-EBUILD tomcat-el-api-10.1.1.ebuild 1082 BLAKE2B 20ff75d660d6d5ee3dfa7a72cf12cddf1cf2050a77aa126eff41b4d8a66c12b857ae6c41c455948ef55115bf528d32360cff146e5cd09dae2da646b624923cd1 SHA512 47056f27631aba63f320f3db12a6cf4994a1bb3584fd62bc4214eb529ad6a58a335de3359466a0243fc060594e5fafea5b7b7b3a3fba506689e07fde0326ff70
-EBUILD tomcat-el-api-8.5.83-r1.ebuild 1078 BLAKE2B eee0be9538f96beac5d029f94738024ad0039112beae20b6d993e28fd6f9f16ce550699c29752afcd6650a9cb8aace5caa7056868ea70d9a5a8bdf545c9e6ec2 SHA512 1710953af638d3bf09ce71ed655e3d33edfc5d2e29a2965a93ced88ef01d04bf4c5dc5f2c48b40ff7eef925d449ecb7eab27cab608b60f1ce3f5c0f7880c1616
-EBUILD tomcat-el-api-9.0.68-r1.ebuild 1078 BLAKE2B a050aae2999b94167e2d8fd0863a460909b18181c30548d6323f3767b0873937ec606c2704bc9c2a0fdc563c279640896d301c892608029e108cc3484dbdf78e SHA512 fd6d23a5515c405ce695b5ff1064db09641085f441f75dbbde017a07b7e92ab6b718a850119b191042fc365a5e807074f5d8e3b519411d83956ddc3dfc6dc3a3
+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
 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 9835da231517..1ee34dfb4b81 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 c8754c29a16a..af1b9927da30 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 4bb1ecb9f608..8bdadadd51dd 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 61f7984c3420..eca7208580da 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 76de98d092d5..57d12f4b55ca 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 1128 BLAKE2B 93ac23cb14cdcc5e4a501dde03de69bfd5e45a0535b38e36a961e7d09ab191331cf27d85e31e239378abf82bad2077f1755981db1ac8bda33e3e4f7001cd024e SHA512 bae8727d620a8b3786b01c3c2cb0c32cbdf7aec482d19f6c07acb9d991509f191d6611cc4ba0dd47efba7d7b0140a72d907ce1c975cbf1dd40193f6a84d50be0
+EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1126 BLAKE2B 9f7389f56ebcdbe0653944c86402ed6dd0a5210e659dcd8e58d7a48a02b0149bfe64d44fba246f8cce25a91c794892c4fed4c8169254a22e4699611eb3bfeaa6 SHA512 66af30cc54b4b098c23ef15affff0ccb5c28d776c580b9515d405785b7d6dc44e2343ac31de1c031794c34eb9e0bf0e872d718cc4bb206eb25aaa089a45ac0e5
 EBUILD tomcat-jsp-api-10.1.0.ebuild 1125 BLAKE2B 5c59fe6a146a1540ee6bacdb34d80b3d171f97a7c902b5cbb0e7a49fb04f2d6baaec3561dabb3a7c95d9411629bf5b0ed654535d09bd59553b2653a3456695a7 SHA512 3162b038a1dcce3557941f850e430f55d95acdbaa9916c4b5c59cb12f9afebb9bad2fbdedfb59e3cbdfb43f409dea9baaa5051ce5f94a48d889a54d091b9595b
-EBUILD tomcat-jsp-api-10.1.1.ebuild 1125 BLAKE2B f3b45e551b1e1daa68659cb713479edab10d31983a1a2ec70c83dfa84028b7bac7f85af3c07ab65447c04c1184d01a635043c31f916e49f13d2f37af604c403f SHA512 ba7f23b9bc7b74ba0c5b51bef0ba276a481455c4056461c4e340e1b2d37dc498fc76eccf12679b64e6c46ec3f31bb147049953cd1e61ae494006750c6a47d661
-EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1121 BLAKE2B bece346b9599cb9c10cb042fba31a28889dc43b245309da3d16270bb12b24555812e770121b2b2197065492244d48caa1f015647dc9b6180f2fd109a49bcb9b1 SHA512 6ce13e8d973b93a33dc5deb95c7bc72d3b38a77528e15f55756ff8202089e49dd2deb267885b7dd66f84d7d4dae08ea70c1712f757d38f0ca32e1349b2c80d2f
-EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1121 BLAKE2B 3af7559e822c96d90093fe681b2dcefbd8963b843b11e8d5dc11ba49c13ca2e3adcbccf21488d9d4d62ca10c027acd31b69c57f1617a6ebc261c56de64c35afb SHA512 b0b9892ff2274730152a4b12b8c006134e2dc6b341a8afbdd1fd588f02a37a1a8e4ed294d8bb6ea499207e8e487985165df31b00c886f4292024c4bb9da86047
+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
 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 e838e36e4359..7a69a2c92b06 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 b5373fb0891a..22f57cc4a51a 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 b9d201f10b20..e0c1409e1b89 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 14d40969d205..635058338fad 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 e0b9188071e5..bcc08b86e107 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 1175 BLAKE2B 8251cf902d082fae48bd5f0906bb23ad4dd2a69008ea6f127a50d009eb2e6f70a274b775d8edbc5eadd4c421b4d2d23d3176d92aebe017ada09186cca396c557 SHA512 cbc958b1ca9385a5bc04f9a689386b787a580f72f379217d3ddad8915d072f4f8c600a77bcb072972efa16f17a89b6f1e631215ce2d27777b739319ee82d08af
+EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1173 BLAKE2B 2bde09380d45e4c7066bbb83f6cc89b891a53294882058d9e850f46a98a72741a2a9d8f2430d4143f5a1a61bc5f447e615a2376dc736fc6c3adf5b2aa6aac452 SHA512 61b7a0fb1d4c66297db96f6e6b03fad8700b23081b2c2c50de360c014c8a8b357a71fb89ee18f7a2d58397393cb2066bb7bac23cfe23641e7b05d4c8e3a5c945
 EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
-EBUILD tomcat-servlet-api-10.1.1.ebuild 1172 BLAKE2B a0e939bb1464ee12c11cd92ccba5ea6c868aaeea83fe0dd4a65d44ff5b04e9bbc7a8723575796833123232b351456e313530aa86cb9fdb94f1cd336bb355f9dd SHA512 98311d5bdcbb1e784bb8228b185c78bec7d46f06ec9ef6bae0f6bfc6f58dc0d5e5bc36b84df604864a332a4b53da5b750a092c99dcde8e1175b996b3a97433f5
+EBUILD tomcat-servlet-api-10.1.1.ebuild 1170 BLAKE2B b0db6284a5bf321dc272f68622b982560b6e845df7ef6f1acc9969e65eb2e6feab16bd5c3457e48626f6548d77c7eab2132a79ec235dc4f6d0003bcd9f982b2a SHA512 7cc04dfe018515be23085cb49c6334bf1f935b8461a87c184349887660b440b37ccfb26e83690192c41dec7bacf3de76d41f08ea72bf9e2f1c300dc378039605
 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 1328 BLAKE2B 385d32707719ae49dff0255a2a5a432adfdd02ab57467c2b71e7edf70bcd6f502c30707e3a02ae80d243fa9453bcd4b6da0345a1f462b28a40c58aa3097607bc SHA512 4b22424585b88d442cf0441a810752d1dc8243d23cac139ab5259393a522a342d340b376e0adab288e6520732bad221950063c0b76eff7b165387b08c62ab254
+EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1326 BLAKE2B ac0c1dc5ea23bb0b7ccdb19b0fc6071dcf2f1903b3e0a4280fae253a9a1c8ba4c4bab4c9223de72d19ad7e1e833ebcf4954658c175bb5d4c1dcba85206d0f53d SHA512 9759bcae0f968978f6a79951032bbbc0eab020d166b7dce80235f1a4ac418a341a2df4dd9f350fe94c939238344b1fb07fd6c0ca14221d356941dee70a4b1ae6
 EBUILD tomcat-servlet-api-9.0.67.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1168 BLAKE2B 772b7aa6f72ba5aa6534e8e866c167864415c780e431c3304413abdfb0f568630108c8ab2bbd388edcc4e88ed816de8992d341bd7a42823ca311ff43761c9fc1 SHA512 070aedbac428440cfe68810109c5a598fcb9ccc8a6a3cdf205f15e5769f91809c75a2ab6c3cb50214dcf6289b4a5b9f0bcfccb5901ba5d6684771caf2e5e8c79
+EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1166 BLAKE2B 060877a6405ddb140c01efd63db61bce05b6fd0e95c3d029adca849e6ea9983c88e14b1eaa293e9d816e35c3284c58d35df463db23ed8359361293aae038280c SHA512 8e11df73a21ebded3028e0ff945ec11a678346410514de680ed2dab59cf4ecc8fdd8d41ee4f4427ccc8909c8c5f05998e8b153657b7fc587489adc25c98d59f5
 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 8b1ec19d3a5b..b065669c2c02 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 a546fc617378..c82165af313c 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 696bde7efc5a..96a9844f8dc6 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 7f3ba3864e80..096f58bb7447 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"