gentoo auto-resync : 18:10:2024 - 04:04:23

13 files changed, 25 insertions, 20 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 2c491619386c..a4926b9e2aa8 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2999b490d6b5..614e445eeff8 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -8,10 +8,10 @@ AUX nginx-1.23.2-mod_auth_ldap-fix.patch 887 BLAKE2B 3834c6af746b5218589b97e040c
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
 AUX nginx-httpoxy-mitigation-r1.patch 2023 BLAKE2B 82e6cb6c1d38b9e4cd619abfe60eeaa968ded8975277e60afb94456b59e311817eef04db2b207e85308ef480c442e8acd68cba8f455b4cfc872829e522cb1ea4 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3
 AUX nginx.conf-r3 1325 BLAKE2B 3aef6116b366ef325fea9c99e6c1f5a8ea4b6d12aced541e3ad89e20bff76f58f146b7cb6339b4ad99789ea64157864552ed099d47f9e534c893265f998c2db3 SHA512 4a185f6bb09576667e98afdd88a6bbf4909e0db251b04e7889c6e17baacb950986c8ac7a79ac4031746f848433c5d3653a73134690cf68f6c37844ad11fe0077
-AUX nginx.confd 1131 BLAKE2B fd9c9e620a0b8c630a609c3f38f91f62babfed12d4d8035f8c54609a9360b28a919cf2020c577575bdab70cdd9c34e5996852d6d35dc9f2f52a2096c9facccfd SHA512 9023b33b6e03de4fa4df8459118a34a24a52ec167eb0aa1d220fd5ba8555aa454ca3451cad4eecc87a445b74cae5132fd717286aec3f1fea390eb96547e4ae85
-AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440a2612b86273936ac4dbb350b81ecbe646dfa67d375492259b1609f3953f1b456c7427a02dd282d37 SHA512 e641829466e54093ad01e9f6c57acd2f0505e489a32e67dfee9279d5da57b216052a92eb05eb0c9c122c12f8b7bf8274b520b6e02fda161cc03187ce7c0660f1
-AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d618abd9e578f2e432ac0cf653a0f3842a0620d405759216bdc17afd50b33aaec3ad0c6757dfac3e34d8 SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95
-AUX nginx.service-r1 356 BLAKE2B 05d89efcc73b70a26655f306f1e074e61c81063cb4e949161efbe95dc375e63807233f38c9af6723801e8f653cfad08f62fbec225b061d1179b7d05fe761afc4 SHA512 e51f4e88abe10555afe79d4d029651a4de42a5dc1dddaf951f13c021453da00e0c56a3fa2129d08fcd090909a54564e76887c93fdf72952021f5a2b09f6097eb
+AUX nginx.confd 1241 BLAKE2B 1b70d46440825dbaef34370e5c88ed5f3a5780a645fd7440d22b78451ed082d9c5dff3689576750cc7806515e8caf939f9a6be2fafa1516e2c519932881f746f SHA512 53d2946ab9f2b5e2c2ccb3a946fc8f26a5320be3d5f90892da86cb6188a147b95758d056f93805f493f1c33b139e534e905fef9c391ed3a7de07a5894d144752
+AUX nginx.initd-r4 2271 BLAKE2B 4cf3f3f25c3fe68c842aa75bf833005e927dd614455b837b3e8e5dc978f693365772b68b5b8630c966d3d3ddf2b6d820055521a0aea9d046ae0796a858f3c0e5 SHA512 79b5608b210ec160f4d6a46781608f07b59db4ec039aa1be7947ae36e5e13d195a9ec8389edf592834ea9953b235961b0c55d63d7bad07840fbeec64a110313b
+AUX nginx.logrotate-r1 269 BLAKE2B 54cf4de47ea51934ae5a9e816f558305b9a276a5746e5e43781eb88bb0e487da1da111bd5479f710302ec8083f5a32255e55ac83019cda4418cf47d6550774ad SHA512 e05713f15063ad6352c668c3de43ad925469e4f0697dee2714982a7568770eaff6e9b0df1218f1c0e805e852d39b26f831b6f866e3d0d7bc1ff82fa56f4179b9
+AUX nginx.service-r1 362 BLAKE2B 88a2298a0ebba93b10668c817c8a3b03bbde2e3d159ea57d41b88c01a8fcbf56bee931b3033e9bb245ccf4fc7c7e1a7c9f40d3150c1fefe9865cbf1d94d33a0a SHA512 b91c42f149dea84da3e92527b53c0932b742b48a0777fdeef8beb56f6256a4c7ba090432e4b730467e6d87d59efb598699e5c943b627a4267d4a4039b0e9b898
 DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d0debbe37c205bb7c6e79594d8b1a6a0d93988880d35f607ef05ef6d73c9aa887baebfd2c54aca894969beeed4bfe576f37 SHA512 20495884c6b3594edf879a19fd7445f2e74a1628789decd146b3c712764b0507e440a84a64aab619461b044f98b8d641913cfad57a6d0002e7061716bdfe84fc
 DIST nginx-1.26.2.tar.gz 1244789 BLAKE2B f054deb47bf21bf963fedc8f980d29c92325bbfcb39c5a2cc67cce15add32036f0b771c7abac018ded6354a0df0850ed5843d26e0cf5d9577b70ca3fa89a206c SHA512 470efe9ae5d6150ecbf133979c6c36415679a2156499a3b6820a85eb8f3038a8aa06f7b28ddd834cffb0e982f3ddc89e4b1649d536eba4f84019a72d4cfa3539
 DIST nginx-1.27.2.tar.gz 1258098 BLAKE2B f3a68e0f5f89cdbae2f79dc71ecf9074cf39bbee114c3bdc59892baec54eb44fc4fdb1e0aa7f3f688ae28386a2371d2301fa12fba93e4a08ed05ebfd3d481952 SHA512 5e2e0ccba596c5fa67571095e7c9b34e0a8a44f12d72c5cc714360926a192a09810e08f653b16112b5a3223e8cddc5a61f9f8dba026fb0854ec7a0d440666cf2
