gentoo resync : 14.08.2021

18 files changed, 16 insertions, 117 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7354b0d3998d..05ca710a32f3 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 5c1868257ddf..4b76dd96a6e5 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,5 +1,5 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
 EBUILD bcmail-1.45-r5.ebuild 912 BLAKE2B ef76eb9c860233cc5e90b84123eeca0317ea2690e03d09a90bebbd13adfdb0ec3c84335b3ea886306b64caf20b20460158b84d260417fc7f0496cfb75bc63731 SHA512 7936c6be67385f5d97d639697c4295bfa2c886c40b4271ab54cb58fde64233c22184a18ef1e4c247a016d12db16fab2d4a846e4e1039d545730bf22d41f03bfc
-EBUILD bcmail-1.69.ebuild 1491 BLAKE2B 5809bd3ee3c8bf5f73734bb9437114bd1c951e30a189ee00b0c40fe5ed40b4724c47cdb71ff4e1a4403a1509539f9e97c0b2c3a1b2fa3405a098f823cd7b59b4 SHA512 c9d4fbc738b3666ca9d8dd70bae4801e8cfe0e75482b232342479b6f648bafaa3dc2f114a1baa335a5e8defcce464d457e76d8bdad4a48c83ab97c8c68c753e7
+EBUILD bcmail-1.69.ebuild 1490 BLAKE2B 61695aae76d1cd89e41ffcf1f738a9104167e95788411c3a70ff9f964daa649f46fb65d32d566e8121f95b6798d1ee18f38c2c96df4bbd47c3c389199e363612 SHA512 649a963bf1b97890ac983caf8b5efde410c3b14869ad2d778cd77d0c2cf5e7cf38e97a97fff4479aa559a036d4f7962cd12dc60c79258e91c631307f15362d17
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcmail/bcmail-1.69.ebuild b/dev-java/bcmail/bcmail-1.69.ebuild
index ec8117b4c80f..2cb840cb7096 100644
--- a/dev-java/bcmail/bcmail-1.69.ebuild
+++ b/dev-java/bcmail/bcmail-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 CDEPEND="
 	~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 72c9d8892c41..5a41a2a382fd 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -2,5 +2,5 @@ DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a
 DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
 EBUILD bcpg-1.50-r1.ebuild 1515 BLAKE2B 25e57aba985350e8922eb0edf9f6a12dbc8f5a2750e4d45c1cb9eb0df0b9ba909ac1eb8d2aa151bdaaa123e7e6accce4eb6182fdd9105c39a2414de9eda46c07 SHA512 eddecb8d3365fe745bf132119d52a46d12a835973e5c9e3e0121822f53b525e8ee24a2b3a6c98920082c24cdc7daf2da6d9d27784abcc424dc41dfbd6a185558
 EBUILD bcpg-1.50-r2.ebuild 1536 BLAKE2B 00122a19f7a787b43507a1a73ae345bd1783efca518818511ea8d8717b42706a2c30f9af202811be5ca60317e3e18250459aa9dd82564daff4e7cd27e36207af SHA512 ad42a74689b4012041e201121ccd134af357b6296f32a4bcba1faad79b03c4ed17579e0e514bdd8c9bcf7f628ad9602a1d8de0f0ff52841a984c408f3ed858cb
