gentoo auto-resync : 17:01:2024 - 02:06:03

author: V3n3RiX <venerix@koprulu.sector> 2024-01-17 02:06:03 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-01-17 02:06:03 +0000
commit: 20c23c152d2e7b44a6f93ec9476b808659e5ff1e (patch)
tree: 06b81787dda2fd1bc47b3967309795f95ddb7b3d
parent: 03aa42efc090f9ed79ad5d8cbb54789052863450 (diff)
168 files changed, 1498 insertions, 1229 deletions
diff --git a/Manifest b/Manifest
index 7098dbc58195..e6c9a53bf943 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29610 BLAKE2B 21a40b1f9376994a0672d3fe13fcc214bd8a01391f6f4bdea1a511c2b801fc977980c0db308da55cdeb99e5efc0156ff9feed54f116f22e4045b7b469f2e1993 SHA512 c04909894bed289e253eb8d00b7f5f625646a56942686ba2a3edaace4c5cbcbd4e356f3c6f068d399b369af7eb0455c5c0a6c07f6e243eb74d47830be04ad7a5
-TIMESTAMP 2024-01-16T19:40:12Z
+MANIFEST Manifest.files.gz 29631 BLAKE2B d743bfcc448de5dd8344b2fae4b7e7a7d8e6a3d812dd3b1763ecc18fac465012f3f2482888cf2ff3a2120d221d2028eac89a724c5a8ebc70cd360144a313bdd3 SHA512 dcaa837facd53313367dc87bfd43cbbbbc60484c80107296428597fd5f33b5fa2665ace584a0d84c35bef5ce072a697edae1f2c1db3f8d7604812fc490b5d365
+TIMESTAMP 2024-01-17T01:40:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWm25xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWnL/xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCc7hAAjfaib9leYzTuZJpuAY/54BCw0JO0FWLvXJLeTLOWgXjxBj8edBKALGuo
-8ICNcNFfe4kZATvNGfUGnKNhXgCw7eHxI76Rs3b10TN2ORnRVSOX2gWzBKCpuPv5
-zHudW8/eqBqLuCBdp8kbZreaIBHZFjSI2e2/IMihuhghHtJx3wTsCwrEkj6BbX+D
-KR+27Qz7t8F6tp7DA2jtyXd/3svMfYXpN/lK/sOF7kmBDhvCisOn6m6IxDxA7k5+
-rqCb5+lzHrXZwKHmFTWvwhXx831U0Zdht5FzZHM6CctQjtNi4H/Gry7jQ8dOUyQc
-ltkZPhsRnbmobEsl5SUsEY3E49lWYMkXlpAxnzEv7eWfsU93e0abtknbRhvHcDax
-eft0oUf0yTukit9Ke3CxLNDLSuMBrK4NCANB9cdNaGYyf7FeQnOw81VYPSXGw+p1
-JWMFvZDUpwRaw1xnFn7g6LwDJsHGXksGhYkJKsZ6ZHqEMGaOocODLHzwDIindBnZ
-8O+0i3gF5zqGtB4QUahaTqna1/Ug4iTojYeJdJNYyUvx6WqbjRtI3GPk/V+8NXGm
-XMHqjzmt2kbPcC3rRXiRF725sfv9xoeYrUd50Cu25x3c24Cdtvto8g7yszkdhYur
-TqfQO+caFAx8CDv+P+HXz+blY/qQLjT9WdZm7Xc//z/7idrigAo=
-=XuRQ
+klBmCQ/+PcLQ1zaDyBY3YcfaqWpvSXuWahCTFr4KKKfRiLkq3zqnaCw2L0BADaHC
++31d4fp0f5yxpUcns2r/uGtw68J5QWrTcq2ojUsqCh/Ly6AkPkDnUDof39oQkqKw
+7s2bhMj0aVGe/zTBEVXkQhtcjsI7WvLMrTMJ+sjTJrGJ6Zo56UZ9zzct/5INvaN1
+x/uIfWVM5reOEVh/TMO+X+S2Zjr+GPytNszJWa8k8RLzFXlupoxGK031dHhI0dqF
+TxQqBPXz6Nky+fEPQ+dQy8S8HDHPPS8Bkv50U80Y0DgG/yPH/D7AZi5jfX2A/GAD
+cUgXuEVjwSPCHrdB0fRETtOjpaHRn6HOudF4sIyBFxyymW+IjE7Qvwi4J/RRFreo
+rFBkDRHNC4taha5F4qVK6tDhGmSBaFKSHQLPJsWLwYxgOyJfE1P7TVtjbJ7eqxOx
+GAat8p09zJWgpEhjd77bm/KS9eu2Jax6hbyYE7mZjD0WaTbOOtDGuWG1e/8zGEUv
+wrlPlYniIa/9w8zzTn82W1WIIkGGUGLR8BJmVq5DXgxqmOi+IlMHkCyqrs1qySHF
+EPPEdzo6FKJ7V9Uv4UYdntkcyB47mbwQqqFK/au1nUIPLBamVBZKZzafqypQUToc
+FkFNgHTHj3zHl5WhMRNZMKlgDcZCx5g0F2l+qMyZi6X9obNCQy8=
+=KydO
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a4ae6b649580..75935d2d9ae1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 5ee210ba944e..1ce3f3a6834b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 96d7c929bb96..1edc14f806f7 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,8 @@
 AUX setools-4.4.1-cython3.patch 1853 BLAKE2B 7a7d5ae303d135cf69be3dfac99cace7afdb345835338f47570629c0cb31be8878abe042e010a18d73313b71035b7b2c77a9b57921a4a5600f1fd1c41a141ad1 SHA512 4892b69a14e0f45c89c397f1840af88b79903ccf50aa7e51c4d6dda9be0a2572e21de40f5f44071ab2a61cf0bba9bc8f5a0a8fba9e84c013db4812bab5257df3
 AUX setools-4.4.2-remove-gui.patch 1131 BLAKE2B 54f1258b4b8318f02fd8ef14c4377eacb42254a406b4b9f339b94b0958da352bda028b4b49871ebcdaf1dfc4e37e51f5a0dd346c288270c149d828981c2b5413 SHA512 a827c435072f4a35c165a2492f18c4689144f352ff8fa84ca840dd4b31c59dbd4d4e7c249ad54fb60616e00daad5bc245604041c710141650f80cba01c9cecb0
 DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1
+DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e
 EBUILD setools-4.4.2.ebuild 1408 BLAKE2B 14733f327fc1e9c6d7b9c351b4575b7965a8d4d64d3852ba013b6c3b78a62f017bb90c3153c6d3460961f6ba93444f323bf78d5ef70d3adcea78ec648683d22d SHA512 8820db660d9ebda0aaa7290c4ce65768c9635237433e9a2741a0f21e0f5598960903442b39fb064d3e13783c840601973df33f86e95591228d8f32591e75cb17
-EBUILD setools-9999.ebuild 1358 BLAKE2B 4a31ac9f1ef8527c1758f48785d69e871deb6ee44090fbdbd6328b9c1e6311eb841adb834ecc999de599a4a99750216c010be8d455b6da8833232ea10bab54bb SHA512 2eb6d7d003bf9522aab274bcf32043c4459e1d3c97e0cc3f85ea2bb9cc11e8bd6946b6b1879f8dbb26337ba8abf83cdec42041fe60085b5a21725ba9912d6ecf
+EBUILD setools-4.4.4.ebuild 1357 BLAKE2B be1932f3ab1dd22f2d3c975dea89ff9c9c0fa1911a5feda38f11572856330c8524aaa61af6d62629e09ad75862c3160e38185bb8c18cfbe04c6854efa5c81029 SHA512 eef76a7acb9aa83341eb06e79e1193488482e7bd8ba443e784f989742e1ef57331f0a7c1f9e79342129371ca1c48972167f3ea7ebdb7a37c1e9fb399ffb8530e
+EBUILD setools-9999.ebuild 1357 BLAKE2B be1932f3ab1dd22f2d3c975dea89ff9c9c0fa1911a5feda38f11572856330c8524aaa61af6d62629e09ad75862c3160e38185bb8c18cfbe04c6854efa5c81029 SHA512 eef76a7acb9aa83341eb06e79e1193488482e7bd8ba443e784f989742e1ef57331f0a7c1f9e79342129371ca1c48972167f3ea7ebdb7a37c1e9fb399ffb8530e
 MISC metadata.xml 335 BLAKE2B 81a7604472415bdf249d90f69e80a7a7c66f23597cba3005fc1fc825012ffdeb29bcb3f8f8b028ee35e0a076fe4863c25d79077718b28d5f658e68df2a703c5b SHA512 9115e12f13e78b8f63ec90a2ed71c5c731781415a77c2fd06bba358240261bf83183f14f2d38e5e9ffcafaee56de4df224b517afceb536d8e1e6af6f1eaa0938
diff --git a/app-admin/setools/setools-4.4.4.ebuild b/app-admin/setools/setools-4.4.4.ebuild
new file mode 100644
index 000000000000..ec3d11050109
--- /dev/null
+++ b/app-admin/setools/setools-4.4.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-3.2:=
+	>=sys-libs/libselinux-3.2:=
+	X? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+	test? (
+		sys-apps/checkpolicy
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
+		die "failed to set lib_dirs"
+
+	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf setools || die
+	epytest
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 2d9636b33744..ec3d11050109 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -28,6 +28,7 @@ IUSE="test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
+	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=sys-libs/libsepol-3.2:=
 	>=sys-libs/libselinux-3.2:=
@@ -37,7 +38,6 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy
 	)"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 6eb41b2816b5..e1ac3dbd330c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index ed10e7a85675..1501ad5fdd82 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,16 +2,13 @@ AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e370
 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce
 AUX wine-staging-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
-DIST wine-8.19.tar.xz 29858012 BLAKE2B 21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50 SHA512 ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
-DIST wine-8.20.tar.xz 29879412 BLAKE2B 207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f SHA512 86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
 DIST wine-8.21.tar.xz 29919212 BLAKE2B 2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2e2222d40ca767499a98c3 SHA512 4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
+DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203 SHA512 76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
-DIST wine-staging-8.19.tar.gz 9606625 BLAKE2B aaa69556e417f566b198b53ca451c4636be32d11fa5ebd1e4dd3cd9b9fdc3ddba33cb4e2ba1cfc0a4806d7a145c7f0fde67182fc97f1bc040de0af2ecc78e433 SHA512 764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1
-DIST wine-staging-8.20.tar.gz 9672931 BLAKE2B e2a86b03c2fd99153583e23053a29779e2ae6800ea7786c43ccad48d0456b534e2e91036111361e39640403d4e44b526bdbf3c8120bf9c230e739b9fea8f745c SHA512 0a107830a3589c91e8573323ce074209c52284e63561ccf3191afe03b586d93de8911b1432736069174a52dd6cbb53ebbca1c5e812b3e765a73e231df1251ccc
 DIST wine-staging-8.21.tar.gz 9669500 BLAKE2B 600ad4b5696a38adefbde2fb9f51623dc7a7d9249ba15ceddcf1062040d840064285c6d2602266fd90f3658f0bdfe2fbca6a486f40e6e3f317fe704553ce39c7 SHA512 abba6084f2aefa8507c2a79c688b717f8137375168e5457ee40a0c96bfce31e9dc44370ecb5a8e8a397e90ce2eb8543fd07b447bf48c4b2d4c68aac9b3674214
+DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 EBUILD wine-staging-8.0.ebuild 12655 BLAKE2B 41692e9bafd318d2238d6006a1cbbff199203171a0ed0645fce829daba6127fae26cd9db9284fb57a1876f952578962300b694e27d53448cdb9cb819665a2c51 SHA512 584d5f97c803e8f6961e877946be5a5902a624bf198be9caab021204d33ebbb8f5a411061041f96738b94d8724b8d0af0d9b2e4eb0f81cecdeb14528e311cbe6
-EBUILD wine-staging-8.19.ebuild 14566 BLAKE2B 72be7649b69e1eebdaf206b665f8d5706720646d8931b8af9aa5a7a20deb310e2ed4f72d1dee2cf8b19ab16f237e4c882d342a8699976d76cf53ca301cd14952 SHA512 e138dd5c3af384aca564a9800cca30549c334f3aeb79a1556a726102454fdad14c04c5096ceb9b81efe68df2eb09c4c60eb20179672f1c6a370bb23d627e84fe
-EBUILD wine-staging-8.20.ebuild 14566 BLAKE2B 72be7649b69e1eebdaf206b665f8d5706720646d8931b8af9aa5a7a20deb310e2ed4f72d1dee2cf8b19ab16f237e4c882d342a8699976d76cf53ca301cd14952 SHA512 e138dd5c3af384aca564a9800cca30549c334f3aeb79a1556a726102454fdad14c04c5096ceb9b81efe68df2eb09c4c60eb20179672f1c6a370bb23d627e84fe
 EBUILD wine-staging-8.21.ebuild 14795 BLAKE2B 8acb7872efc2d8bef0077530da83f31302b913771e5a01282df211a811b79a0d2f5a3b33d086f3dc876c1f490a6fb07d452f886067a843bc328016a59c44be68 SHA512 58762ed4559531ecd5783a3b7092a4f56e9bd7e90e95732a8958849919dcab9d760bfdf4b1ff0f62d72bb5ba89a43ac0e677181679613e001bc5604ab53920b3
+EBUILD wine-staging-9.0.ebuild 14507 BLAKE2B bccfb20c594c5a7d596574f171bd4d85a9a80da296ee250cb2d6de09aa6da898de0a1fc2ee99c5b02e9849b1bc40f495d1eead1eb9ab1de41ee64d6460e2abef SHA512 53d5073ec141f8dd7796adf8cf3ed6f62ac5182e1735390bd9533aee0e9f872d4d4510ae6de5addb345ea8c34c5740a33aedcf51d96ef216fc42f3dac44b72aa
 EBUILD wine-staging-9999.ebuild 14507 BLAKE2B bccfb20c594c5a7d596574f171bd4d85a9a80da296ee250cb2d6de09aa6da898de0a1fc2ee99c5b02e9849b1bc40f495d1eead1eb9ab1de41ee64d6460e2abef SHA512 53d5073ec141f8dd7796adf8cf3ed6f62ac5182e1735390bd9533aee0e9f872d4d4510ae6de5addb345ea8c34c5740a33aedcf51d96ef216fc42f3dac44b72aa
-MISC metadata.xml 2487 BLAKE2B 80c3caec01c9a19e510279ca319c32ed08665a308f94d70c84cec9cffeeb3a932675299fbd14eebaa6531e7023993b81fc3e34ded3fe0dc050e8b11b5d384131 SHA512 5d05cbed9cf1043b85c51f3fc1210e2f9731415d0fa95d4f9db2f9d88e999a5dd09b8d0753bb3d2e648f41a5e68acd44ac8b370276c8cb1c92e20448548bfd36
+MISC metadata.xml 2512 BLAKE2B 0dfebd89f87288a48ebd95e475cc1ba7e3f09ebd6b8e4094da1096f55fd2547b1020cc84e48622c7599f47cba055776415270b5e4ed47bade881043875cb67ff SHA512 b5e832374ba1438d427ff5a1748447c3562e5b39cb0ad0d7fbef1a04c13f527bfb8b199b035e7912110245b8dcf227ec40b3d5405189d2a5c351c62eaf4bb349
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index 41ee07d0e044..d8d6c517c417 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -30,8 +30,9 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 		<flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag>
 		<flag name="wow64">
 			Enable running 32bit applications without 32bit ELF
-			multilib by mapping to 64bit calls (experimental/WIP,
-			USE=abi_x86_32 is recommended for complete support)
+			multilib by mapping to 64bit calls (experimental,
+			may have worse OpenGL performance or other issues
+			compared to USE=abi_x86_32)
 		</flag>
 	</use>
 	<upstream>
diff --git a/app-emulation/wine-staging/wine-staging-8.20.ebuild b/app-emulation/wine-staging/wine-staging-8.20.ebuild
deleted file mode 100644
index 2f2a3a83109b..000000000000
--- a/app-emulation/wine-staging/wine-staging-8.20.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.1.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/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_P}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${WINE_P}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
-	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )"
-
-# 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}] )
-	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}]
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${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}] )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	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 )"
-# gitapply.sh prefers git but can fallback to patch+extras
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.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}) \
-			$(use abi_x86_32 || use wow64 && echo 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
-
-		# hack: use subshell to preserve state (including what git-r3 unpack
-		# sets) for smart-live-rebuild as this is not the repo to look at
-		(
-			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 patchinstallargs=(
-		--all
-		--no-autoconf
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# 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
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# 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
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(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 mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(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 smartcard pcsclite)
-		$(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 wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		filter-flags -fno-plt # build failure
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-
-				# -mavx with mingw-gcc has a history of obscure issues and
-				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-				# crashes with -march=skylake >=wine-8.10, similar issues with
-				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-				append-cflags -mno-avx #912268
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: 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
-
-		if (( bits == 64 )); then
-			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
-
-		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
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	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
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; } &&
-		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
-	then
-		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-		ewarn "applications under ${PN} will likely not be usable."
-	fi
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-8.19.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 2f2a3a83109b..408a9b701dc8 100644
--- a/app-emulation/wine-staging/wine-staging-8.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,8 @@ S="${WORKDIR}/${WINE_P}"
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
 HOMEPAGE="
 	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/"
+	https://gitlab.winehq.org/wine/wine-staging/
+"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
@@ -38,13 +39,15 @@ IUSE="
 	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
 	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
 	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama"
+	+xcomposite xinerama
+"
 # bug #551124 for truetype
 # TODO: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
 	X? ( truetype )
 	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )"
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access
@@ -75,7 +78,8 @@ WINE_DLOPEN_DEPEND="
 	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}] )"
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
 WINE_COMMON_DEPEND="
 	${WINE_DLOPEN_DEPEND}
 	X? (
@@ -101,7 +105,11 @@ WINE_COMMON_DEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
 RDEPEND="
 	${WINE_COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@@ -123,11 +131,13 @@ RDEPEND="
 	)
 	samba? ( net-fs/samba[winbind] )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
+	udisks? ( sys-fs/udisks:2 )
+"
 DEPEND="
 	${WINE_COMMON_DEPEND}
 	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
+	X? ( x11-base/xorg-proto )
+"
 # gitapply.sh prefers git but can fallback to patch+extras
 BDEPEND="
 	${PYTHON_DEPS}
@@ -151,7 +161,8 @@ BDEPEND="
 		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
 	) )
 	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )"
+	wayland? ( dev-util/wayland-scanner )
+"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -210,6 +221,11 @@ src_prepare() {
 	local patchinstallargs=(
 		--all
 		--no-autoconf
+		# patches known broken with USE=-mingw, retry occasionally (bug #921360)
+		$(usev !mingw '
+			-W winedevice-Default_Drivers
+			-W fltmgr.sys-FltBuildDefaultSecurityDescriptor
+		')
 		${MY_WINE_STAGING_CONF}
 	)
 
@@ -335,13 +351,6 @@ src_configure() {
 			CROSSCFLAGS="${CROSSCFLAGS:-$(
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849
-
-				# -mavx with mingw-gcc has a history of obscure issues and
-				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-				# crashes with -march=skylake >=wine-8.10, similar issues with
-				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-				append-cflags -mno-avx #912268
-
 				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
 			)}"
 
