2023-05-10 20:09:51+00:00

66 files changed, 603 insertions, 529 deletions

diff --git a/Manifest b/Manifest
index bcf763da3bd4b..54395d17e0e06 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29447 BLAKE2B d341cfefb6dec681d9c82fa633cae04281d8d3b928cfbebf8bf05d066e151106d036d8400ddb1b9e43be6e345bab625788755623998d7942663548b87f3cc7f3 SHA512 7b919cb0efddcd38303450557d08d4af6ce7fc93084613a86bb2a379391eee87f68c06c15875d7051c8ebd11d9c4b156091f93c31748d8648ad391521df0b051
-TIMESTAMP 2023-05-10T19:39:51Z
+MANIFEST Manifest.files.gz 29435 BLAKE2B 088a2e143ecd90357368e11575dc02039fc1265a60a2196d4873dcf0ddce25cf2073f77c4d1008d4a5c4f3b61b7eba5150b8c71bf05a5d95c31864794b596ab4 SHA512 20834c3bd766c621584ffaef8cc9bb08c45b9eaf099b0e0581c3128f3207121d6d19e1d68ea973ecd5b3bdda88476a20dfc2d79241254ef88e3a609e4734fbb3
+TIMESTAMP 2023-05-10T20:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRb8wdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRb+hNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDY8BAAoRWPOqReOO2PT88WxhuLviG/cd4IJl3VXi9YG9PliFz4LmGfyDGgFM7x
-OZGsa5pBkM48xueQt4ysjgWcIP7wECJodNc/6DcaKZtqzkWPZX8eA3s2IYW2N7Ha
-X+uekpehKJ7KIiy2ddjaaz2V9j751exsQ9ZdQlzp4amm8PLX0UHflVcsaCW3qeNQ
-X6JT0vr3/PbtizlkDpM7QJ7GtfZu+BeP2lkS/aQU6apMR9Q6jamsSk+xrA2Q9RzU
-7DTr6Ipy6tphDKmVL8mKBlOJqpnX0SGdgcjxYlFPApPFUZ/3ZyJJD39E23N9Uz2A
-htX7ofrKtxk/q27uYLfa9LbmgWM5x4OJDIgwvoKdItaMoiBHnTFolb3dBC5rAhZx
-Ol9AT/Cp4GQojcXqSSWEMEtaatlGNAW4moKtmWZJEUOWyUewVknFIqWAdQ4+P5cy
-ulIILXInX0QwSawDgSFC0q/BNP2Dhp0IYuobMm+TOCFMgAUJ93JUv8yNLd4mps5u
-cfjqmqAbFzN4tDErq1cwyIDz02mTRfUzF2f3X/g6/HbO8XsgQiRBj7XKYmCXquxG
-LT9LXkRADqj7SAjhDDaJlYWbtCSNEOkRDdn5pzC2aIZld9OET0JAsY5i23dPHO4K
-Eb8Xm/7kf+k6OyWLhF6XtqamUyMsTMwwROHkhSWon2Gv+g7DdVc=
-=Y8po
+klDU/Q//T0cF1L71GDVcJNGCvVwTGrWmhm6mh0EqaJ8CIL9wBxwi29szvMvY8Sje
+CxkbBP8E5ZIkjDFUa9XmBHSaGJR9KUPNqc3fazRtFg+Z+/YvNz2QcC5szS4IluaA
+PgLskKvL3FZry1l3NNApXysR6emdfd+zYsUqUKh8I+mC9cqs+liDskaDryrz/8Mv
+A6AX3mcWnqUZEmzv33Rd2CuL6w2SnLpIBA/d0+6BhR6/jJr2yCUBEHdj9eq7091P
+IOy2mFXPdT6JXckcnre+2IOCGzP8a68QvGlWu391F1Vc5LNp7DpG6koKMeLFQPls
+gAUyaTasCrGGUZijAgCvNTofioyHoIIiik6VSkYd5CjK79PltV3px8MHJVGGRfJm
+H3kbURctTkkZzuYa77P2pP1Z1fKzTCDfn1Sq3RWz5VZ210I+A7lpEnMYzwCY81pl
+1XngYjEYbpt0ZBxQh181ntJrD2kqJk/7G85ViZ6KXvFRggWgl3XmAWIOQxrZdrkP
+IBOObxB6iHxWI/JYeCKLtDLgtdTIq7RI2CrWyhOm2Wu3wGxV4qSftRSsnE0yWvKA
+u6gTRgkcwPxYz52XDcZ1J4wZJcWfz4zLqdNXnEVZWjvakRqcviysnZpXdbZO45EY
+LH29uryL8cGW6Wn+wRpZ6CVvy2sRbBr8Pja5ugOkPsuH0RawE5Y=
+=m2QA
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3460533741e7c..46d24a208d14b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 48afb08eb4cfe..250735569465a 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 0118324e9eb51..d9f8879cde95e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -4,6 +4,8 @@ AUX libvirt-8.2.0-do-not-use-sysconfig.patch 8420 BLAKE2B 37856003bc58b69531be6b
 AUX libvirt-8.2.0-fix-paths-for-apparmor.patch 2785 BLAKE2B 2b1daa96385ce09a078e1c152b222b274fcde1803497de8709d7569debc1537e9ee4f65a1f775636521ba351310ad13806005e1c02fa00224551244a79ace109 SHA512 be537022563bcf782381cdb99188becf1785de950124626e5ea13219a870a1c6c13834f2cb3c9cf4c364a66b5a7647bfa856a4c5e634dfac6a591c8c93e5ce9f
 AUX libvirt-8.7.0-meson-Stop-detecting-Wl-version-script.patch 2096 BLAKE2B f76ca851dce01ff8c7c1720290b4f732d666e90ed2414c5eaf8915377483a524153e44f7f36639cecec30781e8e764fe43bcb34f0b9d4fc226014b6a20087404 SHA512 7a619e64d952159b0790b6f0229cb165e372e9c74e6fba08492546039b7989ceacd3849bde700a23accbfbea7902b28b7807819ade94c8247d6882c469bf3adb
 AUX libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch 1981 BLAKE2B 69625606757a2b77c9fe4f38b2921ae4f7fb3b929ff7a0a0b9b76b9af5b575264397ae2710398a58fe5af778ab71db3494e4ff597e4cd1595d93b078d002c2f4 SHA512 8e2186f3eecd6bcdf523d4be24a9961251118e4375a5f923009ad1ec83c2c1fd96147ecb540197f780a397d9ff67b35b1f16b5a5180dce1b0aeb7c7c5bfa9485
+AUX libvirt-9.4.0-do-not-use-sysconfig.patch 8195 BLAKE2B b731d57dc86fe725d3cbd47b6e691a414107d3594377bd1c73e19735368937a0983e407ec05700213d2ec5802e90f429fd5c7354cd03fb25d3acced952ab6f38 SHA512 2a2e08a6034ed37cafebde3b0fd27913d972d1e9f8816e10a9af951e99f10bd3b9bc7ada1ac50c5085e3fdd3d02301365d031eb6ce3b71102e4b3072d609f21b
+AUX libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch 988 BLAKE2B 5936eafa5c300edad7ed368ec13063d31aea59e3daefeac59cf515ea44667f61aa63b0e2c2a5c88ace24c48cc132789cc5fa1a7c6c04c17e9ac61b114778e46d SHA512 5b80a5ec2898c1c821d0d49b9de67a256f82cb60879215ddde07c2a51f2e8a8b6893fec65617c27edec50cd51a362fb1fcdd21827e8de954f26879adcfa12418
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91
@@ -27,5 +29,5 @@ EBUILD libvirt-8.9.0-r2.ebuild 9136 BLAKE2B 197b18ee1f588691bc0947f7783208adf726
 EBUILD libvirt-8.9.0.ebuild 9113 BLAKE2B c6fb14ed1b96147f70cfcbaace9b5821c3cf955230e0a665b980094cab0ef6a1d31ea24fab0a8aea5c355213cd9669d64e76735ffb141daf59ef3c89ef1a11fe SHA512 d0f4d47a9edf7956a43c7ce74ab0b936edc6c22f420be32349e784a8fef91435ef0a7129f397ccdda91eb5fb5519a6c505422d46e32f26dde2cb354e25d53255
 EBUILD libvirt-9.2.0.ebuild 9067 BLAKE2B edff1ddc3ab7815b5905e88d64fd85a744f313519db5271999972b120d77da1a39f872a524a7c7296e289c976c9d5d51c279e41a818835a655821815a60b7dc2 SHA512 9d4a95519a38fc18e225331bde2e5d736b02d6fb74823082c6e3282ac4fcac4323ef7cbd6c846b5655b7034ce61322a5dd48797d1178bbba5c92df2d5fc927ff
 EBUILD libvirt-9.3.0.ebuild 9129 BLAKE2B 799bce3282b4b20c0c6afb7456fd492b3339045e801c98ec052cbd1f9da5dd45073e41a8c8c0ac925aa4d585528dfa493b5683dfc48871011be8a3f47a5a63a0 SHA512 593b49636446d1d1a69bff637357d22dba66ad9342846f43ec62b27da78a6f5011cc1eeaf070a67aafce7cb1c99edebcd80a6672f925bf8bd366cf460510b236
