gentoo auto-resync : 24:11:2022 - 01:09:44

219 files changed, 1775 insertions, 2405 deletions

diff --git a/Manifest b/Manifest
index 16ed06b1e51b..e9e4d9ae93c2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29620 BLAKE2B b4a57d8a12acd1bc926b5f2aee9196a91ca7e6267df1632b817ca445d967d5674d7cb5c5a07c699a02ce76dbe8cab4f501c0b2418b81fa9ba518e5dd5bd532d8 SHA512 d97bce772d68d9143a89b9f2e365c17fb615a209939e788abd73dd24cdf5038b7594bc3bd9e0b10a0dcea21f892fb6035703b28a008deec6324ae8de045756dc
-TIMESTAMP 2022-11-23T18:09:49Z
+MANIFEST Manifest.files.gz 29622 BLAKE2B e90caeaed6e65cddeeb53565abe22348f78a8b77aac3264497cfef55954c45aae747260b1fa8ad1d13aac1cf9f86678bdd2bcd28cf8cd43106d7e81fccb41667 SHA512 7325d32be0d73f1f4c64b7f5d8f2d654fec28580ae9af7245fcc9fa22a54aae9424aed608f60de4cfbebdd42b19f83ef22c1f87f1334f6bdcc12693a20ed0763
+TIMESTAMP 2022-11-24T00:09:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN+Ye1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN+tk5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB5hQ/9GWbmVTX0ri5GVZu51aDbvG7hwziGkVNiQxU3q2SqPraCYg86TjrnTJGv
-k3WFnJHzZhHWRORIZFzQjoL8o6gdfsA37CZI6sNKcgQ9mm/7KlPIS9uGjeQetI5z
-PPK+u4alrBkfP34VJYU9JfJCfjRzDjAnpDi7j82CFnttGOriYAcHRwxBpNwagS9t
-1tMlIaoPANHUroHvEWy089QfV4O5GGPiHpqlC4QcktqsgVUXmTbVCb/5Sh4Hjz1Q
-dvnkNZ+RiMtt/7aPoSgj9ApsyDmn+2EAsJK+pb28Y06lUeFkFq+hFAK5hD29wgaj
-LGsotJ+WgJ/ftjKQpG52KuWFiat579D514DzZJI0phoRjlxLkgEitQvNO+CZdnRn
-ImhEaDf4n2Z9Sm/+oRm1c01Qj9AxipB3Kuy+IcWHdejTmXy2qRihRLTQLVN/7qer
-+9Nt/pz1Q2B1LNTChQO2RQcAepv1GOt0G88hTeEJVtRVnshTzytK6b3usr4X2Bvu
-dmYfb1w6xDjA2bSZih/KjtVa9xaHStBrLCpJdr2TZflbuBqa1/CT5kOxlXn2sRL9
-sp/lF8DbkkiDa9KdvERbGnjw9+h8Iu6I+++JBIAFDZB7CQ+bRlBbKjxgMEBIeBYB
-2Vz+LaECLGbEsldouqFvlF6ShaE+Z2mPCoHT8DOw8YmCIaNGxgM=
-=+uK+
+klDX6w//RENNxU3lE7orOI0Tt4JcqP50MDwDgloGKHNIlKa6bTRW6YAHELFhaA/m
+jbcxdYBMEt5ZBAFnwqmmafrvKcpXoXBF0pqZ7wFy15ltV4gejuwKZtbOkfASSfh8
++th324iE2MtZNTS80sCbNj+mKy/daiGMfEfgtArX9XG5NzLWgYlQoHFJKbp3EGTs
+AuP+6KkTUQg1yFbcJtvwTnZadzfkiMahasyMhbxM6HZ+OVn9lsP3Wz5RwKU/XsrL
+IAap47booswHyvD8VXlG6xUKKrok8w1x10+xqk1TUZbe0M1xr+AUyS2RM0SIE0GP
+qD+HuSgRHojagt0JR3g8KoM9A+4t5GfhC4yQj1dcenD8rQVoRHs4vM5v3aPVCfdC
+tK+HSbUMBWEnm4jwEiahiOTetbCodSVwsHiQ6wkmjJ9ztrpEpJM9l38FPDn7RFpd
+LhDAD8hNqHQ2ZmdeVeh+Jc0o8hETtIyFalDfssEdIQpyAoy08RAD8teCzX4eTl7V
+2HEsrKLWzuk1z6Xq7H0lmRYsn1tOri09u6hIK3jEnpHog44ecCS+ocLM+FNxaACd
+TGk9XuEZawxOgUitWkEVMGuxHCyHcgo7mZrHtFDCi1Rh9kipAM+1iwKMoZuGrtGB
+QHIAFhNSzm0h4LJwf4fDWw11AfnD0I5LhMNvuznGj3qYkqXpBww=
+=Le+v
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0f2c6f49670c..08fb88cdab36 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9d2336de2c4c..44d2d2d58cd4 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index f0399c4dbb62..8233fcdd12ec 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,7 +1,5 @@
 AUX backintime-1.2.1-no-compress-docs-examples.patch 6018 BLAKE2B 9ef4f8c5b81677340707e98550ab8e0d4c574a9bfe36fbb9c178f2050ca726ce995927bf2a186363243cc64f4e8be3b99a12b7b2b37ad0d4f6892ae6f730e48d SHA512 6484fdcc4ede6f5c57bfef985a290b9d8a74aecaea43e239a3368cf79aa6797d7fa4842fa331b259afd25084d9c514e643916c39c34d4a8b33bc668c93d9b180
-DIST backintime-1.3.1.tar.gz 714401 BLAKE2B 5b6a294d5a22ee3928725caf1a9895b665bfcddd6b779355cd7f7e58b5a201c3d2158ef4b30fb73eb4525c1a54cacf878397874f28b06798b7bfd973df467a39 SHA512 faac8552748da75db62cf7fa7eea686fd8b262016d1072f432fff54a6c0c72929650582870b4c56efbaa4ef5984acaece9e1d76eb72abcce91c6fc92d34d52ad
 DIST backintime-1.3.2.tar.gz 714459 BLAKE2B cc53bd5391155705016248511e30cdfa7bc25f0a7cb170dfeeffda397e8be1b22f8e335063289d8c192f94c469430655064899ac8059f22f3b7582e3af87d373 SHA512 19f756d03cc7533e02bb5172ae3f8c167206bf5e8d60c0f3af1f647e01297a4eeb7889bbb5b58e46636bc31392ee436249b276ddbfa41697a0538c542fa26cb8
-EBUILD backintime-1.3.1.ebuild 1621 BLAKE2B e9e0ffa41497be3ce63c3c5827dbc6809123dc06b0427cbc438b5ed6367064502c6f8932bd57d2901882af1fa80914d8ff1659e37c73412e1d8a32ed5ad9d668 SHA512 15e5a2adb27450903befd78a80bf5480ac562be318b61fa4e7251247fc29313b38f147cbaa5496f7a96c98eac22282b1fea8ec86448af343831274761adc03aa
 EBUILD backintime-1.3.2.ebuild 1650 BLAKE2B d2bcd4542751449f0c09d5db417620faea80b70a8a3c17d755486941f9fe99804881de5e8399db5cd4b6602f458b0fc43498b4ba8a705134fac43c415b567ef7 SHA512 d7b3f219533d43d05ab333105a9047aee9d0c2ff66d977f46bee5cfb942c40dbdb2da52f7f2d090ff58d5d6b152fb0cdc4c0419249598fecec93e04dcb9bd9a4
 EBUILD backintime-9999.ebuild 1611 BLAKE2B b80a40437968c57066653ebad53ce96595559b2355c2619017a34107c48bff84630f4f60fa119df292b7fd008e692985f9b7169f97dbafdff7277a48dc3a29c2 SHA512 1eff1c238b84167c10af28bba259aeb52f2901d2d39c8471548114a0fb8c21f7ca4576f2dcb9fdd1346b50dfff46e7c6a91c4fdb5a3b4c0a2f384bbbd3d6d63e
 MISC metadata.xml 665 BLAKE2B 402f8b0414939dc87e826c6f635503c87343892033df66701d5be6d379df8d932ba155ffcc8764f7b5a71e3d89f8cb5c83b0ea3a515450c86f6899224298c79e SHA512 4d5271dc1500bb5d4e3f8c7090b95dfd6cb3df44d5c93a2c00fdda7ccdafaf2366c584e331a0b7c83087ea2ca5833f2317fd828676eb5c1d40cea1faa18fbf96
diff --git a/app-backup/backintime/backintime-1.3.1.ebuild b/app-backup/backintime/backintime-1.3.1.ebuild
deleted file mode 100644
index daf1a9fd35d7..000000000000
--- a/app-backup/backintime/backintime-1.3.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
-HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
-SRC_URI="https://github.com/bit-team/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples qt5"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/keyring[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${DEPEND}
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]
-	qt5? ( dev-python/PyQt5[gui,widgets] )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
-
-src_configure() {
-	pushd common > /dev/null || die
-	# Not autotools
-	./configure --python3 --no-fuse-group || die
-	popd > /dev/null || die
-
-	if use qt5 ; then
-		pushd qt > /dev/null || die
-		./configure --python3 || die
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	pushd common > /dev/null || die
-	emake
-	popd > /dev/null || die
-
-	if use qt5 ; then
-		pushd qt > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	pushd common > /dev/null || die
-	emake DESTDIR="${D}" install
-	popd > /dev/null || die
-
-	if use qt5 ; then
-		pushd qt > /dev/null || die
-		emake DESTDIR="${D}" install
-		popd > /dev/null || die
-	fi
-
-	einstalldocs
-
-	if use examples ; then
-		docinto examples
-		dodoc common/{config-example-local,config-example-ssh}
-	fi
-
-	python_optimize "${D}"
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2c697d1fbe53..5100614b9c06 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 0844318c110a..3672eb85d0a9 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,6 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-3.0.4.tar.gz 253157 BLAKE2B b1bde1ca31ef34c264f5045dd36220b3fd04230c59f7e65a9623681377dbde161ed3b92d86bd3e6f5a115d8847b1c2019bf984194f2901b52eb65abefad8bf81 SHA512 919987ac026366d245fa2730edf1212deafb051129811f35b482a30af9b0034a802baa218a35048e030795127cfeae03b4c3d4f12e580cd82edbacdd72e588e7
-EBUILD acme-sh-3.0.4.ebuild 1233 BLAKE2B 69ebd222df639a4b1696edc3e3384390193128306861d7b64a2f35fb611a4ff18d8f7ee1dd84542702896ba82d7edd100d33b5d2432fcdbef56e919dda798cbf SHA512 46cec2814968b97dfb63f7d7f4ee8c895a1102b74a6fbff09111e6b8305e1ab38be54706f376466e1a64254b4bbe66eb8999b25ca3a63f430f9dc8ab9ce20aa3
+DIST acme.sh-3.0.5.tar.gz 270092 BLAKE2B daba86ec09df80d374d1ea632f2bc84ecfbf665874d10fcb410e1bde7787551bb8b128e1ed0a4dc7943f821aaba6f9ae43b83225875f389d02d20d47b6fdf8f3 SHA512 882768c84182a8b11f4f315a9b429cd84399145a97b64772a42e0c7fc478c6c5f93a6c73289410b4d2108786a7c275e99f2e47991bdca315fd7d80a4282eefc9
+EBUILD acme-sh-3.0.5.ebuild 1244 BLAKE2B cc2dcb21ff8b216f91074f8eaa5381e811d2be83b93f66fb65b5787a3087a780ea5d17f47cc3e7f19478e1808259ceb59a9083b651bd967c3a8a00c08d6bf341 SHA512 deb701d30e4944df70349b78c247d08cffb0ec676d49cdf5dc9651a237273317f95a85a186daf8d7b973de6a07b71eee0d6c487c0a69b794a76727006aadbb8c
 EBUILD acme-sh-9999.ebuild 1125 BLAKE2B f12d96d5937e7369877dd27265f486c51d694b6d764d0e9ae3b85ce284e01d10e9e2715384409e1930a88d586d84a95db46bccd85e01a8b777e668f3a250b0fa SHA512 1c96737632ff0cbaa9b636d01134807e140c9122ce695fcf301df5ba55acf06c0ab2b5a04c103e1a6fb3cc1d3a5d72111cf3df955fa765c349d6f3a9edc8fbb3
 MISC metadata.xml 677 BLAKE2B 783e74dfc78dc11568fe72316c5bd100d18fd5c90987d9c21386930f98713d6be5de74d395ed919a8dd7986f0bada50d16c24a670ba856318d103b186a514046 SHA512 6a34e252d900761bc12fe5b1f8d8b8277fded6685f8495a307de4906a19d797f2a4eb9b84676ae1f5f43720c092e3f3d081ec243dff19efa626d4d538974efc1
diff --git a/app-crypt/acme-sh/acme-sh-3.0.4.ebuild b/app-crypt/acme-sh/acme-sh-3.0.5.ebuild
index e8a4db2391b3..c83e0e967104 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.4.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.5.ebuild
@@ -10,7 +10,7 @@ inherit optfeature
 
 DESCRIPTION="A pure Unix shell script implementing ACME client protocol"
 HOMEPAGE="https://github.com/acmesh-official/acme.sh"
-SRC_URI="https://github.com/acmesh-official/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/acmesh-official/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 43d3b2bda026..dea418cd4a0c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 8beedd0611c4..5c13c4cbe469 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -3,6 +3,9 @@ AUX kile-2.9.93-fix-crash-when-deleting-templates.patch 1480 BLAKE2B 65260e42c42
 AUX kile-2.9.93-fix-ktoolbar-usage.patch 962 BLAKE2B 05ef1605d01aabb40f2c64a8ec1c0212f442860add397ee85bd4597ec71ffdeb3120bd895e4a3b2e5bf02fdab15f75ccf9550e1c65aa6c8fd076aaa5e13f53e2 SHA512 06c8c2e0de25247edc0e2798b1455f1cd062d1f04c020a78f557958214b28b4228d56af57a1e154d1bb0598f22f9fe8e850d7b11f7ae9e569b15f89e95c43f2c
 AUX kile-2.9.93-fix-overriding-existing-templates.patch 6492 BLAKE2B 38b851368913d50aba95d5f037933fdd801be90921bfffc2b25fb2cca433c85806875f1472368fc9aace4475d9b24926bfe32ca5d4615ee83bbc728d402bc8aa SHA512 24cc76a554da0e25a37dc05356cf59224fd697278da8532ee2baaa6be4e04710620120545b11dd8a7986f56859ee9365fb072c1d3eaf6ef3fb4fcd5ed9543455
 AUX kile-2.9.93-no-khtml.patch 1361 BLAKE2B 01ab239474e4446368bd4a39da8e2f26f7cefc72f1150ea99a8ecf69dafc405fbdbc18d357da136f97ab446464a579a1d3e792f3d62c7c22a22954f6e6a7ab4e SHA512 2cc92a484315c61941ea19e73a5c98e0ae275a1475fd46bbfccb9f57283454f90d2b6a7e03da0a8e7f766c4486a4d1f6fef4b6c21b6349bc368ef14d936d9ed9
+AUX kile-2.9.93_p20221123-cmake.patch 747 BLAKE2B 51be48cd5f78a9385daa2ddd50a7f1b2e6c6ebd42e11d355e9b0e874260c41b00762e62aa50fca5290c48a5ee97f2a4e59b598ef8669964c92b522ecca380219 SHA512 a496ace8de21c4fc208a243ededf61f6931096dba58320f6b3cd60def52b929e57d53b5aee1781951420bbb5e097059b6bb7413e11f151f04aa9f909cb2e7bf4
 DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
+DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc
 EBUILD kile-2.9.93-r1.ebuild 1892 BLAKE2B 631acbad2cc2460164293d59044a8ae88d03ded1e646acd54900b7574c0da7709c57848f7f5d6f7c6bae2661005dfa66ec35fcf05dd229ea598b079bc5569a87 SHA512 5c1a29302716fa65569f644a726b4452287674bec41b3f301181e7668257784b5c3f894cadd115d5590dfc6e9772d8dece3cf855e7065163c9edb5d7fb8f3090
+EBUILD kile-2.9.93_p20221123.ebuild 1604 BLAKE2B f25f8dd5bb9fed5633d3b9610cc0158cdbf6685bdc6808b83bab40c0868fd0969edd05ca78324586bc994f8507d16036b601e890426ec592d0d86a8a259eb974 SHA512 4ef02f1d25ebafa08f959726f4bd3f35fa4d1bcfc1a1d89b77f58c7d41d3e8f092e4424c319eca81908b75093a5c885d829ae1a0dd2ef03fb647d556664046c3
 MISC metadata.xml 477 BLAKE2B 29032be5f6ed3ad553c35bdeb1fe167470cada69818b6faebf03959ae9fdfdbb4e1154177bbf990647c3bff89f59d5a4c333ebdd5e535734f4d15257ba0673c8 SHA512 76c905140f86d5e6c08e90ee0d4d39430a0136e9df304204fe42e17ef9c809b8585678175aefd3743b7def5976ad1a7ca62650434fbd63f4e234e5649ee09bf7
diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch
new file mode 100644
index 000000000000..0095adf9548c
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch
@@ -0,0 +1,31 @@
+From 2974fba837aef46711d9e1b26cd367aab68ba53a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 19 Dec 2018 13:36:12 +0100
+Subject: [PATCH] Disable install misc files by cmake
+
+AUTHORS, README, Changelog etc. are handled by distribution packages.
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 91a732ab..c69c168c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,13 +114,6 @@ install(
+ 		kile2.0-5_upd.pl
+ 	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
+ 
+-install(FILES
+-		AUTHORS
+-		ChangeLog
+-		README
+-		README.cwl
+-		kile-remote-control.txt
+-	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
+ 
+ ki18n_install(po)
+ 
+-- 
+2.38.1
+
diff --git a/app-editors/kile/kile-2.9.93_p20221123.ebuild b/app-editors/kile/kile-2.9.93_p20221123.ebuild
new file mode 100644
index 000000000000..a3165b4e1290
--- /dev/null
+++ b/app-editors/kile/kile-2.9.93_p20221123.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_CATEGORY="office"
+KDE_ORG_COMMIT="1ca67389327d63fdc5a4c65ab6dd1cf7fbf597af"
+KFMIN=5.82.0
+QTMIN=5.15.5
+MY_P=${P/_beta/b}
+inherit ecm kde.org
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
+
+LICENSE="FDL-1.2 GPL-2"
+SLOT="5"
+# KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+pdf +png"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	kde-apps/okular:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdoctools-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+	kde-apps/konsole:5
+	kde-apps/okular:5[pdf?]
+	virtual/latex-base
+	virtual/tex-base
+	pdf? (
+		app-text/ghostscript-gpl
+		app-text/texlive-core
+	)
+	png? (
+		app-text/dvipng
+		virtual/imagemagick-tools[png?]
+	)
+"
+
+DOCS=( kile-remote-control.txt )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package pdf Poppler)
+	)
+	ecm_src_configure
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 002f4ae0bce9..80c69708577c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 6b7bd4fae209..62e6c3b57010 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -4,6 +4,8 @@ AUX wine-proton-7.0.4-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2
 AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f19297cab205d8b9ca07c5293172a0b017b5d887ec1f5daeb3ed64eb0a322904e528a72f4a225813c27b544015587d71fce97c41b6b1463a2 SHA512 1384f06d4264e22d332eb12fabd7408b8e250e39c195460f876460fe40d35d617c73100815c395f481e3af66676ccaa1a14592c05f1e5b092bfafe2f87112106
 AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df
 DIST proton-wine-7.0-4.tar.gz 45561670 BLAKE2B 0bc3432e5aa9ca1655e76b31dcbef08febe263e07d3635d005fbc7798b3a08fa50e2e736f33b18700f187dc755f012d7e8ae3edae6a63fb433cd9b8861b747b0 SHA512 dccdf4115e2a7c92981163783f5705e78fbfa042f06123e4802251bd2c558e8b4de7e3d2e114a5d942f9493eb64fb7fdedff2e6e8b3f21ea1de1156456930d8c
-EBUILD wine-proton-7.0.4.ebuild 10405 BLAKE2B 3e3967d5b2cd90a4a0932b8ada340872e08b0d419f25c89628353091db4366dfd7de3b0e1273698f7a2d9e029cf853632c1be801f0ed6c5b49337988fddd0e23 SHA512 30fc7d105410d8533866b54baf7f44a72d6cf16cb88900f7736cd322ccf2ffad0c14262a1113cd7f317e5271a049ba2c32e82250f77e2b73d00c6d26c438ac83
-EBUILD wine-proton-7.0.9999.ebuild 10412 BLAKE2B 10d549c5477ec3393d561f8bc8df6572f6f46dfa71a9029c4eadc260b84c763c60f75f29e5cc69720e20d982aaa5d81fa29e0cb885af494f5a6f7d83b96aaf43 SHA512 e916d8822ee6864940a0f93222f6d18c50ed8af27e1960147c0624b498ccd9493718a872d604b31b98b756a2c85b801169570ce1d7f561465937737c820f0bb4
+DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b
+EBUILD wine-proton-7.0.4.ebuild 10309 BLAKE2B 084ee116c5ba5fbefd89b022fed3b1863b8700a15c40bb9dcdbf5775476286474d66bd3ba25deecfa2156ee23d844962983cc8261ad30820cfc41127c456eaa8 SHA512 d5accffbc3618c9dfd7bcae20b169db43dd633bd5d83d723ccb88eb43a9d01033ba213d278d8efe08210df989aefa7713035b6d53df183e436549da53fe377bd
+EBUILD wine-proton-7.0.5.ebuild 10316 BLAKE2B 5ffae0a8f9f947af159b7f7203076b3acb00cf65173d68f6ff10bf9977628e51d5e090e2ac850a91c66ad584447bfc95d88e62a644e3300354ae85108eb53f38 SHA512 de6c2d546c2c2c50eb483b11661a150acf88278dd05498ec9ec6bf91f585794a24ed3a582d3e57c3b92ebc8990486be13eb000688ba562599b0e93e31c787017
+EBUILD wine-proton-7.0.9999.ebuild 10316 BLAKE2B 4a64c83297a590b8cd0c31faaebea248e14cd3d339ed8c8ce45bda954ea7d28a21d5a098312c8840a5b9d115ffb7f30fe91c630a85b986bebb284b68c0659013 SHA512 c0926234e267566ae3099f1c43a3dc5ef30690dd7191c9f5f31c72eb2acf96fbf22d551f672934debb9526ca3d5e20e3b4760e5db0595427329d3736438781ee
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild
index dcb70f280da0..031a67e02638 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild
@@ -96,12 +96,13 @@ DEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-IDEPEND=">=app-eselect/eselect-wine-1.2.2-r1"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -217,6 +218,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -299,27 +305,16 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_preinst() {
 	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
 }
 
 pkg_postinst() {
-	wine-eselect register
-
 	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
+
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
index 9b551b53e450..46cd54a51bd3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
@@ -4,38 +4,34 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic multilib multilib-build \
+	python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
-WINE_MONO=7.3.0
+WINE_MONO=7.3.1
+WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
+	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
 else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
-	S="${WORKDIR}/wine-${PV}"
+	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="
-	https://www.winehq.org/
-	https://gitlab.winehq.org/wine/wine/"
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
-	opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
-	selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan
-	+xcomposite xinerama"
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal
+	osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb
+	v4l +vkd3d +xcomposite xinerama"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access
@@ -43,61 +39,47 @@ RESTRICT="test"
 
 # `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
 WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	dev-libs/gmp:=[${MULTILIB_USEDEP}]
+	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
 WINE_COMMON_DEPEND="
 	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 	)
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 	openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
 		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )"
 RDEPEND="
 	${WINE_COMMON_DEPEND}
 	app-emulation/wine-desktop-common
-	dos? ( games-emulation/dosbox )
 	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
 	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
 	mono? ( app-emulation/wine-mono:${WINE_MONO} )
@@ -105,27 +87,30 @@ RDEPEND="
 		dev-lang/perl
 		dev-perl/XML-LibXML
 	)
-	samba? ( net-fs/samba[winbind] )
 	selinux? ( sec-policy/selinux-wine )
 	udisks? ( sys-fs/udisks:2 )"
 DEPEND="
 	${WINE_COMMON_DEPEND}
 	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