@@ -41,6 +41,6 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 DIST njs-0.8.6.tar.gz 879028 BLAKE2B cd6ef50feeeeeb66ac927a9373bac9612e1bd47ec1a6bf4115feac0c15f2e67a1970c19b1bc0fa751395b98eda303dc91547bffde648958935cca4ed531a0728 SHA512 418fb54cf4924a38a1cde661432e9432853a643289c299c347aa9e9b393013e504ea4f15698c885ecde7e7ccb249c51b6b1c2bab96024f82b9acb271d2d4acb9
-EBUILD nginx-1.26.2-r3.ebuild 42544 BLAKE2B 9a894ec7b8dfd7b9c04c067ff86034c3dc471b3995b0cad212ce9d0e320b9047e634192dd016781eb2951beb5400f56283bf5f1cdaf47ca30cd73f88581d8180 SHA512 9928b0fce43f509cadcc153d28cc28a569a5eeb496003fb063a4e81f3e6b13aba97ba23797872c3cb895ff7c0d9e58309c2f82e20f21f5eb1961399fa1fe12d4
-EBUILD nginx-1.27.2.ebuild 42551 BLAKE2B 9bbfeb06b175113b283a989be5385db73fee13e14add39ed719c98e756199352498b316b3085dd528e63af91e2ea8641291265f51b1b5635b965626af0327abc SHA512 5ec8170c08a3bfeae653cff55a0e123b41553c33d05c05185837f3fa916563566a6990b74d07c46ecdcf34cb3e4aacfe6a7e1bfb068d55307c9d14bbb3ffc601
+EBUILD nginx-1.26.2-r3.ebuild 42550 BLAKE2B be20060939d02e3b30421ed8a0dd5f0c6f47cc7df276da126d35c497b6fd1eb9b84c0bef7a008712bcb66502ca809f5a2d70dcc3d67f62865570c72f48f4a0e3 SHA512 a5863f85dc195ae1d93ac36885917db6ab54c1fd57ee29024234ece2009baa19f2306dc50a90f384e9732c57c81fb4f5e2c6e3dff4de9b086156949b41153f90
+EBUILD nginx-1.27.2.ebuild 42557 BLAKE2B 86905309b69f89190872de8c426eacce2dfb6e51de15f3e2a16f966603b9f226cb70392a897418ecb8abcb9a8e21a6e67f57939ef118d9d5cfb34afdca4d77ec SHA512 16f2ef144b600d66bfaa8d919b77e469af615febc0b230caaa2f80f40c6a6399ba849c47cb39a8fdfcaee368511e9654062d96bbcd3799a814ae388001fc2e78
 MISC metadata.xml 1189 BLAKE2B 9e65f404d2be335d14ffb087be60847a2508de79baae7ee0e3bd7021dbfbbc1f18b93ed758d107ef3a9738ab32889f106a5eb8232f8f4190d57c175eed60ddd5 SHA512 8077d4da43250c5cc783451682047460b093cf1e751e0b0d75a21bb42baf83fd31b1bb3a574ed6e7ab89286afb331c23915c676ed80c7b4cc5fd9f84a40da893