-EBUILD libvirt-9999.ebuild 9129 BLAKE2B 799bce3282b4b20c0c6afb7456fd492b3339045e801c98ec052cbd1f9da5dd45073e41a8c8c0ac925aa4d585528dfa493b5683dfc48871011be8a3f47a5a63a0 SHA512 593b49636446d1d1a69bff637357d22dba66ad9342846f43ec62b27da78a6f5011cc1eeaf070a67aafce7cb1c99edebcd80a6672f925bf8bd366cf460510b236
+EBUILD libvirt-9999.ebuild 9169 BLAKE2B bfc7c644b377c455aa3f30318e4295f2c9dd5894ec49caefb07b55fb98c754bf35b57db87186bdde857e28841c4097868ed64b75c3d81207ca4e60e53a325daa SHA512 2ee0021ed6a7295db012bd0318fcb21ce6404368e09a4b50978380d93b535c32bc9fa85f4be91cebba1e81e20b4fd74af51275f27e73ecf60d9169bf8a4b153b
 MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/files/libvirt-9.4.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-9.4.0-do-not-use-sysconfig.patch
new file mode 100644
index 0000000000000..cfd12efb3de7d
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-9.4.0-do-not-use-sysconfig.patch
@@ -0,0 +1,209 @@
+From 09e34bcb43b3c0fb3bf139f218ebc75e9e9f9a39 Mon Sep 17 00:00:00 2001
+Message-Id: <09e34bcb43b3c0fb3bf139f218ebc75e9e9f9a39.1683631803.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Wed, 2 Mar 2022 10:01:04 +0100
+Subject: [PATCH] libvirt-8.2.0-do-not-use-sysconfig.patch
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/interface/virtinterfaced.service.in | 1 -
+ src/libxl/virtxend.service.in           | 1 -
+ src/locking/virtlockd.service.in        | 1 -
+ src/logging/virtlogd.service.in         | 1 -
+ src/lxc/virtlxcd.service.in             | 1 -
+ src/network/virtnetworkd.service.in     | 1 -
+ src/node_device/virtnodedevd.service.in | 1 -
+ src/nwfilter/virtnwfilterd.service.in   | 1 -
+ src/qemu/virtqemud.service.in           | 1 -
+ src/remote/libvirtd.service.in          | 1 -
+ src/remote/virtproxyd.service.in        | 1 -
+ src/secret/virtsecretd.service.in       | 1 -
+ src/storage/virtstoraged.service.in     | 1 -
+ src/vbox/virtvboxd.service.in           | 1 -
+ tools/libvirt-guests.service.in         | 2 +-
+ 15 files changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in
+index 1be3ab32dc..090b198ac7 100644
+--- a/src/interface/virtinterfaced.service.in
++++ b/src/interface/virtinterfaced.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTINTERFACED_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtinterfaced
+ ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
+index abb1972777..dbbc2ab5b7 100644
+--- a/src/libxl/virtxend.service.in
++++ b/src/libxl/virtxend.service.in
+@@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities
+ [Service]
+ Type=notify
+ Environment=VIRTXEND_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtxend
+ ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 23054369d5..87193952cb 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -8,7 +8,6 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Environment=VIRTLOCKD_ARGS=
+-EnvironmentFile=-@initconfdir@/virtlockd
+ ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Losing the locks is a really bad thing that will
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index e4aecd46a7..d97a98e856 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -8,7 +8,6 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Environment=VIRTLOGD_ARGS=
+-EnvironmentFile=-@initconfdir@/virtlogd
+ ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Losing the logs is a really bad thing that will
+diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
+index 2623f7375a..b48ce6958a 100644
+--- a/src/lxc/virtlxcd.service.in
++++ b/src/lxc/virtlxcd.service.in
+@@ -18,7 +18,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTLXCD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtlxcd
+ ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
+index 48423e777d..ee4cd9bca1 100644
+--- a/src/network/virtnetworkd.service.in
++++ b/src/network/virtnetworkd.service.in
+@@ -17,7 +17,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTNETWORKD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtnetworkd
+ ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in
+index 3ceed30f29..7693aa52c4 100644
+--- a/src/node_device/virtnodedevd.service.in
++++ b/src/node_device/virtnodedevd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTNODEDEVD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtnodedevd
+ ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in
+index 37fa54d684..16d8b377b0 100644
+--- a/src/nwfilter/virtnwfilterd.service.in
++++ b/src/nwfilter/virtnwfilterd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTNWFILTERD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtnwfilterd
+ ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
+index 032cbcbbf0..85a1049567 100644
+--- a/src/qemu/virtqemud.service.in
++++ b/src/qemu/virtqemud.service.in
+@@ -20,7 +20,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTQEMUD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtqemud
+ ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
+index 11507207a1..9cda330e0b 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -28,7 +28,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=LIBVIRTD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/libvirtd
+ ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
+index dd3bdf3429..0eddf5ee93 100644
+--- a/src/remote/virtproxyd.service.in
++++ b/src/remote/virtproxyd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTPROXYD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtproxyd
+ ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in
+index 774cfc3ecd..92e54f175f 100644
+--- a/src/secret/virtsecretd.service.in
++++ b/src/secret/virtsecretd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTSECRETD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtsecretd
+ ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in
+index e1a1ea6820..abe91e3d80 100644
+--- a/src/storage/virtstoraged.service.in
++++ b/src/storage/virtstoraged.service.in
+@@ -16,7 +16,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTSTORAGED_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtstoraged
+ ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in
+index e73206591a..54fbd0be4a 100644
+--- a/src/vbox/virtvboxd.service.in
++++ b/src/vbox/virtvboxd.service.in
+@@ -15,7 +15,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTVBOXD_ARGS="--timeout 120"
+-EnvironmentFile=-@initconfdir@/virtvboxd
+ ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index c547218f2a..f5a1a60abe 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -14,7 +14,7 @@ Documentation=man:libvirt-guests(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-@initconfdir@/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+-- 
+2.39.3
+
diff --git a/app-emulation/libvirt/files/libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch
new file mode 100644
index 0000000000000..d40d2f1b63ec7
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch
@@ -0,0 +1,32 @@
+From 7f22569453720994ba49ca1d3c64c010ed7cc5d0 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 31 Jan 2020 09:42:14 +0100
+Subject: [PATCH] Fix paths in libvirt-guests.sh.in
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tools/libvirt-guests.sh.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index 016014215f..24dd706d6f 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -40,11 +40,11 @@ START_DELAY=0
+ BYPASS_CACHE=0
+ SYNC_TIME=0
+ 
+-test -f "$initconfdir"/libvirt-guests &&
+-    . "$initconfdir"/libvirt-guests
++test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
++    . "$sysconfdir"/libvirt/libvirt-guests.conf
+ 
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+ 
+ RETVAL=0
+ 
+-- 
+2.39.3
+
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 6ca1ae130822f..3d66a605794d1 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -142,8 +142,8 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
 )
 