+	x11-base/xorg-proto"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
-	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+	nls? ( sys-devel/gettext )
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.0-unwind.patch
+	"${FILESDIR}"/${PN}-7.0.4-musl.patch
+	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-7.0.4-unwind.patch
 )
 
 pkg_pretend() {
@@ -141,6 +126,7 @@ pkg_pretend() {
 				eerror "    crossdev --target ${mingw}"
 				eerror
 				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				eerror "--> Note that mingw builds are default for ${PN} even without this USE."
 				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
 			fi
 		done
@@ -162,9 +148,13 @@ src_prepare() {
 	# ensure .desktop calls this variant + slot
 	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
 
+	# similarly to staging, append to `wine --version` for identification
+	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
 	# always update for patches (including user's wrt #432348)
 	eautoreconf
 	tools/make_requests || die # perl
+	dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's
 }
 
 src_configure() {
@@ -177,48 +167,62 @@ src_configure() {
 		--includedir="${EPREFIX}"/usr/include/${P}
 		--libdir="${EPREFIX}"${WINE_PREFIX}
 		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		# upstream (Valve) doesn't really support misc configurations (e.g.
+		# adds vulkan code not always guarded by --with-vulkan), so force
+		# some major options that are typically needed by games either way
+		--with-freetype
+		--with-mingw # needed by many, notably Blizzard titles
+		--with-opengl
+		--with-vulkan
+		--with-x
+
+		# ...and disable most options unimportant for games and unused by
+		# Proton rather than expose as volatile USEs with little support
+		--without-capi
+		--without-cups
+		--without-gphoto
+		--without-gssapi
+		--without-krb5
+		--without-ldap
+		--without-netapi
+		--without-opencl
+		--without-pcap
+		--without-sane
+		ac_cv_lib_soname_odbc=
+
 		$(use_enable gecko mshtml)
 		$(use_enable mono mscoree)
 		--disable-tests
-		$(use_with X x)
 		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
 		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
 		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_with mingw)
-		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
 		$(use_with osmesa)
 		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
 		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
 		$(use_with sdl)
 		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
 		$(use_with udev)
 		$(use_with udisks dbus) # dbus is only used for udisks
 		$(use_with unwind)
 		$(use_with usb)
 		$(use_with v4l v4l2)
-		$(use_with vulkan)
+		$(use_with vkd3d)
 		$(use_with xcomposite)
 		$(use_with xinerama)
-		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)
 
 	tc-ld-force-bfd #867097
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -244,17 +248,15 @@ src_configure() {
 		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
 
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
-		if use mingw; then
-			: "${CROSSCFLAGS:=$(
-				filter-flags '-fstack-clash-protection' #758914
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
-			: "${CROSSLDFLAGS:=$(
-				filter-flags '-fuse-ld=*'
-				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
-			export CROSS{CC,{C,LD}FLAGS}
-		fi
+		: "${CROSSCFLAGS:=$(
+			filter-flags '-fstack-clash-protection' #758914
+			filter-flags '-fstack-protector*' #870136
+			filter-flags '-mfunction-return=thunk*' #878849
+			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+		: "${CROSSLDFLAGS:=$(
+			filter-flags '-fuse-ld=*'
+			CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+		export CROSS{CC,{C,LD}FLAGS}
 
 		ECONF_SOURCE=${S} econf "${conf[@]}"
 	)
@@ -294,31 +296,25 @@ src_install() {
 
 	# don't let portage try to strip PE files with the wrong
 	# strip executable and instead handle it here (saves ~120MB)
-	if use mingw; then
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-		use debug ||
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
-	fi
+	dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+	use debug ||
+		find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+			-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
 
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
+	readme.gentoo_create_doc
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
 }
 
 pkg_postinst() {
-	wine-eselect register
+	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
+
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
index 6206f63f753b..7906e159577b 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
@@ -96,12 +96,13 @@ DEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-IDEPEND=">=app-eselect/eselect-wine-1.2.2-r1"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -217,6 +218,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -299,27 +305,16 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_preinst() {
 	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
 }
 
 pkg_postinst() {
-	wine-eselect register
-
 	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
+
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 673f86ee87f0..df74cf567a22 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,17 +2,14 @@ AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e370
 AUX wine-staging-7.17-unwind.patch 1694 BLAKE2B ad8ba23e07a846152bd93e76a0b226869c8a9a28f197321b0faec3ad3721d05b892c69829d89933f245a7b6e0c8070db0e7dfef7d4b9bb047052d57f5ba7067b SHA512 80c3a1f347e7250cb1d7ab958507987b2aaeaf660c4ffb95c19118011ee61957629a9e28f2600fdafb384b61c26f50bcdaebab1fcbe30a9553c63cbed664c817
 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce
 AUX wine-staging-7.21-crossflags.patch 876 BLAKE2B 84dc39960e40c94f6e0bce4c8206b6d276e4d916f4b98d0f83a40ac0a7349f59b68010eb6bd4ba2b0ca854abb74a2faf58f54258e86cd1c800e849410d0570a9 SHA512 ee53bb03ce6ec181d2d87c63659802c4b68941c55264c8700e13ae83c0f9913a7ff8f45a5c42d40e302d7731535ba673a7fe669d0bebbfa35555e1f6187ab31b
-DIST wine-7.18.tar.xz 28412876 BLAKE2B 1f25c8669a2afbead142923a39913b3f21df641e446a6136e7ecd282f6c31bc70578036e83f3dd28d22516d987ddca179198f76effb5c9aca089f4755ffa873e SHA512 e651b18cef73b4619e953b746d0c207c0220279003560aaf195c2569a22308af129e1460651a246e6a87dcfbcfcff08f52f970734035eb55ab45d8970fd56a02
 DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
 DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453
 DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1
-DIST wine-staging-7.18.tar.gz 9535819 BLAKE2B b7157493c8362bce4683f0cd8847e41b812fa4150cee476a5598bd5b42a95686de0a25073082f513c42d618e53538e14cb5a8ce982c731f3880fb3356f4656f0 SHA512 fce34941f53f649035b9581f3612f0e47bcbb7e52d2edd33deba9123870cf69c237d10c820c8cbe1b9a784fe6e688af8690cc9ea6d71d4fc596f94ebd1a932a9
 DIST wine-staging-7.19.tar.gz 9523048 BLAKE2B e53fd47af493cbdc4542f908a39557324d70ad67ff2e06c80296c006a63518e43988750cab2f4d3d9197fc9c8a1e61ed4d96bcc310b82b6cfc8ec12b941f1c5c SHA512 c51cb18c4ae00eccf414f5edda18ebf363674ba7cfa95da135b3a43b7c012c086d454d6ac32b22d98e611bb87e55c3e1ee95571a4a0c9713028b5ac38e8aed3f
 DIST wine-staging-7.20.tar.gz 9521481 BLAKE2B 5a264460e72ac96d50d23492100c465eeb0b933306200710aa085bd37bb79df3c6ef03aeb5ba2c4c196befb231938457aa9584b9edf938edfd754d06e7cdb574 SHA512 538bf60e760254f3130fe8b6bf07598287e567c0f34d6be2ed04fde10007283d4c675a6f27a0a13d3ce77e833559d5ef853a89f2f96dc5f8cc818bdc3570474a
 DIST wine-staging-7.21.tar.gz 9530737 BLAKE2B a80476dbc957a9cda1554262777c63276f9b66a5ccd1389a006327810b0b960a600f78dfabc0d8df4ce816cdd7c4c3c29c26bea9b63219fa90dff60142d41da1 SHA512 1261267fe82a25d74dbf3f8cd1926339356eac3cd432667517c2ca65656c1b733c2866a48c1e4ad116ac8094d9079366a07f6a7814b8bde27246d654a792e9ec
-EBUILD wine-staging-7.18.ebuild 11208 BLAKE2B 10ed5cc64b97630217ac2afc68282d684eb4f741e0c74af41d966cc7f7cd3c803804999e4f19fe3df28ba1b72a952931d56d3ab71e3548a2642f3e718adb80cc SHA512 3e37d7f6e825f2b500acdcadcc1c435fb847692c7c5cc356ce96b2823a012accbb183ca446b4947f90af474dbb1a673fe13c4c069f688dee04692bc7f8f87b5f
-EBUILD wine-staging-7.19.ebuild 11136 BLAKE2B 5921466e380c7a2fe53a4ccf66e3a1ee8d1638fefc298b880c285899d5fefb39ed7c891fe22a8c25f726df1bfe26be3915aa5d8cf9bda47d211154c3cd103e56 SHA512 b54621f4d6bf0931787856453db5f42599108eab738a335891008c2ed4a066857aa981c114a5b95ae00327f27e606e3de52237e4b852c1ac69cfcbcb4efe686f
-EBUILD wine-staging-7.20.ebuild 11136 BLAKE2B cb43b2a447e74aa51e5989df08d3919c5ed0e22ea31c981aec7b68542e85dfd422806b007cdc6e58e321f4b33f6e51606c50b5d693432adc505d151d58cd47e6 SHA512 a17c65dd21fcc034537d0b70226fea3fa36c000fa9ce49579b1568ad009b5f3c845582091509244fb5ce8028c3f19b41f7b350c1cfc7dad5a64f3f40ca6066ec
-EBUILD wine-staging-7.21.ebuild 11237 BLAKE2B 9fd42e64b8059d368797cc0819295f0c19a71c0f6819cfaece27854a755babfbd427eb18ad41996813e71cd88c74c8614cc2584328166d7cbf85b50513cfb597 SHA512 4a736178afbd4593b3eef5d8c4becd4144b41fd241285acde2248cf5090b22a3e85e51628dbf559101f4aeef5bf6329cd4b8a3d3cf28c9acd3e07163961de578
-EBUILD wine-staging-9999.ebuild 11238 BLAKE2B ad781e976b13feee5dc33774e5de036e2959e9a37a99420bcaf9542d4bca8c46da7976ebd7e346b9875463c6214fe75da072d1912ee39afcc4a3ea7575039a3e SHA512 6c6b02809308df506d1368227d001cd7b563484999eebd177c695502ed70a2abd315dd183ef1e7041b674b4fa6bd571ea27e62c2515eb23dbf04a3dd1c2c4d1e
+EBUILD wine-staging-7.19.ebuild 11051 BLAKE2B af17100f7b5b80d5e1f2d342f9603cb5d4886ceb4f864e154be437ee776a74d4638b9ed8f3db24688cb611c92356d82d6e6fc7e7707a0ece51e09a2e67299f9c SHA512 2621ba9b7146dde03e746a24592918ad6842b93fd0d34dc11d620c00f046837de579ff0322e76b43e6ecc77eaefcf11e5e9ec407b3e73dc84123ea8247b17305
+EBUILD wine-staging-7.20.ebuild 11051 BLAKE2B f378f4cefea21783cc5a07f7bf47d6a052a35493010999087bdcafd2265e5e1f904294bc567d488a9f2b822125d19c520c7587963c1c843485c91a9dfdf80145 SHA512 8f5ba147c7445b4f1066ba79d0591182b313291d6a133561099ece5dbda95db3b954ade53438ae08eadb8c60fe7dc937b47b35b2a30a8659d571d3b3a2bf2495
+EBUILD wine-staging-7.21.ebuild 11152 BLAKE2B 76de2020db1b50da53f4c9b33eb39ee84b3166cbf591a99be1c756b49154e17e838fed8ec7a0a07900289939cdcac305a4f9544926614958f6791f82db79ca5b SHA512 efb247f04442454cd71ef0760f77b7aa8eecf68a898da4cdacb89d0187499132eb4e4fd7c83391eefd490570561295d9c184e769ffe10f5eb856875feb496b3b
+EBUILD wine-staging-9999.ebuild 11153 BLAKE2B 4c47f1d6a805774e2f60d2610acf141ffa9352d6439cb930e47337e27b498c5188b6892cc5282f9269d21c4e33ce3af348082697dd210751a375e3a99bb5be50 SHA512 59667ee9f2d0f91c8bed14011a31d4a8adc28be6a729bd35e64210cb21fd86cc8511331b0b0846b940a9cd1bd55eb5d641aa82c512c5fcffde3a62bff34608b7
 MISC metadata.xml 2352 BLAKE2B c3bc247559ce143b4c8497b17dbeccf283ecb70463ca8230ba46d949c0def97f15c0b676149524111f7d151722d7c6343dc16dddaba5093fba60c62389da778d SHA512 a05a2b4bdaa01b7f097cf824f2b949b2e5ece864c7307dfca42a384711c9db09f486c3d398c9c1f187daadfcc646bb14fe7c488140fea2a3f7092a5e3a8011d1
diff --git a/app-emulation/wine-staging/wine-staging-7.18.ebuild b/app-emulation/wine-staging/wine-staging-7.18.ebuild
deleted file mode 100644
index b310ca62f7cc..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.18.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.3.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/wine-${PV}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
-	opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
-	selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan xattr
-	+xcomposite xinerama"
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? ( games-emulation/dosbox )
-	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
-	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
-
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.17-unwind.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-		EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-		EGIT_CHECKOUT_DIR=${S}
-		einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local staging=(
-		./patchinstall.sh DESTDIR="${S}"
-		--all
-		--backend=eapply
-		--no-autoconf
-		-W winemenubuilder-Desktop_Icon_Path #652176
-		${MY_WINE_STAGING_CONF}
-	)
-
-	# source patcher in a subshell so can use eapply as a backend
-	ebegin "Running ${staging[*]}"
-	( cd ../${P}/patches && . "${staging[@]}" )
-	eend ${?} || die "Failed to apply the patchset"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with xattr)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(usev !odbc ac_cv_lib_soname_odbc=)
-	)
-
-	tc-ld-force-bfd #867097
-	use custom-cflags || strip-flags # can break in obscure ways, also no lto
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# build using upstream's way (--with-wine64)
-	# order matters: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		# CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
-		if (( bits == 64 )); then
-			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
-
-		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
-		if use mingw; then
-			: "${CROSSCFLAGS:=$(
-				filter-flags '-fstack-clash-protection' #758914
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
-			: "${CROSSLDFLAGS:=$(
-				filter-flags '-fuse-ld=*'
-				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
-			export CROSS{CC,{C,LD}FLAGS}
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
-	if use abi_x86_64 && use !abi_x86_32; then
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	# don't let portage try to strip PE files with the wrong
-	# strip executable and instead handle it here (saves ~120MB)
-	if use mingw; then
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-		use debug ||
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
-	fi
-
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
-pkg_postinst() {
-	wine-eselect register
-}
-
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
-}
diff --git a/app-emulation/wine-staging/wine-staging-7.19.ebuild b/app-emulation/wine-staging/wine-staging-7.19.ebuild
index 8f5c2fb8b316..f4d6cc01a97f 100644
--- a/app-emulation/wine-staging/wine-staging-7.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.19.ebuild
@@ -115,12 +115,13 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -249,6 +250,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -334,21 +340,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-staging/wine-staging-7.20.ebuild b/app-emulation/wine-staging/wine-staging-7.20.ebuild
index 9e74efd3fe3a..1a7b1f25c6f9 100644
--- a/app-emulation/wine-staging/wine-staging-7.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.20.ebuild
@@ -115,12 +115,13 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -249,6 +250,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -334,21 +340,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-staging/wine-staging-7.21.ebuild b/app-emulation/wine-staging/wine-staging-7.21.ebuild
index 8a8cd11bbbce..e3f38a33cb12 100644
--- a/app-emulation/wine-staging/wine-staging-7.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.21.ebuild
@@ -114,6 +114,7 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -121,7 +122,7 @@ BDEPEND="
 		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
 	) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -250,6 +251,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -340,21 +346,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 365abdfc568e..1f7740c6c6b6 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -112,6 +112,7 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -119,7 +120,7 @@ BDEPEND="
 		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
 	) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -246,6 +247,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -338,21 +344,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 1848633541c9..aa24705e3015 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,15 +4,13 @@ AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3
 AUX wine-vanilla-7.21-crossflags.patch 876 BLAKE2B fa0bfd1f5fba242a8a99bf94e5ebb2c9cc07bb452d84d542f64a7f73795646af91283ac98dc2a78199ad6d0652544d7768a602539bd7c083ac5b9cf9fd4472ae SHA512 fe5160233246ac2335bb7f38daa761978544a935238d7b99cccf36fe09efa171bc4addbdeedbb457c28ea3a85377f4615ba68d04544ff887c94ff8341e3a8178
 DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944
 DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
-DIST wine-7.18.tar.xz 28412876 BLAKE2B 1f25c8669a2afbead142923a39913b3f21df641e446a6136e7ecd282f6c31bc70578036e83f3dd28d22516d987ddca179198f76effb5c9aca089f4755ffa873e SHA512 e651b18cef73b4619e953b746d0c207c0220279003560aaf195c2569a22308af129e1460651a246e6a87dcfbcfcff08f52f970734035eb55ab45d8970fd56a02
 DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
 DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453
 DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1
-EBUILD wine-vanilla-7.0-r3.ebuild 10355 BLAKE2B f2d9e56ebb09de68dba8f2d0bb7c0384060185478e38acee7b076a0093a73f16283255a7ee5b9db584d4f850caa585af05792b37a248d2a5315707a938847877 SHA512 4a622689aaa1f589c3aab1790b75a8194bb50c46d695f17476a7c3fb4c41362327c1826a6869029abee33a48220e10a4accb11038f8a36ffd88ef4c4c3c0dd64
-EBUILD wine-vanilla-7.0.1.ebuild 10357 BLAKE2B 7ca11786d54fb5ff0a595e803feda0ab0848e72b403fef0a94c2eacf777e5af1ebb53487267c26d120450802ebe9d58b6b2b3d82e88e39d9f6072fa4ce16e0fb SHA512 2492f80869cce835701068a9f1f1ec5c8a6cf1d0cc2fba79f00bdb9d1a8b437ae76115d708e9741a94abb21e505dec39c3657df73a1595582e51d62e25450cf7
-EBUILD wine-vanilla-7.18.ebuild 10272 BLAKE2B 7e2b1f285f03e25d4b919326939b589e7ac6b4b10f6acfb4892c71a73bcd216f66fa00059fc10cefafc2f6ffb139f9263282eea35c0ca674a1f13714ae71e577 SHA512 d5db49c2a58b31f24fc3ff3ba5ce03f0d6a52efd0017b2b627a69173fc718c2307744191bd6a088aa7fa693ee0b52583cfddab8880d443d544ba252436ddf06c
-EBUILD wine-vanilla-7.19.ebuild 10272 BLAKE2B 7e2b1f285f03e25d4b919326939b589e7ac6b4b10f6acfb4892c71a73bcd216f66fa00059fc10cefafc2f6ffb139f9263282eea35c0ca674a1f13714ae71e577 SHA512 d5db49c2a58b31f24fc3ff3ba5ce03f0d6a52efd0017b2b627a69173fc718c2307744191bd6a088aa7fa693ee0b52583cfddab8880d443d544ba252436ddf06c
-EBUILD wine-vanilla-7.20.ebuild 10273 BLAKE2B fa8af5ca85bacdc748f36a7fb218cbc8fafb12ee49b53d63ccf2145f370f9a502016c392227ddcdb99ac2d488bf825b2f2671a2dbea0d867aad663b684e824ac SHA512 688724287c2ec191730789aeff258ca4e8af9e81bee01c522df31d39b66a20bebe928dec8f8075bd5ca230b6e759fb18cd34889eb6c358129b54e221ee918f24
-EBUILD wine-vanilla-7.21.ebuild 10374 BLAKE2B 915087bea2a7b6116f802c8fb29f3fe41a8249b2a69f501e97025fe0c63c99466f3b89bd769300ed2f968c1170683a4ddfb24c0cd9fa40dd18fae2807eff0b88 SHA512 71800fac0ff6f747da2701df52137777f8888ec6eff38950ce0eb37725d6fc5fcce1c5639cdfc3c37b934d9cc5732e78fd4c110ce3d0fa6565e627ae29154e0a
-EBUILD wine-vanilla-9999.ebuild 10375 BLAKE2B c185a517f3e7a1cd4512406ef93e2c1b55549479d0a91e0744cfbc06cf1972e5f60764b80939c8c57443b089e0dcb1ee5bbd18c9e7630b4355c139df3bd4f699 SHA512 a722662b6af9f04c0339fb9a30b2ae626b0852b57726890ec715ef3b319b8271ae80b92c30124f5b5231c492ee2426766a158f355769a7c09ba2555dd68616af
+EBUILD wine-vanilla-7.0-r3.ebuild 10596 BLAKE2B 9e62fe7db88a8e8e8232b4cd2cea88bdbaffcf3c95d023b280f50094f32fbbb95cf118be16470054e0560cef7db6a21ae780ac3dcdf205bce2e4e91059651f8d SHA512 ac951ccd3c00b52ad174c52f5b82b3295e5a1fe025865148d9b6a286f3af3181c43a6f8f2d37e211c45ef94b21b286ad2aed64f4c7faedfec7c78ceb6c284e90
+EBUILD wine-vanilla-7.0.1.ebuild 10272 BLAKE2B ae3917c6d7900e0a211384a600c29b825ab686da4ad79e89a7c479a997b2bdea65862feed77a94d134532b1ac437524004523da9343de8b61d7790f46c567b1b SHA512 ee9cebb5af001838f9659f576b7f54a06e12994c4e35bca445c521f6031367915ef2e898f9776482209c201e2653735322767b9000c9d8534d167e64c6273cdb
+EBUILD wine-vanilla-7.19.ebuild 10187 BLAKE2B 9008395c2c412674f26b5273ae83cdaad211eadfa70de7d75a7a336b0c3ed189ae0d2c60cd957c8c10f1bcdb22fe9c59a48f034b9e597ccf36c55540a374301c SHA512 9d0ae015c3a171768d01d769df742f66741e2d5fa14cfcbcd458e7ccabb7f7b98cabdcf1eff55b88a8b927c85e14aea7319e0edeac1ca57e60335144768f752e
+EBUILD wine-vanilla-7.20.ebuild 10188 BLAKE2B 77c7365ec9c58166b07a13e4204bb0a0e2251816c502dbea050877cc19b7864b16e7c4513cac8ad2225137f70137808d58eec17469af09f1278263a87f5aba10 SHA512 db487e83f4bfded1b71a0d4b3ba1608cc46a9f5a767a78d2efb9bbd545038fba041c92234f851156fee5e637c13b3e76286a88139d250131320b45af4106fc8f
+EBUILD wine-vanilla-7.21.ebuild 10289 BLAKE2B b0c41654525de30f0bdd43319febc764ede2786ec6078579fefad02ba38bc3f793decf9a046a74af7ca7b870ca12cbede6b4a54446fa4f83a5854991dad8e649 SHA512 b7e7a4d33898c4c01be37350c219dd1f223074ed5908fcdf7d6ec2b61a9e1575b5faa7cab570cdc2625f2f986552bf3f0a99bdd040e943760b97c3eb05b3b138
+EBUILD wine-vanilla-9999.ebuild 10290 BLAKE2B 5520ca47cd05a6ce11837819857cee2fc4d718ee8d7a2c14273f64d8d2f5280b4d063bf12b2462e8b38ba3010dc51859fbf0193e34a8bc6194759e0186bf36fd SHA512 ac5154d780d37c350f7078704efe4914bc733a6a1f72aa9ad74106e73b32c7580fbe54687e30f70754eca05f96eeed2b21083db10692bb67f799e2f64fdc9cd8
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
index 67946b35d11a..653e8809117b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
@@ -115,6 +115,7 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -221,6 +222,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
index ac4d2d7ec0d3..da66b3163208 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
@@ -115,12 +115,13 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -221,6 +222,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -306,21 +312,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
index 9b551b53e450..69628d775f7e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
@@ -114,12 +114,13 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -219,6 +220,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -304,21 +310,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
index f7300657747d..e1d2da19d47b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.20.ebuild
@@ -114,12 +114,13 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -219,6 +220,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -304,21 +310,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
index 71f603995e8a..d931d7219d8d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
@@ -113,6 +113,7 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -120,7 +121,7 @@ BDEPEND="
 		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
 	) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -220,6 +221,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -310,21 +316,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index df7e750e1587..b73eb356b435 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -111,6 +111,7 @@ DEPEND="
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	dev-lang/perl
+	sys-devel/binutils
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -118,7 +119,7 @@ BDEPEND="
 		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
 	) )
 	nls? ( sys-devel/gettext )"
-IDEPEND="app-eselect/eselect-wine"
+IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
@@ -216,6 +217,11 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways, also no lto
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
 	# build using upstream's way (--with-wine64)
 	# order matters: configure+compile 64->32, install 32->64
 	local -i bits
@@ -308,21 +314,10 @@ src_install() {
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 }
 