-EBUILD bcpg-1.69.ebuild 1418 BLAKE2B cdf37f3eab642ad5855a344c80c8330eac36d7c9cf2c015ba755758165f1c52728d01ea2505e725f38392f2fc41eb782df794f439e3f5a3d65ae1133807bc66f SHA512 8499f787a8fa3e143ebe89cb09fbe3246a4fc5068cce202bc07ee37ea2278add2aecb3a4df7390996b3515f821427aa4d9c787ac9f1d0c72d2430e0d7eafbcb3
+EBUILD bcpg-1.69.ebuild 1417 BLAKE2B be3b0bb8ffe4910abc4afcb2d78c6fa7671c2ef7e495a5d04cd5e4d7d206c07349ce49fb86cbfa8ce5713291c5a70e0df2c27dfd802628985ad89b10d07a8b88 SHA512 517ce3777d3f990c5c0d6b680658ffe3f8c4a02f97a5d88826615f219183bc2b9f3b3407a540128a5c6462a8f0e3eb082ec49cbb9462ba32c3ddcd746a2f1ab8
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpg/bcpg-1.69.ebuild b/dev-java/bcpg/bcpg-1.69.ebuild
index dc0781dac29c..e81131c0ec21 100644
--- a/dev-java/bcpg/bcpg-1.69.ebuild
+++ b/dev-java/bcpg/bcpg-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 6c7f5f809c40..15ba04bce714 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,5 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
 DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
 EBUILD bcpkix-1.50-r2.ebuild 719 BLAKE2B 96642caf10144d1b4d24a4680e3ff2bad09eb12b6c5646d1e12878dcc5d71316a4807aa955df410aebb41092d4560e7ae4ec8a97a6a054ee081002a7de829e42 SHA512 98a55dac21d68a1d529d3d239a531d4d4856a68dad8b2f2f8ab4ce42ade8938863ab63f1ffc9fc77eff0cd9f4f6aab060742dc7e09bd09b1a40b66e20ad5e97e
-EBUILD bcpkix-1.69.ebuild 2140 BLAKE2B c65fa6a577b45e414b51c96011ced1c67a158d25f55d3818a81776a35c02a102cfbd7147e1a47d79b22eae44c23a5878a6268646c407226a96b9baab7a1b3524 SHA512 6281d94b68c07a74fdd12db468a49f1628eb85831910d53543cefa5f3461bacca8603504770ffb619d3cb6a44d1a7af8e8ce129947f6b13202065149133bc116
+EBUILD bcpkix-1.69.ebuild 2139 BLAKE2B a304e03d8a140d25a2cea08d4b6ad9c48bc5bd38426c6a3b6e4d449dcbaf3f901e4605c0ef437fbbfbcf96e8747d4b8e306c5db651c58ab6ad9f31161aae8d76 SHA512 144769a903f97bd51c5db9a3481d310d297f65b72c6734e55e6ade52012005f04cc1f2ae75685ddcdb9aaf2b4de5e87205250c330e8ec514c13a156872add241
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpkix/bcpkix-1.69.ebuild b/dev-java/bcpkix/bcpkix-1.69.ebuild
index ef36ded451f8..16dc9b18327a 100644
--- a/dev-java/bcpkix/bcpkix-1.69.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 CDEPEND="
 	~dev-java/bcprov-${PV}:0
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 23d7dd6c6977..e0ac2d922c9b 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -8,5 +8,5 @@ EBUILD bcprov-1.50-r2.ebuild 1345 BLAKE2B 6e0103ebcfa6a52bdba02bb40f7085d0361b98
 EBUILD bcprov-1.50-r4.ebuild 1326 BLAKE2B dbd3892976d4eaff7e3af566e13c5f38d5b74bf27cbb3290f3846d560dd0393156c41e6fd92f435ca6bf6609692c195c75743f6c87698bf99cb843369ad7ee92 SHA512 7dfed9b2cae7ea3914278b7be298e517796d8623a33109dbb62ddc87b6d284bcaadf4f4b88d890a1bb8d9447c3b6dfdc80239bdf0b3d5b74e3b96bf99a9485f2
 EBUILD bcprov-1.52-r2.ebuild 1350 BLAKE2B 145f54219d8596d18127ceb1b626bae03bd4cceec442a1e04c5f8f64ce53017ddeb78e2dc33e9d781123e8392dbd249914cd9614f6da6c010665950b8fb1f6a1 SHA512 cd874722a978e52fda5ee92424cd8a0b430c9b9e4c6ab797fa1b0bd63cea199e0f40d4cb4ae1a62d2eb22921665e6580cebe7ec7f5c681ffc349f73b4d9cd334
 EBUILD bcprov-1.68-r2.ebuild 1166 BLAKE2B f8ffaf33eaa23a1ce5938a6b5f6412d605826536551735d919fe091aab221e6a4e70b1e23fa117098c3d6c2d316ea85061c86b373911e87a502a16a86d42dacf SHA512 3f992af0e197f0a020606b7023ea44354ffeffde3856cf1fc5711ee9c313cc129351134f92f666849110f164fe77405c1a2e58acc6279310374ef4dad9abf341