@@ -432,7 +441,7 @@ src_install() {
 		fi
 	fi
 
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
 }
 
 pkg_postinst() {
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 8cb0995e2e71..a61a8ac35d9e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,13 +4,11 @@ AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3
 AUX wine-vanilla-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5 SHA512 330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
-DIST wine-8.19.tar.xz 29858012 BLAKE2B 21a7ab99df8acba6a4de0bbd58ccc2ea3186e99e8caac0d3cae130ba5cfed632fd47218d2029688df789f6930073ba1cfde8fbd7f764db44a55d49547e374f50 SHA512 ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
-DIST wine-8.20.tar.xz 29879412 BLAKE2B 207c247bfba3cce7b378eb1a70188fe67aa669b09474ca1689447fa4f2edaa368ab6c81c16c1a6cc06b69216b44521f15d588563c715e5738c1e148874862c9f SHA512 86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623
 DIST wine-8.21.tar.xz 29919212 BLAKE2B 2e1c135d1c247f4b268c0323538748944b01fe65c82dee27d81f70613aa2fe632c1b4d696f05838a6ab801579a4d13a191de0f4c1a2e2222d40ca767499a98c3 SHA512 4d04d40141d2ea5e548b76aed870ac28d8a03241ffd4e761979c795310baa19136e54a8e518c6ea9bf563c3b23d3c4eb1baefc9906d7eeca469e9942ff99dc40
+DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 EBUILD wine-vanilla-7.0.2.ebuild 11707 BLAKE2B 439a5e3b70b99479d4b901a32eceab74b3fdb4916a5396fd28efe4cf60a3cf9fc196284d94f77f7b7e446484545ec840cb58894c2d835f8f8bf520dc9a472a94 SHA512 a92753cf2c283b837ff058c09787098eba9e1eb12a6a3f163ff05e2732dc9336e1ebd6d226c4f244eb89283c71669537a5c09c5073b11e7cfad643a61240f637
 EBUILD wine-vanilla-8.0.2.ebuild 11795 BLAKE2B a78a0408dc5e6a06db090f4e5ad529b6f9979e86352a9523d82dc08921fd0b2ffdb5459d33a8b9dd243e1636aded912a4c36d9665471bb0cff7b25611de0b6df SHA512 61a2ca44406bad0b4f40aeb5a5cea39ab00f39b7a8cf446fa5b2d9d2a8fef41fb6f3e89865f359c7e7f576939c70b72effdae6a82759e72f2f5ae1c5a7c03363
-EBUILD wine-vanilla-8.19.ebuild 13499 BLAKE2B a1e6ad859923e85227eac4cc2752bf2d2dbff9f3e7519d4db34675910045f311074f765744a20472a7cb2f22e3d6a00796aab75bfc8f55773df9e89b36175ff1 SHA512 6c80442cdf72ba30b2257affae562cc4a66f07a22ef80fa105ed538c50f19f099144ef63310baffc5949345a394a6b8ef86ff88df073186f33e6442bee4e24f1
-EBUILD wine-vanilla-8.20.ebuild 13499 BLAKE2B a1e6ad859923e85227eac4cc2752bf2d2dbff9f3e7519d4db34675910045f311074f765744a20472a7cb2f22e3d6a00796aab75bfc8f55773df9e89b36175ff1 SHA512 6c80442cdf72ba30b2257affae562cc4a66f07a22ef80fa105ed538c50f19f099144ef63310baffc5949345a394a6b8ef86ff88df073186f33e6442bee4e24f1
 EBUILD wine-vanilla-8.21.ebuild 13546 BLAKE2B 61969f9b63a5a3ee30c77b6698c7c4ef94ae6a66dd4bd845f15bd3d62c80a5087f29c9e7179fd07c22ec1f5268af737821b7e2add96c37a47ba1a423ae0577d1 SHA512 0cc084127f734624e602d29e17c84feb57fafb4ee0512f850c9f65a736de772b96afa9c08a4c114ffce602c4f18b4281ed72223ad84722db25e7c049eee564a3
+EBUILD wine-vanilla-9.0.ebuild 13258 BLAKE2B aa398d6bee744acb273383ffade2c45e4ffef0216901fe437bbd19b363c039688cd18c4b201a41d7f6cdd82ab37eb640f70efe45412da62305a21adb07ac1436 SHA512 d3bc479db5efd970bbbe621e61c45e569db216313873264f7aaa4dd82520093555194a4d4e14b8cb4d6cc894d5cfaaa7fa021c8254cb30f5d30b72ee2883d1b3
 EBUILD wine-vanilla-9999.ebuild 13258 BLAKE2B aa398d6bee744acb273383ffade2c45e4ffef0216901fe437bbd19b363c039688cd18c4b201a41d7f6cdd82ab37eb640f70efe45412da62305a21adb07ac1436 SHA512 d3bc479db5efd970bbbe621e61c45e569db216313873264f7aaa4dd82520093555194a4d4e14b8cb4d6cc894d5cfaaa7fa021c8254cb30f5d30b72ee2883d1b3
-MISC metadata.xml 2554 BLAKE2B 31855a2135dcc3167dcc559ba75154359fffe1c072ed3c5c884fcda2f1aafc2bd976be611c0d4ddfe942857de3a0626ab03ca3b310bd4ee96914fdf95fe0173e SHA512 3efcad02c2d6de26aa43936ae752342311caed1f87b0d8f273399252c65604c56b9e835628cb900063ba9b7bcb9c66632ae5c320c418d2e0f5134db3b0d891cc
+MISC metadata.xml 2579 BLAKE2B 8371a899adb0c860bd87ccdc97c4b62d122d04fcdebc4d0140068aaeedc1f98fb825c4379874a55335ab101d8b75ea571ff3b4a0234b2938d364b80fd1daa822 SHA512 b5847fc0cb5500ba2f8e81d3e2ca59f4901bed52ce16ec930d29f93533b9f7d0bac666639765300f6b94b803d5a1beb53e51b11804af9d83e2b102d7f5ca592b
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index 2759332a8b82..0ebc0262285e 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -31,8 +31,9 @@ This variant of the Wine packaging does not include external patchsets
 		<flag name="vkd3d">Enable DirectX 12 support using <pkg>app-emulation/vkd3d</pkg></flag>
 		<flag name="wow64">
 			Enable running 32bit applications without 32bit ELF
-			multilib by mapping to 64bit calls (experimental/WIP,
-			USE=abi_x86_32 is recommended for complete support)
+			multilib by mapping to 64bit calls (experimental,
+			may have worse OpenGL performance or other issues
+			compared to USE=abi_x86_32)
 		</flag>
 	</use>
 	<upstream>
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.20.ebuild
deleted file mode 100644
index 42964a47518d..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-8.20.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 2022-2023 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
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.1.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	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"
-	S="${WORKDIR}/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/"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )"
-
-# 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}]
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${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}] )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	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="
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900338)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.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}) \
-			$(use abi_x86_32 || use wow64 && echo 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_prepare() {
-	# 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
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# 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
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(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 mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(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 smartcard pcsclite)
-		$(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 wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(usev !odbc ac_cv_lib_soname_odbc=)
-	)
-
-	filter-lto # build failure
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		filter-flags -fno-plt # build failure
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-
-				# -mavx with mingw-gcc has a history of obscure issues and
-				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-				# crashes with -march=skylake >=wine-8.10, similar issues with
-				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-				append-cflags -mno-avx #912268
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: 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
-
-		if (( bits == 64 )); then
-			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
-
-		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
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	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
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; } &&
-		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
-	then
-		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-		ewarn "applications under ${PN} will likely not be usable."
-	fi
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 42964a47518d..7109f7104bbe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,8 @@ fi
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
 HOMEPAGE="
 	https://www.winehq.org/
-	https://gitlab.winehq.org/wine/wine/"
+	https://gitlab.winehq.org/wine/wine/
+"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
@@ -35,11 +36,12 @@ IUSE="
 	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama"
 # bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
 	X? ( truetype )
 	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )"
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access
@@ -71,7 +73,8 @@ WINE_DLOPEN_DEPEND="
 	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}] )"
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
 WINE_COMMON_DEPEND="
 	${WINE_DLOPEN_DEPEND}
 	X? (
@@ -97,7 +100,11 @@ WINE_COMMON_DEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
 RDEPEND="
 	${WINE_COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@@ -119,11 +126,13 @@ RDEPEND="
 	)
 	samba? ( net-fs/samba[winbind] )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
+	udisks? ( sys-fs/udisks:2 )
+"
 DEPEND="
 	${WINE_COMMON_DEPEND}
 	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
+	X? ( x11-base/xorg-proto )
+"
 BDEPEND="
 	|| (
 		sys-devel/binutils
@@ -138,7 +147,8 @@ BDEPEND="
 		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
 	) )
 	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )"
+	wayland? ( dev-util/wayland-scanner )
+"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -295,13 +305,6 @@ src_configure() {
 			CROSSCFLAGS="${CROSSCFLAGS:-$(
 				filter-flags '-fstack-protector*' #870136
 				filter-flags '-mfunction-return=thunk*' #878849
-
-				# -mavx with mingw-gcc has a history of obscure issues and
-				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-				# crashes with -march=skylake >=wine-8.10, similar issues with
-				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-				append-cflags -mno-avx #912268
-
 				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
 			)}"
 
@@ -392,7 +395,7 @@ src_install() {
 		fi
 	fi
 
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
 }
 
 pkg_postinst() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b64aa6148483..99365dce5255 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 9b1ad9310ae1..bf557d95d76f 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,5 +1,5 @@
 DIST lesspipe-2.10.tar.gz 170918 BLAKE2B 156fe53975252ac6c59a637ffe0ee9862be0699f325a0b328e5c0f2cb5e6f7d8324481f3d3211cbb15a585a5dabde45adf87ac4e0af91cd34540359331684264 SHA512 3fe122cf0adf8dd3e0782ae65132c58d76f7131a2e8c30d9a10eb426c6f63e50b4b5e02b6792524a37b27ca572bd3e2661a6c82118e9c4ed5ecbccaf2c5a42e2
 DIST lesspipe-2.11.tar.gz 171212 BLAKE2B aa7cf35f00d9db4ad7cb48ae89089a4d0c5d6c6e41ec902bc7ba6d4fd218f8ea90e1fdf3d6fcbac1dd1f86eb841a0daa6838b0086905fd4b0535d91040ef85aa SHA512 ed75d8529bd24876b11a50d0ada476299569d0fe716c390de84a0630ae475594f96370ffbed64fc5d9e2417dcbaa7b2f68630e32f665dff799667c2653b0265f
 EBUILD lesspipe-2.10.ebuild 1306 BLAKE2B de9328c85649a107f7b0290d6d6b3b6e03c31825988fbf278c48aebe2af988992fe43c8e999483162f3c61f8ea1dd8a4a37aa36087e7e3d6ed22c19124dd2bd1 SHA512 c2214069bb84cf5d30e129f629ca0ef4d0e0e6c8d1bf50e0d9a102b3a81ee47e51c62cbf60fe3c7479a04271af0b35c680ef1921a790c562d2907675302821b9