diff --git a/www-servers/nginx/files/nginx.confd b/www-servers/nginx/files/nginx.confd
index f4b804375e92..478ad588f4e4 100644
--- a/www-servers/nginx/files/nginx.confd
+++ b/www-servers/nginx/files/nginx.confd
@@ -6,7 +6,7 @@
 # PID file
 # If you should ever change this, remember to update
 # "/etc/logrotate.d/nginx", too.
-#NGINX_PIDFILE="/run/nginx.pid"
+#NGINX_PIDFILE="/run/nginx/nginx.pid"
 
 # User to run nginx as
 # If you should ever change this, make sure this user has
@@ -30,3 +30,6 @@
 # that the service will be terminated within a given time (60 + 5 seconds
 # per default) when you are stopping the service.
 #NGINX_TERMTIMEOUT="TERM/60/KILL/5"
+
+# Run master process as user (requires configuration with setcap)
+#command_user="${NGINX_USER:-nginx}"
diff --git a/www-servers/nginx/files/nginx.initd-r4 b/www-servers/nginx/files/nginx.initd-r4
index 31f79baa099b..c9896289975f 100644
--- a/www-servers/nginx/files/nginx.initd-r4
+++ b/www-servers/nginx/files/nginx.initd-r4
@@ -15,7 +15,7 @@ NGINX_CONFIGFILE=${NGINX_CONFIGFILE:-/etc/nginx/nginx.conf}
 command="/usr/sbin/nginx"
 command_args="-c \"${NGINX_CONFIGFILE}\""
 start_stop_daemon_args=${NGINX_SSDARGS:-"--wait 1000"}
-pidfile=${NGINX_PIDFILE:-/run/nginx.pid}
+pidfile=${NGINX_PIDFILE:-/run/nginx/nginx.pid}
 user=${NGINX_USER:-nginx}
 group=${NGINX_GROUP:-nginx}
 retry=${NGINX_TERMTIMEOUT:-"TERM/60/KILL/5"}
@@ -26,6 +26,8 @@ depend() {
 }
 
 start_pre() {
+	mkdir -m 0775 -p "/run/nginx"
+	chown -R "${user}:${group}" "/run/nginx"
 	if [ "${RC_CMD}" != "restart" ]; then
 		configtest || return 1
 	fi
diff --git a/www-servers/nginx/files/nginx.logrotate-r1 b/www-servers/nginx/files/nginx.logrotate-r1
index bc9d87a09a91..81eca0168ced 100644
--- a/www-servers/nginx/files/nginx.logrotate-r1
+++ b/www-servers/nginx/files/nginx.logrotate-r1
@@ -6,6 +6,6 @@
 	delaycompress
 	sharedscripts
 	postrotate
-		test -r /run/nginx.pid && kill -USR1 `cat /run/nginx.pid`
+		test -r /run/nginx/nginx.pid && kill -USR1 `cat /run/nginx/nginx.pid`
 	endscript
 }
diff --git a/www-servers/nginx/files/nginx.service-r1 b/www-servers/nginx/files/nginx.service-r1
index e160af7625b7..d87081788091 100644
--- a/www-servers/nginx/files/nginx.service-r1
+++ b/www-servers/nginx/files/nginx.service-r1
@@ -4,7 +4,7 @@ After=network.target remote-fs.target nss-lookup.target
 
 [Service]
 Type=forking
-PIDFile=/run/nginx.pid
+PIDFile=/run/nginx/nginx.pid
 ExecStartPre=/usr/sbin/nginx -t
 ExecStart=/usr/sbin/nginx
 ExecStartPost=/bin/sleep 0.1
diff --git a/www-servers/nginx/nginx-1.26.2-r3.ebuild b/www-servers/nginx/nginx-1.26.2-r3.ebuild
index 657fa2679891..df9a7fc03956 100644
--- a/www-servers/nginx/nginx-1.26.2-r3.ebuild
+++ b/www-servers/nginx/nginx-1.26.2-r3.ebuild
@@ -710,7 +710,7 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
 		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--pid-path="${EPREFIX}"/run/${PN}/${PN}.pid \
 		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
 		--with-cc-opt="-I${ESYSROOT}/usr/include" \
 		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