-EBUILD bcprov-1.69.ebuild 2470 BLAKE2B 9fc0555ac05923c79a6df55d7d1a0ff686988da1730b64d33f627d59a8f83cdc64c28f4216e45871d97e897ef5bbf26021cbdfd34f7f78201d0971e37bc95646 SHA512 0f4b40e3837b61423291fb8d16d38016b329a2029289de925310fb9978ca6fd0ff15272292237f8e6024b866c03eea6d00124ba9144cd6f5067cc2251f899f4f
+EBUILD bcprov-1.69.ebuild 2469 BLAKE2B 037e181b2f575595135ed39f72a5def6b4498f64ecb483b3c85681076586dca3b3a7d58cd374bc2c90e21ed91ce86263bf94d054814479c9b1fc47326dd16a36 SHA512 eb0f703a83f7156f76ff460ed26a0c1754bdc41c2dbcff9df766167688930b2c4d20806d08dd8f539738f61eb5d8026ce183c60a20ea36c2a20a3f9ecde4602e
 MISC metadata.xml 481 BLAKE2B 28abdd8dda620f2fe86c83ba5912c0e560ec40332ee443db8235ddcb3632327475e84fdc6311d9892a7f24fa07ef40b902c510fd7a5611b6ae997a801745003a SHA512 3b414b3faf0ca03ab0f06ab850332f72a554ddf0a1b548827619df018cd6e3a6c1bbac6704fe9a578baab843cdde81c76b9dd0d8bcd82b27af4fd488541e5116
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
index 4db296a5529d..7849fe08b47e 100644
--- a/dev-java/bcprov/bcprov-1.69.ebuild
+++ b/dev-java/bcprov/bcprov-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index 01c3c2d099c9..a362df332231 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1,3 +1,3 @@
 DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-EBUILD bcutil-1.69.ebuild 1347 BLAKE2B bbf3bb2ffc272f5a4696eaafab72eb485998441c14e4f65ee0ca3bae605e16bcab18e8441e26240bee495cc2cc4d42163ca09147323d753e2f2dc6279d816141 SHA512 1fe74f70dfa67ff6b7b9c1ae08ed55ac47cbb917544dddfa2c31749d5fd73f6a73a3f535ce57e0eaf8bec2779ce255cb86efaa84612ac76b93a8af7b81f251bf
+EBUILD bcutil-1.69.ebuild 1346 BLAKE2B 3b9a76529f321dc621dc64aa5a282b151a835fa50760b57bd0195faafe8c95fa575f1fc1f75266575be3d89f48b0c179e07a1a0ff53fed92f7771ac5e504904e SHA512 a367fbb5e0a99dd81b1641a30c462e1bd23ac961910c612604b5bda4aa11950c56b479247f24e23fa314a948e38d2e54e289e090f176f20d41c29b3201cad8e3
 MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/bcutil/bcutil-1.69.ebuild b/dev-java/bcutil/bcutil-1.69.ebuild
index 761c77e705c4..050a6c8d9289 100644
--- a/dev-java/bcutil/bcutil-1.69.ebuild
+++ b/dev-java/bcutil/bcutil-1.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
 DEPEND="${CDEPEND}
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index faf4fdaaf25b..cbc1ae373969 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
 DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-api-1.2.2.ebuild 1593 BLAKE2B 847cef2dad3f234be2ea210e2856a9d86fd2bac728519660f9b1924f5db8c22e2098847937076b728903b57e6df8f8139648024b7863463dc9b744f24630e7bd SHA512 ef422253df5c058d207b208737d06edd5f5c44b5a10bdafff711c218060effed3431620da9a65f3b17edcb5a77779f1e8628dd1571414eb37804eba9b5e05ea6