@@ -291,6 +291,7 @@ src_configure() {
 		-Ddriver_vmware=enabled
 
 		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/conf.d"
 		-Drunstatedir="${EPREFIX}/run"
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d6f2efc9a2b8d..b0298819cab62 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 81e850b5de979..a740f96203c2d 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,14 +1,10 @@
 AUX libxml2-2.10.3-python3-unicode-errors.patch 1208 BLAKE2B 8515db0c9d79c4397c3ef4147660ddf395b863de3658a8db27db20d2274949962172a42637bf9555d3d7bf63ead8f695d19f28ddb5e957b5302c8aed466058c7 SHA512 f2ab7934687ba14bf7541a381317d88c20d9912b424d1b206f8feb60224482f12e03c79ff4e8637025ee8d1bddd870183db932380990eafca833eea1c1373a06
-DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
 DIST libxml2-2.10.4.tar.xz 2643600 BLAKE2B 5bbb63c6e58accf434513aeb974fed7349e5458de642ef89db77768c8d1383532614254e0e3f1d9471e2274c6b81a04a0a3afcb602707ce79550c2bd8e9028d9 SHA512 792c1dceb098cd353a7eca4c46d31cce6310b2553d97fd3918cf0b94d93b2480759202036511bde36c24166236bd4616f57e79959eea9afe3f60614bdfe13094
-DIST libxml2-2.11.1.tar.xz 2627948 BLAKE2B 4ae2c8583ff2fb590b29ffc250baae8d4d3978c6cb9d1d7fadbd3d9aa1d38a69ed0aeb0c9036efb060f869154e6f6d6ea6464ecbb05c7e788b7d93b1c2fa932d SHA512 cdcc06b7f8f8c2bd05ce3272dfd317b49cb52842bbf4bd6b50cd93c6f0b1bb6f57698b20369f6afeb110338b950633babfb8e9858b29f8c7d8b710fcbbec679d
 DIST libxml2-2.11.2.tar.xz 2627884 BLAKE2B 2785354724af03274f9796b10a5f6918a956a7b08ada2032c644cf7829a67d8628363b74d134dd2677f42d0df7f79a6f105e46e5f073416349f5bb36f6180859 SHA512 9b49522d816d7e5682bb863e7706c8e9ddc629d9148fbe6753e82aef4859c11ba6a4b6e801de967b5c3da517d44d0be2dc6b47553b0efee6f04f4cbf1d7285d5
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.10.3-r1.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3
 EBUILD libxml2-2.10.4.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3
-EBUILD libxml2-2.11.1.ebuild 5449 BLAKE2B 6ba3a0f2a4f9999048a6216679a599f7ee4dd314d4b4b70c4bbcbf8df143722e6aa0a18e7191b8ddfd49912a29f702a4247f7faea002f11f60b8868ec45e1c69 SHA512 e55897c65b3b251a60f6e7b006ac0879527470bf5f7e602b29758b9ae035ef31c318fd52c0abf63c6ff51a00106b0bf84c8150e9f06eb5a6456ca2b6048f2eb4
 EBUILD libxml2-2.11.2.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866
 EBUILD libxml2-9999.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild b/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
deleted file mode 100644
index dde6d39580c96..0000000000000
--- a/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
-	inherit autotools git-r3
-else
-	inherit gnome.org libtool
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-SRC_URI+="
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)"
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-LICENSE="MIT"
-SLOT="2"
-IUSE="debug examples +ftp icu lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]] ; then
-	BDEPEND+=" dev-util/gtk-doc-am"
-fi
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch )
-
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		local tarname=${P/_rc/-rc}.tar.xz
-
-		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
-		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-		unpack ${tarname}
-
-		if [[ -n ${PATCHSET_VERSION} ]] ; then
-			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
-		fi
-	fi
-
-	cd "${S}" || die
-
-	if use test ; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		# Please do not remove, as else we get references to PORTAGE_TMPDIR
-		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (bug #26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
-	# Notes:
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--enable-ipv6 \
-			$(use_with ftp) \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	# Build python bindings separately
-	libxml2_configure --without-python
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_configure --with-python
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}"/python >/dev/null || die
-
-	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
-
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python ; then
-		NATIVE_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl run_in_build_dir libxml2_py_emake all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-
-	emake check
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
-
-	# Hack until automake release is made for the optimise fix
-	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
-	multilib_is_native_abi && use python && python_foreach_impl python_optimize
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n "${ROOT}" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# Need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# We don't want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e "${CATALOG}" ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
diff --git a/dev-libs/libxml2/libxml2-2.11.1.ebuild b/dev-libs/libxml2/libxml2-2.11.1.ebuild
deleted file mode 100644
index bce83228cbc6e..0000000000000
--- a/dev-libs/libxml2/libxml2-2.11.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
-	inherit autotools git-r3
-else
-	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-SRC_URI+="
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)
-"
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-LICENSE="MIT"
-SLOT="2"
-IUSE="debug examples +ftp icu lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]] ; then
-	BDEPEND+=" dev-util/gtk-doc-am"
-fi
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-# Needs testing to see if still relevant (bug #745162) and rebasing if so
-#PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch )
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		local tarname=${P/_rc/-rc}.tar.xz
-
-		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
-		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-		unpack ${tarname}
-
-		if [[ -n ${PATCHSET_VERSION} ]] ; then
-			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
-		fi
-	fi
-
-	cd "${S}" || die
-
-	if use test ; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		# Please do not remove, as else we get references to PORTAGE_TMPDIR
-		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (bug #26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# Notes:
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--enable-ipv6 \
-			$(use_with ftp) \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	# Build python bindings separately
-	libxml2_configure --without-python
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_configure --with-python
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}"/python >/dev/null || die
-
-	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
-
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python ; then
-		NATIVE_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl run_in_build_dir libxml2_py_emake all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-
-	emake check
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
-
-	# Hack until automake release is made for the optimise fix
-	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
-	multilib_is_native_abi && use python && python_foreach_impl python_optimize
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n "${ROOT}" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# Need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# We don't want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e "${CATALOG}" ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 50a3e98e72410..2e10b546f39f6 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/scap-driver/Manifest b/dev-util/scap-driver/Manifest
index af35cc9042f10..f70143e6160eb 100644
--- a/dev-util/scap-driver/Manifest
+++ b/dev-util/scap-driver/Manifest
@@ -1,6 +1,8 @@
 AUX 0.29.3-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B 8e5a89b68fb67076d01a7dc295157d2f2542a2db84460a35ed3162b77ff860097f1761317b93dec6aa0d6294b4414e445fd2c94df700bb5d738210982174f595 SHA512 f7c1e57cb05de1a97a3332055f6d6f74a637f38281a4e98b202cf84c9dd02b90e0b4fee3dbc44653760231ce55ad396aec3018b3b239249b6a37b018f672fba4
 AUX 0.29.3-fix-kmod-build-on-6.2+.patch 1420 BLAKE2B 45f312bce9ce3dbaa0ddd300ccfd7dfcc3fb6d537cd0b716642d25b4c5a3747798ca23d237d67c92d32da500edb5e0458bfdff4a940d2f6fdb84144c5687028d SHA512 4b84a2559cb6a72d294b5cac6ec2d6f2de8ae90e298e27afcdff6bc046366afca6468ac923c4197623f14bbe0a4d0bd3757f34740a367e6b7c4e76472b102379
+AUX 0.29.3-fix-kmod-build-on-6.3+.patch 939 BLAKE2B c626a6c9e41510d9720a8d161f4b6fa2efc729437cffdeea97ab346b0dca9a18af82339e403b63c7ac297304893f686a20f5c612df417229b82701367530098d SHA512 c2b020de87c92724f93a0937e2ece2f1e88f8b0dbb5b1d85bffccd51fddc1fc2024fe0ae222f2f01adeb5dc34964b1e86f27f0bdfee347bf1bb927388c1b6c5c
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 EBUILD scap-driver-0.29.3-r1.ebuild 1871 BLAKE2B fa97c444251044913625228bd42d8ab22be21f69ddc75f4e45c15df832c1d1a6dab927f146fdb03addfa244a71ae2329d9651a2a454b79f45dd8a99eb53509da SHA512 7cc7ec73b64691fb8109b4fb406ce3ce565d9d09ead707290394599035f9d6059e5f88bce857b380c967a1edf008442541d692fd453a57880c1f61458da736d9
+EBUILD scap-driver-0.29.3-r2.ebuild 1921 BLAKE2B 992e21dfddd65f396a715da0040abbd33dea30c8e0347bdb4dd3886e10f4b4ccfd1c9083e63d422b99b4eff32494dfc026550ddef96e345a03d19d8ea5a94219 SHA512 6a7ba57ae0a3cde946981dea2e36a77342a4333dd41d47e4cb3f1938219d47c5fc89f267ced7650413217a36de2f132c8aac3650d20b18e2574c88654ab094a5
 EBUILD scap-driver-0.29.3.ebuild 1818 BLAKE2B 739c7da7402f536aa4ee483c77de16498fef6460bdaad84f35bb7bb6f4ad06daac2e99349498f68f741c8348120ccb535bdaa7333d17ce10f3feea78d4889ddf SHA512 7c7d39dc69f2cdc28e656911513ca560722399b051adb5ef6a5626503536337ab7eeae39a2b9ababd217188324e4f270cc3ff9105ca04c63f3f9a919ebf26931
 MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0
diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch
new file mode 100644
index 0000000000000..6926df857179c
--- /dev/null
+++ b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.3+.patch
@@ -0,0 +1,20 @@
+
+Bug: https://github.com/falcosecurity/libs/issues/1063
+Subset of patch taken from: https://github.com/falcosecurity/libs/pull/1071
+
+diff --git a/driver/ppm_fillers.c b/driver/ppm_fillers.c
+index 0441923c6d..cfa967f134 100644
+--- a/driver/ppm_fillers.c
++++ b/driver/ppm_fillers.c
+@@ -1329,7 +1329,10 @@ int f_proc_startupdate(struct event_filler_arguments *args)
+ 
+ 		if (exe_file != NULL) {
+ 			if (file_inode(exe_file) != NULL) {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
++				exe_writable |= (file_permission(exe_file, MAY_WRITE) == 0);
++				exe_writable |= inode_owner_or_capable(file_mnt_idmap(exe_file), file_inode(exe_file));
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
+ 				exe_writable |= (inode_permission(current_user_ns(), file_inode(exe_file), MAY_WRITE) == 0);
+ 				exe_writable |= inode_owner_or_capable(current_user_ns(), file_inode(exe_file));
+ #else
diff --git a/dev-util/scap-driver/scap-driver-0.29.3-r2.ebuild b/dev-util/scap-driver/scap-driver-0.29.3-r2.ebuild
new file mode 100644
index 0000000000000..129db40bcb860
--- /dev/null
+++ b/dev-util/scap-driver/scap-driver-0.29.3-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-mod
+
+DESCRIPTION="Kernel module for dev-util/sysdig"
+HOMEPAGE="https://sysdig.com/"
+
+# The driver is part of falcosecurity/libs, but for versioning reasons we cannot (yet)
+# use semver-released packages; instead we pull in a commit that is used and known
+# to work with sysdig, see sysdig/cmake/modules/falcosecurity-libs.cmake for details.
+# For now the commit here and the one referenced in sysdig should be in sync.
+LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
+SRC_URI="https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
+S="${WORKDIR}/libs-${LIBS_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="!<dev-util/sysdig-${PV}[modules]"
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod, so just pretend to use bundled deps
+		# in order to make it through the cmake setup.
+		-DUSE_BUNDLED_DEPS=ON
+		-DCREATE_TEST_TARGETS=OFF
+		-DDRIVER_VERSION=${LIBS_COMMIT}
+	)
+
+	cmake_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="scap(extra:${BUILD_DIR}/driver/src:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	# work with clang-built kernels (#816024)
+	if linux_chkconfig_present CC_IS_CLANG; then
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+
+	BUILD_TARGETS="all"
+}
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index 9cac2dfec099e..854fa11132130 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1683747626 Wed May 10 07:40:26 PM UTC 2023
+1683749428 Wed May 10 08:10:28 PM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 114e7e41cfff1..026d6c2bef628 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 16387d31bf926..8fec2d004cb5e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 19:39:47 +0000
+Wed, 10 May 2023 20:09:51 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b312a5c2706b6..9fe83471e0e9e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-10T19:39:50Z
+TIMESTAMP 2023-05-10T20:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRb8wZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRb+hJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCYKw/9GrH9vVljS2ZaOe0AClYhYjol/Gpt69B/W2x3JYETxZEoA2oSOn3iJoRX
-KI3qHcm6XYOz+91JKvUrp0TuG4OxGxu3c1NpleQJcBlQZuDLiQXasIY0fHEykFUb
-5dGkYQB23Lzkm5SqdetLoGHqTTpJ+RE4q0xASNplMQjhV39yHL8u0Vf/OuMgDnkv
-vaInif+a9EqGTy3dkspQ8aVURVOW25j2Obj4lUd2Xt8WFYRU27qcZN5u9APwYZUp
-YdjFq0xla1aZnFZ0acGer/ZVwQeFEhDHHA4EXfy+m9i2UhcnTsc1UUslvXd7xQyZ
-16W/YSNvGDMxRCxKtMYVX7mZgB/4hqEhGYGmNlNsWjxW95U0gBWiUbDs/KPi+V+q
-PMENz4ygXf23WmD2ebGxevJuvgc41ta9dHSv1TPzFFIqV/uFCP+2r0qNKiw/xfwW
-TRO1ckAucPX1i6LrDlLqhzsdzslCBMtnRgMcBJ1A3riVgC/vOP2cqzL7pfmWFVx6
-YzRJV59Ne/60e/rfzJcIwRvuCbzDsbnyUFqS2jwIQnXBJWljYVXDrQc3m7df+t8H
-JV3LJTM+tZPKFs0+oTsyKn2MoJ+mw4ugyXOF+toBB9fitCJSikL+mBFisqPJEoNV
-e5P1aVUEnQnV1e2JLa1huON/9dQLIhLClD9Tyz7HobocxrrYeyE=
-=c48h
+klAeJBAAprcH9pFxEMEwj/VKdMF7ZTqVt3qilE/fy1SN4EL3Yo5h0vS+5exZSYhw
+kKVAP3S013ZvSPG2X8LU9zIBP3swAsFqrOkWf83FsQcXYMQjaycZ5McewwY0XV+g
+3ktX70ciliUgtL+CcG0PmKFkWZNdgdMna8OZhKI0Si2Ez3Utz6PfkjsspEG7y/At
+xQFy+Ww7D+F0Tqkiv9Wwsg/Sx9iG3B/0pzMxVCuvwxZcMe4fF1UmriwZ3uR5mT/C
+fQWctAroAwOj4C6LMcym5nG7I0+pMA8TpIhZQP+e0ABsU7J7Ei8Cz0ovo4QoB5I3
+Jn4KYZoyxf+ViJ3VBiG1uj2XHmr0JZ+DCor1orbZZ46hwChBgp2hGWAMJXuRu8FZ
+P700mbWPl0h3EAe/v/e9shJvhoe9U3vl/V9ouRXesTX1aThYOldoPIuUP6+RK3JC
+uVRl0W0984gtTE0JL9fSZsJxDhrI8cGInkBFuMj3x7DP89Gv3xZAg7Ur9YKL/B92
+fwO6nU3MLximjPuiuVlaqfLQqur0O6nxwSVCVG9lcD0gWktI1lfpnsfjPHiD4j+d
+zmSV+fv/7R6ZNLSei9Xb5sgDrxHrVNsuqF7915WyKvGf2kOKivTntOrC0RiUFvye
+BoDlE0m6PSHbaTV6MgkCvQUnt1BeUpgylp2ZB5iMt19mbBxMcAU=
+=o3uU
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f3da5e1da729d..815b4a390872c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 19:39:48 +0000
+Wed, 10 May 2023 20:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b87370422ffde..1b9a0e5d8c257 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index e4f603e7a36ba..1b6c97161b03b 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index f7f9bd40cfb49..32dd52d55b6cb 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtua
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=e3a4656990168386d4d0696b33d8d87e
+_md5_=9da28b5b770bd6a1d5f0248fed32e76c
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c6ebc1049dc17..0886ad9333607 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.10.3-r1 b/metadata/md5-cache/dev-libs/libxml2-2.10.3-r1
deleted file mode 100644
index b0431e374e7a6..0000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.10.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
-DESCRIPTION=XML C parser and toolkit
-EAPI=8
-HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=flag-o-matic python-r1 multilib-minimal toolchain-funcs gnome.org libtool
-IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_10 python_targets_python3_11 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/libxml2/2.10/libxml2-2.10.3.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnome.org	6b39404f1491c60a2d32e3c693a683fe	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0bd86b252ca059f934e7e4cfb8597690
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.11.1 b/metadata/md5-cache/dev-libs/libxml2-2.11.1
deleted file mode 100644
index fec2a43155d89..0000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.11.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
-DESCRIPTION=XML C parser and toolkit
-EAPI=8
-HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=flag-o-matic python-r1 multilib-minimal gnome.org libtool
-IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_10 python_targets_python3_11 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/libxml2/2.11/libxml2-2.11.1.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnome.org	6b39404f1491c60a2d32e3c693a683fe	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=404279c67ec2c01a1dabeb0348f9c468
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9d566e821c817..8d927f940adc0 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/scap-driver-0.29.3-r2 b/metadata/md5-cache/dev-util/scap-driver-0.29.3-r2
new file mode 100644
index 0000000000000..b0b83d8e081ef
--- /dev/null
+++ b/metadata/md5-cache/dev-util/scap-driver-0.29.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel module for dev-util/sysdig
+EAPI=8
+HOMEPAGE=https://sysdig.com/
+INHERIT=cmake linux-mod
+IUSE=dist-kernel
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!<dev-util/sysdig-0.29.3[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/falcosecurity/libs/archive/e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz -> falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	e02e2112f542b74962d5d264c60a08de	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=66fdf8827b2e4f35f84174df754e31f0
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index b56b02064155a..1c6a35584cd6a 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2 b/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2
index 4a1bdea86d4ad..c5374d2dfc080 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2
@@ -1,6 +1,6 @@
 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=compile configure install prepare setup
-DEPEND=>=sys-kernel/linux-headers-2.6.25 elibc_musl? ( net-libs/ppp-defs ) net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
+DEPEND=>=sys-kernel/linux-headers-2.6.25 elibc_musl? ( net-libs/ppp-defs ) <net-dialup/ppp-2.5:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=7
 HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe
@@ -8,8 +8,8 @@ INHERIT=autotools readme.gentoo-r1 toolchain-funcs
 IUSE=tk
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
-RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
+RDEPEND=<net-dialup/ppp-2.5:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.15.tar.gz https://dev.gentoo.org/~polynomial-c/dist/rp-pppoe-3.14-patches-01.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=be6ac95ec4cfbcac631710f3eb83140c
+_md5_=bf6c4fa318fd749119fb3a351b11a909
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-4.0 b/metadata/md5-cache/net-dialup/rp-pppoe-4.0
new file mode 100644
index 0000000000000..41439494b9483
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=>=sys-kernel/linux-headers-2.6.25 elibc_musl? ( net-libs/ppp-defs ) net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
+DESCRIPTION=A user-mode PPPoE client and server suite for Linux
+EAPI=8
+HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe
+INHERIT=readme.gentoo-r1
+IUSE=tk
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
+SLOT=0
+SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-4.0.tar.gz
+_eclasses_=readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
+_md5_=64eb33d076f1c0ebe71d7f979e537b98
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-9999 b/metadata/md5-cache/net-dialup/rp-pppoe-9999
index 9cd0bf4e9e49f..d8b99ffa541cd 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-9999
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
-_md5_=4c90d1720fc7d2420702b7f85477f525
+_md5_=64eb33d076f1c0ebe71d7f979e537b98
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index bcd9bf2b8409b..784a80893fe69 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
index 8a93daa2cb126..8c977beeb6f2e 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.75.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=82cbe7d33d7da788a7ef66150a152383
+_md5_=2a77b64174a699fd552bc902d672dd23
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.76 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.76
index e922cf9a4e69d..7f299ec98248b 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.76
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.76
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.76.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7c916cb4c5fa469203543c6289841e2b
+_md5_=df412184f173283198e095d3fd173a13
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index af05098ca6835..77a2ddbd6139a 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.282-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.282-r1
index b67f23ac63b58..27c2b02989298 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.282-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.282-r1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.282-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-283.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-283.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-283.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-283.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-283.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-283.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8c69974a172189fd21e24d5d3179e770
+_md5_=5da74ed4c26d34622900018677427c26
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.179-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.179-r1
index d0b76e7d7e191..bdd7a79ee895b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.179-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.179-r1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.179-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-189.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-189.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-189.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-189.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-189.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-189.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7a25faae405c5a12024e1ea03e933321
+_md5_=bab6862feb4ff96cfd527d85a338a0a5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.110-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.110-r1
index 07dbf5d3ac348..8154c106cacaf 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.110-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.110-r1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.15.110-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-116.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-116.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-116.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-116.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-116.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-116.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fa962177f77dd35617cb42fc1f1994f2
+_md5_=5eb7d13ef959b9e176cb58724e95581a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.242-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.242-r1
index a1bdf8dd14eea..387fad0024370 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.242-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.242-r1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.242-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-249.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-249.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-249.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-249.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-249.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-249.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c94b98074bc3734c55569a2cb011fad8
+_md5_=f22ccbed164eb66c0511f50e373e65b5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.27-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.27-r1
index af83ec7369e10..7213183bed543 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.27-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.27-r1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=6.1.27-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-32.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-32.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-32.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-32.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-32.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-32.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=41c15cdd5827ef75985ea66d13f801f8
+_md5_=6a3a1dd89b8f069952584862db1c69d1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ccce98230bf5e..796457dfe293b 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-05-10T19:39:50Z
+TIMESTAMP 2023-05-10T20:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRb8wZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRb+hNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDR6Q/8Dp4lZLNC1bVPAYZtRyw3EoXiToOEH1V8Hzaidh3ruxxiGzTBDiC6gSdh
-v/a2VN/fa9+vfE2Vr58ilXlrKEa4j/Q/YIoYVqtCzY8mwc9BqS0WYsl8Yw3y/jpm
-+8zP8c4jClimDsWfpKQExIucysnyxk1k+bIdsCsMJCWkAz/uvS42+cdDz2ra/2Dn
-206KCOxk8R7WlKEp4nS4F20uc7Stc2v0JAXR+CpzMbLXgW4JwSiFfOL/g7MuPr4K
-r198Nx/DTZyRsevGX8FwfaiqtZ+qP2E+b536bQ6udBBEGpplVKaPHp1yh/Euc0H9
-is3T+WnaujfWtQ0mxwPdYu9eWL/a7A9cX40DyUTy7klky4CDIq2TTmEsb54Xc8F2
-9g/54WgT7Zxr8bbPIMqe6eaLTfQO+tntbL+ghyzfJrfdf5NzD56z291obzrNmgLF
-3S/+TKz0deLFK23kKJ73SkZlTvpcDarf8ul4rk/ThjIN8sBmvgyukO2jo0pwcJaI
-I4xoR/G0M00KI7ruJuXpJyKlMetoI6ynOCPdsHcftqH/vA8FZD7Y2n7fpEVNaU2p
-gpm3dXWanj53pD8KfjlDvKLcQFh1S1c+ZIF2/+wD7t2hHwAAMV3PEbIsxEJn4WzU
-dAWmO5z1hMa9zGsKEGLXjsAo8LVsi8q3zUp7LuhMy1weIqiLPzI=
-=IUAs
+klAlow/9EEkVFqrcKJfhcJ68MVqFJ5olR4uooUnNFuAAsFX4VibMTZFA2t/YHVdD
+HX1C3SYHPw2/FLrZLpYk69pCAzRmK/R+9gSCUYh7lU/yt0y3JHdED1F3V2CCQb0d
+d97sJdzsf/ZtRADht8B+W+LH/E+peBe1Eu/NPG5WBZjFCo6FskH7W31k3UA8PKaT
+/86A7hrvJCoaXbWWNqWwMUS5o9m4XuDj5qEIslCXqKRD3+hxbgLAZF3wEJBcUfXY
+QYlNXop/3I6vXGrQi9/tkmKP0ufqJ5iMGmrKy1FjBeJKRgtnZkDpimeM6CApgXm5
+D3TddLLh1ugv0QeGb06DqaGqT9cNXSxZb1UVTSwIdmrk3vqYMM40Jyo+nZeZcskx
+wt4whOp1rq1onL/BKTRcFKkI3IL3HnvsCGxO99+VrHl/+YYEEf082ujhAJ1w9RHA
+QHcF559FMrVeDTyiHHqppM+3d9fUuMP6WokqWznck0Xrm/c21ZUonKa3oCJUnUUE
+BIVLun4+aOTiCg3aBASKFcouJvF4WJa3tVy/O99SbjNkBDhIHbnpK52gSqHfU9hz
+pGgRLz/qQ9bmkOSVBwHnqW89minvO8ujXDYBS91BP2CwyTqsGa7xQOBLtbHIFpDi
+IAgvVn2jA+unCtD6t6qgVLYDz0CrdGaW+Lswt7DejpXVzkgCeGk=
+=Q7aV
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f3da5e1da729d..815b4a390872c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 19:39:48 +0000
+Wed, 10 May 2023 20:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fdbe941f27ce0..7b31574643bfc 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 10 07:39:47 PM UTC 2023
+Wed May 10 08:09:51 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 42ffaef2ed35e..49115bed00f77 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 19:45:01 +0000
+Wed, 10 May 2023 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index dbdc8700ebb69..d8b00106ca107 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-004bf24534a66eb856eefb9735d18090e7565e2d 1683747273 2023-05-10T19:34:33+00:00
+64f23e054166794040d249b4eee4097407259f94 1683749090 2023-05-10T20:04:50+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 878edecece87f..8481f40624a3c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1683747601 Wed 10 May 2023 07:40:01 PM UTC
+1683749401 Wed 10 May 2023 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f3da5e1da729d..8fec2d004cb5e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 19:39:48 +0000
+Wed, 10 May 2023 20:09:51 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 1b79fd743022b..1c0a71dbc378f 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 7b1aeded570ea..dba7b229b0c5f 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -3,6 +3,8 @@ AUX pppoe-server.initd 456 BLAKE2B 1dd9e1dbfe7e18c4f20d9e7a6eb99f942742516273053
 AUX rp-pppoe-3.15-no_max_interfaces.patch 2821 BLAKE2B 3ad091bb9fbab181a223c92c143ff860e0541856cc2e4296700eff08db81f42562f365da9bb836d8180f8ce8c08042e5fa4fc2466a0864678e46f14df619e324 SHA512 16567d42c4691fa0bee04bcca5dc200385c8749c97e147c4134f4290064ab00fad4e1ad8847aaa0be975d7bc2dea024307adcc91f47d54ae20bb42ae0e8dc18c
 DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
-EBUILD rp-pppoe-3.15-r2.ebuild 2271 BLAKE2B 8ae2cb7083e21200c1746333768fe85c07c116aafba342c549a8fd069d85476f8412258cab4f101c6512554dfdbd7a1c3e8807ab7f442ae70e795074b969dfde SHA512 77b37dadf0401ca9da4faf7409209229b37172c019eb5f9018df3ceaf9941b83cb27dab7f0847f585cd3df8bdf4649caa523bd36275f190ac9e4e74fb420a3f5
-EBUILD rp-pppoe-9999.ebuild 1946 BLAKE2B 046221ff976fc71e8c7ff90465eb51d33cafefbdfc7114ce37d114845b8bbe7391b0b19dcf00e05d37375e820c20d0202268bd09f657a74fa7387d8b2d08a8d3 SHA512 915b4aa6d223eff27088fcbfc30b3d5e53150f3926738f1618069b8338a3335b3cc164ae08645895ae4f720da1bdadf196e045062a54a9e4decf5526d7e3106b
+DIST rp-pppoe-4.0.tar.gz 139539 BLAKE2B ba9f11e547dafdacf6fc4d525488a4ac0279b06d545e0c116e568c92a45eb8ab558ca9112f1debecacde5401cb5974eacdf972b1b4cd813711589b8181e918de SHA512 faebe543988b1ffacd4d9bf55a3ec21f3a541f9232ba6c7b6fa0e8103d6c2b7b1c358e7f7bc8f99bebb24b2f7bdcc2f46ba1ef4c23e6dd34062f8f28114e7aea
+EBUILD rp-pppoe-3.15-r2.ebuild 2276 BLAKE2B 1cfb507bd01fd01ca806e595152bc5ef71f1a0b967f1b00b73aa3a5fec50c21ec21b1ccc9cd563fc89cfe1e2d03373d9586f2597f9ab2ea9b9f1a1293921ab0b SHA512 d941aa471c4947021fdb01c2178315848ea0f7ea46d53549a3ad7def23cc017984684c7df0c1b648796f68485adb08e87ff56aa36eaf6e591a7587e693a4e099
+EBUILD rp-pppoe-4.0.ebuild 1882 BLAKE2B 1ee790ccdf5f65be82ee4e87225ba147723e405f78efe08c088a8beb0fcfbb412fb9fa676269bde307298021d2919a2f6a1a04a135f682527c9532a52ab28c35 SHA512 448b010a51738d22417f846b0784588b07c71e47c150ed72dacb7d095fae0ad7972425d3c01a90662ff9fcb5085a9fe04c1cf39afbf68d22bbe748b00efaaf66
+EBUILD rp-pppoe-9999.ebuild 1882 BLAKE2B 1ee790ccdf5f65be82ee4e87225ba147723e405f78efe08c088a8beb0fcfbb412fb9fa676269bde307298021d2919a2f6a1a04a135f682527c9532a52ab28c35 SHA512 448b010a51738d22417f846b0784588b07c71e47c150ed72dacb7d095fae0ad7972425d3c01a90662ff9fcb5085a9fe04c1cf39afbf68d22bbe748b00efaaf66
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
index 79f536d951d8d..881de14186c0e 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc
 IUSE="tk"
 
 RDEPEND="
-	net-dialup/ppp:=
+	<net-dialup/ppp-2.5:=
 	sys-apps/iproute2
 	tk? ( dev-lang/tk:= )
 "
diff --git a/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild b/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
new file mode 100644
index 0000000000000..49505ea74cfce
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe"
+if [[ $PV = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=https://github.com/dfskoll/rp-pppoe.git
+else
+	SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tk"
+
+S="${S}/src"
+
+RDEPEND="
+	net-dialup/ppp:=
+	sys-apps/iproute2
+	tk? ( dev-lang/tk:= )
+"
+DEPEND=">=sys-kernel/linux-headers-2.6.25
+	elibc_musl? ( net-libs/ppp-defs )
+	${RDEPEND}"
+
+DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
+
+pkg_setup() {
+	# This is needed in multiple phases
+	PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR}
+	PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV}
+
+	PPPD_PLUGIN_DIR="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+}
+
+src_configure() {
+	addpredict /dev/ppp
+
+	econf --enable-plugin=/usr/include/pppd
+}
+
+src_compile() {
+	emake PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
+
+	if use tk ; then
+		emake -C "${S}/../gui"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" PLUGIN_DIR="${PPPD_PLUGIN_DIR}" install
+
+	# We don't need this README file here.
+	rm "${ED}${PPPD_PLUGIN_DIR}/README" || die "Error removing ${PPPD_PLUGIN_DIR}/README from installation"
+
+	if use tk ; then
+		emake -C "${S}/../gui" \
+			DESTDIR="${D}" \
+			datadir=/usr/share/doc/${PF}/ \
+			install
+		dosym doc/${PF}/tkpppoe /usr/share/tkpppoe
+	fi
+
+	newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server
+	newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server
+
+	readme.gentoo_create_doc
+}
diff --git a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
index b7e763a73d838..49505ea74cfce 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
@@ -11,9 +11,8 @@ if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI=https://github.com/dfskoll/rp-pppoe.git
 else
-	SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCHSET}.tar.xz"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6acb3835c1f18..00b8cc40ef3b8 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 2cd4d1f7eb3e9..f1e9a96a70cfe 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,6 +1,6 @@
 AUX libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch 2078 BLAKE2B c3a7882d6e340c29fb26dce1c08ee2bf13a7fec0dfaa2b02c4f12afaa7d1ac0c610e33867b44f053db757188d160c57eedd55a77f1bcbdfcbf7d957ffcd81489 SHA512 b19c93b5139bfd50f7ab05c3a586a0d1ecb2c3e67b4f57eb48d1c0839dac44e860b699df6812f40563891435ba47b124fade74703d72c7f345c15dc367b3a0ce
 DIST libmicrohttpd-0.9.75.tar.gz 1952076 BLAKE2B 419d7b7113edbcc54eec3e3b6da92d040e15b451bde4e1372b368fdd87277c85daddc295bc71d25bf02135921a8716876e9536c9dee286fa29b66bfb8167ebd2 SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c
 DIST libmicrohttpd-0.9.76.tar.gz 2199858 BLAKE2B 2c2de77d731ff130bb1491733b91e9e0b0c68bc30ea1a826f7f1d97aaf83fa7f6bec3c219f81c5293de72595b26d1e6eb66cdd4bfe3b16bd37a10e3acd3c6446 SHA512 9ff8a837892142376eaeaf50c0b0dba76697d0ff44b908434cba8db4324c57dfb8bbcc1a922b97d825891ac10f50693dee9388531856e0fa81fa2cfeac538581
-EBUILD libmicrohttpd-0.9.75.ebuild 1472 BLAKE2B cb34d443f9750e8b98a61aafa5522165f6d472a96df3e6dbad778982448a02d69b3c6f127f01af64f04af11b20eb64edb60d13d9f924c376c437a986cc89b477 SHA512 19b87380485323e3fd67f31032a70cd2da3491c1476669b025a48098f0f934d6a10394b5b45805f08c9215cec9b130ff12564b3d5e92e3930a094c31005fb12b
-EBUILD libmicrohttpd-0.9.76.ebuild 1487 BLAKE2B c251ba3842abbbb74d417104170889709894af4def95df02ba6f007124ede2be1a5498234c63064d2a286b3f78f227db4bc7bd96fc80c47c7abdb60e5fb33c06 SHA512 4e0c2146797a530dc98a476a6fd4ae2c6b470f2c21f7d4aeb3c79f27126aefaad8063ca0f4d47f59f02f12f92480d24bc23c742f73b8f88f6765dcac364f99de
+EBUILD libmicrohttpd-0.9.75.ebuild 2087 BLAKE2B 6a6175c70ffddf206fa793c7f014315bc4677a691a834032ac03ce871619552810010c8fc4ac89790bcad984cb3a7a93d18eb615cb20c05da8baa12284f55b5a SHA512 dd844ee14fc05ffb3c33aeff2f1eac487072a93a24a6529c33656fdf73bdc2b97256e5e5e8801b2925a4be18d8c729ea628af3e20a15ae61ef56b7aaf4c0b18b
+EBUILD libmicrohttpd-0.9.76.ebuild 2102 BLAKE2B 9bb570fe641228ddad699f73f7341a0b8fac72cfa85cae3c9a4244027c0ba4ef4fdbe0b611885ae572aedc3c8f585c476976a6b0e8ee5ac93582bcdd4c264984 SHA512 5734aeb2d810d3d3a00bce0f46658e644ebe21fbd0242576e8df9ff879e42d47042aacc62d9d1d7d664160e8c5cdce43db7d611875a5cec019e57a09c1d9fcb9
 MISC metadata.xml 652 BLAKE2B 5b461bd89d8b84747f66c3f34df6ae2fee5e1d1f37c39cbd2fbad3ea96ea554e916f027e0263c4a31780b4443ef514a50ec203990dc3094d5de02419b3719361 SHA512 e3cf24d7c55b8ccffcf9862bc9be76a5132d338c2a3af9c78e36a4aab7ba7ce93482ff2209125bb197041b248a9c10d249cfa467f25724fd7db4ee82fd35ed6b
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
index 91a33a5ffc665..1bb9ef7f324ff 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
@@ -28,6 +28,44 @@ DOCS=( AUTHORS NEWS COPYING README ChangeLog )
 
 PATCHES=( "${FILESDIR}"/${P}-fix-testsuite-with-lto.patch )
 
+# All checks in libmicrohttpd's configure are correct
+# Gentoo Bug #898662
+QA_CONFIG_IMPL_DECL_SKIP=(
+	'pthread_sigmask'
+	'CreateThread'
+	'pthread_attr_init'
+	'pthread_attr_setname_np'
+	'pthread_setname_np'
+	'__builtin_bswap32'
+	'__builtin_bswap64'
+	'WSAPoll'
+	'epoll_create1'
+	'eventfd'
+	'pipe'
+	'pipe2'
+	'socketpair'
+	'gmtime_s'
+	'host_get_clock_service'
+	'clock_get_time'
+	'mach_port_deallocate'
+	'gethrtime'
+	'timespec_get'
+	'gettimeofday'
+	'sendfile'
+	'gnutls_privkey_import_x509_raw'
+	'calloc'
+	'fork'
+	'waitpid'
+	'random'
+	'rand'
+	'getsockname'
+	'sysconf'
+	'sysctl'
+	'sysctlbyname'
+	'usleep'
+	'nanosleep'
+)
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
index a6645d2c91de3..bf4d507938baf 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
@@ -28,6 +28,44 @@ DOCS=( AUTHORS NEWS COPYING README ChangeLog )
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch )
 