diff --git a/www-servers/nginx/nginx-1.27.2.ebuild b/www-servers/nginx/nginx-1.27.2.ebuild
index 7588c9071150..1a85e9d9c4ec 100644
--- a/www-servers/nginx/nginx-1.27.2.ebuild
+++ b/www-servers/nginx/nginx-1.27.2.ebuild
@@ -710,7 +710,7 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
 		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--pid-path="${EPREFIX}"/run/${PN}/${PN}.pid \
 		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
 		--with-cc-opt="-I${ESYSROOT}/usr/include" \
 		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fc49e7282236..3213c01842d3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -21,10 +21,10 @@ DIST apache-tomcat-9.0.95-src.tar.gz.asc 833 BLAKE2B 51dcbb097426b7678296926690d
 DIST apache-tomcat-9.0.96-src.tar.gz 7042818 BLAKE2B de7d573a2ee83ffe997f65ff2b66b8205efdb05c7155e6e6982c5ff0406b0f7ddf1a93978b758c956e5fee8f5b8df8880ef55b4009248a2477f26dc1da30a8b0 SHA512 cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884
 DIST apache-tomcat-9.0.96-src.tar.gz.asc 833 BLAKE2B 6df8c0c7ee73b9104c102c1c4c0f2030728de90a968efc26a0c85537d7876a0402bc66fea9a3a398be8f210c6255b5741ee969a0633cdecd95268731615f8635 SHA512 37404f8687b0bfc761611402ac4581e98063a229f9a4b40d4b4c6fc25e966d48a2b951cdd198cf60930bb7b776ebce6ef02eeaa89e51351120b462ae1b20e54c
 EBUILD tomcat-10.1.28-r1.ebuild 5434 BLAKE2B 14c8fb4ea095811ddbdac986e9e048c9e01131de398d95d703b2bea8ef1cbb094764a666257c4f39af88cf90e175328035ad20cb2092e0f19427dcad144eb175 SHA512 536148e97e39e5548e290f7fbe23db06154f53960b2d6418a5227aa75318a635f344fa11db9ddc1202833b0084d8b5024a2f7319ff71a9c7b9b394f76c4fc4e9
-EBUILD tomcat-10.1.30.ebuild 5435 BLAKE2B 19bd34060658756fddfa8a06f36c084c13ba7eef8985905c1abf0c9b96418353bd84ba54ddc203c8d9f2796b035d04184f86dafff3985aa8c1bf7888bc5558ec SHA512 543917f1b6d20fbc9ebc27c6d72901b94d20c7ea8ebd73936cb0a86aa09385be2bf9d9a13ee4e5bcbd08fc31f536ec53307122783cd67d4a12e6898e2d7dddd6
+EBUILD tomcat-10.1.30.ebuild 5434 BLAKE2B 14c8fb4ea095811ddbdac986e9e048c9e01131de398d95d703b2bea8ef1cbb094764a666257c4f39af88cf90e175328035ad20cb2092e0f19427dcad144eb175 SHA512 536148e97e39e5548e290f7fbe23db06154f53960b2d6418a5227aa75318a635f344fa11db9ddc1202833b0084d8b5024a2f7319ff71a9c7b9b394f76c4fc4e9
 EBUILD tomcat-10.1.31.ebuild 5435 BLAKE2B 19bd34060658756fddfa8a06f36c084c13ba7eef8985905c1abf0c9b96418353bd84ba54ddc203c8d9f2796b035d04184f86dafff3985aa8c1bf7888bc5558ec SHA512 543917f1b6d20fbc9ebc27c6d72901b94d20c7ea8ebd73936cb0a86aa09385be2bf9d9a13ee4e5bcbd08fc31f536ec53307122783cd67d4a12e6898e2d7dddd6
 EBUILD tomcat-11.0.0.ebuild 5550 BLAKE2B 66e4623ac46bcd4b06d95b9d92591e30c79c78cf9387d400ace84459f1b25b5ac0e6be51b4a6c57d9d0a9f040c810eeeed680addb2fc01cf85f8cefd9f5286ad SHA512 46ef13d18a06822abf02433ba88bbd75fef79f9f2f6000cee30b16b314740d9c5e65ad1ab600f59c3acc4eb99da9f1a684b8b3103e6cea36b6fc2ffffec0612a