-wine-eselect() {
-	ebegin "${1^}ing ${P} using eselect-wine"
-	eselect wine ${1} ${P} &&
-		eselect wine ${1} --${PN#wine-} ${P} &&
-		eselect wine update --if-unset &&
-		eselect wine update --${PN#wine-} --if-unset
-	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
-}
-
 pkg_postinst() {
-	wine-eselect register
+	eselect wine update --if-unset || die
 }
 
-pkg_prerm() {
-	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
-		nonfatal wine-eselect deregister
-	fi
+pkg_postrm() {
+	eselect wine update --if-unset || die
 }
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index fdd8b1357cf2..38a881c02f7b 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 14ec6993bf30..9a37ca3b28c7 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -2,5 +2,5 @@ AUX eselect-wine-1.2.2-proton.patch 160 BLAKE2B 6385b15daf83e1ee1cd8fa3a16fcf075
 DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
 DIST eselect-wine-2.0.0.tar.bz2 7336 BLAKE2B facbad9bb4a937a310b1f81c5eb9fd1e29ce1a04cf524f7fd1f6322715d15e639fa27e99220cfc5b3659932d5ee57864a4615523e2dc5142da8ad7e9b49290fc SHA512 ec89b4b2fb3bf60e00983f7dd2c2aaa4c797005516f03573000482c5efa1f62e73d0bc149bb9203c5186a7a0a259d7461e95f077deadfd6791ea8d5bc5cb3c00
 EBUILD eselect-wine-1.2.2-r1.ebuild 1282 BLAKE2B 3eeba89fe219b352d6b0ce155910aaa4aa36a831e0cb40650c8ffe5b5f26e1cacd3a9661f8c91be7c751e9e76554180eb69d0fd0a176f0a7b251998ecb2f3880 SHA512 13e7d32212515398ac9d00488a10d2b51568135dbb5bcae18c52706a373c08ce5c11196d8703d28ef94e4b74aa1a50d5d758ffb177950de29e5d4a0c59906479
-EBUILD eselect-wine-2.0.0.ebuild 3141 BLAKE2B eaaa259d7ac1da6cf73ed588763a3b993ea4e9290013a0cf16363f8b657a9ffec70c5dd2666916da247eb57ad249f2661f9dfba0e5e59ce8a0718c547f67bf80 SHA512 ab02d02ec9e820287ee4021655ceaa8cc4c3062e52177adf49d2dbd58c568ffd6d88ff835921e5c2a312e4ffafdc06523e87b16e7dc63ca7daf9de49cc0ab464
+EBUILD eselect-wine-2.0.0.ebuild 3074 BLAKE2B 1c7d24298d6eb8d87940237ae6c9a459cb659c38307c99bd8cd89e2463cd91aa5c7e4f7c189e9e8a2215b9794093886b698bd21fd8c2387f0c05fe1c7fc877c7 SHA512 35c08260c377a5e976e0c8cff9e3255643b9cbd2b406f22b0fb1e3851e7bc49034b6de9a1ace05a66a9cffac1a72eb3c8ca52a64ea41529c70a1fe16e407fb76
 MISC metadata.xml 343 BLAKE2B bc82c6a6549e8fa152586c247467e3f107920426b0be2758ad20ea1da273afd894aa4a9581f7520942092399c62d877117ceefd67b26b8e5778d832241e8a20f SHA512 9c9905ce98e2c43a285b8995d1e16016151416fc622a3f927751207c6820d661ea73a55c812fee6fbf7cd4e474f382f7a3ab277b4f06bb3f2e519bc3b9f876e1
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
index 9d8edced51a5..92c25353de07 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
@@ -9,8 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-# rewrite that really needs testing so it doesn't break any bottles
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="app-admin/eselect"
 
@@ -81,8 +80,8 @@ pkg_postinst() {
 		ver_test ${REPLACING_VERSIONS##* } -lt 2; then
 		elog
 		if [[ ${REPLACING_VERSIONS} ]]; then
-			elog "Note: if seen bin/wine or include/wine collision messages, it is harmless"
 			elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
+			elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless."
 		fi
 		elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
 	fi
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 928c419f6b8e..dbeac0180ea8 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 7be4638514ed..dcb97f6b9e9e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -398,6 +398,12 @@ DIST bash52-008 1771 BLAKE2B b46dde58525b727565efeca99cf4279fd2510382430b227ed23
 DIST bash52-008.sig 95 BLAKE2B bf702abda6415ac31627c84095d211807cfaed74d53cdd712e1524ec5926f334852bf88b316aade5a87c5c2be2e2268d6867813e0d5205e4c3adc332259d54cf SHA512 84fde6817c0d63525d79355452eb31242b69d39dcc6d9e9453e5691e7ceb79af48a1be854a002d57aa120c7decbcae61af047a48ab1de54eef35b3877856c73b
 DIST bash52-009 1316 BLAKE2B 36a1a5be9166f436077aff8c8dc8e6b8745b6b07408e5abc3756846d199799cee22e825ae992f3db5f3885157fb37b64f1159b3bc8d0bd1d16c5980c9f74e092 SHA512 71fffb71e5876e7abea7e769f4438f2f8d3843d7dfec13f1ba7e79ead5b001d7543c92eb3a628b393f8652bf136e4768c1d1c7b55c155cafe83886b900396e68
 DIST bash52-009.sig 95 BLAKE2B 5527f79b8477b48077002e0fa8277ea6851c02895e0e2cc3bb164f09032be093c2db9afeaea10410451cc4d6d0c189ef153d25f015e64d98495afb28b9d73769 SHA512 ca4b88c3f056d5ab25aaef0f4f9071fd29efc1ac1034a18f0c82187789618203db7eeb4693f82a302a553a0c779b5f186083d4d3f77d03fe34b8398dc44fcbec
+DIST bash52-010 2045 BLAKE2B 0c61991d38c95b25411e793a09855c18f536ddfae237b09d01ac7898d4638b8747fc58d2c2f35c651026bd6957cb04780382256417e0bbde288aa4e05cd80530 SHA512 12d120e39593d3f23aa86e510b0eda514ec69ef42e910e5855e4c7510354e8504e5d6949770448f5632ce482c9ab468f4ba82a8a38b4a8237cdd7b54f742946a
+DIST bash52-010.sig 95 BLAKE2B 347282a2784bfd813919d9690ba2d2dcf76772d826dae2885ca23a10c54ad76009d9637d2cbd7b249ec04ff1d8effcf238c3b75abb576a922e423993bee89153 SHA512 e046197aee4c3acef30872a5a742882e61f8d0eca88a311b9e3826f814935e7d1627800f3dbef22543cf47084b48ca07b22cadfc6c761c5b5a943dabfb150709
+DIST bash52-011 1229 BLAKE2B e1b246634ee7b1bba7e4b140bc730fa6770f5988ed215ea1ba646eea630789b863333fec471e99c28b142b74539639f37239487b02b877ea360f519bdaee2894 SHA512 83a7584ca8ee512839183e329183476a2c8bcb995e3dc9d5188f04f11760bd3cb0f2d29d12bca2661b7ce8ab125d44d35d839f735992ca6c27f936d609ac4683
+DIST bash52-011.sig 95 BLAKE2B e74cee94ba4f5a1e094b026a5fde7d10a1d9280302694476cc701c79cb1915bec2eabc937f5f44ab393e427dd12c900609e35469514121b006f5efce92acaf29 SHA512 15ca053df8c1e87c1724379984ef93d509602f38fc0ce272a2fb1375e07d68299add46605c2c0fb0053eb449cc588cf063bd7a889eec77d4d55f18d3290359ed
+DIST bash52-012 9107 BLAKE2B b7c4888a3af4e9ee37f3d83d15bad1360209eb412ba1e963c4be90b0b1d62e0c860f61f5cf7de3b7b1a34d341101069ffa5a65efc7dc5857dac296444321b9d2 SHA512 8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b
+DIST bash52-012.sig 95 BLAKE2B e4c1867b22814335c9cf233e6240578e181ae9f515e83a652b00b325efc314af463ed019f6f2c692d981a4ef6e70610ae69a16c880e29b44d11c332277f466e6 SHA512 22793024cc8a3c67c03a7e82d910c005e0cbfc657196427cdaaa25158c89c580e5cf2153f62d5bb2083ad5a88715724b79d9d922524c39b82c217824b5609a97
 EBUILD bash-2.05b_p13.ebuild 5246 BLAKE2B a428bfdebf5a98f8a45f2fb6127a132708ec0efc5bbd9cf6fa5c7bb70e565ae12e6b61248c80fda686da3706f957216aff2b5870ca13e1a0a86edfcf50648049 SHA512 72002267b10db0258c1912d5b665d4ca41054210197b4617822a4888ac7a2ff66a0a0354456a947333df5000272a54f70f75ccbcd24e137efe0a0058a4055f25
 EBUILD bash-3.0_p22.ebuild 5384 BLAKE2B a011f5d6d7c8428ffaabfff4f4ced9908876fb3cd198c4f72c2be7fb6b9c8cae37c333c6ad31e8506694c2945e83d0fe8fd6b8bd172f4c6092f74354b9e5fb65 SHA512 e56eedddbbe76d0c96fbbc8b6b1f95c183b1b3fe45fb32ea5ded646cfaff7ab14af4813cfb7ad20a6ce81b75118055aa606bba665e88d4dab55cec7ec6e5acdd
 EBUILD bash-3.1_p23.ebuild 5061 BLAKE2B 30640571e07e149a1a087c139c9f891922e9660a23033fdec6be3258a47812ef3280d72f68ec4521b2b6cb0c136cfce515f40c6ca1f2fafdac1205c7b8ac4067 SHA512 1137f8f69407ce2829681e932a534daff6a2f64c9b79c39e49766223719dae21503467e726dcaab729c10be9b887a947dda2d78d9f958b170168e2bcc2bfef5d
@@ -409,6 +415,7 @@ EBUILD bash-4.3_p48-r2.ebuild 6035 BLAKE2B 408bffd82a0375ccfbe706fd3799a3dc34ce8
 EBUILD bash-4.4_p23-r2.ebuild 6090 BLAKE2B d09c2e76a0766ec38ace27c76b5219a52a6fa5cf2ec87e932950e3d5e3f6dadb84a5e594863b53739314aaad953f5a5fd1427bd9101ab1b4ca69c38e37ba9847 SHA512 9507a94d51dfce866e7ffe36880ad1879cc8a328f941103fb12ff84ab05492edfebee5deab7a19d8f8ff192c2b180656a7e0227f417b771ec32702dc4b549367
 EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f79aaffaf778838f41490dcf7da7eb7dbe4652b47164210c25e764751f8ec60d4dc1c30751373bc0636d9d3ea SHA512 bddcc1a7813ed881f8ba6bf440a890f5ac633335e743ea1393082a6a55d99a3604b36271c6f15c9e2a7b06eefac1820f8f6ee4f92f582afc9ea86181c43ace6b
 EBUILD bash-5.1_p16-r2.ebuild 8226 BLAKE2B f14fc9e50ffa1e89643c2702a52bc89dc0255c5bde3dfca94d7de28baf8a54f121efe1096b673554e324ccd831147f318962c3bca5e7679979a5f58952a66e72 SHA512 aadde860015cf550415fce75a0d8ea0b207f590b597ee8b0ed10ad2d8802ce72389b3f0f6b19d2bac52edccbf26650296820a64fa14b9cc66bb9a09abebc9928
+EBUILD bash-5.2_p12.ebuild 9344 BLAKE2B 6149478fedce8c8fc0c23feb47878dadca0e2a82bb25c00caf34bc7d50e8bf2a8ca45303771b12c2d621a543e094c0f9d55ce07f3befb547a3c54bd75c4aeb41 SHA512 214bb91ad2f2ff7d3fa1faa832749cbbc5abfa1be6d079b513aaa1ee74a8708092abfa32c7cd8736ebbf4097a692ce91122f8380466c8d1831160c2ee7f956b8
 EBUILD bash-5.2_p9-r1.ebuild 9401 BLAKE2B 274bc750aad80e70ea1c2d8714f2788717ff37b7b152ae229f0280d7b7b99daa991c281603d7388ba74246aa28226752d80aba7ed20ad8ca1eed5f15d9b8104f SHA512 00c19aedb1ba555e800b2ec87bf296d2f35d68706b8549086c434fc9926c39e31a5ebfe5401fb9cb7edc0b909017f2e79d35114df4dbb2239e7a303d6ee08f86
 EBUILD bash-9999.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.2_p12.ebuild b/app-shells/bash/bash-5.2_p12.ebuild
new file mode 100644
index 000000000000..955033674b60
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p12.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+	case ${PV} in
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for non-releases.
+READLINE_VER="8.2_p1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if is_release ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if is_release ; then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="
+	virtual/yacc
+	pgo? ( dev-util/gperf )
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches from Chet sent to bash-bug ml
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	if is_release ; then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if use pgo ; then
+		# Build Bash and run its tests to generate profiles.
+		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
+
+		# Used in test suite.
+		unset A
+
+		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
+
+		# Rebuild Bash using the profiling data we just generated.
+		emake clean
+		emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
+
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
+	else
+		emake
+
+		use plugins && emake -C examples/loadables all others
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset A
+
+	default
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
+	keepdir /etc/bash/bashrc.d
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9f134ade133b..0b03c4a36afd 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index f813d14d0316..764d7bbf0fe1 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,3 +1,6 @@
+AUX kbibtex-0.9.2-fix-crash-w-newer-Qt.patch 1014 BLAKE2B c283889e375a09be741d6e8f5ef1dc3d5f37f1dd8d2a0b5418220bc660410f1e80e0a3efeb82bc761d9049cd19c2376fa6e729fdf22b03396262d14d88f5587c SHA512 9144a537c7b5e58c3ed795cb173ad66e37d6bb038ad30cd279b4637e60b6760f4c3d9519c8d159dcfe1558b4070c3bfdb989b97e58c449d26eeb0849324d5562
+AUX kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch 984 BLAKE2B c6db4643c03cb72a735751c62195f878d9346638d6675520de2aa16f4a33f7235d248c268abf0ca5abd1d0eddb1e558355e5c637ca1e0e6550c42b4e8ec81253 SHA512 375e2e642a02cd2144fd4fc854e8a2e0e882535a4785771ac154f9bb33816af98527f8c77a86b3228375acb3cbca246c143ed14096d9823a5d87dc1945b9237a
 DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
+EBUILD kbibtex-0.9.2-r1.ebuild 2175 BLAKE2B 07b413b66a408d86ffa8fa69f3a7b429c711ba5ced9aece45fdb7725d2d8bea7897e2d6d9e7839eecadb1d47cbe6bdff6bd8b8dd20e96ed916edc858921c0e66 SHA512 111036e2f250f4880d38aad95a0cdd2d09fe58a21c89b7b9e204e01e8734aa8840b07b032f30a0e1b50b18f269ab4ec56e90c878035087e8ed2faa212ed5dc4e
 EBUILD kbibtex-0.9.2.ebuild 2044 BLAKE2B 06d4fef041b58ee933fd835116656195e03c5a36352020e4a7a27bb63642668ef98068d703096c07d617db68d1bf70325183d9208a296bf1c616ac622ead4c9d SHA512 8e530f8eacb142c2d444912d63f2c3d1da14ecae90d4981ff6b57cfa46b83eaec450ae0eb2f09b1b2197ff87b207516a237ea0c827c12caa801e841f7c3c11d6
 MISC metadata.xml 509 BLAKE2B 3543de8d45cd889e8789bfa26154243b90c679126cb37e4a6701bb766dc0a72a39c5c14830dd3dca77b735532d10dc6d513c953bb3268767ea66599eb689b831 SHA512 5f8aeb6e149e2dbad6e06d085afc75d4a04117921e2a5897023a110a9aea2bd2916691c2d43f8f3bd0f575e12175a5a3da1a61fc000c5458aef7b1ebdb11306a
diff --git a/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch b/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch
new file mode 100644
index 000000000000..91cc51f9303c
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch
@@ -0,0 +1,28 @@
+From 84b0551eb141b3a7904ceec158d040200c995023 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 8 Apr 2021 22:07:15 +0200
+Subject: [PATCH] Fix crash with newer Qt versions
+
+Assign m_internalModel before calling into
+QSortFilterProxyModel::setSourceModel since that can end up calling filterAcceptsRow
+---
+ src/gui/file/sortfilterfilemodel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/file/sortfilterfilemodel.cpp b/src/gui/file/sortfilterfilemodel.cpp
+index 73707cec..87657aa2 100644
+--- a/src/gui/file/sortfilterfilemodel.cpp
++++ b/src/gui/file/sortfilterfilemodel.cpp
+@@ -40,8 +40,8 @@ SortFilterFileModel::SortFilterFileModel(QObject *parent)
+ 
+ void SortFilterFileModel::setSourceModel(QAbstractItemModel *model)
+ {
+-    QSortFilterProxyModel::setSourceModel(model);
+     m_internalModel = dynamic_cast<FileModel *>(model);
++    QSortFilterProxyModel::setSourceModel(model);
+ }
+ 
+ FileModel *SortFilterFileModel::fileSourceModel() const
+-- 
+GitLab
+
diff --git a/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch b/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch
new file mode 100644
index 000000000000..fdc42d97810b
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch
@@ -0,0 +1,28 @@
+From 1153930536abe9f0331acef67dc40b18210eb07e Mon Sep 17 00:00:00 2001
+From: Thomas Fischer <fischer@unix-ag.uni-kl.de>
+Date: Sat, 1 Oct 2022 23:15:52 +0200
+Subject: [PATCH] Fix creation of URL from user input
+
+... when opening a document associated with a bibliographic entry.
+
+BUG: 459150
+---
+ src/parts/part.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/parts/part.cpp b/src/parts/part.cpp
+index 5324647f..9dc35d1c 100644
+--- a/src/parts/part.cpp
++++ b/src/parts/part.cpp
+@@ -914,7 +914,7 @@ void KBibTeXPart::elementViewDocumentMenu(QObject *obj)
+     QString text = static_cast<QAction *>(obj)->data().toString(); ///< only a QAction will be passed along
+ 
+     /// Guess mime type for url to open
+-    QUrl url(text);
++    QUrl url{QUrl::fromUserInput(text)};
+     QMimeType mimeType = FileInfo::mimeTypeForUrl(url);
+     const QString mimeTypeName = mimeType.name();
+     /// Ask KDE subsystem to open url in viewer matching mime type
+-- 
+GitLab
+
diff --git a/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild b/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..e8d349aaa433
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org optfeature
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="webengine zotero"
+
+RESTRICT="test"
+
+DEPEND="
+	app-text/poppler[qt5]
+	dev-libs/icu:=
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	virtual/tex-base
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	zotero? (
+		>=app-crypt/qca-2.3.0:2[qt5(+)]
+		dev-libs/qoauth:5
+	)
+"
+RDEPEND="${DEPEND}
+	dev-tex/bibtex2html
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-w-newer-Qt.patch"
+	"${FILESDIR}/${P}-fix-creation-w-url-from-user-input.patch" # KDE-bug 459150
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package zotero Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "PDF or PostScript document previews" "kde-apps/okular:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 1278534f9e8b..2869770e349e 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,3 +1,5 @@
 DIST libwps-0.4.12.tar.xz 713008 BLAKE2B c95bdab54f8853cd1d13b59904ee4064cded3741cb91f2b067f139d80cdae6ea19bac68e6855cad74878403bc1a04c6f4bdd3181407b69b7e50f1e7bf4255f58 SHA512 d23667681f443b0c718b55006bee881e8a07d6b071cda742a783a89e9ed0e4c60c66c7dc9612a3fb4a419ff6d6e572f5981cec1d9470422e10cf9837e92a4649
+DIST libwps-0.4.13.tar.xz 717188 BLAKE2B 966d0e57668577620fc5fe8c222096fa1b51f3d2c149dab7fc182c2fe81b69363cfbcc2ff930d2719f9fcf735306d612a00ae863ff1a0d2f03fcd6c67b054489 SHA512 c88357cdb11a68148c9344cf3688d57d793089732ee9828d6ea5e86536eb5f60668326fa520e7609a48298051435f6cc570d0c58aa4aa96581a51c16f914a1d0
 EBUILD libwps-0.4.12.ebuild 768 BLAKE2B ad4e1cd9293fabe8bda43da29962d009d5aeeb82ad2289b6e62f33bd1bd938eba65e318e896f4f51a3e9692129176f8c6fcb55a4198fa77f5ad52793a33217b7 SHA512 f0ce5ad5a54d8844f2ea7f5c73b29777f7017eee01a98592d82e5745e48887a3c13a8d09640bdeb3a1ac7625528ab890d8bb8ce692f14f007a96a62170db5671
+EBUILD libwps-0.4.13.ebuild 749 BLAKE2B 8705c7388c8da7333236b370d7e038a50e82c1f6d9223d289f7d8dae69c52f5c18b6e8afd65a92ec90dffdc35c23e2eac8436cf61152db914854a6bfc3f1b643 SHA512 4b901ef2e83be5c87120a5ef547b4d1186fc5ef1dcd1822a4f6697f45177d9596a708dc4225934d1abe57432c42810ecc13efd1ab9d4619f9057027c47fea153
 MISC metadata.xml 513 BLAKE2B 5f4c689cce8eb239e8c44d53de4f6066bb0d1b578bdd37d4314e904539faa7a0428f4176a8c7c862f42a5fab1c2b6f147815f1d3693e3beca85ee015ca324e9c SHA512 f835e24331d14e1edfbf31480ea04087db1c541a1d7c2720b422cfb3ea70500b48342b1b7476060b98b9b5b18be28e759c8b00063d1e002f6da987c3dcc72371
diff --git a/app-text/libwps/libwps-0.4.13.ebuild b/app-text/libwps/libwps-0.4.13.ebuild
new file mode 100644
index 000000000000..4737dd0f497e
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="debug doc tools"
+
+DEPEND="dev-libs/librevenge"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index fbf3362b8485..2ce1344b143a 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
index f6accc6ceaaf..2bfa36dd7c51 100644
--- a/dev-lua/say/Manifest
+++ b/dev-lua/say/Manifest
@@ -1,5 +1,3 @@
-DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
 DIST say-1.4.1.tar.gz 6091 BLAKE2B 59280a9d8e95f1f759c59a4886f864046ff65db035652acec0c9c32eda000ed8eda74385769bc6b0946262a3695db857848ca4b844a8a1626949c1b5bf273dab SHA512 a6c3477859615d7ae0677ac7aa0cefe8bf6f43424812062b4a06145017952b176801431c5be920cb67f52c07cc3d374e8a6714233e2252a2bb6b7ed4c3e32f90
-EBUILD say-1.3_p1-r1.ebuild 908 BLAKE2B d32fb1ee26c82ceafbfcb6f9ce413190ec0500180ec53aa4a9593cd5ecb1766b58d9fd918966a4e31221a93951b1cc0370d6428432b69d5ad774f59d9b5c816a SHA512 1009a6342e8668dff104ee26c2b06760ca9d08276e3e8c895ad6acadab7370d4f21ccb509ca8b7afd12f36fee45718fbaa0b869af6e1e28c039e5d487fb48399
-EBUILD say-1.4.1.ebuild 876 BLAKE2B aa36fc4af0f33d2f5186f9cddee89a2cf6680e7ccc9afc2ffb006a92e5b076dc44ae1bf2969b3f6c91cbbf4f83b6a67474b796da59f45fbccea00e0e02131f54 SHA512 cdcabfaaa97475ec5d596a74fa30387ecabe47f18b84d180b9ef8a268e97801c6605b036444773392f0dcc50534389b9469b2cf2261a9e35f089557d52113ce5
+EBUILD say-1.4.1.ebuild 870 BLAKE2B 80bc8b821bb5304996dbace79676845d4df4e5b3dc05f8ee2a89c6d9d346a5e33e2e09099f44ed776c588f6fb8a05d833553d89023d135404b2f53eb71d9e0f2 SHA512 21f1e729fa6e40b438e84142a7539add7a6009dca197392f991b7a4dd1bd365231189a6baaef8d53f7d6083910aca73c2231a307bd57a0a8d04b37d7e7f31453
 MISC metadata.xml 465 BLAKE2B 79a515512a0c49be85b628a9e0c3f431001d5057d3fe62605d393af1d55556e889f6ab5ab89275150ed0f4ebb4f716c4b9f22ce4e3f1f2ba34fbc0b2f857b86a SHA512 681be59ce632ac659a5799d32c477a34fbd89a0d94cba948ceaf5786b5b476b916def71a4a25ed51188e447a33a991c5f73cd9fd843b76b9b81bf820c8440829
diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild
deleted file mode 100644
index 59c6ecbebc7a..000000000000
--- a/dev-lua/say/say-1.3_p1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PV="${PV/_p/-}"
-
-inherit lua
-
-DESCRIPTION="Lua String Hashing/Indexing Library"
-HOMEPAGE="https://github.com/lunarmodules/say"
-SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-lua/busted[${LUA_USEDEP}] )
-	${RDEPEND}
-"
-
-lua_src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	insinto $(lua_get_lmod_dir)/say
-	doins src/init.lua
-
-	einstalldocs
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-}
diff --git a/dev-lua/say/say-1.4.1.ebuild b/dev-lua/say/say-1.4.1.ebuild
index b17a4c9fa4d1..e18d471604d7 100644
--- a/dev-lua/say/say-1.4.1.ebuild
+++ b/dev-lua/say/say-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5fdef06f81e8..39a668a10d65 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index b0ad23d1d178..2b3a485ba907 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,3 @@
 DIST bracex-2.3_p1.tar.gz 27541 BLAKE2B a9e33e01f014c6b784b059a76da338a708a24ff88787c98c0916a6d13ac5497a1f4f14d711cab8bde1281a9968db68bdc8fdfbc23a531ef6c89adfa9974492b1 SHA512 3c5a8a81adb78c9d3d40b57328a6a47b3257bb0072be2685c8049cf8a91501993ce470dfd394a61d0a0fdcd082405b204e5e3e0666018978b5aa820b0d74b631
-EBUILD bracex-2.3_p1.ebuild 1178 BLAKE2B 14b5f98e26adc031635288525b63ad96c68f86e9bc6ce7db2e76483fdcd1c1388b5bce80e1317d86344588fdd0ce31f86afdb4797061fef624af5bca636da3cf SHA512 cd98b43a1a77e3be7a26d85cf6e7bf5da52dbef2cde915dd4f5df450db83856a87ae6daf51c847a29c278b40c1961d88c174f13a44859779da6c734d23569e5d
+EBUILD bracex-2.3_p1.ebuild 1197 BLAKE2B 23cd944ab3128023b48b64fd1ce5a213d08df3c23da4a727c36b0bb89e54da8fec146d291db247d3dfbc50c8b6a32368735f399c2d7133457059d18198ea82be SHA512 e0564dfd914fe79b1367a8e327ade7b14c15b0c7c1874f679768eb4fde618e7260600acea97cad514ffefae5eae497981a965eb918291bf6c3f019bc0cb31617
 MISC metadata.xml 1353 BLAKE2B d6fd0602c7e79269273cea7837247e6f2a3bf4cb26a3abae6a70975792b12f83b8403faac84e8c4011bf236df34da5ff85904e13efd54a577f04b16ee0abd642 SHA512 74a14139c4a40c542680dfd94b2f227c7cb62981bac82e2b57b68c6c2e3be17e80222e01fd92e53b18fae2d8e33fb84f01f074e43e1ddb21e0f06bba13bda713
diff --git a/dev-python/bracex/bracex-2.3_p1.ebuild b/dev-python/bracex/bracex-2.3_p1.ebuild
index c689d4f18857..c7173fbae49d 100644
--- a/dev-python/bracex/bracex-2.3_p1.ebuild
+++ b/dev-python/bracex/bracex-2.3_p1.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index c2f500b913e9..33b99aa16de3 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-material-extensions-1.0.3.tar.gz 11983 BLAKE2B 0a9594c85df0782543275598368497bc5bd902c2e96dd75628b94eefc2f7998b948cc659577db6b27fe2787fe2a6547bdecac823f4a9533bb6b8d781922f9a6a SHA512 af6ec96db5628527d6dbdeb6557276cdf297ab5926cebf5508d6e5c4c5b8493b9f55b967230e2853d28bcbb17129a32778936ccd0264ab75c870be2eecf2e8ef
+DIST mkdocs-material-extensions-1.1.1.gh.tar.gz 12092 BLAKE2B ad5a085cf65768f1bf40f5dfc4323fc8047495fa8c501474e9b2fd6db141ea0915b13eb5596225b5a823b9e9f315f5de1d5be1a0a717d06e4ac17ddd7becb1b7 SHA512 84937d3e9a4817d80fd19b9d359d3b2fdb6766b58c5f0b0530d84ad555b628da3796bbbacebd1b3ad438cbc148bbce681e7038b2dbe5c086645b2f5426a5cb2d
 DIST mkdocs-material-extensions-1.1.gh.tar.gz 12063 BLAKE2B ddbee5e2a0bf4a14abf74ddb2e412d0a6152b88036e9b06dba4dac720ccd060ec35470fca2c6407be260de75d6ab88b2f464b091ee935c7d91e590f4e5fa5f93 SHA512 e98a4e8a0e30f30557db2ea3d782d18ab75e9115e761af4db2320d2b92b846d996dd1dd170c4a234dd6b9c5bf625a49294951c84b7d47115b05b67d3ec3af682
 EBUILD mkdocs-material-extensions-1.0.3-r1.ebuild 695 BLAKE2B c10e0e0ac21e7da07036fc503442413341040569a20bf9a98ff02078693ad532cd10f71d948a63294f306b8c6e93b16341306d21e4383959d90463931625c18a SHA512 e887ccd7dffd1e5d938c1467bfc6e21e82c3334b9ad9c47028c44e6ace9fb77e81476f759c78b06af72e951f8abbe518f03e76ee122f873b8ce1afaf0a32c89a
+EBUILD mkdocs-material-extensions-1.1.1.ebuild 686 BLAKE2B 9952d427c251c9ca749c97a9fbad55d5244a1a34378af7ea86e7c5ab6a58d2f6eb822c96c83a1f8eeafed2dfcd3f3cf0ff196d6ce6efebb8dbf1908488fe621d SHA512 33c379756f4be5a2bc0a23307871ebdc6343b5adff256f32ff05f30a68ee8df6f29c61568c4e432df85d7377a495a73962fcb971207a9ea9d1cb4f2626a2c571
 EBUILD mkdocs-material-extensions-1.1.ebuild 703 BLAKE2B d852bf7266e7951280367a64c2e88b44dfa9f6f8d6872f700ee3fb9817b8eb58f59f7a778199a0ea43f955d751bc33bf083e52a44bf4b0dfaa544441e080cc58 SHA512 0289e95a207b097672d7e2a248577dda8f12fff804761d561d9a5357ce88c2866aa5943741cb8a036cc374866424f5f3a40d36121dd1d7e1ee781794fa7e9c86
 MISC metadata.xml 451 BLAKE2B 3deb46d9e68b98525a9d7d31d2ccc0cf3c142d2988dd01636f037bec1b0ebfb07bd675c402fba89f6c7d171444e693b1c070eaee27c9a0ce94d48a1edd73b58e SHA512 add6b4dc2b6a8032aa3edf9ad22f02edaebf4cfae392c2920db40c201adedb20e6f085de59f2224a3fa037060c7cdb3dc238d3174a97f95aa35bc3bc8618f3da
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
new file mode 100644
index 000000000000..6f190ffc97d3
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Extension pack for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs-material-extensions
+	https://pypi.org/project/mkdocs-material-extensions
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index ed394d3645a3..9edbaa87ecc4 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,5 +1,7 @@
 DIST pymdown-extensions-9.7.gh.tar.gz 1015024 BLAKE2B 6b2b1a86e693a2e4bca889c66bd97c099976e9e9e56291c35b25d8a99554dbae8e4e7b913b774ed9de6406fcaa8850009e000ee97bc97b1dfd09bbc514f4bd6e SHA512 0e6a28ac991ec02821abc1525de30007ded891d8437a8e4f9eb349e26c18702f9477fac0ca6728d5c3fdb5f0fdea451a3f00db3ea354115f20a69bb0f4a114f2
 DIST pymdown-extensions-9.8.gh.tar.gz 1012711 BLAKE2B 451dba60e42d8ad5e1368ac02c89a99a086d99b24402a2570f1fc51c73416163c200d2056a0667f03f6a7c5611cd3b3b870d8dd9ae934ca1d867c9ed9f3a985b SHA512 f9937625984dee09ba2dfdf9e706bdc382017f906f89c42080db38af63b17c1475cc7ffaf94c967ea116c735419168eb35d9dc272d971fe7d92a5950f67673cd
+DIST pymdown-extensions-9.9.gh.tar.gz 1013192 BLAKE2B 51b9baf40f8a40f3553529f0670a895d141b3b92c2b5a66b215e8551246c20ba7b96891714b2012a005056b1534d72bb0cc644cc719b230ae1f3bb03e2258203 SHA512 000ca793d891abdbeac3c9902c25d842d5ed2c209a0e32deb5cdab41f2019dc85e0be41abdbecc369b4def1291d30e4bf9a71e86d522f45d629423b4d42c6d8b
 EBUILD pymdown-extensions-9.7.ebuild 1625 BLAKE2B 8be05c03d6225736fc63ad37197220a3c0f4a953895ce36c0064997d1deefe32dccb4e56ac6905367a86a019495afbd3a7de0a3c023e6bbb8401b7a04059797b SHA512 0114c035128fd883d42a0e2ba8403e86bbf56c42156063df59647f42d5b0a71b16d6621cc1e6172fff3894de80a222a9d0b19de84b5b973498e242da492cb7a9
 EBUILD pymdown-extensions-9.8.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
+EBUILD pymdown-extensions-9.9.ebuild 1317 BLAKE2B 9c6b453b7813142ed30e0aa78f28abf23e98b359a76fbf5528a3e5962e12abcb21215043ebcd17357a7f12d41fc5ff499618089f5f0d7845c8b16100d87b6e3f SHA512 12f01b2032e8982655a314dd7a4180c7a33907a8b594d111ca0f5ca07dcb2a36d584405a695c84afc2e692bf7196e015fd47d6a068e2e53496a688ae39fd4be3
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
new file mode 100644
index 000000000000..53b6a8621809
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+DOCS_INITIALIZE_GIT=1
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	default
+	# We need to do this manually instead of relying on docs_compile
+	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
+	# https://bugs.gentoo.org/859637
+	if use doc; then
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 76d0961c8aa1..44cd22515bf3 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
-EBUILD qscintilla-python-2.13.1.ebuild 1831 BLAKE2B 86b481b7b4afb4cfcfb9829e24b644a1a7f3ce4836a8b8eb0abc18c3c3e2ca5566bd86ebb3849632d96034f34f3ad8ae8b7737d7f2f6e411571357c100f1dbbb SHA512 e39e345d290732dabd683f00c7b4f9008d29fe5cae0c7a12a8eacfeaaccb1253f4dfb9e390b1c32628e137448503647f9b2d928076657aff574778800e599bec
 EBUILD qscintilla-python-2.13.3.ebuild 1828 BLAKE2B 02e4815b12f1d1a7678862eeca4287a46e287aac47aae5074eb4d3b613b12056744024e2f39316d6d504f986596fd95b88bfc79cf30a1ee9c6322e69ce27b6b7 SHA512 edcb4cbe91f3d00d2bd43cdf2cb21710c0e7361316df9a7fc2a41d1e24d5bf34916dc61f3c65199452f1fdbab5ff24e71994457bfc8ffa73b9801a071a854010
 MISC metadata.xml 679 BLAKE2B 7d346ab99b6c19180388b012b949a7ff4bd474dbe222bdbecac25c6c29a1f5b14fa9e0a979a2b217d2604c1e9471776012303c45341277582bcb0f77681d94d8 SHA512 5a09f0497846433a08b407bc3b2a5c611087744a5354f744d97663687d179a9c8a0159e73fb88a7ee70cb371ddd11293f44698d3fac4899771b9bd3a4ed11a5f
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
deleted file mode 100644
index b207654bc061..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}_src-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}/Python
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.15.5[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-"
-
-src_prepare() {
-	default
-	mv pyproject{-qt5,}.toml || die
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			sip-build
-			--verbose
-			--build-dir="${BUILD_DIR}"
-			--scripts-dir="$(python_get_scriptdir)"
-			--qmake="$(qt5_get_bindir)"/qmake
-			--no-make
-			$(usev debug '--debug --qml-debug --tracing')
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain and build flags
-		run_in_build_dir eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index f9c2d0960ce8..18decb6bfaab 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index c3fa92efbc6d..ae257f20061f 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -7,7 +7,6 @@ AUX expect-5.45.4-configure-clang16.patch 5377 BLAKE2B dd8a65e98e269f3b3ca086099
 AUX expect-5.45.4-configure-in.patch 2408 BLAKE2B d198b599eeff18833e9532945aaf921779229ddecfbe478f985f2d742a39875e68cdca97fbca6aa5ca572f4c31c3a2491c8ddf473042952213232d3bfd070eee SHA512 7b60a268c6e4c0875978a619a451eb669a519f74623fbcecd90299b22e0ba73f6884177a16367e5ee94828c55636dba2f70c324576c1cc077d389912f4d7409d
 AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c
 DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
-EBUILD expect-5.45.4-r2.ebuild 2290 BLAKE2B 246066fe262ed78dc68f688a7c2f387909b82c7475035f4eb9a9f4af1b9f1ee3460b338bdf5c121c5fff6fe2bb37941aa5163cca6268ae4e87085ac0c1310305 SHA512 216fec55a13569db6238145bef190c13e4e38759679c2088b6f148149f8620e10db8f4f100ab2308dd29c0b0ada3a6df7992c31f36ab1fc7ca2a91c7cd459dac
 EBUILD expect-5.45.4-r3.ebuild 2351 BLAKE2B 7460c2607655969bdf217abfe9c0265be36af8363568a2b0c036245cbc5be3320ba84cb6f7c13a8ba7e92b861eed8a15ad6bc68b4e374ca08dcfa436ffb57c50 SHA512 b9bcebf936a5777d80f6c21095322e94d8e1897d3c29d920c4fabe5e6ab633439ed6ba51571ca3b446167a21683ebe3d4e127f211154273a48691bfe77d82ca3
 EBUILD expect-5.45.4-r4.ebuild 2137 BLAKE2B bffe75e2748b8e13585d835eea1e95cdb722967bbeade349bfe59712c2e6c1ba6f9b555af1bbff2d206ac11dff044cf3a36b682f9c0c7bb48eb7c53e69dd8f1c SHA512 d83e5980b5faf4e6271a9c6148ae70d5c2d8c6abee3b7f4ff19bff621a48c5a86f322245468f81224580ea1ee7e6a7c8781d0207047d6a4e4f65faec88842974
 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6
diff --git a/dev-tcltk/expect/expect-5.45.4-r2.ebuild b/dev-tcltk/expect/expect-5.45.4-r2.ebuild
deleted file mode 100644
index 0b1f85dbef2f..000000000000
--- a/dev-tcltk/expect/expect-5.45.4-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${PN}${PV}"
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="https://core.tcl-lang.org/expect/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug doc threads"
-
-# We need dejagnu for src_test, but dejagnu needs expect
-# to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2:=[threads?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-examples.patch )
-
-src_prepare() {
-	default
-	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
-
-	eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch
-	eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
-	eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943
-	eapply "${FILESDIR}"/${PN}-5.45-format-security.patch
-	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
-
-	# fix install_name on darwin
-	[[ ${CHOST} == *-darwin* ]] && \
-		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-}
-
-src_configure() {
-	# the 64bit flag is useless ... it only adds 64bit compiler flags
-	# (like -m64) which the target toolchain should already handle
-	econf \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-64bit \
-		--enable-shared \
-		$(use_enable threads) \
-		$(use_enable debug symbols mem)
-}
-
-src_test() {
-	# we need dejagnu to do tests ... but dejagnu needs
-	# expect ... so don't do tests unless we have dejagnu
-	type -p runtest || return 0
-	emake test
-}
-
-expect_make_var() {
-	touch pkgIndex.tcl-hand
-	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
-	rm -f pkgIndex.tcl-hand || die
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto examples
-		echo dodoc \
-			example/README \
-			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
-			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
-		dodoc \
-			example/README \
-			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
-			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
-	fi
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9635e61fb805..30f4645c7e49 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index c36fd91309dd..04f814382228 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,4 +1,4 @@
 AUX idea-community-jdk.patch 379 BLAKE2B e60f97a66ba32fe31d91357cb825d43861e61a8fb9e1254e5a5944399cdd19c377750a65c44bf0ead50f1b8af5a1ebbd655b588dcfac019a41fbcf921eb1fbbc SHA512 4bcc1284afa268a350a6ed151873c056991553b32ff35aaeaa53dc12521d2ef0b3e3c566c0d7d924857b17802ae578d94af10c30267bd36c466a83c9c318cd0c
-DIST idea-community-2022.2.3.tar.gz 862407745 BLAKE2B fffac3397551693f51432bd2cd52ec8b3908821bc1186336d31dd8dc893cf3a1f4ccbe05695bb3ad5ad347b04f19869ab5347f0a0757eee82c9572dcfc9222ee SHA512 d792401e105702f1d7084c40dab495a4785001c1cc85a56fb9f3b2b806d64e53e3a1fe71bdbf18d2c949faeca6c967c6df575c4f17407ce459af7455312a3b84
-EBUILD idea-community-2022.2.3.ebuild 3807 BLAKE2B cd69270316d3e5e3f1e2abd3ee3dcdb85d120a4ea2cb0fa70593414b4d3fb1a5262cde049fa2d81332cb6a3d8ba683d595f14ba83bf5c93c9a2323bda01a9349 SHA512 9281650d5498444b2993e30e546c754d6901ca3e6b4cb07eeef1181ae253b5524835b86a6aac93f498e45384f103bb8d00c67b84edbec0480324efb739bdfaa3
+DIST idea-community-2022.2.4.tar.gz 862568767 BLAKE2B 4abb509221b4e029d8b0fdd76be98bf26d60cbfe3af79a4c344e1a3c0a62298acc3c43b64dd209090edf330f4c67eb00555032ec64e873a9ac426032312997ea SHA512 0abdab96e092b96f63047cad44bb8146b961b2a237e0cb0f39a1f41a5193b663a54bcaffcc5dbf55f80d9db74822017c919ff8a8203c7fef04690968ea97463a
+EBUILD idea-community-2022.2.4.ebuild 3807 BLAKE2B cd69270316d3e5e3f1e2abd3ee3dcdb85d120a4ea2cb0fa70593414b4d3fb1a5262cde049fa2d81332cb6a3d8ba683d595f14ba83bf5c93c9a2323bda01a9349 SHA512 9281650d5498444b2993e30e546c754d6901ca3e6b4cb07eeef1181ae253b5524835b86a6aac93f498e45384f103bb8d00c67b84edbec0480324efb739bdfaa3
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2022.2.3.ebuild b/dev-util/idea-community/idea-community-2022.2.4.ebuild
index 32d1a1315e7f..32d1a1315e7f 100644
--- a/dev-util/idea-community/idea-community-2022.2.3.ebuild
+++ b/dev-util/idea-community/idea-community-2022.2.4.ebuild
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 8a3452ba1868..6809694dd846 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest
index f57a75db12d0..581d043e46aa 100644
--- a/kde-misc/plasma-pass/Manifest
+++ b/kde-misc/plasma-pass/Manifest
@@ -1,4 +1,5 @@
+AUX plasma-pass-1.2.0-fix-loggingcategories-dir.patch 1033 BLAKE2B c306aa4a3ffd73520a3979d8b73ae91065da21f60467d839bd1ac617bb074529337bbcf306c786a1aad3644cfd747d1a1f789be352cad73e98d42741ee71f9e1 SHA512 ee13f4f3e81fba1ea7be84f197ccfef7105c2d360f39d888ff2ab903109d3b5c728554fa596816efdd07f83ec7e3fb57ba3ccb798bf827453643f7f91aafc321
 AUX plasma-pass-1.2.0-no-werror.patch 1002 BLAKE2B fa3e277368aca8eb55d26aa1cc05fdd4929e856a7c29188570ade8e07e56b5086aacea3eaf031049560c8971a4840ab7f7f5f3d267dcd26ecbe47055e21d3889 SHA512 aa9bb752b20068fa8c56a650181d78bd718e2ef9b8e9fd04409335e1cfc06db14df7587246e2b47e0b701dd98729fc14b0134a2aa7f75e1dd4b2a800cc9e7550
 DIST plasma-pass-1.2.0.tar.xz 34324 BLAKE2B a6fce04ca5b29066f026e01bb62a2ba4f312795bc4e0676fad82e7a7612ac29386b34047b74cda68ee1cef1fe08cb28ccda6c214565f18573594c281a3dd8658 SHA512 4ac72af97a8026022459c46eb3d8dec1489dedf0ea47ab8c71a5ab92a9c5e2faca92ef2ed512e5cd0cc181a6aa7b6ab802ae98ce525e97818704e0bf58e4603a
-EBUILD plasma-pass-1.2.0.ebuild 982 BLAKE2B 533c7f957898cf62f17bc75edd10e47cec6f411ccfe3ea069ec37eb22d68c20f213280d3f584fe0e21fb6439b31f2af7dcb9107504e37808f162e5e2faf1fa1f SHA512 20cb7e6bb9ea0d336fd30a87dbee1fbef578d259226d722ee767d7520d9cb73cb350c21d45670e10bfeb14f735010b3f5d1b1affef9f5bf1efb8934f1796d810
+EBUILD plasma-pass-1.2.0-r1.ebuild 1052 BLAKE2B ca7e1026bb36de1f793f550f98ac9755426150ca0d91120533d68c1f59306b963b56634344c401a7ae749dab7328e4e13d2cc4e1e390b537ceee7b2d895a7b14 SHA512 da56ffb2aff1b59c1ddca6aec104f30ed2f16fdcbd37e3352ace4ec91aff69d8c94129af75eebf5e80bb2d060a13040e2c96d715bc7bf2c68bf7eeeff43b350c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.2.0-fix-loggingcategories-dir.patch b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-fix-loggingcategories-dir.patch
new file mode 100644
index 000000000000..5131f7dd54b2
--- /dev/null
+++ b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-fix-loggingcategories-dir.patch
@@ -0,0 +1,31 @@
+From 5f62fcc30e7d6c8248dfb6a263ee4a49e7c19e3b Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 17 Feb 2021 21:02:08 +0100
+Subject: [PATCH] cmake: install plasma-pass.categories in newer location
+
+Install plasma-pass.categories in the proper location for it, in case
+ECM >= 5.59.0 is used.
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0bed60..c32b637 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,11 @@ add_subdirectory(plugin)
+ if (BUILD_TESTING)
+     add_subdirectory(tests)
+ endif()
+-install( FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
++if(ECM_VERSION VERSION_GREATER_EQUAL 5.59)
++    install(FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
++else()
++    install(FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_CONFDIR})
++endif()
+ 
+ if(ECM_VERSION VERSION_GREATER_EQUAL 5.79)
+     kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+-- 
+GitLab
+
diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.0-r1.ebuild
index b62a307e42dd..e66dbf2a266a 100644
--- a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild
+++ b/kde-misc/plasma-pass/plasma-pass-1.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.74.0
-QTMIN=5.15.2
+KFMIN=5.82.0
+QTMIN=5.15.5
 inherit ecm kde.org
 
 DESCRIPTION="Plasma applet to access password from pass"
@@ -32,8 +32,12 @@ DEPEND="
 	sys-auth/oath-toolkit
 "
 RDEPEND="${DEPEND}
+	app-crypt/gnupg
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-no-werror.patch ) # bug 785832
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-loggingcategories-dir.patch
+	"${FILESDIR}"/${P}-no-werror.patch # bug 785832
+)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index aacdd3c48587..494eb9f74a48 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 04ef3a22d83f..b821a52a8449 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,3 +1,6 @@
+AUX kxstitch-2.2.0-drop-xkeylock.patch 5150 BLAKE2B ebe404416d6c836f2326c31fc9fc76598ef5197a7c1804c1bad80b7bc8606b3884bec11486beeab237c0af875169f89f0af374bbe3a9aa07be6460a28d138f94 SHA512 27dd3d84dfc445cfff4c4927966f413e0b4a5fee462a46fbaec66fa49484a8f4ccb9ed52cc56f43a19f7819fba22f7cf020f754d96d7145da07584609b9eb95f
+AUX kxstitch-2.2.0-fix-hidpi.patch 672 BLAKE2B 51f90ea504319a3e558d51c8a5d5eb8166f45880624c3680e3ea5aaad08b43efb6b50c56f6aa1eb95722f3241cafcd57defb9694669efb28fc5a54b24f5467a6 SHA512 e59439e147a57eb7085acf6c7b80cbb891945597add70e517d709f1ca34b8daa45c9f4a73abee825516e090b95ee7ba40ec940d471efad00ee1ae82fc12c6ee5
+AUX kxstitch-2.2.0-fix-render-scaled-painter.patch 7804 BLAKE2B 92d7b6677de47ddda7462e6cdcda96a57460c1540365096a0ab912452c6fc84434bbf2a802dbc881b8392d3222c773e90bfc286b673c9889645c274722d9e965 SHA512 fd1621d2aa789b305bc026a75bed9a0acd64e17e861628673beb4eb4a6f87e56e53a4f28585f056ae8a47d8adbdb3510aa21896d6400af41e1df97f3cc0620f5
 DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d
-EBUILD kxstitch-2.2.0.ebuild 1066 BLAKE2B 8c7ca9a2c6904499d44543bed0c6816a6a7ab6df986d3d5692274dedaff540a2652652c55ad9654d8cb392e6fa5fe173b2e61f510a041401691d46e84f5cef96 SHA512 183b1fe99c50a499f4da78b0444239fd4ce450757951d6aa2efd5c040717317f2b5b73004c504ef6c1d940508f4c6f7a184faf46a54e879481ff57e2c9e46b7d
+EBUILD kxstitch-2.2.0-r1.ebuild 1170 BLAKE2B d363e212e1d955dc285b672460fb075d9442f248783e6bd4be3a2c17adce39d29502243dd503edce5c9a4d8d05928ee46b0bab1fc29cbd30c789ab82728c913a SHA512 431b1a42e3919b86c425b0f1b4dbd3d9d37ccd7e3f9fd310a1b6759d6714ec09531e2122ccb3400c8181cf7bdfe0ff1d4170e3f87a605c747837cc8767a352ea
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
new file mode 100644
index 000000000000..805a67ea97c8
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
@@ -0,0 +1,180 @@
+From f97d3eaf4c06b4740fcec63c9c0ca64a5bd56281 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sun, 28 Jun 2020 12:01:49 +0200
+Subject: [PATCH] cmake: require KGuiAddons
+
+It will be used soon.
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36e3169..7ccf7f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,6 +32,7 @@ find_package (KF5 REQUIRED COMPONENTS
+     Config
+     ConfigWidgets
+     Completion
++    GuiAddons
+     I18n
+     KIO
+     TextWidgets
+@@ -145,6 +146,7 @@ target_link_libraries (kxstitch
+     Qt5::X11Extras
+     KF5::Completion
+     KF5::ConfigGui
++    KF5::GuiAddons
+     KF5::KIOFileWidgets
+     KF5::I18n
+     KF5::TextWidgets
+-- 
+GitLab
+
+From 817be56369a25de4dd12f2548f97e4ebcfb73571 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sun, 28 Jun 2020 12:02:34 +0200
+Subject: [PATCH] Switch from XKeyLock to KModifierKeyInfo
+
+Use KModifierKeyInfo from the KGuiAddons framework to get the status
+of keys. In particular, use it to get the status of the Caps Lock key
+instead of the local XKeyLock implementation.
+
+The KModifierKeyInfo object is kept as class member to avoid recreating
+it at each key press in Alphabet mode.
+---
+ src/Editor.cpp | 4 +---
+ src/Editor.h   | 4 ++++
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/Editor.cpp b/src/Editor.cpp
+index bba0760..163e88e 100644
+--- a/src/Editor.cpp
++++ b/src/Editor.cpp
+@@ -46,7 +46,6 @@
+ #include "Scale.h"
+ #include "SchemeManager.h"
+ #include "TextToolDlg.h"
+-#include "XKeyLock.h"
+ 
+ 
+ const Editor::keyPressCallPointer Editor::keyPressCallPointers[] = {
+@@ -858,10 +857,9 @@ void Editor::keyPressText(QKeyEvent *e)
+ 
+ void Editor::keyPressAlphabet(QKeyEvent *e)
+ {
+-    XKeyLock keylock(QX11Info::display());
+     Qt::KeyboardModifiers modifiers = e->modifiers();
+ 
+-    if (keylock.getCapsLock() && Configuration::alphabet_UseCapsLock()) {
++    if (m_keyInfo.isKeyPressed(Qt::Key_CapsLock) && Configuration::alphabet_UseCapsLock()) {
+         modifiers = static_cast<Qt::KeyboardModifiers>(modifiers ^ Qt::ShiftModifier);
+     }
+ 
+diff --git a/src/Editor.h b/src/Editor.h
+index 3189249..8345a38 100644
+--- a/src/Editor.h
++++ b/src/Editor.h
+@@ -16,6 +16,8 @@
+ #include <QStack>
+ #include <QWidget>
+ 
++#include <KModifierKeyInfo>
++
+ #include "Stitch.h"
+ 
+ #include "configuration.h"
+@@ -337,6 +339,8 @@ private:
+     QStack<QPoint>  m_cursorStack;
+     QMap<int, int>  m_cursorCommands;
+ 
++    KModifierKeyInfo m_keyInfo;
++
+     typedef void (Editor::*keyPressCallPointer)(QKeyEvent*);
+     typedef void (Editor::*toolInitCallPointer)();
+     typedef void (Editor::*toolCleanupCallPointer)();
+-- 
+GitLab
+
+From 17d6a17830ce190cd21f266dd319e36e4865e30a Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sun, 28 Jun 2020 12:13:37 +0200
+Subject: [PATCH] Drop XKeyLock & X11 leftovers
+
+XKeyLock is not used anymore, so it can be dropped together with the
+X11 and QX11Extras requirements.
+---
+ CMakeLists.txt   |   6 --
+ src/Editor.cpp   |   1 -
+ src/XKeyLock.cpp | 202 -----------------------------------------------
+ src/XKeyLock.h   |  70 ----------------
+ 4 files changed, 279 deletions(-)
+ delete mode 100644 src/XKeyLock.cpp
+ delete mode 100644 src/XKeyLock.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ccf7f0..c225859 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,6 @@ find_package (Qt5 CONFIG REQUIRED
+     Core
+     PrintSupport
+     Widgets
+-    X11Extras
+ )
+ 
+ find_package (KF5DocTools)
+@@ -41,7 +40,6 @@ find_package (KF5 REQUIRED COMPONENTS
+ )
+ 
+ find_package (ImageMagick COMPONENTS MagickCore Magick++ REQUIRED)
+-find_package (X11 REQUIRED)
+ find_package (Doxygen)
+ find_package (SharedMimeInfo)
+ 
+@@ -57,7 +55,6 @@ include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_D
+ # only in older cmake versions, while the latter only in newer ones
+ include_directories (${ImageMagick_Magick++_INCLUDE_DIR} ${ImageMagick_MagickCore_INCLUDE_DIR})
+ include_directories (${ImageMagick_Magick++_INCLUDE_DIRS} ${ImageMagick_MagickCore_INCLUDE_DIRS})
+-include_directories (${X11_INCLUDE_DIR})
+ 
+ set (kxstitch_SRCS
+     src/BackgroundImage.cpp
+@@ -96,7 +93,6 @@ set (kxstitch_SRCS
+     src/Symbol.cpp
+     src/SymbolLibrary.cpp
+     src/SymbolManager.cpp
+-    src/XKeyLock.cpp
+ 
+     src/AlphaSelect.cpp
+     src/CalibrateFlossDlg.cpp
+@@ -143,7 +139,6 @@ target_link_libraries (kxstitch
+     Qt5::Core
+     Qt5::PrintSupport
+     Qt5::Widgets
+-    Qt5::X11Extras
+     KF5::Completion
+     KF5::ConfigGui
+     KF5::GuiAddons
+@@ -153,7 +148,6 @@ target_link_libraries (kxstitch
+     KF5::WidgetsAddons
+     KF5::XmlGui
+     ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY}
+-    ${X11_LIBRARIES}
+ )
+ 
+ set (WITH_PROFILING OFF CACHE BOOL "Build with profiling support")
+diff --git a/src/Editor.cpp b/src/Editor.cpp
+index 163e88e..4d314e4 100644
+--- a/src/Editor.cpp
++++ b/src/Editor.cpp
+@@ -24,7 +24,6 @@
+ #include <QScrollArea>
+ #include <QStyleOptionRubberBand>
+ #include <QToolTip>
+-#include <QX11Info>
+ 
+ #include <KLocalizedString>
+ #include <KMessageBox>
+-- 
+GitLab
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
new file mode 100644
index 000000000000..bf5d94dae4d6
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
@@ -0,0 +1,26 @@
+From 44d231b5604480601bedc623ca2f5204bd4a3ac8 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 11 Sep 2022 15:55:44 +0200
+Subject: [PATCH] Enable highdpi scaling and pixmaps
+
+---
+ src/Main.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/Main.cpp b/src/Main.cpp
+index 0af162a..4088d37 100644
+--- a/src/Main.cpp
++++ b/src/Main.cpp
+@@ -85,6 +85,9 @@
+     */
+ int main(int argc, char *argv[])
+ {
++    QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
++    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
++
+     QApplication app(argc, argv);
+     KLocalizedString::setApplicationDomain("kxstitch");
+ 
+-- 
+GitLab
+
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
new file mode 100644
index 000000000000..5b2bc07aa1ed
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
@@ -0,0 +1,202 @@
+From c9e6a03c32fe6e6901fad8439bf2235ddb8c288c Mon Sep 17 00:00:00 2001
+From: Steve Allewell <steve.allewell@gmail.com>
+Date: Sun, 3 Jan 2021 13:43:59 +0000
+Subject: [PATCH] Fix for rendering on scaled painter
+
+Fixes for rendering seletion areas on scaled painter in recent versions
+of Qt which were half a square out.
+---
+ src/Editor.cpp | 74 ++++++++++++++++++++++++++++----------------------
+ 1 file changed, 41 insertions(+), 33 deletions(-)
+
+diff --git a/src/Editor.cpp b/src/Editor.cpp
+index 4d314e4..263df1e 100644
+--- a/src/Editor.cpp
++++ b/src/Editor.cpp
+@@ -1388,11 +1388,12 @@ void Editor::renderRubberBandRectangle(QPainter *painter, const QRect&)
+     if (m_rubberBand.isValid()) {
+         painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
+ 
++        painter->resetTransform();
+         QStyleOptionRubberBand opt;
+         opt.initFrom(this);
+         opt.shape = QRubberBand::Rectangle;
+         opt.opaque = false;
+-        opt.rect = m_rubberBand.adjusted(0, 0, 1, 1);
++        opt.rect = rectToContents(m_rubberBand);
+ 
+         style()->drawControl(QStyle::CE_RubberBand, &opt, painter);
+     }
+@@ -1408,14 +1409,15 @@ void Editor::renderRubberBandEllipse(QPainter *painter, const QRect&)
+     if (m_rubberBand.isValid()) {
+         painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
+ 
+-        painter->setPen(Qt::NoPen);
+-        painter->setBrush(QColor(200,225,255));
+-        painter->setOpacity(0.5);
+-        painter->drawEllipse(m_rubberBand);
++        painter->resetTransform();
++        QStyleOptionRubberBand opt;
++        opt.initFrom(this);
+ 
+-        painter->setPen(Qt::darkBlue);
+-        painter->setBrush(Qt::NoBrush);
+-        painter->drawEllipse(m_rubberBand);
++        painter->setPen(opt.palette.color(QPalette::WindowText));
++        painter->setBrush(QBrush(opt.palette.color(QPalette::Highlight), Qt::Dense4Pattern));
++        painter->setBackground(QBrush(opt.palette.base()));
++        painter->setBackgroundMode(Qt::TransparentMode);
++        painter->drawEllipse(rectToContents(m_rubberBand));
+     }
+ 
+     painter->restore();
+@@ -1427,7 +1429,10 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
+     QPolygonF polyline;
+     painter->save();
+ 
+-    painter->setPen(Qt::green);         // use green for the first point
++    QPen pen(Qt::green);
++    pen.setWidth(0);
++
++    painter->setPen(pen);         // use green for the first point
+     painter->setBrush(Qt::green);
+ 
+     QVector<QPoint>::const_iterator i;
+@@ -1435,7 +1440,8 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
+     for (i = m_polygon.constBegin() ; i != m_polygon.constEnd() ; ++i) {
+         QPointF cell = QPointF(*i) + QPointF(0.5, 0.5);
+         painter->drawEllipse(QRectF(-0.5, -0.5, 1, 1).translated(cell));
+-        painter->setPen(Qt::blue);      // use blue for subsequent points
++        pen.setColor(Qt::blue);
++        painter->setPen(pen);      // use blue for subsequent points
+         painter->setBrush(Qt::blue);
+         polyline.append(cell);
+     }
+@@ -1555,9 +1561,9 @@ void Editor::mouseMoveEvent_Draw(QMouseEvent *e)
+ 
+     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
+ 
+-    m_cellTracking = contentsToCell(p);
+-    m_cellEnd = m_cellTracking;
+-    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
++    m_cellEnd = m_cellTracking = contentsToCell(p);
++    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
++
+     update();
+ }
+ 
+@@ -1703,9 +1709,9 @@ void Editor::mouseMoveEvent_Rectangle(QMouseEvent *e)
+ 
+     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
+ 
+-    m_cellTracking = contentsToCell(p);
+-    m_cellEnd = m_cellTracking;
+-    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
++    m_cellEnd = m_cellTracking = contentsToCell(p);
++    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
++
+     update();
+ }
+ 
+@@ -1757,9 +1763,9 @@ void Editor::mouseMoveEvent_FillRectangle(QMouseEvent *e)
+ 
+     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
+ 
+-    m_cellTracking = contentsToCell(p);
+-    m_cellEnd = m_cellTracking;
+-    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
++    m_cellEnd = m_cellTracking = contentsToCell(p);
++    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
++
+     update();
+ }
+ 
+@@ -1793,9 +1799,9 @@ void Editor::mouseMoveEvent_Ellipse(QMouseEvent *e)
+ 
+     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
+ 
+-    m_cellTracking = contentsToCell(p);
+-    m_cellEnd = m_cellTracking;
+-    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
++    m_cellEnd = m_cellTracking = contentsToCell(p);
++    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
++
+     update();
+ }
+ 
+@@ -1848,9 +1854,9 @@ void Editor::mouseMoveEvent_FillEllipse(QMouseEvent *e)
+ 
+     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
+ 
+-    m_cellTracking = contentsToCell(p);
+-    m_cellEnd = m_cellTracking;
+-    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
++    m_cellEnd = m_cellTracking = contentsToCell(p);
++    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
++
+     update();
+ }
+ 
+@@ -1877,7 +1883,7 @@ void Editor::mouseReleaseEvent_FillEllipse(QMouseEvent*)
+         painter.setRenderHint(QPainter::Antialiasing, !useFractionals);
+         painter.setPen(QPen(Qt::color1));
+         painter.setBrush(Qt::color1);
+-        painter.drawEllipse(QRect(m_cellStart, m_cellEnd).normalized());
++        painter.drawEllipse(QRect(m_cellStart, QSize(1,1)).united(QRect(m_cellEnd, QSize(1, 1))));
+         painter.end();
+ 
+         QUndoCommand *cmd = new FillEllipseCommand(m_document);
+@@ -1894,6 +1900,7 @@ void Editor::mousePressEvent_FillPolygon(QMouseEvent *e)
+ {
+     m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
+     m_polygon.append(m_cellStart);
++
+     update();
+ }
+ 
+@@ -2001,6 +2008,7 @@ void Editor::mouseReleaseEvent_Alphabet(QMouseEvent *e)
+ 
+     m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
+     m_cursorStack.push(m_cellEnd);
++
+     update();
+ }
+ 
+@@ -2023,9 +2031,9 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
+ 
+     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
+ 
+-    m_cellTracking = contentsToCell(p);
+-    m_cellEnd = m_cellTracking;
+-    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
++    m_cellEnd = m_cellTracking = contentsToCell(p);
++    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
++
+     update();
+ 
+     QToolTip::showText(QCursor::pos(), QString::fromLatin1("%1,%2 %3 x %4").arg(m_rubberBand.left()).arg(m_rubberBand.top()).arg(m_rubberBand.width()).arg(m_rubberBand.height()));
+@@ -2034,7 +2042,7 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
+ 
+ void Editor::mouseReleaseEvent_Select(QMouseEvent*)
+ {
+-    m_selectionArea = QRect(m_cellStart, m_cellEnd).normalized();
++    m_selectionArea = m_rubberBand;
+     emit(selectionMade(true));
+ }
+ 
+@@ -2052,9 +2060,9 @@ void Editor::mouseMoveEvent_Backstitch(QMouseEvent *e)
+ 
+     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
+ 
+-    m_cellTracking = contentsToSnap(p);
+-    m_cellEnd = m_cellTracking;
+-    m_rubberBand = (snapToCells(m_cellStart).united(snapToCells(m_cellEnd))).normalized();
++    m_cellEnd = m_cellTracking = contentsToSnap(p);
++    m_rubberBand = snapToCells(m_cellStart).united(snapToCells(m_cellEnd));
++
+     update();
+ }
+ 
+-- 
+GitLab
+
diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
index d2ea26577868..927de1cf02ef 100644
--- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.82.0
+QTMIN=5.15.5
 inherit ecm kde.org
 
 DESCRIPTION="Program to create cross stitch patterns"
@@ -17,27 +17,28 @@ SLOT="5"
 KEYWORDS="~amd64"
 IUSE=""
 
-BDEPEND="
-	sys-devel/gettext
-"
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-gfx/imagemagick[cxx]
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!media-gfx/kxstitch:4
 "
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}/${P}-drop-xkeylock.patch"
+	"${FILESDIR}/${P}-fix-render-scaled-painter.patch"
+	"${FILESDIR}/${P}-fix-hidpi.patch"
+)
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index de98b84e79d3..10c047e6e38b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index c3cf1dd35468..52799d608295 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -2,6 +2,6 @@ AUX liblscp-0.9.6-conditional.patch 350 BLAKE2B 5354ef415e5905d3dd03879372f6a434
 DIST liblscp-0.9.6.tar.gz 100811 BLAKE2B a86a5e9e6d52dfd2449274e1c800e40887094dcea3e39d257670dded8b3805f2cdf575b41f640b0df95cd008656d3e7c8ca93d5bc5360c8727b80d6d2695ed83 SHA512 51c3b0b3dfe3947ac5d7cfec18fec597a4282aacc489cdda5a30d5853c3a43778e207ddf2f211c28ba04386fd6f30a09eed62dc2a33177e5aeccd7f77b4ef520
 DIST liblscp-0.9.7.tar.gz 98364 BLAKE2B 8ea8d05f7753db3dc3210e3faaa60d7f0e7fab558948a7e687b60b728f00ca557a08594f72beb0823e14c4eb3d4ec0aa75bb802194a4b9e660546c462196553a SHA512 03b83962ea89bbf4ca6b76c71f4883c7621a7306383bbd53f6240d7f17838cfa89c2861aa169f789754f6067fe76866068b26ab1370a0c2fafbf0f660894a4ad
 EBUILD liblscp-0.9.6.ebuild 748 BLAKE2B 91cdd739be37cafa76cb6241f8b89ee2053f5d03518381acab1ac106f8d816c6a9001acd03bdf3f380e3529e25e5c100e16a9ededb3e427135f1c27cc9b874f0 SHA512 c37f1f6ea1e27fdc5f573dc8745a6aadc9aadbee8ce496c78631b13af7317f72f1f57e84dc043938b81ee63c261228528d4c13dfe7ca78a6d5f6c106d55e2478
-EBUILD liblscp-0.9.7.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
+EBUILD liblscp-0.9.7.ebuild 748 BLAKE2B 91cdd739be37cafa76cb6241f8b89ee2053f5d03518381acab1ac106f8d816c6a9001acd03bdf3f380e3529e25e5c100e16a9ededb3e427135f1c27cc9b874f0 SHA512 c37f1f6ea1e27fdc5f573dc8745a6aadc9aadbee8ce496c78631b13af7317f72f1f57e84dc043938b81ee63c261228528d4c13dfe7ca78a6d5f6c106d55e2478
 EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/liblscp-0.9.7.ebuild b/media-libs/liblscp/liblscp-0.9.7.ebuild
index 5d0c3733b0ff..a68cc47b641b 100644
--- a/media-libs/liblscp/liblscp-0.9.7.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
 		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 3b24ceef4c2b..b20166c28798 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -2,8 +2,8 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed8
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
 AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
 AUX mlt-7.8.0-linux_locale_h.patch 1508 BLAKE2B 412f066a5032e0f2408642256d182f0fdb22e58df3013cb08769e36a9189010b5a8d46b4def16ba0c59325f4db06c84eb664bff5aa7954ac8c8a8ba13ff20785 SHA512 5fddb589cbe2557a02be4a8a721b4e2acb03ab771444e603d8bd9878264c19803888ef7af383f102dd217a4784dec36376eb0bf2b84c1d907e6dfd0b22533f4a
-DIST mlt-7.10.0.tar.gz 1477944 BLAKE2B 29b364526f0f202ac4a2a218d977d8a6b0dbc822fc6605c264d84cd2c5f4754dee7f82cb60a19cd9d9a1a78126b61c1b892b80c21bcb46a8c925941b06c519d2 SHA512 bb5cbf1cd6800b92c1f651cc6f10df271bae3f20afc080822f9aea89fad6d1e852d516e5cd38ff26e44085c5d6f7e27ccefb9c468270dab3d4813b382e61c4ae
+DIST mlt-7.12.0.tar.gz 1481720 BLAKE2B c0df14cfdbba1eec412e71a1184dfd0e595c89a24b956bc90390679307fec1c8a5f2264e9769123fa2f7d95a67ba35cf9316b32173f7248239431ae47743f6cc SHA512 7111ca31f5ed8479dc899596bec4b9dd9440ab8563844abd9d789f7ce342b61c54d1a5058d6f5288fdd510db7e05db12f7e807bf0cd33dbee11a72185fb0b746
 DIST mlt-7.8.0a.tar.gz 1458730 BLAKE2B 0f544923c7f1667d2a2379bcb84a68dca2c701ce7b9cebe4e9b5f81efcb494674111fea09e9025108b8714e792a0179d465d226bb0a0231a197a67c99d82f976 SHA512 aa44d604f2246db11e5c572e2c3f9121ef0ace1fdead95a6a4a20f7555a3139b067fd2d464f27d23cc90cfcf8907ae9cf8f33b26f76c110a6ba2329867f88bd1
-EBUILD mlt-7.10.0.ebuild 3621 BLAKE2B 90ca6c68867db7f5bb4757e7374e4f9ddbd5e6328c5dafa602678b295a398b3c37e771c5f9ee9dd739cb0120a467724d6f70bc19b0c9311cb1f3a07b1b4a6b8b SHA512 3fe2f0649d4d08294e5675d3fe74ee0a8ea243a14f7a57081e9a50137e9680d58f39967352e79216571ef4357abdb42150f7380e828bf4c3a042c1fce02498c6
+EBUILD mlt-7.12.0.ebuild 3621 BLAKE2B 90ca6c68867db7f5bb4757e7374e4f9ddbd5e6328c5dafa602678b295a398b3c37e771c5f9ee9dd739cb0120a467724d6f70bc19b0c9311cb1f3a07b1b4a6b8b SHA512 3fe2f0649d4d08294e5675d3fe74ee0a8ea243a14f7a57081e9a50137e9680d58f39967352e79216571ef4357abdb42150f7380e828bf4c3a042c1fce02498c6
 EBUILD mlt-7.8.0.ebuild 3705 BLAKE2B 1a713c4dbfb65e06907fcd29e67481d2ac5a83f43902a4d495984a3ab2e2f296a7c201762136bb02541df0b049f0f133d10ab761002e92468beec4deac78c181 SHA512 e3425148b727dacc140b1c363d20f2a9cd7fa3841e61559fbef60b86e86e0415c8a8987af8ddee1f872d33d589b678371fe52db38324f4153deefb3934ade64a
 MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/mlt-7.10.0.ebuild b/media-libs/mlt/mlt-7.12.0.ebuild
index df3bc79a01f1..df3bc79a01f1 100644
--- a/media-libs/mlt/mlt-7.10.0.ebuild
+++ b/media-libs/mlt/mlt-7.12.0.ebuild
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 84d747e1150f..bbe43200aa8e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 82b9fb3a42e6..4cd1f1be4e77 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,5 @@
 DIST schismtracker-20220905.tar.gz 1278816 BLAKE2B 6f461732c99a01c8f4a17afbac61b9b52686cd6c0e58c99f75337b4e33e187b5465f9adf5422ec3a455e9448f1beac845080816001af02cf2afa5740b9f384a7 SHA512 2429e6a3ed6004a0d327ddb8ae7c379fbed4e4d2e2fe87be225fb85c990327fa3008115f9dbdcf08b3691c50411bf5aad04e97264a2f9ef6c05c7cfdc6231bda
 DIST schismtracker-20221020.tar.gz 1276386 BLAKE2B d498eba07d05729640eb78de3253a47aad9f09594ea4b45195a4f829b581ca293cef5f12ddcb8bdf7c9b2f01ff9b3e00c5e7c54a23a179d3af23567c233a96f5 SHA512 1653800b0967926c8edab96636fcad547d94f20b6bc06f27780c75d48d7944983ba36013c62bfc9c0f6fcf33e3e8f9fb4c70fff19fd2a56c672ecfc1ba2f2cd7
 EBUILD schismtracker-20220905.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a
-EBUILD schismtracker-20221020.ebuild 1307 BLAKE2B e794286cb89c54677bbd384c5d73bfd4de5e61bc98fe1ec22528a573c71e2a0fe21fd54009997c419f6eb7be6a72b9f4a10f5041eca62631d767bd853cb20a55 SHA512 b80613778005b2c4be7e22493a623dde37bfecff94866d8f0fe8edf37323ca1cc23697de6acf4900c7ff6c8153281c12800e9999185c480ecca1b41127e17f38
+EBUILD schismtracker-20221020.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20221020.ebuild b/media-sound/schismtracker/schismtracker-20221020.ebuild
index fdc90b6a2c28..f487591fc429 100644
--- a/media-sound/schismtracker/schismtracker-20221020.ebuild
+++ b/media-sound/schismtracker/schismtracker-20221020.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6ad4f5ee4c0f..7d6ae69e6d29 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 0601c244c3e3..4373b176ef4b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Nov 2022 18:09:45 +0000
+Thu, 24 Nov 2022 00:09:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e0d5593a3bf4..449b1a28de1d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 537675 BLAKE2B 920e8afd5076bd0b0cdc4b21f592f49b91bbfc5cd35a94863cffbeddf95c33b8cfa3b57b92eb6cb354a0f6b5d3d95712be50f4206d5d745982929e0523ffcf57 SHA512 b57f0c4473d079d8ddd01c5c21f2196c3359382e6f03dacfc2f8f7484775994807c2f998f659cdcb495b95326de503b7834f47ee0f334256cc0077fc813618d3
-TIMESTAMP 2022-11-23T18:09:48Z
+TIMESTAMP 2022-11-24T00:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN+YexfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN+tk1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAH5g/9ENcXSLOn9r0Ug/eDCP0omMO4tPCZWemXF3VT0QYrifk/ixXPi3FlqfMI
-2ejcls9nWajR25hunMbORomSnRdqWstBAWXqO21uIcjH5jK3ZjOk2rEV9yQ9zR4v
-jACdMIB/e97D1Slj5rmTYrDzWRMDWan4loLzbU0TJZm4EwEYbRigdrlnXwJLzh91
-nMSaetLLKDknQJGIV2EY5hm5GVTVnGU6GPug4VbjgVz/1TfPfMcmV9tZTD1pHu7Y
-dQXZiSq8Vp7GHOMBAwxv7V5v8KoLzitYdXnwa7ofvKegb/leCmnFcZUWwGiHpxdp
-QpTQ5lcrTi1VDREC262eFu0Nz6RSYeYpNTIAzrmcP3yBkpm8GQtlT4B/wENzClp3
-cA/LVOg6l4MFzTBKXxOZ2KBcFWydC5HZH8D68vObs9LV/bCSIwSxqO57e/LSJwSr
-aPbW6zuXUNZGbRCi/CZjyBeU//LHjYU6HYxe8Uzn+WfClt1RVYXO7Fk0796CSGak
-0F1FsBufAJSr8EFiOxYbN645wYwT4snJDEv9ppit+o/+DG3JkQCdnfNyiPciFajY
-V/04q1bNJPPBxcVU6V0mYDw2QFD0Iv3/zEH7+ttetIDI+c8oE/sgUozZsQhV+KNi
-7L5I7vCoYe9Qmca0Dw92zABFtb2Zi+MZsFBh0gyuqCeIhWWkrAQ=
-=aEbg
+klA0/xAAodWaZ6PpZnCAHme23B9UarRxKYgD9z62FxyUyR4oKcQHDBdSqM/kdxNz
+Owa9LT8aoYMiWooOvDKYQFmb7VbMzAFUiZONs+EUUjKt+7wGHt+Qvrq7w6p7CWKe
+CHBhUHbwd7PUk1Bkgs83UHeLgzytdV6CwAwN2wxgtvpTg6/oNWJGOy1QydpSgm2g
+h9PG0wU9RSqN1CllwqWjDO6xO2p3FGqUfoCjtZM4JZXz98uG7tF1PhrUHLYBR2Mi
+6U8VmKb1GoWyWpVP4EZGcWA57KiMIP/Z9zmaBBo6IJU+a/f12K0giSeaPfKr76jh
+VuPf+8nmhRAZP8E2XI2iKGMwRPopVcOLMn1mzVM5LtiwWq1+oXOQmkhKrxF8qFPF
+RI/krydVF6xOhk+VCaBYy3V8ahQRCP+U+7ZTj2RqTgg2DKz0ZIKDaYXim8zRGG2L
+hGsTeQFV49OpkaeMqi/csK69UnVFxztg5QNyMHb8YjVkGgUBkdrVw7Oeq9UUM48g
+t+umLOi2D0R7XUlk1Qjwl/JOsUvhxnee6qg38nOtCj2SjtNuHotlzLknPSZsj6Wg
+bGEjV1rGokSlHoi5OjNAdytOTV8eMhktmzWQBqE03LEpxlGFy7EXyNwVR/RWe4v7
+S7knlMt9Mh/39QKvFTzs9fDwXYIoYzvyOQdz4AGOU+DoFy6M09w=
+=kaQX
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7c2cc2ff1841..774e8911b983 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Nov 2022 18:09:46 +0000
+Thu, 24 Nov 2022 00:09:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1b2922741334..869e176ade14 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index ea734950c49c..2ac2d2590ad3 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/backintime-1.3.1 b/metadata/md5-cache/app-backup/backintime-1.3.1
deleted file mode 100644
index 9607a904f202..000000000000
--- a/metadata/md5-cache/app-backup/backintime-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=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_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/keyring[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/keyring[python_targets_python3_9(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Backup system inspired by TimeVault and FlyBack
-EAPI=7
-HOMEPAGE=https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/
-INHERIT=python-single-r1 xdg
-IUSE=examples qt5 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=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_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/keyring[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/keyring[python_targets_python3_9(-)] ) net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5[gui,widgets] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/bit-team/backintime/releases/download/1.3.1/backintime-1.3.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=652b796132460d892a858a587ac7d2d4
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b8e3a0c83abd..011ae9d3ca39 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-sh-3.0.4 b/metadata/md5-cache/app-crypt/acme-sh-3.0.5
index 7223b596b427..2de2b5d7070e 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-3.0.4
+++ b/metadata/md5-cache/app-crypt/acme-sh-3.0.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:0 net-misc/curl net-misc/socat selinux? ( sec-policy/selinux-certbot )
 SLOT=0
-SRC_URI=https://github.com/acmesh-official/acme.sh/archive/3.0.4.tar.gz -> acme.sh-3.0.4.tar.gz
+SRC_URI=https://github.com/acmesh-official/acme.sh/archive/refs/tags/v3.0.5.tar.gz -> acme.sh-3.0.5.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=a4c2a1ba468eb6467ac09628483e5647
+_md5_=6318edbfe5ba406086ccb66b13705d7d
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 22e97d4fab44..756c9fa8cbb9 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/kile-2.9.93_p20221123 b/metadata/md5-cache/app-editors/kile-2.9.93_p20221123
new file mode 100644
index 000000000000..a33fc1918d4b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/kile-2.9.93_p20221123
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtscript-5.15.5:5 >=dev-qt/qttest-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 kde-apps/okular:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdoctools-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 pdf? ( app-text/poppler[qt5] ) dev-qt/qtcore:5
+DESCRIPTION=Latex Editor and TeX shell based on KDE Frameworks
+EAPI=8
+HOMEPAGE=https://apps.kde.org/kile/ https://kile.sourceforge.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=+pdf +png debug +handbook
+LICENSE=FDL-1.2 GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtscript-5.15.5:5 >=dev-qt/qttest-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 kde-apps/okular:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdoctools-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 pdf? ( app-text/poppler[qt5] ) kde-apps/konsole:5 kde-apps/okular:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( app-text/ghostscript-gpl app-text/texlive-core ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://gentoo/kile-2.9.93_p20221123-1ca67389.tar.gz https://invent.kde.org/office/kile/-/archive/1ca67389327d63fdc5a4c65ab6dd1cf7fbf597af/kile-1ca67389327d63fdc5a4c65ab6dd1cf7fbf597af.tar.gz -> kile-2.9.93_p20221123-1ca67389.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a32605789688bfd2c0d5bf038f176a66
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 624b698a5ae0..42c496bf634c 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.4 b/metadata/md5-cache/app-emulation/wine-proton-7.0.4
index eaef55c93e40..a71d4c061b12 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.4
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.4
@@ -1,10 +1,10 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
 DEPEND=dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers x11-base/xorg-proto
 DESCRIPTION=Valve Software's fork of Wine
 EAPI=8
 HOMEPAGE=https://github.com/ValveSoftware/wine/
-IDEPEND=>=app-eselect/eselect-wine-1.2.2-r1
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 IUSE=+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l +vkd3d +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.4
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-4.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e94dfc3c749c4a706ef989aecb6efc7b
+_md5_=b788bdba786f47053237453c4dd01135
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.5 b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
new file mode 100644
index 000000000000..cb2ed21b5fc6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers x11-base/xorg-proto
+DESCRIPTION=Valve Software's fork of Wine
+EAPI=8
+HOMEPAGE=https://github.com/ValveSoftware/wine/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools flag-o-matic multilib multilib-build python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+IUSE=+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l +vkd3d +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
+RDEPEND=dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.3.1 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=7.0.5
+SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-5.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f60fab72f9deb9d2ba984453297f3daf
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.9999 b/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
index f10ced9ec3ac..5abc0db81ced 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
@@ -1,10 +1,10 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup unpack
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers x11-base/xorg-proto
 DESCRIPTION=Valve Software's fork of Wine
 EAPI=8
 HOMEPAGE=https://github.com/ValveSoftware/wine/
-IDEPEND=>=app-eselect/eselect-wine-1.2.2-r1
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper git-r3
 IUSE=+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l +vkd3d +xcomposite xinerama abi_x86_32 abi_x86_64
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=test
 SLOT=7.0.9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=300679976fd2e9cea37b73a5328e8758
+_md5_=af7739188ae3a5e816f896c9d0199c20
diff --git a/metadata/md5-cache/app-emulation/wine-staging-7.18 b/metadata/md5-cache/app-emulation/wine-staging-7.18
deleted file mode 100644
index 05ddc0c2fa3d..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-7.18
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=8
-HOMEPAGE=https://wiki.winehq.org/Wine-Staging
-IDEPEND=app-eselect/eselect-wine
-INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan xattr +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.3.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=7.18
-SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz https://github.com/wine-staging/wine-staging/archive/v7.18.tar.gz -> wine-staging-7.18.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e0c3b95426c30db9131c62da5f10e882
diff --git a/metadata/md5-cache/app-emulation/wine-staging-7.19 b/metadata/md5-cache/app-emulation/wine-staging-7.19
index 270e16d800c9..ab577c1e99b5 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-7.19
+++ b/metadata/md5-cache/app-emulation/wine-staging-7.19
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend unpack
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend unpack
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
 EAPI=8
 HOMEPAGE=https://wiki.winehq.org/Wine-Staging
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.19
 SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.19.tar.xz https://github.com/wine-staging/wine-staging/archive/v7.19.tar.gz -> wine-staging-7.19.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f0afd04d010f85bc06a3d699c9dea439
+_md5_=ce6bb68e3cb1d086eaeb3db720e78a47
diff --git a/metadata/md5-cache/app-emulation/wine-staging-7.20 b/metadata/md5-cache/app-emulation/wine-staging-7.20
index 7854251d6deb..0dd2a4fcf8f2 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-7.20
+++ b/metadata/md5-cache/app-emulation/wine-staging-7.20
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend unpack
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend unpack
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
 EAPI=8
 HOMEPAGE=https://wiki.winehq.org/Wine-Staging
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.20
 SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.20.tar.xz https://github.com/wine-staging/wine-staging/archive/v7.20.tar.gz -> wine-staging-7.20.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f079ed2d55d00c9596ec377a270f89f
+_md5_=781f5d341cc9725771b55cc8cbce6b86
diff --git a/metadata/md5-cache/app-emulation/wine-staging-7.21 b/metadata/md5-cache/app-emulation/wine-staging-7.21
index 95b346d3e86d..ad7c74fa8cae 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-7.21
+++ b/metadata/md5-cache/app-emulation/wine-staging-7.21
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend unpack
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend unpack
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
 EAPI=8
 HOMEPAGE=https://wiki.winehq.org/Wine-Staging
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.21
 SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.21.tar.xz https://github.com/wine-staging/wine-staging/archive/v7.21.tar.gz -> wine-staging-7.21.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b90c38f41f8f326715674662cb4faaba
+_md5_=9f8399b8a40e41e53e6d0f51f558915d
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index ccea0bd14c4e..d9ac628d842f 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend unpack
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend unpack
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
 EAPI=8
 HOMEPAGE=https://wiki.winehq.org/Wine-Staging
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper git-r3
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
@@ -14,4 +14,4 @@ REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_6
 RESTRICT=test
 SLOT=9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e12c762bd8df01262f4a58c792e1348a
+_md5_=420c213423536abe4d012e25993c8b73
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.0-r3 b/metadata/md5-cache/app-emulation/wine-vanilla-7.0-r3
index 2810d9dce3fd..18d83af4515a 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.0-r3
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst prepare prerm pretend
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0
 SRC_URI=https://dl.winehq.org/wine/source/7.0/wine-7.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=50decf1f93174d193654c352fbe5ca1c
+_md5_=5e4e03597e03f5a055d0e5b6d770bc83
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
index 8ca25b5eadc9..a89312df32d7 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
 EAPI=8
 HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vkd3d +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.1
 SRC_URI=https://dl.winehq.org/wine/source/7.0/wine-7.0.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1b60e5459cac5c7b5ac512a52b9c4ee3
+_md5_=8ca62c59ad8c8c5b7e780bc33e18ea43
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.18 b/metadata/md5-cache/app-emulation/wine-vanilla-7.18
deleted file mode 100644
index 8d13e4575113..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.18
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=8
-HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
-IDEPEND=app-eselect/eselect-wine
-INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.3.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=7.18
-SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9b44f4b2d528fccf8e02e1479fef4c21
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.19 b/metadata/md5-cache/app-emulation/wine-vanilla-7.19
index f3e371b32c8a..8cf045a83993 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.19
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.19
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
 EAPI=8
 HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.19
 SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.19.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9b44f4b2d528fccf8e02e1479fef4c21
+_md5_=ec71911c028845528bccc951a4fa786e
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.20 b/metadata/md5-cache/app-emulation/wine-vanilla-7.20
index e71ea29433c7..c405ce5397c1 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.20
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.20
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
 EAPI=8
 HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.20
 SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.20.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d0807ff890b2ed497303db9c8997a32d
+_md5_=2ffc6426c25595a50eb364517be7ef0b
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.21 b/metadata/md5-cache/app-emulation/wine-vanilla-7.21
index fd82b4a55250..83ab8b5184b9 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.21
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.21
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
 EAPI=8
 HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.21
 SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.21.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=95fc5ecfe9d4245f796149b095f1e1ce
+_md5_=c3cc0ca5aed09e134bcb655f3521c6d8
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 9d2c1ad476ab..0c3256541047 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -1,10 +1,10 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend unpack
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend unpack
 DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
 EAPI=8
 HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
-IDEPEND=app-eselect/eselect-wine
+IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper git-r3
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
@@ -14,4 +14,4 @@ REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_6
 RESTRICT=test
 SLOT=9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=edad3b9d677042c5aa1f63878f5fea90
+_md5_=956ffaef33f6b5aec20349075f187725
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 5359d5871f1c..ec0b7b4b4d38 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-wine-2.0.0 b/metadata/md5-cache/app-eselect/eselect-wine-2.0.0
index 411e27ac4b01..37df76aa7554 100644
--- a/metadata/md5-cache/app-eselect/eselect-wine-2.0.0
+++ b/metadata/md5-cache/app-eselect/eselect-wine-2.0.0
@@ -2,8 +2,9 @@ DEFINED_PHASES=install postinst preinst prerm pretend
 DESCRIPTION=Manage active Wine slots and variants
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Wine
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/eselect-wine-2.0.0.tar.bz2
-_md5_=1c8dcf2a7d3689fef2b822c6c135c5c4
+_md5_=e07b2a724c8d0e8974d0a2042769eeec
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index e48187aa93a8..d87fd849a9d5 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-5.2_p12 b/metadata/md5-cache/app-shells/bash-5.2_p12
new file mode 100644
index 000000000000..6009ae7ef590
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.2_p12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/yacc pgo? ( dev-util/gperf ) verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.2_p1:= )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
+INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
+IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +readline verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.2_p1:= )
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.2.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2.tar.gz.sig ) mirror://gnu//bash-5.2-patches/bash52-001 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001.sig ) mirror://gnu//bash-5.2-patches/bash52-002 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002.sig ) mirror://gnu//bash-5.2-patches/bash52-003 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-003.sig ) mirror://gnu//bash-5.2-patches/bash52-004 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-004.sig ) mirror://gnu//bash-5.2-patches/bash52-005 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-005.sig ) mirror://gnu//bash-5.2-patches/bash52-006 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-006.sig ) mirror://gnu//bash-5.2-patches/bash52-007 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-007.sig ) mirror://gnu//bash-5.2-patches/bash52-008 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-008.sig ) mirror://gnu//bash-5.2-patches/bash52-009 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-009.sig ) mirror://gnu//bash-5.2-patches/bash52-010 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-010.sig ) mirror://gnu//bash-5.2-patches/bash52-011 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-011.sig ) mirror://gnu//bash-5.2-patches/bash52-012 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-012.sig )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=2dc7b6c5ba9b9f8ab845ade6224af5db
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c65fff1f98fe..cd887ccc5786 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/kbibtex-0.9.2-r1 b/metadata/md5-cache/app-text/kbibtex-0.9.2-r1
new file mode 100644
index 000000000000..8810fbdb042c
--- /dev/null
+++ b/metadata/md5-cache/app-text/kbibtex-0.9.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=dev-qt/qtxmlpatterns-5.15.5:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.15.5:5[widgets] ) zotero? ( >=app-crypt/qca-2.3.0:2[qt5(+)] dev-libs/qoauth:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
+EAPI=8
+HOMEPAGE=https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org optfeature
+IUSE=webengine zotero debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=dev-qt/qtxmlpatterns-5.15.5:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.15.5:5[widgets] ) zotero? ( >=app-crypt/qca-2.3.0:2[qt5(+)] dev-libs/qoauth:5 ) dev-tex/bibtex2html || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/KBibTeX/0.9.2/kbibtex-0.9.2.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8df9d7f329a412530cd7fba656fa83f5
diff --git a/metadata/md5-cache/app-text/libwps-0.4.13 b/metadata/md5-cache/app-text/libwps-0.4.13
new file mode 100644
index 000000000000..1e88d4a9651e
--- /dev/null
+++ b/metadata/md5-cache/app-text/libwps-0.4.13
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/librevenge
+DESCRIPTION=Microsoft Works file word processor format import filter library
+EAPI=8
+HOMEPAGE=https://sourceforge.net/p/libwps/wiki/Home/
+IUSE=debug doc tools
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 MPL-2.0 )
+RDEPEND=dev-libs/librevenge
+SLOT=0
+SRC_URI=mirror://sourceforge/libwps/libwps-0.4.13.tar.xz
+_md5_=622d502a427e79df429c7d86e63f1504
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 0361c1be88ce..7b48e74ee7aa 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/say-1.3_p1-r1 b/metadata/md5-cache/dev-lua/say-1.3_p1-r1
deleted file mode 100644
index 7644202cc1f5..000000000000
--- a/metadata/md5-cache/dev-lua/say-1.3_p1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] ) lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-DEFINED_PHASES=install test
-DESCRIPTION=Lua String Hashing/Indexing Library
-EAPI=8
-HOMEPAGE=https://github.com/lunarmodules/say
-INHERIT=lua
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
-_eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5bddf8c87557bc810d214e5ec0fce557
diff --git a/metadata/md5-cache/dev-lua/say-1.4.1 b/metadata/md5-cache/dev-lua/say-1.4.1
index 5137fa11a6d9..1bed1f22e67f 100644
--- a/metadata/md5-cache/dev-lua/say-1.4.1
+++ b/metadata/md5-cache/dev-lua/say-1.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/lunarmodules/say
 INHERIT=lua
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lunarmodules/say/archive/refs/tags/v1.4.1.tar.gz -> say-1.4.1.tar.gz
 _eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=219604b359af4a59c6f381747b74d22a
