gentoo auto-resync : 17:07:2022 - 08:31:06

96 files changed, 506 insertions, 732 deletions

diff --git a/Manifest b/Manifest
index 536b12e8d4db..fc4f2781ca41 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29616 BLAKE2B 26e1d0514ed87528b2ed147a6bf7250ecb1b001605700d1bcb3f32b3a031416d6e1058c39c9473b17717d83784e664ec342350fe0c35a348b21b4d0d3b00fede SHA512 402d18343c685a9d8e0b8ed1b527290559caf7bdc76d087243ebe483553772d7bd467ddbdf63eaecf229052b8d9590409b0cb0523ace3c7e7e1906254ea740df
-TIMESTAMP 2022-07-16T23:40:02Z
+MANIFEST Manifest.files.gz 29619 BLAKE2B f6c6948f5b8bcf544cbccbdffa917b463f4d0773e7d9b87f1e1201e82b63bee23900b57005bacd8b7d640c4b52a3c8da69c9d32c9ecc43600592b7d866ba4ac0 SHA512 cdf68c1a29991f4d98fe805b47e94c642d268615bdecbc6646d97cda381d0d01b5a053abbdd471ff9c760368b2f970ab7ee5158f1f146019935e3e56b81488f3
+TIMESTAMP 2022-07-17T06:40:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLTTFJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLTrsJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBtfQ//cBVyaJebtH71DMtX/u6qfsKDWdAymYT1Vm34lRoxFTW/2TFUWJFWh1+o
-3bGx2K+R/WjvyA8I9H0NmNGWC4HMkO1l5z0wtmteBqyKKreDeVoooJ0/RQlb4DSW
-TPwyL+51CNKMEacaWTcwdeTVTV4otI9FRR8QIbXB6TcRPDjYH2fAa9Cn8Yg3Oolq
-FcYuLyvVmZYI759A+VNgde08kniV4ywVQ/URydfH/y/KZNEReUlhTN4TDJQnrNi0
-xv3q+Zp/bHiC4HMoakX/mb6CawT5I99xK2TB3s0pjYVphRzKA+rkTr4gQPVz/nMR
-6YY6jbPZMAbY8J7WSq8yuZeuRHVDOfL2nbTIzAI8kBXPbQLnfMbt5ABpsPCuWCRM
-iu0T4HIt8mT2wlcG0VGXqkzMF1Fb3Fox+DYmsh8+ueOpiJQoWUOVNsVfBCQZ+MRq
-fsVZ1QFsEvKXK06hqD9iMLN6lLaMGcVC50mlbAtRfiJk4k46ee8yK4wOi/nrYI1n
-gczHDPrEyCaUbYYJiDWcg61N6E1ZoGhzGeJax+ECzG41dqZSTQi0wWODjtQq5qPQ
-lWTzgG9UxNmqLxC3nhtqknID1oyQKBfv47Co5y8gdBUkO3q+sfuHWNXOKAjyC9XZ
-/LLCao/6qctupiAlIY/3WpkUGJ8sH4LDUgOonZvI5Zf+N/ZCeAw=
-=dFUq
+klCvdA//UwqyhRwWIKV7Hr+Q+bJ5984x58lpR+MFit8ekildbtOXqXPctmh7gh/u
+LQvEMGFiq1BEA9jz9z0LdJS5oW9QR2IQ5JFrbZZGec4m6n10X+mJR4HiQpQPIjiV
+gzxabloxwMCy1S50/F2E1ilKkwfkwnELc3gMtM2EfBtOm6lKgM0Su6/vC4aXp87S
+zotNKE7XY8lgvHJu77LPZu7lDIvUq1sxmmWTr4NChUWXZWcIffiG86VEBX+9VcAr
+Q2Dj/ZgIfUB1x2h60ySqxcaGNLSs8mKUCz5d/rQfJqyMLaRRXbGsaTeI4oAzVd+l
+e40b7yCt/MRH7G6nmWzQ0WhLbOOeVIDeiUzpNwpgQL8x5UQMPgr3Lhxf7ScDBOFG
+4jcvf2/RUOBE5qSKbeiHPmYKdAnVW/VQGcltwTpnxorB9CDsLjHkmMBamU3YZaOZ
+GlD9wo5wJ4GlQxsP8WgmFv/KdZKtVNfvPQqd1rgxRf5+oaRETp2Y0gIu/lmw95Lo
+p0o4l+EEMVi9srE+K9gMFA4fB7h66Fcf8oTSnfkIytkeKwk03XdaiTAkt0h3I5W7
+TnghBg9W1TJ6uvbFLKVUpcSysmUbTp+xabXMj3thx51TkFVwHVxUbekOD/n7fDp3
+ul7NXJhHqnajGOycw4DqDPLJoGW5FbwMV3fGS1wppo782V871kg=
+=99jQ
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ed381d3872d8..c10029117fb8 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 78d0ff447f2b..de5a916577c3 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/geiser-chicken/Manifest b/app-emacs/geiser-chicken/Manifest
new file mode 100644
index 000000000000..e0c5d60321a4
--- /dev/null
+++ b/app-emacs/geiser-chicken/Manifest
@@ -0,0 +1,5 @@
+AUX 50geiser-chicken-gentoo.el 319 BLAKE2B 3bb243526f00cb2245d1a702f2f22eb49f9cac1fb72d81cea601ff0340bad41f595224dcb72897b241b2f145a3cc8ca3f2d0890178f18355b3c00e0a12e954b1 SHA512 293a82d1f3cad9eb24c4c83cbb7356913c924f537bc302206bc30ef7bbf2bc213182d19b6d49df47633355602d8498c9ff6d96e45238c8437864f97fbb29d096
+AUX geiser-chicken-scheme-dir.patch 357 BLAKE2B 384c49355359ba7f1b0ed79c01b9902bda1dcd6f7c6c2adca97a6aa530e43a2b9d1f4edad57cca33935dc0345cf14e36e66fbfa8c682a158fab5e9b7e66e7376 SHA512 92b68749d56664002bbe595380e56eeb2de9cb37796fcebb4e05fc4c53ccc1c7d219c5a2b72841d6ffb1f37e0004343d3a45df91d6634f6381904435a7ed7e74
+DIST geiser-chicken-0.17.tar.gz 13083 BLAKE2B 02c27de099c1cc835827781159c42664a13a8adf858bb81488f88fa1dadc0b440c791ebdde112ab33aad19dd53f9f7138ff720aee7e14541a903a2a18599f1e0 SHA512 6c292a2c3ca5d036a7af95b029f2fd913675131dd04c3481dc4fe43c534b8c0183ef63bfa386b3393cc34284451b8aa095d3ebdcc8d1bb27fb3649b64d4f5279
+EBUILD geiser-chicken-0.17.ebuild 803 BLAKE2B 6c4f20fe780100cb06f7dc1b4cf765d7751dadeb03a4fa46446b078b14ec3a294b00678d1ce7d5326558803a76af3b9992f9fee4ff674ea6b3fafa2e26df36b1 SHA512 297ef35153c0306b502d72b5aa93aaa0137dc5299f5fda83a145da871f9a7efdc266f49cf856932b06644da1d1cabc46829c27d97d6facc1934446405fb865cc
+MISC metadata.xml 553 BLAKE2B b2029a398ce352e16e4b72495d4e9ae18e698a92c1cf0d794ae394cf8b93b0fec76785242ff5ce4931cde09f535bc23cb0e71100d74d27fe3c6333aa356b0a80 SHA512 3fcc988504bcdca8e09cd99cb446c0cbbc677a41309dd9aa1e675bc1d1d059a13c530baca958f038ea357897ffa9c0e720f71aa06bd5037974a1eedfca3fcfaa
diff --git a/app-emacs/geiser-chicken/files/50geiser-chicken-gentoo.el b/app-emacs/geiser-chicken/files/50geiser-chicken-gentoo.el
new file mode 100644
index 000000000000..e8c115fa7126
--- /dev/null
+++ b/app-emacs/geiser-chicken/files/50geiser-chicken-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'connect-to-chicken "geiser-chicken"
+  "Connect to a remote Geiser Chicken REPL." t)
+(autoload 'run-chicken "geiser-chicken"
+  "Start a Geiser Chicken REPL." t)
+(autoload 'switch-to-chicken "geiser-chicken"
+  "Start a Geiser Chicken REPL, or switch to a running one." t)
diff --git a/app-emacs/geiser-chicken/files/geiser-chicken-scheme-dir.patch b/app-emacs/geiser-chicken/files/geiser-chicken-scheme-dir.patch
new file mode 100644
index 000000000000..5779f23a733f
--- /dev/null
+++ b/app-emacs/geiser-chicken/files/geiser-chicken-scheme-dir.patch
@@ -0,0 +1,11 @@
+--- a/geiser-chicken.el
++++ b/geiser-chicken.el
+@@ -123,7 +123,7 @@ this variable to t."
+ ;;; REPL support:
+ 
+ (defvar geiser-chicken-scheme-dir
+-  (expand-file-name "src" (file-name-directory load-file-name))
++  (expand-file-name "src" "@SITEETC@")
+   "Directory where the Chicken scheme geiser modules are installed.")
+ 
+ (defun geiser-chicken--binary ()
diff --git a/app-emacs/geiser-chicken/geiser-chicken-0.17.ebuild b/app-emacs/geiser-chicken/geiser-chicken-0.17.ebuild
new file mode 100644
index 000000000000..a1cc4fd51604
--- /dev/null
+++ b/app-emacs/geiser-chicken/geiser-chicken-0.17.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Chicken Scheme's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/chicken/"
+SRC_URI="https://gitlab.com/emacs-geiser/chicken/-/archive/${PV}/chicken-${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/chicken-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-emacs/geiser"
+RDEPEND="
+	${BDEPEND}
+	dev-scheme/chicken
+"
+
+DOCS=( readme.org )
+PATCHES=( "${FILESDIR}"/${PN}-scheme-dir.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r src
+}
diff --git a/app-emacs/geiser-chicken/metadata.xml b/app-emacs/geiser-chicken/metadata.xml
new file mode 100644
index 000000000000..4a6b5ade29ce
--- /dev/null
+++ b/app-emacs/geiser-chicken/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.com/emacs-geiser/chicken/-/issues/</bugs-to>
+    <remote-id type="gitlab">emacs-geiser/chicken</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/geiser-gambit/Manifest b/app-emacs/geiser-gambit/Manifest
new file mode 100644
index 000000000000..1a16502602f6
--- /dev/null
+++ b/app-emacs/geiser-gambit/Manifest
@@ -0,0 +1,5 @@
+AUX 50geiser-gambit-gentoo.el 310 BLAKE2B ca6f58efa08f5f9b7008a4d5a593f19bed3b0a867c13597e0c43639097e763c23e5b6e4a1002fee704db24a3b1812cc4a5e3daf0c73a47f13783ef3da9469d62 SHA512 fc82c275778bfebcf6cd4554b5d1a9240c50dc70d59d8a4501c033e8283cf021221b68f9ba00c9809794f737f1d2d818e1f06c4ae5ca323ab646c558cd4ebe58
+AUX geiser-gambit-scheme-dir.patch 433 BLAKE2B e1bc515d45246404aa773db8f188c7f714ec80443bc0d7970ca67c79c354f8288f0f2c41ae1c540628c0373649ca36e8fb0387b38e9554a520c8fd02fcf0de19 SHA512 989740cfc579f71b88e7e8235292496cc0d091dc74ab2da55a61c5555d350e51a8ab88a5745f1031e10bf425dab01bca1d8a7fb629ecde08cba70fbdc4c37d61
+DIST geiser-gambit-0.18.1.tar.gz 19163 BLAKE2B c5624d69380688b751a4a4c9de21e886b1577e87218b7e8d761c5aa1dd4f37dbe296e453b5254777d305ac51c2c318d5282609d0d812b3cd233c1f64e3a8f6b4 SHA512 b5808eac6cc23873f848b96720cf86a4bd5ad2737c44b33def134b2ec61b0d05aaffe0e4cdcd17b296ca04757b37d3a3478741adc8db195ac9c9a90b2e15184a
+EBUILD geiser-gambit-0.18.1.ebuild 805 BLAKE2B 304612fe5fd70d380c874fcfa3cd270f561b3a9c949d24e08dafaa3f219a63780ec76eeba7089b6d36e1864f80e8ab55e81c990f93b9ef36778dc2fd37ded5d4 SHA512 7aaed72e1a1f28dd0e2bde67e3f251667c82af20197e8604c86a84b3d2d4be234f08555636b47e700867c629efba07337b31e1cbf560706375b09e0fef1d3cac
+MISC metadata.xml 551 BLAKE2B 24885070990a1f79a2c896b090f9c7394e8e57428bb7caf41e26b60fadd4dcc7879edb0994321d30b1904ff12020f9e21ef31b52b3983bcf10ab81d96631c9da SHA512 52a319d39e4a74c68e79b820ce5c7051e7cdea344f28b5f6737328b799770e21801788720d7e267f3107c5d23138672c5be4afabe9ffd7619dfd5e66ed2b7c49
diff --git a/app-emacs/geiser-gambit/files/50geiser-gambit-gentoo.el b/app-emacs/geiser-gambit/files/50geiser-gambit-gentoo.el
new file mode 100644
index 000000000000..a98c6d74a878
--- /dev/null
+++ b/app-emacs/geiser-gambit/files/50geiser-gambit-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'connect-to-gambit "geiser-gambit"
+  "Connect to a remote Geiser Gambit REPL." t)
+(autoload 'run-gambit "geiser-gambit"
+  "Start a Geiser Gambit REPL." t)
+(autoload 'switch-to-gambit "geiser-gambit"
+  "Start a Geiser Gambit REPL, or switch to a running one." t)
diff --git a/app-emacs/geiser-gambit/files/geiser-gambit-scheme-dir.patch b/app-emacs/geiser-gambit/files/geiser-gambit-scheme-dir.patch
new file mode 100644
index 000000000000..b761773ddb0b
--- /dev/null
+++ b/app-emacs/geiser-gambit/files/geiser-gambit-scheme-dir.patch
@@ -0,0 +1,11 @@
+--- a/geiser-gambit.el
++++ b/geiser-gambit.el
+@@ -304,7 +304,7 @@ If t, Geiser will use `next-error' to jump to the error's location."
+                                    binary)))
+ 
+ (defvar geiser-gambit-scheme-dir
+-  (expand-file-name "src/" (file-name-directory load-file-name))
++  (expand-file-name "src/" "@SITEETC@")
+   "Directory where the Gambit scheme geiser modules are installed.")
+ 
+ (defun geiser-gambit--parameters ()
diff --git a/app-emacs/geiser-gambit/geiser-gambit-0.18.1.ebuild b/app-emacs/geiser-gambit/geiser-gambit-0.18.1.ebuild
new file mode 100644
index 000000000000..941fb05a649b
--- /dev/null
+++ b/app-emacs/geiser-gambit/geiser-gambit-0.18.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Gambit Scheme's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/gambit/"
+SRC_URI="https://gitlab.com/emacs-geiser/gambit/-/archive/${PV}/gambit-${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/gambit-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-emacs/geiser"
+RDEPEND="
+	${BDEPEND}
+	>=dev-scheme/gambit-4.9.4
+"
+
+DOCS=( readme.org )
+PATCHES=( "${FILESDIR}"/${PN}-scheme-dir.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r src
+}
diff --git a/app-emacs/geiser-gambit/metadata.xml b/app-emacs/geiser-gambit/metadata.xml
new file mode 100644
index 000000000000..0f92a25782d9
--- /dev/null
+++ b/app-emacs/geiser-gambit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.com/emacs-geiser/gambit/-/issues/</bugs-to>
+    <remote-id type="gitlab">emacs-geiser/gambit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f2c9b8e920e2..d729c0a97831 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/rundeck-cli-bin/Manifest b/app-misc/rundeck-cli-bin/Manifest
index 8715b1fc4536..a60edd58af0a 100644
--- a/app-misc/rundeck-cli-bin/Manifest
+++ b/app-misc/rundeck-cli-bin/Manifest
@@ -1,3 +1,5 @@
 DIST rundeck-cli-0.1.11-all.jar 3447560 BLAKE2B e840d3b27dd173244781d1c37a6c3348d89896d3e81dd8fd36e7c3a33911228e46fff460d838d6c8d9bd79c254c9e469dd8b8e26bb645bd7334d38e04e257512 SHA512 3390d5b6ece391a9cf7754cc4c6d79a7720ac1db2f7a555d0b8216eea23feecc7e4cc947fb4c894362ece3bfaddcb383b7b10558d2e499e364e023c65636aa33
+DIST rundeck-cli-2.0.1-all.jar 7470231 BLAKE2B 485b229f49aaf6fda912ab822a7997f8889d487367dcd28ae7fea9e03947f369e1aa61902e5bd38f0990086fc9c73fc5b61426de03cedec33057dee58de49a68 SHA512 9242bff4f736bb324b4ff3321876160d71ff8703f8b6be263df638f5e07e3a78e9edf9a2f47076c0a763c23a403de65819afc0a52890d492669889b593e7f2ae
 EBUILD rundeck-cli-bin-0.1.11.ebuild 551 BLAKE2B e6da193ffe93e204500ad9475a72ed44b8ab703bd4a874ba736b659e29d2bc5647b67a543e04a022f3af64ea5f6f79b8e3c412bac0ed8ff767aed057b24bea43 SHA512 1152f7b5332afcf398e6d3428cff4c4198f4070e5eeca7a49fce2b425afe0db97665db8172516c2fa1bb5a1dbdacd48cfc5cb6ac6372ccfa48334afb95f11f99
-MISC metadata.xml 442 BLAKE2B aaa0c2b7d4294d7724e2c6935ba7724407101ea63fbf886d7dec25306fb92876aea276fcde9fee7ce8526935e812ae4e8e7795896ff1f34d04e6767ec2327aa9 SHA512 032b1e4ab1370674f6ce3783994fb5d3c35f75cc84dd0365c5992e03223b32100dbc9f44ab8afd3fd704fa9c87ecfe941c8cbb7838c2a213bef9bf0fdacc0e5e
+EBUILD rundeck-cli-bin-2.0.1.ebuild 558 BLAKE2B 14a5d71067962b048cbefcd9ffd6a87a306a7c09022dac329a4dff9758e003778f571786fa9cdeaef8627a628e07c21e77eb1659a47f9204cd1587ba76da6097 SHA512 7b979dc53d1dd3b6dc2828c9f3faaea3b41f145b4bfd5af9d565d92b90504f76150affc8fc7ef2f638caa0446bfffa7a894bbb256bc1d50b4d82fb0543ad9abd
+MISC metadata.xml 549 BLAKE2B 90488ef51db502555bf9ea43290ee38e810289c3901825d799f628110dd302e4bc8a1b7f54a33aa7aec808f888aa6024440f08cf1b3432eca08eeda2a012f1e0 SHA512 ccb02f573f7a4f0ffc00f900960f138398fc7e591c85f0af689e63338ff8edb346e3d7c8193bf13f2fecceb02df5793da7234557cf5fdd25f3f493e4348b6fa4
diff --git a/app-misc/rundeck-cli-bin/metadata.xml b/app-misc/rundeck-cli-bin/metadata.xml
index e8b9db973b54..6f8ff53657c1 100644
--- a/app-misc/rundeck-cli-bin/metadata.xml
+++ b/app-misc/rundeck-cli-bin/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">rundeck/rundeck-cli</remote-id>
 	</upstream>
+	<use>
+		<flag name="binary">Copy the precompiled jar file and skip the rest of src_compile</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild b/app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild
new file mode 100644
index 000000000000..9c90692a412a
--- /dev/null
+++ b/app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="+binary"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Command line tool for rundeck"
+HOMEPAGE="https://www.rundeck.com/open-source"
+SRC_URI="https://github.com/rundeck/rundeck-cli/releases/download/v${PV}/rundeck-cli-${PV}-all.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# KEYWORDS="~amd64"
+IUSE="+binary"
+
+RDEPEND=">=virtual/jre-11:*"
+
+JAVA_MAIN_CLASS="org.rundeck.client.tool.Main"
+JAVA_BINJAR_FILENAME="rundeck-cli-${PV}-all.jar"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9534657a5823..0618aea187da 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 8f48558b8c9f..38e077babe6e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,7 +1,5 @@
-DIST tomcat-native-1.2.33-src.tar.gz 430359 BLAKE2B 2253907b5e3e0121ad520e1a5938cd8ceea55bd1403d320d382b959a0885c7e9374afb2b1828714d2f028dc0bfe6b6010d493e1e1b6d45942b4d27321d79614b SHA512 b9ffe0ecfd14482ed8c752caf2c28d880ab5fca1f5ea1d5b2a8330d26a14266406bdecda714644603ba2d4ca78c22ec5fc2341afd09172d073f21cf5a1099a0f
 DIST tomcat-native-1.2.34-src.tar.gz 435320 BLAKE2B 7b4f3feb36c1e4db36a67db835ab70169e64173674b0089fe844cd40b99b1a3a87c8b9f774b0df55689f1ad1e30b5606e8056a3e1707c929dcdbb8f25cc9e47e SHA512 03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
 DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
-EBUILD tomcat-native-1.2.33.ebuild 1182 BLAKE2B ae624184e321f4eae4a1c26f028e230af06bd37f12a26bf86a3b143f29869408c7371b3f296ddbece209c968de2fef24b416ad71cd22c36d499493400ed1df08 SHA512 91222f3794cda0de3532af0f9e5d564e53662de5c73537a3b8e787e09dde61d43f6c03bf516d389789a01c2396d9607c85e44255017af74a85af0d0abcee68c4
 EBUILD tomcat-native-1.2.34.ebuild 1182 BLAKE2B ae624184e321f4eae4a1c26f028e230af06bd37f12a26bf86a3b143f29869408c7371b3f296ddbece209c968de2fef24b416ad71cd22c36d499493400ed1df08 SHA512 91222f3794cda0de3532af0f9e5d564e53662de5c73537a3b8e787e09dde61d43f6c03bf516d389789a01c2396d9607c85e44255017af74a85af0d0abcee68c4
 EBUILD tomcat-native-1.2.35.ebuild 1194 BLAKE2B 720b2088fa3f5c9deded920fe39b1677d3182b7c725e86ff7156b1ad0dc4462b3e1afa50a4e6fd8877fad48e10f37e6c76817ff9f719fb824e670e076c5a307a SHA512 6cfe786a3d574f87b6210b219fe6fe857deb3d6777ec642e196be7e7538332051ef19f79ab847ed37a3c3efc793f1e598b3c2f737127c45a7fbba4afeafc5c4f
 MISC metadata.xml 1104 BLAKE2B 5bce2696664ff1e64ce88f36ef119c11f9b9aa4ce3996c9da8161e5752734efe1e3e6164b0ca80a529b285add041ee361ac343644cc267b543303c2cada33f3d SHA512 aecd35036f1f9b6f48477031e743971c5e2a8018a42d2075666399e4c31c3c58e22886150f49468502dc3024dbeb6aaa8f64de7827dc54611f7b2603832fb667
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
deleted file mode 100644
index 39a5c2b3e960..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a215e93f1691..f307b0d69ea7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 7e53e1886b26..562f9b9e8d7c 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,9 @@
 DIST pikepdf-5.2.0.gh.tar.gz 2359546 BLAKE2B 953a5268eb7dc52934967b593237bb3006ee35e7a1657c0721ef4cdc874c9c51d7920fbdb7e38f67e221b01536166b8811a95021668491e8c783f51a08f49144 SHA512 f36ec09017aeac547c2b4ef17de7513293e8bf243707cb9c0c03826973be266847d8514002be546ac958a735e29765df94efdaecde6ad5f901c329dadc3e9451
 DIST pikepdf-5.3.1.gh.tar.gz 2360816 BLAKE2B 02b36814144acbf05cf50d8bca6542271208af0ed7548dd8f41493b6e95183851033a3d4f3335f10d4bf6798606e9031aa2b38d28a9e824692fe8f78f1e68077 SHA512 b0256533011dae384ce657200db69b6e3ac93b4364fe55a2e0fb8fb2d993550dcfe4e05b723b81d62ed1db3cd544023e81a9e70fd807bcfb618f125ae5a35117
 DIST pikepdf-5.3.2.gh.tar.gz 2886857 BLAKE2B 343006c8123bd814a93d1863442e9fdf80d93ae020ae6b4471cbae640653e74f3652c7c3e32d2e5ec68f5425f24a34543c0d712d78320d46db9bdb8db64ce1bb SHA512 3586a8f33550698d9b49852d741ebea7fd06e3afdbd7f1ed74ba7d9f8bbc086ff35ed964dd065f1e764f6690b3a708440eee97857591829a565acf2f0702ae33
+DIST pikepdf-5.4.0.gh.tar.gz 2891493 BLAKE2B 12aec9e7fe22c9e372886bdf3c32d509f13a92fe0526469445f801ecb3b92d8fb27ad817bee6fc1845a3057d6fe56cfde5712907e9a89fc16412a1528e988504 SHA512 5be5f1d79a4fb9119aa4aed8fd4e0d02f53a7affe39c8b019aad3717b20ec303e8dbd3ac19d57e099c591ea7a29cbaf786b40d5235850f756bc17fe5335324fd
 EBUILD pikepdf-5.2.0-r1.ebuild 1552 BLAKE2B d9f8e96311c19ddad321fd3c8ccef2391d5c30e0f59bd31f829fd8c82cfe5c5bb7e4bdeb0130b48d7b84c5f445f31e9f8095c487c81117b615df46d99c44f3a9 SHA512 3f6c60d2d494aa51c52bf9d60fe14b8fcbdcb612c52532885b195f0dbee08987dcc97dea9c9ead3c8ea28a71568f6a8921693a4ef84b1bc31fb0fbad66b5a21b
 EBUILD pikepdf-5.3.1.ebuild 1543 BLAKE2B 960ecc4871f4f8802687dce7bef7b8394bbbef401d7261e3e3e617ec0f18abcdbd09116c74e1d6d295083e89033d24a9c7289b32bf9d4f3689a6f61154e9c480 SHA512 a04d06f4e2ab96fe268b8448413b3b1794c9d8996d19218268a2eda6abc0937c99367b136db15601c23166a8a441c99c7f4109b5b2b6d70c524f13cccdda0b51
 EBUILD pikepdf-5.3.2.ebuild 1498 BLAKE2B 4c7ed9c326980db4c7c5f4cba98af2135f4dca60e4a0902c9541d7df8ec77ee6249316b955c55a036d22f737511d4f6e1ba7e6658fafe8dd0cd6f66a7d6100b4 SHA512 a9e4483e6e3c436287c078a80e1da9ce0176f4bc1a670b4f7a56172a9a55bc3f09a873af135404b4021f8d82e7817b51e53417eb4111d6fdb4ca45c8880a2006
+EBUILD pikepdf-5.4.0.ebuild 1541 BLAKE2B 56ecc778d49fecd927ccb693ecdf58fb41dc8c9bebb1763e81e6c3ea650c91573ac2ca1fe5b72282fa8e2a9649e3421817a55cfd6883f4ea8cc80a292cb322a4 SHA512 7864f4fbde7cf5fad575091d13e37def859f9ef9cf89050df9add0e395e64f19eedca4cc0503c4310f53056d8d87b8378c6ef89ca39c3e573c4e491a442e01d5
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-5.4.0.ebuild b/dev-python/pikepdf/pikepdf-5.4.0.ebuild
new file mode 100644
index 000000000000..0dcfce946c36
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-5.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=app-text/qpdf-10.6.2:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/-n auto/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index d52493619223..bcbaf107e941 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,4 +1,3 @@
-AUX python-evdev-1.5.0-python311.patch 430 BLAKE2B c735906d032cdd94f7a42ffc616fff89419ed30622bf9da77e108afd38e5ef867fcab92c12c462d6508e3877351e300a3e3af9c7c6e11e7d80deb4c2a17f99c0 SHA512 24fc3a1e0a4966611d57a44019144d2c6052995aedd2587dc4502b0593258efeea7aad41f60eb992f1f7b2bddddabe5fbcfb1cd6e05c0bed0b99495d8b211bf2
 DIST python-evdev-1.5.0.tar.gz 86384 BLAKE2B 6cb6fb634d974b8ab15722def24037019590f510792fcf2bb64d8c2ffec0871ab4075674eb45a737185e4b42e39d0cd556760d51b13b5a97b79d3ee64cfd342f SHA512 27ceca723a0157fe9efa2f7aad8bb790c63d2b8d399f629eaf11fb387f3ebde0885b2d8a5297492968d625d8d9b186877e074334115e70551a1b121c8864339d
-EBUILD python-evdev-1.5.0.ebuild 831 BLAKE2B 6c26520eb2b51f32cdd3a2c76f5a80ff51fe0435b22f43f35dcf4c5c1460e49b21c4330f261bd29ce2519f26415344889d5f3043ee4bbdc952d894f1ed73ebd0 SHA512 ea7bed5d4fed4af67702dd597ee849d18952da1680d6dda562cbbaa33050e5d3a8ab67848276228da36deb2fdb1047020b296a9e9f13643c7c804eb44358a336
+EBUILD python-evdev-1.5.0-r1.ebuild 730 BLAKE2B 887ad1fe48fcd5615d7f56f083902c5bf5b89cddcd3f74ce40acf216083a378c3445297c7615a0c81a27ceade56ae504a689d2e0e347e4c7365e611f9490b104 SHA512 f77b9be830adbd1659f253165ec9933e302cbcc81c9249fd60b34a569c71a9e39d0f7086b5834650ea78840a95edbe47645e1e8e80da6cd16277b5c98730f7f0
 MISC metadata.xml 309 BLAKE2B 6ae01a8430958d20e84fe2de8b8eaeec666b4937a5dc140eed1a90b455f6a17be819e8ae999fe13e1095f2aa9415385ff520fad147318110482390a1aae8419e SHA512 067f19a8bcb3eb7174b9db8c475ca66fbe661a263c8280accd7d05cfd2864605ddfb2660cfd2f146e99266985808b29081a9bff1aef8c8c50303d2ba059c13bc
diff --git a/dev-python/python-evdev/files/python-evdev-1.5.0-python311.patch b/dev-python/python-evdev/files/python-evdev-1.5.0-python311.patch
deleted file mode 100644
index 1f516c79acb2..000000000000
--- a/dev-python/python-evdev/files/python-evdev-1.5.0-python311.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/evdev/eventio_async.py b/evdev/eventio_async.py
-index 77542a4..68225c3 100644
---- a/evdev/eventio_async.py
-+++ b/evdev/eventio_async.py
-@@ -85,8 +85,7 @@ class ReadIterator(object):
-     def __aiter__(self):
-         return self
- 
--    @asyncio.coroutine
--    def __anext__(self):
-+    async def __anext__(self):
-         future = asyncio.Future()
-         try:
-             # Read from the previous batch of events.
diff --git a/dev-python/python-evdev/python-evdev-1.5.0.ebuild b/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild
index 3d0340816d88..a1df11de9086 100644
--- a/dev-python/python-evdev/python-evdev-1.5.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -21,11 +21,6 @@ KEYWORDS="amd64 ~arm x86"
 
 distutils_enable_tests pytest
 
-PATCHES=(
-	# https://github.com/gvalkov/python-evdev/pull/174
-	"${FILESDIR}/${P}-python311.patch"
-)
-
 EPYTEST_DESELECT=(
 	tests/test_uinput.py
 )
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index 127fddd096f3..e42aa34b26a9 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,4 +1,6 @@
 DIST Wand-0.6.7.tar.gz 11686093 BLAKE2B 58abbdc22eb1603ed42e2e2473c0ed2b9026c9c0a499bb885512b56ecf01fb4ffe450979808bba2b4c4466994f86bea9a9c0ced216f8338c845b96a755f39c9f SHA512 e79ecb909f6ad7b3ddae217bb7b27f3c010d22a40eb99866e2a6eb07346000acbead280176e3352da13c20b68a341c751c55d6203bef7968522c8dbcfcab0b06
+DIST Wand-0.6.8.tar.gz 11884527 BLAKE2B 45784abf55682d8b5e101cc4fc93f0492f9275a2805f06dbda2d98e28c6359c7df84fd7870b12348c0a6c513ae3f2bafba61a00020a41263d6a91fd67d9ce682 SHA512 111eef211edd8d5a6c825f0b455db5510c91b43852165934dbab36a9cdeea7e920987c98d975fb8c7f82ac19f20867c0ed5c8c1e2f9dd9467bc30931b4a03dd1
 EBUILD wand-0.6.7-r1.ebuild 725 BLAKE2B 744d613a797f5234560def501a49e49f97800148600c46a1a17338070e6370b279ae8cb30bb86a8c9129647be4c353fd7ec3576a7b5f29e589258bd80afc2e29 SHA512 c60ad6aabd3e2ba297f8394d5741b00360c689d35b02934bb319b633819267aae126e863db7c85beb0643dda380e323e3ae0c2de77bed2485b015777da41fb0c
 EBUILD wand-0.6.7.ebuild 693 BLAKE2B 2fb65a5aafa6af1e39919bde33b704d3dd06f3974b472b8bd2eddb13a8d267a4541afc46d857adc6cc6100f81247e12defa0119320216e2a8bc2d5dd78e5e7e6 SHA512 ce87a3e330c250fcf8a5e02f02db6532e93958288fd26904921ae8ca370690871ec6c1a6f0c2d72e7400a4b5b12dd1cfe0a6d393033f55dbb93e9af187bed7f0
+EBUILD wand-0.6.8.ebuild 799 BLAKE2B 26c6b310db4aeb8b9b1aae8f96b80c5067ab7159398a7ca6f7870deb5f7128dc080f7ed4fa77422a7a263deeaa022fbad6cda9e8a862b2b8c8e70141d78b5452 SHA512 96355dfe9edb46610e62fc30a3190362d002b52edb58ec045ed9e4d9b00fc4ec88513a9a151446309d4d1ea8f9443047a5ab4b88f2a27fa6cc6c3a8d49788271
 MISC metadata.xml 534 BLAKE2B 0c2295ce9b9805ceff22c9549adfa46578a5d5d1d4f13b7af416ad23f305ee24275deb7204a68076901e6060d41a3935580e24578d2fe56a2c32817ab83165b5 SHA512 68f30bc7ad8cf6a451acf550c02b76e1f71a8c66c9ffc8832995bd292bd460d16c9526e5bb2daaed9cabece9591499f9dd3b0f11d748af247c78654d6104ee13
diff --git a/dev-python/wand/wand-0.6.8.ebuild b/dev-python/wand/wand-0.6.8.ebuild
new file mode 100644
index 000000000000..753e731d2674
--- /dev/null
+++ b/dev-python/wand/wand-0.6.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
+HOMEPAGE="
+	https://docs.wand-py.org/
+	https://github.com/emcconville/wand/
+	https://pypi.org/project/Wand/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-gfx/imagemagick
+"
+BDEPEND="
+	test? (
+		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# PDF support is blocked by the default ImageMagick security policy
+	epytest --skip-pdf
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index aa48cabde505..93c31d4a1632 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index b22b315e12ac..e12e604c0096 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -1,8 +1,9 @@
 AUX 50gambit-gentoo.el 386 BLAKE2B bf791e4b89573dcc5a4da472cb198dc9fb5f43f88f420089ffe543016e4f8483fc3a5ad4e1f7752d6a6d5a006556b268bd1a7360afc470c436fec96156b2e13d SHA512 acf956bd70c176b4cccbdab2dd1611ef5a30b7899d51b32341509168fdac52312f0f543c5c519ed005049a2e40d9dcfc67284adaebedd9a781fe12a3ea974e97
+AUX gambit-4.9.4-stamp-release-version.patch 243 BLAKE2B fe54a2aa24718d650b79f5a0cd0a0480a70bc7a3f9e78df5607573e9991acaa3bbdbc9b9f62bb184b1a1042069ff40f0f2997b8eeffc36f03f11ecf6ea9c71ac SHA512 a5ee4e83bc8dd16e219d684d80b9d6115d1ba46134ad289237466721ad958bcf4d556110e6c1a2580e289e12c660a42c9d63e8088f5011aec6a3391ba3c669ef
 DIST gambit-4.9.4.tar.gz 15453486 BLAKE2B 59761f98fe380604b7b5d8be162769506536aaffb35e97c24a755b3cd62e2e72e830468add0ca098e87fba3d1716363b9125b0141dea4eee5608fa55abcbe2cf SHA512 f2963e5e33ad5cc773924cd1ac01bdf6ad68ba6514419583c4a94c0c878ae223c06c9a90b9058cec9c2237f905b6e3cd879360b04415473199a1a515ae4194ee
 DIST gambit-v4_8_8.tgz 13272335 BLAKE2B d15bf944c8da3050c1fee6854044d904712075f070d75797c463a5510590514a06a4f05a81697d4bcd814adc5c00693f27b09834624909356049c02bbad02419 SHA512 99367cf5726d0d3aa59e39f1ef8b69347d92b7f3055e0656d66cbadb69ed4d8e499825395eddd41a4409b9cc57c2d2242ac5b8c29c37b84950b57468b5d92909
 DIST gambit-v4_9_3.tgz 13736448 BLAKE2B 664e90e3cc2419aa07264ac84abf0aacce43fd2339a72dc502745961a56097b6c161a89d12faa4b88a95841b8d45e37c199438d3fa8b9914db431406cc2d0e4b SHA512 0ee8eb5a2a0b63c0250f4d8d5bcf71d7c57b7444bf1a4c31c084fc9aef6f7932bf607a0a0b835987e7ada3a995cf732cc46593eb4b9dd79fc918358c57c4285f
 EBUILD gambit-4.8.8-r2.ebuild 1248 BLAKE2B 06aa2099a15e630acab87ae87be91e7c23cbb2c173d437444fc33e86564f47e6aa2695bb661c00808f12f6c29bce0e30eca98658c5121db3f21fe37e81728c45 SHA512 615493ea15f0496c6bf5054f926bed6d89b83bcfe5d839c1fee22da5e61ab7524db0d27c5aa140506b502c9aff90b8e59456684b9c19ad59ba16ff8f7033711c
 EBUILD gambit-4.9.3-r2.ebuild 1248 BLAKE2B 06aa2099a15e630acab87ae87be91e7c23cbb2c173d437444fc33e86564f47e6aa2695bb661c00808f12f6c29bce0e30eca98658c5121db3f21fe37e81728c45 SHA512 615493ea15f0496c6bf5054f926bed6d89b83bcfe5d839c1fee22da5e61ab7524db0d27c5aa140506b502c9aff90b8e59456684b9c19ad59ba16ff8f7033711c
-EBUILD gambit-4.9.4.ebuild 1345 BLAKE2B f92de4e64ed6a3c9e8fd60f43f93f133f9c27bad31e1943147491240c326cf89dee78497b7e7afc5fdd2107a8937404617b106d3bf4c67b2c973483d73a79b47 SHA512 d3ef29c7a4c40e66f2f47f7e7656eb1ca65701bd3271e96c3ced0c277b28fd5d527e277b94bc363850818beae229349cf14343a26b2c2168dfc98f2e1f2fa1ed
+EBUILD gambit-4.9.4-r1.ebuild 1405 BLAKE2B 4519e9354227f60a80653c7f95835e55e88fb2da1fd1f6fb3bed61e00545472674f77cac05bb1eff37b77138970028ba11295e2558d1aa096084e2cb65dee0ca SHA512 f7344a6e18fe097c96024ab534e5ac669a219e5e0187c8e463a220b988727e5e6a8a74f7abb17afecd2426e571c9700c2ddc70127754441cf50911e72e0af00d
 MISC metadata.xml 582 BLAKE2B 31f6ae847fca53c9b516584ca645e6d5d49b1bf3f3bb32effbd04e2b3c5a9c356dd3bec11b4f0f606cf1669a397e3e8473eac374cc4505383417d16173689783 SHA512 2662ddc6db6ab8dbae6db3d7f26da0c32def518e03d1ee375a5b5059e607cce588c14115c82908e0ab3a6f7c57b28eb7c9c10e439499179210a13da7e8333485
diff --git a/dev-scheme/gambit/files/gambit-4.9.4-stamp-release-version.patch b/dev-scheme/gambit/files/gambit-4.9.4-stamp-release-version.patch
new file mode 100644
index 000000000000..61090989e868
--- /dev/null
+++ b/dev-scheme/gambit/files/gambit-4.9.4-stamp-release-version.patch
@@ -0,0 +1,11 @@
+--- a/include/stamp-release.h
++++ b/include/stamp-release.h
+@@ -7,7 +7,7 @@
+  */
+ 
+ #ifndef ___STAMP_RELEASE_VERSION
+-#define ___STAMP_RELEASE_VERSION "v4.9.3"
++#define ___STAMP_RELEASE_VERSION "v4.9.4"
+ #endif
+ 
+ #ifndef ___STAMP_RELEASE_YMD
diff --git a/dev-scheme/gambit/gambit-4.9.4.ebuild b/dev-scheme/gambit/gambit-4.9.4-r1.ebuild
index 5419e7a1e236..c0d39c447092 100644
--- a/dev-scheme/gambit/gambit-4.9.4.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.4-r1.ebuild
@@ -22,6 +22,8 @@ BDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-stamp-release-version.patch )
+
 DOCS=( INSTALL.txt README README.md )
 SITEFILE="50gambit-gentoo.el"
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 4b211227f50a..3596156196d6 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 54092fd43d5c..179bdc4d9335 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,5 +1,4 @@
-DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
+DIST 5df2b817255ee919991da6c310239e08c8fcc1ae.patch 4115 BLAKE2B 8f364eba7a1f3788ae6aacb76946d9cf963609ac3e6f093eedf4d5e17467eba0ceb88b5b4bbf3acc72ec17e6626f52836805ac07f6044d7712efcb499d0237ff SHA512 5098a82c860370edeec7c41cb71d0f10e6c03b3d1996f163e882d84ea64903d64e866bb67af45380f658870e2715cc805155380c96994854847b06a6db3e111d
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-EBUILD gitolite-gentoo-2.3.1-r2.ebuild 1653 BLAKE2B 7af6010dcf5b536224c5e57755f454a931e8a4061aad2f7dddbe86891618c60bbe0c40fd579bc1527fe99799eac1d7f73f31eb9ac4dc1f7376fd5218c676eadb SHA512 dc8a8874d218fb56ce4666118e421d24ddf323bbb12541be79cc0d29481222155797fe1dc3d4fa69ace0a37e1e58cf2d17d51aad42de094579fc8d2efe55af74
-EBUILD gitolite-gentoo-3.6.6.1-r2.ebuild 2697 BLAKE2B b3000656f544084e3587bc37bc18e1730bfa9216cdc875dc38cd46ce818d21dd65a9532d5c26b0385c9008e5bb4c4403207b14dfcad9a9596189429ff1557d63 SHA512 9ecc7fc2ef804adbd8f05dfba6a5d668b7a1eda58a97a18c75171a795ca0fe5da3e5f5d87b467de67ec4fc0030cf537a0718b67e1a605d8d28dcf5cdd87cf148
+EBUILD gitolite-gentoo-3.6.6.1-r3.ebuild 2875 BLAKE2B 6d319fdbd9bd7f971c9d61c2c47ccc2c4ea004de3dfda5f9d94994b9ce92e4c991fa9f674eb004e99054fc9d21fddbadb8c558c5dd5a71f3b2e4387241f30689 SHA512 42852fd3a09fe5ccc919f454879a74be662c4539877a0e082aa8a714c706d0c3a3500d31a3e1e44c5e8e8cd931c9732d8174882022891a4e75f56fe0affab4af
 MISC metadata.xml 480 BLAKE2B d3524b1d64cf32814329c1cc96d92c816b333dec23a2f9fe03f22b7d361b449ef6700985d94e98253dcb60862e38fc6f5a36ac3bd92f110fa92291a85627b308 SHA512 bf7340f6554cd04dc1b8fc7c9d4f08023ce56514a38344f83a03a235b63389df4fb20b2f5d5761c4d82f1cf67e687420a52395b9afc807322d39d96e96ec7915
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
deleted file mode 100644
index 05571da3b29d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="
-	dev-lang/perl
-	>=dev-vcs/git-1.6.6
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/git
-	acct-user/git[gitolite]
-	!dev-vcs/gitolite
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-src_prepare() {
-	default
-
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
-	local gl_bin="${D}/usr/bin"
-	gl_bin=${gl_bin/\/\//\/}
-
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin
-
-	export PATH="${gl_bin}:${PATH}"
-	./src/gl-system-install ${gl_bin} \
-		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
-	sed -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
-		-i "${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
-
-	rm "${D}"/usr/bin/*.pm
-	insinto "${VENDOR_LIB}"
-	doins src/*.pm
-
-	dodoc README.mkd doc/*
-
-	use contrib && dodoc -r contrib
-}
-
-pkg_postinst() {
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-	ewarn
-	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
-	elog "then please check the permissions of all repositories using the umask feature"
-	ewarn
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
index 0f02b78dc441..55176f69e41d 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
@@ -13,6 +13,7 @@ DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fo
 HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI+=" https://github.com/sitaramc/gitolite/commit/5df2b817255ee919991da6c310239e08c8fcc1ae.patch"
 	KEYWORDS="amd64 x86"
 else
 	SRC_URI=""
@@ -39,6 +40,10 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-gitosis )
 "
 
+PATCHES=(
+	"${DISTDIR}"/5df2b817255ee919991da6c310239e08c8fcc1ae.patch
+)
+
 src_prepare() {
 	default
 	echo "${PF}-gentoo" > src/VERSION || die
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 32e37d8e2926..f06225297351 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ab48d8891556..102263693dd4 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,10 +1,6 @@
-AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
-AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
-DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8 SHA512 7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e556666281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
 DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d SHA512 5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
-EBUILD scummvm-2.2.0-r2.ebuild 3284 BLAKE2B 56f2c163028a473699af68c5d0707d7bbf3d7f3f077008d8e73272e65e55c0d6b59d4f1dd0ad63cb040c17b3e733157f35e4b2db0e42562e6970a2f6aedaf3ee SHA512 a2170c84373dc0c2905667a31f4ab2af67a3400afd7bd0ae5c142accf1151934a939b96084e5d3962ebd1679caaa7418dbc54b71cf9aba9004911ec21ff64077
-EBUILD scummvm-2.5.0.ebuild 3322 BLAKE2B c082f2094b7f9b6de04b1eb8d43c89864a669c6980c6667ce9df1c9258099abbe3854f2c99b53784aed42937a4772a3ed2ed1a367e8025d04739b6ef1ab46b6d SHA512 0977a604cc9ed27ac8c9ed4dbe4fb8908740ff0a66bd1bbb24f06941df2fc078f70cf9f5f2032e4a25b8bb1cadb77f586a93a5e6f436f560551ec09000d07517
+DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80 SHA512 6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
 EBUILD scummvm-2.5.1.ebuild 3322 BLAKE2B c082f2094b7f9b6de04b1eb8d43c89864a669c6980c6667ce9df1c9258099abbe3854f2c99b53784aed42937a4772a3ed2ed1a367e8025d04739b6ef1ab46b6d SHA512 0977a604cc9ed27ac8c9ed4dbe4fb8908740ff0a66bd1bbb24f06941df2fc078f70cf9f5f2032e4a25b8bb1cadb77f586a93a5e6f436f560551ec09000d07517
-EBUILD scummvm-9999.ebuild 3251 BLAKE2B 25f019b4a11fc075bf69d95f8b2ec56ea6335f5c58312a36b9f68f4c61cfe3f4a0416aa9a12f3db4d2b84b97b4153454667c1128ebf41d68bf6b52921066d870 SHA512 5c1ef273c8564a8fa128c21e72a506594e1f06a71873533feae91a05e1cbfea1d80cbbc8b9d0148797cb6efbe704ebdd16a88d93e7d36ee41e3df241b36c66a5
+EBUILD scummvm-2.6.0.ebuild 3263 BLAKE2B 23fc8e532540b863623bfa594f175a9165c3daef50e8752ce7d8b888681edff03cd0c497cdd445d15f8f5d7f5e843defd2d5a58bdcce82d1a2a0698641d167c4 SHA512 99fedb22cba0c4a4c73ac59ad80f78530d72cee98227f5b95251a16ffe82f485257e602e90fdb2864bd01c3e73830c65c4511f75c57ba606972e26cbe2d6f273
+EBUILD scummvm-9999.ebuild 3263 BLAKE2B 23fc8e532540b863623bfa594f175a9165c3daef50e8752ce7d8b888681edff03cd0c497cdd445d15f8f5d7f5e843defd2d5a58bdcce82d1a2a0698641d167c4 SHA512 99fedb22cba0c4a4c73ac59ad80f78530d72cee98227f5b95251a16ffe82f485257e602e90fdb2864bd01c3e73830c65c4511f75c57ba606972e26cbe2d6f273
 MISC metadata.xml 1215 BLAKE2B 87d954f59103b0bdc1300094f195638f44dee1ddfeaadc40dc515248fea7b3da553313a1a6e8478b5e7a827c8971da5a3a56756ae5fc01464af1e8295623db5c SHA512 1a5592562aabd4d78f22dbed63446593b6082b676fcae152b7f1e173c92972d89fa1d99cc759991db55e42670fc122aeb1b22b5c0e7defcb7a3bf68eaea110a7
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
deleted file mode 100644
index 8bb94ec6ab6e..000000000000
--- a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index e0d7c4e3df..d8e82c24f5 100644
---- a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -46,6 +46,14 @@
- #include "backends/platform/ios7/ios7_common.h"
- #endif
- 
-+// We assume here Fluidsynth minor will never be above 255 and
-+// that micro versions won't break API compatibility
-+#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
-+#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) | FLUIDSYNTH_VERSION_MINOR)
-+#else
-+#define FS_API_VERSION 0
-+#endif
-+
- class MidiDriver_FluidSynth : public MidiDriver_Emulated {
- private:
- 	MidiChannel_MPU401 _midiChannels[16];
-@@ -75,7 +83,7 @@ public:
- 
- 	void setEngineSoundFont(Common::SeekableReadStream *soundFontData) override;
- 	bool acceptsSoundFontData() override {
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- 		return true;
- #else
- 		return false;
-@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const char *val) {
- 
- // Soundfont memory loader callback functions.
- 
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- static void *SoundFontMemLoader_open(const char *filename) {
- 	void *p;
- 	if (filename[0] != '&') {
-@@ -144,11 +152,19 @@ static void *SoundFontMemLoader_open(const char *filename) {
- 	return p;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void *handle) {
-+#else
- static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
-+#endif
- 	return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, int origin) {
-+#else
- static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
-+#endif
- 	return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
- }
- 
-@@ -157,7 +173,11 @@ static int SoundFontMemLoader_close(void *handle) {
- 	return FLUID_OK;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
-+#else
- static long SoundFontMemLoader_tell(void *handle) {
-+#endif
- 	return ((Common::SeekableReadStream *) handle)->pos();
- }
- #endif
-@@ -166,7 +186,8 @@ int MidiDriver_FluidSynth::open() {
- 	if (_isOpen)
- 		return MERR_ALREADY_OPEN;
- 
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+
-+#if FS_API_VERSION >= 0x0200
- 	// When provided with in-memory SoundFont data, only use the configured
- 	// SoundFont instead if it's explicitly configured on the current game.
- 	bool isUsingInMemorySoundFontData = _engineSoundFontData && !ConfMan.getActiveDomain()->contains("soundfont");
-@@ -195,7 +216,11 @@ int MidiDriver_FluidSynth::open() {
- 	_synth = new_fluid_synth(_settings);
- 
- 	if (ConfMan.getBool("fluidsynth_chorus_activate")) {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_chorus_on(_synth, -1, 1);
-+#else
- 		fluid_synth_set_chorus_on(_synth, 1);
-+#endif
- 
- 		int chorusNr = ConfMan.getInt("fluidsynth_chorus_nr");
- 		double chorusLevel = (double)ConfMan.getInt("fluidsynth_chorus_level") / 100.0;
-@@ -210,22 +235,49 @@ int MidiDriver_FluidSynth::open() {
- 			chorusType = FLUID_CHORUS_MOD_TRIANGLE;
- 		}
- 
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_set_chorus_group_nr(_synth, -1, chorusNr);
-+		fluid_synth_set_chorus_group_level(_synth, -1, chorusLevel);
-+		fluid_synth_set_chorus_group_speed(_synth, -1, chorusSpeed);
-+		fluid_synth_set_chorus_group_depth(_synth, -1, chorusDepthMs);
-+		fluid_synth_set_chorus_group_type(_synth, -1, chorusType);
-+#else
- 		fluid_synth_set_chorus(_synth, chorusNr, chorusLevel, chorusSpeed, chorusDepthMs, chorusType);
-+#endif
- 	} else {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_chorus_on(_synth, -1, 0);
-+#else
- 		fluid_synth_set_chorus_on(_synth, 0);
-+#endif
- 	}
- 
- 	if (ConfMan.getBool("fluidsynth_reverb_activate")) {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_reverb_on(_synth, -1, 1);
-+#else
- 		fluid_synth_set_reverb_on(_synth, 1);
-+#endif
- 
- 		double reverbRoomSize = (double)ConfMan.getInt("fluidsynth_reverb_roomsize") / 100.0;
- 		double reverbDamping = (double)ConfMan.getInt("fluidsynth_reverb_damping") / 100.0;
- 		int reverbWidth = ConfMan.getInt("fluidsynth_reverb_width");
- 		double reverbLevel = (double)ConfMan.getInt("fluidsynth_reverb_level") / 100.0;
- 
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_set_reverb_group_roomsize(_synth, -1, reverbRoomSize);
-+		fluid_synth_set_reverb_group_damp(_synth, -1, reverbDamping);
-+		fluid_synth_set_reverb_group_width(_synth, -1, reverbWidth);
-+		fluid_synth_set_reverb_group_level(_synth, -1, reverbLevel);
-+#else
- 		fluid_synth_set_reverb(_synth, reverbRoomSize, reverbDamping, reverbWidth, reverbLevel);
-+#endif
- 	} else {
-+#if FS_API_VERSION >= 0x0202
-+		fluid_synth_reverb_on(_synth, -1, 0);
-+#else
- 		fluid_synth_set_reverb_on(_synth, 0);
-+#endif
- 	}
- 
- 	Common::String interpolation = ConfMan.get("fluidsynth_misc_interpolation");
-@@ -246,7 +298,7 @@ int MidiDriver_FluidSynth::open() {
- 	const char *soundfont = !isUsingInMemorySoundFontData ?
- 			ConfMan.get("soundfont").c_str() : Common::String::format("&%p", (void *)_engineSoundFontData).c_str();
- 
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- 	if (isUsingInMemorySoundFontData) {
- 		fluid_sfloader_t *soundFontMemoryLoader = new_fluid_defsfloader(_settings);
- 		fluid_sfloader_set_callbacks(soundFontMemoryLoader,
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
deleted file mode 100644
index d73ad03820ea..000000000000
--- a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From d546389b10518eabd34fd5b4e22265069b25a966 Mon Sep 17 00:00:00 2001
-From: Paul Gilbert <dreammaster@scummvm.org>
-Date: Wed, 23 Sep 2020 19:10:17 -0700
-Subject: [PATCH] ULTIMA: Add lua as an engine dependency
-
----
- engines/ultima/configure.engine | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
-index 6447e3eb7f96..704a79d1f61f 100644
---- a/engines/ultima/configure.engine
-+++ b/engines/ultima/configure.engine
-@@ -1,3 +1,3 @@
- # This file is included from the main "configure" script
- # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
--add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
-+add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"
diff --git a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
deleted file mode 100644
index 22d247713dfa..000000000000
--- a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-HOMEPAGE="https://www.scummvm.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
-else
-	SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.0[sound,joystick,video]
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fribidi? ( dev-libs/fribidi )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:3
-	)
-	jpeg? ( virtual/jpeg:0 )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	net? (
-		media-libs/sdl2-net
-		net-misc/curl
-	)
-	opengl? ( || (
-		virtual/opengl
-		media-libs/mesa[gles2]
-		media-libs/mesa[gles1]
-	) )
-	png? ( media-libs/libpng:0 )
-	sndio? ( media-sound/sndio:= )
-	speech? ( app-accessibility/speech-dispatcher )
-	truetype? ( media-libs/freetype:2 )
-	theora? ( media-libs/libtheora )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	truetype? ( virtual/pkgconfig )
-	x86? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ultima_engine_lua_dep.patch"
-	"${FILESDIR}/${P}-fluidsynth-2.2.patch"
-)
-
-src_prepare() {
-	default
-
-	# -g isn't needed for nasm here
-	sed -i \
-		-e '/NASMFLAGS/ s/-g//' \
-		configure || die
-	sed -i \
-		-e '/INSTALL.*doc/d' \
-		-e '/INSTALL.*\/pixmaps/d' \
-		-e 's/-s //' \
-		ports.mk || die
-}
-
-src_configure() {
-	use x86 && append-ldflags -Wl,-z,noexecstack
-	tc-export STRINGS
-
-	local myconf=(
-		--backend=sdl
-		--host=${CHOST}
-		--enable-verbose-build
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--opengl-mode=$(usex opengl auto none)
-		--with-sdl-prefix="${EPREFIX}/usr"
-		$(use_enable a52)
-		$(use_enable aac faad)
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable !debug release-mode)
-		$(use_enable flac)
-		$(usex fluidsynth '' --disable-fluidsynth)
-		$(use_enable fribidi)
-		$(use_enable gtk)
-		$(use_enable jpeg)
-		$(use_enable lua)
-		$(use_enable mp3 mad)
-		$(use_enable mpeg2)
-		$(use_enable net libcurl)
-		$(use_enable net sdlnet)
-		$(use_enable png)
-		$(use_enable sndio)
-		$(use_enable speech tts)
-		$(use_enable theora theoradec)
-		$(use_enable truetype freetype2)
-		$(usex unsupported --enable-all-engines '')
-		$(use_enable vorbis)
-		$(use_enable zlib)
-		$(use_enable x86 nasm)
-	)
-	echo "configure ${myconf[@]}"
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	SDL_CONFIG="sdl2-config" \
-	./configure "${myconf[@]}" ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR) cru" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	default
-	doicon -s scalable icons/scummvm.svg
-}
diff --git a/games-engines/scummvm/scummvm-2.5.0.ebuild b/games-engines/scummvm/scummvm-2.6.0.ebuild
index 9f70736f67ee..820e36114b99 100644
--- a/games-engines/scummvm/scummvm-2.5.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
 		dev-libs/glib:2
 		x11-libs/gtk+:3
 	)
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
 	net? (
@@ -47,7 +47,6 @@ RDEPEND="
 			media-libs/mesa[gles2]
 			media-libs/mesa[gles1]
 		)
-		glew? ( media-libs/glew:0= )
 	)
 	png? ( media-libs/libpng:0 )
 	sndio? ( media-sound/sndio:= )
@@ -104,7 +103,6 @@ src_configure() {
 		$(usex fluidsynth '' --disable-fluidsynth)
 		$(use_enable fribidi)
 		$(use_enable gif)
-		$(use opengl && use_enable glew)
 		$(use_enable gtk)
 		$(use_enable jpeg)
 		$(use_enable lua)
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
index fb4d5b239514..820e36114b99 100644
--- a/games-engines/scummvm/scummvm-9999.ebuild
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="
 		dev-libs/glib:2
 		x11-libs/gtk+:3
 	)
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
 	net? (
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index cd66a63a324f..653f9ec88153 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index c20a01f63b45..f445a96461b8 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,4 +1,4 @@
 DIST lutris_0.5.10.1.tar.xz 1230464 BLAKE2B 5ba913f5e37956344b59c47c1315cf277ce57b1b771279c8aa4243971ea9f0c5277ad19b18655731048e989f752d957216d055ac6c26bb8731e52b4345d30847 SHA512 f6443fa86d0b38e1b5ba51054e50776eea63d9adda5738a7e69f2fe6b196f99491894d5068d6cddfd35d1baafa4188bd1935598b84266e9e23bd1b58c16dde20
-EBUILD lutris-0.5.10.1.ebuild 2190 BLAKE2B 3d1fb2034e0aa73f36c27341a14c18a996787f1133876e3e49cf7fb2e952b03eadfd2e15427c5aa07ef52267f14f2a1821900905b744f1ae2b35be26b0213b16 SHA512 7e3c78b211f21a5817b27e626e50e2bacbb62bb1e55b71bbd75ad6f8cb140227dda1ed1c1f9d0f1d37d3def80d8a71d9690721bf5dabef3ad587f417af811ce2
-EBUILD lutris-9999.ebuild 1960 BLAKE2B 587f7664ba03c1963607998435645bcd3e59ba51945b3d38ab4f05b3820959954fdb4aa33a00d7d32a3285be65433873a12c32b13c2b312a125544ad6de0a853 SHA512 2aeb1ae3d3dd811dc1b80140666c61f9f715f2d0e6de373a22490d7c7c7126706a707ea24a00bfcf7a0ac25f5467f08492f6be855cac062e9e840952e2cb47b8
+EBUILD lutris-0.5.10.1.ebuild 2190 BLAKE2B 88c9b4c3d4f0fe06ad4c310d90934ad3fa9a0ab3562f3d233a23f1969a6ca9a7fe7254ec91e984ed1ffc08538157f782947e457d0426e8e9612222b4b4221aaf SHA512 7f251210aec54ea1f3f3708cb2f2caa32e7a866bb4739a24c30d0ee6e7655ff5b1f583d42ba7a2367f2db34af770cf07f99390cd88a4d18a3987f35b78493522
+EBUILD lutris-9999.ebuild 1960 BLAKE2B a47f2bfdb7364ce9c1d0ffe1236c6995b67cbb5d84ef472d7fa059302ad05c5063f0928f9accd05608819ef3d668ec35f2742a2a9c269a8bfd33da78f904aef3 SHA512 cf9576152e735e5fc28cb26dadd0da4e970cee4fbaa6404982e373382fd3a2cb8dcfb0ed9da05fccbee16edf765e5f0aa4d7ff6802c1641500d1a1ec3041243c
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/lutris-0.5.10.1.ebuild b/games-util/lutris/lutris-0.5.10.1.ebuild
index 8808cea2f845..f9735e9f61e4 100644
--- a/games-util/lutris/lutris-0.5.10.1.ebuild
+++ b/games-util/lutris/lutris-0.5.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index d0cf69b3a9e0..1b9e6fc4d1db 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0a6e69eeb8ea..e87d5dcc1e2d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index d6222874ac60..38c643a0866b 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -7,7 +7,7 @@ DIST Csound6.17.0_manual_html.zip 25897263 BLAKE2B 3148a60a398d49d6932864d84b2ee
 DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9 SHA512 bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61 SHA512 b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa
-EBUILD csound-6.16.2.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
+EBUILD csound-6.16.2.ebuild 7132 BLAKE2B 57e7c2b61574635fb261142d6439df9984a8f8f9b163477d5f580c476c16e32343296e4182bf0c70be958357a9d1d7f360806c903d1f66e44779b44ef1047170 SHA512 5b3321f90a936f577b7a794de2f4194f2d0939cc18a8536e0b2216b0ade193b01ec3651d8d405229497c0550e234f941e0442b41a10494739d6223bb3a6f9652
 EBUILD csound-6.17.0.ebuild 5434 BLAKE2B b4db909f1ce178512d66e828b0a42c8988fb037e8672d2f3f263677f73084705dfb1ef3b161c9c4a1711b0e69c826339218f508f40ddf3ad1e8c74633a95ab68 SHA512 1d68aec981ecf44973220afea4fe1dd0a49e738ab7dfca85bb6871f7048a3e49bdde0b0cc2cb6e0cb43eb6ebe4a96be0499b084908c73d7e2333c6d87978fda3
 EBUILD csound-9999.ebuild 5191 BLAKE2B 7a6d621f017b4785480fbe72cc9d377060152e5cfe107e5d3e49b329acea363c20d932b1766dfc5d6a6f28c67dae49a577bc5c2c174b3c2b0cffb82496faec86 SHA512 41aa47513261bba2779f41b625cb8e29101bc7e0f2c4eab17a4ef7f73981bbaa396c56ae1273bbd46291f679b72fd1d47c70b0bf09e3cdcbf768ebafaadae2ec
 MISC metadata.xml 1244 BLAKE2B cd28c168f6625c7ab090f3b3812fbdcb8a7f2e17d649083c54761ea3a109d4ec90f9d6241cacf8502f386d10fa682e5c2d0be1a77a6f19d94820d80115b290a9 SHA512 96e697c02828da5fa3ca22a3a564f76ad06b55d8479f5bd2c207aa2427675b814f351fd5d9e5ec61e9c3b88d2e803137288a11e15dc92c149c015a2dcd315cbc
diff --git a/media-sound/csound/csound-6.16.2.ebuild b/media-sound/csound/csound-6.16.2.ebuild
index 58046967e8a0..6f59d02107af 100644
--- a/media-sound/csound/csound-6.16.2.ebuild
+++ b/media-sound/csound/csound-6.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -8,7 +8,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake lua-single python-single-r1 toolchain-funcs
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f3dbb29967f6..e05d09c0752c 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 52fb1b9a61ee..57479b7f1c8f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Jul 2022 23:39:55 +0000
+Sun, 17 Jul 2022 06:39:58 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 81ff863b3a50..57f71a4740a5 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-16T23:40:01Z
+TIMESTAMP 2022-07-17T06:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLTTFFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLTrsFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD68Q//aITyWJBNK6+BUle487lxwP0t8sB/fJLyOxpJNmD/lOi75pcSDIkMu5X1
-Mhb5cncKnM/SrjWTYh3lGpiyWGRqR3ZFPkFxE8rou6Hak9f7/6OBnuvI9esHh1/G
-M8gCHjxl4+vGmeHZlZQ3MW6zdqlcExW1Y+NYmfS/smVSETEY0aMTTyESEjk8MwY8
-/96lR5v645jwZiITbdH5Mqx8szenOG0T2D8H7s3HPGUB27QDEpDzgxqTKmbnkFgd
-g7sH33kVFepSTOxLzjvzsMF2JrUP5D4TJfz4vL7SLLJFHvfzpiPJy4xbeI+Uv9UE
-WtUObVbFVP+dJd6V9ksA6+MWbYSlIAxuJIXTvt8DvcgdGPojITXc10F+ZH+XkqXX
-Jvw44G5ETVRIKbfRm4eyrunic+3OUJno4LMFWrH3hQ1C0wa0BoPlIMzKfsvzUHUN
-0w4hMcOHd0V7nCDsW4wI8/k4DPwCd4wM7cwI9urkDIzFSogcmkRtPjk7kDxenLzM
-okshWuhL7lpSqZt4X+UAJgGRE+SB/DvD0Krgqu7J9Hixpmy7JnLVv41WeJQoUbQL
-eHEd9odsx3dxLEr9NkqiFSLG9zAp5O6BZAzKR6JTNG4vKnUHujAG6/We/vUzDwuv
-WDDGvzfxwORdbO42cmlELLJvVN35UzbQnME927gzJAf6SGn6/Pc=
-=ZLbw
+klA6YQ/+OAf3k+wQaFVEIHEwi/xfqZQ1qVyZDodr3Cn38DDw+5EuUy/bZIQrzWmo
+H5UiPePS4HZw0STjfadi3dw4KWtERtugGsmAWX2TN5rRHcs8MVHJHD9dhQkBqeaq
+oG/sAO8Cgz4IuW4rPBJbYdyUNxhNGVnQZQlc8C9U6/LtLk4ec4VgRXcdD/Z7Km0R
+lRileZR4dD5iRpX0ci8ux54TolwHeL468awnQaYXrrIX9PBr9qbDreuFwLPzook8
+Hs7OGZNNK2NvL+zPyPF0qEbbcsEhVL6Tggplf3euCrgz264qIlCLiBO6ssjQWtEc
+TCEt3D5V0pkoWtd8fotHqSdtqkd092dkJROGOpz6j7sZOHE4suhzGmxrQcH0DSdk
+EeERmaxob8qJ1VThR6UyvjFQ3JejHfHFqHDpBHLQBtcTjfsDFB1H+ihhBYDNTkti
+kH2e+UVJVpbF5r86Tg+IxmzgGojcGFPO3qdBLznO9MC9PGtLO52HFwIH8GRWKmiM
+rmiAaxpF4g7R8aqGhG/EWYjklnYAbNL7bhOq8TqSB119dZT/2hrAwqgzRnQs1zDH
+wNnQpMT7CwIWbB0yCN4G1iW9WSsI0pGyX98/AC/h82EfWdz9JHjb7Wk0iIjJ/OeK
+OS9hk7+RZNbyFiv16wzxkGx4HNP1oPY7+Y6dEfh9bfUVh+mUmzE=
+=rqLv
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 38853f8ff837..57479b7f1c8f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Jul 2022 23:39:56 +0000
+Sun, 17 Jul 2022 06:39:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cdb34a362090..6d00ea5a5f2a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index a342016e8301..ea3f05ed48ca 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/geiser-chicken-0.17 b/metadata/md5-cache/app-emacs/geiser-chicken-0.17
new file mode 100644
index 000000000000..15d1e3b3c2a6
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/geiser-chicken-0.17
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/geiser >=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Chicken Scheme's implementation of the Geiser protocols
+EAPI=8
+HOMEPAGE=https://gitlab.com/emacs-geiser/chicken/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-emacs/geiser dev-scheme/chicken >=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://gitlab.com/emacs-geiser/chicken/-/archive/0.17/chicken-0.17.tar.gz -> geiser-chicken-0.17.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=6f8a5345583280335862ba1c7c211f7c
diff --git a/metadata/md5-cache/app-emacs/geiser-gambit-0.18.1 b/metadata/md5-cache/app-emacs/geiser-gambit-0.18.1
new file mode 100644
index 000000000000..f8af3d5fbfb5
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/geiser-gambit-0.18.1
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/geiser >=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Gambit Scheme's implementation of the Geiser protocols
+EAPI=8
+HOMEPAGE=https://gitlab.com/emacs-geiser/gambit/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-emacs/geiser >=dev-scheme/gambit-4.9.4 >=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://gitlab.com/emacs-geiser/gambit/-/archive/0.18.1/gambit-0.18.1.tar.gz -> geiser-gambit-0.18.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=97ee2a024f8c6c20410394dcb6edb21a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 75c0366f0506..3d9a1773d2aa 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1 b/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1
new file mode 100644
index 000000000000..94e566f67d74
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Command line tool for rundeck
+EAPI=8
+HOMEPAGE=https://www.rundeck.com/open-source
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=+binary +binary
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/rundeck/rundeck-cli/releases/download/v2.0.1/rundeck-cli-2.0.1-all.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	20f7aa09b49045020177a457e5a1a883	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=8fb308beb53e0fb15284f72085b71105
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 3aa2bb013ac4..aaf8feb4d1cd 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.33 b/metadata/md5-cache/dev-java/tomcat-native-1.2.33
deleted file mode 100644
index 99c61a676ee6..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.33
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=static-libs test
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.33/source/tomcat-native-1.2.33-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	3484f775017f532a8d1ae02c65defe13
-_md5_=4d0641fff4ff93b51958f2e8ddc698b3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e65801a1e771..1d29ff86a5b3 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.4.0 b/metadata/md5-cache/dev-python/pikepdf-5.4.0
new file mode 100644
index 000000000000..4e7ece5e5867
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-5.4.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-text/qpdf-10.6.2:0=
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=8
+HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pikepdf/pikepdf/archive/v5.4.0.tar.gz -> pikepdf-5.4.0.gh.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	3484f775017f532a8d1ae02c65defe13
+_md5_=51e0f7cc8c1be9be43e34cdf6845ab72
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.5.0 b/metadata/md5-cache/dev-python/python-evdev-1.5.0-r1
index 76ad35992e06..c2333844096b 100644
--- a/metadata/md5-cache/dev-python/python-evdev-1.5.0
+++ b/metadata/md5-cache/dev-python/python-evdev-1.5.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for evdev bindings
 EAPI=8
 HOMEPAGE=https://python-evdev.readthedocs.io/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-evdev/archive/v1.5.0.tar.gz -> python-evdev-1.5.0.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	3484f775017f532a8d1ae02c65defe13
-_md5_=56a08ec41ef0d89b35f08c807d5b317d
+_md5_=7117406021907d6001067162321974b1
diff --git a/metadata/md5-cache/dev-python/wand-0.6.8 b/metadata/md5-cache/dev-python/wand-0.6.8
new file mode 100644
index 000000000000..b11053b6e44b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wand-0.6.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( media-gfx/imagemagick[fftw,jpeg,png,truetype,xml] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) test? ( media-gfx/imagemagick >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Ctypes-based simple ImageMagick binding for Python
+EAPI=8
+HOMEPAGE=https://docs.wand-py.org/ https://github.com/emcconville/wand/ https://pypi.org/project/Wand/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/W/Wand/Wand-0.6.8.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	3484f775017f532a8d1ae02c65defe13
+_md5_=5ef60a1932e35b38ca4cf39eac9199b5
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index df6be462bf2c..afaad4eed978 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.9.4 b/metadata/md5-cache/dev-scheme/gambit-4.9.4-r1
index 2b833d780c55..53d83743c00a 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.9.4
+++ b/metadata/md5-cache/dev-scheme/gambit-4.9.4-r1
@@ -4,6 +4,7 @@ DEPEND=ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=8
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
+INHERIT=elisp-common
 IUSE=emacs ssl static
 KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
@@ -11,4 +12,4 @@ RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/gambit/gambit/archive/tags/v4.9.4.tar.gz -> gambit-4.9.4.tar.gz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=f117c7ca9bb85f423f46abfa19c312fc
+_md5_=97b833e1b45d247e2a292e0a9e1ea3e4
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r2
deleted file mode 100644
index 859f736d5040..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-lang/perl >=dev-vcs/git-1.6.6 virtual/perl-File-Path virtual/perl-File-Temp dev-lang/perl
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=7
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-INHERIT=perl-module
-IUSE=contrib vim-syntax
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=dev-vcs/git-1.6.6 virtual/perl-File-Path virtual/perl-File-Temp acct-group/git acct-user/git[gitolite] !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.1.tar.bz2
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec
-_md5_=7fe5c3f387d5022b157b4fbd6d6dce28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r3
index 62a66df0b4cc..0add84cec11f 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r2
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r3
@@ -10,6 +10,6 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=dev-vcs/git-1.6.6 virtual/perl-File-Path virtual/perl-File-Temp acct-group/git acct-user/git[gitolite] >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) dev-lang/perl:=
 SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.1.tar.bz2
+SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.1.tar.bz2 https://github.com/sitaramc/gitolite/commit/5df2b817255ee919991da6c310239e08c8fcc1ae.patch
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec
-_md5_=2a887c93a3ed08f497e5b6a200e66614
+_md5_=15aaee8b6f14a2aeddf4829ec24677c3
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index b494c2b2cd20..ee1d898cc16a 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/scummvm-2.2.0-r2 b/metadata/md5-cache/games-engines/scummvm-2.2.0-r2
deleted file mode 100644
index 17c2a1dbd5b3..000000000000
--- a/metadata/md5-cache/games-engines/scummvm-2.2.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils truetype? ( virtual/pkgconfig ) x86? ( dev-lang/nasm )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
-DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
-EAPI=8
-HOMEPAGE=https://www.scummvm.org/
-INHERIT=desktop flag-o-matic toolchain-funcs xdg
-IUSE=a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
-RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://scummvm.org/frs/scummvm/2.2.0/scummvm-2.2.0.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	3484f775017f532a8d1ae02c65defe13	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=55e26be966598fa751e77d7561e721fb
diff --git a/metadata/md5-cache/games-engines/scummvm-2.5.0 b/metadata/md5-cache/games-engines/scummvm-2.5.0
deleted file mode 100644
index f0991d889fd2..000000000000
--- a/metadata/md5-cache/games-engines/scummvm-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils truetype? ( virtual/pkgconfig ) x86? ( dev-lang/nasm )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) glew? ( media-libs/glew:0= ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
-DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
-EAPI=8
-HOMEPAGE=https://www.scummvm.org/
-INHERIT=desktop flag-o-matic toolchain-funcs xdg
-IUSE=a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
-RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) glew? ( media-libs/glew:0= ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	3484f775017f532a8d1ae02c65defe13	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e7cdcb8c6107d26b9b914cd5101b357b
diff --git a/metadata/md5-cache/games-engines/scummvm-2.6.0 b/metadata/md5-cache/games-engines/scummvm-2.6.0
new file mode 100644
index 000000000000..64e1cb2977dc
--- /dev/null
+++ b/metadata/md5-cache/games-engines/scummvm-2.6.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils truetype? ( virtual/pkgconfig ) x86? ( dev-lang/nasm )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( media-libs/libjpeg-turbo:= ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
+DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
+EAPI=8
+HOMEPAGE=https://www.scummvm.org/
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
+IUSE=a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
+RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( media-libs/libjpeg-turbo:= ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.scummvm.org/frs/scummvm/2.6.0/scummvm-2.6.0.tar.xz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	3484f775017f532a8d1ae02c65defe13	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0f9f6e88c536156dd53578a6527daa9f
diff --git a/metadata/md5-cache/games-engines/scummvm-9999 b/metadata/md5-cache/games-engines/scummvm-9999
index 3b2bf3eb24bc..618b752e8c3a 100644
--- a/metadata/md5-cache/games-engines/scummvm-9999
+++ b/metadata/md5-cache/games-engines/scummvm-9999
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/xz-utils truetype? ( virtual/pkgconfig ) x86? ( dev-lang/nasm ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
+DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( media-libs/libjpeg-turbo:= ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
 DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
 EAPI=8
 HOMEPAGE=https://www.scummvm.org/
@@ -8,8 +8,8 @@ INHERIT=desktop flag-o-matic toolchain-funcs xdg git-r3
 IUSE=a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib
 LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
 PROPERTIES=live
-RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
+RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jpeg? ( media-libs/libjpeg-turbo:= ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) net? ( media-libs/sdl2-net net-misc/curl ) opengl? ( || ( virtual/opengl media-libs/mesa[gles2] media-libs/mesa[gles1] ) ) png? ( media-libs/libpng:0 ) sndio? ( media-sound/sndio:= ) speech? ( app-accessibility/speech-dispatcher ) truetype? ( media-libs/freetype:2 ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
 RESTRICT=test
 SLOT=0
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	3484f775017f532a8d1ae02c65defe13	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2276e8ccd2ddc20ab006e7fb8f5ebd32
+_md5_=0f9f6e88c536156dd53578a6527daa9f
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index d469ddebfacf..9e39f390190a 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/lutris-0.5.10.1 b/metadata/md5-cache/games-util/lutris-0.5.10.1
index 31b7f9ea32ab..3cab5fda7720 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.10.1
+++ b/metadata/md5-cache/games-util/lutris-0.5.10.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/python-magic[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.2[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,threads(+)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-42.0.2[python_targets_python3_11(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DESCRIPTION=An open source gaming platform for GNU/Linux
 EAPI=8
 HOMEPAGE=https://lutris.net/
 INHERIT=distutils-r1 optfeature virtualx xdg
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ CC0-1.0
-RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/python-magic[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,threads(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/gdk-pixbuf[jpeg] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.10.1.tar.xz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	3484f775017f532a8d1ae02c65defe13	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=02456fc94374df83408a09ac9412a30b
+_md5_=0ed2552c60d4c7c6a3a7cfcdec0057a0
diff --git a/metadata/md5-cache/games-util/lutris-9999 b/metadata/md5-cache/games-util/lutris-9999
index a499d8887845..59e08f7c59e1 100644
--- a/metadata/md5-cache/games-util/lutris-9999
+++ b/metadata/md5-cache/games-util/lutris-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/python-magic[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.2[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,threads(+)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-42.0.2[python_targets_python3_11(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DESCRIPTION=An open source gaming platform for GNU/Linux
 EAPI=8
 HOMEPAGE=https://lutris.net/
 INHERIT=distutils-r1 virtualx xdg git-r3
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/python-magic[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,threads(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] dev-python/python-magic[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-magic[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-magic[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,threads(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	3484f775017f532a8d1ae02c65defe13	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a3a5837f904d7912b5565ca58b62061e
+_md5_=2bfcf02e42fc50a6325eaeebe31568d5
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d5d01e8c30eb..ae78cb38745a 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/csound-6.16.2 b/metadata/md5-cache/media-sound/csound-6.16.2
index 0db5db3fe206..1af4f3933d89 100644
--- a/metadata/md5-cache/media-sound/csound-6.16.2
+++ b/metadata/md5-cache/media-sound/csound-6.16.2
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) lua? ( dev-lang/swig ) python? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) lua? ( dev-lang/swig ) python? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= ) dev-libs/boost doc? ( app-arch/unzip )
+DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= ) dev-libs/boost doc? ( app-arch/unzip )
 DESCRIPTION=Sound design and signal processing system for composition and performance
 EAPI=7
 HOMEPAGE=https://csound.github.io/
 INHERIT=cmake lua-single python-single-r1 toolchain-funcs
-IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
-RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
-REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) cxx )
+RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
+REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) cxx )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.16.2-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.16.2/Csound6.16.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.16.2/Csound6.16.0_manual_html.zip )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	3484f775017f532a8d1ae02c65defe13	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1df222f7f68a04a823c7f352fb843cac
+_md5_=e568a2291167d8c1868805a02cf7ffb6
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 603b68126981..d29ca771db62 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.10.2 b/metadata/md5-cache/www-apps/icingaweb2-2.10.2
deleted file mode 100644
index fc9679591a36..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=7
-HOMEPAGE=http://www.icinga.org/
-INHERIT=depend.apache multilib
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.10.2 -> icingaweb2-2.10.2.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	3484f775017f532a8d1ae02c65defe13
-_md5_=9951ec466392cdf5eda26bd6c303cce4
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.10.3 b/metadata/md5-cache/www-apps/icingaweb2-2.10.3
index d4e5d999a545..b3ace01a33ac 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.10.3
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.10.3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://www.icinga.org/
 INHERIT=depend.apache multilib
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.10.3 -> icingaweb2-2.10.3.tar.gz
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	3484f775017f532a8d1ae02c65defe13
-_md5_=9951ec466392cdf5eda26bd6c303cce4
+_md5_=35e2631ce3cfb69e780281db45f8b0d3
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0c154eff3d31..3bc913364fa0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-17T00:40:01Z
+TIMESTAMP 2022-07-17T06:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLTWmFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLTrsFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDd9A/+NsUuaM5YQlkFwWtJK1U/I7W5Ut8gX4wcZBkOctDDWPMvqo1dYyXH+CI3
-dzuaoQjtf2RhS5wR3padaDmymwJLLuR4oITjut602fCTCYBcIHiOq7TjhZyZWMWw
-0fzdkU05ZluNBeag+C/TSQvWtsGlgk0eCClkbynmrlGVhAUTx4nBFowMIZvPUx5o
-YQ0nirtkVaRe7csnDSzL6FapM7uw2qWa3ZTrz1llaJOkOlqv36NdMuEvJaTNn3nC
-V4tSOVmFmlA9ohDncxd1L8bN5uw2twnxfzU/6vC16W5pOWMAnuJSSA9zk6HtlPeD
-Ghez82ipQpOiQ44kEgTXkfeS6FGs9fmqaU5HLirVOJDR2/nJeRf6JKMBCCF162b+
-8lDinRnODBmNJo7ILflJX19apUu2JnQoMLw+ovnpZPXx2SEWTXJ2GhQ2vVhJ/i+Z
-GkRZ/76onAFx15ukzHWzf31YCJ2MSUqHvWyPHr1GGX+TrBocIKyrz1zlkuJUxSWb
-z5fUqztIcCoHGUoHSn+VcJOdz78woTNTgk+jYi9RiaxgPmrxUPS+toaY6EXJys2d
-wZO+R435Fw83MkchZSsqw98zeGwworJm9iN4dCb9skPgP4Wb+30+T/zSKCPppHN1
-l7xEAbS7T0UljlGBDM+/3MEpTirlaDJcfR29Gv/USn+QtCNhBZ8=
-=yA4e
+klDxZxAAocbpQOpoSGN3jQHGjhyfgZkw9SObu8p5aaMDlpbHSq/V7i/0qyYOlhEV
+IzGzEY7QSonbQVZerMl4fNI0ZoBVM7LUvbdOfFmFCNj5kHlvaS9uh+8qMd3kK4lT
+Y7oDkzq3o2rjdQj6rlYvO2SAQJTmUF0CsDPFGGeNL+phTT4XbiU4apgdlP5mozIr
+sUFO50jm05iqkJCctTNNk01v9pN3v0wHw/zimp7vG8b61TxbmzEsMD1UMXidkier
+tnnOUYDE2YB+YEW7J5fvmZMWb7W0ktVbZlhAwzAaFB5/+Hy90s/e0gKSJt+WcnWN
+QMZBRAtEEa902dMfJUWCmMA5J+e07faqs0Oi0SoNGnRIjznCgAVtOeQrPT5gRSD9
+gVObw1xLw4MjanBvBO01jISHEGO5+z5TSnCyn/ogyJ82rP9l+x6rkb3WStpHaqnY
+bZv0+OzKT1MGaugiAwNmstc0yKZ2a6x4Lui6k9bl1VfREwUePX8ci3ol+rakFhh3
+bbpO/tH4JaMcPcvRMnd67gy5a4/7F2tp6/YrM1E4M0aTclzoA8olRsRol5fQt9ya
+ZEtRBQh5PyvR0CbWjqRHTAmUQ+JtiuSybFso4Urn5R0OiFywrvCcIRNScIz1WXUP
+VqrwzTi6CSF9XlFBL/Rh44xz1p5qCvIddPT1gPrE/cmCCWw6LIU=
+=8BUR
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ca13ffc75fdd..57479b7f1c8f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 17 Jul 2022 00:39:57 +0000
+Sun, 17 Jul 2022 06:39:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 21734dad6c2c..3466e2a18d3c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jul 16 11:39:55 PM UTC 2022
+Sun Jul 17 06:39:58 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f81f507c5a68..d15eef785808 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 16 Jul 2022 23:45:01 +0000
+Sun, 17 Jul 2022 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c7e997cdcf3b..f06d3cad721b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5cb35fc0c3efaa29d8c334b20eb3fa31bc22868a 1658011446 2022-07-16T22:44:06+00:00
+eef60e8ead370b9be167a187719c83cb76ddcc42 1658039278 2022-07-17T06:27:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5f10a232f90e..17df3b612e04 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1658014801 Sat 16 Jul 2022 11:40:01 PM UTC
+1658040001 Sun 17 Jul 2022 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ca13ffc75fdd..57479b7f1c8f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 17 Jul 2022 00:39:57 +0000
+Sun, 17 Jul 2022 06:39:58 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f85663d80483..d87add02cc9c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 04edd9abcd53..88add26fc73f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -908,6 +908,7 @@ app-misc/recoll:inotify - Use the Linux Kernel notification subsystem for monito
 app-misc/recoll:session - Stop monitoring file alterations when X11 session terminates
 app-misc/recoll:webengine - Use dev-qt/qtwebengine for fancy result list display
 app-misc/rlwrap:debug - Enable debug
+app-misc/rundeck-cli-bin:binary - Copy the precompiled jar file and skip the rest of src_compile
 app-misc/screen:multiuser - Enable multiuser support (by setting correct permissions)
 app-misc/screen:nethack - Express error messages in nethack style
 app-misc/screenfetch:X - Use the media-gfx/scrot package to take screenshots
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 3378f860b1a7..280200859024 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index cdcc09c588be..345c99ab6596 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,11 +1,9 @@
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2 SHA512 ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
-DIST icingaweb2-2.10.2.tar.gz 11489780 BLAKE2B 4135e798afba7e7ea457ac00add5cd4ff14d9572ce6ffa50c8dc29ba43435e9305b9c2f52187bc50fc25f3def730c01c682a9ef80afdc79676a5d0c27dd87297 SHA512 e0e7f4f24c5609ccc0b1b0773fc018632bdd8d879311968e7b72cca1a856f227af3e6ff3e916b8bcdfc8c24c60d32008c6fee53ebac8d3a08328ded88baa3c00
 DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d SHA512 f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067
 DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191 SHA512 e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67 SHA512 3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997
 EBUILD icingaweb2-2.10.1.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
-EBUILD icingaweb2-2.10.2.ebuild 2531 BLAKE2B 53f83accfd9a604c1c9ca85371379b8d6fda8df18dc0d0459a93549d3504fdd37cba3ca23deaeb7e28165fa56974d126bcc227a4f7459c4b92d885b4d2432dd1 SHA512 7fe3b7cb49979ce01fb96be9d7a887c2c540b521aac120cbc3437e371dedad178d8a9874574885845dce17642aedc1f9a7799164e5495c92aad7e5f29b6a7711
-EBUILD icingaweb2-2.10.3.ebuild 2531 BLAKE2B 53f83accfd9a604c1c9ca85371379b8d6fda8df18dc0d0459a93549d3504fdd37cba3ca23deaeb7e28165fa56974d126bcc227a4f7459c4b92d885b4d2432dd1 SHA512 7fe3b7cb49979ce01fb96be9d7a887c2c540b521aac120cbc3437e371dedad178d8a9874574885845dce17642aedc1f9a7799164e5495c92aad7e5f29b6a7711
+EBUILD icingaweb2-2.10.3.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
 EBUILD icingaweb2-2.11.0.ebuild 2630 BLAKE2B eeca16f7d11d494af283842afad010e87c589e1fe8724c93176c70463db396815a73fa99496c557dc5fe25cf3da55739bbe805d9ecc1776a291126a066f7bfbd SHA512 32878a4e15cd689e8c5b890db2c41242992cbaf230f6080d7bc2e88715bbb6587f226f74bd19744dcec6cf23e81573bfda46bdc0c0e3eb3f255d0da6e2a4ef67
 EBUILD icingaweb2-2.11.1.ebuild 2630 BLAKE2B eeca16f7d11d494af283842afad010e87c589e1fe8724c93176c70463db396815a73fa99496c557dc5fe25cf3da55739bbe805d9ecc1776a291126a066f7bfbd SHA512 32878a4e15cd689e8c5b890db2c41242992cbaf230f6080d7bc2e88715bbb6587f226f74bd19744dcec6cf23e81573bfda46bdc0c0e3eb3f255d0da6e2a4ef67
 EBUILD icingaweb2-9999.ebuild 2630 BLAKE2B eeca16f7d11d494af283842afad010e87c589e1fe8724c93176c70463db396815a73fa99496c557dc5fe25cf3da55739bbe805d9ecc1776a291126a066f7bfbd SHA512 32878a4e15cd689e8c5b890db2c41242992cbaf230f6080d7bc2e88715bbb6587f226f74bd19744dcec6cf23e81573bfda46bdc0c0e3eb3f255d0da6e2a4ef67
diff --git a/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
deleted file mode 100644
index 1c12f98d4b39..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		dev-libs/icinga-php-library
-		dev-libs/icinga-php-thirdparty
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-	fowners root:icingaweb2 "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
index 1c12f98d4b39..eb5a96a535d5 100644
--- a/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"