-EBUILD tomcat-9.0.93-r1.ebuild 5019 BLAKE2B aca571f46642b134bcf4b5622b8af34f5258719efc68d85929e2abd3484467aa6f279d54f0973ca386dd207bafb9cefd12c7a6ae0d1228416ece19aebf33e410 SHA512 3fd48269af48f6cc7b591b582fc2c23f4da252dea9112fa1a02e26dfe28fa62fc7f6fc07748f61a7c4b76534ee138a9b08f309996541636cbfbaff4fbb2bd6d3
-EBUILD tomcat-9.0.95.ebuild 5020 BLAKE2B c8e5fe66ebe1ab2c6c4615e9ce1db3eaaf721f0fd07e613074f7d7e4446bf2bb27f6022bf074467b5de9526a754791e797cfa14d92dfbb1ebb3dfd8f4537a01f SHA512 4065e12dcabe4fdd81a458734f38947e92dcdbb2be490618009de8b35de85bdad4a688d50b1f3eb3e4285af0a8a6de33f8d894bd3f981305398d8a6bd5ab976e
-EBUILD tomcat-9.0.96.ebuild 5020 BLAKE2B c8e5fe66ebe1ab2c6c4615e9ce1db3eaaf721f0fd07e613074f7d7e4446bf2bb27f6022bf074467b5de9526a754791e797cfa14d92dfbb1ebb3dfd8f4537a01f SHA512 4065e12dcabe4fdd81a458734f38947e92dcdbb2be490618009de8b35de85bdad4a688d50b1f3eb3e4285af0a8a6de33f8d894bd3f981305398d8a6bd5ab976e
+EBUILD tomcat-9.0.93-r1.ebuild 5014 BLAKE2B 5c4632a8aced391064f0060a319794056d3121c21c29e002f9c366bf6078ce2f97f04c31babdcc1bffbe1f938208f4d7a249a72c0376a743fa5e7188e713e120 SHA512 ec1ae289100699b992fe0d0e0270b59f6b049579863c1f5dbee2a563dfb70e3e8270539860f209404fbbf3ee013cc04c8c3b7f68735fd3cbb2f614e5acdd4b3a
+EBUILD tomcat-9.0.95.ebuild 5014 BLAKE2B 5c4632a8aced391064f0060a319794056d3121c21c29e002f9c366bf6078ce2f97f04c31babdcc1bffbe1f938208f4d7a249a72c0376a743fa5e7188e713e120 SHA512 ec1ae289100699b992fe0d0e0270b59f6b049579863c1f5dbee2a563dfb70e3e8270539860f209404fbbf3ee013cc04c8c3b7f68735fd3cbb2f614e5acdd4b3a
+EBUILD tomcat-9.0.96.ebuild 5015 BLAKE2B 0a6752c6da2f0c63df88308ac347ca932c0b36e787e80d3ed81e87de961e4ea3a0c7978c35a0f1623696dee1ab7d7ebeac5efbc5489e38e5472198fb4fc14dec SHA512 927f04c4e89c04d0f2fa21c8884c859fe4a15691dbdc0157fcd0878b0e0212ab2c8df6bad1d1306090d6844f1e028c9dbde3e23e5e9e37ba94852d5de262bb00
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/tomcat-10.1.30.ebuild b/www-servers/tomcat/tomcat-10.1.30.ebuild
index 4eeadd5c4bce..335e0c37e0dd 100644
--- a/www-servers/tomcat/tomcat-10.1.30.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.30.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="10.1"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.93-r1.ebuild b/www-servers/tomcat/tomcat-9.0.93-r1.ebuild
index f74a084c475c..65bb2104fdd8 100644
--- a/www-servers/tomcat/tomcat-9.0.93-r1.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.93-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.95.ebuild b/www-servers/tomcat/tomcat-9.0.95.ebuild
index b0075c0de79d..65bb2104fdd8 100644
--- a/www-servers/tomcat/tomcat-9.0.95.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.95.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.96.ebuild b/www-servers/tomcat/tomcat-9.0.96.ebuild
index b0075c0de79d..01ffb2ede3e3 100644
--- a/www-servers/tomcat/tomcat-9.0.96.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.96.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?