summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Manifest30
-rw-r--r--Manifest.files.gzbin29458 -> 29453 bytes
-rw-r--r--app-containers/Manifest.gzbin7544 -> 7544 bytes
-rw-r--r--app-containers/docker-compose/Manifest2
-rw-r--r--app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild2
-rw-r--r--app-emacs/Manifest.gzbin67831 -> 67830 bytes
-rw-r--r--app-emacs/all-the-icons-ivy-rich/Manifest2
-rw-r--r--app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild2
-rw-r--r--app-emacs/citar/Manifest2
-rw-r--r--app-emacs/citar/citar-1.2.0.ebuild2
-rw-r--r--app-emacs/projectile/Manifest2
-rw-r--r--app-emacs/projectile/projectile-2.7.0.ebuild2
-rw-r--r--app-misc/Manifest.gzbin49940 -> 49935 bytes
-rw-r--r--app-misc/resolve-march-native/Manifest2
-rw-r--r--app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild2
-rw-r--r--app-portage/Manifest.gzbin9418 -> 9423 bytes
-rw-r--r--app-portage/elogv/Manifest2
-rw-r--r--app-portage/elogv/elogv-0.7.9-r3.ebuild2
-rw-r--r--app-portage/metagen/Manifest2
-rw-r--r--app-portage/metagen/metagen-0.7.3-r2.ebuild2
-rw-r--r--app-text/Manifest.gzbin48583 -> 48577 bytes
-rw-r--r--app-text/crengine-ng/Manifest2
-rw-r--r--app-text/crengine-ng/crengine-ng-0.9.8.ebuild58
-rw-r--r--app-text/crqt-ng/Manifest2
-rw-r--r--app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild (renamed from app-text/crqt-ng/crqt-ng-1.0.11.ebuild)2
-rw-r--r--app-text/crwx-ng/Manifest2
-rw-r--r--app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild (renamed from app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild)4
-rw-r--r--dev-java/Manifest.gzbin57479 -> 57471 bytes
-rw-r--r--dev-java/commons-logging/Manifest8
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r6.ebuild122
-rw-r--r--dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild2
-rw-r--r--dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch26
-rw-r--r--dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch42
-rw-r--r--dev-java/commons-logging/metadata.xml6
-rw-r--r--dev-java/maven-bin/Manifest2
-rw-r--r--dev-java/maven-bin/maven-bin-3.8.7.ebuild64
-rw-r--r--dev-lua/Manifest.gzbin7303 -> 7310 bytes
-rw-r--r--dev-lua/luasec/Manifest2
-rw-r--r--dev-lua/luasec/luasec-1.3.1.ebuild2
-rw-r--r--dev-lua/mpack/Manifest2
-rw-r--r--dev-lua/mpack/mpack-1.0.10.ebuild2
-rw-r--r--dev-python/Manifest.gzbin258593 -> 258595 bytes
-rw-r--r--dev-python/hypothesis/Manifest2
-rw-r--r--dev-python/hypothesis/hypothesis-6.71.0.ebuild2
-rw-r--r--dev-util/Manifest.gzbin68437 -> 68437 bytes
-rw-r--r--dev-util/ydiff/Manifest2
-rw-r--r--dev-util/ydiff/ydiff-1.2-r1.ebuild2
-rw-r--r--games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild92
-rw-r--r--games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild12
-rw-r--r--games-simulation/EmptyEpsilon/Manifest8
-rw-r--r--games-simulation/Manifest.gzbin3923 -> 3933 bytes
-rw-r--r--kde-frameworks/Manifest.gzbin13764 -> 13761 bytes
-rw-r--r--kde-frameworks/extra-cmake-modules/Manifest2
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild2
-rw-r--r--media-gfx/Manifest.gzbin37863 -> 37859 bytes
-rw-r--r--media-gfx/mcomix/Manifest2
-rw-r--r--media-gfx/mcomix/mcomix-2.1.0.ebuild2
-rw-r--r--media-libs/Manifest.gzbin68058 -> 68056 bytes
-rw-r--r--media-libs/rubberband/Manifest3
-rw-r--r--media-libs/rubberband/files/rubberband-3.1.1-build.patch179
-rw-r--r--media-libs/rubberband/rubberband-3.1.1-r1.ebuild68
-rw-r--r--metadata/Manifest.gzbin3511 -> 3509 bytes
-rw-r--r--metadata/dtd/timestamp.chk2
-rw-r--r--metadata/glsa/Manifest28
-rw-r--r--metadata/glsa/timestamp.chk2
-rw-r--r--metadata/md5-cache/Manifest.gzbin28077 -> 28065 bytes
-rw-r--r--metadata/md5-cache/app-containers/Manifest.gzbin14469 -> 14467 bytes
-rw-r--r--metadata/md5-cache/app-containers/docker-compose-1.29.2-r34
-rw-r--r--metadata/md5-cache/app-emacs/Manifest.gzbin108863 -> 108871 bytes
-rw-r--r--metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.04
-rw-r--r--metadata/md5-cache/app-emacs/citar-1.2.04
-rw-r--r--metadata/md5-cache/app-emacs/projectile-2.7.04
-rw-r--r--metadata/md5-cache/app-misc/Manifest.gzbin74418 -> 74423 bytes
-rw-r--r--metadata/md5-cache/app-misc/resolve-march-native-2.2.04
-rw-r--r--metadata/md5-cache/app-portage/Manifest.gzbin17277 -> 17285 bytes
-rw-r--r--metadata/md5-cache/app-portage/elogv-0.7.9-r34
-rw-r--r--metadata/md5-cache/app-portage/metagen-0.7.3-r24
-rw-r--r--metadata/md5-cache/app-text/Manifest.gzbin71912 -> 72055 bytes
-rw-r--r--metadata/md5-cache/app-text/crengine-ng-0.9.815
-rw-r--r--metadata/md5-cache/app-text/crqt-ng-1.0.11-r1 (renamed from metadata/md5-cache/app-text/crqt-ng-1.0.11)6
-rw-r--r--metadata/md5-cache/app-text/crwx-ng-0.2.0-r3 (renamed from metadata/md5-cache/app-text/crwx-ng-0.2.0-r2)8
-rw-r--r--metadata/md5-cache/dev-java/Manifest.gzbin71657 -> 71348 bytes
-rw-r--r--metadata/md5-cache/dev-java/commons-logging-1.2-r616
-rw-r--r--metadata/md5-cache/dev-java/commons-logging-1.3.0_pre202303194
-rw-r--r--metadata/md5-cache/dev-java/maven-bin-3.8.713
-rw-r--r--metadata/md5-cache/dev-lua/Manifest.gzbin8284 -> 8277 bytes
-rw-r--r--metadata/md5-cache/dev-lua/luasec-1.3.14
-rw-r--r--metadata/md5-cache/dev-lua/mpack-1.0.104
-rw-r--r--metadata/md5-cache/dev-python/Manifest.gzbin344201 -> 344202 bytes
-rw-r--r--metadata/md5-cache/dev-python/hypothesis-6.71.04
-rw-r--r--metadata/md5-cache/dev-util/Manifest.gzbin127382 -> 127380 bytes
-rw-r--r--metadata/md5-cache/dev-util/ydiff-1.2-r14
-rw-r--r--metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.1614
-rw-r--r--metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.284
-rw-r--r--metadata/md5-cache/games-simulation/Manifest.gzbin4643 -> 4479 bytes
-rw-r--r--metadata/md5-cache/kde-frameworks/Manifest.gzbin39237 -> 39230 bytes
-rw-r--r--metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.04
-rw-r--r--metadata/md5-cache/media-gfx/Manifest.gzbin57171 -> 57176 bytes
-rw-r--r--metadata/md5-cache/media-gfx/mcomix-2.1.04
-rw-r--r--metadata/md5-cache/media-libs/Manifest.gzbin106985 -> 106822 bytes
-rw-r--r--metadata/md5-cache/media-libs/rubberband-3.1.1-r115
-rw-r--r--metadata/md5-cache/net-analyzer/Manifest.gzbin60334 -> 60497 bytes
-rw-r--r--metadata/md5-cache/net-analyzer/sngrep-1.7.015
-rw-r--r--metadata/md5-cache/net-fs/Manifest.gzbin6021 -> 6184 bytes
-rw-r--r--metadata/md5-cache/net-fs/nfs-utils-2.6.317
-rw-r--r--metadata/md5-cache/sec-keys/Manifest.gzbin23068 -> 23229 bytes
-rw-r--r--metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.8 (renamed from metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5)4
-rw-r--r--metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.889
-rw-r--r--metadata/md5-cache/sys-apps/Manifest.gzbin87045 -> 87046 bytes
-rw-r--r--metadata/md5-cache/sys-apps/flatpak-1.12.84
-rw-r--r--metadata/md5-cache/sys-apps/flatpak-1.14.4-r14
-rw-r--r--metadata/md5-cache/sys-devel/Manifest.gzbin34307 -> 34459 bytes
-rw-r--r--metadata/md5-cache/sys-devel/gcc-10.4.1_p2023041916
-rw-r--r--metadata/md5-cache/www-apps/Manifest.gzbin24006 -> 24009 bytes
-rw-r--r--metadata/md5-cache/www-apps/xpra-html5-6.14
-rw-r--r--metadata/md5-cache/www-servers/Manifest.gzbin9312 -> 9627 bytes
-rw-r--r--metadata/md5-cache/www-servers/tomcat-10.1.816
-rw-r--r--metadata/md5-cache/www-servers/tomcat-8.5.8816
-rw-r--r--metadata/md5-cache/x11-misc/Manifest.gzbin63342 -> 63344 bytes
-rw-r--r--metadata/md5-cache/x11-misc/picom-10.24
-rw-r--r--metadata/md5-cache/x11-misc/zim-0.75.14
-rw-r--r--metadata/news/Manifest28
-rw-r--r--metadata/news/timestamp.chk2
-rw-r--r--metadata/timestamp2
-rw-r--r--metadata/timestamp.chk2
-rw-r--r--metadata/timestamp.commit2
-rw-r--r--metadata/timestamp.x2
-rw-r--r--metadata/xml-schema/timestamp.chk2
-rw-r--r--net-analyzer/Manifest.gzbin43389 -> 43386 bytes
-rw-r--r--net-analyzer/sngrep/Manifest2
-rw-r--r--net-analyzer/sngrep/sngrep-1.7.0.ebuild47
-rw-r--r--net-fs/Manifest.gzbin3530 -> 3531 bytes
-rw-r--r--net-fs/nfs-utils/Manifest2
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.6.3.ebuild228
-rw-r--r--profiles/Manifest.gzbin185123 -> 185124 bytes
-rw-r--r--profiles/package.mask7
-rw-r--r--profiles/use.local.desc3
-rw-r--r--sec-keys/Manifest.gzbin19062 -> 19058 bytes
-rw-r--r--sec-keys/openpgp-keys-apache-tomcat/Manifest6
-rw-r--r--sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.8.ebuild (renamed from sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild)0
-rw-r--r--sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild20
-rw-r--r--sys-apps/Manifest.gzbin49317 -> 49320 bytes
-rw-r--r--sys-apps/flatpak/Manifest4
-rw-r--r--sys-apps/flatpak/flatpak-1.12.8.ebuild2
-rw-r--r--sys-apps/flatpak/flatpak-1.14.4-r1.ebuild2
-rw-r--r--sys-devel/Manifest.gzbin10655 -> 10650 bytes
-rw-r--r--sys-devel/gcc/Manifest2
-rw-r--r--sys-devel/gcc/gcc-10.4.1_p20230419.ebuild58
-rw-r--r--www-apps/Manifest.gzbin12958 -> 12951 bytes
-rw-r--r--www-apps/xpra-html5/Manifest2
-rw-r--r--www-apps/xpra-html5/xpra-html5-6.1.ebuild2
-rw-r--r--www-servers/Manifest.gzbin4547 -> 4545 bytes
-rw-r--r--www-servers/tomcat/Manifest6
-rw-r--r--www-servers/tomcat/tomcat-10.1.8.ebuild186
-rw-r--r--www-servers/tomcat/tomcat-8.5.88.ebuild154
-rw-r--r--x11-misc/Manifest.gzbin47048 -> 47040 bytes
-rw-r--r--x11-misc/picom/Manifest2
-rw-r--r--x11-misc/picom/picom-10.2.ebuild2
-rw-r--r--x11-misc/zim/Manifest2
-rw-r--r--x11-misc/zim/zim-0.75.1.ebuild2
160 files changed, 1040 insertions, 819 deletions
diff --git a/Manifest b/Manifest
index cdf33b99ea1c..b260510e558a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29458 BLAKE2B b7b02dae5a2b82c4d587d1f164f41e27cd06749ea08d97c80692e2f890e6b69884252a76310c8ed5a4e6175b6b441119d12c9250fbb1848eeb0e1f30f6e14dd3 SHA512 34cdd790d11c109a45ea24e86dd19be92ac41f5d40f18ffa1cce0f25233261b358d7c8fb7468c2857f53b94406914a3fa7aa72feb718e57f4a60242520f5a1d6
-TIMESTAMP 2023-04-20T04:10:11Z
+MANIFEST Manifest.files.gz 29453 BLAKE2B 41d1342a43578d638b91eeef96218d92516e594d87ac4846ecb5c0ec18d6238dda47ace7dfc10c01434f13c8dc4e570e51b89febc893c72d9e258457ea828703 SHA512 6bbb8d7683df19144c6191068abca6e52bcc3d8cb05755ef674f5d42c4c0481ec0f93f6aac0868ad5330d49b8ff6fdd4dcbea0ed0d21a1333fafc1c699428535
+TIMESTAMP 2023-04-20T10:09:57Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAuyNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRBD3VfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC/jRAAgH/ofOoTemcG3uF2UamDSa1fO4pbWFRHZwjEGRhz4Bt3yY0HQOjiP+yG
-6MGk0pv+3OOeZM8qj6/50/onejl+w9dFAlH7CCHrnYVZHRN2eGNhnhBtkGOZINS5
-Ce34Y7/vMq89A738tT+vTTY2nZY7iZAhC5/dUAWrM8ypLb8nLJNizL2MAEK8fjFh
-Mc80oA4c1IA2xHGV6TjEj49m3+WFJytqS9l9fpSi552b2fYN8hCXL5m26rAY3T9m
-Sz9x3+APzKVUIEGkyx/In7DPcs2hNw7Md1KD+6Kh/TUrqlzVAFf4tu2NSyOSjx3J
-w8LMBxmIvSvLRDtJNijXNeJAvD7YqstdRNhd2n+13h0ChxTCLv6aAXEJUt8F9sfQ
-jrkeKbyevSymfnnZuI7+OhBhNzFr8FwrnCeTa9bM3exC0hfnxPIG09gk5yz51M4x
-6p9PJhuKBFucfdFZtgJGLb5m859VW7DsOrpNOLgos6X6hTH5tx+U6DLXDJA1ufEh
-vELFH0t2H/5Em4k2hEeXTDu+uEn2mhRHIKc0CisNMED/oNEEUJuArJw5HgQgfsob
-DUrqFzxTES/p2R9C2fv0oN698PEIzF98ByF6sVQ4fdSz+VXD9Sgr/a71eEpVMqgh
-4dIIyahEH3/A89p0BGw5CRnG2TH2rZBR6Z80gqo3jGTCvsDlhkA=
-=7gWN
+klCWtw//QABX7gDbsehZV0khxwifgg4iIfLXf0n7aMeqrgIzADggwFsGtdhjgICK
+zOfu/h+jMITuJHVpgk2GEayT4WSWxYnoi309OLvcbojf97IhzZ2Le51P2W9/dDy0
+MyAeHO8f6ihT5Kmu8SLXZYUQ63x7Qbox4ob5Ng3a70U8fxz562AE2KycY0oZBiaH
+codw/2n+ZNlUeqmMz1VwNXendjoxcTnzGrp/U1pBOe5ND7Dt4qkPjF2B/G9mHq6Y
+hE2pCaKdIwagFgvB83Iz7WQsydPYr3/jkNPc5Hbb/kpmazRALq7CBP4/FT+7/y/y
++xsAJlGr32XLk8u/Dkdkm6CNOU26DskQwkALMt5R9dIF9emas55USnLAmR5eE/TU
+rlt1jW6kf70rJJoU5NndZAVK2cxxqqO3nUbvCfdB/00LTp3RUTy5uVAh4QVvNtjb
+NW6iIPA1zc3EbUKy37Lt4sPj3Rn21/2zj7X7k3Ifuhp7vGUE7CsJzsEFH3TW0fnj
+GBu3exWq5YmFjrpH0OfWufxBQRNs9x+v8SkR9kkpgMfmbIDLEC/o2wede0bDwGzv
+uPWPFDqHfU1hLQBwpHGz9bm5GHHJ+UdLsCa7hz2MRLUa9vlyXiIR4fz9SxYUWb02
+FxuYIcyA9uRktOH16NTaAqsF6TXH1mCHQy82pVPl65grDHGtacA=
+=o5b5
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e201d821812e..fe097c1e4210 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
Binary files differ
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index e7fa9200bcd7..a9ab07d575b3 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
Binary files differ
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 716cb54131d5..1482a39398a1 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -5,6 +5,6 @@ DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a9
DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
EBUILD docker-compose-1.29.2-r1.ebuild 1918 BLAKE2B bf3402c6139087a39c13b23710b981f36d7e6f8802ae40d9fabc7360109b2332c8b6d9042c46248c75655aded07ad6ea6a9a69a25c1fcf43a0f53999adf54c25 SHA512 86b1860c5414c7ae77f41e8b4d379332762f10bf5000d944d04ea4384b1baa1d4e9653c98bef32aa8baae4d0c520b5fe23b54fe44286a14c4210e447399a6186
EBUILD docker-compose-1.29.2-r2.ebuild 1969 BLAKE2B 1b64296bae273bb6ff90991988d94b6470fafe365915183d52e8d56106702fc30d856dc6e23eb7c094bbc4f12bee70ead77d03a31512dd89fed6824ae3151c43 SHA512 43f0a4ab7009a6a4516f30a7432a9a11c60b33a8e845eb9ad0d64f1e9f091cb2fbb32baa04cbdc034d9fa23709ec79cfe2dba12d19588b5b33326c4696d595bc
-EBUILD docker-compose-1.29.2-r3.ebuild 2002 BLAKE2B d0d373ce91f1ed78d3765276f647adebf1c376176aaa980a957d3d933cd24ccb558c481c1272ffc18592f4a07b07c213b25bfc5945dfda315ec6c939ac4ec6c1 SHA512 ee4e0e92503de958174c1740a01483ed2857a7d94b651065399700456a968f9ddf83d00f69a361775864f3dd759d2be881466e3207cf1ec5ea0feeacd3543260
+EBUILD docker-compose-1.29.2-r3.ebuild 2001 BLAKE2B 15d4d03a2955fb37c790c5e7f9b587888a97e7790f2796512f4765245c9a8b76aebdd3804e7f98ae63e29d4ee3e74842bb77fd9e31027f6eef3c284a91b33445 SHA512 338f9067f522982eb767d4aeb78a2925ea8e6ee61239c4f73f4b52ff09a0ecb6eb680b70ad23c2b4e634e71e7df10bec50cc6bebec0e58bdd74f4e170a1a7939
EBUILD docker-compose-2.17.2.ebuild 1156 BLAKE2B 9a6d68382e2d6912a77001c9da0bea27548c0cab28e233455b91cf9cba65cb137ba5990d1f38ff164d466bf2dadf8534487867f5f1b3a23624878f37b008122b SHA512 a74a21c6fc62fdb791909958c2967f77235458db9b1a6489b5dec0fc712bc9b2a6a7c7814464d52be0c0e7ced3e275718de076f48cec497635cb22cb14c95dd7
MISC metadata.xml 689 BLAKE2B 99d0b18b036a6570a862e3d0f4401c00559256fe0b8f925085846297de55bce4a2b9fe1c5b0f535cd0d16dbe53897155911b8edd791b50e085a976eec4efd8b7 SHA512 565037e956a654d01ebe5a29d4995e7f3df916f2fce7e95d2d2a6dd200f5dab5b67f7d52d6aaa98353578fa3b8b20c865761c040fee538e780d690c45ecb728c
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
index 90aa5aa0b0db..4f274a47deae 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.ta
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2f687bf3bdbe..9963924bf950 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
Binary files differ
diff --git a/app-emacs/all-the-icons-ivy-rich/Manifest b/app-emacs/all-the-icons-ivy-rich/Manifest
index b7cdbefe2bc4..40ffbaf75f49 100644
--- a/app-emacs/all-the-icons-ivy-rich/Manifest
+++ b/app-emacs/all-the-icons-ivy-rich/Manifest
@@ -4,5 +4,5 @@ DIST all-the-icons-ivy-rich-1.8.0.tar.gz 26090 BLAKE2B ec0ccd4192007938d38dacf83
DIST all-the-icons-ivy-rich-1.9.0.tar.gz 26428 BLAKE2B f2d23fd537921fd48ce26caac35a5ac9516ad2bffdb99c37d507ba2640179aed8c5f88361c5e9e34c2945bdb9619d2416d8c5fea55c0dd25d0fe0fe42cd5c353 SHA512 ac0c3f18d3842eb4b9c6f098e00814f421277b44c4253f9efb28c6d02e94fbb159db40cd9ade877ce218154c30210bb39dc93bfd95a7a61a71b09cbed1af5d70
EBUILD all-the-icons-ivy-rich-1.7.1.ebuild 510 BLAKE2B 61219ac266a7f6865d20d5c66fbc8d78c08586b14109b1eef49f2ddf553050a0925b65d6022372d39637c3b1bb2f830c120864b5ccd5b3c3cf53faa8b1b34ede SHA512 5842e5090c54f27143a0c144bf3aae1440594a7be511e93098fd36266d27873ed21de1e64059172ab97c8e973763b969594403784dfba43d6132082bd897c40a
EBUILD all-the-icons-ivy-rich-1.8.0.ebuild 509 BLAKE2B 176cea71e324aebf836d52a02fe366d20e1f308af154d66f3809c5ebb86ad7d13733553cf4fc47e22dcf4c4d0e21c6227c89d678cfced33a9454092871d9cdb7 SHA512 863c84f79ac5273fbf2a99cdf0ec3fa40109b1e20b6f81d0142039897501c5804309762f6eca623495604d9d851b7e30588eb271b521971a9159fffdebe435ea
-EBUILD all-the-icons-ivy-rich-1.9.0.ebuild 510 BLAKE2B 61219ac266a7f6865d20d5c66fbc8d78c08586b14109b1eef49f2ddf553050a0925b65d6022372d39637c3b1bb2f830c120864b5ccd5b3c3cf53faa8b1b34ede SHA512 5842e5090c54f27143a0c144bf3aae1440594a7be511e93098fd36266d27873ed21de1e64059172ab97c8e973763b969594403784dfba43d6132082bd897c40a
+EBUILD all-the-icons-ivy-rich-1.9.0.ebuild 509 BLAKE2B 176cea71e324aebf836d52a02fe366d20e1f308af154d66f3809c5ebb86ad7d13733553cf4fc47e22dcf4c4d0e21c6227c89d678cfced33a9454092871d9cdb7 SHA512 863c84f79ac5273fbf2a99cdf0ec3fa40109b1e20b6f81d0142039897501c5804309762f6eca623495604d9d851b7e30588eb271b521971a9159fffdebe435ea
MISC metadata.xml 455 BLAKE2B 8e42e8f90284961bfa2009e40e212db1665b4624ff14b18689a32ec25361d9eefa65acc7e5b7e189d8e3b3b397eb41bfa36e672732f066a937b6bbf3fb70d5e2 SHA512 01b692b5436521b2a4e781aca48fbbee42979990521ab5b74ae6e0fa8f17725880ef9d096d77eb7dd5ebb087981c11d2d5f3736fab536c587211ffae19f784f1
diff --git a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
index 1fb9764f8aaf..35dffc4b0c4a 100644
--- a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
+++ b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
app-emacs/all-the-icons
diff --git a/app-emacs/citar/Manifest b/app-emacs/citar/Manifest
index 0e0b2628c4d2..1298e8e29b48 100644
--- a/app-emacs/citar/Manifest
+++ b/app-emacs/citar/Manifest
@@ -3,6 +3,6 @@ DIST citar-1.1.tar.gz 1340039 BLAKE2B b2090a35a582918300f5e4bb2188d4636309888303
DIST citar-1.2.0.tar.gz 1417090 BLAKE2B 40673ee0f2ee5b4f86928e140714a517958d261c632ea1e7bcb3dcd3dde3a0bb9baaaa1107f50447f1d8e87485570033afbf0c652fa6b3f1fbffeda7b7df04c3 SHA512 31f817de77bc8fe9e2fdf96ac7df521ebe5685cf49a2a78cd2b1cd51e538165bde36fc8515c2fd7c20d4c6160372fdf37c1b870b12167f946c0f3934edd5fb7c
DIST citar-1.3.1.tar.gz 1602843 BLAKE2B 0abf90120860777e13ac495681bb1e07d6c352bc17aef173b32e60fc2d754a37628670b57e17335bc5e549c451b9565a58c8547952a5b78d6335adc7601b8f5e SHA512 a00e7ff5331fa3a161151292dd4a9d3c0a7211051f5ddf528cfe7d4a48377af64f3719f57c76013b45a30082fbfd435d98196e757169970a22bb662f49ccd346
EBUILD citar-1.1.ebuild 978 BLAKE2B 3f4cc6c8f51f24e94246a5250d3c99514fc5e42f99c467c558f68d947979f815f9aa44e416dfc70db5460eb72f7e3187cab6e2f7522d50aaab0b732045a142c8 SHA512 42de076ee5f065b4c6035fda96c51b2b51595b92a0ffaa6ade128f215344bdcaa2278ff2cb92530cb31aecbe46917557eb949732fafd17dbb4073c913d6199f7
-EBUILD citar-1.2.0.ebuild 979 BLAKE2B 8243cd6b70792fcf30ba71450389a1475cb4c5a66b794824feb4861cde560f34fc9b8fc09cb56b9ebd88baf322f9f9b296daeb8e294ee6a15ccefbb3db298774 SHA512 23566dbc5ff4ad70d61e382fbe4107295e0b1c36946d957434c92e04e8662585fe3b3f89eb09637acaea6725ad6a411a46cd3b657e66256caecbddb6356d766b
+EBUILD citar-1.2.0.ebuild 978 BLAKE2B 3f4cc6c8f51f24e94246a5250d3c99514fc5e42f99c467c558f68d947979f815f9aa44e416dfc70db5460eb72f7e3187cab6e2f7522d50aaab0b732045a142c8 SHA512 42de076ee5f065b4c6035fda96c51b2b51595b92a0ffaa6ade128f215344bdcaa2278ff2cb92530cb31aecbe46917557eb949732fafd17dbb4073c913d6199f7
EBUILD citar-1.3.1.ebuild 971 BLAKE2B 401d427cde0abd5caa7a50fe59a818cfc754ddd19685bce5c4320b209cb3f9b59172ec725f5f66baebd47eb2d1ebcb0a1f1e8001afbe66d932c916a0dbada592 SHA512 734aa260e166a2440c1cac97cd583d8d5abae7803bb00df4383b651e13da5430a03fa8cf1824175c1e44ec27d0b994f233fd1e50dd348c1abc676f7c6b91dc4e
MISC metadata.xml 1034 BLAKE2B 10d658566f58e3a91deab1c4d2035bcd25ee216777aa105b1e8c8853ab103add779f0f439e706496b2468a3fcb8490320ccb454d90c2e70b5b8bbe9f218773e4 SHA512 4b81115dfccc471987c63876c0b282875fe95c5738f69dfdf7a6300c37998102f2fdda829d14938871bd857fbb5d145e6c62b5b4be40b532f46245256d0be259
diff --git a/app-emacs/citar/citar-1.2.0.ebuild b/app-emacs/citar/citar-1.2.0.ebuild
index 9c62e000f5a7..ff1b374f1f92 100644
--- a/app-emacs/citar/citar-1.2.0.ebuild
+++ b/app-emacs/citar/citar-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/emacs-citar/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="
app-emacs/citeproc-el
diff --git a/app-emacs/projectile/Manifest b/app-emacs/projectile/Manifest
index 644a1eb68066..cfc0473ce71d 100644
--- a/app-emacs/projectile/Manifest
+++ b/app-emacs/projectile/Manifest
@@ -4,5 +4,5 @@ DIST projectile-2.6.0.tar.gz 1922935 BLAKE2B 40e5fc3d152b4fa244bb42cd606d4d6c92e
DIST projectile-2.7.0.tar.gz 1926804 BLAKE2B 2dc52883335dda0bb6b5d9bf606cf56ee38730c2d14ddca5a8e5fac1169b9ae91f8c264d7f1d0a311bea21690ad292194f9b2bdab7d4dc2b03abafda706a67bc SHA512 bdd4484b916f59434f33bfc6eb663bb75ba6196b632894f27a46f90ea75f0268eb847142c9ff97386ca9ae6a2dc2fa6f26b20b34e2f3d00c80674784a32d10f8
EBUILD projectile-2.5.0-r1.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
EBUILD projectile-2.6.0.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
-EBUILD projectile-2.7.0.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
+EBUILD projectile-2.7.0.ebuild 594 BLAKE2B 9133b4397b8c3e00288a6aabe45114dc1e209e70a1adb36699afbe2dc6da73498685317d3a9c766f4df469ce5dd0e2d7cb8db3732079960e7caff6d27251306f SHA512 eed1b667a99add4da312177e8dc63b281858408861ae146bc9d1b056af4ba6ca2624e087ba854fb95a14c645c0f1ea86aa67384a08b0f745a38a6ecdb0e82810
MISC metadata.xml 730 BLAKE2B 026ad65ade8e08d1874db2ff46be522a975ae4f1c81a04510e46912bdf7ff171e5523c48b863a5d2cfee3818ec28d0dd82aa135de272b60923d200396a09ac44 SHA512 81f9d1c00773d81a5c680e3ee57455b92d85e0e136d5a8125418e419f07c91a6c16cc5e899f995c5610904a605a03aa405f319fc4f5399df5e9b7942a68c1bcd
diff --git a/app-emacs/projectile/projectile-2.7.0.ebuild b/app-emacs/projectile/projectile-2.7.0.ebuild
index 4e3c229ebadd..e06a14a2f800 100644
--- a/app-emacs/projectile/projectile-2.7.0.ebuild
+++ b/app-emacs/projectile/projectile-2.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm ~arm64"
SITEFILE="50projectile-gentoo.el"
DOCS=( README.md )
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f9b0c2cd724e..8e4c525d0aed 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
Binary files differ
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index 2b9a6ce25e73..cd26618f1c97 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -4,5 +4,5 @@ DIST resolve-march-native-2.2.0.tar.gz 15110 BLAKE2B bd0fc09f35bcc46727a9d105d09
EBUILD resolve-march-native-1.0.0-r1.ebuild 492 BLAKE2B 3957e10de33e2d28856187a8a8776178c500a7352454323904919fc5bcd5ef1e9461dd425d1b463bde18da4d13c046a45a07c9613afb9f2087f3d465383c3b9f SHA512 23d16c07d7f63adccd42d59dd4b51269edc752ec88904b1453314ce43746c66523b15642eced9d269d5e46556f84231d173eb003ac5909ec74de61fe22806faf
EBUILD resolve-march-native-2.1.0-r1.ebuild 526 BLAKE2B 793a091f444aa5f9293d6d4f4049bee62503f1b06fce3131d178801576a788cf5f177acfbd57695250f7e148f26261169c1c9d0ccca5d16b6dbcbd7b8493d728 SHA512 f3450ed3defe168cee482580a18b7620fd6fa5593776bbc13f6be1f3ddef36a298b1df9dff34b9ddbe6fd64fb2cc41fa9211000e575d6ea9640520629ceb6a33
EBUILD resolve-march-native-2.1.0.ebuild 494 BLAKE2B d2ca98be590c3b3ffbffbf73c604be60c167572d9cb7b76677add72c4063ae01bad195f68490cf3bb64466d297525a1747dea44c1f6e90f280f6d07561a951d1 SHA512 f453070969b57658edacd18fc4b2e6acf9f161c99ddbf7f1708c699d41c6df6c5b2e99b4da10758349fb410e342dccd778dff409a6d92523802d1b7a2e415f7c
-EBUILD resolve-march-native-2.2.0.ebuild 526 BLAKE2B 793a091f444aa5f9293d6d4f4049bee62503f1b06fce3131d178801576a788cf5f177acfbd57695250f7e148f26261169c1c9d0ccca5d16b6dbcbd7b8493d728 SHA512 f3450ed3defe168cee482580a18b7620fd6fa5593776bbc13f6be1f3ddef36a298b1df9dff34b9ddbe6fd64fb2cc41fa9211000e575d6ea9640520629ceb6a33
+EBUILD resolve-march-native-2.2.0.ebuild 524 BLAKE2B 9283955da0b65409f536734684002f62d7a54189f240078e077b45a72abaca71384f48be28e0bf8b7e79848793f47565e23e2ebf1ee63c927dede11c613b8476 SHA512 a37daecfa5026a2d0718cbb24b3e26247895e0ad41fd23a5b821a12b8a1cda49b0085db67b55f83403c31e5aa4140abb1b83981d682dee1e655dfce49bf49f43
MISC metadata.xml 344 BLAKE2B 90b1eab14f1ff2330a87a33bea4de6d1179aa4fdef0460d3ce08054afe2abd23d09a6798539c2ac17b4b512db6777ff4274c883c5bba59baddac8cb873563fab SHA512 67a6747446ff67ecaddcce213508c6e01b3734239716bd051416e96a73d03b00340bffb74cd47cd4e1569ff2342c21d794f361d2b68b49ed4910eaad8421470f
diff --git a/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild b/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
index 66670c04a72c..a94cf77a84db 100644
--- a/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND=""
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fac6a2e0d6a1..b0ac68b76713 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
Binary files differ
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 578a69f6f449..0f615fba1b65 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,6 +1,6 @@
DIST elogv-0.7.9.tar.gz 19556 BLAKE2B 5d5f1a4adab09cf8b56ca3433b2a1cd0d3572345ff92f34b6b3ad175178161c36531bf9211563f4ad18191c6ff99c2cdcf9c3d188eca293a1698157e0a9f04a2 SHA512 703d1e8f55f5ee17a393f3a331ee38ef1d4e4c918c316055d5e2297b96dbe7de0ca6df864f462520f2087ed1a7bb7f43db56bfd3864a865d349516694522a686
EBUILD elogv-0.7.9-r1.ebuild 1710 BLAKE2B 509a8d1d7c56addce062c481098dae4fec032594ea5387d24e371d748a4e0b5630927ddc4b8da936e67d3bc532cf194c6560890be7fdbe0fde26a50c46f64c39 SHA512 f41d3f9cbdaf6331389b0978ea388fa1bceec2e986ea158876c8910d7136dcce48f818568076aeb572b9f8474ea6d790dabd9fb99fe4ad35b8555ce08d21c6b0
EBUILD elogv-0.7.9-r2.ebuild 1729 BLAKE2B a7789ae2fd5a35c7c432de4e57fe81dcabd0ac7bcae1804234dd27b54b1e908ce3739c07832e4791b44b942a411cc2980dbaf18910547aaa97a11094bd3bce09 SHA512 c4772d1751846f7831de986d695f3bb63e58db054453f2619d88d109259f44dc606d53d49009b62227913ce24c902c61ea7eac5ce62d67d28218910b45ca52dd
-EBUILD elogv-0.7.9-r3.ebuild 1730 BLAKE2B b800101e7aff9eb3b4721bcd12b9c15ade4a2bc0ae8dc16490614a56ae81a4c391ca71146fb432e9edebe77f96fccca344a6ff7f1ec696f40f80ea48f072ab37 SHA512 b0abe78059c07c46665f4845991b5cdb945446e65bea869f88d6cd97d21cbbb5406008a03f5518c1dfab9b582c283fcff3dcb66552b32edb3242e19b29d124fc
+EBUILD elogv-0.7.9-r3.ebuild 1726 BLAKE2B 63546a3e8a7de3e7daab298092a4eb1ab9edd530307b0bb2161df751475b8440057cf1efa3718035f2518f867fedd0e4002dcdc8918f9370eeacc906478b0127 SHA512 2661087131dbdc8f14c346cd1f8a40601df80c625aa5f8d0e91a4434cea41ae28286f7ef45196e1e502afdfe0a1688907c16b952391bdfe54681a8b38f24ab42
EBUILD elogv-0.7.9.ebuild 1607 BLAKE2B fa6825ca81e26df9c4c60d2ae2e84e333ad28af53939d5bd3ccc34e6007cf6cee0876824d4db0bfd3c43e8ef87591d7e231de1204f106fb6178c25b55c89560a SHA512 04535406acec34cb3680fd3b85bc22b59174a2c655b275caee34e539fff88c84fe552c97006cb7e6b783aa7bd9d97e9ea2553960868c0673641959620db5fe62
MISC metadata.xml 470 BLAKE2B 8929c8c694be9a3296adfdb126acc0505333cb9b780a6ede783b18046f45d90a75039fd02742b53982a67e10912fc091528a75775aae08aa725a16c9df37ab01 SHA512 16782cd7c0f06ab11b81ab3c3850b6084bcaf160e2e0e383f3a0cfa9737f73a9ad3f2532b1b3c779c7eea746aaadd2e360f6e2b57baace74f5a18e4ca266ef17
diff --git a/app-portage/elogv/elogv-0.7.9-r3.ebuild b/app-portage/elogv/elogv-0.7.9-r3.ebuild
index 959c38572a39..3e9b628d1a51 100644
--- a/app-portage/elogv/elogv-0.7.9-r3.ebuild
+++ b/app-portage/elogv/elogv-0.7.9-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
PLOCALES=( "de" "es" "it" "pl" )
IUSE="${PLOCALES[*]/#/l10n_}"
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index d6a2c31a8780..d710ca664313 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,6 +1,6 @@
DIST metagen-0.7.3.tar.gz 9607 BLAKE2B 3c5b9debf10b0a6dda9bdf0e45e157c80019d0496d93f5af18e7be1b502c320fdbf7bd28f382e9021580d3aaa373566d7b342f3fa57f736fcb3676bafdd4d6e2 SHA512 d7293125685ad3be35dd9213b5d52c9219b6a5bcee4ab15fb2426bdccdb95b4df5567c2178bdefc0e75987080cd51026b5b089a4d4cf6402f455429d55d3a9e8
EBUILD metagen-0.7.3-r1.ebuild 917 BLAKE2B 76d0e6f271f4d38229b8c7ea6f7b3c7aa5d71de0ca3a6d29bec8dbacfb4a3bf7431da13854e59cacdd978d82bee4703eb472ceb5d3eac861d86c9f30f5d1da52 SHA512 0bcfa1df1336adad24af6c701b0e8e95bf8398214bd179b15d329baa35bd17826bac94fb1aacf25d4f1d3a1bdf523f170f1fe61dbf5ad31ff8afc7f410ebbbf6
-EBUILD metagen-0.7.3-r2.ebuild 902 BLAKE2B fcf67cdd674b755821f313cb8d93a7b3ec1f0df707c6db052fcb461dbd79a4e41c7ecb3afab6118fa46fe77b9966533398530ec7429fa74f182f687376ce5e43 SHA512 f2e64769f9fbeff02b5da68c9e5be91c5992e9fa23bcd8dbd7524ae6aeebff5725998c76e61f67e7094a0176228c3b246f3cb9e1848de699fabeb4f3b79e7499
+EBUILD metagen-0.7.3-r2.ebuild 899 BLAKE2B 9d33b8c980dae96f6a694f4644b51b8832b2e5ef8d9e92b85e392b3bbbddb72c94eb22c47087bf47cb6f87d4c28c2dd29e3a11bc76ab0f2051d370aa18e5b7f4 SHA512 3ed3643eb354e5701ce2f8912c5237c65401aca45dc4cb7efecb928120f87f172c62bbfab7c5305a814254dd44c79c37c8fe77f2f1685c3a7a79948e79550c30
EBUILD metagen-0.7.3.ebuild 907 BLAKE2B 557c3edebe919df0e67db6a975e8dc80ff19009fdf3562821ca51121192d801ce7b6934d02eb050415d703d8d46f9a7a3db71c7d90d8f22f192466760a5a27b7 SHA512 9d3786afe98798ecbc09578e08264f74e11bf5260271ac2c8fb5bbf294b21d293f46ed92109faa3b36aa6356d74a341d64670f25cb7aaa343a89eb602c1cd830
EBUILD metagen-9999.ebuild 887 BLAKE2B 10d8ee1aeb44d19b7795b05ab8658d2c560f44c3d0e3f2c283b457368e9d20d80c2e195b436630a612c52052181a822cdc08554570d7d621e0d92e736a825632 SHA512 0806403189c4113cac684505b66725fdc3d6dcc3833b41d9ed454137a1e5604a0e53eb0004997f10648edcaafaaf14e7030e63743e5a5527ed059ab63e5cbf31
MISC metadata.xml 320 BLAKE2B 4321891734786ba01e58321578aa81d5b67a974a24c743003a206c82762f3e8d0582f3f8177ce11b29eae18017d301d5a7b3a9e5048dda134077d66dfdbf3401 SHA512 842f0f4e3ee5e995d504c35bdd1aa00a9b923a916b7395edbfa9134190bc36afef608fb3967deb7d83be2467cc15ec3a677d6bcba5f3aa9c7920d9e9a8816f31
diff --git a/app-portage/metagen/metagen-0.7.3-r2.ebuild b/app-portage/metagen/metagen-0.7.3-r2.ebuild
index 436a7a9df46f..930c202fcc26 100644
--- a/app-portage/metagen/metagen-0.7.3-r2.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 812aeaa31804..a07123403c3b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
Binary files differ
diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest
index 3bd19f04dcc6..bbe1c091c789 100644
--- a/app-text/crengine-ng/Manifest
+++ b/app-text/crengine-ng/Manifest
@@ -1,3 +1,5 @@
DIST crengine-ng-0.9.7.tar.bz2 3594561 BLAKE2B 65adf26be6198a29c26a506e5e00dde809a6bd9371e7f226ca954a89e0dfc68f314891f9e060a3055e5313673c266a26954353479f486abcf1bb87951202f64c SHA512 94775722f8ff3680c36278e2cecd864b5e3f9de7940aa0e681b683cc5136c8098650e495c3f0729af187839e45d6409993fdc2fc2738250cacd406f2540fdc31
+DIST crengine-ng-0.9.8.tar.bz2 3407775 BLAKE2B f4e2c49ac0ee690f658f549e26bf29a61ec3c9fcb18b86ef3f7fb5d998560ecf99b61e08c438f9336dc0ec78bc3c22cb0753ef182a3e328c2734f54a9d37b324 SHA512 9cd234caddfe6cd651fbf4e2f2eb1ce143f21505a194af8e87bf79c41cd1082a4319383d47e2fcdd8aef22da2bf20f46b9db2a617fdcb4eb3e87982b2660094e
EBUILD crengine-ng-0.9.7.ebuild 1602 BLAKE2B 64dadcb4c730cccd36a11285e1983bb8b6969789167c720b2bec44ba5957626022aaf5224b0042f1af0918ae21ce6760601fef7a40ff3870082accb4ed2d9c6e SHA512 07a3a323e8e642a443cb1428ad5e7eaa70a49b3dcba3423642bd06e5c603b0aa9af6d22e37ab1badbb641550c02dcbfa8c1991c1f18a4b7e20b41587cfeac3d0
+EBUILD crengine-ng-0.9.8.ebuild 1607 BLAKE2B 26aefcdc3bc6a740e982e9b0f999d5df1e0eba7e635ff76211398b643cff8a5a33f27043b800b153f5d5f015aeece65c982747317374bc599a62d15a26e12326 SHA512 a4caf3cd602f40a20aba13f9e4933b83efcbb1e7f1e0136e4892f4cc1334522d35031395714c629bcf2a4373e9cc672633d6854a5264556c8597c2b0abf39e86
MISC metadata.xml 1232 BLAKE2B ecb2f3ff8720e43b48f6e211da27f0f34d3123644a429cb7853ae4044761793f5137dfbeaa0962093f2b722fdcfb6e3bf9ad432835fa6fa3f5bbf5f7f7abd78c SHA512 6aa7904c0d002926d4223c46b31de30f5ab06dee8291909498ecaa6deed3a6b547cfaa40df1ad7dca7e74faa55e95ab4fe4fa4ac0698202b5dd0221a50288036
diff --git a/app-text/crengine-ng/crengine-ng-0.9.8.ebuild b/app-text/crengine-ng/crengine-ng-0.9.8.ebuild
new file mode 100644
index 000000000000..6d121a24104c
--- /dev/null
+++ b/app-text/crengine-ng/crengine-ng-0.9.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Cross-platform library designed to implement e-book readers"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs"
+
+CDEPEND="sys-libs/zlib
+ png? ( media-libs/libpng:0 )
+ jpeg? ( media-libs/libjpeg-turbo )
+ >=media-libs/freetype-2.10.0
+ harfbuzz? ( media-libs/harfbuzz:= )
+ libunibreak? ( dev-libs/libunibreak:= )
+ fribidi? ( dev-libs/fribidi )
+ zstd? ( app-arch/zstd:= )
+ libutf8proc? ( dev-libs/libutf8proc:= )
+ fontconfig? ( media-libs/fontconfig )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ ${CDEPEND}"
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ CMAKE_BUILD_TYPE="Release"
+ local mycmakeargs=(
+ -DCRE_BUILD_SHARED=ON
+ -DCRE_BUILD_STATIC=$(usex static-libs)
+ -DUSE_COLOR_BACKBUFFER=ON
+ -DWITH_LIBPNG=$(usex png)
+ -DWITH_LIBJPEG=$(usex jpeg)
+ -DWITH_FREETYPE=ON
+ -DWITH_HARFBUZZ=$(usex harfbuzz)
+ -DWITH_LIBUNIBREAK=$(usex libunibreak)
+ -DWITH_FRIBIDI=$(usex fribidi)
+ -DWITH_ZSTD=$(usex zstd)
+ -DWITH_UTF8PROC=$(usex libutf8proc)
+ -DUSE_GIF=$(usex gif)
+ -DUSE_NANOSVG=$(usex svg)
+ -DUSE_CHM=$(usex chm)
+ -DUSE_ANTIWORD=ON
+ -DUSE_FONTCONFIG=$(usex fontconfig)
+ -DUSE_SHASUM=OFF
+ -DBUILD_TOOLS=OFF
+ -DENABLE_UNITTESTING=OFF
+ -DENABLE_LTO=$(usex lto)
+ )
+ cmake_src_configure
+}
diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest
index 229aa0674002..6a7679c7b611 100644
--- a/app-text/crqt-ng/Manifest
+++ b/app-text/crqt-ng/Manifest
@@ -1,5 +1,5 @@
DIST crqt-ng-1.0.11.tar.bz2 442916 BLAKE2B 3eb4c73f1c3b3c88d92cb6ed5bf4895329caab1391c7be05dc0ccc1a65546f7761ee7af6246045be70137fd8683e2bfc5fb41df3dad604177ae4c0351f44c74e SHA512 62bb4b8a3dec3dd9fba5e1a2795f384e5310b87800d89e15b7f4fe258eb923481f1264ec23645b09f5ae89822e332d1499aeca0a79efab21124b43deec3ada44
DIST crqt-ng-1.0.9.tar.bz2 435826 BLAKE2B 771b073fadf6f1bc9ddf7887603aaf6081d54c2effd548523f7afbb8b6bdf20d21bf55c1c37101662c2b851e932c6b4dce777c8e9160b059dbb1daed499db1c4 SHA512 b4f395be1d2029024dfb064f38db2ea372587151de1f5fae3cef492d4285d6ce597bc93a48d98594c5b703db8c99ba29cd9afdaae4c39b80b53cf6a7bafdbb97
-EBUILD crqt-ng-1.0.11.ebuild 1091 BLAKE2B 9f8aa2a9731bb1ad68771c14a54cce822e385be5351fad4daa1d33b3b8ec1f78d38b7f27fda89f64cbbacd861319cee99a3815b4464e37fb3e78447c711831a2 SHA512 d940c3f8bf0a8bd94ca81d30b65cad6a27453f42158c7511abafa0905cde07b98e26c26e1804e30b853d78f70a75b50649c6ea25f1f0b85e04dc2ceb4db8d445
+EBUILD crqt-ng-1.0.11-r1.ebuild 1094 BLAKE2B 494139b1428a262054ba697cf733ea1fa91be32c543b0f958d5e0ea8c8333ceb2ca7dd9aaa7ff432ed17ea074bae1dbd74edcc927800c825c58143db5edb43f6 SHA512 dc5f6847e384c9b418c371a5645210d6fcf6dd4038446a88e5a7361e94239b781d44aa7326ecc9dbf97f67db474a333a6e4b0a8d9c96c87fe5f65faf869f46a5
EBUILD crqt-ng-1.0.9.ebuild 1085 BLAKE2B 83fe51d3d4725fe1353c5b9652535ed9ec0014db11835c61a97085508a69927370388ae9ec4da35196193e74f3c48eda5ad8fdda0b05267af73250e8080cbeff SHA512 78846eb89eec8dbaac7228fbb77f0a0e80143dc0369565d96e1f5569972997c565ca9a473b5e2a34325adf346f2edb78face6205e53a49e48992339424a066f2
MISC metadata.xml 1177 BLAKE2B 0c28a5a4feb5c6dd5cb1115c063770bb276f2accff5c7a5e695b1492ae5cf3a188ceef2d5fb3519da87f6b68eff452f4f61b87f6ebd196b08cba55a26836047f SHA512 7cd49c422506be812eb080160286b21e0ecd48d6ae877e3bbea2ea8fd2ca0998e36c670db0e75c708a54c0b311b55fcadbfc1bf791e4c0c912c29b42ed6fcee4
diff --git a/app-text/crqt-ng/crqt-ng-1.0.11.ebuild b/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
index c06677c451df..61940f927e92 100644
--- a/app-text/crqt-ng/crqt-ng-1.0.11.ebuild
+++ b/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
-CDEPEND=">=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5"
diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest
index 1e7f16a45d9e..50cdb9426f16 100644
--- a/app-text/crwx-ng/Manifest
+++ b/app-text/crwx-ng/Manifest
@@ -1,4 +1,4 @@
AUX crwx-ng-0.2.0.patch 3504 BLAKE2B 4ba842f9961f57fcd86f6423232fc401f2af07a1b5b77213716519d5e2a29b156d8f304b126249f2336abe60b7ac8ce13921d9f58aff1ce4efa70fdb06537ce0 SHA512 5370b9111efc9db9f493fdead16245b1b03eccd7e178f3ec9df6765893c743879c23f56ee700794e4dbab2dc15186714e598db335fb5a624b5cd096d8814df40
DIST crwx-ng-0.2.0.tar.bz2 364917 BLAKE2B f8d541fa479fe3102d495ba43ce51d256f55b9724844d26b89db8396f2cbf90680dd312ecc0c816ee50fb498c8b69ba69d0db73f9ee5dcefc9991e8077754171 SHA512 0890a6066fca7178b483749e946659a6e4304f13694601024fe500e9b79351f7170403b136407a831abe7a040f775dd34c02d9411814c136da68ee6b69e00a99
-EBUILD crwx-ng-0.2.0-r2.ebuild 700 BLAKE2B 4e80d8ea6377434b6f99a49ed8a95f7cdde613ab5f1793fbe2b330549ba37fecc6d8c8565da32c81f8c4419ec5af56cd37b01bd56a07592ac904d8b569077a8b SHA512 09cc9b248a4a7265270f37232292f6b20835182b86fb651a6117028dfc164acb34665c0b95fc51667f487aecfc67ab8c7f75a6ac31570b89717a35c20c749744
+EBUILD crwx-ng-0.2.0-r3.ebuild 704 BLAKE2B 721f91fdb3e1aa632c4b0bcf823db7edab03cdf4c6656d403868c2af8318032666427bc6edc8aa37489ce1c0bffcc615e981dad9f9a0e67c5f77a228aeca4f23 SHA512 c3b06e48e0416ed62ddd51d1680b2a4174b71e318250e4ea5c6215b95ca024ee4060bac7f7b862c7ea768c8515c7e4babb2608931b2710d78fab4414190e1d75
MISC metadata.xml 1177 BLAKE2B d2d0af2338da64845775c14b66725abb760d84d267ca93a44f2ea679e0125f0cb1815ecd312da919ab1d9050f957c9e763ceeb817df7b48bac024b15ed292e96 SHA512 3bdc42749dff929ae4fdb6b9bd2c84eadbae352de4baacdd4f08572cd20d1f336dcd2d003b41bd79d56b3476026ba4d57d89331fe038592b8adaef60d03f34d7
diff --git a/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild b/app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
index c362c9d43f6d..64cec1b653a4 100644
--- a/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild
+++ b/app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Cross-platform e-book reader"
HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng"
SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
-CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
x11-libs/wxGTK:${WX_GTK_VER}[X]"
BDEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f31fd9d81738..d998f3cead50 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 49b93635bc80..f99584f68989 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,7 +1,3 @@
-AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
-AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
-DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
-EBUILD commons-logging-1.2-r6.ebuild 4146 BLAKE2B 3d9d1e7121406deb2cfbb50ce274df70a0c165d99870f77a69068447e68588bd43b259b076bd5dc2e853a4d79e2df80844caaebd4d4dfe095701f3c4799a98c6 SHA512 7bee2954d057db0c3bbfd3b8bba6b7c9e1cc2f708b5d85070defde51fb6c9d2f8f10b1be122fcfadabfaffc612d2b63ef355818cc6a14253a9de05b79c0c0dde
-EBUILD commons-logging-1.3.0_pre20230319.ebuild 4232 BLAKE2B ed7da971dfb3e962ebdf328afab4d1f126efdeb48cbe14e34d85bd166980a3c6efe5a87ae565728e6df8ea2a0bd2ee0b1548a76d0050bfc37c89fa0a1e448915 SHA512 278663f90115823b5f832caf311801a3067a63218a5bfd86470dfaafce60f29f0672edf2a1fbef0226cb0da6f1b0a24d91aa8f79b4c99ed442b6fc5177dae3df
-MISC metadata.xml 925 BLAKE2B 4834c919748bbef9b8ac9cbb0545a3b13cdd8c97f0ce6039e09f5fa63522f0506e89ab1749fb273d7cf511414b4d16f661ac156f953dfee1ac3a01f6723b1b99 SHA512 3ea4a17834b877e710c618d6a9669275e76b6305b4c090b4b2462c54a132da20c9f39063c8e9763e712ae21f4c86ca8d02892a47039184dd3ed1680fee8b5849
+EBUILD commons-logging-1.3.0_pre20230319.ebuild 4229 BLAKE2B 9611fd81e67a1a21c6a6f87638c8a5b1413688406dd8336c8580aa02daf59f4be3d5372bc80144771d2d6c066c8b43a0f0cd33eff8bff00ee92dc9f8ecad783b SHA512 da522092c9a1dacdedcdbf3c979e8d24e15323d61e94010a0b053135b300234640fcc79690939b592cfbb9c818af1c37eb9a95af9776b546d65faa026c8dc416
+MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0
diff --git a/dev-java/commons-logging/commons-logging-1.2-r6.ebuild b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
deleted file mode 100644
index 8c38a37bc9cb..000000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-logging:commons-logging:1.2"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="
- avalon-logkit? ( dev-java/avalon-logkit:2.0 )
- avalon-framework? ( dev-java/avalon-framework:4.2 )
- log4j? (
- dev-java/log4j-12-api:2
- dev-java/log4j-api:2
- dev-java/log4j-core:2
- )
- servletapi? ( dev-java/jakarta-servlet-api:4 )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}/${P}-gentoo.patch"
- # patch to make the build.xml respect no servletapi
- eapply "${FILESDIR}/${P}-servletapi.patch"
-
- # bug #208098
- echo "jdk.1.4.present=true" > build.properties || die
-
- if use avalon-framework; then
- echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
- fi
- if use avalon-logkit; then
- echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
- fi
- if use log4j; then
- # log4j12.jar can only contain path to one single file because
- # build.xml decides whether the Log4JLogger should be built with
- # <available file="${log4j12.jar}" property="log4j12.present"/>,
- # and a value that contains multiple file paths will cause the
- # test to return a negative result. However, classes from multiple
- # Log4j 2 JARs are needed to compile the sources. So, we combine
- # them into a single JAR on the go.
- # https://bugs.gentoo.org/834036
- mkdir -p "${T}/log4j-2" ||
- die "Failed to create temporary directory for Log4j 2 classes"
- pushd "${T}/log4j-2" > /dev/null ||
- die "Failed to enter temporary directory for Log4j 2 classes"
-
- local jar="$(java-config -j)"
- local dep
- for dep in log4j-{12-api,api,core}; do
- # Assuming SLOT="2" for Log4j 2 dependencies
- "${jar}" -xf "$(java-pkg_getjar "${dep}-2" "${dep}.jar")" ||
- die "Failed to extract files from ${dep}-2 installed on system"
- done
- "${jar}" -cf log4j-2.jar . || die "Failed to create JAR for Log4j"
-
- popd > /dev/null ||
- die "Failed to leave temporary directory for Log4j 2 classes"
-
- echo "log4j12.jar=${T}/log4j-2/log4j-2.jar" >> build.properties || die
- fi
-
- if use servletapi; then
- echo "servletapi.jar=$(java-pkg_getjars jakarta-servlet-api-4 )" >> build.properties || die
- fi
-}
-
-src_install() {
- local pkg=org.apache.commons.logging
- java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
- java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
- java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
- einstalldocs
- use doc && java-pkg_dojavadoc target/docs/
- use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
- # Do not run Log4j tests because these tests use an Appender to verify
- # logging correctness. The log4j-12-api bridge no longer supports using an
- # Appender for verifications since the methods for adding an Appender in
- # the bridge "are largely no-ops". This means an Appender's state would
- # never be changed by log4j-12-api after new messages are logged. The test
- # cases, however, expect changes to the Appender's state in such an event,
- # so they would fail with log4j-12-api.
- # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
- sed -i -e "/^log4j12\.jar=/d" build.properties ||
- die "Failed to skip Log4j tests by modifying build.properties"
- java-pkg-2_src_test
-}
diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index 78119f70a2ef..fae791f5d474 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="log4j"
CDEPEND="
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
deleted file mode 100644
index a654ce1fc763..000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -773,4 +773,23 @@
- </fail>
- </target>
-
-+ <target depends="" name="javadoc" description="o Generate javadoc" >
-+ <mkdir dir="${build.home}/docs" >
-+ </mkdir>
-+ <tstamp >
-+ <format pattern="2001-yyyy" property="year" >
-+ </format>
-+ </tstamp>
-+ <property name="copyright" value="Copyright &amp;copy; The Apache Software Foundation. All Rights Reserved." >
-+ </property>
-+ <property name="title" value="Logging 1.1 API" >
-+ </property>
-+ <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" >
-+ <classpath >
-+ <path refid="javadoc.classpath" >
-+ </path>
-+ </classpath>
-+ </javadoc>
-+ </target>
-+
- </project>
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
deleted file mode 100644
index a9fccba8d5c1..000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -279,6 +279,8 @@
- classpathref="compile.classpath"
- classname="org.apache.log.Logger"/>
-
-+ <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available>
-+
- <available property="avalon-framework.present"
- classpathref="compile.classpath"
- classname="org.apache.avalon.framework.logger.Logger"/>
-@@ -315,6 +317,13 @@
- </echo>
- </target>
-
-+ <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" >
-+ <echo >
-+ *** WARNING ***
-+ ServletAPI not found: Cannot Build ServletContextCleaner
-+ </echo>
-+ </target>
-+
- <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
- <echo>
- *** WARNING ***
-@@ -337,7 +346,7 @@
- </target>
-
- <target name='warning'
-- depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
-+ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
-
- <target name="compile-only"
- depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
-@@ -365,6 +374,7 @@
-
- <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
-
-+ <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude>
- <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
- unless="jdk.1.4.present"/>
- <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index 6d5d06dd2376..6f7f23a3f9e5 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -11,12 +11,6 @@
<remote-id type="github">apache/commons-logging</remote-id>
</upstream>
<use>
- <flag name="avalon-framework">Add optional support for avalon-framework</flag>
- <flag name="avalon-logkit">Add optional support for avalon-logkit</flag>
<flag name="log4j">Add optional support for log4j</flag>
- <flag name="servletapi">Add optional support for servletapi</flag>
</use>
- <longdescription>
- Apache Commons Logging is a thin adapter allowing configurable bridging to other, well known logging systems.
- </longdescription>
</pkgmetadata>
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 77ceaf1bbe0e..fc2fb3cee211 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,7 +1,5 @@
-DIST apache-maven-3.8.7-bin.tar.gz 8293440 BLAKE2B 0a586cf0eb2a579d99bbe5736f294369b774ee4b041b37ecd4721eb3b988e274fd6d88bb34cc20a48c98c4f70c256dd74441c0f57119f90958af05e8c16f89c6 SHA512 21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27
DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
DIST apache-maven-3.9.1-bin.tar.gz 9039409 BLAKE2B e1925202d8b5363f16cd734aca409091a1e7f56fa9220aa6060a79fae6dfd37772daf04bc15edc2918757ac718ea41e861583c86dff40b0e3172fa0a7cdfbcef SHA512 d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3
-EBUILD maven-bin-3.8.7.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
EBUILD maven-bin-3.8.8.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
EBUILD maven-bin-3.9.1.ebuild 1372 BLAKE2B 5e7c245e7888d018784a15d894ff5277c792b7f2a0f4a0ab4a354a26adb2ab7b23d80d549d0197394ec5ac9b7f5e0c9ceee3911e04362ee895f982ffce9af082 SHA512 4579ec07fca112b9765b1710dd70b321d5fc73e6c33a116d6f3e27d2a52ed8e7dd16acf9a1fa45846c7f89189fa4618d92553dc3a9079892b08dcc9415739524
MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.8.7.ebuild b/dev-java/maven-bin/maven-bin-3.8.7.ebuild
deleted file mode 100644
index 110c8ce5aeb0..000000000000
--- a/dev-java/maven-bin/maven-bin-3.8.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.8"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- app-eselect/eselect-java"
-
-RDEPEND="
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
- "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
- "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
- dodir "${MAVEN_SHARE}"
-
- cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
- dodoc NOTICE README.txt
-
- dodir /usr/bin
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
- # See bug #342901.
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
- doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
- eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
- eselect maven update
-}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 77b896141d17..3f7d01c7658f 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
Binary files differ
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index e26140ff2d78..0306c7e1c856 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,5 @@
DIST luasec-1.2.0.tar.gz 53379 BLAKE2B dad93b341565b602fa02a5551a127bce42e76cee5abb0314f9cc4a98f162d23b0f8b4b9c0f16423095e4b54ec5ab260ee06bef5993ad46f559ad1295dcc28856 SHA512 5564f73495bef7c5683285ff7648c7b82a3a3dfdce96e88c77cc8835427b6595a694e5a2bf0a4f6332fe52b8aed3d94531607df81260d7597458a6fb0465d3fe
DIST luasec-1.3.1.tar.gz 54807 BLAKE2B e09d340b8bc391830d671dd5cbec76bd5190bebdd2e534800bea8efd19749a4379e2681bb7a6e6551da49109345f0b846904c222c0ecada6135d775e2060bfc7 SHA512 cfa4187518445abc6591bd0c24924122b62252be25ffd5564cf291f9a2ae3702a5fa299ffd265d2e0e8315b90d6783eccace4ff560f54f299161d3c5e3749508
EBUILD luasec-1.2.0.ebuild 1737 BLAKE2B 633fd25ccf721edb600c479956f37504d46bca254e6df6f512325fbfa6c1964d07fe16256df50cb950358321993686de87bfa1d732a4550dc8c7718de1cc2202 SHA512 41d17718b574d404deb383f45b98de42271ab443b3e7f9069363008c1188ab17e720a6d52d7428a4ea69288f524880110f768ccfb0e1f37c03977be1241b9159
-EBUILD luasec-1.3.1.ebuild 1742 BLAKE2B 9d3c7af0e7443dd15d2593e56b50ff8ecded5b7f2848a9251e851170324c6be73c06bc5e5ad92afa55fbdd5d863efc344793b958a775350b0ed889c9c0248f39 SHA512 8c455577dc86a3bb505ac95ec0eb8ae5ab977abcbcb8aad3bb64162e3d1bc12ec25ef804460fac857128402b3259bde575a674aa16667f74f7d982713c5b5212
+EBUILD luasec-1.3.1.ebuild 1737 BLAKE2B 7b985f8fe90ac76a529950deca77cb7968ac8d44455eafc335371e8c0ffcd9c609eef0f4ce6970a64bf1684de88116a25d438cc2df1fc0e9638f91c91b3e948a SHA512 0c6a3ce9626d6740d402d6cb9cc37873568a1cca4acde0d97174fdc7e2f12dde9ab03a8cb883f96bdcb22c8bc444e255b86084b589e70745da1ed22c0abe6a3f
MISC metadata.xml 597 BLAKE2B 6398ca37e0d10458a7b1a111d2d0e8d44aa64136ada116a8bb73bf200be4c10f673c8f574733043eb7b2216c28b003c30a993736145344ae72ef25f001a5783e SHA512 399501a7a9c0b08d8747b30478a3810dde63efb48d2d42eeff1ba7355c882e35fd3528424930f618d51182f80641c1c6fb4662b31ec21cf38abd0f0fde0d17dd
diff --git a/dev-lua/luasec/luasec-1.3.1.ebuild b/dev-lua/luasec/luasec-1.3.1.ebuild
index 3764a56b37dd..8371ae1e3422 100644
--- a/dev-lua/luasec/luasec-1.3.1.ebuild
+++ b/dev-lua/luasec/luasec-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
RDEPEND="
>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index df433f0a27b1..6fa450872b5c 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,5 +1,5 @@
DIST mpack-1.0.10.tar.gz 16256 BLAKE2B 56f279be5b84e89a18a6010320eff9f006cfba6df9621e7b4c338a866170a69589e9e50d0d7deb238ff40634f28aa4d0c43a135c6b7fa9a38ec41b8b669945cd SHA512 879e200d806a4aeb3dc31bf44781bb92b377ee86fe3050692179bff794a2748c175135e4ab5eb59f29202bd36ff27ecc26bab07d0c46c11414361f72abf3dc53
DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395
-EBUILD mpack-1.0.10.ebuild 2301 BLAKE2B d015309660bec8ac5772a6d04fc7b8b0f857cf033f0496d02e90d8e38e5643bc2637c6de97696c1cd7e71a796884000ffcf7968344d25c252ca6c3a1015a4cf5 SHA512 2e570d674a4d7af05e60b4f435c52a5ec61119d95e08f62846135297926dfc406f63a7e50f5ba6955d8a046eeb58e19d53d133be67cbeec4de7d4efeea3aaad6
+EBUILD mpack-1.0.10.ebuild 2299 BLAKE2B 32f3f528c4f591833dcb839831fc61bd4922935d4fd30ef42662be2dabb9bcfaed48d993e5025e15f16dc78021e097f33740df7fd185cce9e57b1a7e290a945c SHA512 a5b86510731627ca0ccb9c1292d3b9388810f564685fa0574203564fd58974f67b94ead5bcddba3b77eaa9154a76091010aa07f10038f561ac9cde23ab0212ac
EBUILD mpack-1.0.9-r1.ebuild 2299 BLAKE2B 81972f5a84aa553852c0c6fc59010e1f67116280ea0e2106d0dadd9bc1f6cb3e990367561c5790f8b646c65b49c8267a83d343021ff3c144f432ef94f0468ff1 SHA512 1c51651b30ff803991d706755ae64262e56c629b701d5487e6e9f5f73b3a9ca8278175cc772f916bc225541d6ca311af7412f87658abd91452ce5289c49efae5
MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1
diff --git a/dev-lua/mpack/mpack-1.0.10.ebuild b/dev-lua/mpack/mpack-1.0.10.ebuild
index 60ae13d835e1..2924e676d514 100644
--- a/dev-lua/mpack/mpack-1.0.10.ebuild
+++ b/dev-lua/mpack/mpack-1.0.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
IUSE="test"
REQUIRED_USE="${LUA_REQUIRED_USE}"
RESTRICT="!test? ( test )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7233dd940b94..2c0bf5b065b1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e52016774ae0..f23ff1f54da2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -11,7 +11,7 @@ EBUILD hypothesis-6.69.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d3171848
EBUILD hypothesis-6.70.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
EBUILD hypothesis-6.70.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
EBUILD hypothesis-6.70.2.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
-EBUILD hypothesis-6.71.0.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
+EBUILD hypothesis-6.71.0.ebuild 2128 BLAKE2B 74e1a7c5fb6d1d7b9acdef8a94993b3d0b5cc446b0c7208daf25065c5238d67851a417d3d0b73f8a108bfa7468fe10db66d7682c467a5cacc6f7cf7beb692651 SHA512 2b76881fee9dc0ed2dab414ccbdb7bfd63102b72b8b8664668e37164e944f444c9c001d7144ee22d05f3d0b3de9175874b1fd993a108eda4c2c388dd978e1ca9
EBUILD hypothesis-6.72.0.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
EBUILD hypothesis-6.72.1.ebuild 2125 BLAKE2B 51d07695cdc9af22cb2b6cba55a932a31325861d109fa77216c3dfbd5bda0ddf4246014e90faa2559e7f50334ad5eb33efb377be5319525e664f5c334106ba87 SHA512 bcc6d5b8eafde5dcd3aef80abc3485974131f29975500ee6359fad0aec7d1759848fd131d9901a13a5bc48ca880149b9ef72e5baad1a1368a9300bac65cd7807
MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.71.0.ebuild b/dev-python/hypothesis/hypothesis-6.71.0.ebuild
index ccd35ad36fe8..183fd03a9bae 100644
--- a/dev-python/hypothesis/hypothesis-6.71.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.71.0.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="cli"
RDEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 15f7b3a23b30..862eb6b894e9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index 7b4a4e80da42..bae5577a1dfb 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,4 +1,4 @@
DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
-EBUILD ydiff-1.2-r1.ebuild 601 BLAKE2B 4bcd02119312d9ace79730623e189c7d06fd58624791a4c2f344cb74f01533c290b4bce693019e8cb94d69b7cf103aabcab8e4a432495a04fa67eb7e982db269 SHA512 1970cfffd08e0618615596f0bcf25cbc6c0e487e0263d4928713e268463187c4cd26500135a65bdd2fdcbf8bd748c8e314ab8f59d174061fe4e99093b683be33
+EBUILD ydiff-1.2-r1.ebuild 599 BLAKE2B 8e7f6558fdd0db8fb96d2f2caff5d41b142dfd107110cb046e546d8a02d55e5e87c8e371b45f47ba7b0e4f46d2a72b556ea0317bfc12f97b6292b6b7843c4b16 SHA512 07f49ded5e0f84ad69e92ada1e7a86a1585c090dc78fdeb7b47c07abd74b77e80e5fb05b1e83136ec656214039e853fea8932a8383b09cd6860d3ee6c26e17e5
EBUILD ydiff-1.2.ebuild 642 BLAKE2B 461635fc87413caff56750c87bfb828d036249013690ed8d584cc5c4555055196d5c7044c856894792f573e524bd35b64190f5543063f0d37d3e720ba56ab34c SHA512 eea9f0471582ed3020195d4079ce9c090f61a6a5b13ffb62f094453a058b131a924a152deba4b941995a21cbdaf7a75f15ae1205f1751583a4d26707ea87354f
MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7
diff --git a/dev-util/ydiff/ydiff-1.2-r1.ebuild b/dev-util/ydiff/ydiff-1.2-r1.ebuild
index 6b0c9d651200..0e52ba3f8d8a 100644
--- a/dev-util/ydiff/ydiff-1.2-r1.ebuild
+++ b/dev-util/ydiff/ydiff-1.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ymattw/ydiff"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="sys-apps/less"
diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
deleted file mode 100644
index ccb890d0ff82..000000000000
--- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-# basics_universal version
-MY_BU_VER="1_15_update2"
-# meshoptimizer version
-MY_MO_VER="0.16"
-
-DESCRIPTION="A spaceship bridge simulator game"
-HOMEPAGE="https://daid.github.io/EmptyEpsilon/"
-# This bundles SeriousProton as the build system does not support using
-# a separate SeriousProton instance (and currently EmptyEpsilon seems to
-# be the only consumer).
-SRC_URI="
- https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz
- https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz
- https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz
- https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz
-"
-
-# EmptyEpsilon is mostly licensed under GPL, however the art ressources
-# use Creative Commons and the bundled SeriousProton is MIT-licensed.
-LICENSE="Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
- dev-cpp/nlohmann_json
- media-libs/freetype
- media-libs/libsdl2
- >=media-libs/glm-0.9.9.8
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/EmptyEpsilon-EE-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-cmake-meshoptimizer.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} == "binary" ]] && return
-
- if tc-is-gcc; then
- if [[ $(gcc-major-version) -lt 11 ]]; then
- # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29'
- eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler."
- die "Need at least GCC >= 11"
- fi
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- local -A externals=()
- externals["${BUILD_DIR}/SeriousProton/externals/basis"]="${WORKDIR}/basis_universal-${MY_BU_VER}"
- externals["${BUILD_DIR}/externals/meshoptimizer"]="${WORKDIR}/meshoptimizer-${MY_MO_VER}"
- local link
- for link in "${!externals[@]}"; do
- local external_dir=$(dirname "${link}")
- if [[ ! -d "${external_dir}" ]]; then
- mkdir -p "${external_dir}" || die
- fi
- local target="${externals[${link}]}"
- ln -rs "${target}" "${link}" || die
- done
-
- local serious_proton_patches=(
- "${FILESDIR}/SeriousProton-cmake.patch"
- "${FILESDIR}/SeriousProton-Add-missing-include-memory-to-websocket.h.patch"
- )
- eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \
- "${serious_proton_patches[@]}"
-}
-
-src_configure() {
- local version=( $(ver_rs 1- ' ') )
- local mycmakeargs=(
- -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/"
- -DCPACK_PACKAGE_VERSION="${PV}"
- -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}"
- -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}"
- -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}"
- )
-
- cmake_src_configure
-}
diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
index 712b44d5d70d..11108d01222d 100644
--- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
+++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
@@ -20,6 +20,12 @@ SRC_URI="
https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz
https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz
https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz
+ https://github.com/Flowdalic/SeriousProton/commit/dc9dccf6c802b9c55ac4eccad424d2b1af9f4b93.patch ->
+ SeriousProton-2022.10.28-add-missing-cstdint-include.patch
+ https://github.com/daid/SeriousProton/commit/3bb7f1cfbd91a4520ff23af7d761e08b5ca7cf88.patch ->
+ SeriousProton-2022.10.28-lua-fix-underlinking.patch
+ https://github.com/daid/EmptyEpsilon/commit/5d7e7bba4daadeeb05897349d518a8d9568331cc.patch ->
+ EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch
"
# EmptyEpsilon is mostly licensed under GPL, however the art ressources
@@ -40,6 +46,8 @@ S="${WORKDIR}/EmptyEpsilon-EE-${PV}"
PATCHES=(
"${FILESDIR}/${PN}-cmake-meshoptimizer.patch"
+ # https://github.com/daid/EmptyEpsilon/pull/1969
+ "${DISTDIR}/EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch"
)
pkg_pretend() {
@@ -72,6 +80,10 @@ src_prepare() {
local serious_proton_patches=(
"${FILESDIR}/SeriousProton-cmake.patch"
+ # https://github.com/daid/SeriousProton/pull/236
+ "${DISTDIR}/SeriousProton-2022.10.28-add-missing-cstdint-include.patch"
+ # https://github.com/daid/SeriousProton/pull/237
+ "${DISTDIR}/SeriousProton-2022.10.28-lua-fix-underlinking.patch"
)
eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \
"${serious_proton_patches[@]}"
diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest
index eea304275a9a..67b3a84fb7f9 100644
--- a/games-simulation/EmptyEpsilon/Manifest
+++ b/games-simulation/EmptyEpsilon/Manifest
@@ -1,12 +1,12 @@
AUX EmptyEpsilon-cmake-meshoptimizer.patch 457 BLAKE2B fcef3984e5154ea1819109b89398be0c519f699296d7f64070060cbce888fa8f8c12aac77f9db14c607ef8f7499338e41ef84cb6c6778b2e5198f9e0d795ae77 SHA512 c171fb453ff71c5925508cf6eeee821dadfd95b38470596f5719de1f711eaba31a361289e5f3efe31bc83b778aa5850f1c3a1fa766fb1de98aa6e8ca8938b82e
AUX SeriousProton-Add-missing-include-memory-to-websocket.h.patch 706 BLAKE2B 12129f7eca18439840bbbf53968ec0f950158dd01659bf7923a126b1176678613c704e9b00f7817b281095d5ecf859d29832295ab19b8fc63526882f565aa31f SHA512 3be656fa7c883e91df93085d8b5cc296d4912723b785472c187abff3e51562d5f0b82a2fea6bcd47c58dc00294b9302cfb6a97256456e990f246ba60bad6f725
AUX SeriousProton-cmake.patch 450 BLAKE2B 1f1585eda5dcf7980d4439e1485edf4363dba5378c968f387c3b978eee9a9c5d7bdd406dcdc207dbe1e93f1efdf88285995cc3a5a414e1dc4566123e7685388f SHA512 bc09fa1047f1cc33c5d27ffd640d6e06623f83bb49263786bdab25e3fa353fbddef4d15203197ecf58eac696f92f27b47b9eae67a872a49bda2c11579741dbcd
-DIST EmptyEpsilon-2022.03.16.tar.gz 258014053 BLAKE2B d447518c6887b5969bce48abc042a259733a6845a49ba767b274d17c1b0e28a025443d073563e269365837191439f7963f3a3775c58b143e97cef7b7c0cef336 SHA512 63f351be1af792be0ce8b1171ea14dd9f3ab75825ca9df48f7a7bfbc3cedfe05183f59896a51cd4e1f4e977aa5c9386159716dcc206afd7a1adab1df7c35e062
+DIST EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch 668 BLAKE2B 7338f41fa2bf3b95352ff70ce0440f501fc6c99778fdef9d2af3ceae7a7e141ae3e85d290a4c18b4f97f993533e40cc4e66d2715be6d78545ce9bbb413a4e357 SHA512 cfedba9ceca79511478180eefcc130a7a4a33ae2f0c2577b05df6acb24c261dfb03f914e1681bfb952efbc7ff27b729745afc5ef4f2fa2fbe6f1fdbb988600b4
DIST EmptyEpsilon-2022.10.28.tar.gz 258148673 BLAKE2B dcc2cdd6f02afef4fee00939145c4c98461ea5403ad45949ffc99758b0575f56504b610249231969f63751d8a2f746913a004d88d7287876a5b448a4b90d8162 SHA512 6af0522cb9f07f0b0cf3ac287ce57b156206b27b4d17de237acf50c46928782c49a4af397c9cad4be30603e0ee04bd6979404e11d0b2c5472cf0c278124df140
-DIST SeriousProton-2022.03.16.tar.gz 2671635 BLAKE2B 9fdb58d50e7f3522678efe14b753016c4d2e3341f2e3b78ede00815e4f6a6361eb635016c9cdf0ce235a0bb35fb813b61790a5b0d1522a1e8afe2f3594674341 SHA512 74a06c69a3f49789b35a6e5795a7b1de1b7e79d36c956a92e1383f9983489319060c62f3ee6349e26ac985a5121b4e60cf7a3546ec78b3a830e30c0c99ccd023
+DIST SeriousProton-2022.10.28-add-missing-cstdint-include.patch 850 BLAKE2B f193fb30b39e7b07caf0018fc4e32430ee451baaf63315110e204e7e6f3aff84448a3a5cc83b60e642c27cebb39f532065bd1126f5646ac70645c1c341c8e464 SHA512 3645efb49ea012a31da0414a454bfca46170dfdfd90db7af07481181d75b87c621e7d8ba2ee9752c49d978ab0e5080f01b81eeb07cf1ce68425066c8a4111c2b
+DIST SeriousProton-2022.10.28-lua-fix-underlinking.patch 736 BLAKE2B 50a0fa840c90056032100d19805eb26ba4b0135b77cd7a9bfea92201c0c4b88b0e8597f6cbf453ebb8ffae19e90ef691fb1e98a0219027bfd906eade92956abe SHA512 d7949e6d622d7470de0a1a68c1cecc5920d72b8e9f919c7f0c19be884a981b7e07c8ed2e0c2f51eb532ff46bcb43f40eb4db1ebde7a97f708809f54c2396cf15
DIST SeriousProton-2022.10.28.tar.gz 2668713 BLAKE2B 9f200881bfa812904cd37428eb2bb2f8e04c46a134e8b3fceb0e02e87fe4bd7e529e1fbaf18cb4e284ec7ee4d1c6e8606f35e7ec3e61efa66816a7b354d446b9 SHA512 7955ed78529c0f69d6fd3ef6fac5537009548cdfe1cf8e47dc1fac8919fc3532e03453869968369f027c40dd4da513cfd84e58ffedaddd4b9d9fe67d28406be7
DIST basis_universal_1_15_update2.tar.gz 13283133 BLAKE2B 5400d23f86dd581da1bc96c1b95eae58f3c97b5412ad1d09d7f4ffd2ae7cae6cb14330795380e253579cc17f1ee16c91555229268219c300905da1420c0d8717 SHA512 a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32
DIST meshoptimizer-0.16.tar.gz 342571 BLAKE2B 2b4e244ea3676f109c904261d47bd0e7b2ad440f23d65325d34281ed13ac09657116c96b5a56860a0107479773b58c21018c8825b314f87a05bce38341fd75c1 SHA512 cc6d28359fb99a615e1046a4af1b247cbc6ea0266d9e7f41ea0516c1fc09fa1e67376071daf138a126c77bca3baf9d565636ed0e3adf045f1a08498c38b7a7e7
-EBUILD EmptyEpsilon-2022.03.16.ebuild 2844 BLAKE2B 475c559eb8741d6aafaf315dd837ca71d3cd82990c149a018cb2107390aa5542b899dc8fc1a6a10844dc281ac53d6aae99e0856889963b9d4fe8f510553dae32 SHA512 038c54763a17e43c7ff334fe5de2e748609064729f0cb66dbc53d1cd95cf8c7906d32c5f7eff80c3f2aeffebdccd10a998d4fabf1d2b209854bc9ae1015b1aa5
-EBUILD EmptyEpsilon-2022.10.28.ebuild 2765 BLAKE2B fba0c42d0d180e2389a5fe787e4798421095c5be8f91c9121e31082976821cf90f241347d809167dc607aced60f463ccc39c81d9234ac40bba89daa962adae0e SHA512 a69cea4a5c56c5c7451414babfb083630cc6bcae2fb3d83a3dc54cfb3eab644fc850d4c0d7e0201b6f4ad272f70c21a0f4afbf16cb5b4c137242562408175aa8
+EBUILD EmptyEpsilon-2022.10.28.ebuild 3587 BLAKE2B c718acc282ade604d546d7ed9757afa8ac8090167c3a20a955d1db37d7c890be3d860b17ae0a2ea17d3e2f727516fff7b7dfbadd5cb53c5f5a6d4e76292954d8 SHA512 1e726c1770e97b918dbeb0eb2b9726a1d76a16647af594cd4fe3bcb036ad70db7c3129f5e26770b55916ef41e50a88a52e377f6f13b62ad6b411bd56f0f88650
MISC metadata.xml 329 BLAKE2B 8473231ca386ac0a49c270619d7dbe528f578e6dafda3aff92309e947fdae58e6a09b8895e9f051dcf4f70854351756188463e2a987b03939eb41d3cc9346893 SHA512 75c1304961cb113e7957b9f40e091f343af41f7ab74ce59ad20840a883179e8123cc571f6cf45f77ca15bebadecee5e0ed945dc7eae614770b1f943fc195e7b2
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index cf12aa6d9e01..664d0cbf26c7 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
Binary files differ
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index d6baa8747564..0fd045a145da 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
Binary files differ
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 2e91d8a09385..db29177be39f 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -5,6 +5,6 @@ DIST extra-cmake-modules-5.102.0.tar.xz 330720 BLAKE2B 1f2036a3a9cf240afa822024d
DIST extra-cmake-modules-5.104.0.tar.xz 330988 BLAKE2B 9092045fe525f42647d426231997765fd7170b7768408b560af2599231a5183ec02314422deca2b1354cdfa291e1b16e29d3a368e97365e421c3945d763427e8 SHA512 63a3c4d66a07d48bf0a9ebe4fd009b5e043baee42d8a3f58b286e2b825250de05b896aa7e9c06f543eb29a12dd16be7ef5fb773c06477195cf6f018877805014
DIST extra-cmake-modules-5.105.0.tar.xz 330968 BLAKE2B 96ba9374e8cdf8cba016017a411f90e5faf3c5055ed4444eded3395dd586b3039f7e125ac2ccba0d20520f00ee8af642e094381d0ef71455b4269c17d1885146 SHA512 04de829d7b0d42eba010aad235d68cea7e0fc4970e5ca86bdf441630893887baefe20588ed8e2fbe5bcdd51cfc352e94192e642e7dac9932de8e8f99a1734ca1
EBUILD extra-cmake-modules-5.102.0.ebuild 1843 BLAKE2B b2933a9332c598b23d2111464284a69e2d31b0aa6e5f8e15f5ad00319d6357aa87286fc1e220296022291939e531d01b40d74ddb786689a9414f29d449c785e0 SHA512 db0f077d4048816189ea9c66c96f96d02bfdfb1598851fcd2b378036ad7de740a1d99c196b7739c9dfcf8f97db883515a041342ea39115320315b415c580d40b
-EBUILD extra-cmake-modules-5.104.0.ebuild 1847 BLAKE2B 4944a847a4651f0ac31424331400a855758a63bf31d06e609e6ca3cd75d11dbc9113e42e03d5475abe3a371f2b5d53b1e94808ba783e20f748f34b63d8321631 SHA512 658ac13b1145cbcb29993ebf16d27f849a6cd50b2452b7273ac31f4b835563a8aa292ec31b507ca09dbe4331d50c88712a837125c1a756c572e95f6df4e3df03
+EBUILD extra-cmake-modules-5.104.0.ebuild 1846 BLAKE2B 3b21d6f58a7d93ddf5a246dba95db12d48db9c1423427cd3d0a47ff4525f93b53f14191bbdf593555fb41f749f4606ecbd8b81e0794b7da6ed0680d59d97c515 SHA512 b9ea5a8301adc6be72b0ecac9594254adf6f29cb4d3d6164bfe63ebe24a8a8f19ef5fb74e78e4c63b7c5e8f35c9ab277051f1d3f35867129e10a781ba8a0cd45
EBUILD extra-cmake-modules-5.105.0.ebuild 1848 BLAKE2B 7d58e0a2cd4fdea3cdc0a4a87f245ea7b45bab483df1566796a024c11f9b61ea00c30087e10df3b1a5fd01901913624fad978445c432d02eb5d631bd870ea0de SHA512 1d50f3c6d04ffb9fdf1f6ccbd567cd733e7dfd6959a49cd15eb09d257a607e4cfa75949e58989835005bc1f2e603e90e16b7c8eaaa971424bb79c892da8fadf4
MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
index a96dc9fd82c8..77f27bf769d1 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9ea32f5e78ad..167d7c98f091 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 0c2bc7937b3f..210f6dcd82f1 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -3,6 +3,6 @@ DIST mcomix-2.0.2.tar.gz 515427 BLAKE2B 3f7b7a0788622173049169034a0a8ed3d3d5fb64
DIST mcomix-2.1.0.tar.gz 517070 BLAKE2B 71aa67b48ac4cc09f12516312a07c1688e3d9ba086e0af8fab0f22549814fc82841b30965b7ac4e90192086338414c50d253af2d37b158fea8fc2358cee3d3db SHA512 385654c48192c20e285a053a8a90f1e792d58f7adbb0960745f31703d2ff5906f5e5bfd868ebaa08dd27314543a761a255503e5d586edd1baa064ffcea0205ca
EBUILD mcomix-1.3.0_pre20211015.ebuild 1744 BLAKE2B 546324b50681f4ce3b9909e39efca2ef61e178efd637219e9157a41ee15bd693af63c5c8f9ebfac31ae3446f73c8fb451c385b26a82e8a45ef559582076cc28d SHA512 2b8f4cfd716f9b5205754e7ec54b3512169e49f64cbfcbda99150f14e8e245d513781430676fb8824290fc2e1b9e9ddb5deec19826d725ef441e3ca9229f5e16
EBUILD mcomix-2.0.2-r1.ebuild 1110 BLAKE2B 574e122d0a622e2687ba6925347f3f9b4d9fed85a97738c39603eff4aac5c282a622134dcfdaa8eb2b4e6c6dbaf05ed29590206957dd4559bf943c9fa2482843 SHA512 82d7d5cd61e753765a3870516a694883f2bb0d276c7f53a5b1428acfbd76ad6cc59b3141714237a85b4fb4a7a424a0c36dc6242a66d1644737f2a2b358b3b479
-EBUILD mcomix-2.1.0.ebuild 1110 BLAKE2B 574e122d0a622e2687ba6925347f3f9b4d9fed85a97738c39603eff4aac5c282a622134dcfdaa8eb2b4e6c6dbaf05ed29590206957dd4559bf943c9fa2482843 SHA512 82d7d5cd61e753765a3870516a694883f2bb0d276c7f53a5b1428acfbd76ad6cc59b3141714237a85b4fb4a7a424a0c36dc6242a66d1644737f2a2b358b3b479
+EBUILD mcomix-2.1.0.ebuild 1109 BLAKE2B 1a0c9bf3cf215e3568f4894dfa2c3eced7e7cafc4a96b2b4dcf09e0e00669d043bff0d31f48e41c7d182508acc23a508f2ebc3a605571e2498a49c1aafdff663 SHA512 438b5b9bdcf53ab36b8509ba621eb44b47ba292b78c78d69ace564b258769265a297a395bb0a86afee0c571cf6ce361cda1d1ae9e97fccdbb52aa17262fd76f9
EBUILD mcomix-9999.ebuild 1095 BLAKE2B d01ec9ae161b0b2d7f3ca6dd4844a0c0e457937851661089e56a769ab714a4a931be7d877f7ecb10fe80c04f3d53066dd1a610f9f25ebd67cd5e0a4e9f3c65fa SHA512 0c584488b6906fc29d17e8a959c2afb92e63e940ab490d6bac828c0982d83969922ebc40d6e8ae3b658a1e91742649c2e0a5f34ec8fbafa33552456f9d96812c
MISC metadata.xml 339 BLAKE2B 16c122a9f4454ff61d2b777e14de1bf321ba4d98aadd3284f88a13419bac2cdb227bd1001ef6960aaaa183b3e2f86f2d7b5a555aa9a17a6ad1f9e46db2657609 SHA512 a66ff965443f30fe9c647a760359ee71b4ed9cbe5ff684979fb547823bf1ae5ffbf8cd4128afdfef13d07c03e953ed5495b9e80526ec01a0e53b66b1b0f2e6dc
diff --git a/media-gfx/mcomix/mcomix-2.1.0.ebuild b/media-gfx/mcomix/mcomix-2.1.0.ebuild
index 76304676162c..1cfb05564ec3 100644
--- a/media-gfx/mcomix/mcomix-2.1.0.ebuild
+++ b/media-gfx/mcomix/mcomix-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index eb1afc566229..5a42ab6cd516 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 7148c4a77391..a2b6e6490658 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,9 +1,6 @@
-AUX rubberband-3.1.1-build.patch 6812 BLAKE2B bbc737c3721fcecbe133acda980c31d90fd0009d697e5dfdbdc38ab47bc381ce8ce65bbde011a6974f363c69fe33b22daf6a8d4a950b113dc905e5fce9b01465 SHA512 d6bfd803cdead6b1b744bc980258e8e41752ea3e2caeb8a6b8ccba0b1d1ddee3cdb5d580a13ee4316dc26310b3fed4dc11e832e55371624c7ba0676518089158
-DIST rubberband-3.1.1.tar.bz2 217586 BLAKE2B 17f616eab563f0949dc89103775dac2c932b8ade79e7445524c87d9ced46ecd30d9cff53960e2638ce571c1f6ddbc9ad50e7371900b96eb0ec22c58cc80e585e SHA512 240ad6cd486f975099f76c6ac8bcf34add45670f58164089ffc9767ebef4c7dfdd7e58ad0c3d99a96f56af0d1f7669e55c5fc3e79277357c62fba21cb3bfe4cd
DIST rubberband-3.1.2.tar.bz2 218361 BLAKE2B 26d2850adea8b564e49ce1eb24abcd9cd83d20a5eda6bcfc1254b3357a0e720b04faa9e9f2de769b65f6449afe138de9051505f745f69a73cc1275786029838c SHA512 b21605a0cf882e34fc2eada38a446220257e4b067475e36dfeef00d491425ad51398fbb49773dbd162683531b70f7c864ab02bff744d7e0dde7ed1d64aa1d327
DIST rubberband-3.1.3.tar.bz2 218532 BLAKE2B edc9ada6a67af2b45f15a6240b46d77830068595f5b873b50b55e91be29abc30600025713e7bd84e99d05ea1d0fcdb36873cbf966b00d7e805cfea99a4462e1d SHA512 c7e42020c543b1741e1d3e7ad79f92081177953f63a8b7b1c302a185cb7a0b828d9519e03a6df39c1cff356b324370313501df54bc74be32dcdb955c789b6485
DIST rubberband-3.2.1.tar.bz2 221756 BLAKE2B 6b2bb540037495892907285561982b2f87affa60b6ad84315654e92f3321be097dfc23fec9dde6eb9e3a7a3e38d6e3126f683dc88f442845722f321ddeb8c24d SHA512 c2278d874ebaeafa2ff6be4bdd3dea40235debce7ced8b93f1b73a93b5796b77ee5f6024cb539776f11bd936c2f100c084d7e91c006e81c1e6f3cf5eff602cbf
-EBUILD rubberband-3.1.1-r1.ebuild 1777 BLAKE2B 006f2b1e51b9445703d547d8a8bbf5c0b793ab824738bbf9274b4b7acaf11b982f6bf52db67e982359c8b8456927d2a320889faefde2e92b6de8f3b9a0a95a28 SHA512 e42edbfa26c594a74acdf6230fc6f60fe7b4c928c698216e327c1528039c4c6238d69dd79c227ad3211ab96ea981e94ba67dd185bcbb407db5aada1b8d4d5e75
EBUILD rubberband-3.1.2.ebuild 2427 BLAKE2B e9f5ab31106e27cd132d71a7d7736d1656fd991c9d8b3da13e8e09074d7cfa70556feabcf4601827e6b061ae27ac2d5ad63e7bb785b1cc660fa1ff1ec2b06339 SHA512 916d3e687b46cbd5a4298fa46fc971ef3157f5b67ed05b81f837d72015eb278e2598e78d82e7d796d5f580acfa4e13a4b9766fb81f1b2e19aac516443cd05fae
EBUILD rubberband-3.1.3.ebuild 2433 BLAKE2B cf669664027b15cf972e5a500adce631e7dbeaba4ac8aaf59eeb3434c285f45fe31fee8a052fbb182e7d061d2ecc1d3cab91a960c6853c488117018c38cd6e7e SHA512 4abfae1b4fdcc8ecb23358e30968529525f910d0f05540270e5ada1b0d1eca179e27d105a042f892203ac8b0d440861cb2c4660d6b382e518516b5332088f2d7
EBUILD rubberband-3.2.1.ebuild 2433 BLAKE2B cf669664027b15cf972e5a500adce631e7dbeaba4ac8aaf59eeb3434c285f45fe31fee8a052fbb182e7d061d2ecc1d3cab91a960c6853c488117018c38cd6e7e SHA512 4abfae1b4fdcc8ecb23358e30968529525f910d0f05540270e5ada1b0d1eca179e27d105a042f892203ac8b0d440861cb2c4660d6b382e518516b5332088f2d7
diff --git a/media-libs/rubberband/files/rubberband-3.1.1-build.patch b/media-libs/rubberband/files/rubberband-3.1.1-build.patch
deleted file mode 100644
index 9dce52ec5e03..000000000000
--- a/media-libs/rubberband/files/rubberband-3.1.1-build.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -117,12 +117,18 @@ sleef_dep = dependency('sleef', version: '>= 3.3.0', required: false)
- sleefdft_dep = dependency('sleefdft', version: '>= 3.3.0', required: false)
- samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
- speexdsp_dep = dependency('speexdsp', version: '>= 1.0.0', required: false)
--sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
--vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+if get_option('programs')
-+ sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: true)
-+endif
-+if get_option('vamp')
-+ vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: true)
-+endif
-
- boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: false)
- thread_dep = dependency('threads')
--have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+if get_option('ladspa')
-+ have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+endif
- have_lv2 = cpp.has_header('lv2.h', args: extra_include_args)
- have_sincos = cpp.has_function('sincos',
- prefix: '#define _GNU_SOURCE\n#include <math.h>',
-@@ -142,8 +148,9 @@ have_sincos = cpp.has_function('sincos',
- # language pack, optionally, and only go on to JNI if that succeeds,
- # making sure that nothing "clever" happens if Java is not found.
- #
--have_java = add_languages('java', required: false)
--if have_java
-+if get_option('jni')
-+ javac = find_program('javac', required: false)
-+ jar = find_program('jar', required: true)
- jni_dep = dependency('jni', version: '>= 7.0.0', required: false)
- if not jni_dep.found()
- if cpp.has_header('jni.h', args: extra_include_args)
-@@ -370,37 +377,41 @@ if ipp_needed
- endif
- endif # ipp_needed
-
--if not vamp_dep.found()
-- vamp_dep = cpp.find_library('VampPluginSDK',
-- dirs: get_option('extra_lib_dirs'),
-- has_headers: ['vamp-sdk.h'],
-- header_args: extra_include_args,
-- required: false)
-+if get_option('vamp')
- if not vamp_dep.found()
-- vamp_dep = cpp.find_library('vamp-sdk',
-+ vamp_dep = cpp.find_library('VampPluginSDK',
- dirs: get_option('extra_lib_dirs'),
- has_headers: ['vamp-sdk.h'],
- header_args: extra_include_args,
- required: false)
-+ if not vamp_dep.found()
-+ vamp_dep = cpp.find_library('vamp-sdk',
-+ dirs: get_option('extra_lib_dirs'),
-+ has_headers: ['vamp-sdk.h'],
-+ header_args: extra_include_args,
-+ required: false)
-+ endif
- endif
-+ have_vamp = true
- endif
--have_vamp = vamp_dep.found()
-
--if not sndfile_dep.found()
-- sndfile_dep = cpp.find_library('sndfile',
-- dirs: get_option('extra_lib_dirs'),
-- has_headers: ['sndfile.h'],
-- header_args: extra_include_args,
-- required: false)
-+if get_option('programs')
- if not sndfile_dep.found()
-- sndfile_dep = cpp.find_library('sndfile-1',
-+ sndfile_dep = cpp.find_library('sndfile',
- dirs: get_option('extra_lib_dirs'),
- has_headers: ['sndfile.h'],
- header_args: extra_include_args,
- required: false)
-+ if not sndfile_dep.found()
-+ sndfile_dep = cpp.find_library('sndfile-1',
-+ dirs: get_option('extra_lib_dirs'),
-+ has_headers: ['sndfile.h'],
-+ header_args: extra_include_args,
-+ required: false)
-+ endif
- endif
-+ have_sndfile = true
- endif
--have_sndfile = sndfile_dep.found()
-
- have_boost_unit_test = boost_unit_test_dep.found()
-
-@@ -609,7 +620,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li
- )
- endif
-
--if have_java and jni_dep.found()
-+if get_option('jni')
- target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
- message('Will build Java Native Interface')
- rubberband_jni = shared_library(
-@@ -630,14 +641,21 @@ if have_java and jni_dep.found()
- # NB the JNI library is not versioned
- install: true,
- )
-- jar('rubberband', 'com/breakfastquay/rubberband/RubberBandStretcher.java')
-+ rubberband_class = custom_target(
-+ 'rubberband_class',
-+ input: 'com/breakfastquay/rubberband/RubberBandStretcher.java',
-+ output: 'RubberBandStretcher.class',
-+ command: [ javac, '@INPUT@', '-d', '@OUTDIR@' ],
-+ )
-+ rubberband_jar = custom_target(
-+ 'rubberband_jar',
-+ input: rubberband_class,
-+ output: 'rubberband.jar',
-+ command: [ jar, 'cvf', '@OUTPUT@', 'com/breakfastquay/rubberband/@INPUT@' ],
-+ build_by_default: true,
-+ )
- else
- target_summary += { 'JNI library': false }
-- if not have_java
-- message('Not building Java Native Interface: Java compiler or archiver missing')
-- else
-- message('Not building Java Native Interface: JNI header not found')
-- endif
- endif
-
- install_headers(
-@@ -647,7 +665,7 @@ install_headers(
- subdir: 'rubberband'
- )
-
--if have_ladspa
-+if get_option('ladspa')
- target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
- message('Will build LADSPA plugin')
- rubberband_ladspa = shared_library(
-@@ -714,7 +732,7 @@ else
- message('Not building LV2 plugin: lv2.h header not found')
- endif
-
--if have_vamp
-+if get_option('vamp')
- target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
- message('Will build Vamp plugin')
- rubberband_vamp = shared_library(
-@@ -746,7 +764,7 @@ else
- message('Not building Vamp plugin: Vamp dependency not found')
- endif
-
--if have_sndfile
-+if get_option('programs')
- message('Will build command-line utilities')
- target_summary += { 'Command-line utility (R2)': [ true, 'Name: ' + rubberband_program_name ] }
- rubberband_program = executable(
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -26,3 +26,18 @@ option('extra_lib_dirs',
- value: [],
- description: 'Additional local library directories to search for dependencies.')
-
-+option('jni',
-+ type: 'boolean',
-+ value: 'false')
-+
-+option('ladspa',
-+ type: 'boolean',
-+ value: 'false')
-+
-+option('programs',
-+ type: 'boolean',
-+ value: 'false')
-+
-+option('vamp',
-+ type: 'boolean',
-+ value: 'false')
diff --git a/media-libs/rubberband/rubberband-3.1.1-r1.ebuild b/media-libs/rubberband/rubberband-3.1.1-r1.ebuild
deleted file mode 100644
index 3488f7ac50cd..000000000000
--- a/media-libs/rubberband/rubberband-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://www.breakfastquay.com/rubberband/"
-SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="ladspa jni static-libs +programs vamp"
-
-BDEPEND="
- virtual/pkgconfig
-"
-CDEPEND="
- media-libs/libsamplerate[${MULTILIB_USEDEP}]
- sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
- jni? ( >=virtual/jdk-1.8:* )
- ladspa? ( media-libs/ladspa-sdk )
- programs? ( media-libs/libsndfile )
- vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${CDEPEND}
- sys-devel/gcc:*
-"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-multilib_src_configure() {
- if use ppc ; then
- # bug #827203
- # meson doesn't respect/use LIBS but mangles LDFLAGS with libs
- # correctly. Use this until we get a Meson test for libatomic.
- append-ldflags -latomic
- elif tc-is-clang && [[ $(tc-get-cxx-stdlib) == libstdc++ ]] ; then
- # bug #860078
- # undefined reference to `__atomic_is_lock_free'
- append-ldflags -latomic
- fi
-
- local emesonargs=(
- --buildtype=release
- -Dfft=fftw
- -Dresampler=libsamplerate
- -Ddefault_library=$(use static-libs && echo "both" || echo "shared")
- $(meson_use ladspa)
- $(meson_use jni)
- $(meson_use programs)
- $(meson_use vamp)
- )
- use jni && emesonargs+=(
- -Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
- )
- meson_src_configure
-}
-
-multilib_src_install_all() {
- ! use jni && find "${ED}" -name "*.a" -delete
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2222fcd8ba11..2bce9c36e5e3 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
Binary files differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 74d491312ee1..9f9e005a2c70 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Apr 2023 04:10:05 +0000
+Thu, 20 Apr 2023 10:09:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f87b3349d76e..011da43e612a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-20T04:10:10Z
+TIMESTAMP 2023-04-20T10:09:56Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAuyJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRBD3RfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBI0hAArUu793zUBj9019n2QmgbI0zQEEeBLyqby444EqvKFRvcax/9qWdQG1BN
-TuUGK+H6l4/d13UgQnObZ6pYEGuP7pXUMpQigGojbdksXWaVC4qinHdCAERkQENT
-jD8q/E3/JFS8V6nJ5utM6wcTwB2dhFcACrcOlr1gSduSUyeB3/h6fSJ9K+8N3zfZ
-Yb625zLlYgAc08XElbR6foawR98rPS7iDjmpuWTrBFVhUqOGGf0gAROOvtf1Pijm
-j04vp1yOJQMa72PfbVEfWyHYKdJ7KppowMyjjrDcGhOQQnMn3HdGeAeCv4BPPgkf
-Z5RQzmGVNpMlk9NVRPLnZNDSLBoSSihgsH1vsaDso4uwnbrBy9nY8U11m+RWNLK7
-QOevg0roa+bQoKyVc2KTIRSuS+s5n/BwVWvy4hZl/QKuR8bdvpSYpTz9leCkIxQ4
-CZXP8YC367pA8XkhN+OpCu0izYhDDtWYjvUDJvYqJDPdypfnd2JMhG9Bxwb3a4Tg
-t7EgbyDcw9EFbZuvAmE/m6fFiDeOTFj97D73K+x00lLRq5vtCnSySIxmT2TbSHpy
-lr3L/fVxJQ2serztsuL/7ZfQ1xnUhgSjz4yZE1LeuJK0Ej99UKjgWiU9EHviW/Dh
-eDVVtaUrgc2/1WUqVJuvEMuNYJJw5Rj4dQiY/uHrejQTZyDQ5qc=
-=h8XC
+klAPlg/+NyPLjV3oHBNRzqhraKO0P1fAfylZ3tZHtVBZ6OxH1GdGh9e7MVI7EvFm
+xii94zUrok7xzoqtQ49YaiN7o0dupD2/87h75nTL3otYD62rIWDxEeb6Y9hjvXwI
+4Wkc1zNABihEW168QoJODhg9o6mYT0fX+LHg87IddtoAHpw+xWYo2HuIjBjKfGuU
+ClZ87tt3U6VQQckcGZArzPJCsJSByhiDKzVpx39ePxlFtyod+0KSn3XfKIXDPwm0
+HnfdrevMF9DxCRxVLGjVRRlpi2ILzocgo6GKP1AgQ9+XVHEc1FwrMiye+BLAH9mR
+PX8T2vWwTZu5lZ/4VY0mv7xQGKKgjvJPmg5BeDGWbmEjBWbj3yoXO2OOiZ1JS40h
+r8MA5azCOCIqYPX3J4P3RiRAao77q6o6el1r2172e+qHyzq+U4I1kC4uCkmN3Fjq
+fOVlqHnNy45Q97pCJBKVgG2NNnhrU2o6k339GF7aWTLZKJcQnKXVDPWkBb0XijAF
+DN73aTNNgm2IjuRyGISAihMA7Z5lhe4ZT6dMfu/tylmFdAXFXOP2LHDChQHLTWg7
+o8ZIDgTFj+iljDCTNEitJMgCC8QzXUAINSM/BVBWP2HjelEfdgRQ33IZ+UnaH6th
+dIR9YXZAV+/yCNEH7Nu/wZdl2G5lWQw/+O65gAx1Rts3qQ/3lMk=
+=d9qy
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 74d491312ee1..9f9e005a2c70 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Apr 2023 04:10:05 +0000
+Thu, 20 Apr 2023 10:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index dbe2a93b4343..eae3488d6240 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 61aed3e468c9..eeaaa6f376fe 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3 b/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
index 27f9fca0442d..ed3593268f5e 100644
--- a/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
+++ b/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://github.com/docker/compose
INHERIT=bash-completion-r1 distutils-r1
IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm64
+KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
RDEPEND=>=dev-python/distro-1.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/docker/compose/archive/1.29.2.tar.gz -> docker-compose-1.29.2.gh.tar.gz
_eclasses_=bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-r1 3c6cd0f418ba702c186a9865b85e704d python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=a1ce608e3ae9749fcb6361ca5f51ec30
+_md5_=e34634c63285c3bbc13bb09ce4ee25cf
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 4ca0cc7a5176..01e6bbbbb4a2 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0 b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
index 26a42eec9a35..b74a897b63d8 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
+++ b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=Display icons for ivy buffers in Emacs
EAPI=8
HOMEPAGE=https://github.com/seagle0128/all-the-icons-ivy-rich/
INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-3+
RDEPEND=app-emacs/all-the-icons app-emacs/ivy-rich >=app-editors/emacs-25.3:*
SLOT=0
SRC_URI=https://github.com/seagle0128/all-the-icons-ivy-rich/archive/v1.9.0.tar.gz -> all-the-icons-ivy-rich-1.9.0.tar.gz
_eclasses_=elisp 7190c722d9e06fabcae26ef1e1dc9183 elisp-common dcd21c5d379fc2217e95f529504c5fe0
-_md5_=1abcecefea133ea7b444564f5eeb1d13
+_md5_=b684ac6e383c09e65b9cb8c54e9c42b0
diff --git a/metadata/md5-cache/app-emacs/citar-1.2.0 b/metadata/md5-cache/app-emacs/citar-1.2.0
index 824adffa6a4e..188cfefabd40 100644
--- a/metadata/md5-cache/app-emacs/citar-1.2.0
+++ b/metadata/md5-cache/app-emacs/citar-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Emacs package to quickly find and act on bibliographic references
EAPI=8
HOMEPAGE=https://github.com/emacs-citar/citar/
INHERIT=elisp
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=GPL-3+
RDEPEND=app-emacs/citeproc-el app-emacs/parsebib >=app-editors/emacs-27.1:*
SLOT=0
SRC_URI=https://github.com/emacs-citar/citar/archive/v1.2.0.tar.gz -> citar-1.2.0.tar.gz
_eclasses_=elisp 7190c722d9e06fabcae26ef1e1dc9183 elisp-common dcd21c5d379fc2217e95f529504c5fe0
-_md5_=82fee0ea12c18b1763419245aa1e38e8
+_md5_=fca572a3418d6d685f8cb2dfccd15ead
diff --git a/metadata/md5-cache/app-emacs/projectile-2.7.0 b/metadata/md5-cache/app-emacs/projectile-2.7.0
index bc9badc05d2c..ced7c5520135 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.7.0
+++ b/metadata/md5-cache/app-emacs/projectile-2.7.0
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://docs.projectile.mx https://github.com/bbatsov/projectile/
INHERIT=elisp
IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~arm ~arm64
LICENSE=GPL-3+
RDEPEND=>=app-editors/emacs-25.3:*
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/bbatsov/projectile/archive/v2.7.0.tar.gz -> projectile-2.7.0.tar.gz
_eclasses_=elisp 7190c722d9e06fabcae26ef1e1dc9183 elisp-common dcd21c5d379fc2217e95f529504c5fe0
-_md5_=4ad66eae66bf2c07ddeb71c1ebe7dbc6
+_md5_=2383bace90955d44d78eb0ab58a8ba98
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index aa9cae53e19f..aaa969813fbb 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-2.2.0 b/metadata/md5-cache/app-misc/resolve-march-native-2.2.0
index c5ad2c4fbef1..8ed9e857235d 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-2.2.0
+++ b/metadata/md5-cache/app-misc/resolve-march-native-2.2.0
@@ -5,7 +5,7 @@ EAPI=8
HOMEPAGE=https://github.com/hartwork/resolve-march-native
INHERIT=distutils-r1
IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-2+
RDEPEND=>=sys-devel/gcc-4.2 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/hartwork/resolve-march-native/archive/2.2.0.tar.gz -> resolve-march-native-2.2.0.tar.gz
_eclasses_=distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-r1 3c6cd0f418ba702c186a9865b85e704d python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=1011b1eab6bb25d9bb29f1001e2c8e84
+_md5_=3a2f3be1d658d782af3bc3fc30306ef0
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 07fe3b29e9d1..83e37f854731 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.9-r3 b/metadata/md5-cache/app-portage/elogv-0.7.9-r3
index ca4f25a12a42..f33c72ab4982 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.9-r3
+++ b/metadata/md5-cache/app-portage/elogv-0.7.9-r3
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://gitweb.gentoo.org/proj/elogv.git/
INHERIT=distutils-r1
IUSE=l10n_de l10n_es l10n_it l10n_pl python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses] )
REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
SLOT=0
SRC_URI=https://github.com/gentoo/elogv/archive/0.7.9.tar.gz -> elogv-0.7.9.tar.gz
_eclasses_=distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-r1 3c6cd0f418ba702c186a9865b85e704d python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=8c25327ace1b640e56150f2f37cddd90
+_md5_=509eb4e5493fdf0518c4d7f8f4e1aff1
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.3-r2 b/metadata/md5-cache/app-portage/metagen-0.7.3-r2
index ed0198f78999..3fc1b61bbba9 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.3-r2
+++ b/metadata/md5-cache/app-portage/metagen-0.7.3-r2
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
INHERIT=distutils-r1 pypi
IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
SLOT=0
SRC_URI=https://files.pythonhosted.org/packages/source/m/metagen/metagen-0.7.3.tar.gz
_eclasses_=distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 3b6a844fbf71f1581992b44c78b549b7 python-r1 3c6cd0f418ba702c186a9865b85e704d python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=6d4a14e4ab23cc13a72cda858c9db3d4
+_md5_=173b4b861d526deea536e639953a2df0
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index b00640863c86..0ab66105a427 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-text/crengine-ng-0.9.8 b/metadata/md5-cache/app-text/crengine-ng-0.9.8
new file mode 100644
index 000000000000..4031e8ac7ac7
--- /dev/null
+++ b/metadata/md5-cache/app-text/crengine-ng-0.9.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
+DESCRIPTION=Cross-platform library designed to implement e-book readers
+EAPI=8
+HOMEPAGE=https://gitlab.com/coolreader-ng/crengine-ng
+INHERIT=cmake
+IUSE=+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
+SLOT=0/5
+SRC_URI=https://gitlab.com/coolreader-ng/crengine-ng/-/archive/0.9.8/crengine-ng-0.9.8.tar.bz2
+_eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg-utils baea6080dd821f5562d715887954c9d3
+_md5_=255462c4ecaf1ec037e44cca2fd4e134
diff --git a/metadata/md5-cache/app-text/crqt-ng-1.0.11 b/metadata/md5-cache/app-text/crqt-ng-1.0.11-r1
index 84b2765a4131..0bcda099302e 100644
--- a/metadata/md5-cache/app-text/crqt-ng-1.0.11
+++ b/metadata/md5-cache/app-text/crqt-ng-1.0.11-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
DESCRIPTION=Cross-platform e-book reader
EAPI=8
@@ -8,8 +8,8 @@ INHERIT=cmake plocale xdg
IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
-RDEPEND=>=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+RDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gitlab.com/coolreader-ng/crqt-ng/-/archive/1.0.11/crqt-ng-1.0.11.tar.bz2
_eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 plocale 950fbaec7deeba41b5bcc0572cca99b9 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=4babf4a1be604e1b1a44df91687c8305
+_md5_=341f13ec43df96082c37586affe396be
diff --git a/metadata/md5-cache/app-text/crwx-ng-0.2.0-r2 b/metadata/md5-cache/app-text/crwx-ng-0.2.0-r3
index 1e42b7bfa9d1..cac33400580d 100644
--- a/metadata/md5-cache/app-text/crwx-ng-0.2.0-r2
+++ b/metadata/md5-cache/app-text/crwx-ng-0.2.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Cross-platform e-book reader
EAPI=8
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/coolreader-ng/crwx-ng
INHERIT=cmake wxwidgets
IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] virtual/ttf-fonts
+LICENSE=GPL-2+
+RDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] virtual/ttf-fonts
SLOT=0
SRC_URI=https://gitlab.com/coolreader-ng/crwx-ng/-/archive/0.2.0/crwx-ng-0.2.0.tar.bz2
_eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e wxwidgets 9a707a3f9f1ea7aa703b1e46552291e5 xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=c9b31838f444b18a139fca03564c50f3
+_md5_=68aecebd19d43aaee16bb2a0b9110644
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index c7b26a6bcd87..8aa103b03164 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r6 b/metadata/md5-cache/dev-java/commons-logging-1.2-r6
deleted file mode 100644
index 291ac7e5e59c..000000000000
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/jakarta-servlet-api:4 ) >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An ultra-thin bridge between different Java logging libraries
-EAPI=8
-HOMEPAGE=https://commons.apache.org/logging/
-INHERIT=java-pkg-2 java-ant-2 java-osgi
-IUSE=avalon-framework avalon-logkit log4j servletapi test doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/jakarta-servlet-api:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-REQUIRED_USE=doc? ( avalon-framework avalon-logkit log4j servletapi )
-RESTRICT=!test? ( test ) !servletapi? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=java-ant-2 5a1b508f2544b7cac8ec27c170676de0 java-osgi c82db640aeccac34f009e90c7bb10a81 java-pkg-2 1794573de2f5124d88b64ee5dc9aabb4 java-utils-2 8c72ea36a4935f626b13a30141d0d39c multilib d1408425c7c4a7669b9b17735404b693 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=8e5b2fdebc8ca72e7d1ed312eb10aa52
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319 b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
index 0b8247295fa4..21330ffdd942 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
+++ b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://commons.apache.org/proper/commons-logging/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=log4j doc source test
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/apache/commons-logging/archive/d376d3128663e53de4af948e161291e7ec0c6ec1.tar.gz -> commons-logging-1.3.0_pre20230319.tar.gz
_eclasses_=java-pkg-2 1794573de2f5124d88b64ee5dc9aabb4 java-pkg-simple 7dacd744ab3fb5ec581318fefaa7a9e5 java-utils-2 8c72ea36a4935f626b13a30141d0d39c
-_md5_=909b2811569b04162a94292f6bab3b4b
+_md5_=fb1920203df026e8ee7d050ef3186bae
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.7 b/metadata/md5-cache/dev-java/maven-bin-3.8.7
deleted file mode 100644
index b424d51cb497..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=8
-HOMEPAGE=https://maven.apache.org/
-INHERIT=java-pkg-2
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=3.8
-SRC_URI=mirror://apache/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.tar.gz
-_eclasses_=java-pkg-2 1794573de2f5124d88b64ee5dc9aabb4 java-utils-2 8c72ea36a4935f626b13a30141d0d39c
-_md5_=ee8fd3e2203a061a7921f026d8c4ce99
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 498460c362a1..d984b243123f 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-lua/luasec-1.3.1 b/metadata/md5-cache/dev-lua/luasec-1.3.1
index 6964baa65963..e48dbade5534 100644
--- a/metadata/md5-cache/dev-lua/luasec-1.3.1
+++ b/metadata/md5-cache/dev-lua/luasec-1.3.1
@@ -6,10 +6,10 @@ EAPI=8
HOMEPAGE=https://github.com/brunoos/luasec
INHERIT=lua toolchain-funcs
IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
LICENSE=MIT
RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r103[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
SLOT=0
SRC_URI=https://github.com/brunoos/luasec/archive/v1.3.1.tar.gz -> luasec-1.3.1.tar.gz
_eclasses_=lua 8f9406bfff123a92ad04e4ace3e7f89b lua-utils d37a16dbcc1f07f71bc48da75ed7a0cb multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=5407e43486ea9592d1a64901b74a4d0d
+_md5_=af7eaacacf14f6f8e8ef312203c6b30f
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.10 b/metadata/md5-cache/dev-lua/mpack-1.0.10
index 4c749eccdb43..e78cb8aa5eab 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.10
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.10
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://github.com/libmpack/libmpack-lua/
INHERIT=lua toolchain-funcs
IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
LICENSE=MIT
RDEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.10.tar.gz -> mpack-1.0.10.tar.gz
_eclasses_=lua 8f9406bfff123a92ad04e4ace3e7f89b lua-utils d37a16dbcc1f07f71bc48da75ed7a0cb multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=8fa273ce7221af344e27d7d1166ee0f1
+_md5_=d1756e4a5d2737fc6a6483bb969bb522
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f93d6dfaf258..fbaab30f381e 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.71.0 b/metadata/md5-cache/dev-python/hypothesis-6.71.0
index f56aa99d56ee..4818fd68f13c 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.71.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.71.0
@@ -5,7 +5,7 @@ EAPI=8
HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
INHERIT=distutils-r1 multiprocessing optfeature
IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
LICENSE=MPL-2.0
RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.71.0.tar.gz -> hypothesis-6.71.0.gh.tar.gz
_eclasses_=distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-r1 3c6cd0f418ba702c186a9865b85e704d python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=d24acb6f6f27019938b39608b6ce5f4e
+_md5_=74b8b75db521ea4c4ab6dfb5214a2b1e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d06978842bfb..6a3c95d49c59 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-util/ydiff-1.2-r1 b/metadata/md5-cache/dev-util/ydiff-1.2-r1
index 8ae2702de95c..d700cd611197 100644
--- a/metadata/md5-cache/dev-util/ydiff-1.2-r1
+++ b/metadata/md5-cache/dev-util/ydiff-1.2-r1
@@ -5,7 +5,7 @@ EAPI=8
HOMEPAGE=https://github.com/ymattw/ydiff
INHERIT=distutils-r1 pypi
IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=sys-apps/less python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://files.pythonhosted.org/packages/source/y/ydiff/ydiff-1.2.tar.gz
_eclasses_=distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 3b6a844fbf71f1581992b44c78b549b7 python-r1 3c6cd0f418ba702c186a9865b85e704d python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=a97827ae239f8f158003264915dc3368
+_md5_=072ef8136ed1f341195cfbcf5be5d17e
diff --git a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16 b/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
deleted file mode 100644
index 227025cdcc11..000000000000
--- a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=dev-cpp/nlohmann_json media-libs/freetype media-libs/libsdl2 >=media-libs/glm-0.9.9.8
-DESCRIPTION=A spaceship bridge simulator game
-EAPI=8
-HOMEPAGE=https://daid.github.io/EmptyEpsilon/
-INHERIT=cmake toolchain-funcs
-KEYWORDS=amd64
-LICENSE=Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT
-RDEPEND=dev-cpp/nlohmann_json media-libs/freetype media-libs/libsdl2 >=media-libs/glm-0.9.9.8
-SLOT=0
-SRC_URI=https://github.com/daid/EmptyEpsilon/archive/EE-2022.03.16.tar.gz -> EmptyEpsilon-2022.03.16.tar.gz https://github.com/daid/SeriousProton/archive/EE-2022.03.16.tar.gz -> SeriousProton-2022.03.16.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_update2.tar.gz -> basis_universal_1_15_update2.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16.tar.gz -> meshoptimizer-0.16.tar.gz
-_eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=eeaceee6ea159c7221f29a57ed7e7b82
diff --git a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28 b/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
index b722ad2e13eb..18f54a143a7c 100644
--- a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
+++ b/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
@@ -9,6 +9,6 @@ KEYWORDS=amd64
LICENSE=Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT
RDEPEND=dev-cpp/nlohmann_json media-libs/freetype media-libs/libsdl2 >=media-libs/glm-0.9.9.8
SLOT=0
-SRC_URI=https://github.com/daid/EmptyEpsilon/archive/EE-2022.10.28.tar.gz -> EmptyEpsilon-2022.10.28.tar.gz https://github.com/daid/SeriousProton/archive/EE-2022.10.28.tar.gz -> SeriousProton-2022.10.28.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_update2.tar.gz -> basis_universal_1_15_update2.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16.tar.gz -> meshoptimizer-0.16.tar.gz
+SRC_URI=https://github.com/daid/EmptyEpsilon/archive/EE-2022.10.28.tar.gz -> EmptyEpsilon-2022.10.28.tar.gz https://github.com/daid/SeriousProton/archive/EE-2022.10.28.tar.gz -> SeriousProton-2022.10.28.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_update2.tar.gz -> basis_universal_1_15_update2.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16.tar.gz -> meshoptimizer-0.16.tar.gz https://github.com/Flowdalic/SeriousProton/commit/dc9dccf6c802b9c55ac4eccad424d2b1af9f4b93.patch -> SeriousProton-2022.10.28-add-missing-cstdint-include.patch https://github.com/daid/SeriousProton/commit/3bb7f1cfbd91a4520ff23af7d761e08b5ca7cf88.patch -> SeriousProton-2022.10.28-lua-fix-underlinking.patch https://github.com/daid/EmptyEpsilon/commit/5d7e7bba4daadeeb05897349d518a8d9568331cc.patch -> EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch
_eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=8dde06a12bb22ae98d3437f97d65388f
+_md5_=0453e894d2eaea15660c1b21b443dc9c
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 764b4e35081d..6581d7a713f1 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 7466124ef187..d15e64e9f556 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
index ee2a12c338f1..a8028f351f1a 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
INHERIT=cmake frameworks.kde.org python-any-r1
IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86
LICENSE=BSD
RDEPEND=app-arch/libarchive[bzip2]
RESTRICT=!test? ( test )
SLOT=5/5.104
SRC_URI=mirror://kde/stable/frameworks/5.104/extra-cmake-modules-5.104.0.tar.xz
_eclasses_=cmake 7fb5980de96325cbab639f5b2187357c flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a frameworks.kde.org 6556398a532490b4d6d03158a82e455a kde.org dc60243572471279b11120514b85b558 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 python-any-r1 d2955aaac8daaaa69fcc6dc93ed19f29 python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=b5a4df1ffb7cce852d0b262f61267bdb
+_md5_=3545a32322622e9dcc22bfb247730587
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7ce383bb0695..8a9244284ea6 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-gfx/mcomix-2.1.0 b/metadata/md5-cache/media-gfx/mcomix-2.1.0
index 03f5b9aa47ad..9a83e5750070 100644
--- a/metadata/md5-cache/media-gfx/mcomix-2.1.0
+++ b/metadata/md5-cache/media-gfx/mcomix-2.1.0
@@ -7,7 +7,7 @@ HOMEPAGE=http://mcomix.sourceforge.net
IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
INHERIT=distutils-r1 optfeature xdg
IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
LICENSE=GPL-2
RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pillow-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycairo-1.16.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.36.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:0 x11-libs/gtk+:3[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/mcomix/mcomix-2.1.0.tar.gz
_eclasses_=distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-r1 3c6cd0f418ba702c186a9865b85e704d python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=92ba64638f330bd34b930ddf47765a67
+_md5_=613aaccb9e7292c52b4705583fa41cf1
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 430b15069854..bcf17ca51a86 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-libs/rubberband-3.1.1-r1 b/metadata/md5-cache/media-libs/rubberband-3.1.1-r1
deleted file mode 100644
index 56f2eb615f96..000000000000
--- a/metadata/md5-cache/media-libs/rubberband-3.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
-EAPI=8
-HOMEPAGE=https://www.breakfastquay.com/rubberband/
-INHERIT=meson-multilib flag-o-matic toolchain-funcs
-IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gcc:*
-SLOT=0
-SRC_URI=https://breakfastquay.com/files/releases/rubberband-3.1.1.tar.bz2
-_eclasses_=flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a meson 915ec7c25e08d7886558215e6809ca1e meson-multilib 8989922d980e5e870cc3de949d1b2586 multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multilib-build e8aed98bd43dbd25694310a660ad562c multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=c6519dd539bf140563147e8463e9be56
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 27b3e0086afc..e4e48cc96a79 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.7.0 b/metadata/md5-cache/net-analyzer/sngrep-1.7.0
new file mode 100644
index 000000000000..e1abd9c17dde
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sngrep-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure prepare
+DEPEND=net-libs/libpcap sys-libs/ncurses:=[unicode(+)] ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) pcre? ( dev-libs/libpcre2 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Ncurses SIP Messages flow viewer
+EAPI=8
+HOMEPAGE=https://github.com/irontec/sngrep
+INHERIT=autotools
+IUSE=eep gnutls pcre ssl zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/libpcap sys-libs/ncurses:=[unicode(+)] ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) pcre? ( dev-libs/libpcre2 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.7.0/sngrep-1.7.0.tar.gz
+_eclasses_=autotools f0d3196128225dee3220e65f3371bc7a gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b multilib d1408425c7c4a7669b9b17735404b693 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
+_md5_=03f203be9fe7fe201e5bdc1531d248c5
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 9da7f5ed6521..463ac640df40 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.6.3 b/metadata/md5-cache/net-fs/nfs-utils-2.6.3
new file mode 100644
index 000000000000..93c2c1ad00e0
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.6.3
@@ -0,0 +1,17 @@
+BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=NFS client and server daemons
+EAPI=8
+HOMEPAGE=http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git
+INHERIT=autotools linux-info systemd
+IUSE=caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.6.3.tar.bz2
+_eclasses_=autotools f0d3196128225dee3220e65f3371bc7a gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b linux-info c4f1201b96a8a2c1f3b86cc8b2c71c91 multilib d1408425c7c4a7669b9b17735404b693 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
+_md5_=d0a365cc7bdf0bea0830d13337af9731
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 1d8e91306a20..000cfaa85d52 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.8
index 59a54d33026d..a241cc97ce4e 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.8
@@ -4,6 +4,6 @@ EAPI=8
HOMEPAGE=https://tomcat.apache.org/download-90.cgi
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=public-domain
-SLOT=10.1.5
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/KEYS -> openpgp-keys-apache-tomcat-10.1.5-KEYS.asc
+SLOT=10.1.8
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.8/KEYS -> openpgp-keys-apache-tomcat-10.1.8-KEYS.asc
_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.88 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.88
new file mode 100644
index 000000000000..da53724d0cda
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.88
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.88
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.88/KEYS -> openpgp-keys-apache-tomcat-8.5.88-KEYS.asc
+_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c1411066ba16..719394048ede 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.12.8 b/metadata/md5-cache/sys-apps/flatpak-1.12.8
index c3e28b24a7ac..0fa7c66d7c8e 100644
--- a/metadata/md5-cache/sys-apps/flatpak-1.12.8
+++ b/metadata/md5-cache/sys-apps/flatpak-1.12.8
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://flatpak.org/
INHERIT=linux-info python-any-r1
IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
LICENSE=LGPL-2.1+
PDEPEND=sys-apps/xdg-desktop-portal
RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.4:2.4= >=sys-apps/bubblewrap-0.5.0 sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
@@ -14,4 +14,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.12.8/flatpak-1.12.8.tar.xz
_eclasses_=linux-info c4f1201b96a8a2c1f3b86cc8b2c71c91 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 d2955aaac8daaaa69fcc6dc93ed19f29 python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=63a7e4edf478b6497fa4ce71afb1f15a
+_md5_=99fbd60bf84c0f797da566f4a6cbe33c
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1 b/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
index a4c62f5993b7..1ef910ec94f5 100644
--- a/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
+++ b/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://flatpak.org/
INHERIT=linux-info python-any-r1 systemd
IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
LICENSE=LGPL-2.1+
PDEPEND=sys-apps/xdg-desktop-portal
RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] dev-util/ostree[curl] >=gnome-base/dconf-0.26:= gnome-base/gsettings-desktop-schemas net-misc/curl:= >=sys-apps/bubblewrap-0.5.0 sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
@@ -14,4 +14,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.14.4/flatpak-1.14.4.tar.xz
_eclasses_=linux-info c4f1201b96a8a2c1f3b86cc8b2c71c91 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 d2955aaac8daaaa69fcc6dc93ed19f29 python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=93ab0b846359e1f60bc23432f97a42c2
+_md5_=5867953dca5546cb9ca225a059926a5b
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 8e30dc85f422..75ba9a2cfe46 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230419 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230419
new file mode 100644
index 000000000000..1d776261e300
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230419
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=mirror://gcc/snapshots/10-20230419/gcc-10-20230419.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-2.tar.xz
+_eclasses_=edo c0eb9cbe6b0bd01fcb4918f12598a4d3 flag-o-matic 514815b1cc0dd4aeac177c2e812b3b1a gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b multilib d1408425c7c4a7669b9b17735404b693 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain cb15ce1344fceac0d0436457e22e5992 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
+_md5_=155bf158e7b00b2adad27fd8b3701c85
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 77edb775c115..402ca1f867ed 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/www-apps/xpra-html5-6.1 b/metadata/md5-cache/www-apps/xpra-html5-6.1
index 899600113dce..a5682e479e96 100644
--- a/metadata/md5-cache/www-apps/xpra-html5-6.1
+++ b/metadata/md5-cache/www-apps/xpra-html5-6.1
@@ -5,9 +5,9 @@ EAPI=8
HOMEPAGE=https://xpra.org/
INHERIT=python-any-r1
IUSE=brotli +gzip minify
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=MPL-2.0
SLOT=0
SRC_URI=https://github.com/Xpra-org/xpra-html5/archive/refs/tags/v6.1.tar.gz -> xpra-html5-6.1.tar.gz
_eclasses_=multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-any-r1 d2955aaac8daaaa69fcc6dc93ed19f29 python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e
-_md5_=a36311c90216150b54d8b1fe2decc0f6
+_md5_=dee62bbd975b66aae1c838ced66f96e7
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 63b7d7d844e8..f5ff73bd6780 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.8 b/metadata/md5-cache/www-servers/tomcat-10.1.8
new file mode 100644
index 000000000000..816d7b76c6e6
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.8
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.8:10.1.8 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.tar.gz.asc )
+_eclasses_=java-ant-2 5a1b508f2544b7cac8ec27c170676de0 java-pkg-2 1794573de2f5124d88b64ee5dc9aabb4 java-utils-2 8c72ea36a4935f626b13a30141d0d39c multilib d1408425c7c4a7669b9b17735404b693 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e verify-sig ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=4715795a1d8c909468fb9b1a1abcce2b
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.88 b/metadata/md5-cache/www-servers/tomcat-8.5.88
new file mode 100644
index 000000000000..c2a0902751a0
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.88
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.88:8.5.88 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.asc )
+_eclasses_=java-ant-2 5a1b508f2544b7cac8ec27c170676de0 java-pkg-2 1794573de2f5124d88b64ee5dc9aabb4 java-utils-2 8c72ea36a4935f626b13a30141d0d39c multilib d1408425c7c4a7669b9b17735404b693 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e verify-sig ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=a0bf378037d796d2ac9e271322d4c57b
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index cff122ba3896..9d21cf1f3d8e 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/x11-misc/picom-10.2 b/metadata/md5-cache/x11-misc/picom-10.2
index 6309eda29d10..0f20d0b73dbc 100644
--- a/metadata/md5-cache/x11-misc/picom-10.2
+++ b/metadata/md5-cache/x11-misc/picom-10.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://github.com/yshui/picom
IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
INHERIT=meson python-any-r1 virtualx xdg
IUSE=+config-file dbus +doc +drm opengl pcre test test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
LICENSE=MPL-2.0 MIT
RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
REQUIRED_USE=test? ( dbus )
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/yshui/picom/archive/v10.2.tar.gz -> picom-10.2.tar.gz
_eclasses_=meson 915ec7c25e08d7886558215e6809ca1e multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 python-any-r1 d2955aaac8daaaa69fcc6dc93ed19f29 python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=58c0f28e0e4bd458eaf887ff46b572ff
+_md5_=2371dd6d9919af0dd0d248868e8138d0
diff --git a/metadata/md5-cache/x11-misc/zim-0.75.1 b/metadata/md5-cache/x11-misc/zim-0.75.1
index 5493a271bd7c..aeb375e3a0c4 100644
--- a/metadata/md5-cache/x11-misc/zim-0.75.1
+++ b/metadata/md5-cache/x11-misc/zim-0.75.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-w
IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
INHERIT=distutils-r1 optfeature virtualx xdg
IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
LICENSE=BSD GPL-2+
RDEPEND=python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.75.1.tar.gz -> zim-0.75.1.tar.gz
_eclasses_=distutils-r1 05bcfd9823be251f6e9f211ca285094e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib d1408425c7c4a7669b9b17735404b693 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 76050953ad5b70d7e09a6ca55558db92 optfeature 222cb475c5a4f7ae7cfb0bf510a6fe54 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-single-r1 75118e916668a74c660a13b0ecb22562 python-utils-r1 429bfd4e8d8e39db5385ba5744f30788 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=79c34343df07b5dd01af2324f72ecc43
+_md5_=c79627f1fa758a8110aecf10d41f7130
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index dc066a036a9b..cacf091fdd8e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-20T04:10:10Z
+TIMESTAMP 2023-04-20T10:09:56Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAuyJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRBD3VfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFbg//fkhPqKn9BSSFV+bfTk6j75TLc4T8fsim2drQrTr5DMfbpYjRMQocQjSR
-hdIch8SgKF0uPmQTjjbxB5hstYjKImWpvcgRIfw6es29NWriV7qsmtPiO8WAHUqY
-p/POZ9P2fcREB5kPDP6U6VAexkiNYArzF/oMTvxP98XBKatyXFNpCV5xjZ0+WRxH
-hq+BWpTlxyU0xmVKKtS2PP9EGgBjTE5CcBcdIJP7dlfPwYaLyRcp4WVTfAkVAkU4
-DVkd+nzhj4dQhqUNdrUeapKq41U5LBZaJLYiiHTRIeM5/GTO7u4wkEmR84l2zsIy
-+f12YI8L/fvxlRSrBceS+mme2lBrG3u1UJOqWwbVFDYdR56BHpfmxleO5A/xx0Fw
-lj4vAdFCg5sTL/knn871mi+o+hRsT5p1OzOvP9SvA6gVh7uaCj+eIW89cbVuCtY7
-J4jb9Z2vD8Ftp2e48nHwpm5eZb0SS8JHSJUSovnwG3cs18PE8T5dpeYUKIgJmd7k
-omlOTk1VLD+1M0hkdz1+o/8gtEu4sYJli0Vzu/Kr6eJ3tWLKKiSG8Ov8pK/LhynD
-bZVa1S+MTAXSbTCY8ny5MmJcfYqivjGFZVBMJ9q2PmO+o00lsB8ZB0+gkShswUK2
-gOPlgtfBP62QGif7VeBRtKAUjskiF/GKFnAGMAqkb9701a0JX1g=
-=buIL
+klCXxQ/8CvVNAMZbQg1n4aLfrJwQPqpU8n6z9o61UhfmRdswb/ROXMtzfGmobRr3
+/FhXa5/u5nl/irYOzJWiW8g7a7gOQQQ2fxTEWgHdmACpJDVXUya4DeVuGxAd57bR
+sUjfpZ+Gw5wY1JxERVbvVufxHWzb3nzs8cPlvaqF1kJmMt03KU0y5fM/zFFJp99C
+fHb3cvg+JOX8GaAustSMB/OkpIEmiqWmi2WOmOhg8sQp7a5++5Q0wC6JR7ZBRSbO
+li2/FtTBNm1ncHwle9Ew2v37RY8BCItCVYatMte0keZkr8gtgjgStJw/ErZVVZjh
+gUJi/99wfeRRSKxHpW16aMgktBzTukOSZ3RGTuzZBcM541ybU8qDOHGVQ7iJqiI0
+yMTj6HMir/WssO5JUa0+wl1GRtrNOHYvKl4ihJeaPb0aNwARhgRG5m8jSzOPC7W0
+H7PH928GW4HyHqk9sccGyVxMkMhKMexxHcVB27zYOEvOXEpJvyMlMEYA4nkkh35E
+uGMpr2RwBGNlPVZ8LGLMfODytE3R7HKoF8in5NYcjjxIvRuYWSPEz8giNO4QN3PZ
+kuIeXls/q4MiudB5Qcc4QDI1knEhAAePF1eny6nlB8l+/m02XIV+ixksOTeNh99s
+BCEvL5N556GOcx6uFoaSnyWrpJhEHjBDXzCFDJxRMTXbyWE00b4=
+=cffM
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 74d491312ee1..9f9e005a2c70 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Apr 2023 04:10:05 +0000
+Thu, 20 Apr 2023 10:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index cf35e7038429..0999d807faa2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr 20 04:10:05 AM UTC 2023
+Thu Apr 20 10:09:52 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 227575ebe3b7..83843d333f36 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Apr 2023 04:15:01 +0000
+Thu, 20 Apr 2023 10:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ace763304f9f..5697ce8e5d1a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d583809b1a045ee3cffa6a674d4bbeaeb9206223 1681963349 2023-04-20T04:02:29+00:00
+1ac3fd6d08ba0957720d9c617a4f44fdc04608af 1681983988 2023-04-20T09:46:28+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 933fe2b4662c..bc879c3ac6b2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1681963801 Thu 20 Apr 2023 04:10:01 AM UTC
+1681985402 Thu 20 Apr 2023 10:10:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 74d491312ee1..9f9e005a2c70 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Apr 2023 04:10:05 +0000
+Thu, 20 Apr 2023 10:09:52 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index aba8a8d33216..82e0f676bd1e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index ce04655a0612..b079bd4a68c9 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,3 +1,5 @@
DIST sngrep-1.6.0.tar.gz 248091 BLAKE2B a08c50d87d43f49f24494a85b8f4d72f24a649050ab696cabd087a39bd64532a9e7ed137ccaacecddce8ef22c960fc43f5372c9b13817eae26dd06b711363e3b SHA512 bca3192e1aacf4152f566925fd075dfd957cbe87017c8258303c8689f1221ea082f337866db45cb5ada0629f7cc4b66ce73b74a911d230c63d10fefa19aaebe3
+DIST sngrep-1.7.0.tar.gz 248947 BLAKE2B 39a5d9bc71df9fb5bd4abadadf3f8fc8a680dd06eb4a7f06bb597a70215854d0ee4b93b39cfff67e2b15b6fed4ffac2865741af31b21a7ba8a91f9c01c4c750a SHA512 ecf31d61643ecc9ba1a9fe7759ae8c2c65fcbf6886ed263def2993dd6900eb9aeaddce8ebbde71e1ec57fbdc11a388de05f7c13f4587714e3b3e33689cf591b0
EBUILD sngrep-1.6.0-r1.ebuild 878 BLAKE2B e65118d52a01866a4cbb8484deac943bca129b80ead7335de22aa333bb1fa2a56c755cc9ab9253b27bec6c281d12541df999b6ce9743a493780d2ea9ec7c92af SHA512 2dc5e5ff66dd11633f6494e44431a7f1652c8bfae970351082e5556c213cf55779e577e235635806a164abdf65d6b6db68b688a062d0c899efe341a8cbce39e2
+EBUILD sngrep-1.7.0.ebuild 878 BLAKE2B cf757d29c925926be7728f80bbde828046d5039ecd3b04756de53dc188bae303c9b1e8114a1cdf684916a94cfa4907e422dc0bb3c003e47952d2691817e9dca3 SHA512 c04b8cfeb08b41bc90351cc0f9c706e629e99b3ce92f6e87e6ad132f9fc9d7f74e0558e4b794a48d6b22dd24e381df8ec5c1b3c44657a347a848afaff1b7ddb4
MISC metadata.xml 468 BLAKE2B 7b8e43ef6cb3bd733bc3321a2f5436b43bd846def6ac09d648e09bfe412a2cbb8f2b8d26cdb2721a2e44c33a183c4ab1d60e5fc9f899d7b8bbc0beac4e19abf5 SHA512 f6614eac2fdb609c8bd4ca7f3719b672a300ea52f96906c5ca6de204c345dbc80b5ec9e673046c24031b96118d0c70168c290fcdfda0063e7bd4493e6f7e58ae
diff --git a/net-analyzer/sngrep/sngrep-1.7.0.ebuild b/net-analyzer/sngrep/sngrep-1.7.0.ebuild
new file mode 100644
index 000000000000..4ec90e3677e8
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls pcre ssl zlib"
+
+DEPEND="
+ net-libs/libpcap
+ sys-libs/ncurses:=[unicode(+)]
+ ssl? (
+ !gnutls? ( dev-libs/openssl:= )
+ gnutls? ( net-libs/gnutls:= )
+ )
+ pcre? ( dev-libs/libpcre2 )
+ zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-ipv6
+ --enable-unicode
+ --without-pcre
+ $(use_enable eep)
+ $(use_with pcre pcre2)
+ $(use_with ssl $(usex gnutls gnutls openssl))
+ $(use_with zlib)
+ )
+
+ econf "${myeconfargs[@]}"
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 0f5a4f8efe0c..46b86322051f 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
Binary files differ
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index a03467e55c59..3ef6acce835d 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -14,5 +14,7 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1
AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8
+DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853
EBUILD nfs-utils-2.6.2-r1.ebuild 6273 BLAKE2B 13c6ac04c9d4b5c7d117537f6a89c82c9978780f29f5ea1d8949585cc7823e0aae8dec0478d6f2aa07c34d3ec0e98c4ae16015ebbb05fd970ffcfa9300f1661a SHA512 b7d271c5b949d4e248f310016b85d4e3a29e873a7baff6b83bff5512f8f09313cadb6572133bea220970b4c29bdad171a1f8db8cd6031cbdf1287c384103cc5d
+EBUILD nfs-utils-2.6.3.ebuild 6104 BLAKE2B fa8ad0804b123ac9b1ef021349b61f68b6a62ab4de0b1278573b481346ccaacf69a3bce24ec07fc929cbfd4a96196f660df9d9829065fa8e409bd364301b34c7 SHA512 e43f10a71a428c8e676f966981367a767e5edee3b04f3560dc1d1555a29cee4b298cb85d100c9c88e8dc8f68e4840e06869d725ff75b64c47ce202ec3e7ffffe
MISC metadata.xml 931 BLAKE2B 68fe90eceb28d3941cf4a8179320b5e5839b3d84dddab9509f9a1bb7c70f413acbb32ef6fda9cb94349193e258df71edb2a518568780177b4a8cfe155f9b57a9 SHA512 af2f74e21226176eb2873ea5de7f96996f54b73b742800adb444ced7485c8ae3556aba20b47c58c0694655f9a9b56447307483f98fc426b322fe05c56a2ce8a9
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
new file mode 100644
index 000000000000..b95d66ce7f7f
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git"
+
+if [[ ${PV} == *_rc* ]] ; then
+ MY_PV="$(ver_rs 1- -)"
+ SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+ SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+# bug #315573
+RESTRICT="test"
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+COMMON_DEPEND="
+ dev-libs/libxml2
+ net-libs/libtirpc:=
+ >=net-nds/rpcbind-0.2.4
+ sys-fs/e2fsprogs
+ caps? ( sys-libs/libcap )
+ ldap? (
+ net-nds/openldap:=
+ sasl? (
+ app-crypt/mit-krb5
+ dev-libs/cyrus-sasl:2
+ )
+ )
+ libmount? ( sys-apps/util-linux )
+ nfsv4? (
+ dev-db/sqlite:3
+ dev-libs/libevent:=
+ >=sys-apps/keyutils-1.5.9:=
+ kerberos? (
+ >=net-libs/libtirpc-0.2.4-r1[kerberos]
+ app-crypt/mit-krb5
+ )
+ )
+ nfsv41? (
+ sys-fs/lvm2
+ )
+ tcpd? ( sys-apps/tcp-wrappers )
+ uuid? ( sys-apps/util-linux )"
+DEPEND="${COMMON_DEPEND}
+ elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="${COMMON_DEPEND}
+ !net-libs/libnfsidmap
+ selinux? (
+ sec-policy/selinux-rpc
+ sec-policy/selinux-rpcbind
+ )
+"
+BDEPEND="
+ net-libs/rpcsvc-proto
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+ ewarn "Your NFS server will be unable to track clients across server restarts!"
+ ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+ ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+ ewarn "support the legacy, in-kernel client tracker."
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed \
+ -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+ -i utils/*/Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # Our DEPEND forces this.
+ export libsqlite3_cv_is_recent=yes
+ export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+ # SASL is consumed in a purely automagic way
+ export ac_cv_header_sasl_h=no
+ export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+ local myeconfargs=(
+ --disable-static
+ --with-statedir="${EPREFIX}"/var/lib/nfs
+ --enable-tirpc
+ --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
+ --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+ --with-rpcgen
+ --with-systemd="$(systemd_get_systemunitdir)"
+ --without-gssglue
+ $(use_enable caps)
+ --enable-ipv6
+ $(use_enable junction)
+ $(use_enable kerberos gss)
+ $(use_enable kerberos svcgss)
+ $(use_enable ldap)
+ $(use_enable libmount libmount-mount)
+ $(use_enable nfsdcld nfsdcltrack)
+ $(use_enable nfsv4)
+ $(use_enable nfsv41)
+ $(use_enable uuid)
+ $(use_with tcpd tcp-wrappers)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Remove compiled files bundled in the tarball
+ emake clean
+
+ default
+}
+
+src_install() {
+ default
+ rm linux-nfs/Makefile* || die
+ dodoc -r linux-nfs README
+
+ # Don't overwrite existing xtab/etab, install the original
+ # versions somewhere safe... more info in pkg_postinst
+ keepdir /var/lib/nfs/{,sm,sm.bak}
+ mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+ # Install some client-side binaries in /sbin
+ dodir /sbin
+ mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+ if use nfsv4 && use nfsidmap ; then
+ insinto /etc
+ doins support/nfsidmap/idmapd.conf
+
+ # Install a config file for idmappers in newer kernels. bug #415625
+ insinto /etc/request-key.d
+ echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+ doins id_resolver.conf
+ fi
+
+ insinto /etc
+ doins "${FILESDIR}"/exports
+ keepdir /etc/exports.d
+
+ local f list=() opt_need=""
+ if use nfsv4 ; then
+ opt_need="rpc.idmapd"
+ list+=( rpc.idmapd rpc.pipefs )
+ use kerberos && list+=( rpc.gssd rpc.svcgssd )
+ fi
+ for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+ newinitd "${FILESDIR}"/${f}.initd ${f}
+ done
+
+ # Nuke after 2015/08/01
+ newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount
+ for f in nfs nfsclient ; do
+ newconfd "${FILESDIR}"/${f}.confd ${f}
+ done
+
+ # bug #234132
+ sed -i \
+ -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+ "${ED}"/etc/conf.d/nfs || die
+
+ local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+ sed -i \
+ -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+ "${ED}${systemd_systemunitdir}"/* || die
+
+ # bug #368505
+ keepdir /var/lib/nfs
+ # bug #603628
+ keepdir /var/lib/nfs/v4recovery
+
+ # No static archives
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ # Install default xtab and friends if there's none existing. In
+ # src_install we put them in /usr/lib/nfs for safe-keeping, but
+ # the daemons actually use the files in /var/lib/nfs. #30486
+ local f
+ for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+ [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+ einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+ cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+ done
+
+ if systemd_is_booted; then
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -lt 1.3.0; then
+ ewarn "We have switched to upstream systemd unit files. Since"
+ ewarn "they got renamed, you should probably enable the new ones."
+ ewarn "You can run 'equery files nfs-utils | grep systemd'"
+ ewarn "to know what services you need to enable now."
+ fi
+ done
+ else
+ ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+ ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+ ewarn "same runlevel as nfsmount."
+ fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b07060a006c8..4b0925699e1a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 125b2b720b55..223e2a7337b5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
#--- END OF EXAMPLES ---
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-04-21)
+# Unused java libraries. Removal on 2023-05-22
+dev-java/avalon-framework
+dev-java/avalon-logkit
+java-virtuals/servlet-api
+dev-java/resin-servlet-api
+
# Ionen Wolkens <ionen@gentoo.org> (2023-04-19)
# Snapshot matching Proton-8.0-1's vkd3d-proton commit, but reported
# to be semi-broken. Keeping around anyway but leaving masked until
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0f7087d9677e..1e013412f965 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1626,10 +1626,7 @@ dev-java/ant:resolver - Enable Apache Resolver Ant tasks
dev-java/ant:swing - Enable Swing Ant tasks
dev-java/ant:testutil - Enable optional test util classes
dev-java/ant:xz - Enable XZ Ant tasks
-dev-java/commons-logging:avalon-framework - Add optional support for avalon-framework
-dev-java/commons-logging:avalon-logkit - Add optional support for avalon-logkit
dev-java/commons-logging:log4j - Add optional support for log4j
-dev-java/commons-logging:servletapi - Add optional support for servletapi
dev-java/dom4j:jaxen - Includes org.jaxen.dom4j package
dev-java/eclipse-ecj:ant - Support using ecj in Ant builds via dev-java/ant-eclipse-ecj
dev-java/emma:launcher - Install /usr/bin/emma. Collides with sci-biology/emboss.
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index eccc359fbcc3..2c9a5f34f3b2 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
Binary files differ
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index cf8956f0f18e..d758aabdba5c 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,11 +1,13 @@
-DIST openpgp-keys-apache-tomcat-10.1.5-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
DIST openpgp-keys-apache-tomcat-10.1.7-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
+DIST openpgp-keys-apache-tomcat-10.1.8-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
DIST openpgp-keys-apache-tomcat-8.5.87-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.88-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
DIST openpgp-keys-apache-tomcat-9.0.73-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
DIST openpgp-keys-apache-tomcat-9.0.74-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
-EBUILD openpgp-keys-apache-tomcat-10.1.5.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
EBUILD openpgp-keys-apache-tomcat-10.1.7.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-10.1.8.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
EBUILD openpgp-keys-apache-tomcat-8.5.87.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
+EBUILD openpgp-keys-apache-tomcat-8.5.88.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
EBUILD openpgp-keys-apache-tomcat-9.0.73.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
EBUILD openpgp-keys-apache-tomcat-9.0.74.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.8.ebuild
index 81b3505e76ec..81b3505e76ec 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.8.ebuild
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild
new file mode 100644
index 000000000000..f17ae55806f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-80.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+ local files=( ${A} )
+ insinto /usr/share/openpgp-keys
+ newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b020125740ff..aa738df7ebaa 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 30898e28d447..5fef64d594d2 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -5,7 +5,7 @@ DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B 6db457eba6b5c03ae4b7037e55f0537821152
DIST flatpak-1.14.1.tar.xz 1626500 BLAKE2B bf33dcd5a0f0289e5bff32794012dcfc45dcdbb11ef0da5c68769c18b1bcd12fcc0308ea275a7532f59998db6afa019746313387b0f9636c7d9b91ceb7d66665 SHA512 1f22622b9a797b644b5fe9d26c3c4ec3f6b1a3b81a12d498e5aeeecb1a965c9aaa5c1d18843c938f116855bbbed3a8d9866997440f86241abe70eae13be7cdcb
DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe SHA512 3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
EBUILD flatpak-1.12.3-r1.ebuild 2520 BLAKE2B 1164a0b45277b5352f03f59cac94dba8cf9107a7f620bab0b1c1b64173c67bf2a7aa80294c0e3869743bed0387f3e0a90618ab85a1bcf098c550243bed899d8a SHA512 e53ad1f5cd51861d4b687c6212577631521c743bf4fbb18b544c8c8df9e7720e50c87a8e54a01ea27bd649f4e1f6feea19c5f5b1abcf6365ce8fa3b62fc5c849
-EBUILD flatpak-1.12.8.ebuild 2523 BLAKE2B 46fd265834c106fa8edc9bf0b48b81f5681f926fd4ab2185fa7f97f7196d4361713623dd70b53c2f83b6c73ee50603c5149f9d1bd28f65c5c3213694ccc431dd SHA512 916330aabfcf005bc6b37ec9386c1849127b556e648e876164b1c9a7ddbaad628b12d6c4e89edb3ea1ca440781dcd12b95420114d2a31680a1f74c8d8cf94b21
+EBUILD flatpak-1.12.8.ebuild 2522 BLAKE2B e5a62e83a294233eb1bc5241a285e159bfffc374485610f88aec383383cc5f01c5d68c729c06d01960bce201384a6c740304b42428bb5ce01da8e4e66a533dde SHA512 801f8dd723259a2f071fc6a8a491c2e7f7a5217f710325825f55b390db626d688396180f558419e103ded1dd6fd63432bc7f81eca8850ba92207f922fcccdef3
EBUILD flatpak-1.14.1.ebuild 2626 BLAKE2B 0276683806ca4180a9addbb33bdb1edf23ec8623ddd2f85238a82342a4426f8960d02b76f03b0099116e727bbc3c8e4df698ab451f63251f4c0fbc89921697d8 SHA512 4788847c696f9177459613d09b79f9414d5b773f790fa96c528d7ca7e17e6c423c08a57cdedc94a71edb42e7f07c2577304f691df1db24db77d931156ae4ccdd
-EBUILD flatpak-1.14.4-r1.ebuild 2725 BLAKE2B 7bbfe07f6c3c8fa58a40e3e451b257080666bf792e7a37a441e5abeeb6d49e5ee3bdaa361c2d2074b5e5fe54fbe52f9815c803a913852f24f785b9c2a283ac8e SHA512 2c4b3f76dcefeac510107d16f5f0df839927735f21516e6ab782608215fb387f58238d012b497b5de88ac9c07e3574aa69b78e0fd94c38ffe5143ae5dbf7693c
+EBUILD flatpak-1.14.4-r1.ebuild 2724 BLAKE2B ea0642781cfa494ab49ee934238033578a314cddfa3303198a13a7c9571ad9f77a4ca4961d4807d10f8a50bd96d24497f82b808178adb4bf76ede77a2eee28c9 SHA512 b862fc242c19086446e5e336a70027d5e1b6b11d50755ca2e4afe58672da3b1579e42edfb9769970221e326746b056e6abc78c75586c9437c13bd932609551e2
MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.8.ebuild b/sys-apps/flatpak/flatpak-1.12.8.ebuild
index 6ce89dfdade3..9bcc5a2c13e8 100644
--- a/sys-apps/flatpak/flatpak-1.12.8.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
IUSE="doc introspection policykit seccomp systemd X"
RESTRICT="test"
diff --git a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
index 2feeffe4d50c..dfc593ca8189 100644
--- a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="doc introspection policykit seccomp systemd X"
RESTRICT="test"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 339027a44177..552ff2dadfa5 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
Binary files differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 964927ff1f39..822751c14fe8 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,6 +3,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
DIST gcc-10-20230302.tar.xz 72112120 BLAKE2B 8647639d9c6aef31b63566b006bb2980ca974e4aac4f5ced5f12a4f7fe0e9bda1e456d31f13dc478ab187d5e739ac850dd7dcc9db421ece1cadc50c952dbbed4 SHA512 97f72699b1a38de0dfb95253dc1602400fb05c2466b3682e51a4793d17db62e1d55b8d19211c3326e5369aace2a74345059b4b1c1a61a1f2c1c75a0aa9ec3e0e
DIST gcc-10-20230413.tar.xz 72123372 BLAKE2B fe2c92692eedd66b9a6ed6af0c9102e4bcf996bfb20b5e1bf6ab2aaaa5662dbe81d1a5a18cce2cc7dbc4e6b4b599c59ea1a9e46586a36439d5047584a876e924 SHA512 c0fdb0a083b833ed24b85f744a18b1071bcf76de620ea7eb7b20b6b59f6489596c8e6cbd4c39d7f87119421f345a788a285f7aac47eab5f01ffb3aefc1d36dba
+DIST gcc-10-20230419.tar.xz 72143336 BLAKE2B ffe2c39a0e99900d0c147908b3e2ebefff24460ec77b4835ae8ecd21bdc7e5b45865dbca16ff92e5ec7df6d0fa6c7629a77e2cf7d4113696bb6b25e42f6e24d8 SHA512 d1465b4b2f5c5d80c9d8fd6c4843246dea40c0d71925de47cdcb4ba2c426457dca876fefe7a2e46bd8bd933d28203aaab65dac12a981a2451716ff24584a40e8
DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e
DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B e97b471fb6115fd0421be8a6390f7d88312de7ac0132fde3aa43dbf2a49d3bc640ec05f766f20363f033adeaf0430e90c42b5a6f92a422d1a82128f119e769f6 SHA512 2589b8a3be0bc60dd7b205ef9955dfd1ba525508879b30ee8057779d2677783c7c13a0bf901bc2a126e15c52d440663e6fe22a299d935e0706a037406e1cfb31
@@ -32,6 +33,7 @@ DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f7
EBUILD gcc-10.4.1_p20230119-r1.ebuild 1445 BLAKE2B 3ec47f604ac04dc3b07b02b56a912d5ca1971460b72f2adfdf3992c6d17182e7be9c7a11f047a59be29ead76b8c543d873e6c68cfd6cdea8fa6c0279f58c767d SHA512 3ec35f5053c21c1c6debc11a5b654bd5ec6c04f8bb72dd3dede77c4fab9d0734a0b866aba34d2286ef7b7ff1efa06189c7a6f79c8a57ce734c932fa6f1367b15
EBUILD gcc-10.4.1_p20230302.ebuild 1453 BLAKE2B fe070759433bfc4d214d0d14eb8998d78830420b5008d5dd7a4dc2acb5db1f3ce549a3558b884fb474831eff097ad4a0c8f7366730bda54c9ffefcc0772fbcee SHA512 2f4e1da8d8aacb17cab60fc1d215e06d72968dadb81808e9cbe2d2e80c7a0e5ef426e6bfb6d847898d7dede47dc6a715c299bf6dbca24e93bb4574437c88a632
EBUILD gcc-10.4.1_p20230413.ebuild 1456 BLAKE2B 44855d5d880bb6391a140d4212b9c92c3a0e056622380e830104aaa2146d6c1fce51690c526b1e45a7a94833c2efef6de3781567cbf0e4c1182e9de28a9bd853 SHA512 0bf4a44a5cc89f6f04ed129a24dc8b9fed0c4211fee0ff2e9e343b04e71432b053acd022374dae96096cbd65c5e9f05f7b65919a6597c85b0295f5aa1b01903e
+EBUILD gcc-10.4.1_p20230419.ebuild 1456 BLAKE2B 44855d5d880bb6391a140d4212b9c92c3a0e056622380e830104aaa2146d6c1fce51690c526b1e45a7a94833c2efef6de3781567cbf0e4c1182e9de28a9bd853 SHA512 0bf4a44a5cc89f6f04ed129a24dc8b9fed0c4211fee0ff2e9e343b04e71432b053acd022374dae96096cbd65c5e9f05f7b65919a6597c85b0295f5aa1b01903e
EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
EBUILD gcc-11.3.1_p20221209.ebuild 1334 BLAKE2B ca826cedb1606019ec76b0d4117f74d5847f9b575d4f73caeeb749ea93bf5c4eb5d88ae63fe18ddb3a43b6aa053fe237a3908d62e151bf099bc158f29308a3c2 SHA512 fa51e2c6bf5c691d4acc2700ecb6e16ee2a0f8706eeb404a2bfbfdc7aa2d987344ff64255827ccf32fc34540f618dbfe8fe0909d0914ec8eef6be62ac343d73c
EBUILD gcc-11.3.1_p20230120-r1.ebuild 1334 BLAKE2B ff7ec5997af15e5cc40d4834d779512c6319387f7d9b8905323db1b8d68f70e8a717817265d431ea37e259d506eeb0966472c7c4341eb76e5a1f25c4d7df9f2d SHA512 10054ca3c00ca54ec905a7d087d5d99a7db43af9bad0bff1ea1dc547e0ac899e5cddaa939a8ed4b38aad4eb109cc88fa71a6b05ea2c72a982774abb4350ecf1c
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230419.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230419.ebuild
new file mode 100644
index 000000000000..07a2b5e91ab4
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230419.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="5"
+MUSL_VER="2"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+ MY_PV_2=$(ver_cut 2)
+ if [[ ${MY_PV_2} == 0 ]] ; then
+ MY_PV_2=0
+ else
+ MY_PV_2=$(($(ver_cut 2) - 1))
+ fi
+
+ # e.g. 12.2.9999 -> 12.1.1
+ TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+ # Cheesy hack for RCs
+ MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+ MY_P=${PN}-${MY_PV}
+ GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+ TOOLCHAIN_SET_S=no
+ S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+ local p upstreamed_patches=(
+ # add them here
+ )
+ for p in "${upstreamed_patches[@]}"; do
+ rm -v "${WORKDIR}/patch/${p}" || die
+ done
+
+ if has_version '>=sys-libs/glibc-2.32-r1'; then
+ rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+ fi
+
+ toolchain_src_prepare
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 75eff96906cd..0cfc6e93d2fb 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
Binary files differ
diff --git a/www-apps/xpra-html5/Manifest b/www-apps/xpra-html5/Manifest
index d098d4f493bf..32f83b17932f 100644
--- a/www-apps/xpra-html5/Manifest
+++ b/www-apps/xpra-html5/Manifest
@@ -1,5 +1,5 @@
DIST xpra-html5-5.0.tar.gz 1570694 BLAKE2B aef7b818aa618c143701993627e629884b5e696c7334e6b75701a20028f18aced5e3249505ac031d6cd0a08d79ca2b9728afdb2e90712fcbe45d43d02598f608 SHA512 8318c6dd8f8f53d0a132272c2bb8c69e8ba928f2f267679aee48cec4598faa828788a219dfa342162e1fcf8159bf46b44d50db57180f1aa972edd67fa43e9cd5
DIST xpra-html5-6.1.tar.gz 1416380 BLAKE2B ba0e2bdcae91b30a1f46655dc505f5338cd8c516414f55871c6bc01b6bdcd81d351d66c575c6a7a219cb0c29e7da17e8db558b928dc89067b5ad3289520005f2 SHA512 3539c235f38a66f0a8eaea679df4b4bb4a1ef778ab31baf705acc29b0d4b3998ae84081eeac085db973d170afaa1ee0f167124efc3e48266145fdbef255a6bf5
EBUILD xpra-html5-5.0.ebuild 947 BLAKE2B f8d55d9fc2da3dffb18706702f3e3d050d082336cd208dcd16baf67d43c6214dbcdf79c81dc4a26889b3681a54281ffc5bbd601aa57f3d90c5b9821bb38bd42b SHA512 ec52f0892f9476e1f18c4c1afd81515bd4210095caf31308ba881983e2c6f9e81e18110e91ec44ff6b98c9e0cb26db084f588601e4de81e4ea874bec5344ea72
-EBUILD xpra-html5-6.1.ebuild 952 BLAKE2B 12da5571f00df4ebb00211ffc5b52881b6407b9a3a928f1d7ea8ef3a4892184dc2a73e507b6032b7368f11c1a52c12bcd686c0c4d574a9d6dd1cd8da9f58e56c SHA512 260aa59a8934f4540e16bd094df1e618683778c6de906ffd87413085edb554b83ac040a4d1af7696cae4e51b74c792327e0fe15088b4adc2b1e9ec29e558da34
+EBUILD xpra-html5-6.1.ebuild 951 BLAKE2B 1e1333a152fc1cb607ebe8cb59cf7a5f9e544f8e603b1db6f51c8991c7d68bdecdf0c55d6b7e0fa2daa467a6c85dda4168eb6a6a10480546afa97b50b44ed8bf SHA512 c5af79c29c8d078bb96227dda4df7d85a6aae46c928ae2b60bd03ac5c84f610a21d989689a5ae7a092b941681346f0e99c89e193681a5cb807aed9a9acb5b1e0
MISC metadata.xml 551 BLAKE2B 6d62f17a775361ec0b066cb994bc5a6ccc841e61991aa44a72512e82ac94c6a66ad7fbf3998c784cf830cfe44f03e496edd9b491e95f173fea71f328349bd457 SHA512 d839ba317b8d58e5849de92243408096799b1328baa3d46e0ca06e4c038639a35566a9a636f7da491820bc0e3af0cbd5e18043bf815b873f3ead4d68ff54c960
diff --git a/www-apps/xpra-html5/xpra-html5-6.1.ebuild b/www-apps/xpra-html5/xpra-html5-6.1.ebuild
index 047debce69ae..b61b4635fe66 100644
--- a/www-apps/xpra-html5/xpra-html5-6.1.ebuild
+++ b/www-apps/xpra-html5/xpra-html5-6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Xpra-org/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="brotli +gzip minify"
BDEPEND="
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 3b3e404b4cf7..0cc801c90c19 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
Binary files differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fab0784af840..6090e3fa63bf 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,8 +8,12 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
+DIST apache-tomcat-10.1.8-src.tar.gz 6086270 BLAKE2B 080ffacfb3b010605fa901319f3f059524f532306af5a5d05a0e4eaf108be06ed139977ef39e8b9fa0423fef0ad073305b57793bcbb4e897bbb0239cee183017 SHA512 14ac35a22d24284b770182996388bdc004defc5e56e65d2420e096a1e1c5c45887e4a55c0174884294acb7c99e6412f98159bb9be92de337e1a1cacc48d39ea4
+DIST apache-tomcat-10.1.8-src.tar.gz.asc 849 BLAKE2B 2a62d64e349739397fc786b92e75a14b74d3e8f9243a4f90ca17a070d85bb31707417da01d9d34217a23ab10157dbff46857efd65629a66aa41be861fe036ca5 SHA512 e818e040be1e1c29c989228cf72586ac8a602a93373ac33760db22578fbf79a5202f038b4cf36a0ec3549112bcdd5f5629a6859119aa0b129fef923c073c3055
DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
+DIST apache-tomcat-8.5.88-src.tar.gz 6051684 BLAKE2B bae4785765d2c373a5507bf1f422a9d4d0c0157f7b642bb2c34edeefc341af6661fc55077b03d8f5fc77744bf903792f0fdfd7265efebdafbeca35fb04a3a20f SHA512 f3db0daf451ab6ef34163e2adf6388cd4d4502c7b28915f3ae954b79ea3fe5ed17c900294bac0b192268431a62d501b3b8d35f6d9e0bcb3ae1f9962ac3b8a084
+DIST apache-tomcat-8.5.88-src.tar.gz.asc 849 BLAKE2B e82e714721272c7ca6e6837a4be369c9ef3ad6c654f56ba15028f7f8d8f54ab62d7c1da32a2f4914c417889b3b65ef9f5ba6dea7d8ed4125de871ee4f91339df SHA512 f5ad2bd77287e763d7a09b5be17601b318ed6492d5c476903eadd54304b19afbbedd90ee5232b5dbc30ee597ed3c4fe5fc371c3d9809b94ca1614fcde1bec4d1
DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16 SHA512 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237
DIST apache-tomcat-9.0.73-src.tar.gz.asc 833 BLAKE2B 0d9e81e16e356aded1f02dc02833f24875584794358591b70a2fe54d67d116c7305dc5a477d158395afe3b72b2958c2dc0e102a893b8ef504a3f24acec14ba41 SHA512 fda56cb885fd6ab0bb00907084977217c2e23bbfb2fe25374bea1bd9f863f5275dd8949e3ff2a88d5d10f37788978b484ae59460c1bb43d2ca0ac814426efcac
DIST apache-tomcat-9.0.74-src.tar.gz 6237459 BLAKE2B d4942b85f184e8ecdc8bbb85256fe70677be772fdbdce906bd097eac6a56653ee08d3b76bbe42f4ef34664229c62ad236557ef8742c9e9bfa8c728927027d3b8 SHA512 a57afcc669d4058b4a46e9c7e196443dd5a09aab2b194d2a1f258fd218e09cec73b5f864ec073d9090a0e633b67f7deae7d643207511dab349d6a578449706ff
@@ -17,7 +21,9 @@ DIST apache-tomcat-9.0.74-src.tar.gz.asc 833 BLAKE2B c5f2cc71272b5917cd522f4b3bb
DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
EBUILD tomcat-10.1.7.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503
+EBUILD tomcat-10.1.8.ebuild 5787 BLAKE2B c75a963504b636477be460f2fb1938b5ebd2aa757c563a2dab47c075b86ce9dbae54ac17f01fb88c4b53daf3a6b04b15567e6c6e3f06bc2dee5657683bf94f1c SHA512 1d3f73161a73c3a5513bc78b391eec20a4a332529fc9f2370581015a83404edd7e01f767c3126b4cd25392985d0b84a05f1825c70ed431af4c5056ee9734e92f
EBUILD tomcat-8.5.87.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa
+EBUILD tomcat-8.5.88.ebuild 4650 BLAKE2B c16f87d43ded61e661d3ac4031e2372cbcdf6fca64afb0f7a76d1ab71bcf2fd73096b8afe5239b6efb103c2763b52805d52571ff3f9f133e6a8ffc1dc2e011e5 SHA512 7e213a31359181a6f2cae5e6c9836b0825fd2fd51a130daf83cd44b74f48374fea451bc48822da85128173e336438b6f0b1145aec9fd0606f6d03b0ea6515f0e
EBUILD tomcat-9.0.73.ebuild 5665 BLAKE2B 7a5d46aa3919e1a0f021d96ff6de326f7f0d17f7eeb31ff1863e15f5b56919cd4383c36c3b72c9e8409ae3f2998f92204d0279da27c1935c797e25aac269ec3b SHA512 041d17c1a05ecb482b64c2cedd744901615519d8e7cc25fea74d643cd850d5bc4ea138ecdc3232c9db9e2cb76ec09562593860a284ec56cb24b97df3ac2753d3
EBUILD tomcat-9.0.74.ebuild 5649 BLAKE2B c7bc422d705e483556207f7676b7ac172e98dca481c1dbc27c3abec0d7162d26df3ab3daad7a1ab3b696aeddfdce6f3f4b80b6e87affc16e5c82748ce13fb89e SHA512 de832d9cf3484e4912e0afc6898d7a19c0451adf5fb3c981651ec0c5b4a4f658759f62583e5af57d6cc3d41bcd57e71ba066a7749989b9144fc09c789d3b6c30
MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.8.ebuild b/www-servers/tomcat/tomcat-10.1.8.ebuild
new file mode 100644
index 000000000000..a2d0614c3733
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.8.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+ verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/jax-rpc-api:0
+ >=dev-java/jakartaee-migration-1.0.5:0
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ >=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ >=virtual/jdk-11:*
+ test? (
+ dev-java/ant-junit:0
+ dev-java/easymock:3.2
+ )"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+ fi
+
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+ einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "Please note that since version 10 the primary package for all implemented APIs"
+ ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+ ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.88.ebuild b/www-servers/tomcat/tomcat-8.5.88.ebuild
new file mode 100644
index 000000000000..6f5f1a7f9687
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.88.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+ verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ >=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ dev-java/ant-core
+ >=virtual/jdk-1.8:*
+ doc? (
+ dev-java/jax-rpc-api:0
+ dev-java/wsdl4j:0
+ )
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+ einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 8202ff6b1bfd..0c3cbc62ea58 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index f38207132e3c..8cae928a1309 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -2,7 +2,7 @@ DIST picom-10.1.tar.gz 286934 BLAKE2B 0a6637c5615cfed514b746d85c2627b398fb0dd45b
DIST picom-10.2.tar.gz 287166 BLAKE2B feaa07fc5f0a53396675dfd4d8f2507caf6ce355b2db242b25b3559b287845b0505c48194e51c9c7fc6809dd10b871be6adf3e9fc87d91a41f01ccfeb87803ab SHA512 9c0351fbe8a9e76533243c8e76f8e7d10c1e49292f1c8e6c06f31fb0b512542a67970abe803d061c953546ff8d3e704488c263002a5a831f68deb010caee481d
DIST picom-9.1.tar.gz 263924 BLAKE2B 093f2fe12f3388b7979379d2e2b695a779cc9ebf95cbfa5b4f39c4fcc7cd6fc82be662bb9b0355fbadca66c0b0d7ac0d1e463272b0dbe4bbcca985691b6255e9 SHA512 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df
EBUILD picom-10.1.ebuild 1584 BLAKE2B c935837a5b8a48cf0d50259cccf13e58c2e88dcfaa519d95006d5f9338b7cdb3ee09d8949d4a7e5c377039a57b0768af363673c4da0badbcbc711f6426914ff0 SHA512 e16ed8d563c1553932162f082b9798d21ccf5a9e87dc5acdaa60db2e68bde34dbcf39d971b17be70c6e3892ceafc0d7715f3023dd949e3873535ceda518f793d
-EBUILD picom-10.2.ebuild 1584 BLAKE2B c935837a5b8a48cf0d50259cccf13e58c2e88dcfaa519d95006d5f9338b7cdb3ee09d8949d4a7e5c377039a57b0768af363673c4da0badbcbc711f6426914ff0 SHA512 e16ed8d563c1553932162f082b9798d21ccf5a9e87dc5acdaa60db2e68bde34dbcf39d971b17be70c6e3892ceafc0d7715f3023dd949e3873535ceda518f793d
+EBUILD picom-10.2.ebuild 1582 BLAKE2B be05958637eef0268c6285a02955204a8975727136f2085f02a78ba6b026abed970d931ad985f3a6d33ca4cefdf1e05b7594c697a26eb4098f4f36d35ba33504 SHA512 3492a5faa2f19323b592e957a3a36ad751d38e38a0317344c11b38dea8769262712281de36230b44f6a6ebf294becae564e56af896cc16a4ebe76ceb5b9e5729
EBUILD picom-9.1.ebuild 1582 BLAKE2B e30f0022d572e362c774c99dfdcb81ebe1e6d97b8c75b75f8eca16ee3524e0fdbde09ab3841884f74a6ac21c3b1b02aec249a592e17b974f5d2b44fc13b6aed8 SHA512 7b611d52c9a65041c0f437ae800d41b487408953faedbfb22d33754e2dee1539ee7a69e0835cd20b260b93f9361adacfe0c478ccf5ef5cf9847cdce4138ec029
EBUILD picom-9999.ebuild 1523 BLAKE2B 9c24a1efe6d0b4ba27297f5cac1f9708d1a7e6fe716e9b3ded8d71d02a58e334a8e97070d7c2aa2cf3a06983098dc51159f64a875218cdd3ef22f1f463c004d0 SHA512 df1128e7ef11ce640b959bb1ab9d2a8e2aa80a93ff4f631396b7cbaf9fdc09b4cffb4d0d03fd1e7fff7f86618f8eb8625729210d4e913df5681ea4bf91ac3cbc
MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-10.2.ebuild b/x11-misc/picom/picom-10.2.ebuild
index 096c4965a203..5500bc0c290b 100644
--- a/x11-misc/picom/picom-10.2.ebuild
+++ b/x11-misc/picom/picom-10.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
IUSE="+config-file dbus +doc +drm opengl pcre test"
REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 534ce141c16d..4ab64c6f4b74 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,5 +2,5 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d
DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5
EBUILD zim-0.74.3.ebuild 1827 BLAKE2B 44c738e81590a89088d535a374d58945a9ba7c2d2cdb8184e013e80707466124e2098d838b995af950dd63d18361e4a2d99ead2d3a70a378c10f53aa2ae66aa5 SHA512 aad716cb741690be4a1c5455b9ec1edaab3bdef8c28dbde24136b95eda1aa6a00d01ea71a85a684995f2246b99b19dd32aa67b66d8c906611a10bac72fb18760
-EBUILD zim-0.75.1.ebuild 2035 BLAKE2B ac7cc28255a874b4bdec08274407da28df4695f16588bc82b245661586cb92313e1c0bade0a15957cfbc8f5d47fec3e56930b8fb0b60e37f4b0df96b23685521 SHA512 12fa574153f40f7d1c5cb488577c71482a75d03a4942912846259c3f409cd2c1fdfd2c8fb836e0495ed87e730cfcb6208d7255c6fe92c47bef9e2a970934aeed
+EBUILD zim-0.75.1.ebuild 2034 BLAKE2B 37e08133c6618703445e594a6b7477640654143fa78b7c6177a46a179a8287663601146084bb3a5edf53d1615a6703e60fe46a64cdcd025fbc17290bcf2163bc SHA512 769825e0602bddd55d86a69f084fd15639e113c00b13d197e1bc90459ea55889f52723a45018572fce66fa8cc7c40b0e12e45042c3d591a0f55df90bb158fb29
MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.75.1.ebuild b/x11-misc/zim/zim-0.75.1.ebuild
index c5d76bac3fa8..c670751098c1 100644
--- a/x11-misc/zim/zim-0.75.1.ebuild
+++ b/x11-misc/zim/zim-0.75.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
LICENSE="BSD GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
RDEPEND="
$(python_gen_cond_dep '