+_md5_=079f3e124d7858ac3d1e2c2933136dc3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5bd9104018a9..50507366fae5 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/bracex-2.3_p1 b/metadata/md5-cache/dev-python/bracex-2.3_p1
index cf6d19c14738..b13768187589 100644
--- a/metadata/md5-cache/dev-python/bracex-2.3_p1
+++ b/metadata/md5-cache/dev-python/bracex-2.3_p1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/facelessuser/bracex/ https://pypi.org/project/bracex/
 INHERIT=distutils-r1 docs
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/bracex/archive/2.3.post1.tar.gz -> bracex-2.3_p1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	docs	2af4a2f0074bd646101ce0f66ca6dd03	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1fd8fbf98fad1363e94882a4a5f456ab
+_md5_=061a79c2b01dc89549af1db3194415be
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.1.1 b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.1.1
new file mode 100644
index 000000000000..3a2da444a47e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/mkdocs-material-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extension pack for Python Markdown
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/mkdocs-material-extensions https://pypi.org/project/mkdocs-material-extensions
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mkdocs-material-5.0.0[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 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/mkdocs-material-extensions/archive/1.1.1.tar.gz -> mkdocs-material-extensions-1.1.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b846b8d9d86e8c06b847dc3457896608
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.9 b/metadata/md5-cache/dev-python/pymdown-extensions-9.9
new file mode 100644
index 000000000000..f6784faf7004
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-9.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pygments-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/pymdown-lexers[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pymdown-lexers[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pymdown-lexers[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/pymdown-lexers[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) dev-vcs/git )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extensions for Python Markdown
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
+INHERIT=distutils-r1 docs
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-3.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 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/9.9.tar.gz -> pymdown-extensions-9.9.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	docs	2af4a2f0074bd646101ce0f66ca6dd03	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=21835ccd1646befabf60f7e3468c6acc
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.13.1 b/metadata/md5-cache/dev-python/qscintilla-python-2.13.1
deleted file mode 100644
index 96ca812dc52a..000000000000
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.13.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5
-DEFINED_PHASES=compile configure install prepare
-DEPEND=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/PyQt5-5.15.5[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.13.1:=
-DESCRIPTION=Python bindings for QScintilla
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/
-INHERIT=python-r1 qmake-utils
-IUSE=debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-3
-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 ) >=dev-python/PyQt5-5.15.5[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.13.1:= >=dev-python/PyQt5-sip-12.9:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.1/QScintilla_src-2.13.1.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e45a621364df227ef27272e0258de9bf
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 3d11cf749d5d..8683d7179e02 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/expect-5.45.4-r2 b/metadata/md5-cache/dev-tcltk/expect-5.45.4-r2
deleted file mode 100644
index 66449151a190..000000000000
--- a/metadata/md5-cache/dev-tcltk/expect-5.45.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-lang/tcl-8.2:=[threads?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=tool for automating interactive applications
-EAPI=6
-HOMEPAGE=https://core.tcl-lang.org/expect/
-INHERIT=autotools
-IUSE=debug doc threads
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/tcl-8.2:=[threads?]
-SLOT=0
-SRC_URI=mirror://sourceforge/expect/expect5.45.4.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9391ba23352376b579823cc59f1114ca
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 2670403de23a..660a4557f072 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/idea-community-2022.2.3 b/metadata/md5-cache/dev-util/idea-community-2022.2.4
index 4a34dda9ba6b..b81447cb3b4d 100644
--- a/metadata/md5-cache/dev-util/idea-community-2022.2.3
+++ b/metadata/md5-cache/dev-util/idea-community-2022.2.4
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL
 RDEPEND=|| ( >=dev-java/openjdk-17.0.3_p7-r1:17 >=dev-java/openjdk-bin-17.0.3_p7:17 ) sys-libs/glibc media-libs/harfbuzz dev-java/jansi-native dev-libs/libdbusmenu
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz -> idea-community-2022.2.3.tar.gz
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2022.2.4.tar.gz -> idea-community-2022.2.4.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a1788cecb4f1f7dc9b7d9a554942cfb3
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 264e12f8a2ef..7be7bc01b6d8 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/plasma-pass-1.2.0 b/metadata/md5-cache/kde-misc/plasma-pass-1.2.0
deleted file mode 100644
index 4c16544919c3..000000000000
--- a/metadata/md5-cache/kde-misc/plasma-pass-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.74.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 sys-auth/oath-toolkit dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet to access password from pass
-EAPI=7
-HOMEPAGE=https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/plasma/plasma-pass
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~ppc64
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 sys-auth/oath-toolkit >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma-pass/plasma-pass-1.2.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fa0564cb24c610aa718c1002507fd042
diff --git a/metadata/md5-cache/kde-misc/plasma-pass-1.2.0-r1 b/metadata/md5-cache/kde-misc/plasma-pass-1.2.0-r1
new file mode 100644
index 000000000000..34d35f33948f
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/plasma-pass-1.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 sys-auth/oath-toolkit dev-qt/qtcore:5
+DESCRIPTION=Plasma applet to access password from pass
+EAPI=8
+HOMEPAGE=https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/plasma/plasma-pass
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=amd64 ~ppc64
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 sys-auth/oath-toolkit app-crypt/gnupg >=dev-qt/qtquickcontrols2-5.15.5:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma-pass/plasma-pass-1.2.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0bca82d8f28ae7fb65fc140045f964a8
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 1337c1b72a7e..fcc746303d64 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.2.0 b/metadata/md5-cache/media-gfx/kxstitch-2.2.0
deleted file mode 100644
index 41c82a79b118..000000000000
--- a/metadata/md5-cache/media-gfx/kxstitch-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/imagemagick[cxx] x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Program to create cross stitch patterns
-EAPI=7
-HOMEPAGE=https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch
-INHERIT=ecm kde.org
-IUSE=debug +handbook
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kxstitch/2.2.0/kxstitch-2.2.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a6b75941ef18123816b7089cf390967f
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.2.0-r1 b/metadata/md5-cache/media-gfx/kxstitch-2.2.0-r1
new file mode 100644
index 000000000000..1484b6f61cb6
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/imagemagick[cxx] dev-qt/qtcore:5
+DESCRIPTION=Program to create cross stitch patterns
+EAPI=8
+HOMEPAGE=https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/imagemagick[cxx] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kxstitch/2.2.0/kxstitch-2.2.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5e08bebb748a1deabeac706923b4e834
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 3f4c39f2d054..cecc0539ef53 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/liblscp-0.9.7 b/metadata/md5-cache/media-libs/liblscp-0.9.7
index b5572377284a..30be6bc7e5e4 100644
--- a/metadata/md5-cache/media-libs/liblscp-0.9.7
+++ b/metadata/md5-cache/media-libs/liblscp-0.9.7
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.linuxsampler.org
 INHERIT=cmake
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/liblscp-0.9.7.tar.gz https://download.linuxsampler.org/packages/liblscp-0.9.7.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=602ccd183929f91a9ceee7bc98c62d9f
+_md5_=d573ac5cdbe5b327e2207e633fadc859
diff --git a/metadata/md5-cache/media-libs/mlt-7.10.0 b/metadata/md5-cache/media-libs/mlt-7.12.0
index 779f2c829d66..2412bddf8b2a 100644
--- a/metadata/md5-cache/media-libs/mlt-7.10.0
+++ b/metadata/md5-cache/media-libs/mlt-7.12.0
@@ -12,6 +12,6 @@ RDEPEND=>=media-libs/libebur128-1.2.2:= sci-libs/fftw:3.0= ffmpeg? ( media-video
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=test
 SLOT=0/7
-SRC_URI=https://github.com/mltframework/mlt/releases/download/v7.10.0/mlt-7.10.0.tar.gz
+SRC_URI=https://github.com/mltframework/mlt/releases/download/v7.12.0/mlt-7.12.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=bbefd432a733ae68ea17e0b28f6bc2c8
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c152248e32a1..9ab3f2d17cde 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/schismtracker-20221020 b/metadata/md5-cache/media-sound/schismtracker-20221020
index 587c48a26aeb..c131630b98f2 100644
--- a/metadata/md5-cache/media-sound/schismtracker-20221020
+++ b/metadata/md5-cache/media-sound/schismtracker-20221020
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://schismtracker.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools desktop xdg
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2 public-domain
 RDEPEND=media-libs/libsdl2[X] x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://github.com/schismtracker/schismtracker/archive/20221020.tar.gz -> schismtracker-20221020.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0bbe00941ab92c4ac3dbfea5bf6611fc
+_md5_=dcf51f455a3bc009d85ef9bcff24ef34
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 90c091f5f58a..4e6bdff4050b 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/znc-palaver-1.2.1-r1 b/metadata/md5-cache/net-irc/znc-palaver-1.2.1-r1
deleted file mode 100644
index b57202df9db4..000000000000
--- a/metadata/md5-cache/net-irc/znc-palaver-1.2.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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 ) net-irc/znc:=[ssl] python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-asyncio[python_targets_python3_8(-)] dev-python/semantic_version[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-asyncio[python_targets_python3_9(-)] dev-python/semantic_version[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-asyncio[python_targets_python3_10(-)] dev-python/semantic_version[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile install setup test
-DESCRIPTION=A ZNC module which provides push notifications to Palaver
-EAPI=8
-HOMEPAGE=https://github.com/cocodelabs/znc-palaver
-INHERIT=python-single-r1 toolchain-funcs
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=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 ) net-irc/znc:=[ssl]
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cocodelabs/znc-palaver/archive/1.2.1.tar.gz -> znc-palaver-1.2.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ea6a919775d8845b5a7483c47538daaa
diff --git a/metadata/md5-cache/net-irc/znc-palaver-1.2.2 b/metadata/md5-cache/net-irc/znc-palaver-1.2.2
index 9121fe51d6ff..fa306b1ee4c5 100644
--- a/metadata/md5-cache/net-irc/znc-palaver-1.2.2
+++ b/metadata/md5-cache/net-irc/znc-palaver-1.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cocodelabs/znc-palaver
 INHERIT=python-single-r1 toolchain-funcs
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=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 ) net-irc/znc:=[ssl]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cocodelabs/znc-palaver/archive/1.2.2.tar.gz -> znc-palaver-1.2.2.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cda8b196cee0a7f173974e520333abc8
+_md5_=dcbb1c391effb6c25e2ef94b0bf7967c
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 95aa791477c2..8867346b6e8f 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.7-r1 b/metadata/md5-cache/net-misc/rsync-3.2.7-r1
index b7a3fc59a772..dce13a528ff2 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.7-r1
+++ b/metadata/md5-cache/net-misc/rsync-3.2.7-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://rsync.samba.org/
 INHERIT=prefix python-single-r1 systemd verify-sig
 IUSE=acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
-KEYWORDS=~alpha ~amd64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( 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 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) rrsync? ( 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_8? ( dev-python/bracex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/bracex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bracex[python_targets_python3_10(-)] ) ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
 REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) rrsync? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=d952a10c96bde02d8c8fc1aa9265b3d5
+_md5_=602330018adc0776684dccb8aca1104d
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2-r6 b/metadata/md5-cache/net-misc/vde-2.3.2-r6
deleted file mode 100644
index 01562a893859..000000000000
--- a/metadata/md5-cache/net-misc/vde-2.3.2-r6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=pcap? ( net-libs/libpcap ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
-EAPI=6
-HOMEPAGE=https://virtualsquare.org
-IUSE=pcap selinux ssl static-libs
-KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=pcap? ( net-libs/libpcap ) ssl? ( dev-libs/openssl:0= ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
-SLOT=0
-SRC_URI=mirror://sourceforge/vde/vde2-2.3.2.tar.bz2
-_md5_=adebd60dfd946e566fbaa6f557622969
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1 b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
deleted file mode 100644
index 5a8539f9df16..000000000000
--- a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=pcap? ( net-libs/libpcap ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
-EAPI=6
-HOMEPAGE=https://virtualsquare.org
-INHERIT=flag-o-matic autotools
-IUSE=pcap selinux static-libs
-KEYWORDS=amd64 arm64 ~loong ~ppc ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
-SLOT=0
-SRC_URI=https://github.com/virtualsquare/vde-2/archive/c7b36a57831a9067c8619c3e17a03e595623b3eb.tar.gz -> vde-2.3.2_p20191011.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a7b97a351ce900089e9fc82829460a2f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index acd8cbd2ffe4..e1cebdbabadc 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/miopen-5.0.2 b/metadata/md5-cache/sci-libs/miopen-5.0.2
deleted file mode 100644
index 7f5c1940d9b7..000000000000
--- a/metadata/md5-cache/sci-libs/miopen-5.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/half:0/1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/hip >=dev-db/sqlite-3.17 dev-libs/ocl-icd dev-util/rocm-clang-ocl:0/5.0 sci-libs/rocBLAS:0/5.0 dev-libs/boost
-DESCRIPTION=AMD's Machine Intelligence Library
-EAPI=8
-HOMEPAGE=https://github.com/ROCmSoftwarePlatform/MIOpen
-INHERIT=cmake flag-o-matic
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-util/hip >=dev-db/sqlite-3.17 dev-libs/ocl-icd dev-util/rocm-clang-ocl:0/5.0 sci-libs/rocBLAS:0/5.0 dev-libs/boost
-RESTRICT=!test? ( test )
-SLOT=0/5.0
-SRC_URI=https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.0.2.tar.gz -> MIOpen-5.0.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=916bbee79033adc41a9befd47202d198
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index d82eed529580..2d52d5ab063d 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/octave-5.2.0 b/metadata/md5-cache/sci-mathematics/octave-5.2.0
deleted file mode 100644
index adf128460fd6..000000000000
--- a/metadata/md5-cache/sci-mathematics/octave-5.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) dev-util/gperf sys-apps/texinfo virtual/pkgconfig doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) gui? ( dev-qt/linguist-tools:5 ) java? ( >=virtual/jdk-1.6.0 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=High-level interactive language for numerical computations
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/octave/
-INHERIT=autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
-IUSE=curl doc fftw +glpk gnuplot gui hdf5 java opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib java
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/5.2.0
-SRC_URI=mirror://gnu/octave/octave-5.2.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d1aaea16a861d05eeb512171b226f8a2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a23339f73a1d..0c4a0065ddc5 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/less-612 b/metadata/md5-cache/sys-apps/less-612
index 96fc1181ec7c..21379b1de14c 100644
--- a/metadata/md5-cache/sys-apps/less-612
+++ b/metadata/md5-cache/sys-apps/less-612
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~floppym/dist/less-612-gentoo.tar.gz
-_md5_=d15bfdfca0ab4c7a0e6db5b4ce72f4f8
+SRC_URI=http://www.greenwoodsoftware.com/less/less-612-beta.tar.gz
+_md5_=c91c660678dc1d00d075286ed06b2320
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index ff8839c860ce..1fc199ad3a44 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
index 915249a7464b..6e0bb5e8c861 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
@@ -8,8 +8,8 @@ INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolcha
 IUSE=+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools dist-kernel driver
 KEYWORDS=-* amd64 x86
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT
-RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.154/NVIDIA-Linux-x86-390.154.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.154.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=4129c89a9f9987821f011754f58051f9
+_md5_=40bee1204b274398fa2e2ca3366ca6a8
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
index 27b0291cf52e..834cd0cec783 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
@@ -8,8 +8,8 @@ INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolcha
 IUSE=+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools dist-kernel driver
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT
-RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.157/NVIDIA-Linux-x86-390.157.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=f7fb852a7e55cb3a62ccd6ce5e984341
+_md5_=4f82434522168b6dfd936aeaef213285
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 21a2da7f79fe..5b1ac1bf42f5 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.13.1 b/metadata/md5-cache/x11-libs/qscintilla-2.13.1
deleted file mode 100644
index 98f7cba3ce05..000000000000
--- a/metadata/md5-cache/x11-libs/qscintilla-2.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
-DESCRIPTION=Qt port of Neil Hodgson's Scintilla C++ editor control
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
-INHERIT=flag-o-matic qmake-utils
-IUSE=designer doc
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
-SLOT=0/15
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.1/QScintilla_src-2.13.1.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=43ef656103cb98aa7f662011b3673e12
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f0bbce796833..178b0e3f950f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14421 BLAKE2B 0f41c59983421c5a874774c72cee0a539dbe67328a99d7b3fac34e629fe17a797572a6b288edfdc1f7afe68fd982ecb7741c2b1e7518c31f7e22823346ffd70c SHA512 01aefa27769efd4db47e7c9ce0eb916aca94e3d3d3bcec5a340337270c8e62665b5495397e431cbd07b9e15c6be0b763e01adfdfd12745a3d8ebdd2e0a2d782a
-TIMESTAMP 2022-11-23T18:09:48Z
+TIMESTAMP 2022-11-24T00:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN+Ye1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN+tk1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDPIRAAphQmL0KuAiPB+eBcc+ktDNBlD9jfMBqADRaQGQXXfTgGHHY6rP3F1i2/
-bkwLY5xfh/Rgj+IiPw3YTuu8X0ALctPeCtwWC9ujWOLGTto0I/8ReRefe7WgA4oR
-aDuSmY+xfZBV0r5NWHpZ5/0AYgEdyEo6rH1BYeyYOmjDnzax2rb9xS/aFSpYW1Rc
-C8vkaV6eUjjYjeH8mk46TGB3cHpD+yR7chbxGPP28Fp9bXLmrnIN1lI9n8NeXJrg
-9BW7hEcIZrrYp8Rh0Sd6WWp0bZm5w2e7CEaIzktyTvTEEQqNHt3RPShd+9wY1vLp
-QAsu51ZmnV9/filCh21tlimUKMQygq2UcQ8Ed+EwsX2NO8096OFrfisJSnvOQ56S
-Vn57ZqBonFxtcO5ArlqIEgBq52rRHflQNBrJMezFoxj6P10Snz5KTbowIAJD7/Df
-EIvM0lVh2YUOqG6XR2NO6/vehe0/LsURWLWtMx5eJEIgtLitVs51/NaKg8lv3DjR
-07Pkjad4BnDZMCrqQUFw5Q6THE3LhKuUOzaGBT9E/kYPrEmYY2DSXN5TNzNieXDm
-g7ZzYylB2izOlwT7wlRPpYBBZIkE6CqEJ26e070NDIdZ0BMtsGPeKJ724IMvOmVS
-NAxBgbCURinnsPyxAOoSVdjFYvq2wJyJAhwdC+rylj1OajrDJP4=
-=zHS9
+klCtcw/9FDGJai6iSi7rahSX87LGZ0uakqI0WG7/R0g4Hb7hbUzHrWY++iodIn8V
+CHT2Uh7mnqe5VXWkuwj6H8IiI6CvEfyQ3P3405vmwMxUQfiIIBNvZyd+/aPSwpN/
+AowRSBBXU1UfbqaLyzbiM3oCaO+E6DP3An6W/0+fbo1YvI8wMGkvW3Sk0k4Y78sa
+WXkPxKVtOf/nOE1Na8jDyW9EtbNbsOPtxTE8seUreKWoE+tqElEt7tRKewvFDgCi
+Bbw9fZsjnnfZjT1QcxTnSft7mSW/O+OvUDcL0h+yJEFhDO8f2XvkNLUnY5MCi5Wf
+wuTT0UssRFq9cAWWs6xWdwSmc1bsTjiI0HvYEAvjUQPcO0p6teYXCPfvBMoPNPzU
+Q6ZPQdzKNC4xNSVpXuShZQYUwSGUGgKulVQ9JX5R/K4LOkBzobDgFtcqJ96y+x8I
+X1QdSnYKLbCSj8RsPLF9ZK2LAuOgWDJ3KzYb2t559E7pX16f3nPJXp9F6A6hXL4V
+slkHX2SDANQEzK2f6hbYK6t63aslvUVknV1RiBYcuoovaSvbOGalAcpKgmpp22R8
+SOI5QOquE17+lZGYTbXj26gG7g5DeeMW0Uxev/BsjQELWEZU9CsdotNdz44d1sTk
+VeL7NrYHZJZe1xk/CDLjACOlxSUzbuqcpsfteZvrKA0L9BoerzM=
+=2bVj
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7c2cc2ff1841..774e8911b983 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Nov 2022 18:09:46 +0000
+Thu, 24 Nov 2022 00:09:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 18e13ac3c567..c36a0cfee766 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Nov 23 06:09:45 PM UTC 2022
+Thu Nov 24 12:09:44 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d0f6392e669e..ce852bd06574 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Nov 2022 18:15:01 +0000
+Thu, 24 Nov 2022 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 0c0634ea90f6..e5dd3a356eb8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f2496f457d429c5a47250766422df3c9cf26398b 1669226393 2022-11-23T17:59:53+00:00
+8e3297e85b4b4a0d8221d5b164e25a7f4d5d949b 1669247095 2022-11-23T23:44:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 834ed4042323..5c96fcd47169 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1669227001 Wed 23 Nov 2022 06:10:01 PM UTC
+1669248601 Thu 24 Nov 2022 12:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0601c244c3e3..4373b176ef4b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Nov 2022 18:09:45 +0000
+Thu, 24 Nov 2022 00:09:44 +0000
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 1141f255445a..0ba27f6e2ff6 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index b00dd7d5ca78..a65c32b6d2c3 100644
--- a/net-irc/znc-palaver/Manifest
+++ b/net-irc/znc-palaver/Manifest
@@ -1,7 +1,5 @@
 AUX znc-palaver-1.2.1-python310.patch 2084 BLAKE2B c764435ddcbe2ae6a00b4c937e030b5bb9f8c5f612d97dab6c655c4658523b66dcd8b0bf99a00dbcaffca704e61e191b2bcce43abbd79952b1f156e47bff2564 SHA512 171307c0cc374fe88bb59f5c344d14fc85088edc34b8ff2d85efb731efdeff8159a6ac640e36aec308b1bb3a39d8991323f956937482636aec46ffd6ee379f56
 AUX znc-palaver-1.2.1-xunit2.patch 803 BLAKE2B c56e25f2961257f2a02e6f50d22542c484285460c51cba2b7e7ae9b115a182d79a2f1f2785f5bbc64381bf33062c0d2ffcad2569670e139f8360c769470fe136 SHA512 d37c7ef8e50852096ac152a984a67802ff65002ce94ae0d3e8fed76ebed8aa3b79f04cbc6587b316522cbb1d12f69e82693892e5f273600c5ce72553d03dc032
-DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B 0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4 SHA512 0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
 DIST znc-palaver-1.2.2.tar.gz 14649 BLAKE2B ad67bbbfc9ad293ce71669d84b7ccb3bd69f52e534662ac35c4a3ecd41fe91af2fe519f109dd2e9b9b824e5970883706a6dc7ebc89b806e74e5ad121466947f8 SHA512 b91ba7200cac393557252874293f131c83a4cea83203457e8f6f91a129d8207c16951b983e52848ce4f54750752f69765ca26b8e3f50e74da2a11138eaf2bdce
-EBUILD znc-palaver-1.2.1-r1.ebuild 1132 BLAKE2B 9a2d10fc8c97276313388bf07ce49ba17de0444f164d6e6c4d665aca13f05ef835510550ed5549a5d65b2c73815a180760cd7cb361225670635a64532ab63d07 SHA512 71d2c3d35fd4aa6f256561ed32b4eb41874d3be596178a985254c0d1b14696db285a385de7594bbc1bbdbbc2910c514904271f7f4f9a1980c86be0629f4f6d09
-EBUILD znc-palaver-1.2.2.ebuild 1052 BLAKE2B cd8bf2054305f68bed7825d25a1d3a650a2103a8cca3b0bbcf5ceda74f2393aeb1546a4e89bd35f8a5c1d9c91109818bdb38a8da71f85a7be58adcf6d238f779 SHA512 63250c4bfcb4bcbe1deab9b3fdb35f6c32b32e61deabfc63bce8826bfbe6abde0a45bdb09bd5ef8f2377aca3e4713555b4b6795039dce6df4e0249131eb6f89e
+EBUILD znc-palaver-1.2.2.ebuild 1050 BLAKE2B 3ddc0f99bb5a59a5a78460d145d660c70aeb06e68820d25654f891424b2bedc262c6e831c14d9c3783ba9e1b93af4ec3ee82d062801d4b5e009370950b4665c1 SHA512 008245a2871339c8d9ee89e5756ebd78a54ce506e034871a4e4fe075d3934f3259f472ccc903b18eaca41f145e04df3b933ab73017f3b03ed2780d5a24e44317
 MISC metadata.xml 573 BLAKE2B 69a013a18c6c19b2211f70a09e80201d98c4909723f843043855751ddf6aa8545e2dc2b47ba5bfc0e932e25b9de609e5afebc1e9b2a4d81da0bee48cedea6397 SHA512 916557c4e13fe0f1044d427bb9041dcf5829bfc77fdbeb6874d0b75702f27a5a358d821e0db6154b1f3326ed393f7a1b72781acca5110856b0fffbb5b29736f3
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
deleted file mode 100644
index 73185c6ac198..000000000000
--- a/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="A ZNC module which provides push notifications to Palaver"
-HOMEPAGE="https://github.com/cocodelabs/znc-palaver"
-SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	net-irc/znc:=[ssl]"
-
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/semantic_version[${PYTHON_USEDEP}]
-	')
-"
-
-DOCS=( "CHANGELOG.md" "README.md" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-python310.patch"
-	"${FILESDIR}/${P}-xunit2.patch"
-)
-
-src_compile() {
-	tc-export CXX
-
-	# Building znc modules by 'znc-buildmod'
-	# does not support multiple threads.
-	emake -j1
-}
-
-src_test() {
-	default
-
-	emake test-integration
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/znc
-	doins palaver.so
-
-	einstalldocs
-}
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
index a02f04fc7453..fb325d4797bb 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 773169c87b79..62dcc539d861 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 9b32f80da5ba..9930d29982dd 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -13,6 +13,6 @@ DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12ded
 DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
 EBUILD rsync-3.2.6.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
-EBUILD rsync-3.2.7-r1.ebuild 4904 BLAKE2B b5170be42eed0f82d13b1f584f71ae34e88599719a034ea06cea920e5008ce5c851ca2165dce9d6be81c5296f6c39d4c083a80a9534ed152d46e1469e65d400c SHA512 5ad05d7d45b0e90ef0a7cf99d2bd0c08fc6e77653f60c15b07cbd640832e2fbc160084a107c740ea6e9e4a294e8be0a7ff7ea6fa91c6050fa06f7fc57881c314
+EBUILD rsync-3.2.7-r1.ebuild 4923 BLAKE2B adbc704b1e4d0f786cea18f42be7555384ca252d2271ef492a54e792b79d3d68412ba5100e6c1bd8121b8d114399387a0a8d189b80d5ea66a33723309d320246 SHA512 f5decd86dd7ef1121f7b9972cbf02f00044608ebf8c9116873c1e15be2b187cc9d0fbd88ef162a54880718b847928b6c3e6114137c18634a86b86fe129f445f6
 EBUILD rsync-9999.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
 MISC metadata.xml 880 BLAKE2B b079b9b9cb5dcc93b50d49fa50723729b7c57c34ad0cdfd946821089a1f9788a460818cef8d6a4e9f603ad066f6b3a0c22c7becb950abc1eac8e2923adf18bac SHA512 215f0df65f53e2aca8d519c85111f87e95d592454b8a297f69058c1d87ff5650f32f3c937715c8a83dc9bef1ca1e70589cd3797ca595688806c1067462717c14
diff --git a/net-misc/rsync/rsync-3.2.7-r1.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild
index be57ac763382..9af44ab57907 100644
--- a/net-misc/rsync/rsync-3.2.7-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 854a2aef6544..f0968e7f07ac 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,14 +1,6 @@
-AUX vde-2.3.2-fix-inline-funcs-r1.patch 698 BLAKE2B 131ede6fed47cc8e9835604df3d34cd3c679ba717c81d67d292c9da17e1ce6a652412244f8e113a295bc17f08a525de22782dcb3b95aa8df05d768ec6765dc49 SHA512 2e7b16a7fd7cccbc79ac8f1c64e5e22399bbf219b37626b8c700d22e7f1d3b3250cb32cbfbd592743065bc68443b1b0443dedeb731f917de59a0e2568db6cbf4
-AUX vde-2.3.2-format-security.patch 547 BLAKE2B 757f0008ed24eea80225c9e194584f2320fda48ee21c2ce49a3a500ce0700b1475ece3c3826d2a2f42c0abfab20194214b73071a7422b9a86c9c47ac098844d2 SHA512 05d4ef0c8e45a30ccdf24ce65e7b1ed268f7e8da095d20d8743193eef1018bc11cf13996bde32231739d153af9e4b1828bd2073d862e06ac21e7e64b6945cbf4
-AUX vde-2.3.2-openssl-1.1.patch 2739 BLAKE2B 57062de9d624875255a4bb9a77408a356e8832163ce70bdee5f15884dfe641dcdd3f697d0d57340384f4380836c0867edb27b155249b3a54e4369639d72ca783 SHA512 fe7f549917267e025ccc6417b76af7409002a72d0a1e8133dcfde84ab44e954b9fef7c725bf102f7cdd3c1328da06dfe2fb0b309ea454e2094abdcf95b9cee3f
-AUX vde-2.3.2-slibtool-support.patch 1583 BLAKE2B 6667d3a5d158a72b43576e813405620b387e1ab3f12b8592411e64524a610a7422caa89c37d92565d4946ae6d629c632bc09324e4a3ee79dcd5bee25905eddc3 SHA512 c734000ee5481fb6297d8df39c573624486aafd91491d2fe9aa6f7e714a4dd76dab503f2218d9b67d90bbb89a6b0b6b0df57c685f01b43a2c7c59272d10dc15b
 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df
 AUX vde.init-r1 1021 BLAKE2B cf91532a53a59fb653b3c9c221ce68a4351a40503dedb28e89b5b28b582ec557f48f46aaa5ab5aad2d911ef19802fb3bec820dee79af533faf99aa9992c402f1 SHA512 a89251f3bccc7eb7332cb54d60a0590fd0d6eef556718d650b14da9ca80ef84c22fae0cdf0d89d83de2b616b0b5dac97bbe6551701d2a2df4093a00cb8e1d3fc
-DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde-2.3.3.tar.gz 234790 BLAKE2B e3ed7423edc03a6af09967484613c0e2a701f74a4323eeab720cabe9a899120023425527054662ee1dbd207327b7e6dd375bceb4999fd708666df13c08acf348 SHA512 d0495aa700984dcc82f85cf7c8125cc10505a8a077fceec45b7fd2bec9c389966381682842e886469fa49239badd9442403d091c2ae5282685085e8262396387
-DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
-EBUILD vde-2.3.2-r6.ebuild 1407 BLAKE2B 639dd926dc7bcfde76216470b381cec847f7a7369e18b359d614f8edde3e3570cab2ab6416cc312f316a962d3cfd028a136209a607338b48a6cc318cb367b9c4 SHA512 852218c41c305ab7ae013c674c3b3194fbb03895377e37ef0b203611b8e1f1a68bfa5d6ea5bd5fef16afc82ac0706f431afaa3f98dc421d19dd7f8673585e2ac
-EBUILD vde-2.3.2_p20191011-r1.ebuild 2040 BLAKE2B 270ed469d78196b1134df3ee73af555a5888d8a5299bc517e561f26ee9edc0712f027e293c5dd084a03412c69837f901a2aca5717ad34b8c5988ad9c97699764 SHA512 8d4fbb5b3e8a15489d45e51e89bcbbae88c6d7cc7c22863253561554789306feac589cf2692c7c217d2719a086dcf17571bc88ef667ca5bc153e356e5eb6e69d
 EBUILD vde-2.3.3.ebuild 1700 BLAKE2B 9b97229d3533aff70d9bec3e7c22d3e7562202f16a69d78dc27aab162a8ecb5104119dec4cd7e2b285bf311c010f646f6585f9139ef9c367023b645ad6cce897 SHA512 db3201020aeaa3e8d89cd37356c489d11e69f4b73458931d0336b042e23fa28881a60cd3e9496959e0a3db94670052eee0854edad3730940925b55bcfd0b5fdd
 EBUILD vde-9999.ebuild 1704 BLAKE2B 90c04f4e50be6ab68055c51a2d597bed497faf27ed08adc115712afdd708e0f3d313edab68fc8610107d6ba3640696ceeb3852d47224648ee43020975f7e71f1 SHA512 28b14f637cffc78b76cb1746a6c418aae02df588a4b40f5e2aaaa11bc9af35bee78acda196c366bd08be409709af6eabe918cbab72ccb501e012927955d8a9f8
-MISC metadata.xml 566 BLAKE2B 5f22e7e7ead240023dfa4049c23dab6b7c5a5a2ce264736deb3008d9ea66cf4d6fa022273ca8980e8091402c786e9c4e9d09252bababda1c3d0600cb783dda28 SHA512 d35a52d060009bfae1262fe1a1ada7d0987fb654d8a43322ee3af7e8002290323a600c5f900a2c0a1299349e214b8ee88f37b88f4637cc2d0fe86e1f45bb1403
+MISC metadata.xml 427 BLAKE2B f872d87b52da0551a9041b6c77be20d49c81bf2587d6a655da39552fdb93c3266f8d8b65bd82065023097f85a97845833f06e503c0e92feb0b8d4b56c0c88b84 SHA512 8b42c0e6f59fc77520a581788a470fe183e278cdf41c688d68bcdabba351ad1b283043a57431e907aa98d6678fe7c56e0da682858f1a817c650cf7a6e6c0aa70
diff --git a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch b/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch
deleted file mode 100644
index c1329d0f7207..000000000000
--- a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# Sourced from https://raw.githubusercontent.com/OpenMandrivaAssociation/vde2/master/vd2-2.3.2-clang.patch
-
---- a/src/vde_switch/fstp.c	2014-10-29 22:54:18.659988435 +0000
-+++ b/src/vde_switch/fstp.c	2014-10-29 22:54:44.912986501 +0000
-@@ -30,14 +30,14 @@
- #ifdef FSTP
- #include <fstp.h>
- /*********************** sending macro used by FSTP & Core ******************/
--void inline ltonstring(unsigned long l,unsigned char *s) {
-+void ltonstring(unsigned long l,unsigned char *s) {
- 	s[3]=l; l>>=8;
- 	s[2]=l; l>>=8;
- 	s[1]=l; l>>=8;
- 	s[0]=l;
- }
- 
--unsigned long inline nstringtol(unsigned char *s) {
-+unsigned long nstringtol(unsigned char *s) {
- 	return (s[0]<<24)+(s[1]<<16)+(s[2]<<8)+s[3];
- }
- 
diff --git a/net-misc/vde/files/vde-2.3.2-format-security.patch b/net-misc/vde/files/vde-2.3.2-format-security.patch
deleted file mode 100644
index d1cfaa58cb2f..000000000000
--- a/net-misc/vde/files/vde-2.3.2-format-security.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/common/cmdparse.c	2017-09-20 18:47:31.662856695 -0400
-+++ b/src/common/cmdparse.c	2017-09-20 18:48:54.008852141 -0400
-@@ -284,13 +284,13 @@
- 								int i;
- 								for (i=0;i<argc;i++) {
- 									if (i) fprintf(mf," ");
--									fprintf(mf,argv[i]);
-+									fprintf(mf,"%s",argv[i]);
- 								}
- 							} else {
- 								int num=atoi(t);
- 								while (*t >='0' && *t <= '9') t++;
- 								if (num < argc) 
--									fprintf(mf,argv[num]);
-+									fprintf(mf,"%s",argv[num]);
- 							}
- 						} else
- 							fprintf(mf,"%c",*t);
diff --git a/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch b/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch
deleted file mode 100644
index b490b93350f4..000000000000
--- a/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 5f2c4c7b67617991af65798a4d177ada90f7e463 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Fri, 2 Sep 2016 19:52:49 +0000
-Subject: [PATCH] vde_cryptcab: compile against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
- src/vde_cryptcab/cryptcab.c | 30 +++++++++++++++++++-----------
- 1 file changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/vde_cryptcab/cryptcab.c b/src/vde_cryptcab/cryptcab.c
-index c5b4474..a2780f1 100644
---- a/src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
-+++ b/src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
-@@ -22,7 +22,7 @@
- 	exit(1);
- }
- 	
--static EVP_CIPHER_CTX ctx;
-+static EVP_CIPHER_CTX *ctx;
- static int ctx_initialized = 0;
- static int encryption_disabled = 0;
- static int nfd;
-@@ -30,6 +30,10 @@
- static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
- static int verbose = 0;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#define EVP_CIPHER_CTX_reset(x)	EVP_CIPHER_CTX_cleanup(x)
-+#endif
-+
- void vc_printlog(int priority, const char *format, ...)
- {
- 	va_list arg;
-@@ -103,19 +107,21 @@
- 	}
- 
- 	if (!ctx_initialized) {
--		EVP_CIPHER_CTX_init (&ctx);
-+		ctx = EVP_CIPHER_CTX_new ();
-+		if (!ctx)
-+			return -1;
- 		ctx_initialized = 1;
- 	}
- 	
--	EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
--	if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+	EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+	if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
- 	{
- 		fprintf (stderr,"error in encrypt update\n");
- 		olen = -1;
- 		goto cleanup;
- 	}
- 
--	if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
-+	if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
- 	{
- 		fprintf (stderr,"error in encrypt final\n");
- 		olen = -1;
-@@ -124,7 +130,7 @@
- 	olen += tlen;
- 
- cleanup:
--	EVP_CIPHER_CTX_cleanup(&ctx);	
-+	EVP_CIPHER_CTX_reset(ctx);
- 	return olen;
- }
- 
-@@ -138,19 +144,21 @@
- 	}
- 	
- 	if (!ctx_initialized) {
--		EVP_CIPHER_CTX_init (&ctx);
-+		ctx = EVP_CIPHER_CTX_new ();
-+		if (!ctx)
-+			return -1;
- 		ctx_initialized = 1;
- 	}
- 
--	EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
--	if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+	EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+	if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
- 	{
- 		fprintf (stderr,"error in decrypt update\n");
- 		olen = -1;
- 		goto cleanup;
- 	}
- 
--	if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
-+	if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
- 	{
- 		fprintf (stderr,"error in decrypt final\n");
- 		olen = -1;
-@@ -159,7 +167,7 @@
- 	olen += tlen;
- 
- cleanup:
--	EVP_CIPHER_CTX_cleanup(&ctx);	
-+	EVP_CIPHER_CTX_reset (ctx);
- 	return olen;
- }
- 
diff --git a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
deleted file mode 100644
index 5eeb3a5c9026..000000000000
--- a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d11d9dd8b370016a2d10ffd35c450c9f68e578a5 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 17 Mar 2021 15:14:45 -0700
-Subject: [PATCH] build: Only use -module for libraries.
-
----
- src/vde_l3/Makefile.am     | 9 +++++++--
- src/vde_router/Makefile.am | 2 +-
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/vde_l3/Makefile.am b/src/vde_l3/Makefile.am
-index 748cb78..855081c 100644
---- a/src/vde_l3/Makefile.am
-+++ b/src/vde_l3/Makefile.am
-@@ -1,7 +1,6 @@
--
- moddir = $(pkglibdir)/vde_l3
- 
--AM_LDFLAGS = -module -avoid-version -export-dynamic
-+AM_LDFLAGS = -avoid-version -export-dynamic
- AM_LIBTOOLFLAGS = --tag=disable-static
- AM_CPPFLAGS = -I$(top_srcdir)/include
- 
-@@ -15,6 +14,12 @@ pfifo_la_SOURCES = pfifo.c  vde_buff.h
- tbf_la_SOURCES = tbf.c  vde_buff.h
- bfifo_la_SOURCES = bfifo.c  vde_buff.h
- 
-+vde_l3_lib_LDFLAGS = -module
-+
-+pfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
-+bfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
-+tbf_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
-+
- pfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
- bfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
- tbf_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
-diff --git a/src/vde_router/Makefile.am b/src/vde_router/Makefile.am
-index d872388..d055259 100644
---- a/src/vde_router/Makefile.am
-+++ b/src/vde_router/Makefile.am
-@@ -1,7 +1,7 @@
- 
- moddir = $(pkglibdir)/vde_router
- 
--AM_LDFLAGS = -module -avoid-version -export-dynamic
-+AM_LDFLAGS = -avoid-version -export-dynamic
- AM_LIBTOOLFLAGS = --tag=disable-static
- AM_CPPFLAGS = -I$(top_srcdir)/include
- 
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index 8284456aa7c7..2f9b19bd1a72 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="pcap">
-    Enable the pcap-based plugin that allows creating a switch against
-    a real interface.
-  </flag>
-    <flag name="ssl">
-    Enable the cryptcab plugin that allows creating an encrypted
-    virtual cable.
-  </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">vde</remote-id>
-    <remote-id type="github">virtualsquare/vde-2</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="pcap">Enable the pcap-based plugin that allows creating a switch against a real interface.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">vde</remote-id>
+		<remote-id type="github">virtualsquare/vde-2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/vde/vde-2.3.2-r6.ebuild b/net-misc/vde/vde-2.3.2-r6.ebuild
deleted file mode 100644
index 3e9c368a8f50..000000000000
--- a/net-misc/vde/vde-2.3.2-r6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="https://virtualsquare.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-IUSE="pcap selinux ssl static-libs"
-
-COMMON_DEPS="pcap? ( net-libs/libpcap )
-	ssl? ( dev-libs/openssl:0= )
-	"
-DEPEND="${COMMON_DEPS}"
-RDEPEND="${COMMON_DEPS}
-	acct-group/qemu
-	selinux? ( sec-policy/selinux-vde )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-format-security.patch"
-	"${FILESDIR}/${P}-fix-inline-funcs-r1.patch"
-)
-
-src_prepare() {
-	default
-	has_version ">=dev-libs/openssl-1.1.0" && eapply "${FILESDIR}/${P}-openssl-1.1.patch"
-}
-
-src_configure() {
-	econf \
-		--disable-python \
-		$(use_enable pcap) \
-		$(use_enable ssl cryptcab) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	newinitd "${FILESDIR}"/vde.init-r1 vde
-	newconfd "${FILESDIR}"/vde.conf-r1 vde
-}
-
-pkg_postinst() {
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-}
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
deleted file mode 100644
index f541ec750c2d..000000000000
--- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
-elif [[ ${PV} = *_p* ]]; then
-	inherit autotools
-	MY_PN="vde-2"
-	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
-	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86"
-
-	S="${WORKDIR}/${MY_PN}-${COMMIT}"
-else
-	MY_P="${PN}2-${PV}"
-	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
-HOMEPAGE="https://virtualsquare.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# upstream switched to wolfssl
-IUSE="pcap selinux static-libs"
-
-COMMON_DEPS="pcap? ( net-libs/libpcap )"
-DEPEND="${COMMON_DEPS}"
-RDEPEND="${COMMON_DEPS}
-	acct-group/qemu
-	selinux? ( sec-policy/selinux-vde )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.2-slibtool-support.patch"
-)
-
-# upstream switched to wolfssl
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then
-		eautoreconf
-	fi
-# upstream switched to wolfssl
-#	has_version ">=dev-libs/openssl-1.1.0" && \
-#		eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch"
-}
-
-src_configure() {
-	filter-flags -O0 -Os
-# upstream switched to wolfssl
-#		$(use_enable ssl cryptcab) \
-	econf \
-		--disable-python \
-		--disable-cryptcab \
-		$(use_enable pcap) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# https://github.com/virtualsquare/vde-2/issues/6
-	emake -j1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	newinitd "${FILESDIR}"/vde.init-r1 vde
-	newconfd "${FILESDIR}"/vde.conf-r1 vde
-}
-
-pkg_postinst() {
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 7c8d19dec08d..6c1803524281 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index be2115298dc2..ff24841ad22d 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -7,4 +7,4 @@ EBUILD libreswan-4.6-r1.ebuild 3449 BLAKE2B b23a90826a32e9453ac56ca73905d61ce216
 EBUILD libreswan-4.7.ebuild 3449 BLAKE2B b23a90826a32e9453ac56ca73905d61ce216d3e12ca5c96cab2fb0787495065b0540a231c53e6ac46a83b7553496d3a6525aca4556f79716d98e421610a1e4b0 SHA512 dc7c642e0204bd0449323a214a1ae0a5acc46f103d4755b49ccee68c6c64b65bd70ad0917ef85536fece3fe7fca8486a4fea1b226bcfd31e47cfe478d66abbbd
 EBUILD libreswan-4.8.ebuild 3451 BLAKE2B c0a2a7e846fefec360605416c46fb7788cb3c597cf4d8b171cd8f9e526c0abb6929b0551c19531c7953df117175508d87e708d2f660f4554a805e7b90f8f2812 SHA512 61af4e0f024b08834cb895cd695995b0afa06cbe139a23e7a2ad343fe4f4a2e3fefc7eab50a6bcfe731ab765b02063be9c0b24e0d48587cc526b77b00cc8108b
 EBUILD libreswan-4.9.ebuild 3451 BLAKE2B c0a2a7e846fefec360605416c46fb7788cb3c597cf4d8b171cd8f9e526c0abb6929b0551c19531c7953df117175508d87e708d2f660f4554a805e7b90f8f2812 SHA512 61af4e0f024b08834cb895cd695995b0afa06cbe139a23e7a2ad343fe4f4a2e3fefc7eab50a6bcfe731ab765b02063be9c0b24e0d48587cc526b77b00cc8108b
-MISC metadata.xml 320 BLAKE2B 0c27b16d57b404aa7307e58f0fe31a368595acf482fca1efcb5f2ebf3b98487cbe9f77b10862820443c2dc13d98664bf4bf5944abf9ca5dec393af2e1eb19668 SHA512 b313c55f0d9de7f3ff3d5a8fb7b0d010b3240388fb0b808b7108c7d2f43d926896a13e64ac365bf4a6156d429857c99809f0d034298b2bb6e55c4b0bc56e36ab
+MISC metadata.xml 404 BLAKE2B f1ff60cd5478c1733d76593cd0973609ce894c1cdf7d9086259bb1d988a7877a06762da95d872466633353d08b99f9c531ee65708593a8ada551cb96630ce4b7 SHA512 bf2ceacf48e75dec7f9ae83c9442b27a27b62bb89a5533f636f2032fcd765357c9892897145c6a05d6ad14855986a7c4bc15b79f99bdbd23cf9b8f2868a8f394
diff --git a/net-vpn/libreswan/metadata.xml b/net-vpn/libreswan/metadata.xml
index a3fb4b3d5c15..ee9c662fbe16 100644
--- a/net-vpn/libreswan/metadata.xml
+++ b/net-vpn/libreswan/metadata.xml
@@ -7,4 +7,7 @@
 	<use>
 		<flag name="dnssec">Use DNSSEC resolver (requires <pkg>net-dns/unbound</pkg>)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">libreswan/libreswan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ddf2c7860013..2030ca9b3312 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index e3aefef4ece9..a73e5c8b471f 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Yixun Lan <dlan@gentoo.org> (2022-11-24)
+# depend on dev-libs/libpcre2[jit] which not supported yet, bug #879511
+www-servers/varnish jit
+
 # Sam James <sam@gentoo.org> (2022-10-29)
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
diff --git a/profiles/default/linux/mips/17.0/mipsel/n32/systemd/eapi b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/mips/17.0/mipsel/n32/systemd/parent b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/17.0/n32/systemd/eapi b/profiles/default/linux/mips/17.0/n32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/mips/17.0/n32/systemd/parent b/profiles/default/linux/mips/17.0/n32/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/17.0/n64/systemd/eapi b/profiles/default/linux/mips/17.0/n64/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n64/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/mips/17.0/n64/systemd/parent b/profiles/default/linux/mips/17.0/n64/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n64/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/package.mask b/profiles/package.mask
index 577611f5f402..63d874e654fe 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,6 +34,18 @@
 #--- END OF EXAMPLES ---
 
 # Michał Górny <mgorny@gentoo.org> (2022-11-23)
+# Unpredictable build failures reported.  No revdeps left.
+# dev-libs/opencl-icd-loader is a good replacement.
+# Removal on 2022-12-23.  Bug #733018.
+dev-libs/ocl-icd
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-23)
+# Unattended by maintainer since 2013.  Pending major version bump.
+# Build and test failures reported.
+# Removal on 2022-12-23.  Bug #870670.
+dev-lang/open-cobol
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-23)
 # Packages with no maintainer and major issues reported.
 #
 # app-cdr/xbiso: bug #882089, last release in 2005
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 36158072835e..2e8b948e72c8 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -195,7 +195,11 @@ mips		default/linux/mips/17.0/o32					exp
 mips		default/linux/mips/17.0/o32/systemd				exp
 mips		default/linux/mips/17.0/o32/systemd/merged-usr			exp
 mips		default/linux/mips/17.0/n32					exp
+mips		default/linux/mips/17.0/n32/systemd				exp
+mips		default/linux/mips/17.0/n32/systemd/merged-usr			exp
 mips		default/linux/mips/17.0/n64					exp
+mips		default/linux/mips/17.0/n64/systemd				exp
+mips		default/linux/mips/17.0/n64/systemd/merged-usr			exp
 mips		default/linux/mips/17.0/multilib/o32				exp
 mips		default/linux/mips/17.0/multilib/n32				exp
 mips		default/linux/mips/17.0/multilib/n64				exp
@@ -203,6 +207,8 @@ mips		default/linux/mips/17.0/mipsel/o32				exp
 mips		default/linux/mips/17.0/mipsel/o32/systemd			exp
 mips		default/linux/mips/17.0/mipsel/o32/systemd/merged-usr		exp
 mips		default/linux/mips/17.0/mipsel/n32				exp
+mips		default/linux/mips/17.0/mipsel/n32/systemd			exp
+mips		default/linux/mips/17.0/mipsel/n32/systemd/merged-usr		exp
 mips		default/linux/mips/17.0/mipsel/n64				exp
 mips		default/linux/mips/17.0/mipsel/n64/systemd			exp
 mips		default/linux/mips/17.0/mipsel/n64/systemd/merged-usr		exp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a640ab80c239..ebd8340a08aa 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6659,7 +6659,6 @@ net-misc/tigervnc:drm - Build with DRM support
 net-misc/tigervnc:server - Build TigerVNC server
 net-misc/uftp:server - Install uftp server daemon
 net-misc/vde:pcap - Enable the pcap-based plugin that allows creating a switch against a real interface.
-net-misc/vde:ssl - Enable the cryptcab plugin that allows creating an encrypted virtual cable.
 net-misc/wget:cookie-check - Enable cookie checks via net-libs/libpsl
 net-misc/wget:metalink - Enable support for media-libs/libmetalink
 net-misc/wget:ntlm - Enable support for NTLM (Windows-based) authorization
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a2f469d46c1c..468d140b3ad6 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 10f51846ec25..46916fd4d68e 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -2,16 +2,12 @@ AUX miopen-4.2.0-disable-no-inline-boost.patch 447 BLAKE2B ed62e94b4a557c06654ec
 AUX miopen-4.2.0-gcc11-numeric_limits.patch 461 BLAKE2B 4502c7dc41e0e4ebf4105076c4415ce36e56e596bf98672ecf3d77de4a984499be0990a762c2b05d5e395a06c7df511c9f7629362c7849b31a0d2868b45d99d0 SHA512 04ce10c55af9b979651ef0c345bd12156c850139809601f29ab9305235499b53034efe1928a6dbb77d04114ddf8d93c71d37cc7bef373b07620c2169f88aebc3
 AUX miopen-4.3.0-enable-test.patch 1046 BLAKE2B a9a103eee9b3b6890c02349f36dba7c4cc4459969ebe07915d0cccd3aecbd0edab21de8acbdaee17daae602733965ec1bdda60456f2e0c6bd91ae9795c24622e SHA512 cadc3844aaa32713f0d630ae3ffb9a947c303cf80410785339187ad0ee3cce8bac1b201c12134ba0241c54c296e2752a1076a3826735ccfe4d2cf5f15504f390
 AUX miopen-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch 954 BLAKE2B 11f260c1ab9dd1569cf25363626e6431615f8853f334b0123d82b0e3404dcdb1b4ecd9e26658e2f39e4fa6a15ba672cb6940b0279e0ef22535e46992721fd060 SHA512 28724e7e1c1de5cee2d18b6c3da76fa857f95aee64a286262c8426149787f62d07f4a3892472cef91d3c091ec53c7f474a70616ce63e5fbbb4c531ed2ab91a50
-AUX miopen-5.0.2-gfx1031.patch 11488 BLAKE2B 25b3136015309e8a06de6fcac7864f90d146beb50674db9810ed568b1ff1e8a761bf3a2a96f74ca4e215c1c670df0fcf09bb60c51d54122a063c8c8ee4059ebf SHA512 ebc1fb32aeef147366440e4ded002a833cc2f7b621b5cb2059ec5b3cc5786167c3f5955d04b0e6e3d9cfab86fe6f414e2e74a15db0090429fd97be3671c7445c
-AUX miopen-5.0.2-no-strip.patch 670 BLAKE2B 20a9c14b5df7d1d964ade240fc5c77ff3d119bded10f3b60e6bb17b98db116d3b7e954a6fb9ff6b5bf47243ca0e2c6160e63f27113a0663ee62eeac438c50f8d SHA512 342238b750bdf8210ccb6fc2e4839ce8d236efeec8bbf23b8fb70b0e31027aac39a8f443f0a38835d59365bc9d55bb0ecb210695c9c6488cd8e765c42754b674
 AUX miopen-5.0.2-strip-xnack-in-flags.patch 1205 BLAKE2B d1ba065387050b51288dba37631adea42398b2f7cd8b604e5c305d3491fb661dce8c448e31db42c70f8b6e4dec84c4214ce869dd1419eb67c2ea4c33f18849b5 SHA512 ad32335831c7d1057b53469aa2d1f8f3366b23ccdc71cb7e9a4e7813e7da7e9bb73e62465f1086391653538ccbab2f662baf2446e10e8dbc0f0db631d7368a4d
 AUX miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch 10748 BLAKE2B 582b362a54d9ee00c8f6062b4ec16bebdaea7734adadcd5f6201801cb8ce3a7ca64e8148a10f2f3ab682560ced1f037b217bdcd161869d80a8489f4d56bd5241 SHA512 08cd489d23a48d0b227dacc514e3f84999c1e9a0ac3dd5424d9376c77c4d745c65f48c0f470cb5e65c20e9dbbfcb457995301a74bfe27a81604bf89213a2f1d2
 AUX miopen-5.1.3-deprecate-clang-ocl.patch 2884 BLAKE2B 4f45f66d87dea51d9f87878f52520863b36defa1403055a580e5f33c18e3de08daad1b3d3d5fad06d7d3f16da4f0945390872f573f168d1893f5f635070f1463 SHA512 c4835559a4005ffd2aac7afb38213d06857ab1a8d4bc5bd5c150b82226671fb1d66c6ef1d4eab2106ad11c475007af441182ca26f659a3fd779cd7d4f5c90247
 AUX miopen-5.1.3-gfx1031.patch 19268 BLAKE2B b3d10c57601fd5f39ae431d101687863de34b149ee08df25c987d18ef0bd89d8419a4a18659a22060093eba1cf97c2774e92abf8a38449a202e8770070b29dbf SHA512 44fb3445065087a3952ac143fba88addb4cc634dbd13e15d85d234c64fabba9cf7b83d8161a361e847375a2bc92efc86489e12cfa23ecce1b035d2ccb028db56
 AUX miopen-5.1.3-include-array.patch 343 BLAKE2B 993a8f3e301f4c16088ca216b2d820b17ceb42eeda4550b4291a70e00592281f992bf184407d024a0f8b2207a26fef2d56c26ef95e7a452d3b97090e1335a404 SHA512 887ac13f25c1bfd524bb2a3be701bf688f002a95ef8218cb798e41feaeb0678dbbd2ffaf905c59070a125001093bf5ede1bb6a77fdfe6f7a4ff19cbccfdc6624
 AUX miopen-5.1.3-no-strip.patch 608 BLAKE2B 3173d95219542a48c6dcd2b87e7157dcf483ff714c3d1c1c47aab8fc8af7b1fd4f6ac52b9d8e892cc25bff973597f4a05426fa4714b0764733b810867af59cfe SHA512 201357718203ee9a4062362541c483e069321b825708c6aa0e8892cc7722bcd520808797307e320df34c4fbf0003198f7a46717d5ff3819b1e2c3a5a3a045725
-DIST MIOpen-5.0.2.tar.gz 76294827 BLAKE2B 7b2a1f0e675793aee4a0fa2a270caac8332cda36c8f04cee483cc2882ed987b6e676e9c24a1acf4976a16a10f922b1a6263470b419aa88a29cfcb6d6d4b4cc29 SHA512 a581b45220797904db3e4dd3840f2ef96085f00baf8187c5ab574325a66da4f599dee6496457bb1cc32825b57a13fb0ef35a2ef1bd2a5f449c7e7b9fa64b27d1
 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
-EBUILD miopen-5.0.2.ebuild 2221 BLAKE2B affa8b448a9b67b91921c1fd1390ecece736fb12e40bf24f614b8460d88134810dae2136fc74a5eae1adcf41f8bfd761354679871d834fd340051745ba449ad4 SHA512 3b3197f2b73ba51e8bf095f35d7e4c11e7baefb9de74c67153c99ab1ce0c589f425a3ee40e1779e1c35eaffdbbb69b02e7ee6af0757684f8e4478647015b5250
 EBUILD miopen-5.1.3-r1.ebuild 3130 BLAKE2B 207d459d970a54b75422191bb0b649593db96b8e8a4fd857a2086fb7eed911ee39654775455a77968d4404a443737b655485c51c0f6535571b0e291e1a0e5a87 SHA512 614a3b82edd2d07eb28a74e655d6c3d1095c813e0c892cc4688fd171648af1889adf2e2b663c063eb910a13ba7dfc9ec9d6952aee0d7990cdfba4c1139513200
 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch b/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch
deleted file mode 100644
index 15ac67bd3cef..000000000000
--- a/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-Index: MIOpen-rocm-5.0.2/src/include/miopen/solver/implicitgemm_util.hpp
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/include/miopen/solver/implicitgemm_util.hpp
-+++ MIOpen-rocm-5.0.2/src/include/miopen/solver/implicitgemm_util.hpp
-@@ -478,7 +478,7 @@ static inline bool is_use_amd_buffer_loa
- {
- #if WORKAROUND_MIOPEN_ISSUE_557
-     const auto device_name = ctx.GetStream().GetDeviceName();
--    return !StartsWith(device_name, "gfx1030");
-+    return !StartsWith(device_name, "gfx1030") && !StartsWith(device_name, "gfx1031");
- #else
-     return true;
- #endif
-@@ -487,7 +487,7 @@ static inline bool is_use_amd_buffer_loa
- static inline bool is_use_v_fmac_f32(const ConvolutionContext& ctx)
- {
-     const auto device_name = ctx.GetStream().GetDeviceName();
--    return StartsWith(device_name, "gfx1030");
-+    return StartsWith(device_name, "gfx1030") || StartsWith(device_name, "gfx1031");
- }
- 
- static inline bool support_amd_buffer_atomic_fadd(const std::string& device_name)
-@@ -608,7 +608,8 @@ static inline bool IsComposableKernelSup
-            StartsWith(c.GetStream().GetDeviceName(), "gfx906") ||
-            StartsWith(c.GetStream().GetDeviceName(), "gfx908") ||
-            StartsWith(c.GetStream().GetDeviceName(), "gfx90a") ||
--           StartsWith(c.GetStream().GetDeviceName(), "gfx1030");
-+           StartsWith(c.GetStream().GetDeviceName(), "gfx1030")||
-+           StartsWith(c.GetStream().GetDeviceName(), "gfx1031");
- }
- 
- // greatest common divisor, aka highest common factor
-Index: MIOpen-rocm-5.0.2/src/kernels/batchnorm_functions.h
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/kernels/batchnorm_functions.h
-+++ MIOpen-rocm-5.0.2/src/kernels/batchnorm_functions.h
-@@ -159,6 +159,10 @@
- #define MIO_BN_GFX1030 0
- #endif
- 
-+#ifndef MIO_BN_GFX1031
-+#define MIO_BN_GFX1031 0
-+#endif
-+
- #define UNUSED __attribute__((__unused__))
- 
- #if(MIO_BN_VARIANT != 4)
-Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdPerAct.cl
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivBwdPerAct.cl
-+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdPerAct.cl
-@@ -34,7 +34,7 @@
- #endif
- 
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
-Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdSpatial.cl
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivBwdSpatial.cl
-+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdSpatial.cl
-@@ -32,7 +32,7 @@
- #endif
- 
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
-Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl
-+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl
-@@ -33,7 +33,7 @@
- #endif
- 
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
-Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormBwdSpatial.cl
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormBwdSpatial.cl
-+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormBwdSpatial.cl
-@@ -33,7 +33,7 @@
- #endif
- 
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
-Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl
-+++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl
-@@ -33,7 +33,7 @@
- #endif
- 
- #define MIOPEN_USE_AMDGCN 0
--#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
-+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
- #undef MIOPEN_USE_AMDGCN
- #define MIOPEN_USE_AMDGCN 1
- #endif
-Index: MIOpen-rocm-5.0.2/src/md_graph.cpp
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/md_graph.cpp
-+++ MIOpen-rocm-5.0.2/src/md_graph.cpp
-@@ -738,8 +738,8 @@ void FusionMDGraph::InitConv(FusionMDGra
- 
-             add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 1);
-             add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 2);
--            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 1);
--            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 2);
-+            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 1);
-+            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 2);
-         }
-     }
- 
-Index: MIOpen-rocm-5.0.2/src/ocl/fusionopbiasbnactivocl.cpp
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/ocl/fusionopbiasbnactivocl.cpp
-+++ MIOpen-rocm-5.0.2/src/ocl/fusionopbiasbnactivocl.cpp
-@@ -392,7 +392,8 @@ miopenStatus_t BatchNormBwdTrainFusionOp
-            " -DMIO_BN_USESAVED=" + std::to_string(static_cast<int>(true)) +
-            " -DMIO_BN_VARIANT=" + std::to_string(variant) +
-            " -DMIO_BN_CBA_WRITE_INTERMEDIATE=" + std::to_string(0) +
--           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
-+           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
-+           " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
- 
-     compile_config += add;
-     MIOPEN_LOG_I2(add);
-@@ -607,7 +608,8 @@ miopenStatus_t BatchNormFwdTrainFusionOp
-            " -DMIO_SAVE_MEAN_VARIANCE=" + (saveBatchStats ? "1" : "0") +
-            " -DMIO_RUNNING_RESULT=" + ((savePopStats) ? "1" : "0") +
-            " -DMIO_BN_VARIANT=" + std::to_string(variant) +
--           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
-+           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
-+           " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
- 
-     compile_config += add;
-     MIOPEN_LOG_I2(add);
-Index: MIOpen-rocm-5.0.2/src/target_properties.cpp
-===================================================================
---- MIOpen-rocm-5.0.2.orig/src/target_properties.cpp
-+++ MIOpen-rocm-5.0.2/src/target_properties.cpp
-@@ -54,6 +54,7 @@ static std::string GetDeviceNameFromMap(
-         {"Vega10", "gfx900"},
-         {"gfx901", "gfx900"},
-         {"10.3.0 Sienna_Cichlid 18", "gfx1030"},
-+        {"10.3.1 Navi_flounder 18", "gfx1031"},
-     };
- 
-     const char* const p_asciz = miopen::GetStringEnv(MIOPEN_DEBUG_ENFORCE_DEVICE{});
-Index: MIOpen-rocm-5.0.2/test/CMakeLists.txt
-===================================================================
---- MIOpen-rocm-5.0.2.orig/test/CMakeLists.txt
-+++ MIOpen-rocm-5.0.2/test/CMakeLists.txt
-@@ -37,6 +37,7 @@ option( MIOPEN_TEST_GFX908 "Test on MI10
- option( MIOPEN_TEST_GFX90A "Test on gfx90a" OFF )
- option( MIOPEN_TEST_VEGA "Test on Vega10/20 (gfx900, gfx906)" OFF )
- option( MIOPEN_TEST_GFX1030 "Test on Navi21 (gfx1030)" OFF )
-+option( MIOPEN_TEST_GFX1031 "Test on Navi21 (gfx1031)" OFF )
- option( MIOPEN_TEST_GPU_XNACK_ENABLED "Test as if XNACK mode is enabled" OFF )
- option( MIOPEN_TEST_CONV Off)
- option( MIOPEN_TEST_DEEPBENCH Off)
-@@ -74,7 +75,7 @@ endif()
- # Also we do not detect GPU when target GPU for testing is specified explicitly.
- set(MIOPEN_TEST_GPU_DETECTION_FAILED FALSE)
- set(MIOPEN_NO_GPU FALSE)
--if(NOT (MIOPEN_TEST_VEGA OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_HIP_NOGPU))
-+if(NOT (MIOPEN_TEST_VEGA OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 OR MIOPEN_TEST_HIP_NOGPU))
-     find_program(ROCMINFO
-         NAMES rocminfo
-         PATHS
-@@ -96,6 +97,8 @@ if(NOT (MIOPEN_TEST_VEGA OR MIOPEN_TEST_
-         elseif (NOT ROCMINFO_EXIT_STATUS EQUAL 0)
-             message(WARNING "ROCMINFO FAILED, GPU TYPE UNKNOWN. Manually set respective MIOPEN_TEST_GFX* CMake variable to specify target GPU for testing.")
-             set(MIOPEN_TEST_GPU_DETECTION_FAILED TRUE)
-+        elseif(ROCMINFO_OUTPUT MATCHES "gfx1031")
-+            set(MIOPEN_TEST_GFX1031 ON)
-         elseif(ROCMINFO_OUTPUT MATCHES "gfx1030")
-             set(MIOPEN_TEST_GFX1030 ON)
-         elseif(ROCMINFO_OUTPUT MATCHES "gfx900|gfx906")
-@@ -122,6 +125,7 @@ message(STATUS "MIOPEN_TEST_VEGA ${MIOPE
- message(STATUS "MIOPEN_TEST_GFX908 ${MIOPEN_TEST_GFX908}")
- message(STATUS "MIOPEN_TEST_GFX90A ${MIOPEN_TEST_GFX90A}")
- message(STATUS "MIOPEN_TEST_GFX1030 ${MIOPEN_TEST_GFX1030}")
-+message(STATUS "MIOPEN_TEST_GFX1031 ${MIOPEN_TEST_GFX1031}")
- message(STATUS "MIOPEN_TEST_GPU_XNACK_ENABLED ${MIOPEN_TEST_GPU_XNACK_ENABLED}")
- message(STATUS "MIOPEN_TEST_GPU_DETECTION_FAILED ${MIOPEN_TEST_GPU_DETECTION_FAILED}")
- 
-@@ -164,10 +168,10 @@ endmacro()
- set_var_to_condition(WORKAROUND_ISSUE_1187_DEFAULT MIOPEN_TEST_GFX90A AND MIOPEN_TEST_FLOAT)
- option( WORKAROUND_ISSUE_1187 "" ${WORKAROUND_ISSUE_1187_DEFAULT})
- 
--set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
-+set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
- option( WORKAROUND_ISSUE_1148 "" ${WORKAROUND_ISSUE_1148_DEFAULT})
- 
--set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
-+set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
- option( WORKAROUND_ISSUE_1334 "" ${WORKAROUND_ISSUE_1334_DEFAULT})
- 
- set_var_to_condition(WORKAROUND_ISSUE_1317_DEFAULT MIOPEN_TEST_OPENCL)
-@@ -216,7 +220,7 @@ if (MIOPEN_NO_GPU)
-             test_pooling3d test_perfdb)
- endif()
- 
--if(MIOPEN_TEST_GFX1030)
-+if(MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031)
-     if(WORKAROUND_ISSUE_1053 AND MIOPEN_TEST_ALL)
-         list(APPEND SKIP_TESTS test_lrn_test)
-     endif()
-@@ -443,7 +447,7 @@ endfunction()
- #   If nothing is specified, the default value is taken.
- #   Default: FLOAT_ENABLED HALF_DISABLED BF16_DISABLED INT8_DISABLED
- #
--# GPU types: VEGA, GFX908, GFX90A, GFX1030
-+# GPU types: VEGA, GFX908, GFX90A, GFX1030, GFX1031
- #   VEGA tests are intended to be run on gfx900 or gfx906.
- #   The option can be enabled or disabled by using '_ENABLED' and '_DISABLED' suffix.
- #   If nothing is specified, the default value is taken.
-@@ -574,7 +578,7 @@ function(add_custom_test NAME)
-         set_tests_properties(${NAME} PROPERTIES RUN_SERIAL On)
-     endif()
- 
--    if(  (is_vega_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx90a_check)
-+	if(  (is_vega_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx1031_check OR is_gfx90a_check)
-      AND is_full_check
-      AND is_xnack_on_check
-      AND (is_miotensile_check AND is_mlir_check)
diff --git a/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch b/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch
deleted file mode 100644
index a7be67e99578..000000000000
--- a/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Don't strip for release. Let portage handle stripping.
-Index: MIOpen-rocm-5.0.2/CMakeLists.txt
-===================================================================
---- MIOpen-rocm-5.0.2.orig/CMakeLists.txt
-+++ MIOpen-rocm-5.0.2/CMakeLists.txt
-@@ -78,12 +78,6 @@ option( BUILD_DEV "Build for development
- option(MIOPEN_ENABLE_FIN "Enable the fin driver for MIOpen"  OFF)
- 
- 
--# Strip symbols for release
--if(NOT WIN32 AND NOT APPLE)
--    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
--    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
--endif()
--
- rocm_setup_version(VERSION 2.15.0)
- 
- list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
diff --git a/sci-libs/miopen/miopen-5.0.2.ebuild b/sci-libs/miopen/miopen-5.0.2.ebuild
deleted file mode 100644
index 10be8feadaf5..000000000000
--- a/sci-libs/miopen/miopen-5.0.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=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="AMD's Machine Intelligence Library"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/MIOpen"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/hip
-	>=dev-db/sqlite-3.17
-	dev-libs/ocl-icd
-	dev-util/rocm-clang-ocl:${SLOT}
-	sci-libs/rocBLAS:${SLOT}
-	dev-libs/boost
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-libs/half:0/1"
-
-S="${WORKDIR}/MIOpen-rocm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-disable-no-inline-boost.patch"
-	"${FILESDIR}/${PN}-4.2.0-gcc11-numeric_limits.patch"
-	"${FILESDIR}/${PN}-5.0.2-strip-xnack-in-flags.patch"
-	"${FILESDIR}/${PN}-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch"
-	"${FILESDIR}/${PN}-4.3.0-enable-test.patch"
-	"${FILESDIR}/${PN}-5.0.2-no-strip.patch"
-	"${FILESDIR}/${PN}-5.0.2-gfx1031.patch"
-)
-
-src_prepare() {
-	sed -e "s:/opt/rocm/llvm:""${EPREFIX}""/usr/lib/llvm/roc/ NO_DEFAULT_PATH:" \
-		-e "s:/opt/rocm/hip:""${EPREFIX}""/usr/lib/hip/ NO_DEFAULT_PATH:" \
-		-e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \
-		-e '/MIOPEN_TIDY_ERRORS ALL/d' \
-		-i CMakeLists.txt || die
-
-	sed -e "/rocm_install_symlink_subdir(\${MIOPEN_INSTALL_DIR})/d" -i src/CMakeLists.txt || die
-	sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" -i test/CMakeLists.txt || die
-
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i cmake/hip-config.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	if ! use debug; then
-		append-cflags "-DNDEBUG"
-		append-cxxflags "-DNDEBUG"
-		CMAKE_BUILD_TYPE="Release"
-	else
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	export CXX="${EPREFIX}/usr/lib/llvm/roc/bin/clang++"
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DMIOPEN_BACKEND=HIP
-		-DBoost_USE_STATIC_LIBS=OFF
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DMIOPEN_TEST_ALL=$(usex test ON OFF)
-		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index b697a8992b10..090194d47f9e 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -10,4 +10,4 @@ AUX mkl-static-lp64-iomp.pc 342 BLAKE2B eddd6bba13426762a47a306469613e2010f5882b
 AUX mkl-static-lp64-seq.pc 331 BLAKE2B 5c234425fff2462f668fc8dd681a9c3d6d1c4e39f73ec4e5cb984eeeede1f84907ffcba3066b81912b7e8712d2dc154af5703d19d085b0f5a5fa3ab0290f2457 SHA512 b828a7513a491e852c65922159333418be026497d4b0b8b456607463af8b0d71da910e0eb4cd915f5a7eb1d0ff959c87bfc443df352f1f84ce9006530dd0af7f
 DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
 EBUILD mkl-2020.4.304.ebuild 6674 BLAKE2B abe1ed5d32ba1114aee0aa33c4b0259f1ce6f241dbfc146f344903ea5d815e81b4059a54df0ab2b934b3dd672f1471666565989981ed54bbf15283411e7bd8c1 SHA512 3deaa4858df6b8ddb58755ddcbfd62d11ea98af5b38597cfa916b80cf59b23fe043dd667b9b6c2f1d458545579002f07d375a484e0896aa7f6ef5572021baeae
-MISC metadata.xml 717 BLAKE2B 1e0c641fb3f818df9d2e952257722cf152e6978c6dd60203228031d5b040243b2a556c4b73daf74676b9152333389fe16d70a345c0f8b2d1527a040e0c14bf65 SHA512 c179f78da3f14f7859cc316248664c7beadb6344a5c7083533c5a3d9d564072fac3feebf9a7cb3506f7856c8d231b7b343882f41f6becd2c3a0164d7c08e909c
+MISC metadata.xml 799 BLAKE2B 98a214e275d4d4930086f0dd1695c4d5dfd44da3399f77cc1f839e403423050c6d20f7b38892bd9ff96e5e8578a4c83ff8979e6505dfb67417c6dbb40fe59500 SHA512 3b609c66ec90f057cb16c6721e6a5bfd6a3522a1ff2bba47e2a77212e26f06fb850be8b178a0a2020f751882ddd32fda082879c7f5a9b008c041ce493f55d28a
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 07376226d866..1c12a7532045 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -13,4 +13,7 @@
 		capacities. The package is installed as binary and has a restrictive
 		license. Please see license terms and home page for proper use.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">oneapi-src/oneMKL</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ab4a84b793bf..ef4c279f785f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 38516b807e54..a4b3af76d16f 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,15 +1,11 @@
-AUX octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch 199 BLAKE2B 36c7f66c0fba3387dcbc027dc60370f1526e0f5bd42c4a24ed031745f6fdf6ff3860909dc2462b6577db30b8b47ec301299ccd3584fbb99d1b1b205c8f46e0b6 SHA512 e9984fe54b7b4c49783f5f7559d24e9f1076b47ff8c0ec2751dda2e96c1f84ad48f03a760fd4d8b87fba021174237bc7f19c75ba7f33e84bce6def6318184e7d
 AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c52f54e105f209edf79c869e6ce253a9cec7a3373a8dd0c98196ba3271f9b2b066ad3de3784151072055f2319ebbb4d1b68a475 SHA512 d2d6fe57a11f0493f86378bc4e1fc71378ae6d1878d17a367b77aa16a29880e37134e61343ba081f7ab2c4d127d93611491bef1320d6cd202eff0d78681cd4cc
-AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 AUX octave-6.4.0-omit-qtchooser-qtver.patch 765 BLAKE2B 2f889e8278e48489f2eab1c399b0bf7af26be7f79e35c29fc2963124852067429f7ee25325402ad6983c047398a5c43c2d9f44d3a96e5c3db49282f826ecab82 SHA512 a1edd69d06aadd5c9772b12f32468bcd25b181883d3c303cd5ff58175e95021ed661d363137002a50073ec9c90564442c8b968ea1a3ad6fe56a80cf27e2efc3a
 AUX octave-6.4.0-slibtool.patch 1416 BLAKE2B e4b487481490b41a4da499bb5eceff0f6a25a7e25d4f6c76088c3703259ab4899a354b0cf67eecb989bf4c4c05836be09881cce72145b3badca1393bd386a85f SHA512 cac0d183b3c555a25db37df250b2517ae4b762b7bc0d65ba0cb1093133f6f7ada42f6745b060d17f59c2177976841dafabcda61cf03d9cd14028399472f28ed7
 AUX octave-7.3.0-docs-texinfo-7.0.patch 1623 BLAKE2B 36a6ceda753083171ece9e4045af8551121f7073901d9f32facfd6c2bb88a10226f5aa719a79e8677c7a0cb7f26a226f2da190d9b4281b3fd666f570af3ac761 SHA512 0ac71393c59681a2188316356235ddb876e5c7cbf4a2ff1752bd3dddde7babeb456e0619ed65e32d5048d754416fb33c949aa0979748f7282e3e9d2589931612
-DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
-EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.4.0-r3.ebuild 6043 BLAKE2B a99d2325249cbd29bcc3b00e734b28f7de4b61025f8f2133d5b7c53ad7bbb14bdbbd068ac204e3f7af80143c3797ec97688487b70361f8966dffd06569b3612d SHA512 559c07c35ecc7011e0f44a23fb2ad392a1562221f7218c0b5d89a2a9a2dd60e9f68e9cf3345b226d572d5da85d63cbe051643363bc9e1896ce4820817317f605
 EBUILD octave-6.4.0-r4.ebuild 6031 BLAKE2B 30bbe11d7ac6fea759463681cfc49a5779cec4eb99aaf5917bf9d8955bc03d63ec6e7c45b8589a54e7ca79dfe302ee60f6f20ab8a667c3a2ebb2d5d9e5e6bc56 SHA512 dcf58e44d24a894d18b2478727f970ac39f81ccd38947147dabc3f88ba8e637b6d783b136073bc2a5d4155b065d387e3f183131bc838a98c1a52bb6274c6bad1
 EBUILD octave-7.2.0-r1.ebuild 5527 BLAKE2B 799a3175791ed82cc0f46bca34f6280a5b51b0e42381e627b748f195fa965a84fda6f562d8c6e6a20b3074a225d87a9b5ab1f8ba41b8978d3187d14df569ba0e SHA512 cfa3e263ce589e39b47b5c9240c63fe006a8751b81bf03850dc91848965fb46bc67db069550e86db5a4f3bc653ae7ab7744930753bbfbcfbcbde3efa91b4e5a0
diff --git a/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch b/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
deleted file mode 100644
index f6fa7be3b28f..000000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/getcwd.m4
-+++ b/m4/getcwd.m4
-@@ -110,7 +110,7 @@
- 
-   gl_abort_bug=no
-   case "$host_os" in
--    mingw*)
-+    *-gnu* | gnu* | mingw*)
-       gl_cv_func_getcwd_path_max=yes
-       ;;
-     *)
diff --git a/sci-mathematics/octave/files/octave-4.4.0-texi.patch b/sci-mathematics/octave/files/octave-4.4.0-texi.patch
deleted file mode 100644
index 90ffa5361bf7..000000000000
--- a/sci-mathematics/octave/files/octave-4.4.0-texi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/interpreter/module.mk	2018-04-30 19:03:56.000000000 +0200
-+++ a/doc/interpreter/module.mk.new	2018-05-22 12:17:03.587175816 +0200
-@@ -368,6 +368,8 @@
- 	$(AWK) -f $(srcdir)/%reldir%/mkcontrib.awk $(srcdir)/%reldir%/contributors.in > $@-t && \
- 	mv $@-t $@
- 
-+%reldir%/preface.texi: %reldir%/contributors.texi
-+
- AUTHORS: %reldir%/preface.texi %reldir%/contributors.texi | %reldir%/$(octave_dirstamp)
- 	$(AM_V_MAKEINFO)rm -f $@-t $@ && \
- 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/%reldir%/contributors.texi ] && [ ! -f %reldir%/contributors.texi ]; then \
diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild
deleted file mode 100644
index 0427a86b5e74..000000000000
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
-	portaudio postscript +qhull +qrupdate readline sndfile +sparse
-	ssl static-libs X zlib"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre:3=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	virtual/blas
-	virtual/lapack
-	curl? ( net-misc/curl:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:0= )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-libs/qscintilla:=
-	)
-	hdf5? ( sci-libs/hdf5:0= )
-	java? ( >=virtual/jre-1.6.0:* )
-	opengl? (
-		media-libs/freetype:2=
-		media-libs/fontconfig:1.0=
-		virtual/glu
-		>=x11-libs/fltk-1.3:1=[opengl,xft]
-		x11-libs/gl2ps:0=
-	)
-	ssl? (
-		 dev-libs/openssl:0=
-	)
-	portaudio? ( media-libs/portaudio )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig
-	)
-	qhull? ( media-libs/qhull:0= )
-	qrupdate? ( sci-libs/qrupdate:0= )
-	readline? ( sys-libs/readline:0= )
-	sndfile? ( media-libs/libsndfile )
-	sparse? (
-		sci-libs/arpack:0=
-		sci-libs/camd:0=
-		sci-libs/ccolamd:0=
-		sci-libs/cholmod:0=
-		sci-libs/colamd:0=
-		sci-libs/cxsparse:0=
-		sci-libs/umfpack:0=
-	)
-	X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	gui? ( dev-qt/linguist-tools:5 )
-	java? ( >=virtual/jdk-1.6.0 )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )"
-
-# Removed "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
-# because I think Z_LIBS are added to LIBOCTINTERP_LINK_DEPS
-# in the top-level configure.ac now.
-#
-# Both "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
-# and "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch were removed
-# because this support has been broken upstream for a long time,
-# and a fix that involves "using namespace Magick;" was rejected
-# as far as I can tell. Moreover, the configure.ac patch no longer
-# applies. In the meantime, I've remove support for USE=imagemagick
-# and USE=graphicsmagick.
-#
-# Removed "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch because it was fixed
-# in https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1
-#
-# The texi patch is upstream as https://savannah.gnu.org/bugs/?58057
-# and should be in a future release.
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0-texi.patch
-	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-)
-
-src_prepare() {
-	# nasty prefix hacks for fltk:1 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	econf \
-		--localstatedir="${EPREFIX}/var/state/octave" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--disable-64 \
-		--disable-jit \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
-	default
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc $(find doc -name '*.pdf')
-	else
-		# bug 566134, macros.texi is installed by make install if use doc
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && \
-		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
-	doenvd 99octave
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cbae1b990e87..6e238c337e8d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index af49b88eb7d9..089177255df1 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,7 +1,7 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
-DIST less-612-gentoo.tar.gz 368093 BLAKE2B 35120badac25ed4def0da06f93036ec45a9c3be55a585baabd6bb98b0c016ee849142121423286a0af95f62fcf6f0fc69a6bdec32c5eb80ded6be59a4ca16b49 SHA512 97fc7e9074b4a164e089e8e9cbdba951e8833d79e1650fc3787986e4f81efb272299db7bf3961c7da8d9f33ce3458549f4223c248aea502d5abd195bc13f1b17
+DIST less-612-beta.tar.gz 365379 BLAKE2B 85c391992a95edfa263804444ae935925dc1e31a632c981410b943fccce1062125aeae7d7a192f82f4257280cb4f21022dcbb1b5851908f4425d3b9a241b1892 SHA512 d359ff0de223da3181f31db865a12497cd8481aa0fcf0ca736736f9af0bac7d573a57fc77ada24c8aa8556696e8e52f0fef972828284639815854a0d57602be3
 EBUILD less-608.ebuild 1372 BLAKE2B 9e6ca781c599b023ac69f2f50efe2d67fd2240dd1377c0b01d03e5fa2dde68be1f64d28d118fcf96e25ac96e5ddaf4c85c3e531214f251cabe26ff75a2fb1b50 SHA512 4f1365280ed6c95546ccba75535592edc299a1e2facb1b34ea21c04e03754c05387bcf1a4543533dc1047ef78b762deb16c1cc13d0b5e111c3b6368647ce89df
-EBUILD less-612.ebuild 1337 BLAKE2B 49c560341dd51d80c01b621d503f2879bddcae5355f4142f6b6d02a2d7dccec078a2df1aca995c7c4bb0170b32a7aeb6279323e8d1bd52389f82d7b960dd679f SHA512 b05b48bd354fc8c26c0df26c30c384c765df44a28219f7d1b3254e4fa2cb468db1d6e5933aa72ac9336ca8a7c19b689a04ea691570201141dccd5911a76565b5
+EBUILD less-612.ebuild 1275 BLAKE2B 5e9a130d7599bf6185559233a46c5934701fbf526884a0841f9b37bb5278bffa904210e2e1ff722cbba83ebab2f5d0409e3334942b24de74c78cb41cf120f0da SHA512 2e89df95a7007c9a3301968c68d7783ef4b3fa632c6c95a440e464b4f5f46417182c9fadc332247133c7ce4f40c104cf983f2f0a6b8f94ea5c4b3984c4d11243
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-612.ebuild b/sys-apps/less/less-612.ebuild
index 91b4db0d77e0..575e9a82356e 100644
--- a/sys-apps/less/less-612.ebuild
+++ b/sys-apps/less/less-612.ebuild
@@ -5,8 +5,7 @@ EAPI=8
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-#SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}-gentoo.tar.gz"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}-beta.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 1656da63e646..6a06214c9545 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5875d2647a9b..b84cc4c71579 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -88,8 +88,8 @@ DIST nvidia-xconfig-515.86.01.tar.bz2 109747 BLAKE2B d6253f9d052be5aaa1a2be82bf4
 DIST nvidia-xconfig-520.56.06.tar.bz2 110304 BLAKE2B 31888ae4eb675e3e877150120b2fb02be9560e6abd885799d87b94bcce5b784d6640c3018c8db5ea3c9645e0907312956c7d6bdd2317cdf79fb758dc9ba0957f SHA512 9bcf55f13ad99571e2ad605704f8297b529f32e4f1bebe1a3eccf648c6559e1b6e2867e9f406cf34f0e4d240ddc12559e7dfaa790e700d1b3f5a7582bcffb27c
 DIST nvidia-xconfig-525.53.tar.bz2 110566 BLAKE2B 7078adebc0aebb52eb6822826aaf38edc1fca5413a54b6c0bc230ce003bf9aeaa95eb2f075665586e7dce2d04095337c52157644cdcde1e1424a1629c5d6acff SHA512 2674fc4612bd8b451cd57c01c7d02d1a899a290801214f5af993f14de603e074242621ae1fc46b377e3fbb6c43e43e8f7b7f277cce7beab143ccbfa95fd9af67
 DIST open-gpu-kernel-modules-515.49.25.tar.gz 7418303 BLAKE2B 8d520dfbb2669a1b2c7ec959106579a1fe2051906a9e6d2d5188ca5ea94753032fd7e70d96495e20a3efae4f871f25921e01046fa52811d6be6998ec456189a6 SHA512 32657af1fdede0adf5e5ccbc24b9d85121b4ea2952786963ff0a42ac130ceec8c3df627b8211f92a25fd9640fa7be20835860db91bd6148fee516ad80a7a831d
-EBUILD nvidia-drivers-390.154.ebuild 17274 BLAKE2B 0278db4d0f9868ec27dab285ef4e56172c320571ef3e56bfed2a4dc9394337cecab5472ce0bb7243201f0cc7ca74a7572c6a54604ff9152d861773f591169ef3 SHA512 ac5d386b792f717675d75af17e1991a6fba1200d96c85f76e8e195213e43d552a075902f18a6c938cff515021a0531dfa0308e7815c6bde55376b3ca0c23a41a
-EBUILD nvidia-drivers-390.157.ebuild 17275 BLAKE2B 36a26061849692a15b5996fc855e6fd4f3bc17455102f2878249e777df8f7e205e058f27f99a27b5d074924ef46a7a23379a6917c2c15eeedf7280ac48bc1f46 SHA512 0c2410c2e52772dd43fe79032845394e0abdb06c05bc6fece1c4335bfceb2b4c633181977b36a8f6d133372c2707d7dbba8b9750cbade05ab8daa3fd314c1e37
+EBUILD nvidia-drivers-390.154.ebuild 17254 BLAKE2B 20b9af69d569093975dde36f553dcfc832a1ee3a4c03a3ab9f2d3e135bafd6b913bcdc33bf5fb7b5afde0fdba155814f642124226b228886df4245d306ff2112 SHA512 23efdb80f08f36f308ec7089a8de996f63b150385332cca9d6115455196b67f865ab42ab1e3284670a0f202200ca113c9ecdaea3df2eb8d22295a311515fee19
+EBUILD nvidia-drivers-390.157.ebuild 17255 BLAKE2B 080589a14ee87c30b9ddc45c1a7516b2728623ebd98efa5bc57ef506924c5d6def91032062b27e3c269cd0adfcb3b21570c45c2a071313398c12ee8558cc51d1 SHA512 7405f682cc88076798b290f53eee43b0ff467e0f5bba5e2619acb4120731a9ec0ca7af7c79c8588797cad678e70135a4c712060b10e5ada51c232dfd3c206377
 EBUILD nvidia-drivers-470.141.03.ebuild 17925 BLAKE2B 3bb9e2b78c50ab6de9df03034e4bf3a31526264e0e6a7b499c665850543cc8673e41970934c531870ab745f0f784ce5b7a20a3d141499a4ee1755dfbee06b178 SHA512 40d424a75a6c371b74219e004549135ec44247a424b42a3514acdfd143c06142de8f031d37dd216e159c627aec9664e09638d218e72611d83ca6c80334cb8b45
 EBUILD nvidia-drivers-470.161.03.ebuild 17925 BLAKE2B ca7a44791d90f13f8de058b4730871fa86a177503f0a28b465727859a517213c65a12631681c048aa06b5d24b0682e825e02025eb551c50a0871e6227c07ce86 SHA512 90db6d9b5dc826cefa23090b0d25f6bc226ebd602c11512017fc06da1c5cbccd9e6f2545000865b0c8c28c5c2bb7b3ecbde4d006f8329418e63c3b922d40e695
 EBUILD nvidia-drivers-510.108.03.ebuild 18255 BLAKE2B 895d8f4dde3219098397e4155e25ee85f058292c91064ed3ea1ec062c5206be4bb3c297dfdd4004c1ddd49297afe3155001bb65954021372883f3613f3d85202 SHA512 ac81977955afc55fc2020cda2e1b82ec273962982ca0fe959a9ed041058b44f5f8df87684b5dd59856d5499627d29e701cf6045c3c060f3a043369ec413e49d1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
index b5730eeeba6f..f99247334c44 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 		net-libs/libtirpc:=
 	)
 	tools? (
-		|| ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk )
+		>=app-accessibility/at-spi2-core-2.46:2
 		dev-libs/glib:2
 		dev-libs/jansson:=
 		media-libs/harfbuzz:=
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 779d3a77955a..5b54ff180e73 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 		net-libs/libtirpc:=
 	)
 	tools? (
-		|| ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk )
+		>=app-accessibility/at-spi2-core-2.46:2
 		dev-libs/glib:2
 		dev-libs/jansson:=
 		media-libs/harfbuzz:=
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 61e49ad61318..cbc38f4997b0 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 932ed94ec435..d2f82a1697cc 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
-EBUILD qscintilla-2.13.1.ebuild 1898 BLAKE2B 3f12cbb046479c41e627790dcdd07725f9d6a70ed75edf123b844702ed6ed7603b83fb35d93e4a2d078d409fdb0be39b17d61a849460f4523e3be3610d6a855a SHA512 600176bf4a329e0b4e076fd752630ab4edfed325145ae2e488a0fdc2f194cce50a802a6923198363d30234a95f047a311bb1a2a3bbfa1404c4138fb25d539461
 EBUILD qscintilla-2.13.3.ebuild 1904 BLAKE2B 4efdf5c406362d834ee9e357cb5770cc41ebf3a398c15edbdc548783a70b3139cd731b20bb5b98fb10dc76e51905fffa1a7ac3960b0b6c193b2900d1ab04507c SHA512 5103d72ac50506fad4eb7f8c2b82c506e9b366d86cb04f978eb2eba53ef70fe35ff3468d81e9ad4da10eb6bc2f9a5e2c8c2df2ef7a2adfa7c80826190147365f
 MISC metadata.xml 605 BLAKE2B 926d6dffbaf1d0243678e72a7e09d537d58571413142bef96b5963ea21cf1edadb6404992a6c57c1698cc58f9154ef9eb80926f1472b0570f6f3c299e856304c SHA512 99a337e3019d6ea8f8887bd92130d3fbc8d042eeb4d0c42afd6ea943751b901dbe0bc94f3244ae55371e2e2b9cfc0e2c4709f2bcbd07b70e42c16c454ae83007
diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
deleted file mode 100644
index 8dba82f8be1c..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}_src-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
-IUSE="designer doc"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/src/qscintilla.pro || die)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../src
-		append-ldflags -L../src
-	fi
-
-	qsci_run_in src eqmake5
-	use designer && qsci_run_in designer eqmake5
-}
-
-src_compile() {
-	qsci_run_in src emake
-	use designer && qsci_run_in designer emake
-}
-
-src_install() {
-	qsci_run_in src emake INSTALL_ROOT="${D}" install
-	use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
-
-	use doc && HTML_DOCS=( doc/html/. )
-	einstalldocs
-}