+# All checks in libmicrohttpd's configure are correct
+# Gentoo Bug #898662
+QA_CONFIG_IMPL_DECL_SKIP=(
+	'pthread_sigmask'
+	'CreateThread'
+	'pthread_attr_init'
+	'pthread_attr_setname_np'
+	'pthread_setname_np'
+	'__builtin_bswap32'
+	'__builtin_bswap64'
+	'WSAPoll'
+	'epoll_create1'
+	'eventfd'
+	'pipe'
+	'pipe2'
+	'socketpair'
+	'gmtime_s'
+	'host_get_clock_service'
+	'clock_get_time'
+	'mach_port_deallocate'
+	'gethrtime'
+	'timespec_get'
+	'gettimeofday'
+	'sendfile'
+	'gnutls_privkey_import_x509_raw'
+	'calloc'
+	'fork'
+	'waitpid'
+	'random'
+	'rand'
+	'getsockname'
+	'sysconf'
+	'sysctl'
+	'sysctlbyname'
+	'usleep'
+	'nanosleep'
+)
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f5a5236f57f58..fa04d0f0d9001 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 7c8ae3f309332..08b67561ef356 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,6 +34,11 @@
 #--- END OF EXAMPLES ---
 
 # Sam James <sam@gentoo.org> (2023-05-10)