+EBUILD jakarta-activation-api-1.2.2.ebuild 1592 BLAKE2B eb1f1dbe3ee12433b56f3ef5b7fe385655c2676fa9f688614ae6696448a4b4ebbfe4b2cdb4aa8bb29fbac06c15d8c9b14ddf1e2ee7cfbfd33c2f222d96cc76b0 SHA512 6944260c2ee150bfb8791b8ed5fe98342d00265a6d77183a2aed6d29795b29868905b98d27865a5c3f72ee225d4bc48cf47684cc2fb01ae12ef5c63459f40f84
 EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1558 BLAKE2B 3951b0ea3bd20d0bb129387747c215122f662f1f52b6660bc5be83b4eb6afcb966bf8518bba74131026933d9d944ece5d15b9100963adf2c826c61d0f4d4bb86 SHA512 09d0f47c9472f4ec6528f109f238beabf68a7dbdd7f71458fc07747f46457972e1eb74e8aa5ba49ea38b8ec66722c47eed805c3c1b469f396441c4f735f06c10
 MISC metadata.xml 361 BLAKE2B d3bf866111d68c231bb0f2468c6caa6ad0898d222c1807a9e853e32573e0d4e3b8c1f668bf1b36e85ac466869873acdf976379a490e7cb4fb0eab377484f19b9 SHA512 e493232219ce389523bd77123bbb11ef5e4c06a05c191beef3fe9829803f0c70211bc68b99cf49d575865f0929621d9c745c81325f3ded6f25888daab72faf4f
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
index 5b47a111d00e..c3f8a4078df7 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="EPL-1.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 84e8ee524b5d..d6193196eadb 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-1.2.2.ebuild 1631 BLAKE2B 8707059442280ae28352a31d8117111f7fad10a284f54adc57d891faca2a24848ae2e45e828e91b92171202614f4dd98da2fe0acdc53673ef60617e9bc5e208b SHA512 33075450cff9380ad47494586c4fc73409ed13c7bde0dece5f2ea529514dac2a69a2fd5784a4d5b26a5da8fb343c2e0ee50741921d7373a6c90d76bb59d667a6
+EBUILD jakarta-activation-1.2.2.ebuild 1630 BLAKE2B 8a484b3b2c3fb613cc72c29a004d86e98644c2e699c306ff14f97978b8a866330d7cf22ec1b3b4ec9840e97b65bf5de0a2b8dc61004371b215ff707217efd9b4 SHA512 66e4c4bbb9cf359382c0e4400dfe32577b46309d8f117a2f3f739e83bac50135c2426722b2180018ee459da70b316f8f5d97d76524eafefd864454e3fc61d092
 MISC metadata.xml 361 BLAKE2B d3bf866111d68c231bb0f2468c6caa6ad0898d222c1807a9e853e32573e0d4e3b8c1f668bf1b36e85ac466869873acdf976379a490e7cb4fb0eab377484f19b9 SHA512 e493232219ce389523bd77123bbb11ef5e4c06a05c191beef3fe9829803f0c70211bc68b99cf49d575865f0929621d9c745c81325f3ded6f25888daab72faf4f
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
index 95a7266e4a11..5e1451d2cac9 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="EPL-1.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 CDEPEND="dev-java/jakarta-activation-api:1"
 DEPEND="${CDEPEND}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 55a2e5b7aab4..29dab5b28f15 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -7,7 +7,6 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
 DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
 DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d
@@ -17,8 +16,7 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.68.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.69.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
+EBUILD tomcat-servlet-api-8.5.69.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-9.0.50.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
 EBUILD tomcat-servlet-api-9.0.52.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild
deleted file mode 100644
index 8846bfbc900c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild
index d5d3aa1096eb..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 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"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"