-EBUILD lesspipe-2.11.ebuild 1308 BLAKE2B 9c4ac1e55b4737b4dd8ebcabfa1b4e5ced20db6ff1d98c9989296760250cd13560b1ca3d9c55c8a53e1cd69da49976f2aa290098fcc792e0d8fcfd5929fe6466 SHA512 44501284b54240641f4d3dffc558143b92c7edd6f843321cdf60cf7b01afe28e682f14c65a194aabb16220294f19d9bf30d3488da36b558cc375d4d4e39b5c5e
+EBUILD lesspipe-2.11.ebuild 1306 BLAKE2B 0d781de9be7bbd4fd0417363db0e40282638982fb806d4a8169984c541b68a414f937479e00ca0939820901994f8235b5e1078ec80b94fab78c14f37c02318b8 SHA512 e44ece8c07479e2ada2213a1d1ab44a8ae14db4976ee28125b2ceccb80762fc2438cd4bb71f3fa6f6c5c746159df6066f6e4799ca8052323241b482e2fabcb41
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.11.ebuild b/app-text/lesspipe/lesspipe-2.11.ebuild
index 2cb52db742fa..8ff84655c3ba 100644
--- a/app-text/lesspipe/lesspipe-2.11.ebuild
+++ b/app-text/lesspipe/lesspipe-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Please check again on bumps! (bug #734896)
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 641d3f89d0ab..f3ec39af2120 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-util/mage/Manifest b/dev-build/mage/Manifest
index fc94cea698e1..fc94cea698e1 100644
--- a/dev-util/mage/Manifest
+++ b/dev-build/mage/Manifest
diff --git a/dev-util/mage/mage-1.11.0.ebuild b/dev-build/mage/mage-1.11.0.ebuild
index b589b5b0780b..b589b5b0780b 100644
--- a/dev-util/mage/mage-1.11.0.ebuild
+++ b/dev-build/mage/mage-1.11.0.ebuild
diff --git a/dev-util/mage/mage-1.13.0.ebuild b/dev-build/mage/mage-1.13.0.ebuild
index 521f66fd6e66..521f66fd6e66 100644
--- a/dev-util/mage/mage-1.13.0.ebuild
+++ b/dev-build/mage/mage-1.13.0.ebuild
diff --git a/dev-util/mage/mage-1.15.0.ebuild b/dev-build/mage/mage-1.15.0.ebuild
index 579e852a78a7..579e852a78a7 100644
--- a/dev-util/mage/mage-1.15.0.ebuild
+++ b/dev-build/mage/mage-1.15.0.ebuild
diff --git a/dev-util/mage/metadata.xml b/dev-build/mage/metadata.xml
index 2470b06def1e..2470b06def1e 100644
--- a/dev-util/mage/metadata.xml
+++ b/dev-build/mage/metadata.xml
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index faa6ba5391cf..5e226805897f 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 446774e42f90..75530cafe27c 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -8,6 +8,6 @@ EBUILD highway-1.0.1-r1.ebuild 1000 BLAKE2B 785d94ce1c5bda32873bae32c693eeb56672
 EBUILD highway-1.0.3-r1.ebuild 1088 BLAKE2B 2480c977a6917c8c73535266a3551ef429b3e983116b42da23b081dc37be39e11b63928c8ca74e174d4dc6155ca4209318d1ed17867085d6a6224d6960ab2918 SHA512 dfd974802114483b35fb21be722bcd7648819ea8a1277e956e22a1d1a998657998a779fb6fdf224a4e84a576c53088a08c6b891fc6b5e120ae301e4ff7721749
 EBUILD highway-1.0.3.ebuild 1019 BLAKE2B 61447444b75bc7fdb09363992aeee6d454400f6d22288f972c0b48d18bf4eedb791bd1a5761ed7edc24f7f846926f3f34b290bec2c74abcb201d1e01282f4b4a SHA512 745b3be032f06e186791a758ca0d399327d9c4ee8b18c9e0ca87ebc862aee170aec0dd051a35502615b2df09894a66bfa9176ef4c4678410af00594121cd1e68
 EBUILD highway-1.0.5.ebuild 937 BLAKE2B 5dc370af85a93d6864cdd01b113f7c6099b078e9488386e69c2c9e138983eb643c20dc2500df8cb7514b69445f2624a9498ede326b06c4b7948c7dfc01abc693 SHA512 100aa26a702801b0a56d39675b30f7a4fbb48184f1e392261362b688a25847e835ad4ffef65dc3b9c75e9c7718eafce26a712ad8c5b83df84e765b84ad65e3d2
-EBUILD highway-1.0.7.ebuild 937 BLAKE2B 5dc370af85a93d6864cdd01b113f7c6099b078e9488386e69c2c9e138983eb643c20dc2500df8cb7514b69445f2624a9498ede326b06c4b7948c7dfc01abc693 SHA512 100aa26a702801b0a56d39675b30f7a4fbb48184f1e392261362b688a25847e835ad4ffef65dc3b9c75e9c7718eafce26a712ad8c5b83df84e765b84ad65e3d2
+EBUILD highway-1.0.7.ebuild 934 BLAKE2B 0fed31dade2bc1015b90da374697654cfec882f8f9512bd8d56b81b36950f9461e2e99c34a6c5ea55716eb7e5a915f66fc2d8abcf55dfd2e0c05418434c77c10 SHA512 a514f93cf38e5a50eb49b420352a43c81e7309f60e5f10ab67fbf38978dfc4925beab592dd9c4da6350a0dd64c531ee147d0cf3c7d62f5a46f73e450e7b5657d
 EBUILD highway-9999.ebuild 930 BLAKE2B ae08b4b970402c4afa31b7add6d6201dc1e10d8d7b52019de21b13903fa4d9ee48d541a936be6baf2d9d766f78b4c9358d3ae879c5ff16c8034d04c37ed01b6f SHA512 325ecb955be3deb5592ed0a176a67517920e3321929b444e1e0b683a3e336fa9107607cabf6cc8a93a466124348d6c3a94c30528a343f0a9a8a19511b565e9ab
 MISC metadata.xml 700 BLAKE2B 23fb803289745f094f19cb7dc6b296f56a3bf712b39f87ee563872496edb5798fe9f36ec1d8a9d9af52d26b589bca354bc58a3c039753156e09a154de27cb960 SHA512 b47da71c110bb91b523dd970a1ed8f4d40c1cc067c170d10ef0ad412850967682303e610c352d7c6425d7bad33d58f90a6d3a34a333a38e427c65a8341c3ec21
diff --git a/dev-cpp/highway/highway-1.0.7.ebuild b/dev-cpp/highway/highway-1.0.7.ebuild
index 9314e1341deb..9136d245992c 100644
--- a/dev-cpp/highway/highway-1.0.7.ebuild
+++ b/dev-cpp/highway/highway-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 9546c96e0c2a..5aa36e8a3a26 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/raspberrypi-utils/Manifest b/dev-embedded/raspberrypi-utils/Manifest
index aa0e00aeb68f..1ba07409f848 100644
--- a/dev-embedded/raspberrypi-utils/Manifest
+++ b/dev-embedded/raspberrypi-utils/Manifest
@@ -1,3 +1,3 @@
-DIST raspberrypi-utils-0_p20240112.tar.gz 122544 BLAKE2B ccdd25aca03b3a09d1d6a6007a80b3615ec8bc5fabcb7e5b7fedd09d68f992e587e90bf4fa36b7131090438fbd8706f7184d70018aadad05a1a9d897282d6c0f SHA512 6d3aa77499ef88ffc33b364267021822c64554ccf9226537e862ceed52cdf3557ec42a45be3618ca2828dfe0cddb901a09f0cddf7fa07946536713996f6b2cc0
-EBUILD raspberrypi-utils-0_p20240112.ebuild 848 BLAKE2B e7142af889a4af18f87607bfb95adbcc3fa5541a0d4c09f377408dfd2a06ea16bdacafc7c804a7f7689b262bcd535a48b13d57105c7f5da574ca4e6deb3fcd98 SHA512 d38726add4851ab82536c6bf9b6e59e6a438fe4b040e41b99118d1b15af46a4f246daf264c065586add8473ea574de34a43dda2dac0cb7592a76b4759f81ff74
+DIST raspberrypi-utils-0_p20240115.tar.gz 122554 BLAKE2B 94c101a50a422f265b2ea87ab33d802f21b21c57b8693a7bdc407460ec6e230da390d9f8d3e5541cb7145c55a7c53766cb8fb36c565006b1ec371090a6a4777b SHA512 b411242a1f5055a6075ea487fa746ee2cdbf31eff61f115cf11c97efa57d0245feb30c786c7c1164c174828da774a5cf4a4792d9ae46518e1c43510f120e5c43
+EBUILD raspberrypi-utils-0_p20240115.ebuild 885 BLAKE2B d42361129b75f7596cf8968c2e1c2fb229707a45148071f5bd8a327ea2ebb4c591835e49f1692068e1ac12a0a03feac4fea30323620ad32dc226381d96ef2a60 SHA512 e36691f86fd9d5c7ac5d2257ebf5bff77ff1a6a6448b5d73270c8e750c56aa4f2a156f65d77de119a647f3fac3b1994c1752d4b66714290d731ef9739a82b100
 MISC metadata.xml 330 BLAKE2B e7285a8024f322ab0f8c8789bdfa2601c046c776c24c7e411ef9c5be424bd3000c2749d47e5cac3c0f5f870decd1106e019b279c229dc27de238cfad8f2e4979 SHA512 f0cd8ffa52484dc9ff84623ddf51d9f4c696c1d7cc357042bfae47b7da62eb94336703d038b1511138b40a0b545d96b4a4faa8e5b2787d0bcdac3b9259c883fc
diff --git a/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240112.ebuild b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240115.ebuild
index 9628a77098f0..6f84f4cb186c 100644
--- a/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240112.ebuild
+++ b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240115.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit bash-completion-r1 cmake
 
-COMMIT="193e6e34b40807cbeedee2e4abc3ef5165e14ae2"
+COMMIT="32602f565c6cb854d1f2643b51a022991cea2b1b"
 
 DESCRIPTION="Raspberry Pi userspace utilities"
 HOMEPAGE="https://github.com/raspberrypi/utils"
@@ -15,7 +15,12 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~arm ~arm64"
 
+DEPEND="
+	sys-apps/dtc
+"
+
 RDEPEND="
+	${DEPEND}
 	!media-libs/raspberrypi-userland
 	!media-libs/raspberrypi-userland-bin
 "
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 257ebc1eefa6..181588af2d2a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 1c31cafb446c..70a4827c6cfe 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -5,6 +5,6 @@ AUX spdlog-musl-1.2.4.patch 1428 BLAKE2B 22d1c0ada761c52f29e1a4dff0c16140741d78f
 DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
 DIST spdlog-1.12.0.tar.gz 251037 BLAKE2B 3170f1e680fc4652ed8ddc0f74627aec22149f028def599fc5ed4db3a942d840006963789577f2e3df0e2b8ca1d98a881f3b96be5e1174fdf0acea15b3676d6e SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d
 EBUILD spdlog-1.11.0-r3.ebuild 1066 BLAKE2B 2f9e5013ded134257381f8be7a545677ff1950018cbee2d6e56a1c668890c0d5c2a1f606473cfed9858155ee1e7ba15fc147bd0c0a2f54480be35d58525989ab SHA512 07fa9eb7b51213654f012761aa0d3c107499bcf9f07371b5fdfcccfefba5d378cb825bea61c618c8284759091030cd995fc454e132b541c8bf95cad043d78689
-EBUILD spdlog-1.12.0-r2.ebuild 1114 BLAKE2B 2f7701ee2dd7309bf946fa68a1425367a691389b2b50c22609f1571071800109d3c2ff9a2461ed531f2c2cc522e115af556c250dfc07452094b408fe55f7a39f SHA512 7bf9e4bb2c17c8cbd4b81c16410be2b2459bd226c2bb1a2212a4603b656c01f9d1865bb64ed44321ccaeec4a544ce71e2d1ed9794688010a89962458134a5945
+EBUILD spdlog-1.12.0-r2.ebuild 1111 BLAKE2B f965bb7d15ee57895edc9a70076661687e0ccef444e66e87b556b8754a285fe30e045ec34d39581fa86026ab28e49f26155296d97498ebc17ea2914b3b699a2c SHA512 1bc38f614aeed8688f17d9d32b1706844358ab76e3b712e6fd3465869932bce53a8a71c2d6a9f2d8a52520e2043814959652c503a1d2c51b8a4a41acb84ff568
 EBUILD spdlog-9999.ebuild 1037 BLAKE2B dc327846fe1bb2ed5199ba13f53ba24b2040af8df5e6e094059d96436b1e882cf1fee83f92da10812ac738a4c50e8eaae3d0c7b1fe5fca72ca1e17831b647364 SHA512 fe9ec2e627e4dc8195bfee5892e966ee119bd6149e9002d5a8469f981d20e980fccb6bbeaf9eb90b564982ab479efe9f4cf2235a3db60cf4807b89e8296b9943
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
index 420571283d0b..6d7faea245b6 100644
--- a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index eaccbd5410ac..68a24723c334 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 00ade7d4b53e..e94379fcf2af 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -7,9 +7,11 @@ DIST facter-4.4.1.tar.gz 492785 BLAKE2B b8f173aee1e2c3a6e9b650e1962ee6a7f860cadb
 DIST facter-4.4.3.tar.gz 493663 BLAKE2B 19f670e503b5ccf3d78b7fa72b0f3d25cef827eacf9939182fa4bfd6591fbfae6091425d6fc4d00c87ee587537dbcefdc1ff8d3a6d713c21ad6e167b55753835 SHA512 9e8867b00665559562e5778783247bf97a8fce154c857fc1b2e4cb193a66c9029edcfa09dd4e3ca8a0ad16b8dec272b440441f4cffab899366d543a66d1e26df
 DIST facter-4.5.0.tar.gz 494255 BLAKE2B 7ec4edc85c83fd2a4ab198e0807d705cfba7c05ae5fd6dc1954c00a6e14ab6869926d315bc6fcaf553ec3ae632452a383c6a25e5da2d9a099f24c721fd14407c SHA512 025afb1a8ce2716253cfa94f2a4692558ab1c0021afeacfe4c8e6f482fdf91e8042d0f914da04716c4c50faca5b7e89cd6e741b10d431a71ed933943ca4e712f
 DIST facter-4.5.1.tar.gz 494725 BLAKE2B d77ef233c901f41e2bfeaaf5ecd0d3be885154f5027d9e51a02815eed928ddfa6911af396b5ccfb4a33bd7814ba1e8afd77cafec76e78f2baa57a2113dfd2e0a SHA512 f89dfda26fbde74a7425159cde6eb51755238b86b4e15e2237dbfe3997032130e88f7be3d80c5fe115c6dc41cc69ef8942b826aeeb1669d94fe7a1b7824c0167
+DIST facter-4.5.2.tar.gz 465911 BLAKE2B c806d5abb14ed434a4453cbabc77edd5791788ed11eab6b6ea4c56fbfaee82c1ecbb3407b0953ea674b00b0893da1cdce4752c9ab299bdffc97aece61b14ad0b SHA512 1117845c730fa102b833deb2c1020dc82fd9a5fe3ef959e0e98b0b55b3beeb988bc9bc2dbbb04374e26a2c449815139763a107c799a075ad12f64bbf357ca9b8
 EBUILD facter-3.14.24.ebuild 2150 BLAKE2B d56c04c9058bbe08cb810be7a5a679375f02ef9e38d7473da4dd8b673dab5c9a5b459e901e376e0132289b99856280a2ada2a383996225fbde34a5414c51381f SHA512 5b823d534d7b9e77d7938d4f046a1afdee2686506a3d500b821fc475a85029ce2ec14cb583a2998eebea78e7cd9a31b816fa711555f514d1326da7024e670e5f
 EBUILD facter-4.4.1.ebuild 1298 BLAKE2B faa278e5811601fe8240e7b8476b1efd5f7ab99eb7f937998222bbcabdc90b1fdebadf93900bfd1885248704c81632948997447d32752caaff6825f536fea02c SHA512 31ab6d1d0aa92338b291ad55d2e6b9fa80d2c6bb624e537dffa191fd5f8791c19ea540f518d3dec0c954065d8645eeb971d8a3da61287d1d703d1a8b7a079b80
 EBUILD facter-4.4.3-r1.ebuild 1543 BLAKE2B fa9bbb6b95b02ffbd0bae5e2f1984cb2957dedc9844c6b030655f9808d1ba7ede95f85222fe9eecbc3cff6adf9d84e6fba9aef279ef8f61676adf124be3c6081 SHA512 711e99625f8ab76c1d8576a9741363011a780820f0321f5a51833ddf978290cd01a72b1b839fa8790eb4ae48733c629cfccb83007060ef55f2e519e75c55dd0b
 EBUILD facter-4.5.0.ebuild 1543 BLAKE2B fa9bbb6b95b02ffbd0bae5e2f1984cb2957dedc9844c6b030655f9808d1ba7ede95f85222fe9eecbc3cff6adf9d84e6fba9aef279ef8f61676adf124be3c6081 SHA512 711e99625f8ab76c1d8576a9741363011a780820f0321f5a51833ddf978290cd01a72b1b839fa8790eb4ae48733c629cfccb83007060ef55f2e519e75c55dd0b
 EBUILD facter-4.5.1.ebuild 1543 BLAKE2B fa9bbb6b95b02ffbd0bae5e2f1984cb2957dedc9844c6b030655f9808d1ba7ede95f85222fe9eecbc3cff6adf9d84e6fba9aef279ef8f61676adf124be3c6081 SHA512 711e99625f8ab76c1d8576a9741363011a780820f0321f5a51833ddf978290cd01a72b1b839fa8790eb4ae48733c629cfccb83007060ef55f2e519e75c55dd0b
+EBUILD facter-4.5.2.ebuild 1543 BLAKE2B 277bf50de60663ac549fe997a139e4df5c2f82acb6432eb197df753ff104f6b04f5502ff4fd6f3c2e3963e71a480eb2aab51533a28b18bc8c533751213e9ec9a SHA512 0b7e05365576ba7b2b9637ba10f6bf0e7e10e4810c95f212ad19c596c2e2735c151fd6cf405c8ad542ae90b88466867fe4bc6883bd33888c240a22a15586f4ed
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-4.5.2.ebuild b/dev-ruby/facter/facter-4.5.2.ebuild
new file mode 100644
index 000000000000..c2a4a652e567
--- /dev/null
+++ b/dev-ruby/facter/facter-4.5.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 80568126c2e9..a5e5e03d9ddf 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 04ac91f99d85..8235d057ce98 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 900ec18dfd80..74ab7462dca7 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -32,5 +32,5 @@ DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BL
 DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.8.0-r3.ebuild 21551 BLAKE2B dc795690c4d8672c82ce44ba3e7fb67c32206155cc18624109da4106b0eee16d03fd3591d843af6bd1b5caf0c5050c4ee75201758e8a0d764ffdb4195844f301 SHA512 f9d927735bdd34d41b0dcc9a2a7ce5944c7f40f75934b0e93574ce2619d06a0d01527a20c1320a9cfd907ce11f51dddb3de2e413796ddf9f2f90d3932db5bbac
-EBUILD opencv-4.8.1-r1.ebuild 29111 BLAKE2B 14c3f8dd665800c7b9c2ddaf2c555729e0cff22e953d9a780d1dc53a06ee56d9221e8e4942f511b652f9dcfeea0cc9241a59806828453df945b86f19bccbcf9d SHA512 c9b534968a863e763d585077dea64a56f5251a0c0dac710f91ceab0deaa39de3f44e41cc7b03183a996d20d4c47584493ce15cec75636cf6fb4766e7104464c1
+EBUILD opencv-4.8.1-r1.ebuild 29110 BLAKE2B 43a68b6799e8ea6cdfad0520edce4d9b987d0fe48d707966ccdbbe7d76e88846fb42523e447988bef4dff575bbb8255b31f754778c7902237a0ff307a7d3537d SHA512 7f067a5f9f85baa85f24844d463cb943c319a1fa05f19cd705eb6d0e304a9e0bcc8a6a585b64a27c0cccbef28cf3cc27872f9437fcc48199e8faf438667cd1d5
 MISC metadata.xml 3428 BLAKE2B 17df3db9dc912981f85b6dd7e500b593504fe6d17c85d1ebc07afa8ab04266489550b03aa20ee80615f52f8e2a206c77b00d9bfc9096bf77239378fa0874a0db SHA512 15e6dc56efd85d9b6d173979ef5edc38978cf31f0b2700674ffda5fb53923df77453234b431c21ff61943c57218f8fe4fe611701abb630c9867ed990cf953d49
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 1a7df1d12747..19f60739e552 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -45,7 +45,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda cudnn debug dnnsamples +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack non-free opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms tbb tiff vaapi v4l vtk webp xine video_cards_intel"
 
 # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 111484863489..f5df1e18a488 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 9c638e92a04b..3ae6d29f678e 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -12,5 +12,5 @@ AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
 EBUILD tvheadend-4.2.8-r2.ebuild 3614 BLAKE2B 7144f91807a695255cdea331cc8e0c488477895e5c13148a659c6aaf3f65d265b60e34cdb38a3289c31d8061ebfcc6768254c30ecaf39e2eb0af18ff63aeb55a SHA512 242bf35bfe88ef84a9c4c76bbb71b8444a0ad0c4b22edf1b4b2b3a8a905067e66a86a4a3c1ea3ffd1a7bf8fad0e99798785489822c193ee849caa1d054effeec
-EBUILD tvheadend-9999.ebuild 4139 BLAKE2B 81862360d2293c6208bb52631d7b75a7cdf2ae201f19e864860fe8847537021906357a621fb9d62b5a7f777899ebaf255f3df285f238d18d273d77df6f0fbb91 SHA512 87b7a2b96f309be302ee76c901a3986f54bcd2ba077af72b914ec0f1ff1fda595f5d10022547b64ec061e3025415b192ab0ef01aab45e49a0084697c66ea664d
+EBUILD tvheadend-9999.ebuild 4136 BLAKE2B a396af07ce2cad71c62f96b0042a348e113a4603f53c62ef8649df86994dad804c14f21f71b5e496d38000d228bb4cf9c042088201eeddd54797fa457fa6c595 SHA512 b05058899e8b60bb4265fe4e251979691fd1fdd3ba6c63ad319b8fd027d80d1699051d840c2d596490feebd4c38f028bda7c849b299086e5a641453a09cf5804
 MISC metadata.xml 1446 BLAKE2B 622295d497db162d2a214c94187f0e15a9c23b8cc7d484255618f2bb3d10c5de9ecd9aaacbceeb05c27e5d53ffa2338fcd2678cdfdc386104033c1c57aa51c96 SHA512 5e34e61e7ecec9a997ece8b50f6a45f1158e203df0759e08e8d3735a4973baa795a556f9bcac1aaf8069cd25974655adc3f393c0f1670cf6e6a3762903d84759
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index e9692775e140..27ebacd3cd42 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs
 
@@ -28,7 +28,7 @@ RDEPEND="
 	virtual/libiconv
 	dbus? ( sys-apps/dbus )
 	dvbcsa? ( media-libs/libdvbcsa )
-	ffmpeg? ( <media-video/ffmpeg-5:=[opus?,vpx?,x264?,x265?] )
+	ffmpeg? ( media-video/ffmpeg:=[opus?,vpx?,x264?,x265?] )
 	hdhomerun? ( media-libs/libhdhomerun )
 	dev-libs/openssl:0=
 	uriparser? ( dev-libs/uriparser )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index dadc127aa2ae..8ecb3089ca6a 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 19abbc65feee..880074580a8b 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,5 +1,5 @@
 AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a
 AUX ffmpeg-chromium-120.patch 1485 BLAKE2B 49ece028bf7da100adc7af93e82b6235fb39f12199ce037b730b97012ca787047b45be821cec609cdfa7e00bb1f8c88a9ecae0b7b88fd8db6f53476b94833f9f SHA512 0f3276f75132bd8adbde4305ffa604cfa3d504ed66f883af109c75711d0f9af6dee2d55d7298ec36864a421250a0c4998d3306f0e47750c016c4274545195b49
 DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7ddddaca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3 SHA512 0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b
-EBUILD ffmpeg-chromium-120.ebuild 6644 BLAKE2B 707fe81e5402c8ff24ccb32df65d60e65c578b65599bfe1a391ec5be4549db10224534b284912419f709998341f705176491aff27cba27a14289dd3c8cbef7ee SHA512 dd8ae3ef64febee1074e5e93440461ba78248927aeb8274a46ad0db72b162ae816b66255a01799ddf41484c455a1c35908fef2867081c317701df0cfd7f6bcdd
+EBUILD ffmpeg-chromium-120.ebuild 6700 BLAKE2B 210147af995236d5c2111c8d0d0870311ac7d723684723d768c0028429ce3ce760fb50c424934619ca9e33876f14646f7287fbd594b7f71e45c6407433412961 SHA512 b15f0f37a832d67b87baac8100c9a71d4d4cd4baf75171702514ac86df5091b18e2e1129d92dc2199fbf94df6656b932d897d3c4f5b5925ed11153b58b51ac27
 MISC metadata.xml 589 BLAKE2B 60a8f7a2eca511672dc67487956c589fffbb86ca6500d61c266916be92d1cde6c26246516289f129bbce05b07b811bdfcc0136d56676ce4097e5f19b361f375a SHA512 3953c626bb570af8cceedbf8b4035a0259e789823c296d11e6823237d05bd5d25a08260c6a8815bcea02bee56a522b0bb8da2b8aacd6be417b1992c4b0d22964
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
index beeede979097..26434d60d9c9 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
@@ -47,6 +47,8 @@ ARM_CPU_FEATURES=(
 	cpu_flags_arm_vfp:vfp
 	cpu_flags_arm_vfpv3:vfpv3
 	cpu_flags_arm_v8:armv8
+	cpu_flags_arm_asimddp:dotprod
+	cpu_flags_arm_i8mm:i8mm
 )
 ARM_CPU_REQUIRED_USE="
 	arm64? ( cpu_flags_arm_v8 )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1d15cbd804ce..dbce02c69e97 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7de04419abbb..33842ed8bed3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jan 2024 19:40:07 +0000
+Wed, 17 Jan 2024 01:40:08 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b1cec3e6a5e2..ec91ef2e81e3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 562011 BLAKE2B 4f303bfa2201afa25d92c6de3ee0b20c33a55df26101444f3a60a5c7551ad29bbf2b4a0ea12786f5c698395abed552f9c00010c60be13643dabbf13f4cc8bebe SHA512 5627c638c07440b1a865e6a00253907199dfeb4a109a0da198bbe5312fad4cc04c4fe2d7e89ba479739fbfe5cadee585c3f001e6dd0b8484b386e2646fb8d5ae
-TIMESTAMP 2024-01-16T19:40:11Z
+TIMESTAMP 2024-01-17T01:40:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWm25tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWnL/tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDzfg/9HyvhKoBzgThQFp3PSrt/08Dqw3y9+9gLt5l8MjVzQS92cGrYDt3xrBmf
-94AjKwPt8qtwowi/Zf/JWGjztaXo4EPIq5vt6EpNavZc6g2wlaJTR3XtKjK2qLfB
-Mpnu14C3YYTOOpkyzk7rt8HQbyQ0Las52culQq89XS/mCJnsrqTw8GiA9HIoBvAt
-4KORmHdk98NUtAxNvLyraQSgYvw2qf+oG9mBMgIjDSy+HZFZenqugesxxCSmBvZz
-FhN2WLpGTDppM9vyUouazwef3YeRCLTIXa6f7f/zdmgBMOXxIjD+c5OuE1dC56VC
-Cve9ZqX5ZU7I/HP5J1aGVVkjnDvyCwELfJlGn/LvcIWv/eJEX81DOFJsLpRPWdcV
-4Dm5onctNfm5pkP+Cbe9rO2FLymbUsV3mC97EYJLglvKjSV4zEG9JAAoTaN94ute
-JXnawwVfpfoyMM/CipO4PwMzRBUyUgv0Xea5YhYBmYNzrbvs5mFNHKP2AFqRlTf7
-nTONsZsBcwIk6kTvyMyK180YwQ5kNFVTpQHh/pqabo7JuvmLf5/SobomUo7Ymytd
-BpXpf43h4IFaG5qj4iz79cdgGwwE85NDkxnLcn5FSyCm5BPw9AV+7+ahxTNN6EZP
-rbjwZ6kQF2d67InykWjST07UfVaUY6EW3GkM9/rtY+iKoOCmM8Q=
-=6P2E
+klDGoxAAp3JoIGrQe++0me8lQfXLu65nQ11uoIwwGMijhoi88rfvFBhJhD10QG/r
+g26aZRy8qbaeR7H3oRIGdirUNSSyNZN7Nft+0w3zGWfBnSo/zPdXLWLRpA/OPf25
+xNH9qltNtEbte0ry5RmTxkw+P9icQysp9Vu+CCDHJrc3cbqhYnNYbR1FYCRvofhS
+0FLNQ8h1HReTf50LY5fUv/M0PGAHyDKUTnz7G40tGcNs8cm6fAdLmGslx3bnJisK
+OALM6HoYDuN3mgHfX9FP/U54Us3tnsJRSD6+XCmS3Zx0hL7Wmew4nmctzly+wPHp
+RFXoSqR2gR+Tit5n83M4U07+syLOBkJ0JVDMrIlC8PEkogPWt6oi5ZVByMWjqDRo
+CpcdxP+j2ho4cdMBLXkJ/vLGjZVCMkQ4aQwZgcnLwQOi30Gmg90BeEEjSF0X4sH+
+L4lpkOa8d4uqHK7PvF1eu9DzHJHWi+CcQTZQNk5mDO9po2Jml6cZfuyA1Oo/yh2j
+ByVaRs6wx5nsmNBFMyOftQ6MQg6TYsDeXg1Z63ItE53nb5tkZ5WoE5dXLzvASL1k
+dletL4FfOiCQnQnLcjomiGxBFEm8dpQHJ3hKdGSyFL4YwjsI3C43J7nFFuY3auS0
+QUQURrqbR3DGlhT/rit0ay60P1vb9tTECr3gsmUOpsHg8VdMt44=
+=UoPT
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7de04419abbb..954d744bdbe1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jan 2024 19:40:07 +0000
+Wed, 17 Jan 2024 01:40:09 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 003f529bb705..670deb5b5f5b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 8aae6aa6649e..9ed8e449104c 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/setools-4.4.4 b/metadata/md5-cache/app-admin/setools-4.4.4
new file mode 100644
index 000000000000..2e520e79b83f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/setools-4.4.4
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/cython-0.27[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( sys-apps/checkpolicy ) test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Policy Analysis Tools for SELinux
+EAPI=8
+HOMEPAGE=https://github.com/SELinuxProject/setools/wiki
+INHERIT=distutils-r1
+IUSE=test X test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.4.4/setools-4.4.4.tar.bz2
+_eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=39ecf3dd702aba0107989d50c8ad5159
diff --git a/metadata/md5-cache/app-admin/setools-9999 b/metadata/md5-cache/app-admin/setools-9999
index b0c5b8d058f1..50910b5163c3 100644
--- a/metadata/md5-cache/app-admin/setools-9999
+++ b/metadata/md5-cache/app-admin/setools-9999
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-python/cython-0.27[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/checkpolicy ) test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-python/cython-0.27[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( sys-apps/checkpolicy ) test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Policy Analysis Tools for SELinux
 EAPI=8
 HOMEPAGE=https://github.com/SELinuxProject/setools/wiki
 INHERIT=distutils-r1 git-r3
-IUSE=test X test python_targets_python3_10 python_targets_python3_11 debug
+IUSE=test X test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=252193220aa7d38efd52985d88ee1d44
+_md5_=39ecf3dd702aba0107989d50c8ad5159
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 64a747393736..a2905e7d8207 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-staging-8.20 b/metadata/md5-cache/app-emulation/wine-staging-8.20
deleted file mode 100644
index 4bcc59afd824..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-8.20
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) || ( sys-devel/binutils sys-devel/lld ) 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(-)?] wow64? ( dev-util/mingw64-toolchain[abi_x86_32] ) ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup 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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[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 https://gitlab.winehq.org/wine/wine-staging/
-IDEPEND=>=app-eselect/eselect-wine-2
-INHERIT=autotools edo flag-o-matic multilib multilib-build prefix python-any-r1 toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP 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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( app-emulation/wine-gecko[abi_x86_32] ) ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:8.1.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 ) wow64? ( abi_x86_64 !abi_x86_32 mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=8.20
-SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.20.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.20.tar.gz -> wine-staging-8.20.tar.gz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d75a61cae8dca53b125ff83a0f0fb66e
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.19 b/metadata/md5-cache/app-emulation/wine-staging-9.0
index f1df21ddc59a..536718bf96b6 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-8.19
+++ b/metadata/md5-cache/app-emulation/wine-staging-9.0
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) || ( sys-devel/binutils sys-devel/lld ) 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(-)?] wow64? ( dev-util/mingw64-toolchain[abi_x86_32] ) ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup 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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libxkbcommon[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 https://gitlab.winehq.org/wine/wine-staging/
@@ -9,10 +9,10 @@ INHERIT=autotools edo flag-o-matic multilib multilib-build prefix python-any-r1
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP 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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( app-emulation/wine-gecko[abi_x86_32] ) ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:8.1.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( app-emulation/wine-gecko[abi_x86_32] ) ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:8.1.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 ) wow64? ( abi_x86_64 !abi_x86_32 mingw ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=test
-SLOT=8.19
-SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.19.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.19.tar.gz -> wine-staging-8.19.tar.gz
+SLOT=9.0
+SRC_URI=https://dl.winehq.org/wine/source/9.0/wine-9.0.tar.xz https://github.com/wine-staging/wine-staging/archive/v9.0.tar.gz -> wine-staging-9.0.tar.gz
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d75a61cae8dca53b125ff83a0f0fb66e
+_md5_=85fda99245c369b7d0b6652db0fdf71a
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-8.20 b/metadata/md5-cache/app-emulation/wine-vanilla-8.20
deleted file mode 100644
index d493e5a5151a..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-8.20
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( sys-devel/binutils sys-devel/lld ) 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(-)?] wow64? ( dev-util/mingw64-toolchain[abi_x86_32] ) ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[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-2
-INHERIT=autotools flag-o-matic multilib multilib-build prefix toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP 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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( app-emulation/wine-gecko[abi_x86_32] ) ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:8.1.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 ) wow64? ( abi_x86_64 !abi_x86_32 mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=8.20
-SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.20.tar.xz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f82417c0c3878978f1696e77a1c3bab9
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-8.19 b/metadata/md5-cache/app-emulation/wine-vanilla-9.0
index 266b0bac1435..cc3715235788 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-8.19
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9.0
@@ -1,6 +1,6 @@
 BDEPEND=|| ( sys-devel/binutils sys-devel/lld ) 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(-)?] wow64? ( dev-util/mingw64-toolchain[abi_x86_32] ) ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libxkbcommon[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/
@@ -9,10 +9,10 @@ INHERIT=autotools flag-o-matic multilib multilib-build prefix toolchain-funcs wr
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP 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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( app-emulation/wine-gecko[abi_x86_32] ) ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:8.1.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+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(-)?] ) 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(-)?] ) smartcard? ( sys-apps/pcsc-lite[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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] wow64? ( app-emulation/wine-gecko[abi_x86_32] ) ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:8.1.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 ) wow64? ( abi_x86_64 !abi_x86_32 mingw ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=test
-SLOT=8.19
-SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.19.tar.xz
+SLOT=9.0
+SRC_URI=https://dl.winehq.org/wine/source/9.0/wine-9.0.tar.xz
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f82417c0c3878978f1696e77a1c3bab9
+_md5_=1d9c44ccb8e7a77ad5a8995b43c4df49
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 242f1ea1c969..af578a1feed4 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/lesspipe-2.11 b/metadata/md5-cache/app-text/lesspipe-2.11
index c3cc2bb4da15..fa0ff4dc1eab 100644
--- a/metadata/md5-cache/app-text/lesspipe-2.11
+++ b/metadata/md5-cache/app-text/lesspipe-2.11
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/wofr06/lesspipe
 INHERIT=edo bash-completion-r1
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.11.tar.gz -> lesspipe-2.11.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c78898d79f9ed971db1143ad4a766bf5
+_md5_=b10964a029e10a0d087c3f814406aeb5
diff --git a/metadata/md5-cache/dev-build/Manifest.gz b/metadata/md5-cache/dev-build/Manifest.gz
index 1542ae380e65..56e10cf6466d 100644
--- a/metadata/md5-cache/dev-build/Manifest.gz
+++ b/metadata/md5-cache/dev-build/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/mage-1.11.0 b/metadata/md5-cache/dev-build/mage-1.11.0
index f82d8423a58d..f82d8423a58d 100644
--- a/metadata/md5-cache/dev-util/mage-1.11.0
+++ b/metadata/md5-cache/dev-build/mage-1.11.0
diff --git a/metadata/md5-cache/dev-util/mage-1.13.0 b/metadata/md5-cache/dev-build/mage-1.13.0
index f74638dbc1d8..f74638dbc1d8 100644
--- a/metadata/md5-cache/dev-util/mage-1.13.0
+++ b/metadata/md5-cache/dev-build/mage-1.13.0
diff --git a/metadata/md5-cache/dev-util/mage-1.15.0 b/metadata/md5-cache/dev-build/mage-1.15.0
index 8493a2520262..8493a2520262 100644
--- a/metadata/md5-cache/dev-util/mage-1.15.0
+++ b/metadata/md5-cache/dev-build/mage-1.15.0
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index bcf69901dc15..f50e168c74de 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.7 b/metadata/md5-cache/dev-cpp/highway-1.0.7
index 1b559be58765..ba251a27aee9 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.7
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/highway
 INHERIT=cmake-multilib
 IUSE=cpu_flags_arm_neon test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.7.tar.gz -> highway-1.0.7.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c885f959e95a50fc2d6deccf7dd3b45b
+_md5_=f2f84963997c636a2a7b976085df23c5
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index d81e43e8dd3f..602812349523 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240112 b/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240115
index f8799004e53c..17311bc15d1f 100644
--- a/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240112
+++ b/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240115
@@ -1,13 +1,14 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/dtc
 DESCRIPTION=Raspberry Pi userspace utilities
 EAPI=8
 HOMEPAGE=https://github.com/raspberrypi/utils
 INHERIT=bash-completion-r1 cmake
 KEYWORDS=~arm ~arm64
 LICENSE=BSD
-RDEPEND=!media-libs/raspberrypi-userland !media-libs/raspberrypi-userland-bin
+RDEPEND=sys-apps/dtc !media-libs/raspberrypi-userland !media-libs/raspberrypi-userland-bin
 SLOT=0
-SRC_URI=https://github.com/raspberrypi/utils/archive/193e6e34b40807cbeedee2e4abc3ef5165e14ae2.tar.gz -> raspberrypi-utils-0_p20240112.tar.gz
+SRC_URI=https://github.com/raspberrypi/utils/archive/32602f565c6cb854d1f2643b51a022991cea2b1b.tar.gz -> raspberrypi-utils-0_p20240115.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0e69375d6ce36d3f164f193e8ce4887a
+_md5_=ab4159d8c9afb1259ce54da01a5fb923
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fead7d2343dd..27fbd476a2c6 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2 b/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2
index 7d2b3dfecbed..7e9cf16fd835 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2
+++ b/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/gabime/spdlog
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.12.0.tar.gz -> spdlog-1.12.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1b7f0b2e4ca2d5550f447c3eadffa606
+_md5_=fbdf066a6e5a037d66ad33f8a3fbdf1b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 4a0a204ab4d7..fa961993078c 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/facter-4.5.2 b/metadata/md5-cache/dev-ruby/facter-4.5.2
new file mode 100644
index 000000000000..fd12a6c10ddf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/facter-4.5.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/hocon[ruby_targets_ruby31(-)] <dev-ruby/thor-2.0[ruby_targets_ruby31(-)] dev-ruby/ffi[ruby_targets_ruby31(-)] dev-ruby/sys-filesystem[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/hocon[ruby_targets_ruby32(-)] <dev-ruby/thor-2.0[ruby_targets_ruby32(-)] dev-ruby/ffi[ruby_targets_ruby32(-)] dev-ruby/sys-filesystem[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/simplecov[ruby_targets_ruby31(-)] dev-ruby/timecop[ruby_targets_ruby31(-)] dev-ruby/webmock[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/simplecov[ruby_targets_ruby32(-)] dev-ruby/timecop[ruby_targets_ruby32(-)] dev-ruby/webmock[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/yard[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
+EAPI=8
+HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby31? ( dev-ruby/hocon[ruby_targets_ruby31(-)] <dev-ruby/thor-2.0[ruby_targets_ruby31(-)] dev-ruby/ffi[ruby_targets_ruby31(-)] dev-ruby/sys-filesystem[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/hocon[ruby_targets_ruby32(-)] <dev-ruby/thor-2.0[ruby_targets_ruby32(-)] dev-ruby/ffi[ruby_targets_ruby32(-)] dev-ruby/sys-filesystem[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/facter/archive/4.5.2.tar.gz -> facter-4.5.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=77589bd5076aef2a500e241bd906102d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 67139a80ac79..837cf4641b34 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ba3815871316..8926395389fe 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/opencv-4.8.1-r1 b/metadata/md5-cache/media-libs/opencv-4.8.1-r1
index 44bb265daa6f..78093c055677 100644
--- a/metadata/md5-cache/media-libs/opencv-4.8.1-r1
+++ b/metadata/md5-cache/media-libs/opencv-4.8.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://opencv.org
 INHERIT=cuda java-pkg-opt-2 java-ant-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs
 IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda cudnn debug dnnsamples +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack non-free opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms tbb tiff vaapi v4l vtk webp xine video_cards_intel cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_popcnt cpu_flags_x86_sse4_2 cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/protobuf-23:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) cudnn? ( dev-libs/cudnn:= ) contribdnn? ( dev-libs/flatbuffers:= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( >=dev-games/ogre-1.12:= ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/cblas >=virtual/lapack-3.10 virtual/lapacke ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/opencl-headers ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( qt6? ( dev-qt/qtbase:6[gui,widgets,concurrent,opengl?] ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tbb? ( dev-cpp/tbb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( media-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk:=[rendering,cuda=] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( contrib tesseract? ( opencl ) ) cudnn? ( cuda ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib || ( qt5 qt6 ) ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib ) java? ( python ) opengl? ( || ( qt5 qt6 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ) tesseract? ( contrib ) ?? ( gtk3 || ( qt5 qt6 ) ) ?? ( cuda gdal ) ?? ( cuda openexr ) ?? ( cuda tbb )
 SLOT=0/4.8.1
 SRC_URI=https://github.com/opencv/opencv/archive/4.8.1.tar.gz -> opencv-4.8.1.tar.gz https://github.com/opencv/ade/archive/v0.1.2a.tar.gz -> ade-0.1.2a.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/4.8.1.tar.gz -> opencv-4.8.1_contrib.tar.gz dnnsamples? ( https://github.com/opencv/opencv_3rdparty/archive/a8b69ccc738421293254aec5ddb38bd523503252.tar.gz -> opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz https://github.com/opencv/opencv_3rdparty/archive/b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz -> opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz ) contribxfeatures2d? ( https://github.com/opencv/opencv_3rdparty/archive/34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz -> opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz https://github.com/opencv/opencv_3rdparty/archive/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz -> opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz ) contribdnn? ( https://github.com/opencv/opencv_3rdparty/archive/8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz -> opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz ) cuda? ( https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz -> NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz ) )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	java-ant-2	53b9c110af009f9f4548f5b129ae6fe6	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ba4e8b9802a886932f85df0ca22ccb2d
+_md5_=9366133c6efdcc79df86e6d88f01e942
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index bd4373a9155a..d337ebee92cf 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index 2ce4d49ca8fa..5f54eb10e4d4 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) sys-devel/gettext virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) sys-devel/gettext virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup unpack
-DEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( <media-video/ffmpeg-5:=[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( opus? ( media-libs/opus ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) x265? ( media-libs/x265 ) )
+DEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:=[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( opus? ( media-libs/opus ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) x265? ( media-libs/x265 ) )
 DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=8
 HOMEPAGE=https://tvheadend.org/
@@ -8,8 +8,8 @@ INHERIT=git-r3 linux-info python-any-r1 systemd toolchain-funcs
 IUSE=dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( <media-video/ffmpeg-5:=[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
+RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:=[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=ddci? ( dvb )
 SLOT=0
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a1016cd06c9cc75e1b3fc1fae53811f5
+_md5_=0aa093e66f806520b8df50106f4c10d6
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index be4f19e58012..378a737cfe2a 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/ffmpeg-chromium-120 b/metadata/md5-cache/media-video/ffmpeg-chromium-120
index 3f02d4115cc6..a226de00d16e 100644
--- a/metadata/md5-cache/media-video/ffmpeg-chromium-120
+++ b/metadata/md5-cache/media-video/ffmpeg-chromium-120
@@ -5,7 +5,7 @@ DESCRIPTION=FFmpeg built specifically for codec support in Chromium-based browse
 EAPI=8
 HOMEPAGE=https://ffmpeg.org/
 INHERIT=flag-o-matic toolchain-funcs
-IUSE=cpudetection debug +gpl vaapi vdpau vulkan mmal nvenc +threads cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop
+IUSE=cpudetection debug +gpl vaapi vdpau vulkan mmal nvenc +threads cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 cpu_flags_arm_asimddp cpu_flags_arm_i8mm cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop
 KEYWORDS=amd64 ~arm ~arm64
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 )
 RDEPEND=mmal? ( media-libs/raspberrypi-userland ) >=media-libs/opus-1.0.2-r2 vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) vdpau? ( >=x11-libs/libvdpau-0.7 ) vulkan? ( >=media-libs/vulkan-loader-1.3.255:= )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=120
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/ffmpeg-chromium-120.tar.xz
 _eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=31a0a61bece5111db705a6875d574e7e
+_md5_=24ff63e5efdf5376f972c8034fd5060a
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 36ba48dbc944..d725ffad93d0 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/etherdfs-20180203-r4 b/metadata/md5-cache/net-misc/etherdfs-20180203-r5
index 14f4952693a6..d805ffc2038f 100644
--- a/metadata/md5-cache/net-misc/etherdfs-20180203-r4
+++ b/metadata/md5-cache/net-misc/etherdfs-20180203-r5
@@ -8,6 +8,6 @@ IUSE=tsr
 KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=mirror://sourceforge/etherdfs/ethersrv-linux-20180203.tar.xz tsr? ( mirror://sourceforge/etherdfs/v0.8.2/etherdfs.zip -> etherdfs-20180203.zip )
+SRC_URI=mirror://sourceforge/etherdfs/ethersrv-linux-20180203.tar.xz tsr? ( mirror://sourceforge/etherdfs/v0.8.3/etherdfs.zip -> etherdfs-tsr-0.8.3.zip )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=45a1d35eb558ec27a1dbbdf98e7d33fb
+_md5_=64739342fdbc305a305f4b0d3fc20690
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 8c779f016397..54d6833722b9 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/busybox-1.36.1-r1 b/metadata/md5-cache/sys-apps/busybox-1.36.1-r1
index 8e4a27753f7c..8247991dfcd9 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.36.1-r1
+++ b/metadata/md5-cache/sys-apps/busybox-1.36.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.busybox.net/
 INHERIT=flag-o-matic readme.gentoo-r1 savedconfig toolchain-funcs
 IUSE=debug livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!static? ( virtual/libc virtual/libcrypt:= selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam )
 REQUIRED_USE=pam? ( !static )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.36.1.tar.bz2
 _eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	portability	225656ad6c6594fe3b0187bdd50707fb	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a631d4821269c431309e045be5ce2b94
+_md5_=dc91b75c4876ebfca2f4e3b415b5250c
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-3.6 b/metadata/md5-cache/sys-apps/checkpolicy-3.6
new file mode 100644
index 000000000000..aa534e1d3dd6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/checkpolicy-3.6
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex sys-devel/bison
+DEFINED_PHASES=compile install postinst
+DEPEND=>=sys-libs/libsepol-3.6
+DESCRIPTION=SELinux policy compiler
+EAPI=7
+HOMEPAGE=http://userspace.selinuxproject.org
+INHERIT=toolchain-funcs
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-3.6
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/checkpolicy-3.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0e34645fcd7ac9e99a1eadc989e842c1
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-9999 b/metadata/md5-cache/sys-apps/checkpolicy-9999
index fb091c7e80f6..b19ae9d5c71f 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-9999
+++ b/metadata/md5-cache/sys-apps/checkpolicy-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/libsepol-9999
 SLOT=0
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6c26f03400f6da5e028c13a201a902fd
+_md5_=0e34645fcd7ac9e99a1eadc989e842c1
diff --git a/metadata/md5-cache/sys-apps/mcstrans-3.6 b/metadata/md5-cache/sys-apps/mcstrans-3.6
new file mode 100644
index 000000000000..f87434d88a8f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/mcstrans-3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=sys-libs/libsepol-3.6:= >=sys-libs/libselinux-3.6:= dev-libs/libpcre2:= >=sys-libs/libcap-1.10-r10:=
+DESCRIPTION=SELinux context translation to human readable names
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-3.6:= >=sys-libs/libselinux-3.6:= dev-libs/libpcre2:= >=sys-libs/libcap-1.10-r10:=
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/mcstrans-3.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=13ad2d5250b5db71d78c91815a006d7c
diff --git a/metadata/md5-cache/sys-apps/mcstrans-9999 b/metadata/md5-cache/sys-apps/mcstrans-9999
index 0744c9399d93..5aed0abd06e9 100644
--- a/metadata/md5-cache/sys-apps/mcstrans-9999
+++ b/metadata/md5-cache/sys-apps/mcstrans-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:= dev-libs/libpcre2:= >=sys-libs/libcap-1.10-r10:=
 SLOT=0
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=50e40b7998581704c6139c5aa0e4b6ee
+_md5_=13ad2d5250b5db71d78c91815a006d7c
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-3.6 b/metadata/md5-cache/sys-apps/policycoreutils-3.6
new file mode 100644
index 000000000000..ad6222fc481b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/policycoreutils-3.6
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-libs/libselinux-3.6:=[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsemanage-3.6:=[python(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.6:= sys-libs/libcap-ng:= >=app-admin/setools-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] audit? ( >=sys-process/audit-1.5.1[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pam? ( sys-libs/pam:= ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] )
+DESCRIPTION=SELinux core utilities
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=python-r1 toolchain-funcs bash-completion-r1
+IUSE=audit pam split-usr python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
+RDEPEND=>=sys-libs/libselinux-3.6:=[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsemanage-3.6:=[python(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.6:= sys-libs/libcap-ng:= >=app-admin/setools-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] audit? ( >=sys-process/audit-1.5.1[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pam? ( sys-libs/pam:= ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) app-misc/pax-utils
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/policycoreutils-3.6.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8dacae9abdc238f30ed5a38a62e41581
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-9999 b/metadata/md5-cache/sys-apps/policycoreutils-9999
index 11f3c3048de5..16e1cc56fffe 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-9999
+++ b/metadata/md5-cache/sys-apps/policycoreutils-9999
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/libselinux-9999:=[python,python_targets_python3_10(-)?,python_
 DESCRIPTION=SELinux core utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib python-r1 toolchain-funcs bash-completion-r1 git-r3
+INHERIT=python-r1 toolchain-funcs bash-completion-r1 git-r3
 IUSE=audit pam split-usr python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ccbb3a7024c629b573ed8ffac11a5fbb
+_md5_=8dacae9abdc238f30ed5a38a62e41581
diff --git a/metadata/md5-cache/sys-apps/restorecond-3.6 b/metadata/md5-cache/sys-apps/restorecond-3.6
new file mode 100644
index 000000000000..fb43a6c67e1b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/restorecond-3.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:2 >=sys-libs/libsepol-3.6:= >=sys-libs/libselinux-3.6:=
+DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=systemd toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=sys-libs/libsepol-3.6:= >=sys-libs/libselinux-3.6:=
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/restorecond-3.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0c5fe7763a6b8fcf5d081496d2ec2d46
diff --git a/metadata/md5-cache/sys-apps/restorecond-9999 b/metadata/md5-cache/sys-apps/restorecond-9999
index 651ae8f0ea97..ccd5c3255405 100644
--- a/metadata/md5-cache/sys-apps/restorecond-9999
+++ b/metadata/md5-cache/sys-apps/restorecond-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 >=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:=
 SLOT=0
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e0da3df07626cf4bac6a6392595248c5
+_md5_=0c5fe7763a6b8fcf5d081496d2ec2d46
diff --git a/metadata/md5-cache/sys-apps/secilc-3.6 b/metadata/md5-cache/sys-apps/secilc-3.6
new file mode 100644
index 000000000000..eebe3e993ba4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/secilc-3.6
@@ -0,0 +1,15 @@
+BDEPEND=app-text/xmlto
+DEFINED_PHASES=compile
+DEPEND=>=sys-libs/libsepol-3.6
+DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-3.6
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/secilc-3.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=7c54c36fa8cdae0c6137af907ebe5062
diff --git a/metadata/md5-cache/sys-apps/secilc-9999 b/metadata/md5-cache/sys-apps/secilc-9999
index d4d524cfb000..be9b7c153a24 100644
--- a/metadata/md5-cache/sys-apps/secilc-9999
+++ b/metadata/md5-cache/sys-apps/secilc-9999
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/libsepol-9999
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c35912e2211c14e9d9247a1d66566f61
+_md5_=7c54c36fa8cdae0c6137af907ebe5062
diff --git a/metadata/md5-cache/sys-apps/selinux-python-3.6 b/metadata/md5-cache/sys-apps/selinux-python-3.6
new file mode 100644
index 000000000000..b62a3d94ca60
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/selinux-python-3.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=sys-libs/libselinux-3.6:=[python] >=sys-libs/libsemanage-3.6:=[python(+)] >=sys-libs/libsepol-3.6:= >=app-admin/setools-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-process/audit-1.5.1[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) >=sys-apps/secilc-3.6 )
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=sys-libs/libselinux-3.6:=[python] >=sys-libs/libsemanage-3.6:=[python(+)] >=sys-libs/libsepol-3.6:= >=app-admin/setools-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-process/audit-1.5.1[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] )
+DESCRIPTION=SELinux core utilities
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=python-r1 toolchain-funcs
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libselinux-3.6:=[python] >=sys-libs/libsemanage-3.6:=[python(+)] >=sys-libs/libsepol-3.6:= >=app-admin/setools-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-process/audit-1.5.1[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/selinux-python-3.6.tar.gz
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c63219a12a4e7e9174e6e330944eeb66
diff --git a/metadata/md5-cache/sys-apps/selinux-python-9999 b/metadata/md5-cache/sys-apps/selinux-python-9999
index b56355fa6c8e..4a461cd95232 100644
--- a/metadata/md5-cache/sys-apps/selinux-python-9999
+++ b/metadata/md5-cache/sys-apps/selinux-python-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bcc4c579c8b2212f760cd9c04e0cd989
+_md5_=c63219a12a4e7e9174e6e330944eeb66
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-3.6 b/metadata/md5-cache/sys-apps/semodule-utils-3.6
new file mode 100644
index 000000000000..7b1183af566b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/semodule-utils-3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=sys-libs/libsepol-3.6:=
+DESCRIPTION=SELinux policy module utilities
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-3.6:=
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/semodule-utils-3.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=da253896e6c64196bed4f0ac7bc48ad1
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-9999 b/metadata/md5-cache/sys-apps/semodule-utils-9999
index 5be6b503c458..2f322a735ccd 100644
--- a/metadata/md5-cache/sys-apps/semodule-utils-9999
+++ b/metadata/md5-cache/sys-apps/semodule-utils-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/libsepol-9999:=
 SLOT=0
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7912f7ccfb0abc97c9246888bdc9e5c4
+_md5_=da253896e6c64196bed4f0ac7bc48ad1
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index b38cafe41264..fa7fc3421028 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240113-r1 b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240113-r1
new file mode 100644
index 000000000000..355d0cd7f99c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-13.2.1_p20240113-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 app-alternatives/yacc >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-debug/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=13
+SRC_URI=mirror://gcc/snapshots/13-20240113/gcc-13-20240113.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-12.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	12c52b8a89ca88012258d132b4abbef3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=7344e03c706eb38758ed0f2b1efabd8b
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 750073bfe6a9..c23dbadcdbb8 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libselinux-3.6 b/metadata/md5-cache/sys-libs/libselinux-3.6
new file mode 100644
index 000000000000..e71ef0d87b5c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libselinux-3.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ruby? ( >=dev-lang/swig-2.0.9 )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ) elibc_musl? ( sys-libs/fts-standalone )
+DESCRIPTION=SELinux userland library
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=python-r1 toolchain-funcs multilib-minimal
+IUSE=python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~riscv ~x86
+LICENSE=public-domain
+RDEPEND=dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ) elibc_musl? ( sys-libs/fts-standalone )
+REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/libselinux-3.6.tar.gz
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d6396690f583eb66e8e1a668aca3dbac
diff --git a/metadata/md5-cache/sys-libs/libselinux-9999 b/metadata/md5-cache/sys-libs/libselinux-9999
index 8cd66ea7183a..9a7d31b5208b 100644
--- a/metadata/md5-cache/sys-libs/libselinux-9999
+++ b/metadata/md5-cache/sys-libs/libselinux-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 dev-python/pip[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ruby? ( >=dev-lang/swig-2.0.9 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) elibc_musl? ( sys-libs/fts-standalone )
+DEPEND=dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ) elibc_musl? ( sys-libs/fts-standalone )
 DESCRIPTION=SELinux userland library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 INHERIT=python-r1 toolchain-funcs multilib-minimal git-r3
-IUSE=python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=public-domain
 PROPERTIES=live
-RDEPEND=dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) elibc_musl? ( sys-libs/fts-standalone )
+RDEPEND=dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ) elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 SLOT=0
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7c10ed7881b6016212ae0313ec74fecb
+_md5_=d6396690f583eb66e8e1a668aca3dbac
diff --git a/metadata/md5-cache/sys-libs/libsemanage-3.6 b/metadata/md5-cache/sys-libs/libsemanage-3.6
new file mode 100644
index 000000000000..ce46d4e335c5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libsemanage-3.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/swig-2.0.4-r1 app-alternatives/yacc app-alternatives/lex virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+DESCRIPTION=SELinux kernel and policy management library
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=python-r1 toolchain-funcs multilib-minimal
+IUSE=python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libsepol-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0/2
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/libsemanage-3.6.tar.gz
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=ef824c32058d757d222e9000f55ebb1f
diff --git a/metadata/md5-cache/sys-libs/libsemanage-9999 b/metadata/md5-cache/sys-libs/libsemanage-9999
index 6f7a4d3b0556..98b4a70fe202 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-9999
+++ b/metadata/md5-cache/sys-libs/libsemanage-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0/2
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bc2596da8504d7f85991fdd1737f5295
+_md5_=ef824c32058d757d222e9000f55ebb1f
diff --git a/metadata/md5-cache/sys-libs/libsepol-3.6 b/metadata/md5-cache/sys-libs/libsepol-3.6
new file mode 100644
index 000000000000..b3791902f4a8
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libsepol-3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SELinux binary policy representation library
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=toolchain-funcs multilib-minimal
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~riscv ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0/2
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.6/libsepol-3.6.tar.gz
+_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=eedb64d5d4beb37b7200b170d7d13776
diff --git a/metadata/md5-cache/sys-libs/libsepol-9999 b/metadata/md5-cache/sys-libs/libsepol-9999
index 32b857485c25..7c469ec18a39 100644
--- a/metadata/md5-cache/sys-libs/libsepol-9999
+++ b/metadata/md5-cache/sys-libs/libsepol-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=test
 SLOT=0/2
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6b8e6d2585b0c470a74dd2cf98df5a89
+_md5_=eedb64d5d4beb37b7200b170d7d13776
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 618e718333e6..d29927169af4 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.12.0 b/metadata/md5-cache/www-apps/icingaweb2-2.12.0
deleted file mode 100644
index 209e97194977..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:8.1[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.2[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.13.0 >=dev-libs/icinga-php-thirdparty-0.12.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=7
-HOMEPAGE=http://www.icinga.org/
-INHERIT=depend.apache multilib
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:8.1[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.2[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.13.0 >=dev-libs/icinga-php-thirdparty-0.12.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.12.0 -> icingaweb2-2.12.0.tar.gz
-_eclasses_=depend.apache	1d51223a0def226481583990f380519c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=becbcb6ba7c03c3e672bee21007524d5
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 743980075165..2dc6dbf834ad 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.5.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
index d513030bc4f5..8cdfca6edfa8 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos
 INHERIT=meson-multilib
 IUSE=gles2 wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2?,wayland?,X?] wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/demos/mesa-demos-8.5.0.tar.bz2 https://mesa.freedesktop.org/archive/demos/8.5.0/mesa-demos-8.5.0.tar.bz2
 _eclasses_=meson	e322276188f86eacb29ae081ba5485c8	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0643fdde9afea9c168c9b6b5dcf8b70e
+_md5_=e8242bbbcdbc408e12b23137d402ba6b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d114abafccfe..08473fbae537 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 16406 BLAKE2B 831dc046ea406344dbd9b591c255d828ca04da7c452f7b4a63f8a58504ddc325c6724ae02796dd39c5d2e9e24c95b59fa4c581422c416b448d20859db6c8b728 SHA512 cb96126e3ee8e1077dc15f453e8dc01ee546de8fa380c05ab4dd76adcda8cf6375c2ce86b50de95976012ea5e4584c099fb16f7c6439eededbf93235a12f77e3
-TIMESTAMP 2024-01-16T19:40:11Z
+TIMESTAMP 2024-01-17T01:40:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWm25tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWnL/xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDPHxAAm3lfKkrEEkKK6TzUlhIJX86raLE36ooayJWbsnAtRh21WjhzhGdFOTBd
-aUuKZQ0US47bvBGMKYgKY+TOghzQ6axxslXxLCBNtM/p4DR7VVNj0iGM7AVsqfui
-080RCNQuPHEJ8OPoOC7nveAuFnSwew3Sp9Vf/raGs+vYQOtMVjduut9rJHflSi+F
-BAqReTmH0YR6KMKri3iYQPe9e78tmGahkmh7C8YpoL6bmFpkk66nZp3rF+9Y7ZZl
-LHrd3BXe+Mmt8i4MDKIIjPgeyBNljX23iYugAyGs8yhpbBXDdQyLt3H0SjpLjFq1
-dsJ0ysJkis06LQcW29TwAGmLgiq11XeSK3X8fYQ8Tjg0j3Lh68dEc0YSQEFAQpR2
-iP1a616DhRbK7+9Qn/807StkYhIZBcdQs37+9FLFwfWDx5ZD1wl1Qo14o8cBWoUw
-2gtlR5/uCRh7HCgXk3dehDO4FmwU1ZhyhvU1QNc0jH11ydYWotbOncPCBlPwM0UU
-47xjAKVp2mA8nqH7JmirW3zREuhx22CIzKSrVYw/88yHOKklX4Dpx6KcwsHaBepp
-XeiaJKwasd1o22Kamm4kf059T/eZvQli3KW1PhxTAMvkzjlptDOMam54APWWsCJL
-n5NotbznesdGK8xbq16OSCGU6vUXswwXeqiYocIFXQVwoEoUSfY=
-=q9Vf
+klBQdA//SnBJLoPh4O5XTDPL7a786bA1knzxEJPIsNT7HeGzHA+TQ6DoFO20r6Tw
+4dn/CCvjTQyy0Np6p296SFW5MLnGPVuThFGXbEC2DUwURkc1sMeehl9FL7IUhyn2
+ib6w8Dv3yYteGs8NJJnVj0cJvWc8HX7c5N5Cpg8jIc/8gbXQk7SBjSMgLTIwYunr
+me70xu2oa8el7fg5zE7XQmes4N7uSDkVJ5wCudetQGpBmlqItIkLREQg8ubXWIF3
+nQtrBo78fQf3upvA1uHACCYd64KZu2jnCFf7EdpmOLCuOzLKWG++DS+BWffoDi9h
+l5yboxCGZrN70UeskDOPP1iBm/Teebfbiv49d356461dkpnrli3N/EEFLNppS5mk
+1B871hnAER6rRJCn6ksAAGNC6hBWoAo83KWNbf14in1ZZKYdl0lkdKZmr84twQgu
+6clokmEVAqq7mjOGYydyuX73TZIeVartqkBJyrtGSJAh0rOztacVG8D/zSxPBVvY
+D+2FkJdmp5IR/klJnW0iWxVowA8orhoYRZ7S7F6YASqfLYc6y8SUOCsBvDhXg7eX
+WtwhuOepyfleaVIo8+4FsLsRYJzoBhhRFjpaVPIY7HxXOnnWdSESWtZtOEqDZv4T
+B5qMUjfotOg91UG1TANM0uKz61aMJfMaan5yk2t/QfMrbRdJW8Q=
+=7/tX
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e13bae89e6b7..954d744bdbe1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jan 2024 19:40:08 +0000
+Wed, 17 Jan 2024 01:40:09 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 97f4dec72c06..9f4a7bcc0aad 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jan 16 07:40:07 PM UTC 2024
+Wed Jan 17 01:40:08 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 18aec0cce95c..98fae0e2461a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jan 2024 19:45:01 +0000
+Wed, 17 Jan 2024 01:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f6f300d0e813..4d4cbcbcac3c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-24b8ae0cdeda9b790495acbfe5c21ca665968746 1705432938 2024-01-16T19:22:18+00:00
+c7b146ac346a4e3f09e471a439c1181204652021 1705454968 2024-01-17T01:29:28+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f7d02d92097d..9f09d5ea0db1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1705434001 Tue 16 Jan 2024 07:40:01 PM UTC
+1705455601 Wed 17 Jan 2024 01:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7de04419abbb..954d744bdbe1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jan 2024 19:40:07 +0000
+Wed, 17 Jan 2024 01:40:09 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 4464733cc5ab..4bc508491b39 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest
index f80a3da88ff1..917ebcf28e55 100644
--- a/net-misc/etherdfs/Manifest
+++ b/net-misc/etherdfs/Manifest
@@ -3,7 +3,7 @@ AUX etherdfs-20180203-musl.patch 332 BLAKE2B 6667c63ab0a24b9921b850b3a0f7134670c
 AUX etherdfs.confd 345 BLAKE2B 4e299984a7680aca036a80e5e0c5efa5ae699de0726dca8ae7368e214a0d3b4f6d90b10ac46f29d8d29d4f6b5aa7547e38d6371fc95d63bc0488a1d4d88b72a1 SHA512 41f2425c6ed387414a9ccdacfa259b55f9089effff4028e849a897a13e92013fcf705e50120d88cc7af183f3af3dc4a2359b0f6516c677298a31201ffcfdb6ea
 AUX etherdfs.initd 242 BLAKE2B b3109ef0534637cecb3d116254457c562e59c44042e94b3cfa6579e0cf84f9365f47dda26a7c84a0989312e9384befe8131b97259845e38cdf2bd84056c855f0 SHA512 b30385aa569831ba0989cf73bd35321577116a77014bcf1d6235b7ddde039ccbe822b590bd8b2da2ffccf5c9161cb977aaea810f8b49126e64265ca77b82c20b
 AUX etherdfs.service-r1 191 BLAKE2B 2ec8070a38ec09a86b90d33e12a5418b68d6650eaf943d39d5b411ebc25835172ea9b25441d08efd63dc168482aa4bd77ee60403e5c29e3e985126d16cd37f10 SHA512 249d55bfb0334a0b834909aa4d2b180ac1f1df7a10906cfc865b1e95c011509a7402e77fcb0139ddd3d336f202baa1027bda0ec1ab736ff58d19debaeb057939
-DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439
+DIST etherdfs-tsr-0.8.3.zip 13139 BLAKE2B 5907974d9c4c2f97f737ead66ab5a3f0934d5086a07cfdc2483e7ef236d993d784a3686811bdf615f85a6112647e9d538de463d6453536e13c04a5ae7c082393 SHA512 489d61f13a1233ce94ce8ce4b0ad7400cceab3fd4b864efff94fe142f0703b6d76713a66ebd941b979af2d515192ed196ba1b33ae283647b5181dfbed27a8d97
 DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e
-EBUILD etherdfs-20180203-r4.ebuild 1247 BLAKE2B 2f6e7a34da2f370611649a1ec18cd47336a5f2a338f58d214665bc2292e1cc7eaf39c79bde8c4e5905caa99724d8dc1da8526592565dc9d95e022e411da29014 SHA512 c4104aedeb2dedc05663bcc8308c48665d532acea0b98e69b014d894efcb89796ebf1d7df9b59fa0d50665fa011038f0cf9f60ac137fdab00c0f945c2e965ce1
-MISC metadata.xml 629 BLAKE2B 794c6caaf34566e3add393fe39c9889f30433594e74241e3f3cf56b964f3b765d4cb13e9338df520a398179adad079c272479e0b8dbc7feae7cd42aba4f76df0 SHA512 33afeaa1e364e05170919978cfbed059a5db1a5a0ec2494d8ccf4b63392690d80e68e7e4b151e7ab5cbd38bbc630487be52e6a455b4d2e5fa10a4f0c65c1d30c
+EBUILD etherdfs-20180203-r5.ebuild 1265 BLAKE2B 26014fb9e02ae188476734b8a4ff5f1e2900c9795fef626935b963666bfed9d4bbceb2dc1210c52c5cd07979dd7f69f99dd0c403e532e72806b952f85c08aedb SHA512 4af80dd8f2a4aebc90b32074e2219b7b52da5543aba22702a3af6a47d9efbd03b1cbec9235f4a043ba92997de743ba274279a83be2b7637453e7e08d418254e9
+MISC metadata.xml 643 BLAKE2B 4d6f63cd15b249bf4eb57f0da0bdd3d0f3e035a1631ffec21f98da908a3eb05436996b26807f34811681be2fbce444115ebc5a02f5429043897f1c2f45d06ccf SHA512 95bff31533e055c11e403d543503442b68c5d4ffb6ea876425fe2aafef39d744e62f9d73895672d41a39a4637020514fce61fc0f02dcd38e4c78df6b8b16f852
diff --git a/net-misc/etherdfs/etherdfs-20180203-r4.ebuild b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild
index 9a85cc57a896..6dae1d2c447e 100644
--- a/net-misc/etherdfs/etherdfs-20180203-r4.ebuild
+++ b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_PN="ethersrv-linux"
-MY_PV_TSR="0.8.2"
+MY_PV_TSR="0.8.3"
 MY_P="${MY_PN}-${PV}"
 
 inherit systemd toolchain-funcs
@@ -13,7 +13,7 @@ DESCRIPTION="An ethernet-based file system for DOS"
 HOMEPAGE="http://etherdfs.sourceforge.net/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${MY_P}.tar.xz
-	tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${P}.zip )
+	tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${PN}-tsr-${MY_PV_TSR}.zip )
 "
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-misc/etherdfs/metadata.xml b/net-misc/etherdfs/metadata.xml
index d9337e277c43..24fb39b58029 100644
--- a/net-misc/etherdfs/metadata.xml
+++ b/net-misc/etherdfs/metadata.xml
@@ -11,7 +11,7 @@
 		to a local drive letter, using raw ethernet frames to communicate.
 	</longdescription>
 	<use>
-		<flag name="tsr">Build the TSR program for DOS, which acts as a client.</flag>
+		<flag name="tsr">Install the precompiled TSR program for DOS, which acts as a client.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">etherdfs</remote-id>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a5d87da40011..9ef9a4c0aa01 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index b4c5290715be..7b623bc478bb 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -35,3 +35,4 @@ move sys-devel/automake-vanilla dev-build/automake-vanilla
 move sys-devel/automake dev-build/automake
 move sys-devel/slibtool dev-build/slibtool
 move sys-devel/libtool dev-build/libtool
+move dev-util/mage dev-build/mage
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ca9c20692436..9a3e0e7af6bf 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -689,7 +689,7 @@ app-emulation/wine-staging:pcap - Support packet capture software (e.g. wireshar
 app-emulation/wine-staging:perl - Install helpers that require perl (winedump/winemaker)
 app-emulation/wine-staging:samba - Pull in net-fs/samba with winbind for NTLM auth support
 app-emulation/wine-staging:sdl - Enable gamepad support using media-libs/libsdl2
-app-emulation/wine-staging:wow64 - Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental/WIP, USE=abi_x86_32 is recommended for complete support)
+app-emulation/wine-staging:wow64 - Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, may have worse OpenGL performance or other issues compared to USE=abi_x86_32)
 app-emulation/wine-vanilla:capi - Enable ISDN support using net-libs/libcapi
 app-emulation/wine-vanilla:crossdev-mingw - Use sys-devel/crossdev for the toolchain rather than dev-util/mingw64-toolchain (requires manual setting up)
 app-emulation/wine-vanilla:dos - Pull in games-emulation/dosbox to run DOS applications
@@ -703,7 +703,7 @@ app-emulation/wine-vanilla:perl - Install helpers that require perl (winedump/wi
 app-emulation/wine-vanilla:samba - Pull in net-fs/samba with winbind for NTLM auth support
 app-emulation/wine-vanilla:sdl - Enable gamepad support using media-libs/libsdl2
 app-emulation/wine-vanilla:vkd3d - Enable DirectX 12 support using app-emulation/vkd3d
-app-emulation/wine-vanilla:wow64 - Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental/WIP, USE=abi_x86_32 is recommended for complete support)
+app-emulation/wine-vanilla:wow64 - Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, may have worse OpenGL performance or other issues compared to USE=abi_x86_32)
 app-emulation/winetricks:rar - Pull in app-arch/unrar for extraction of rar-compressed game files
 app-emulation/x48:readline - Enables support for libreadline
 app-emulation/xe-guest-utilities:xenstore - Use xenstore binaries bundled by Citrix instead of building app-emulation/xen-tools
@@ -6334,7 +6334,7 @@ net-misc/electrum:cli - Enables the CLI interface
 net-misc/electrum:qrcode - Enable QR code scanning with media-gfx/zbar
 net-misc/electrum-ltc:cli - Enables the CLI interface
 net-misc/electrum-ltc:qrcode - Enable QR code scanning with media-gfx/zbar
-net-misc/etherdfs:tsr - Build the TSR program for DOS, which acts as a client.
+net-misc/etherdfs:tsr - Install the precompiled TSR program for DOS, which acts as a client.
 net-misc/ethflop:tsr - Build the TSR program for DOS, which acts as a client.
 net-misc/eventd:libcanberra - Enable plugin for sounds via media-libs/libcanberra
 net-misc/eventd:libnotify - Enable plugin to relay events to notification daemon (Note: not required for local notifications via net-misc/eventd)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2ac560494ac4..acd4c5d88275 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 511aeded612b..b4fea4a957c3 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -18,7 +18,7 @@ AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e75
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e SHA512 8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
-EBUILD busybox-1.36.1-r1.ebuild 10860 BLAKE2B 3903f87f402225bdb9c90f91cf443ac23f2ae65187d507ccaf5d429bf694536377d0158bc56a631a3e1162a311b59764cb3c9c41d92e4a12f9c4540367630b5a SHA512 7bea77ed004f214032fe3e301833e381a94a848f6b8c4a45478b306831d1163ceb661f9ebcd76a18ffc88d97c4605c20c35782099bc83bf9c626ab8c24da0743
+EBUILD busybox-1.36.1-r1.ebuild 10854 BLAKE2B 7c772d4cb5756da7b006967e1c5252ee38c0c2038374c897d6c330398502f7fff683af298bd541c71d1039c4454d629a4320bdf3333e725d7d58b22e0c4e8994 SHA512 4a963fb887897271613b0f4fe4d7cefe835a83def99929043402d58d1eb9d9194d795ce72a66a68d5a995d76353cf7cfdd0b73cfac38e64681c548a1fa57d652
 EBUILD busybox-1.36.1.ebuild 10488 BLAKE2B 5e9d61e5c9682786e2137be08ac54d948101e479c3231bd4035e17bc8df1ae8a97c576218e8991f3b5b544ef09d2bc16885bd149ecb33daff1f8374acbfe1169 SHA512 8eab6a264efac5287cfd24fea758c96928ea5cfeb8f6fbb06ed1d7ff5f3421d3582a9d801f637ca35e89fa568ad9a2ae36e0afee8b29c32a1bc65924ad748eb3
 EBUILD busybox-9999.ebuild 10860 BLAKE2B 3903f87f402225bdb9c90f91cf443ac23f2ae65187d507ccaf5d429bf694536377d0158bc56a631a3e1162a311b59764cb3c9c41d92e4a12f9c4540367630b5a SHA512 7bea77ed004f214032fe3e301833e381a94a848f6b8c4a45478b306831d1163ceb661f9ebcd76a18ffc88d97c4605c20c35782099bc83bf9c626ab8c24da0743
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.36.1-r1.ebuild b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
index 5028429069a8..3c52e56325e1 100644
--- a/sys-apps/busybox/busybox-1.36.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 19869985fab2..cce5d369c85e 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,4 +1,6 @@
 DIST checkpolicy-3.5.tar.gz 69904 BLAKE2B e02ccad07534568a1bbb612330018bbe486800ea40df20ed6f9dc38c88aff7f8858782a28ba7915a58c3bb384f180eb8da7a8fe97a92bcb9baa61eec18da6cbc SHA512 fcd490d865af3b4350c32c5dd9916f8406219841e1e255d8945c6dcc958535247aa27af5597a6988e19f11faea7beeabcb46e8ba2431112bb4aa5c7697bca529
+DIST checkpolicy-3.6.tar.gz 70684 BLAKE2B d32a8b86897bd4a08caf61a096a691c8d049fa7b5b4561f4847e0dfbb62a82fc6c3ddb5be163c7cd6163491c50513aec14e4c67842f256f48688b26178c2887a SHA512 0d48fb385b4d1e66d562e40b6e794406f46d8803cc504705b26547130cb13b65fab5fdb4fc032b1c95d4f91862ff134a89fffde854c5ce466c2dd2657e416070
 EBUILD checkpolicy-3.5.ebuild 1089 BLAKE2B aa0a7a244530c2b7a8231750b0479c485c567bacf53b79570ffc7ad4cf1c5cc9b6060d63dfc86f16e6fbfbeff69a85cfa773080953d241d6029fd0c0b14f8d66 SHA512 86d8586db0842ab0df9da87739c2e40fde0483777921e3b67a1933ba27e233ede07cefd6668664f2c25b74eda8281ad5b52bd07363ac4080f1f725f047d059f5
-EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B 6c906c311f009a3674dcde42019f8f68e3cdcbd568c2eca8a55eb4b6ccd48346852fafe93296b9ced65f17b7051f82831d55ea26a0f23be74ac5159f65f93c82 SHA512 3f12684e340c6bd3001ec05c90647d5218a343038652fb607fefb94f511bb247e7019bb8ea85016cc1161f90f1fd9b1706203fe6f82f3b73dcbfe6319d4c33a6
+EBUILD checkpolicy-3.6.ebuild 1093 BLAKE2B 3593f18258575213cdd8ed15117789d5ccd325028dad25cec4a670f88e7e0d124af3880b49a59bed9f76cbf596aa154a4c3879a5bb42fac5c1a1e446c7c0afe5 SHA512 adbb39edafcc2a5987d8c2588ae19dd2eeff58f8df5d25b41d4a3036cfe1b6c6ae6391796219b0d9c423d941af9cd362746cf16643f09841139d34c1d4c2719d
+EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B 3593f18258575213cdd8ed15117789d5ccd325028dad25cec4a670f88e7e0d124af3880b49a59bed9f76cbf596aa154a4c3879a5bb42fac5c1a1e446c7c0afe5 SHA512 adbb39edafcc2a5987d8c2588ae19dd2eeff58f8df5d25b41d4a3036cfe1b6c6ae6391796219b0d9c423d941af9cd362746cf16643f09841139d34c1d4c2719d
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/checkpolicy/checkpolicy-3.6.ebuild b/sys-apps/checkpolicy/checkpolicy-3.6.ebuild
new file mode 100644
index 000000000000..6d5e91d8b18a
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-3.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+BDEPEND="sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsepol-${PV}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	if ! tc-is-cross-compiler; then
+		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	fi
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 496db82366f7..6d5e91d8b18a 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 72432eab4db0..29974e4ceb9e 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,5 +1,7 @@
 AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579
 DIST mcstrans-3.5.tar.gz 45091 BLAKE2B c6604075a6b37d7bf10e2daee40d9f034a26c5d56b81973cbc3b39621bdf5e2cb1d5906e91942e09ff077a14facafcc2464995675d8df31930707033fac5db90 SHA512 f4d3b04750e197c6abd31f1642af4b53a4fe0e968952a7ade992909f903d7486c1e72733963453563fcbc9745273c8238f169f520550df1470e7f6e4d6e56665
+DIST mcstrans-3.6.tar.gz 42199 BLAKE2B 0f1b4ed212994037b062c42887e2629ae7374e0cbbd79692588ce164440eafddc6d7ab15d58f6064d68781a5a8fd614c9cfa734c4dbe1d3fea1dbb0f8191ddc1 SHA512 2c01a70741675faa41e8a9243f3cf08b558e568d7ae343874ff9c269473ba2748d42e0b45871d82d6c9b01bf71547835d547683f1aa5a8cf626708c7c69569fc
 EBUILD mcstrans-3.5.ebuild 1060 BLAKE2B 13380e1ed9b6aa3eb2176749619722da35e2654d54f79715f85389a0f8f3f4c9789001f1f4cba61d5509dd01c2ec8ad1307099f893e5b771efb21b5a97caf2dc SHA512 e7544d50c5448e3c03acc9fa38474dcd89ce28a309d26478436d9861a8add24890232fdd92f85e99bca3fa2aac4d4047fb73894db617e3e42204fc150dc74507
-EBUILD mcstrans-9999.ebuild 1064 BLAKE2B ec64721658c8d2f4f768cdb67eae4f9715c9b56c2a343d38260924c76ea97270679913775cfbea6966fa6ce777198b94f61b0230c433deb054726fa2cb5482cb SHA512 bab61b4da72b5428b7758d0f434281eb0697819ce1f3b0d1d12dea59f80ebad7fd54152d99b28c4fa14df82a6b24136bfbb32b4528e0ae14664a7daf283a67d1
+EBUILD mcstrans-3.6.ebuild 1056 BLAKE2B 96c4afa9019306bbfb420cb34a626bf45129b90ed103f23df3c4cfea1bfce11c013c8da1fb35e6a55819c814038f5cf5c9d0559f9e94ed451b473be614bb21a6 SHA512 93c4833c33c9bbbfefe0f3c65dba768e10873ee8c18bcfeb3656c89802ac9dab9fb3f000d651364a2d19ea5e5563fc5114c761cebed9ea1d630fdc2c847dd42b
+EBUILD mcstrans-9999.ebuild 1056 BLAKE2B 96c4afa9019306bbfb420cb34a626bf45129b90ed103f23df3c4cfea1bfce11c013c8da1fb35e6a55819c814038f5cf5c9d0559f9e94ed451b473be614bb21a6 SHA512 93c4833c33c9bbbfefe0f3c65dba768e10873ee8c18bcfeb3656c89802ac9dab9fb3f000d651364a2d19ea5e5563fc5114c761cebed9ea1d630fdc2c847dd42b
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.6.ebuild b/sys-apps/mcstrans/mcstrans-3.6.ebuild
new file mode 100644
index 000000000000..bbd7a4cc0378
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre2:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index 5cad428935de..bbd7a4cc0378 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 DEPEND=">=sys-libs/libsepol-${PV}:=
 	>=sys-libs/libselinux-${PV}:=
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index d304a35cd778..8575a31ae4e2 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,6 +1,8 @@
 AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
 DIST policycoreutils-3.5.tar.gz 775639 BLAKE2B 777b8564484e89385db7a184c4cad9a99aabf1fd1ac41abd5826c7e6ad29118ae9d6f0d0fd968b6ced87f2f04bc6d7cd207b67428151522915367f656fb8d3f8 SHA512 7978ef6b7a278c6384c9b397734d03c4932c8aefecceaa1e6a1345be27b253dbe276fdcd219ce83ad732c6ed55d53bbc3254e39bccadd67d2cd1152a14749444
+DIST policycoreutils-3.6.tar.gz 755682 BLAKE2B a8b180c8006989192d152651dcfa51856956780bfe1139cc1dc0162eb66ba1eef4f7d64f68a48479572b02e2e97a68c7082722a745d22a9453e8378373319e3c SHA512 e1f32e6e0310b879a5aadab157b103314a61bf3b8fd59c1212d701fbf39900e3b9a0b727338988103d784a7e505355a871ba519dd91520b135a3b9dae40bf1b0
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.5.ebuild 4648 BLAKE2B 1c728597f8b0b13e2bb513a81acdeecd45a3eba75f4a20e9ac779e7e315d75a337355452b1d6338aef0d44c1e7d25c65103a56c81cc35160119b400365f19541 SHA512 76b1b2cfa0d1dbb591351cd4ee14ebaf187e3a34c3f4af5695df86ecf28acb94126098e37bb99b066c3f8f77fd410e87b5c6963c18f8e2e54efe1dede36d5dbb
-EBUILD policycoreutils-9999.ebuild 4652 BLAKE2B 1b52298d80edd39cacd62c4927019acae23ca1ab6b325078c9696229edf1f02e7fd4fc6d36659031f7377e92427be6cf76a2fdef51171f9bddb8fc2c3a23df18 SHA512 e9314a444b819dc2928363cc62642ab4a38d94d6ee027e80964c04589e21b264630e56fd2f96509c6e8ffb7156c92be508113103a85135e9cd8123a33e1eb8d5
+EBUILD policycoreutils-3.6.ebuild 4644 BLAKE2B 622bcf81f955799c14026d64e4e23fa8704a781ea85a4e8e35675b4454beed1ac6a45031e838922b9e6229d75d8ea44fecc46b0f10a7606cfeaa7d1827ea9424 SHA512 a00d351f31674324396e5f0278de55174ad24e04a79837ea2c3e4c6e887faa12a133451843fea0f5174fa02bbc19f5bd224553ce59378407874743f4b3f04f7e
+EBUILD policycoreutils-9999.ebuild 4644 BLAKE2B 622bcf81f955799c14026d64e4e23fa8704a781ea85a4e8e35675b4454beed1ac6a45031e838922b9e6229d75d8ea44fecc46b0f10a7606cfeaa7d1827ea9424 SHA512 a00d351f31674324396e5f0278de55174ad24e04a79837ea2c3e4c6e887faa12a133451843fea0f5174fa02bbc19f5bd224553ce59378407874743f4b3f04f7e
 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.6.ebuild b/sys-apps/policycoreutils/policycoreutils-3.6.ebuild
new file mode 100644
index 000000000000..b8625ff49cd8
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.6.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 toolchain-funcs bash-completion-r1
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+EXTRAS_VER="1.37"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${P}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${MY_P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="audit pam split-usr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=
+	sys-libs/libcap-ng:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}"
+
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	if use split-usr; then
+		dosym ../../sbin/setfiles /usr/sbin/setfiles
+	else
+		# remove sestatus symlink
+		rm -f "${D}"/usr/sbin/sestatus || die
+	fi
+
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
+		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 6df44f548cc8..b8625ff49cd8 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
-inherit multilib python-r1 toolchain-funcs bash-completion-r1
+inherit python-r1 toolchain-funcs bash-completion-r1
 
 MY_PV="${PV//_/-}"
 MY_P="${PN}-${MY_PV}"
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index ca14be518ed7..82a410139cdf 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,5 +1,7 @@
 AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6
 DIST restorecond-3.5.tar.gz 19070 BLAKE2B 6db7d0fc9085a07669d346e025836a94acca610572e986e2c90974b0bd21b55e66b57a2dafd7d42011bed5f06363b654f5431ac43530fccf7b68d3edd9d63850 SHA512 80cb84e62c7072a12fe57ebaafc0bcb441c853862c67f9ea35b86faa2d8e49ea22a70b9e05a3ff24e8ce08ca2999604d7961efd534f89167cd6fcb05c852de40
+DIST restorecond-3.6.tar.gz 18020 BLAKE2B 306b4a7c9990c0b2f229cc7963dbd0481df5f9fbecd709b37d254839177fc604f6f85ac19235209f4fbb12d9186f01dd71a11f98deca5d01bd70c415240ddf5a SHA512 e21fa23bfea488f2bddd01b4bab353f22863e09247078e47db9852995d7a0153aee6483cbeaaaf033b482b60f80affad0b6a3e829f935c3901c034a7efb1ebef
 EBUILD restorecond-3.5.ebuild 1157 BLAKE2B 4c2ae607b891a74674b86d62645fe393a73fea3b0e0d486d7b063b8acdec7cdde7b6fc21c8ca6088fec0abbbbd6866a2c1e766bab2a4d1a38795c091bd3b89c8 SHA512 abb97b62baf954c97b2627cae73c6db11aeb3945fad5674904c83dff379e3010e0f8723fa07576bc8a15c28c8da38d86c393c66beeb46945f314a354dfca0e80
-EBUILD restorecond-9999.ebuild 1161 BLAKE2B 59fc9cdff1f1d21f54c29325215de5189e34e7129c6a98a54cd1ebbaf540195044f99d82dd14b079578c2b3cd103d06cb25f601b44bdd8c9bd5156d9a60918ec SHA512 52ae3ee7c60e057b929f57d7c487b993aadb2a155e80db038539fcd4da79fa6fdc7f459d4869b6b33f9e5c32b92788da740a482231b2f26b941d852175663482
+EBUILD restorecond-3.6.ebuild 1153 BLAKE2B c1659b0f8f6445f3a39656a6828ae7f7a40c9a6f246a28f174d7c9328692113be9452300bf81773b673dbe186b58fea92c300117dbf4698bc04a2b64a52ad082 SHA512 65e783a2ed4176330d5a1142b3b86a7ed0a3ceba2dc968fb7497fadf8d0fcedd9cc557f0cf37f6941af416a01fb3a690a1b5086937fb6f16d9edfb2f9a94c9cd
+EBUILD restorecond-9999.ebuild 1153 BLAKE2B c1659b0f8f6445f3a39656a6828ae7f7a40c9a6f246a28f174d7c9328692113be9452300bf81773b673dbe186b58fea92c300117dbf4698bc04a2b64a52ad082 SHA512 65e783a2ed4176330d5a1142b3b86a7ed0a3ceba2dc968fb7497fadf8d0fcedd9cc557f0cf37f6941af416a01fb3a690a1b5086937fb6f16d9edfb2f9a94c9cd
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/restorecond/restorecond-3.6.ebuild b/sys-apps/restorecond/restorecond-3.6.ebuild
new file mode 100644
index 000000000000..794b84bc99e8
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-3.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="dev-libs/glib:2
+	>=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+		install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index a55a218edd6c..794b84bc99e8 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,6 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 DEPEND="dev-libs/glib:2
 	>=sys-libs/libsepol-${PV}:=
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 593d18cb7177..91e83a357de6 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,4 +1,6 @@
 DIST secilc-3.5.tar.gz 180803 BLAKE2B a42620318b312a5ef35565e3b40a89fd7ff44aaf73de835bc349f927193121b72c07bd2151a8a6b2cee53e2699a3ae6bb246084e18a181d334ebc082fdfdc56e SHA512 eff37a981072c4b9c7c15bf4709db8797d8af5325883515f5c2fe611136b24419f6d01c797e4f131c9c08e1ba40576fcb2094b1e34325aae8351b6299bdba3dd
+DIST secilc-3.6.tar.gz 185186 BLAKE2B 47fdc281cad69339eb23226a277df8c8086557fe3a2c7f013eef38bbfcd62584e318ce2d79552388617687b39c37e67a1328b808becbecad364253b7527d3a52 SHA512 91381aae1444822c7897729c1695ca221a4226dcec042b2223a55800d1247510ef2033b844d8d0627623fb15b8169a626fb0ca2efeee8090635219c4139eabf5
 EBUILD secilc-3.5.ebuild 842 BLAKE2B 387d0db499db6576edae25dac89014d5e16525a1603b7562af7ad7e082e0515e22f890c0a938ef648876a4fe2a2b6eb638ed41aab606584b6f9bb78b1b76e7f8 SHA512 522010e0db519d7b55b2cca421ddf80d89ea60f52c3104bfa8a81e6ab7e1e53632f782ecfac04782e2c1d0fd20a5562c038af7e216ae80930a15633a92569f1a
-EBUILD secilc-9999.ebuild 846 BLAKE2B fc36451aaccfa42879ca010acd0d23377b7cd770c593fb9b834cf7c49c23a1bcfba0fc5d6829cee157fee96f11b33124dc4e9bcf3a3c582e533af4cb2a8d4cea SHA512 e9023aac358442a32a3be721a941d73a50c38a6b6f56adc37118860553bc15f49d39418c3cc2c17c62bfb11058e20f3652f6979368cee47a51031536423049cd
+EBUILD secilc-3.6.ebuild 846 BLAKE2B ae4db57ea74b12b316aac674d0200e5b4e2e7a3585d9343ae937b455c169c259de5d38d9bfe743444ca812abc037e48542a856f2d2e97d04460e106dc523a0b4 SHA512 65e49b4b3963335f751de4e2f95156ac62a158fd259d93b184d60ead9604e06a0887bc0970e965b3321564283165144ef9a75924e816e70615543415369402a0
+EBUILD secilc-9999.ebuild 846 BLAKE2B ae4db57ea74b12b316aac674d0200e5b4e2e7a3585d9343ae937b455c169c259de5d38d9bfe743444ca812abc037e48542a856f2d2e97d04460e106dc523a0b4 SHA512 65e49b4b3963335f751de4e2f95156ac62a158fd259d93b184d60ead9604e06a0887bc0970e965b3321564283165144ef9a75924e816e70615543415369402a0
 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.6.ebuild b/sys-apps/secilc/secilc-3.6.ebuild
new file mode 100644
index 000000000000..5c59b25c3742
--- /dev/null
+++ b/sys-apps/secilc/secilc-3.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index 76eeb7422445..5c59b25c3742 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 73a77643f420..d15f2e7f4b64 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,4 +1,6 @@
 DIST selinux-python-3.5.tar.gz 3604439 BLAKE2B 5a7fcd303c337cb0f5ae0066d13c945bb5cacaba472c7b17f0496295294998fcc6d81c153720ef704b749a01590c28b48b4f471a48fc386b8f02564c3550250b SHA512 2ac176a9f078f2b2721e5871ba21e92041eed54fc692fd8d809ff14327beee6de63b3084d0f1053a640b9e40bcc6461498915bb9b038a658cd772f77d80fd217
+DIST selinux-python-3.6.tar.gz 3633272 BLAKE2B c2b99779eda2c7698f7f68740e3136cbfa5ab471a5d154142aafd2694d8c32aa605df3609a3667c687449d3ba44e72bcc3b37c36adecba8e34fcc629b9f04de5 SHA512 6289f3f2a3038b2cb62f6b3b12c729a9981c34a5ee80c0830e6316e8c77f5283dffa46007f6e7dc073332b829ed9953ba54e64c986fb18c7dc40759ec0375dc9
 EBUILD selinux-python-3.5.ebuild 3162 BLAKE2B 0273b02c35abae8d4aa5798b71398f9c949640fe09a2f40ab3347662cb5d12b979bd700ea6841eb6fa3dbdfdbcdcbdd9040840dfead606d24c51a388429981a6 SHA512 346c103082f36ba32ec65831109236df893bf7c9debec153c8a2ce604533a79bfcbb5d9f73d4dffa0366651df32b3c8080b0ed7d1ec4d972f928a0dbbdec32c8
-EBUILD selinux-python-9999.ebuild 3166 BLAKE2B cfa0a61e9b8c3da3c6ae9252a742b0ab199e7ce015e37426e36574837b2370971e913bd7c64629accc06c26fc49ced92fc67c33943c76ba201ffacfba0ef4339 SHA512 7a7094de4756093fc5624398c95faf85c90493282b75dfe8189a15772bce365cbd04bd3e7f09e71645a2439e35ebb803359b4f8f752cace6b81b532f3de4c9f7
+EBUILD selinux-python-3.6.ebuild 3167 BLAKE2B e3e65bf739532fb11ebf30cf445a28a3f949c56887f08c4fce9b8150e8cbeb7fc46cdb44017694f86355ebcf63e83cf5c6125f74357aba82fd6bb26267e8b623 SHA512 d3b837e4ed9b3ba280227a64d9d40c217d41d9263e4c172eefeb27c3945ab25a249a4aaf3dc51dfcd59d5f596780b6b75b84373a37e155e83fcdf11511474aaf
+EBUILD selinux-python-9999.ebuild 3167 BLAKE2B e3e65bf739532fb11ebf30cf445a28a3f949c56887f08c4fce9b8150e8cbeb7fc46cdb44017694f86355ebcf63e83cf5c6125f74357aba82fd6bb26267e8b623 SHA512 d3b837e4ed9b3ba280227a64d9d40c217d41d9263e4c172eefeb27c3945ab25a249a4aaf3dc51dfcd59d5f596780b6b75b84373a37e155e83fcdf11511474aaf
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.6.ebuild b/sys-apps/selinux-python/selinux-python-3.6.ebuild
new file mode 100644
index 000000000000..20a1fea452bf
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.6.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN#selinux-}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
+	>=sys-libs/libsemanage-${PV}:=[python(+)]
+	>=sys-libs/libsepol-${PV}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=sys-apps/secilc-${PV}
+	)"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_test() {
+	testing() {
+		# The different subprojects have some interproject dependencies:
+		# - audit2allow depens on sepolgen
+		# - chcat depends on semanage
+		# and maybe others.
+		# Add all the modules of the individual subprojects to the
+		# PYTHONPATH, so they get actually found and used. In
+		# particular, already installed versions on the system are not
+		# used.
+		for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
+			PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
+		done
+		PYTHONPATH=${PYTHONPATH} \
+			emake -C "${BUILD_DIR}" \
+				test
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 470211f8d553..20a1fea452bf 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index f200cc6464b2..30066cb3d1ae 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,4 +1,6 @@
 DIST semodule-utils-3.5.tar.gz 14383 BLAKE2B a1bb432013bca1023d99b32f43b2c972b6b807a4677f9d8c9fb9aff10225232506f3ecca86fc231b4c63d04582a91a1c4218f87ce5532a4d35a26a09665c6f10 SHA512 7c32f425ae71745040d1c6a6585149a1efb319913aa9d4c8bf185b0a4216dc66378fa38595b171614ee3ae4ade997d3ae56a060346e334faec55c419a87d71dd
+DIST semodule-utils-3.6.tar.gz 12844 BLAKE2B e5e7501c412649f471e89cc89569d6c51421e0b46f172f243ce778bbe3a2c658ef9a92e3f3e1e07fb3358e25f63e004b6bd4b56619472fbcae8cb5b916d54170 SHA512 16b58bbafcaef9a2e8e34a20d0e1e4024a9044024de8fa3137c5ba1b9af600afac51c15ccb648dd6bff77747c047f4c9feafeea07c19b1eb14955acc92697a48
 EBUILD semodule-utils-3.5.ebuild 876 BLAKE2B c9d57a97fb559460aaec7b355a981192ef5b79db015475b7ba923c5b89a2f1df49ac45bd7d1c59de757cafa13b07a89f5dcd924df9f975c9c8c02725ed025081 SHA512 ff1ce29a9662b041a3c18e4d7c8477856c0090111d67bc4f9531e4e3486235432ea4f7b20e46c61516fbbde61ca7c39c9a2f51a5436c9057e67e7b3172194a3e
-EBUILD semodule-utils-9999.ebuild 880 BLAKE2B 3624682497456dbe8eb0f8a7e9fb082da518ee0592b995958c8b06565450993c19f77039911e0f088619c1c81529626e6e81471cd2c1cc8995f5a070b36abeb3 SHA512 6f11547af02e16e53a7f8dcac9808fdf631c485c123bdb45dbe210e8f2816f88f6889de49ec7631684ab47669b408fbd87b8d8ffa454d8bc8b74b7e7ceb91443
+EBUILD semodule-utils-3.6.ebuild 872 BLAKE2B 920343123a3612f5c3694a67bd91fb3838e74f63a1b937a6175c071fc7ca80c6063eaefc6cde517c5e365ef56b4d96d99e65d0a88ce459a9e390079656112c1c SHA512 6a8f6dbbb03e49a4318b69dbd23ee0741d44b591450e98365989b7ab2f868b08bd5124f826d873f6487661cd0fb24d28221a0521538a0bf98177d8d32efd55c4
+EBUILD semodule-utils-9999.ebuild 872 BLAKE2B 920343123a3612f5c3694a67bd91fb3838e74f63a1b937a6175c071fc7ca80c6063eaefc6cde517c5e365ef56b4d96d99e65d0a88ce459a9e390079656112c1c SHA512 6a8f6dbbb03e49a4318b69dbd23ee0741d44b591450e98365989b7ab2f868b08bd5124f826d873f6487661cd0fb24d28221a0521538a0bf98177d8d32efd55c4
 MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.6.ebuild b/sys-apps/semodule-utils/semodule-utils-3.6.ebuild
new file mode 100644
index 000000000000..621cfaf21ea4
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index 525188411f40..621cfaf21ea4 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 DEPEND=">=sys-libs/libsepol-${PV}:="
 RDEPEND="${DEPEND}"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 383f4a5e8f5a..d481fb4f8d3d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index bb4f8f2fefb6..547efd40e49f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -29,6 +29,7 @@ DIST gcc-13-20240106.tar.xz 84368432 BLAKE2B e352f3994ff4e5626a8f278d488098b8718
 DIST gcc-13-20240113.tar.xz 84356052 BLAKE2B 1fbfffc9f2afe443158e3f26182c8bdc3f3b599c5582762117831ecb6e6d3c1c69e8d2e5932f45eb7d534c3967e08a9f7b1bcec31aa5d7ac608bebff9f35120c SHA512 a59886f707cf18f684295031d4d9fc5b03396face1705e61852d7de98729c53ac4cf209e951d00c232f14e9dc48eee40dd92487db7cb6ad0e80f2339d6d9503a
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-11.tar.xz 46340 BLAKE2B c9f12ccbe7bb7ba3a2afec16695e69b062429779d544f5614e1ef0617751e54d77eb9bb6e19dc8c6132c57e630f0e77e2cc20cf2c77e0e79d03a6e57b9ba53c6 SHA512 a09801ecefccc66830607986a622bbcc5f217ba08da4ac9f68436e422b5a19042c60c7d5fcb75d4fe9ad9008ab06278382c9798b319ed9630c2e97fa09c3a344
+DIST gcc-13.2.0-patches-12.tar.xz 47404 BLAKE2B ed018bcd7429d1c7aace746cbfc4e59dae409fc0a35231320c1b44c96fff0d912eba5c72109c2deb883f5368159df02148b2d4373396b34da882164c61fe4387 SHA512 b7872a03870bce7b633e4af4329b24fe8f3d50d6d9173f63549f606ce062787748af7f79e7ec4afeb768968d6e8462a849bd1b94316ea6bb284551f99e811617
 DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B 4a8700a8d44bfaa84926f8bfd0da4c5b0c0377f47fc0679456e909f7c9029b9cf1b72c0ba0bc505d9035d5c38e27f7e5b029727eaf2bc7aca417a6be966b2f43 SHA512 f440c97e6782ecb8581d41608e31a648ac426e2d870bc1d171da7794cdeff2fd0546cae0c7214e72fd3a00ead8a5c66f3f633b670b74553a2f3a40378b51f20c
 DIST gcc-14-20231217.tar.xz 86943032 BLAKE2B 8d5ab21fedffad0d4d4e02201c74f3b90cfabe5c2c1abbc048b6c4d179cbf3977cffc6bfc1b7b679d0276b66f86d58ef5c0b8451a4fcb75b88b7240fd7baf41c SHA512 23d8e6dd76aff0a5d7687ce8753aba7bdc374d3330553314da378af84ad629e67dbb532ba416816ce81812857c4c54e31cc5460d3f86619d7a9fb368328ff11d
 DIST gcc-14-20231224.tar.xz 87027056 BLAKE2B 412a0e8c82063f3aac828620648e5a57942dc2028408904290f7051b5756fe1f78d81fea8d1fba607db57e1905104ed236f86fc7d07b0bb35f407ce6c91f6e4a SHA512 c05eaa660732cbe57e7390afa9218eb99253dd58a00f376287dfd4765ed43acc4672635031439226b2e068899796a20ef14e5ac610f32ca31e285a4cdfa2f65e
@@ -65,6 +66,7 @@ EBUILD gcc-13.2.1_p20231216.ebuild 1680 BLAKE2B dd776c332de13307fefdd9ce3115e30e
 EBUILD gcc-13.2.1_p20231223.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20231230.ebuild 1681 BLAKE2B 60c4e7fc3a3aea345109fd1f8a988afacff8720369fe4989066914ea7d7875aa320f78bccb6ec2098710026347b4a57f3bfb0052c1b8f5e3185ee0128ba1b841 SHA512 2b85102f972612ee31b9910b95ed7a5f50fe463bf7d89bb21c2d8b29c755a8cb4dd2fc74adf386364f1b951e02e4cd1f6a219fc98331ba93f9aaa67beda98f6f
 EBUILD gcc-13.2.1_p20240106.ebuild 1681 BLAKE2B e92aea675a8a79fe9781590310f190a3bf512bd9f687becc89782c86db26ade815a65431a7fafbfb1c4e8bc6039687ab7b435e63b0867185a00421b41ae56fa6 SHA512 51c275f9cf92cfcf232579d66086de9ac41cd65fea4c2771ca346788fe752bfe1ef90d99b2bdc963d508cb8a21c44564b1592d888b6a344079d53008a8325c29
+EBUILD gcc-13.2.1_p20240113-r1.ebuild 1680 BLAKE2B 36b0504fa8b04c1ecfce3bec881a0b439b135c1fbfed1c4990f30d3f6ecbd385a19565e1ca4fda3ce51874d45de388ae37b91667d77a7b656cf5ed5c27ea11eb SHA512 af943c182a76d1a3e1a44384c6386a632689a3ab241f23a6e09167b417cde4f116b097669109b92a4c2c3d48b2a4ef78e85aab293ebe44d0e452d42063c8e7ef
 EBUILD gcc-13.2.1_p20240113.ebuild 1681 BLAKE2B e92aea675a8a79fe9781590310f190a3bf512bd9f687becc89782c86db26ade815a65431a7fafbfb1c4e8bc6039687ab7b435e63b0867185a00421b41ae56fa6 SHA512 51c275f9cf92cfcf232579d66086de9ac41cd65fea4c2771ca346788fe752bfe1ef90d99b2bdc963d508cb8a21c44564b1592d888b6a344079d53008a8325c29
 EBUILD gcc-13.3.9999.ebuild 1589 BLAKE2B bf6463d9ba5db2a0d494941a33cc7a2be6fd01fc75222c1de50997555b70ebaf2a374dd9f61ffc3eafc1befe23ebedb36123e4f2366cb623b69f1ed566a1a3b1 SHA512 2138f692eca45b998e5675fde63a5b36dbc1dbdec36d2aecf5695c12c51caeaa578a443bc9e795de9e711a55bef79dbf5ce9751a151002bf1625df90b1bb9ca4
 EBUILD gcc-14.0.0_pre20231217.ebuild 1596 BLAKE2B b82b52e7652b6872edea7820cb8d25106b974aa5b28aa1ed68ecc721f6025e67d5f240be05e1456b644789f6404646d2ad98b64a80028183255bec0f70d5d1d4 SHA512 604729d35c656b6ab17df319e7bc78275d83fda8425e8d5835ea61a716a819108593b855c6835a3cc12ba2c664c6eaa7a114d5fd971e5cb85eeb592fb04af808
diff --git a/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild
new file mode 100644
index 000000000000..71eb3b2b9651
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="13.2.0"
+PATCH_VER="12"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 72d9df9b51c5..198ef37edd43 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index fb0399138752..2812c2ee200f 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,4 +1,6 @@
 DIST libselinux-3.5.tar.gz 211453 BLAKE2B f7f3067c4bb0448e18bd7085135f11d94ae99728949480a655c0f660486817beb5829d8a43dff7bce286ccd50705b0c657bde85970f01c794e01fb707f469d8b SHA512 4e13261a5821018a5f3cdce676f180bb62e5bc225981ca8a498ece0d1c88d9ba8eaa0ce4099dd0849309a8a7c5a9a0953df841a9922f2c284e5a109e5d937ba7
+DIST libselinux-3.6.tar.gz 194210 BLAKE2B 615198d47ecfb4b6274810cbe32cce5953dd44d1d04e8ce244213dc4ddbd61cde3515f4650046b805cf98f341aba718af8d7a9e1d66773172031ac19599f6032 SHA512 182dcdf3510083ff4b9376a4a6d6a7b33905ac3c5e974c188bf3965686c54b663162c543ecf15eab75102f3c91a2502d33d0f1104dec01dd9b14737ef3f2b544
 EBUILD libselinux-3.5-r1.ebuild 4112 BLAKE2B 8787a7c9c9c5a6f52fbab464530539119ff1a1e8acfd61fee8738794bc79aebaf89e03b6f0ab82cd92bc8e3b56bd6346a3ca0f502b0fb6c0f9c55d0a8ba2635a SHA512 eed2053ed74bdfeea643b4495410c0174884a7ae9a94c1dea37a63367649b8a1c1aed9cf2d85f624e216ba709340ef336e7627be664fe85d5e666a95e253f429
-EBUILD libselinux-9999.ebuild 4081 BLAKE2B 653263477834909cbdf597ad7fe6f672a4d35bed5c50dd34e1eabc412b176eb0c5c37f630701f1a9072605b537a66dca6eec7f5fa685d220dfd16815fd5882db SHA512 1f66c199a91bf0f051103488efcb87c77c0790d86e8644d1ab93d0048afe5b2ed08701efdfe33109c01766744aa8df7ade990ecafdd305050ca4e0302fd39404
+EBUILD libselinux-3.6.ebuild 4081 BLAKE2B c3b3c5c5963632a63c2303e5072e69cc6c36029f938bed0766bee89799192a1b16735f163ffebea29705f5d422ffc655e17501d514f228e936bdb087cfbcdfc8 SHA512 34fcb915d280ad495cf25aca9f6b3810ae5403d3faa10f04dc7a6d928f44981fbe954709061e99bb3532520b9d9085ca377c2ac6fa718fcb59dc6f010fd13c14
+EBUILD libselinux-9999.ebuild 4081 BLAKE2B c3b3c5c5963632a63c2303e5072e69cc6c36029f938bed0766bee89799192a1b16735f163ffebea29705f5d422ffc655e17501d514f228e936bdb087cfbcdfc8 SHA512 34fcb915d280ad495cf25aca9f6b3810ae5403d3faa10f04dc7a6d928f44981fbe954709061e99bb3532520b9d9085ca377c2ac6fa718fcb59dc6f010fd13c14
 MISC metadata.xml 649 BLAKE2B 0d4704823be4492064b2d69a31581397cdedc9e5d564090d9770aa79124c53a66f98290fb4de22abb4f81e732267589ad1df3beda2bb71a3cf5a70f84b885dc4 SHA512 6b240fad142e4ba6457f70c83fb3171c6869ed4ac5729d51b8cc159b2471959c24a0a290ff91fa1d90e0f24f96be76a69487174de22c603539f3fc0e7109a561
diff --git a/sys-libs/libselinux/libselinux-3.6.ebuild b/sys-libs/libselinux/libselinux-3.6.ebuild
new file mode 100644
index 000000000000..941b189dd857
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-3.6.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# No, I am not calling ruby-ng
+inherit python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	python? (
+		>=dev-lang/swig-2.0.9
+		dev-python/pip[${PYTHON_USEDEP}]
+)
+	ruby? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		USE_PCRE2=y \
+		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			emake \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2=y \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				pywrap
+		}
+		python_foreach_impl building
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		building() {
+			einfo "Calling rubywrap for ${1}"
+			# Clean up .lo file to force rebuild
+			rm -f src/selinuxswig_ruby_wrap.lo || die
+			emake \
+				RUBY=${1} \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2=y \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		USE_PCRE2=y \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2=y \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		installation() {
+			einfo "Calling install-rubywrap for ${1}"
+			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+			rm src/selinuxswig_ruby_wrap.lo
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				RUBY=${1} \
+				USE_PCRE2=y \
+				install-rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			installation ${RUBYTARGET}
+		done
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a || die
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
+				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
+				|| die "Failed to recompile contexts"
+			fi
+		done
+	done
+}
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index f5475a7744c4..941b189dd857 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 # No, I am not calling ruby-ng
 inherit python-r1 toolchain-funcs multilib-minimal
@@ -26,16 +26,16 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32"
+IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 		ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 0912a664eefb..d24049c14ec7 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,6 +1,8 @@
 DIST libsemanage-3.4.tar.gz 185177 BLAKE2B 45276ae6f54cf3dc453bc0d99fb4d7439970bb14ff5b909ebc5511ec31bce1d2bdc477ba9c1fb4fd04ab494ccb37cd8bf47a90d81460c2974af2196d9019bf67 SHA512 831dc789545bb9a0b009bdb4f7fe52f6197ad8325946640f886a960d08e40b8a69eccd5a70cce51466bb5cb7f742feb78d19a9ec63383fbd03aa451508677e73
 DIST libsemanage-3.5.tar.gz 185060 BLAKE2B 3e08b15cb6b335a2747bd5f0bd84f74abdd22a7e8ec91ebb443ca6fe3886d5e8cd2827fefdaa0e9caf2af3280cffbf593ee828fee54dd423a21b257493cc754c SHA512 959fbd0d6bc6849da6caa13dc41c3f8818cbbd29f04b5d2ac7246c4b395b4f370f113a04cc9cfcb52be2afebfa636013ac4ad4011384c58c7ce066a45cae2751
+DIST libsemanage-3.6.tar.gz 182583 BLAKE2B 3ed9ef06601093983fa41ad6ab9f7eeae241dce98937db04efca6f421afcfd3f59cf5e51d24c596ae03997a398949ed84fbdf629518e3c382a5453129b0a87ab SHA512 8998b6a1b254a9673b99ae4d70a1edc769bb728a44f573cdf62e0a9c9392b77644ee2d70e1936a2f8a9a7f8b063ce98a981f4b8b7060f5b82791889330d69364
 EBUILD libsemanage-3.4-r1.ebuild 4405 BLAKE2B 337f44e1d668ed4189b1067285d10c50ead3f917de1fbc768a2cc4c2720faa3de6e7e8af1e4ee9318ccc37aba065fb37433b34d26ff708130c3f57fac2532cdc SHA512 9ab61ab57e6b6e158a6a26cadac1766d4b80c76542933ee0d0daa77c77979232feb88ff602c99e521979b5aff65430d707c0265b269c95d3c4f8fb52a6c215ab
 EBUILD libsemanage-3.5.ebuild 4405 BLAKE2B 337f44e1d668ed4189b1067285d10c50ead3f917de1fbc768a2cc4c2720faa3de6e7e8af1e4ee9318ccc37aba065fb37433b34d26ff708130c3f57fac2532cdc SHA512 9ab61ab57e6b6e158a6a26cadac1766d4b80c76542933ee0d0daa77c77979232feb88ff602c99e521979b5aff65430d707c0265b269c95d3c4f8fb52a6c215ab
-EBUILD libsemanage-9999.ebuild 4409 BLAKE2B 4b6879108a250db306c5b64e8a0f590af90e732b6fe55c0b7deec12b63f1d1683cd66c191eddd633777d1fec485405177c67c2e3b721eb2ac3b13a03353dc603 SHA512 2885b3b2e5ee8ea57bb85bae50a2228e90fe54d2dc0b6d2394a6759b0c0b926a302443dd398cb5dd3c16ed8566e6a24f0b0183ccf1738b6b7515c2737d960c4a
+EBUILD libsemanage-3.6.ebuild 4410 BLAKE2B d6926284fa62a98fe9cea873d95059ece06a954401c3d4769d315434f49565ea691029bbd8aa7d3e1918a2ed5a447091444ede1df292a8a5f03d05a0a5593199 SHA512 cefbf0b85ada632525eae3cc0b57f3baf0ddf0990302853274e1db18a124a05b1e600b34960aff50f2db263b7df4b8f66b80ab04b202bbbd1fcbaaf5edbed186
+EBUILD libsemanage-9999.ebuild 4410 BLAKE2B d6926284fa62a98fe9cea873d95059ece06a954401c3d4769d315434f49565ea691029bbd8aa7d3e1918a2ed5a447091444ede1df292a8a5f03d05a0a5593199 SHA512 cefbf0b85ada632525eae3cc0b57f3baf0ddf0990302853274e1db18a124a05b1e600b34960aff50f2db263b7df4b8f66b80ab04b202bbbd1fcbaaf5edbed186
 MISC metadata.xml 405 BLAKE2B b41c6e744a90be985e11b1329493febf85889218623fabfc731306b2851f6067bc75126084e40ab82f3b367ef0e13e659dbc930d7786adff967b546fc5f89792 SHA512 8f08f6c3d07f4e76cd4b6a5033dcd7138b3f94c2cab46e1cf89dc9b113810edbe8e6d20298eadefc00b4e32a69057c1ed0c4255144edb2c5e9ce9e139c7dba70
diff --git a/sys-libs/libsemanage/libsemanage-3.6.ebuild b/sys-libs/libsemanage/libsemanage-3.6.ebuild
new file mode 100644
index 000000000000..eb127413897f
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-3.6.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux kernel and policy management library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/2"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="app-arch/bzip2[${MULTILIB_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${PV}:=[${MULTILIB_USEDEP}]
+	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/swig-2.0.4-r1
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		all
+
+	if multilib_is_native_abi; then
+		building_py() {
+			emake \
+				AR="$(tc-getAR)" \
+				CC="$(tc-getCC)" \
+				PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				"$@"
+		}
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${ED}" install
+
+	if multilib_is_native_abi; then
+		installation_py() {
+			emake DESTDIR="${ED}" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation_py
+	fi
+}
+
+multiib_src_install_all() {
+	python_setup
+	python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store
+}
+
+pkg_postinst() {
+	# Migrate the SELinux semanage configuration store if not done already
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
+		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
+		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
+		ewarn "If there are any issues, it can be done manually by running:"
+		ewarn "/usr/libexec/selinux/semanage_migrate_store"
+		ewarn "For more information, please see"
+		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
+	fi
+}
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 7c2c0548cf0e..eb127413897f 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-r1 toolchain-funcs multilib-minimal
 
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 6adf8858b6ba..a0a556594451 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,4 +1,6 @@
 DIST libsepol-3.5.tar.gz 497522 BLAKE2B dad2d346605be53fe41aef69e2e4bd4f1ce68a15f0b9307deb6b66bbe7bf06a9ee6be580e60d2f19aebbc8ee5041ac8a7b831b51342ba7c7089e1f1a447e7691 SHA512 66f45a9f4951589855961955db686b006b4c0cddead6ac49ad238a0e4a34775905bd10fb8cf0c0ff2ab64f9b7d8366b97fcd5b19c382dec39971a2835cc765c8
+DIST libsepol-3.6.tar.gz 509100 BLAKE2B c073c9437004df0c723125971ed26354dc6b8a78b069c593977062527342061303bcc48917fcd9623d17998748254f63408b233173f3c62e92ee0ea2f3c4a430 SHA512 35a42d2749fc4f71bc6b7488380714f56975564007128566f1c73e5c50bf81c17535b2cfda4583aacb4870aa2cd5885321c01523e415bda8b3326bfefb13d58e
 EBUILD libsepol-3.5.ebuild 1114 BLAKE2B e2dd440d5fcdd3e3dce67bb25a5180cdda5dd534c4f5fa42b30acf1f33fa5d794583fb7808b4b39b3a7003850bb08b12bf8fbdaede1b7c3c6986c365e8d7090b SHA512 1cbd7242dfa76531be30bb7d897ca8fa05be2357351b6b276fbf14958785c5620edf1cce8d3af16a0b8d8fbcb9e1d883ffa6a9313ace5bf73278644234a10043
-EBUILD libsepol-9999.ebuild 1118 BLAKE2B 7b0047c08b1a5d27e6ec4db8722880d12cf7d2946a1e6fade6b505662f2347b18c9faa686b58bce24e22892eae1bec3c9428c7131a593c711845a56868322215 SHA512 86083220febcf661958a30a025bf4e39eefa2bdac60d3217b3702212fa573e08ba92cce2c0b64a586a8b63510f1882550bc78203ebc7346bab7a35f8b7b39294
+EBUILD libsepol-3.6.ebuild 1118 BLAKE2B 88169dc0f0dedfb3c83e8e494fc94867adb857186045d2864f6fcf47b05815c3a73933e68c2a21b51673ceeb823b291c934340bd8cbc6d1f273419c49c96e90c SHA512 af8780c69339ed629c8da06b60ad0798de4af367b3afaadc534fb28db016635c306ffd75e713cf921366cdda4eda84c161e1b22beecab4dec2d91af7b8475937
+EBUILD libsepol-9999.ebuild 1118 BLAKE2B 88169dc0f0dedfb3c83e8e494fc94867adb857186045d2864f6fcf47b05815c3a73933e68c2a21b51673ceeb823b291c934340bd8cbc6d1f273419c49c96e90c SHA512 af8780c69339ed629c8da06b60ad0798de4af367b3afaadc534fb28db016635c306ffd75e713cf921366cdda4eda84c161e1b22beecab4dec2d91af7b8475937
 MISC metadata.xml 402 BLAKE2B 0450441687952fc82e64536652076085d66870e8cd81d9aaa99d023d17d46bc8ef6627c9ebdd6084b4c60e7d26edb61b4aaf5693794105b04b500c74a37c25be SHA512 a107ad99e8050f4cbe1c32f76699524afdced1f4b9a0c0fb3a4b5954d4f9cd5993d4d047d7a3fb45fb68c2be361c658be48287e1099ea7a6b6fca7d676969c2d
diff --git a/sys-libs/libsepol/libsepol-3.6.ebuild b/sys-libs/libsepol/libsepol-3.6.ebuild
new file mode 100644
index 000000000000..17fe4da89451
--- /dev/null
+++ b/sys-libs/libsepol/libsepol-3.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs multilib-minimal
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux binary policy representation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/2"
+
+# tests are not meant to be run outside of the full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC AR RANLIB
+
+	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		install
+}
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index f682823e4643..17fe4da89451 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6b0958fd7a17..b8d75b06864d 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index df550213b8f3..c98c38d4d0d9 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,6 @@
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8 SHA512 3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae
-DIST icingaweb2-2.12.0.tar.gz 6354699 BLAKE2B a3d5af224a85278dbc244877fc8699617ff770a82e56f65c1e642eb23afd883b01d445d479319e9376b9a45e97d4ba028305c2773623b75464b19b1c00c12e72 SHA512 8e03c80ae0f4730307f606bcfed57978fea59d7917f2d505b063c29e05d913e047b6975bfc56673c0e71464a09578983d63a88c8efd35b1c80abb0d15384c275
 DIST icingaweb2-2.12.1.tar.gz 6353911 BLAKE2B c1f52444c2ccc1eeafce89603564f21269607bc183a3189b80d93ccba5d621bf8c8bd79c75e5c9aaeb6672870923f99c98c7ebc469147125a803d16b00f9426d SHA512 71e6ad8f947ee47ff0bd3924920584c558fbd8e371f76adb83cc08e95442e792009af79280c484afe478cf1a176cf2812c6be661d838f61f044abdc106ca0999
 EBUILD icingaweb2-2.11.4-r1.ebuild 2437 BLAKE2B 87e8e5cc1c5683d1a79915030e9bd3f19fa9b9e8ace11bf886d7d5ad2949881b7155546dfcaa295afb9c0d512369798327d5184a9b6b21c6d66d24e0cd3315bd SHA512 cefa272a1f1f0fe8f561036ebf214ebc43035e999a6f4d728b19880714183128fe15186983eb0f95486060b61ecca0ac0aacff84a342ca2da9600da0245ea6fe
-EBUILD icingaweb2-2.12.0.ebuild 2466 BLAKE2B a9c8deb4cd9bf6c51dcd5329f491566881b9cc402baaac77a307ead2b16b9572707211474f5433ce5eda48fe5f8fdbf39c8cf122283e766c4c384bf94b6dcb92 SHA512 f8c9eb6d59d2275afa57975d654f988fa5f8c5e8b998f9d7d814a5f05c8952eccc71f3970c9cf93de7c2dcc307318ff54cacf550934afac58ae55146a07dc055
 EBUILD icingaweb2-2.12.1.ebuild 2466 BLAKE2B a9c8deb4cd9bf6c51dcd5329f491566881b9cc402baaac77a307ead2b16b9572707211474f5433ce5eda48fe5f8fdbf39c8cf122283e766c4c384bf94b6dcb92 SHA512 f8c9eb6d59d2275afa57975d654f988fa5f8c5e8b998f9d7d814a5f05c8952eccc71f3970c9cf93de7c2dcc307318ff54cacf550934afac58ae55146a07dc055
 EBUILD icingaweb2-9999.ebuild 2439 BLAKE2B f2133f8a710ac57cfa1461d2699aeb1346f70690f9155bf3db99248cef5a55cddb2b4945c35133fa0e29a624ee814c19ae286ab647abf11202a46c4fba3eea46 SHA512 7b92d046da4d6614a33b18106b4d7a5e76c8c8ee1be7e85d8035bfbde664a807a625b61f3759bd2c8969d41163f3b28ba599c8b717a1137058ea311a4997445b
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
deleted file mode 100644
index 0a0ddca0fee2..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:8.1[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:8.2[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		>=dev-libs/icinga-php-library-0.13.0
-		>=dev-libs/icinga-php-thirdparty-0.12.0
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-	fowners root:icingaweb2 "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 91b84e3fbe5c..9a3b2a008d74 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index c187715cb9e7..bf71c2710187 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,6 +1,6 @@
 AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
 AUX 9999-Disable-things-we-don-t-want.patch 5239 BLAKE2B a58b5726ed42a8ac9466433db5d54503d1ab4c605bf9f7083c35fd704613ba10cbb7c28daa10e40b9a2423cc3f3695cd2ab96f4f338b55f8b46d10f2a851d3fc SHA512 4a8a331bbb8aa1cd3d529d3c97993b3c62f43acf96105f68d2716b6f93d394ddd4c9aef1c582bb6f841803853bca58ef5fd4180d593efa0bf9446f76e2f03601
 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
-EBUILD mesa-progs-8.5.0.ebuild 1804 BLAKE2B c453575100a78f7b5599698e6eb13b538314e189e892cfef3670e10b9aa6f7de83995046131e7002352176cf1c10b6a05ddd44d5df01d5dc29171ef78ca99d56 SHA512 f388241bbabd38ec926cfa71d12ba8c5d4e494ca3aa33c7f38786df59c8fd870be198096e7e619353ae1e979b379a8a784d84573e8432738172afa7a45df096a
+EBUILD mesa-progs-8.5.0.ebuild 1803 BLAKE2B 998a7cb2d24b3c86320af4f2be565cf416951898a05afe4dea7a89f05c8aad9767cf3eb1f969a692ffe3a09c1044e725b35346925b16fea6ddaa2ea68087b2ac SHA512 5eac4d8bb3d7041b8f504b73f5e6e463bfee23986c70e2049f10b4a6dc43f2e3e2509eec743c77ed35f3afbe4b56924037c8bf6c46b7438d9044cf4b5affa9ab
 EBUILD mesa-progs-9999.ebuild 1904 BLAKE2B fb83349574e55d14aacc678ff29b130ef6a8418c59167109ff5dccf94638dcb8f6f6fe4b6fab0ddb94d40e88b7f2e9ed9cee4d32a21627b4f55b7d874fb6fa4c SHA512 d65fc3d946ae6efa3981f3b0356bbdf353c0528accf349e6bf3dcc364aca010a9de30279b95e470eabc192e814f2a4e26f9b66b079e3c4859b9e1d3542220a52
 MISC metadata.xml 332 BLAKE2B e04fff442530a88cc9d5601e87b439c2dacf38443bce413174f0bf5923a490140c7f43d8c1808e6011936e4bd77306d6d7e5be4f18d0cfecdd4841f252714a19 SHA512 c1f234a2663a6c51177ee9dcb7b33a94deed4dde8c13b53018b5bc429efe269faae54ac7693608186d939d9e7e493209a450852f2f68310e41422e31836f71ca
diff --git a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
index cd4dc2c03782..d6c39f6ada63 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
author	V3n3RiX <venerix@koprulu.sector>	2024-01-17 02:06:03 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-01-17 02:06:03 +0000
commit	20c23c152d2e7b44a6f93ec9476b808659e5ff1e (patch)
tree	06b81787dda2fd1bc47b3967309795f95ddb7b3d
parent	03aa42efc090f9ed79ad5d8cbb54789052863450 (diff)