+# A major reverse depndency (kde-apps/libkexiv2) does not yet build against this
+# so mask for now, see bug #906087 and bug #906090.
+=media-gfx/exiv2-0.28.0
+
+# Sam James <sam@gentoo.org> (2023-05-10)
 # Lots of package breakage as usual for new versions. Masked until most/all
 # reverse dependencies are fixed. Tracker bug is bug #906077.
 =dev-libs/libfmt-10*
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1df23b98ae7f1..7b5afca6816ad 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 57fc33c6a7198..e42de8ba0f0bb 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -121,27 +121,27 @@ EBUILD gentoo-sources-4.14.314.ebuild 749 BLAKE2B e831d8482b8a15b97bddb2d0bc3169
 EBUILD gentoo-sources-4.19.277.ebuild 741 BLAKE2B 15cc732badb765bf2c6365f54637ab26a077939862ef7867e29df07b9e162fea2ea8bd272d3f5176052eca688d71f4938d6dd9ef44fd8d8de4459c59106cc465 SHA512 1fb36e3606e0075b58d917498458cf38fff28ed1e0b70619b6767a48536873ed679e298384947aa75a041aaf97102c7f6d4227faa3ad2caff01a43658d9c2a52
 EBUILD gentoo-sources-4.19.280.ebuild 749 BLAKE2B c03e2c3c031f4c048a5869b80b8dc98eea7e6247ba3ed99076ff835747dfb2087f223b99f844bdb1a398682282c42e098efbe1891ca72a368994f04886f0f5fa SHA512 0294875eb8506327d498ade037d48d972ca87757c84f5cf4ebb8fbac4b4b04e37e882022bb29bd999e055ea20ded3e2cc47e60fc5493ef70a716c89729838b40
 EBUILD gentoo-sources-4.19.281.ebuild 749 BLAKE2B 8db317fae3e964a10ba34083bbc9d7325233420f753a91f5390337cc87e2893b23f2e22ebca2f8d3a76ef3644a01158118d84b3a393b5f5d1c177705e5f0ae02 SHA512 8302bc1f43e0f605b6fdc7b5c378fae2e6f690321cf1b8d5a41dbe3083ed9b22117e835b2ca803b46966a1f1db0fdd69e90c94ea877c7c38cce7305a68da6b44
-EBUILD gentoo-sources-4.19.282-r1.ebuild 749 BLAKE2B d38248c46847b863217af1d1ff410dbe116a187c0bff17153f33a18559c21d7f237d8afa0d3979aebf207cef0ebb5c31a18418d978a3878edf3a49ff4c51db01 SHA512 c936e470b313a5fe996e68799b1dcd84262c21e2dc8c618120fae2f86069a1c063ad4e712ea4050a75aed787b1f64c485c8fc67066237b297dc29da770dff13f
+EBUILD gentoo-sources-4.19.282-r1.ebuild 741 BLAKE2B dfd15f2c0a1dbdc663693e64b83f492787c1c344bcd49749dcb660137f5d113a190342acfefc425a4f3e1ffb9bd19e73ed9f85b194ddf732547f2ce5d15149c4 SHA512 78626e6982b5a5a9b3180613677c93d2c71e628bfb6b25f0c3711f01a7ea327c5be7f1294692b53d4a038af6ef37df146377e147b3c09903074654a6f0368aae
 EBUILD gentoo-sources-4.19.282.ebuild 749 BLAKE2B d6335662360917a701b839bb19e0480770692b2f2fd21e1349d1b10bd5dc858dccff66ec47d9f4c8f71f53d1fd4e6ed8bfadd975ca1d0bb9109fffb6bdc865a1 SHA512 0732f68d2fccdec31669638633f84dd75abfe187a1cf448754061327114c496362d7001e44f2d8d99ff1be09a8ec3fc8b5bc8068f6488e5cf1f0bbef9c38923e
 EBUILD gentoo-sources-5.10.174.ebuild 741 BLAKE2B 9c4bc912946d58b2fb5466f1fd03f3ba0141da60a58ca99c235e0cdf38d6354bb175d302f52e323b7a628c76a7993e05def7c891d596e7b128fe74f66bd02d68 SHA512 307158fcbd0611e2e5c0eacfc8f244e645d192b51f701ff512a07f5af0079bde882a83a7b9c928f8f49c0034c8011591ec4985fab6bf50d8f26a4c1b5dba2463
 EBUILD gentoo-sources-5.10.177.ebuild 749 BLAKE2B 2400af35ab9ab531702446e219979b3ebea688b2df9ebcc49569a760f8d92af17717f4f19294d58c61a84fd799a32f238db2da44fbf18701432c91c37827ba88 SHA512 7a458fbdfb358e9d5cf7b0b315ccc7eb9a1c6a3e8f0439735e0771fa1aff725c532fa52f63a11a6afa7d53eace3626e29a042aa1cfde6c45efea2c36754808ae
 EBUILD gentoo-sources-5.10.178.ebuild 749 BLAKE2B 37964d5701715038b748024fc760970ffee82395a8714965cbf21c10edf2f2b08df45160a76a5e9dabe9d80095714bdf37ee65e000b6e8b8dd7b1fa8fdb37a90 SHA512 e6600d84d7f7cc4711ae5a4057b0dd43d77b7957fd8023f00a5a7b212f44bb3fd8f2530f7a7f64a914aac254a477bddd433013822559b751b9dba0947971d438
-EBUILD gentoo-sources-5.10.179-r1.ebuild 749 BLAKE2B aab227c9f13d6a5007600ab803b427e2326e1659c064673e2e428790be611ecf7b1f1f24b3571ecd68c87d06ec4c64c28108930924a42f26725e1d81a5779f66 SHA512 fbd95d4a84c990bc5c5ec4c8f1f97ab5e98821fda44d7b2cee921d99a2493a3af99fad6b78b2de96d6f6df3b73554d636c2bba067a91784eff72585b62155914
+EBUILD gentoo-sources-5.10.179-r1.ebuild 741 BLAKE2B fb508b7e4775cf0f4314bc679f7fccef7ec7cca4295b736c47726466106d2f16d25e15128869408d37a43fc9e297361392f3da16e89b322f10001425032260b9 SHA512 1a3ff9bd713b5b2b9e70aa21840dc6784c55f386b79afab991089dd2fa63f3bb180a0eb3612deac530597de8611e1962e4a6ddb4cbcd9dde5a4db0ef14a19509
 EBUILD gentoo-sources-5.10.179.ebuild 749 BLAKE2B 9a88eef57e2a9ca1ffed626f2c3982ececdaa39712f8d86ac222546f16a019efff3cd75ffebff7f8d0ab093e9bb3d50fc0f33df7a3abf587f8515e76ae62cb49 SHA512 25260961355c697a5e5f35ddac83cf21ca3d59efcf49992bed79885247f97a955f7fc113fe0ddb508e44d640f0257a2d8d6fc220e29c8b7ae90189ca4e1f882d
 EBUILD gentoo-sources-5.15.102.ebuild 741 BLAKE2B b9dcd125e47431ba320758706ae629b3d5e2b4b231d61ce7fc11a438299fa221b8277763cf0009d87441b836193150fd2c1886a2a2e31acd2bc5f8c8a11face7 SHA512 05f4eb57cc39cb8621b6fd7f7b7860edf9123e553206db35615a5662bb08fc67bd40dde6d0a24f3f4b4ee9a79d206c2b7733edf1d56d3ef7792965c0390dd7d3
 EBUILD gentoo-sources-5.15.108.ebuild 749 BLAKE2B 15e6a29283be6ab29c080ef0ac53905a4d0688625fda94b71036378a5b65c825c8efe1355bcce98dbcaa530c2feea509cd2bb22454fe762f2e7f8052b043dcc0 SHA512 f4f10f5c4b72c2cd0e21b919cf7f57b0edc75750f16140fee26fc53656838baec84b38d0d666531efa442162f67e92dd68446358aafe74213a0665304911a999
 EBUILD gentoo-sources-5.15.109.ebuild 749 BLAKE2B e03c775cc6319d8cbd61aa6c383d1d338c549168dfad91501344f3d76889bdc38f68bb628cdc191775b10050543c68ac29446bb78cec928d4c2ad95878250991 SHA512 2a31e2718966d887cbe9c3f04bc2283641c807e7492206bc860025d39d6f99d1f5555d152abbf6acebe61b4b44c318a7a45258a1873814bf981b2d23c3037ad8
-EBUILD gentoo-sources-5.15.110-r1.ebuild 749 BLAKE2B bbcb5b9d9ebbe23af9e49f50faab849c3038953a8e5d6d413a707a2ac59acc8e9f4fac63f6334c9c698cb59bc90f3d2897525f3e9004e691e9ee97e3cfe5d291 SHA512 79821d6ac31c75ef711b10a84edf2bde99300f9ac4dec8efce0d93e14aa89417655c7906e00770dce68e867cb5ee7dcbf14ed0b1d78456dd991253f4a637d2bf
+EBUILD gentoo-sources-5.15.110-r1.ebuild 741 BLAKE2B 5a642c321566d105efa2faaf1a97399728cee2c5b21327070c91df0c2ee3bd58d25149e92523fec30566bf8294c69e262743e7c433de4b07603dd26e5aaee23d SHA512 440a2aad08da27e16e82f62aba59589ab0c476d5016549504ae902c93d7bd44c4c280da5b0d5817187c13bc7d2e1f79b81e518532241652f69c4ca679d3be463
 EBUILD gentoo-sources-5.15.110.ebuild 749 BLAKE2B c23dd1cf2ff7f68f8c9095d8fb0f660c455572e18c82396e2c372fbf0595ee8419123f39e98aca0bf752c78e5f68e8416ba3fb5c2d38f1c68ffa73312ab316c5 SHA512 5ce7161420603642ddebdc4199f8d7d507fe5b216c778ba18e0048cd69c98b091f9e9e1c5f198676e2ba302a598e6dbd9b8044f5854d6d5923d894c7e80d4433
 EBUILD gentoo-sources-5.4.236.ebuild 741 BLAKE2B 70c3324c4ef3ed049839490ed7922fcf2d5c0bb6cc328cc0f9a3d3300085fa20a486bb3173fb6558e78dbfdef2affcb976cf02fc2825e6085b940e73a53e35d6 SHA512 59eb55b4aac19282fbdc54536d39176ba957c4986dc25f89b6f13d90c7bf84d1fff431c8f0a8990bed48613d45d3c34cd1d51c2293cd1bd9f47d08d72321f32d
 EBUILD gentoo-sources-5.4.240.ebuild 749 BLAKE2B 7a14d04768975cb6b213e2ba5b8ee0f4aae18266465e909d19dcb6fc8c455e8f9dac5a3f1de89b0564e8ae40d1ba2f82919a6f890611e1d25e77ba4f2357cdff SHA512 c66a62df19ed1d13c7909427a7487f7c8b050e3a069881c6ba6f5ef5bad85e9e23ceb718be742e276fb71aed3a18d05c6220fd4e75055f42425672c143c385ca
 EBUILD gentoo-sources-5.4.241.ebuild 749 BLAKE2B 2fe163a8667ef2ec4654f507d073cb85f6e72ede745b76df08e9f941ec79652587f02100983f291705001cba106e364b7d0310ca0c01303689064608c8e5d989 SHA512 759575ee4e395c9a31cef1b0fd22c3e05bed5c5ff182ac111d3ef3cd7152710690fb767c09fd9558b82e64c902e26beacd55dcfd4ed2feadc74fc39154541ddb
-EBUILD gentoo-sources-5.4.242-r1.ebuild 749 BLAKE2B 83e0ccb2cbb712749b83fb8516417b50326dee0378efe037ba2719b872462cf2e585d7db2aa558ca30f7d3e8f581d41b39b9d4016c2bc3a92dcf7a9bf70b41fd SHA512 dc4f2a77a0d4b6ff5a12932f063d63c2a927d2accbd75c152cfb13c2bcb24d6672b971984dadc30fcdeccc0d52710c9364c70db0898aaea64655d1b960f81c7b
+EBUILD gentoo-sources-5.4.242-r1.ebuild 741 BLAKE2B 969fd0e5ab40e4d7ddf184b73ee9cf90a0a0aebbf109c87370e9e20096866a2febecd25cb8bae29441b1b1a5ede7c4d185ac1a9450d2c12621ce7c02803b146c SHA512 8ab1fb1c47918b9f26220eec306cc86941e5d24ae2bfd404cd7389505190d179bdc4d94534d769dcaeb7875a4c0e0235ab201498787767d2e98a841451b79aaf
 EBUILD gentoo-sources-5.4.242.ebuild 749 BLAKE2B c969903a9f18a1169232882117234379be9beba67597a02b3a671c9cf204bf1b17449e8c61f5ef74db93dd3e29958a579b762915f1689bed2220c89cc423ee9b SHA512 c67d9de423c71f85875c650b4d82242e98f76619807746dc416bb164c90df2e6c00bf39a87d1544fdfe7ea1a8a0349d5e6c75908d7114a6da9c6722b9ac7a9d2
 EBUILD gentoo-sources-6.1.19.ebuild 740 BLAKE2B 9006936d0cda808bff2a154abb38686aa3410dd404b8c58a85bf2bea96ba79c7b7e67140c345412e01f32b81137d03d9c6d62f246a1a99ac2ad9fabe7625c02c SHA512 f2d9d9a6402ab2aa00dffe3227393e456c3c93e69a2f6686eb8ddb3ac203bfb2520e10c229f585648db9b3dec2629bde1922d7b9d35f79d9e84dd1cbe271dc2a
 EBUILD gentoo-sources-6.1.25.ebuild 748 BLAKE2B 66bd8f422cb8b32bdaa7fc1d5647058be343807c741e2ee62f408e85c65bd331f421272deb25b88c073b2207e558bf0ffc1b7a481388cdc21a6f12bbdedec073 SHA512 966b500ef5527cd7cd315f7e05f31dc5cd2a9a0a2999f1c9b980c00a3d729041a0947eae41a9a03878a7b226604bc63c9134cbe0307fe8eb633014f5056d994e
 EBUILD gentoo-sources-6.1.26.ebuild 748 BLAKE2B 58a8bc0e68b6164d50f5603e3b070c7a6ecc8c777673290545601e21fe07cff42981582ee9641dd900fb460fa32f56ca2fd51cbe531894ad31c76911c9a34fc3 SHA512 914a694fed67161e782c901c4d5e6002097fe2b1b03afd10e3e8c0dbdcbc92837f25541fd965478c8be42a45195e15b35b3a4122cd7a32a822b15a0246373594
-EBUILD gentoo-sources-6.1.27-r1.ebuild 748 BLAKE2B b41c4bb0a28f21bc1bdb6ea805f4e4c100d49a033e4d7f71e6dcd56692000f421e933583433ffa0df29d2d5a4171e091b2e3df40d91491bd97983b28ef4c2ad9 SHA512 451e55a4931adf3c675e4de47410837d7fe2cfadd7a9d959de0d0722916c7a9c51fc9c43e91f9b8f75853238f4d2efa41fa8a4cd40f467c5a97c52ec7cffa8cd
+EBUILD gentoo-sources-6.1.27-r1.ebuild 740 BLAKE2B 1e16f1b1b5333d6ea03c8f1752f303b58e738b001348f74e1410a1dca5cd00be46394e2193499a929c4b035418ca2bfc60ed869e275b3dd73504ce85121a734d SHA512 f52d179289527543fce8fbedb32d0b86487c7dd9c91ad33d1aa74835f29c4b5c45e5d1afa28b62739424a3362ff642523d65e50101e76524285a569b4241092e
 EBUILD gentoo-sources-6.1.27.ebuild 748 BLAKE2B ab4e2a198f0c1d14d9d3aa4ab647b377f55f5dc63cb8119b29f4b6d850f2930904f0aacf537bbe088ecd7a10004e7dc8a038efdc8caa418fb068247e753b5056 SHA512 ae14b49f96442858a95f0eab1faa42cc75dd3690935a22812811998f34f268996fb3a0ea16896020c226df068197534359d3320fb93699f31ac4c3715ba2100d
 EBUILD gentoo-sources-6.2.12.ebuild 755 BLAKE2B d8a02c110c18fb30c2192b8808d8b666d3fbd5c7547a1d20489cd11aca85ed78625153bc3f274d27958c80cc9297bdcc78e8345c2b2a908505a8a05230f5dd2e SHA512 80184bdfdc7cbd64050225a4d7d71b2e9fd0ceded7cc756168b868961e0db98f0be908621275ac4b214c9626a0974b34c3d3ae59a45875201f10e2fda7cc6a5c
 EBUILD gentoo-sources-6.2.13.ebuild 755 BLAKE2B 569c33f8463443a6b7c4ecabb1a8fd048888f45896f165cf865eba9a4755ca20491c8891c63293194bce2e27eea2e96ce9e0cea86dff4e843a8bb71d1c9f056f SHA512 768f0d9082c171a2ec67bca71207b1546460afe67a7c11ebded5d0c947ef2bb0833441fbe30ad649ec8fc19ff74c5145cd342e7d284d765b1acffc73d3b8e307
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.282-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.282-r1.ebuild
index 0d4ed48723494..09ab700cd1ea3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.282-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.282-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.179-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.179-r1.ebuild
index bafe92482bd8f..e581063a0cb4c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.179-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.179-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.110-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.110-r1.ebuild
index 1303500e054a9..2b8eb075f3b63 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.110-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.110-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.242-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.242-r1.ebuild
index 4d745a956d798..b7e91298631a3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.242-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.242-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.27-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.27-r1.ebuild
index 2ff80fe972122..5551d92861234 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.27-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.27-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"