gentoo auto-resync : 03:03:2024 - 17:42:46

author: V3n3RiX <venerix@koprulu.sector> 2024-03-03 17:42:46 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-03-03 17:42:46 +0000
commit: 9b39c5fa703e6f57558ea8a2ca68a5a0bfce1edd (patch)
tree: a1cff8bbd255e47010ff280f6e836bd7ac53b096
parent: 194313a653d5ba077627c85051de73377b95672a (diff)
353 files changed, 1169 insertions, 2141 deletions
diff --git a/Manifest b/Manifest
index 9fcb30134b90..cede87666d71 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29792 BLAKE2B b69eaae636840bb0071586bb0929de5f8ce6a3a480cd9176e3ef194e0ec70126152bed24dfa67dd7d234e72161b9a6f26cb9b801bb23dec18620974fe941df0a SHA512 c5ee9db963fd1a7049dd27a2484f1975f1895b3927fff722750a0326bcde8bda11b21decb2c2979b283de140e054137c797b25d7f7e046d1eb7ad7b635dec150
-TIMESTAMP 2024-03-03T11:10:08Z
+MANIFEST Manifest.files.gz 29781 BLAKE2B ceceda39647984888b8c9990376a9e2a1b524fc476c732d28b1134e7caccdc3321ae88339dea1f09cf9b05a0c55f4c56f26cb34c8f34127c5160eb65429e8bec SHA512 8963d15592adbbbf30be0b0310b0e35935937b122c3fb6942a1dc76ca0e9656b9e6206f24219cee3c9b3de9f838bc83cd106c532a8991a7efdd80e052c0aaf61
+TIMESTAMP 2024-03-03T17:10:15Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXkWpBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXkrvdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDYig/+KqIk5P/mBW6oQG7n9nCi1PwwMaXwLmjT/hFfLVof5Rx7JJpOpGdsogJs
-k3FN0V1iV3AXLyutfz0cvU41L2zlwk5MjXULzKgwc9gDCVOPD76sK7hy42Rnve67
-70VNOgBU8IASi9B8NfBPVANU5G+qsOrNIecNWYbWjfnLoL7H0z1gbVK0gpgvYsSm
-fu+AtYIX3O+Q+Ugb8aMN72EPJdoT7yZ/GeWhx9d512Bvy5pVJHs1mDEFIABaTwbr
-FmrBsgjd+pqXv5uJseod7qSPUJjG0T45vuFISv4XVvEROcROoB1SwoUrLII+tsRZ
-mj1d14p6YRcsKKQGyzQ1R7vImTtkoXH9faKuEUK4ptUwJ7NNehLBfi3I0lJS2ztK
-UFWuBTMCv54Na2SCXCVgrIffU0eItK5rR2CJ+IaquGH2dNTBIvHmaFIAniDIP8UB
-RSeVYuBRV9sLTuGAtfoUHbGxdhM3RXJLO6X4vdG9SksoWvkPpmnKktru5egKZDPY
-0ktR6WXQ/vjVpDEPFVHnoIGUXov7ymvUGfg2jI4CrwYfpZ+low8HbXx1vDnPbTUY
-W688voiabrCJoSIYmzUK9yEfhRJDLQ64iFQcNFT82IjgNewU6vbIV7Vij+SL3S6X
-TgtakeUnIr3sJd2pG+r4dXPzepE6IXKu/hgeRtAkYJ5K0IPVRR4=
-=bPCm
+klCfcw//eeKlOiUkSr1V81qJCmkWhnUm+ZnUM0xDaJIdY1gjN+Si7JCcnvfPm+Ah
+ugDc5q5gXAddXegXf5KuCh1x/watL44lyHtEEbarLcWNM/RRfwX36wgqQLa1RxOw
+NEHxCJWKuOx1QJVkCSnds7O6oAzN6ZtAATQAOyoMb+WAJnR/TNdwjsYD45Zoa1x4
+xQJVI80DhMqhP6NivBFUR4Oe1wRZJbZoHN42pftpPonqVMG39t7L4Ccv1m1gr8mR
+aaTWMTbeRoIdEkgymIbTUOPT7H1ULJPcsgfzcw4pUIhzN4MmkY6e8hc6PU2tqhzn
+DldrBA2FaSTIRB0w2LDCychTG1XvJXBoHmgxv7dFVJiI5s7pBih/VtnzV0SWU60D
+dmIauReoxQchBBGhB91AL+/fDPId8Ob9nwuss+lVEwrLFrkqusx5MMU1CEa/Lxoe
+4LMvG6XMcvGFVXOL1ACy7ivL10yx5wUJ083kGjzOr9+sgwlevDQnqP48Nj5REygI
+n2p6IAOdNHSK1/zPiHS+f8Q1aTiRPQyfBFtdavWYcQ8hd9p8OE/MC4PSfJyAP33q
+UPISncSnZ71qTnwgAwm013NkrNhiGcrr8eJRzdiKfjJ8g+vRacGcbctEwMFZJywz
+XPsne+YEJ6FC7P086kszCQ9S3fk9bigaZRBtATmepXPTSIpPH4M=
+=UHr9
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0664a435b7aa..1f3afc236753 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index d740a55bab97..0039e6666f68 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 783d06f8acc6..e0dcbb38a29b 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,3 +1,4 @@
 DIST cdemu-client-3.2.5.tar.xz 41596 BLAKE2B 5b3e5a16f9daa0ab2c670a8cba54af380894e668c87a64a5e2126777d6725420d9bb7f41290ca69eba12e20db97b00cc74aea3df9694ef331e7a571b913820b1 SHA512 d143705607507503cd7828f02e7a0fbe5d33f15e28ce61f453567d8635ed863c5b508ed2b1964f034d846ecdea752bd3dfb565350174db3e06cf7d29c2f828bf
+EBUILD cdemu-3.2.5-r1.ebuild 1284 BLAKE2B b096b171755674f165313f45a403340c496111529d9abbd23a0dcba57d200a15bffd4aea3eba464589420784c6402c211b4ec096e3d3cea9944d43b4861feb3c SHA512 0014284e8c94041b3dfd14eeaf8c28b8a70b19b096315f0b609883f15943c6ccee8ec8f730052920bbf0c64862e1fa3eddc8ff939e8a92809e6ee13dad75ec34
 EBUILD cdemu-3.2.5.ebuild 1281 BLAKE2B 5a5b715a1e450a2df0d3ac169b404b98b18fd5ade5a54cecf784b0a131008447d68394ca359b7eafca664d5155c78c005f3c292bd6a87a54b3bac6605821945e SHA512 7813f00d1be08379cb31ab11f0698000394a48fff03adabcc8c0bab179c49634098973fb717e486b3c79e2e29f48f42c61811205eb558ac4664b6e78b5699d04
 MISC metadata.xml 530 BLAKE2B 78454943e47661858c79699f9f4346803ebdccf4d9bc37e3577fee85ba2b0a7d20f5fea844a0fe33d78b0424098dc030b9ccbe6e5db078817f1272baac7ba08d SHA512 e1f4efd8dacd7def02135e75276293b4be8642d6be80eda30da3de4409824622c6e99beba76318ebaa58635d723f681f9129580f8da1c9b49bd0c29dcf0a7fcb
diff --git a/app-cdr/cdemu/cdemu-3.2.5-r1.ebuild b/app-cdr/cdemu/cdemu-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..c697a93a5418
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-3.2.5-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 cmake python-single-r1 xdg-utils
+
+MY_P=cdemu-client-${PV}
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/cdemu-client/${MY_P}.tar.xz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_fix_shebang src/cdemu
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		# requires bash-completion as BDEPEND, better install it manually
+		-DENABLE_BASH_COMPLETION=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp data/cdemu-bash-completion.sh cdemu
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 658a6fe64d94..2985935c3066 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,3 +1,4 @@
 DIST gcdemu-3.2.6.tar.xz 47968 BLAKE2B edbe8cb46ce020eec20b2740da99c35d3fd9727a1c65a5e6992de7876d55e24527c8c524e2ccc479a7ca01a0e68bff1488db2746838fc56ea29d424928c2338f SHA512 1ed08c159f5de9ed5ad850508356998ad17f4bbb17b111ba385c913f2058daa32d8e9cd7ae04cdeacca9c7f3004f29c3c6e995cfd14a7eb60bdb32489f49515e
+EBUILD gcdemu-3.2.6-r1.ebuild 1187 BLAKE2B f0e3c6dcc0666ee06e647450863c5b4d92f2e92bc5d7969f39c7fb9ad0b669665d4e4ddc8c0246f369687c47437f4504996641525d3ec3f8908c057c7c9b99e8 SHA512 fb0dd3a3ae403f9e2825bd4f6fc754b7b9bb03fe4927969dc9856de4a715c9a94e0f1416ce3971c5b1f208a57ebe3ab7a78ebc1af4be904139fad7010d19f10a
 EBUILD gcdemu-3.2.6.ebuild 1184 BLAKE2B 4844a0314567c0ae213175748ce3d0414ccb95ee7227efc9469b463d2cf2e44250044c5f9593484d315ee293610dd12d155e9d5bd2b611192d25c738b3d98d57 SHA512 16eaacab5e5d44dc928f4b30140b67d3505b188205fed52e778da4eaa23b7fd848286f42f925ce94efa973c66dbcd988e6c7ced0c5fcadcd88e3a314f9111b8c
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/app-cdr/gcdemu/gcdemu-3.2.6-r1.ebuild b/app-cdr/gcdemu/gcdemu-3.2.6-r1.ebuild
new file mode 100644
index 000000000000..10f7298db619
--- /dev/null
+++ b/app-cdr/gcdemu/gcdemu-3.2.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/gcdemu/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# librsvg for pixbuf-loader
+RDEPEND="
+	${PYTHON_DEPS}
+	app-cdr/cdemu-daemon:0/7
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	gnome-base/librsvg:2
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang src/gcdemu
+}
+
+src_configure() {
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 034ac4900768..9d6cb06f5e04 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index e4e0f50a7adc..2c3e8c09750a 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,5 +1,5 @@
 DIST glep63-check-10.tar.gz 73550 BLAKE2B af45dce2a89e4af31a81e979659494c47b9c24f3fb71cccc33e84d6fc2900339ecefcafb1b6186b1e19e9fce7a2f17df754005c91828d27d0d2d9fe67586661e SHA512 d2fbfdb1b60250897b5d9582111573b6ed78f02b30d66cffc0fa94e0a1136dc0f3561e808b66d9b8ce43fca9fbdaf1548790c7c2395929308ff24d42d18ecf03
 DIST glep63-check-11.tar.gz 73765 BLAKE2B f1893397c18458d1a9abb0236334f2acf9adcb4cf13229f49887cd1381db4e68c470f604b76b339c5481207c63522a3f99256e00cba820e3a15c412a8e52ec2d SHA512 6ee9ed33ee259eaa14d6fb1d914e555aae5b622d04f08a2eef094e7ff20ce9368a3af105a55cbc2c37ced5b51846f17651b20a2c0644f0efcc883eea49f0310b
 EBUILD glep63-check-10.ebuild 576 BLAKE2B 7825c9106e4ae6fffbe3de6d4774cfbddba1a80f2f587b527cfd97e6f1c256e789d06e9f03895d58f397fa7bedbffbd4e78a941eae09e786f614bc6a411f43b1 SHA512 2692afc8a624a2b90a4ef4ecca476a1c7d23841abfbe6e610bd3fd2f619229515b6a29634e63b084f121b012ebd9ad682a0bd147a6c3c38190c0d381cf10a33e
-EBUILD glep63-check-11.ebuild 599 BLAKE2B bfeb4374b2ff3e7ede50b8acb99155e693fa8664cbb2d291a5e9fa7c8bfa167e36a9762385a4443d82a4dc4552c2556eac829964838c2ff0ec6e7e8418f70d37 SHA512 603d9b0e15d44d9d95b72cc219d1a7c79ce952faf05cb73edc3f998cb4eee6ae3b45ad4570b5b135e53bebd9654d5675d02c315af787a423a84a51c842ce6e3a
+EBUILD glep63-check-11.ebuild 708 BLAKE2B 4313278658c12417b105d69353ab7df40433dccb4ecc06535510330da4d9a8f820123706c37356d71c41996c5ff5d07eabbde7eb29c7dc9f1b367134e83bb9fb SHA512 bd4772195bfd63cfef2ea2d291c23e9d361d5137e87f2e4d92ed32ea62c059a59fb6b679a8b57971b362c6fa58b1c35d8f808ade9fabcc3449763a4ac1fec393
 MISC metadata.xml 538 BLAKE2B 048a37ba118ccf91598205ccb0a2122b556f0e24f81fcde068f1413ab4db15687ae55830c4cab1d1ad1bc3ff2d51a7c16c855b58857d3dc08db274971cebb275 SHA512 9e865daaa782e8973dcce7d2ad715b0ba1081833211714c61552a0cf8b425d88c9df2692927c35cdc580256202b9c86d51026696d7fc6620b187afa1d84010e1
diff --git a/app-crypt/glep63-check/glep63-check-11.ebuild b/app-crypt/glep63-check/glep63-check-11.ebuild
index 37398e67dec8..b406a6836679 100644
--- a/app-crypt/glep63-check/glep63-check-11.ebuild
+++ b/app-crypt/glep63-check/glep63-check-11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -12,17 +12,28 @@ DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
 HOMEPAGE="https://github.com/projg2/glep63-check/"
 SRC_URI="
 	https://github.com/projg2/glep63-check/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
+		-> ${P}.tar.gz
+"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="app-crypt/gnupg"
+RDEPEND="
+	app-crypt/gnupg
+"
 DEPEND="
 	test? (
 		>=app-crypt/gnupg-2.3.3
 		sys-libs/libfaketime
-	)"
+	)
+"
 
 distutils_enable_tests unittest
+
+src_test() {
+	local -x GNUPGHOME=${T}/gnupg
+	mkdir -p "${GNUPGHOME}" || die
+
+	distutils-r1_src_test
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 00fe0ea73a24..015741eb55cf 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/votrify/Manifest b/app-misc/votrify/Manifest
index 9b186c7efedd..1e9a79e19b7f 100644
--- a/app-misc/votrify/Manifest
+++ b/app-misc/votrify/Manifest
@@ -1,3 +1,3 @@
 DIST votrify-5.tar.gz 9192 BLAKE2B 5df0ccd0b5a843b384e002c2bd1001df06cb5bcf039f10c689abeda07f1a05c545a917b0a42bd78c06c537eacca58ef7b4c2920a0fe6809f4450d4c98ee2fade SHA512 3d441eb42f860e4e571541300a04c1a52a01abbe20f76615adc1c9764bafbff35faf0f1dbe9f9267ad3c4dc0e4cb4bc715b87e2104cdef8997e7918ab834bb5d
-EBUILD votrify-5-r1.ebuild 1361 BLAKE2B bbea041bffe47b7689602cca2479ce87b0368d9f5087dce10e53362a671477432076d6fb9b53d9913c55195b78a7f2ec83b432786e2c67ab5a968a892e14bdba SHA512 9145319083d587cc32052dfbfe24eb2ffb8df8b56b43d6eac5f827e2f91b4696c3473e37934d00bf234f8ea1cd9596da2c8507b595ff8246fe2e695a9ec2f903
+EBUILD votrify-5-r1.ebuild 1362 BLAKE2B 4789ebf35c288e3a9108d7d1e746d956d2644d67978254344b2a99022c16a3da5e85302af4b59ea4e00b0fed18eb2c99b67e2a38527ea2c400147ddc0a9c4d7f SHA512 276ec832beb882f69e676a5b3e789f700746db4e57ed137c77dc20186c480abef6dc5f6e8b3bd93eea21ba7fa902325d899ec7b2b46baab6c93d8ddca7892e04
 MISC metadata.xml 351 BLAKE2B 7d96981218cfc5ae4d6dcdf1829abaec979416ca525e0faa77e9e6b5de245e3e651a34632982206a8b2eb86d6fa109d93cff6a968595fc82ef555b914840f61f SHA512 2e5e5e2dfbfac0b9de26ecbf2bd0bc99a24b35485721361b9d6d1040953159db22720ed30db860ecc57294d1bc211607fcaa2580475920649654e65fe2eb85d0
diff --git a/app-misc/votrify/votrify-5-r1.ebuild b/app-misc/votrify/votrify-5-r1.ebuild
index 3b1e35ab8a2a..c3e458361ede 100644
--- a/app-misc/votrify/votrify-5-r1.ebuild
+++ b/app-misc/votrify/votrify-5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-single-r1
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index d50d0e27015d..bca6c08f9131 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index 5d1dba758e33..3a8f1bbace94 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,3 +1,3 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r5.ebuild 544 BLAKE2B 52b120262618d631c2baf8ed979b55900df0732d64e713023d9fca0d8d2f95e4aa6d0e8dfa03788893bddd3bff35390190dda21e4f1e4777111a0bf7042dcf9c SHA512 e4764f15089a267d6ef639e78ba17948b389a9f354c23cae6ec8c88c0e6545cdb8f3ae62c360a5d0f0b654e3a847a0fc675619b922914f8eb7c4df953eb1ffbe
+EBUILD diffmask-0.3.3-r5.ebuild 545 BLAKE2B ad71d0d170d884a82b6d6930b5fad6661d46b1ba21d6ebc7e0d287cf91b58de75ce49697e0b8e1aaeb66216e42e42251a482e90362a7df9dafbf38278d8fac6c SHA512 46519ba19f1157cf06fa9e6fbdbcd51141c48df8c3077614ed4a61de3a8f749162cea3c90c83067bf8425bd912572ddbd9b696a027e6ebd3eec55fd9705636c6
 MISC metadata.xml 752 BLAKE2B 6d4fab0465c176648efd096d0f5b8529057224f233d18e6d11ff447805f40cb5ffdd0dc907c106cf75341b2c1e3f6dc8d6e7a23785b1595e6e7e136a2cb9c52f SHA512 95cc67ec491b1acf367334222f89df9b44d0dfe3b5ac29ac0b3203621f8996c71af9caba9c15c8550d56ff738f61efe2eb35e23e5681a2c5522ca524c73c17ea
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
index b0395e2ce2cc..a4cfe46a89af 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 1d62d0632424..9a0a403276c8 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 703 BLAKE2B ed43f171b7113c893a8c9fe8bd277f04925e4e295d7ce4bb754798ad5f41b4c5a0e17b0990573b8b1a48daf16ea36d0464f025f602246eb4c092a520c25d4f23 SHA512 aed6efa69827a4c547aa5c0872c54e025abc256ceabf71aa5fb1cb1b57c59e6f597b6866796d85675f7148727d03d40aa20240669edbe908234f3b203a952c37
+EBUILD gverify-2.ebuild 704 BLAKE2B dd0177b7dc573b16410b2f87c42b82e4205514b2ffa36f2ffd6aeff118d3f38b683b7d7b5735b016bac72f2292e75150bb6f6eb4441b20aefd4d50d42aaa5836 SHA512 6086ffb2551313b76d14b65be2e26282f92a0e7f25ae4cba4d438d2341f3e50e286bf9f9c70bb6c3b7429349afce6ce54f9fb57293b8895dc53a88eda134798a
 MISC metadata.xml 327 BLAKE2B b8961730b05ea00a9c28b4a195ac20f031ce0c27a6c3414bda5480d8b6974caf594e8c57bb3b2ca948e20d30cc7b76e88d9548566110b938fcb785771553fee3 SHA512 df1d8b31273da19113f9166b450361abfba7b5420c8393a781e94db6635a78821cb7ead0ec236471f70514f5ef013958400b93e14f523b7a2ced69bfae35feaa
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index 5ae4eab359ac..db36790e3f20 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.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_{10..12} )
 
 inherit python-single-r1
 
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 20d51ca285a6..d0cb639bcf4e 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 7e50ee7404dd..68745fde8826 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,5 +1,5 @@
 DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.11.ebuild 4047 BLAKE2B b4ed29c6466671dfd2fc4c96e5f8015fc5801ff41d7d66b940ef88c9dc0576679b08bc7c69413dda66f52f023e284f8645b0d285cfe820badfae2ec01c316cd3 SHA512 024dc800bc2b2177bd8ce6da65cfdbb04b136c181d5f4575afc54a2b0cc1e589987c48023c5b5780369f8eb4b30d78d8acaec287b5c87f7a82a5ae2b0c2d5a0d
-EBUILD bash-completion-9999.ebuild 3978 BLAKE2B aac935ea0768c24b882c54dbcfbd391d4bb4f05516f5a00efdcacd98ee236c2d710110c3c8f93c26d60a32980f5fbe1298586f0fd516b73240481faa194e4f91 SHA512 0bb0a3a334a3d6e372169cbffd2ab08787ba1e6272620d11b1d5205c38db1e53f58d9df75c7c95503472edec24656a4dc8c3e01e46e52a4568b28655713e9bd6
-MISC metadata.xml 1433 BLAKE2B 09156ab369dfe03c5817a71b97c30cf768222c8f464441a0f04de8b2f0c6b9591545f2f0a62547f87241e7d787b565986fbe5903bfde7d1f1c2f6752d7dd12db SHA512 e18dee528d2f67f83044e9f6d218280c394f1508c9ce59d4dbec72302ac20125edd021924359ffaa52208a234a2246b3a710cd24b80d387701d37505092d7b27
+EBUILD bash-completion-2.11.ebuild 4048 BLAKE2B 177e6746e781a1743b28d4d523c934d6779c2dfab654d2d2ee280bd446004df315a775e8685f17c9db701f97619e4ba789cf2c84c245a05996d7decc90142d4c SHA512 f1a58ee868d4b44a29924650dcaeca20aebd05afce9f80da79bc562770b37a67f3d58c8f6d4488ba37c40e48f127173d7b194f39d33bdf40105f7040297679a8
+EBUILD bash-completion-9999.ebuild 3979 BLAKE2B b37b8af1bb45b4a3b0095eefaaf64570b4ee57d335099110733d0b8ecba00ee75e81c86255118d6c021a1c3181af967c9abbeb53b367dc28e741842acc452d7b SHA512 114907ded2229849f913a54592f9a9d77cff6ff15a6afcebe1e05a97c2feda33914eec430485cc13f8cd19499f29f90be07e46e25e80041945f46a30748bc173
+MISC metadata.xml 1325 BLAKE2B 9a17274f25645bf251ae66c3ddce5d140dff6d6722efce13786d2cafb9c380b20fd5450da22821ee277bccec523c602d64769c0f29cb465835d6dc1ec7dd5bf4 SHA512 cf16bfdd62d42f70ff480ab2c5e0831d5b7e0d987e131b5d04475448b7614b95e8d88c24f4f7a81d2c63e02ade16be57469cc02cc14a3b009620434b9cf4f61b
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 9d1182abc528..60411504c5c1 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1
 
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 7e597f994ebc..d9a8954d6f32 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-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_{10..12} )
 
 inherit autotools git-r3 python-any-r1
 
diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 7def7326d530..8b2bdc7b1a53 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3e43d7ba8ab5..661fef22656f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 1221fc14dfbd..8d39127f5f52 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -16,8 +16,8 @@ DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab07808
 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
 DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a
 DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
-EBUILD openjdk-11.0.20.1_p1.ebuild 8856 BLAKE2B 47d0d96a0fae3aabc5c5a99df41978eb7d1667eef24211b1dd1a3a307d5124c0fe54cc0f4f05958087eb0cc93fe095de0a200c96937e8c83bce64f02f8d2c9f7 SHA512 9c449b1d5ed00b9b5c0196af86a9dd60a3dfc9e710aef9e58f17bd1b796f7fce97be1f67ea7a232978534cbb4b8a4b9435b4e2c5c9f071875c7283b9c4269da1
-EBUILD openjdk-17.0.8.1_p1.ebuild 9650 BLAKE2B 03a949b5cf796bd672dc41ccb3c80075046c240f989ed14ad2f697b420b36aafea2a8ae66852e51cf5eaf086e9ec091846bd62a0a8979600ef3a24fea630bd91 SHA512 bd729a0c4deb1c5e00fd81513e5cee3269d83ae417ffb359fe205ccf52f3943ae0b87c0d3858e88d560fcfc8f94289b13ccb006965d6af04fa061b50222c39ad
-EBUILD openjdk-21.0.1_p12.ebuild 9243 BLAKE2B abea83c696bf42e74fb4fe84bb19088af490646d527e6650ba2aa6f6c67e9682e650d2d3c6313703cc2dbb07f9ac3e0d4a7b8d612cc3166a0db4f2a97d1c6f17 SHA512 16c3aaa650d20bca1069959c625214b7ea9573a26e950ec0d3b557e0ea27eb83b771ad2b6125a896b742f3213c41c6cffd0fb8ea78c912a91dccc9ec899a8d99
+EBUILD openjdk-11.0.20.1_p1.ebuild 8954 BLAKE2B 6fc8e1e5ceb6c4c30a70dd08d199123f24c356752444cf7e24612b46a8c0bc8578d8b2d4da1bee3b0ac92be5228e3e0965a9eab16772813d188449f326d239e0 SHA512 e3268551384c6fbc45a310072a5a0621c6237de2cdcb9df124e87de8b470234e770dba1a1cc5831ec52f554707ddebc6915c121e8a69c9458236dda705a015e4
+EBUILD openjdk-17.0.8.1_p1.ebuild 9748 BLAKE2B 7a6340dd5805a785edb59bf194f1de6b2f00f4be26c78a6f8efadbe34350b4834d2e7a8488998a744a24a1dd1ba8b314c5d8a030220c89fd3a05acb35c79d857 SHA512 cea0f18e4e9da6131c7652d4d2fafc8cccdeac5d40a61058a8c0effbca4453070c39238e00eadea486244944521aca0748c5452701276282c826cf4b18baae67
+EBUILD openjdk-21.0.1_p12.ebuild 9341 BLAKE2B 12e0ba91c2209b646903e40f7d72e1a44173bd8ef0635b05408404b59cd4f8e7b98d78b1bbc16393276a5a74beb1edd8879d11099ccd79eda62b8a865097766b SHA512 319b2decbb6afcfacbccae7c9b83b488545962447319fd15a34349a9663d42585105a713ce4fce21ad0b7dbf9b86cf89afc1363f171823eccbb1bc7d7027d863
 EBUILD openjdk-8.382_p05-r2.ebuild 6494 BLAKE2B 2a99d21d84dfd6d6113c7f4983cb74e1ebb4190f116bca7dc956fa41af8279edc839b7156b9161e12dcb8598538366a5669426982cf5a13733813376aa63cee8 SHA512 8f9909a88f201162e7472c07cab45d6c041e0da90eda4fb71052f827bd13b0fb9fc32aca7017c61afab30c1e2bd9b0b1bf15f8d9d4f5fe5e3499cdc468eee6e4
 MISC metadata.xml 1495 BLAKE2B af223deac1715bfcf1a02d0d9c387d2bb09b01985795a60472ffde2288c8e3a1f4541a20c24a230894a585f875246863749d79ce2195eb2378c9dff807079a60 SHA512 c6b568fcc3c07914a761225600aea1984c4bdcf95f1b23c773174eee29f63a3206856db483f80aca45669dd6dcb124db7ff00db7e7da15a2c7b574f4d3aa48de
diff --git a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild
index 36fec8b7b302..e05303dde86e 100644
--- a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild
@@ -167,6 +167,9 @@ src_configure() {
 	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
+	# bug 906987; append-cppflags doesnt work
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
 	# Work around -fno-common ( GCC10 default ), bug #713180
 	append-flags -fcommon
 
diff --git a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild
index 3f1d61a220af..b7024ebb2a6b 100644
--- a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild
@@ -185,6 +185,9 @@ src_configure() {
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
+	# bug 906987; append-cppflags doesnt work
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
 	# Work around -fno-common ( GCC10 default ), bug #713180
 	append-flags -fcommon
 
diff --git a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
index df6a3e6a4ed3..7ba18116be89 100644
--- a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
@@ -178,6 +178,9 @@ src_configure() {
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
+	# bug 906987; append-cppflags doesnt work
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
 	# Work around -fno-common ( GCC10 default ), bug #713180
 	append-flags -fcommon
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0a0b432a3194..616cd9fa2149 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libei/Manifest b/dev-libs/libei/Manifest
index 63757b3d4c73..6baf0e807871 100644
--- a/dev-libs/libei/Manifest
+++ b/dev-libs/libei/Manifest
@@ -1,8 +1,6 @@
-DIST libei-1.1.0.tar.bz2 169197 BLAKE2B 3f33b21a9876da533a6f52ecc2478065f4f3083f72880cf09f1bbeadcdcaed843e681e5d9fc8692ff667fe7262195caa272712b755997ca74a1b90f24492c08d SHA512 93525215cf896213e5f28581a1701cfccaf1ea07ae85744c01b6152ff29c2c9d6fd3afeeb8de5850cde915b540d3452bfe32c8c56bf780dd401da9947e28044b
 DIST libei-1.2.0.tar.bz2 174155 BLAKE2B 4b540cb79decd9785f67efa6fa76b984eb7ae2729dd49ac36e240b6a4feb4c54b34626dad93831c873861e3d3fd597c530e7eaaab0150890f0c952a9d75ee178 SHA512 c1d39c2c830df373ff5d7cc3eca330c2d771a26df6f2902d62f639a8a4db9af5370db4b9defe605721dd1f429eae68cbc4249792b3ae26b4c82d269f07a36732
 DIST libei-1.2.1.tar.bz2 174636 BLAKE2B b718d2287e83adb43a8dee9ae06499d780b2a50231e9ce452b6e7bfa9e89e9599058628614fb4325d0cef842d6b29ca68eb38b3e547790cd5a7a0ac14728f250 SHA512 ac8e32a381b9555a6b9becab9217a323d79aeba4b3f11e1dbba9f876d566f232f41d0f299f8cb8e5de6707d0dd91e93872edd81532c971e35d1cf33f9f9063b4
 DIST munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz 27724 BLAKE2B 9670c9b7a0b5d9ee6ec8df2dea9e241b043964ecf1fa3f6060ad1d16c40ab6afe47f53c6d4a791003e101a0b363263b858e6e4e445f868292753dd1ee7f7e3ce SHA512 26b5599fd12be627a692823ebf496fa446be7ed04a1233fb42e0667c05109b0f804f76646e289ac660fc815baf45f77ec8caf0ff2ea7fb0b4f87f0038a2b971c
-EBUILD libei-1.1.0.ebuild 2399 BLAKE2B e03d93794150f63923cd86fab7ff068bb2327a649a68edfd27103816bd5295c41a7d9ba127d0b3dddb9a17aaf4a29d41c84d8aedf94469f9b18e0b1e707491ae SHA512 3ce3900fde69057b99ab9931e66ba1fd74c1a887218dfd3b70e19e6d6ccfedb608ebb9d977ce0e2925fbdd6040f6ce043cda8510eacfb90c35248fa5306a9e36
 EBUILD libei-1.2.0.ebuild 2404 BLAKE2B a3a2286bc1a5fce6910a92ccf8b3e16a6258cf3c1ef9b9c3af2951100e0a7a5d6edaf79923a33c88b5bb5125752aedb4120dee9b1c8b6c2f67d426a80dd35ae4 SHA512 ba21a436be2356a0dafae3673f464708dee2068a6a7a93283128ebb1692c1d2712c8eacbef359328a0a4a501a6967d7a329f88f4dc977a6ad29f6e25c3c1a2c0
 EBUILD libei-1.2.1.ebuild 2410 BLAKE2B c2dc17b1e9eee0135a103294c79dee3eb1f7b14fd30770fae78c1545b22581ef5d328d25334d09de00de6989a8cf3e45aa7b684d7f7d28da8a898bf1fcb09d1f SHA512 63b19a7d3dbcf521e4789025755c3d921aa5767c83cac25c0f287cab29f52bbcf2c856d9edba3d01f0a764a1fac66f71dad5358ce23c56c3366c12fb05399323
 MISC metadata.xml 336 BLAKE2B 2fd4200876fa044f3563b0eea2096214af92fed1a8db009cf4885a7cf32f303b0a6911dba18cc8fac942348dbe2668ea2d50fabedd235e33be0793076ab0e5be SHA512 a26feb7d41edc6f728bfbaf805cfefa6bba4c5161e70785e7de5f389492f405f7cd6f2c55cce1d2c6bdf9af3aba17e1e51254d9e4421c4fab2e61f2c563c8f3f
diff --git a/dev-libs/libei/libei-1.1.0.ebuild b/dev-libs/libei/libei-1.1.0.ebuild
deleted file mode 100644
index 2baef82f12b5..000000000000
--- a/dev-libs/libei/libei-1.1.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1
-
-DESCRIPTION="Library for Emulated Input, primarily aimed at the Wayland stack"
-HOMEPAGE="https://gitlab.freedesktop.org/libinput/libei"
-SRC_URI="https://gitlab.freedesktop.org/libinput/${PN}/-/archive/${PV}/${P}.tar.bz2"
-MUNIT_COMMIT="fbbdf1467eb0d04a6ee465def2e529e4c87f2118"
-SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> munit-${MUNIT_COMMIT}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="elogind systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libevdev-1.9.902
-	|| (
-		systemd? ( >=sys-apps/systemd-237 )
-		elogind? ( >=sys-auth/elogind-237 )
-		sys-libs/basu
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/structlog[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/python-dbusmock[${PYTHON_USEDEP}]" \
-			"dev-python/pyyaml[${PYTHON_USEDEP}]" \
-			"dev-python/structlog[${PYTHON_USEDEP}]" \
-			|| return 1
-	fi
-	python_has_version \
-		"dev-python/attrs[${PYTHON_USEDEP}]" \
-		"dev-python/jinja[${PYTHON_USEDEP}]" \
-		|| return 1
-}
-
-src_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-		mv "${WORKDIR}"/munit-${MUNIT_COMMIT} "${WORKDIR}"/${P}/subprojects/munit || die
-		rm "${WORKDIR}"/${P}/subprojects/munit.wrap || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's:^valgrind = .*:valgrind = disabler():g' test/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=""
-		-Dliboeffis=enabled
-		$(meson_feature test tests)
-	)
-	if use systemd; then
-		emesonargs+=(-Dsd-bus-provider=libsystemd)
-	elif use elogind; then
-		emesonargs+=(-Dsd-bus-provider=libelogind)
-	else
-		emesonargs+=(-Dsd-bus-provider=basu)
-	fi
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# munit subproject is installed but not wanted
-	if use test; then
-		rm "${ED}"/usr/lib*/libmunit.so || die
-	fi
-}
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 879e358f4968..7e09fc85b134 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,5 +1,3 @@
-DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 DIST libparserutils-0.2.5-src.tar.gz 74518 BLAKE2B 792e9fd14119537e4ec6e54d0e147114473e6935ea4b557c0de1341c29352e5773be90b282ca49573fd11cfb5a17e6f0f41cce1f2abbb95e5203794b3775ce4b SHA512 5d26bbfb754deb950c098f444d44003d681f30dfaf18a4d6b25ef5023ab5dbfa8968a9d8b6d319ad470fe3c75022328c55c810a623139208a7091b2df27f0a18
-EBUILD libparserutils-0.2.4-r3.ebuild 864 BLAKE2B bc17a73ffc55a299e7eb6a44faac37cb6fbfe22d92a9d3769f9b37cb31882f1fc9751dc088a8ec4c522a4710cce647ffc024043f44bdec9b59e0c0b0e60ad2a9 SHA512 0740ec2c2e7e0cfec0974b1af26411a3a4fef8760c16d69f7100aa4d2c36e6af087e86eeb4e7478330d4b1f22abfa50542bd099b7b97e7966f23b01fa0693dad
 EBUILD libparserutils-0.2.5.ebuild 855 BLAKE2B ab68c3e5bd611c0d0044d898bafe4687f2b60f32900f93925306ba91d4fa7d7f9c23b2b294ba19ff2216eabe3f06e1594d71b39c863e7cf9d739da8edd92e3ec SHA512 7d9249e0a43928478f424e9ddce65be21ad6cb88e5958ebf2671aafad349439c1ee56ca77334facd7ebed237aedc6c3fd87746c436e20d09593ef0eb923cd4ed
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
deleted file mode 100644
index 46ce4711efb8..000000000000
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic netsurf
-
-DESCRIPTION="C library for building efficient parsers"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="iconv test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-build/netsurf-buildsystem-1.7-r1
-	test? (	dev-lang/perl )
-"
-
-DOCS=( README docs/Todo )
-
-src_configure() {
-	append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
-}
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index ec04d6b0aa40..6a9109698914 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,3 +1,3 @@
 DIST libwapcaplet-0.4.3-src.tar.gz 31766 BLAKE2B 7a51b27911192b0697d6eebe9e98abf720a76daa0e0ce0eb6148186e21e36d3b1853d3b24c8fa325ecaa4ed69d8262a9282ef77ba028d316dd16a225a6766d64 SHA512 b4cc8b0dac86c87b1806acfcf5c4734955eb797cb04ea67f764bae32fdecfd3ee4d8ad0f2f3f0a1813c9684b7120dbb97ecf11f29de0d60a7bd45d96c1a451cb
-EBUILD libwapcaplet-0.4.3-r1.ebuild 754 BLAKE2B 3daaa3a55148c7c6b5dea50377fc517f41650ba95c5bd5a4172f8e7b2f5a9d40bcc4a8f446e5777e9f9107f37643ff6f6b578eb14cca1a8ce5ad14e136a38b55 SHA512 1d00dcf1d25020f5456e210d51baded0321a922a54fd7ea7017af419ff4714c39a32ff4a04dd303e5c015e15deae9b7c6c104b0e24ecc159b188be7ea171818a
+EBUILD libwapcaplet-0.4.3-r1.ebuild 753 BLAKE2B a3c390c39dc21f6cb823a518d47fe16bc52104737292362807377c277981703ac22506363c0534a0284adc88df1f5a425e3d2f7ec5e9adf34a367e86d39afcce SHA512 01eed1420fca1c74907e9a2a187c59334bcfe1202984cd584759dcde7b940ee7cf541aca19388ac750cf86f2b3fe54e500e81eac2ddc31cafcc6623343b5e30d
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
index 11c9965eaa23..d4494f601744 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index 52e3cb24c7b6..283e4f017a1c 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-wayland-protocols-1.12.0.tar.xz 44272 BLAKE2B 05f6c7e496d8be7d215ceeed6059230bb609c43c81eba363fc85e49279f2322a5c7c6cedebd9987d1f6d4edefad01eb84039cd949de730607e9ee4bb9a9c2c01 SHA512 4894493e117669d7ab54b385e2a40d69ddce7cb860b68d9a28f9032d63cad6004858f984ad8ece34567e0e806ccb3f973852596b905d2618b60115ccf9c82886
-EBUILD plasma-wayland-protocols-1.12.0.ebuild 448 BLAKE2B 403ff62f939b8e00830f2ccc97103082ba20086400ad343d91851572fae34113e10b2264edb6a4a3bfe73814b4a8fcdd20e7decf02664ae23118d9c89d1d137d SHA512 554f64f72947a667a19721b0a4c80126a509552ae2f2ff54b7b5e2eea09de643d3c1244b53922b5e1eda5ef37d4782c89f3b57e28d0b569cbe3d5f9542f0925e
+EBUILD plasma-wayland-protocols-1.12.0-r1.ebuild 751 BLAKE2B a10b4e5619dc01411ca3206ddfe8c5e288136e9ee3d9d7ad94bd5ee3a84dd91efcf84fdc89f821b7037f4b13e48bf900d5c5409e9fa32bcceebbf21a270b8b90 SHA512 64b868b0a561e1a0129f1d466faf852f6dbaf0828333e3fe78f14b48f927e33e7dce9f52e3ad4737cc25ccf35eb3a1823c7779082b04decca263a95f04e0f5d1
 MISC metadata.xml 396 BLAKE2B 6294f1b003e4b05cd62b0c8697b59d385166c6ea4acbe5f68d9efac7cfb9a6afa2502bbb339dd44459fb94ffcff7a03404fdf86f4db5afb711d34986e4e7bed5 SHA512 67f21a439977f1f939fdc5fd94ac9e8e8861d17640e823157fe51474e78fbae372c01617aceb0e7cea15de35694609f37bb7c68d33a5c0fea1d0733ce2c41e2f
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild
index 5a9c09e22f1e..ad0d538fed5b 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-ECM_NONGUI=true
-inherit ecm kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Plasma Specific Protocols for Wayland"
 HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
@@ -16,3 +15,21 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+
+BDEPEND="
+	dev-libs/libpcre2:*
+	>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	|| (
+		dev-qt/qtbase:6
+		dev-qt/qtcore:5
+	)
+"
+
+ecm_src_configure() {
+	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+		-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index d963967f9369..da0a3f8f8a63 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,5 +1,3 @@
-DIST skalibs-2.14.1.0.tar.gz 237166 BLAKE2B a787bd5aab7e22f1c49422a3010ff186a3324bcf97b32b954ef05cd8609bc19a48b06e1e14c58481f0507bad5c3bbf294121826e9fdd3f895cf5d2735ca01fe7 SHA512 41e76a52e49d8bf9458f7feee6cc85b8168a346e5688261293fc556462695b573b70c51b67d85aa0a788db1d6ecc1dfc450f8e8e9807812d149dab88028d98c0
 DIST skalibs-2.14.1.1.tar.gz 237220 BLAKE2B 880f40a640e7680f847f8d9eb5e90ca472583d0badfbf233707be9bf64e2eb172543fdc9b663c99c3a5839ed58dbf7befebf9aa75820c9be9d70cd0c37959665 SHA512 01b3da7614ee626f838b62aff6fa2d4677ab5c5dfffcb3145232db9ac0b5bf70c063f4d83abdee809139fee721c75550eb997e2c3e265417b9493c98886236f9
-EBUILD skalibs-2.14.1.0.ebuild 899 BLAKE2B a9e4b321cee50647a674b8d4a337f058c72efb0b10eebe9df391340d85731aff8a6936a3dab07eafd4d9f8d9dd3fe663e277d094ef326f36c0c507743da1ed40 SHA512 ac34af44991b4d6ec5d4def73c3f4887f91f98ae2c456e6116ec047f101aed925610edb8240877ac17833ff207468050ac46abc9cf7a8a4050e2387b76a7e588
 EBUILD skalibs-2.14.1.1.ebuild 899 BLAKE2B a9e4b321cee50647a674b8d4a337f058c72efb0b10eebe9df391340d85731aff8a6936a3dab07eafd4d9f8d9dd3fe663e277d094ef326f36c0c507743da1ed40 SHA512 ac34af44991b4d6ec5d4def73c3f4887f91f98ae2c456e6116ec047f101aed925610edb8240877ac17833ff207468050ac46abc9cf7a8a4050e2387b76a7e588
 MISC metadata.xml 355 BLAKE2B 66e0a671da1ad125bd77d9d05bf03ea2e4bb9f8ec0c91bfe2f5b87192ce2de48a5137105af6e34260fb53c0a858577bc63681a53436d40ae635d87b2a346da25 SHA512 c6240c87d05a08450803a5887077715842112da1fa49264a8594735909d07e76a25a10bff4b09e7cf6049081153f520ac12019d93384357b692734ce82b07089
diff --git a/dev-libs/skalibs/skalibs-2.14.1.0.ebuild b/dev-libs/skalibs/skalibs-2.14.1.0.ebuild
deleted file mode 100644
index ea5da9db95bb..000000000000
--- a/dev-libs/skalibs/skalibs-2.14.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="General-purpose libraries from skarnet.org"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~riscv x86"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--sysdepdir="/usr/$(get_libdir)/${PN}"
-		--sysconfdir=/etc
-
-		--disable-static
-		--enable-clock
-		--enable-ipv6
-		--enable-shared
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 7f8bf8a977b0..eed1f6503bcb 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 3f39b7257152..ebb40bc9abd9 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -21,7 +21,10 @@ DIST sbcl-2.4.0-source.tar.bz2 7695124 BLAKE2B 7f282282af0f2900cfc07795c659cc508
 DIST sbcl-2.4.0-x86-64-linux-binary.tar.bz2 12122206 BLAKE2B 8f0ba1bb4a3ba52f4b54cf16d347b7014d28bb635154f7f6811a30d08a19d4e1b9b448ed8fc5ae84d3aaa9edca89692cbcc5c9496e8f914cf3c9950890f164b4 SHA512 99b4760a5cc52c7807610aae7ae71810df013824a49fe956c4920d009648aa2a0c3a96c0745d00a7f09ba90b97e353999f19f98acd788b431defe6acd24edbc8
 DIST sbcl-2.4.1-source.tar.bz2 7800453 BLAKE2B 4ac07e5d3d18d9cfa5df266207d259f6b6b778b458e1e3be749ad7b145347e7aeada3623c1c423b20a15ba757dd2a2de4bd16163001aabc965ced8554f397825 SHA512 ae78f4d64063c05f82748239f661fb88792652496fced0a7bedcd00fda6b17cf9e01b866a5a11ca953746bc8b208116b73a93288ad08c9ffe578cc3266870780
 DIST sbcl-2.4.1-x86-64-linux-binary.tar.bz2 12113408 BLAKE2B 608f2455590d7118986015d48d02894b07350e418c3a893eb29bf423f6b78435ebde64e91cb9ca542cf2629ad9148f0c8576ddd3e7fb4569852ae6a374c2f38e SHA512 03fdefb9f51c8ebe32878328954d574dad31bce32e2b73c41c891188ce4f2d36039820639fea65b3280d257015cd5c7074989093ba71106e8f36d8e2df545db9
+DIST sbcl-2.4.2-source.tar.bz2 8148605 BLAKE2B be59c4332a25202dd5e2fabe78a51e039ae1efbdeb41ecec5392eb1e53a4e49c406a4d3dd5a3bd5e545702f924349a326f786e67db47b31bcf5ec9a9ec3766aa SHA512 9e4abb58b87e24937b883967e36da92ff3658e3eedbce245511f20f97455212436629f885815e91481d07b10e7af89b124c787e0dc7d4e5ce2790e9ea90fdbf3
+DIST sbcl-2.4.2-x86-64-linux-binary.tar.bz2 12072658 BLAKE2B b579b847d23f569b7cef01265781457ebfb07bac6604c18d1886c471e79af672cb2ec7c7b145b65b2d3ea7796bb288725bbb066c59e972ce56e153e76577cb65 SHA512 680908f21b8697c71f5a7ce5e68846fabcd4474fe4cd99f087576e0a9f336ba2f4cba83baf987af77869dab2d29974e46edbb52abe9b336be37dd9c8acecd81b
 EBUILD sbcl-2.3.5.ebuild 9048 BLAKE2B 5ed640bc380cab66baa817a4dbb9fd15a1d8bd4843b1e0459d636afe1d816ccddb01ca9a0297b1acafc1fe1ef8eb01e4646e8b9adca87ea36daac6cac7d31628 SHA512 1ad0c2443836a9b15c1f6a746833f91201adfa2182b6b82786c592f04c35abf10192e0a28b59228be81ad7d22859dc2096f277994004b05356615d4e4e6e7c49
 EBUILD sbcl-2.4.0.ebuild 9142 BLAKE2B 3f2b70c0324a1af7a5dfecb870d994cfba77cf0e98cfd752118b04406e5587c8b30a3de5f78962228dc5e71f80eeaa9174e9d1b4fbe7a6d9f093f3018fc47aa0 SHA512 191828f180d7e0eb0f80a56e302e3c9dfe5a25d3c7a6b9d0fff09e60373cda85ec8739d9f6691c0dd12f2a693d3eb5fbf30c026cb9c25be7b23feed26809bc28
 EBUILD sbcl-2.4.1.ebuild 9142 BLAKE2B 2d2fde85e0635d9bb89f771c2fa5a147b7b503efc8c44f652f383545ebc6c2c3b380137fa5066c1bd946b4f026dece5dd9e603e60912c22b25f946aad2bb0c5e SHA512 c378fb7f5562a6625013e1e34897c5218707aa5740ea05feb3eb6ac18f0eee7573a2d02158bf32589623d285946bb06cdb8bca24c09b2fee660876e758763125
+EBUILD sbcl-2.4.2.ebuild 9142 BLAKE2B 5c29f8d91504d76d9752362f2168af5a2c29b3c548209f2e624603106e3257e9055bd82e033df94cccd1610aa6f7957d9d742d73dbe7477486d21b0e7d18e2c4 SHA512 067adeb3ef5e70aecdec5cb53d600bf76fa67ca3abd4cf36ddc066095f72f1d52c5b7634b5d267d48583a8d4a1808b8c40b23bdee36eef0bd34c919ee3b98098
 MISC metadata.xml 1498 BLAKE2B 26fd9f6375ae06e3158d09608aeb5ea4a50e6ce7dd002c7c8f7827cf05798aebd7cba2b630238495ab0a27152ef6e485af2101446dd31e9592e9ffb14fb012b2 SHA512 c56fbecceb20c9550b4f5a07662276af099e7a600ad4f93139e25618aefd57bc45489fd85049da35b1f19937f2293640c1f953cb76780b849435b26f1f27285f
diff --git a/dev-lisp/sbcl/sbcl-2.4.2.ebuild b/dev-lisp/sbcl/sbcl-2.4.2.ebuild
new file mode 100644
index 000000000000..5f950057e5b8
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-2.4.2.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic pax-utils toolchain-funcs
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=2.4.2
+BV_PPC=1.2.7
+BV_PPC64LE=1.5.8
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=2.3.3
+BV_ARM64=1.4.2
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="https://www.sbcl.org/ http://sbcl.sourceforge.net/"
+BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.6.patch
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz
+	!system-bootstrap? (
+		x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+		amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+		ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+		ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 )
+		sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+		alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+		arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+		arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+		x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+		ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+		x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	)"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
+
+CDEPEND=">=dev-lisp/asdf-3.3:= \
+	prefix? ( dev-util/patchelf )"
+# bug #843851
+BDEPEND="${CDEPEND}
+		dev-debug/strace
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )"
+RDEPEND="${CDEPEND}
+		zstd? ( app-arch/zstd )
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zstd)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	if ! use system-bootstrap ; then
+		mv sbcl-*-* sbcl-binary || die
+	fi
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
+	# bugs #486552, #527666, #517004
+	eapply "${WORKDIR}"/${BSD_SOCKETS_TEST_PATCH}
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch
+	# bug #767742
+	eapply "${FILESDIR}"/etags-2.1.0.patch
+	# Use ${PV} as build-id, bug #797574
+	eapply "${FILESDIR}"/build-id-2.3.6.patch
+
+	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# set interpreter for Prefix
+	if use prefix ; then
+		patchelf --set-interpreter \
+			"${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \
+			"${WORKDIR}"/sbcl-binary/src/runtime/sbcl
+	fi
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+	local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger"
+
+	if use system-bootstrap ; then
+		if has_version "dev-lisp/sbcl" ; then
+			bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger"
+		else
+			bootstrap_lisp="clisp"
+		fi
+	fi
+
+	# Bug #869434
+	append-cppflags -D_GNU_SOURCE
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \
+		GNUMAKE=make PV=${PV} ./make.sh \
+		"${bootstrap_lisp}" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+		for d in contrib/*/; do
+			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
+		done
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c47a0c32067e..2e379c8537e2 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index d94d004cc685..5b9c30bf7d8c 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,3 +1,3 @@
 DIST docutils-glep-1.5.gh.tar.gz 6826 BLAKE2B 09decf04f7978c86a2f7161ebfd858f6ff59450d8a22d22963fdea36bb595615337b2c7a565794d86128764512b6e3dda3a7db7124905c74c186513965117da3 SHA512 2d740b02a46265e27b3d0b82a8424bd66f875fdc3f9fb6c1596522e2924bb6484e028ad060af62e4f5747b4046fe850e3d7fdcc48e4bd0bf1c6e2851599dbbc8
-EBUILD docutils-glep-1.5.ebuild 702 BLAKE2B 7d521c98961afc7563e1de8e17f14ae11cbeb73aab7e21e98bea3fc0c3caaed09ff9f69d7c70ffd8f7f4fd1e46c23d5338ee174e2b80794e89fbafbbbb0776e6 SHA512 21f2efb18b0d60ba2a1f3c7914b4464b3124d56552169a648e869f7018f6dee54aa077bb39e140d89cd11816006da095cfe1aa15b83e801ca53b2147da6dcba3
+EBUILD docutils-glep-1.5.ebuild 703 BLAKE2B cb1151741f94ccd0479697be4978c907296fe754aef71cdc675a5f04969cfa7267c402a08c3413cb001ebb0be0989f8098c3f64d08896299b45452124d7f7cd2 SHA512 c04de6d34c440add9ebdc3833e7ddfbc3ec596f0a4f5d9901f3cdfc95e32974850a9f537df5c2ddbfe26dc318ef5c858579468302a5d91ff07a8e3ee58a58b09
 MISC metadata.xml 509 BLAKE2B 8b84599af3e00a6941e4ced4b0c18b9634e18a0b336a6ebc9697ebeaed0b4262a055d2bcd92ed68b65d8ca91b5b2c3b01db4199b023524579211e3eb3e0e13b4 SHA512 757622b65088c34a2aa0a3bf45069107c828887f622ef993e343d2013694a7a0ad37c0217cd078677df2b5e0485313870b8478638ebcc2bcd2dc1c724a53169f
diff --git a/dev-python/docutils-glep/docutils-glep-1.5.ebuild b/dev-python/docutils-glep/docutils-glep-1.5.ebuild
index 260467d50c5b..6184a8bd712d 100644
--- a/dev-python/docutils-glep/docutils-glep-1.5.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index bbcc3b0715b3..849b6a38d729 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,7 +1,3 @@
-DIST jwcrypto-1.5.1.gh.tar.gz 96563 BLAKE2B 13b39b27825031d4f30e1399bac085ba846551b5e50c49ae2a1ff31182e47a896ef9bfdd1705a40e59ddeb6850ba7bafd19ccf83d9f8177c47936e220df881db SHA512 fecb993a1157b6e689d3e845c8839f3178e32ab7fc920bf6b7328705293dae5e3d1424532b066f6dedd9c25a5cdeec91089ed4b83c4592cf6e1690419b5a5539
-DIST jwcrypto-1.5.3.gh.tar.gz 96597 BLAKE2B 6efffce256f7652ca79316c0a4148df61bec65d74f275ffad6f665cfb26c14137ecc7ec219fa30c0f8dcdc3de8468a94dc158ed0b1f973b8d5a451fa1081fcae SHA512 90081959ebd3ff0d003e8bfb6f25e51243c6f7d522d085f5fa63e2a810707b070069a387fbf067c16e8bf3d8e84f9387c399a49a23e20c4d2007ab53e99f041d
 DIST jwcrypto-1.5.4.gh.tar.gz 96607 BLAKE2B a1558c58c26e6ecb3747c6e7d554bd2100fd8f3c9c5804cf2a596c55920399e879dad267bcbc162aab0b956bde129cdb0090af98171eb7cb06970ed0964f47d9 SHA512 085adfd5f894ee8215c70371d2ebc2e97a38efb17be14ee8433858474df906ff963f243f669e209624e7ec78c1eb8b5ccc2077f0fc50b4e5eef25885e338b4e1
-EBUILD jwcrypto-1.5.1.ebuild 845 BLAKE2B b0c7c3320880be5ac70e9e95c3968434070e7b5b272a32c86bad42e8831e98e50b0b42cc047355718ce27c11a0373f53d186056675d4becf21556cceb52fbaa2 SHA512 db0683040c46a27b56f3ba9fe78747edc61a7cfec22bff4b8e2fffed1bc863c09898d9063ec26654d4b9cf5247771d4c0925427167753b32d0dfb3d8735e01b4
-EBUILD jwcrypto-1.5.3.ebuild 855 BLAKE2B 00f5a63516d7a526988d3ec76930767efd391e13ae73f1060b798296fae35ec8507b2119aad6041204457c47e72dad9d56d82800004220655d58244b1772c199 SHA512 d0543094363f40ea1335ee45aab6fc1a0cc072b162a7d21fa6245d22a401a0a4679a1d1f4b6555be7d3ec87321b7323b1c45d1cc832f758f7c49b4ff45920b6b
 EBUILD jwcrypto-1.5.4.ebuild 860 BLAKE2B 613b45d89e37f0af12f2ea71a7f0fe46bbbd584cffd97659526d92c878e816e540227aca4f7f100580e3528a9f92753366386fd4b2d7fdb11b6f0fcc993810a7 SHA512 c4afa93dd773fc5a25102e94ffcce8afd2f1749e6fe56be52080b393d53ada00ff8f14370cc07847456395d587bdc95770c715c46259f588165984abaacc34a6
 MISC metadata.xml 369 BLAKE2B c7868e0b20a2875964290642cddb457b71628e361f0e032875ac45f4405abeb76c8c53bcfe623c9a2e49ea6e184505503b4e43f34c456528ff3250aea5110b10 SHA512 a1fec6ac31bbb096e508b0ebd644aa8a96418e6972d852512d4b7702b67f241f858610235dbd68430c588d8b837c7a0866f333c8aab182e7cd01e10325031d34
diff --git a/dev-python/jwcrypto/jwcrypto-1.5.1.ebuild b/dev-python/jwcrypto/jwcrypto-1.5.1.ebuild
deleted file mode 100644
index 65db8997f7c7..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-3.4[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -e "/data_files/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.5.3.ebuild b/dev-python/jwcrypto/jwcrypto-1.5.3.ebuild
deleted file mode 100644
index 4ecae46ff05f..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-3.4[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -e "/data_files/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 409b036398ff..744dd73f07ee 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,8 +1,6 @@
-DIST stripe-8.2.0.tar.gz 1066563 BLAKE2B e622ff4bfbcf8fe97c6dad7858845b5fc863523be8777c2c99549d4e5ec6e1af77058f79c466bc4bbffaec1f7410f16e0940f145b0af9cfc0b10d6c2bcf20669 SHA512 57e538de91de380116f67cda8108edead1795a92cc39cb0025ea71b94208929d710ca6101aeeb1e8d489dca0af372d6768443dbd2631b7aadc365b6fce395e4e
 DIST stripe-8.3.0.tar.gz 1067989 BLAKE2B fb91886e93e9398fac0e20d72f70e63579150bdf27d594ec256b74e76561a5fe52ab326743f31d0f48874f3e066fbd0441569d62f41da0ec486ad84a592ce4e1 SHA512 963bc17da4acb8664482459dd0c09bba6859f17e0aa0ef55da8a9aa588174e1f34072084e9f94829cf81d0e4f9bb78df2836fdc58710f49acb4b17a271b7742c
 DIST stripe-8.4.0.tar.gz 1071302 BLAKE2B b7aa15e20baa6c0a2e939fda1ee45d3acab72ab771717ca15b0302793f4958257d0fe915c02d92d4be1d51eb6cc6be3bc28d4cda43dffb0ed1e2e958cfc29160 SHA512 b7ddb5a11c379492f5a7eafcc44197e026e3020420a83c294db6bbe2d73b39c4af38746817d0684e84f09232b12b45280d919090a331a9a0d03af4d02e59ef99
 DIST stripe-8.5.0.tar.gz 1073351 BLAKE2B 7e30a06b34c99cbdeb06e33ee462ae6e5ace4583e293f860992f64dcc7ab6b8766e9cac0f941fd709747f0d6e0c2a171dbd72931e0af527a731c860266812121 SHA512 f6ab165d13f037856d2648faa5aef1d47d7c0aea78e222d23aec0a5ffd90e782c30401367fe00a7c09807e029f53382bd5f76ebcd096ad8d06185e32776766b4
-EBUILD stripe-8.2.0.ebuild 2139 BLAKE2B 4ca310dddacbe87e6255fefac4b9da728dc92c2cad995895104534f382e6a287691a4e0718367f928903e1a6e72c0f90fc3880a3c2f2b6b549b269fd4eaab7ca SHA512 a6bb0cf9f275ba7b6f4b7786034afdfc426ff87a0b54fe01d61dba9a1ccf31ae3bc78e42f2d9905279c1583d48bc10a4cce8bbbd116a7547b5b7b32b7924a072
 EBUILD stripe-8.3.0.ebuild 2139 BLAKE2B ebca4f16824fb84f12b8a3009d39418bf836d5afe7a7cba989a79e7511cec8e7dd5497c641fc7722a4b91b5b5fd41cc2d66aed9d66c7f85bc0884c66dacdcb61 SHA512 5d06e11939ee3a719576700265c595e974f5b1d4b5b5f3431283e78d6c2eb16dbc9a49e3919e7341e91e00a4130d1345efce1249f098ab27dd7967a32b645094
 EBUILD stripe-8.4.0.ebuild 2142 BLAKE2B 12b001219d977c62a6077979b148cce983a3cab06ed9513222d50ee54b5e1958e70d01d906f50e0e2103674c68a0822de16309ce6abfa17e1883d04c1a7c7160 SHA512 9794a2cd535557155735e3805d99b6825f27e827a82b505042e15cfc53d4912c384fc3d9687bdb5eb2474ebac3f3a08d84946e2a617bb18729c2d80ba59a4fe6
 EBUILD stripe-8.5.0.ebuild 2142 BLAKE2B 12b001219d977c62a6077979b148cce983a3cab06ed9513222d50ee54b5e1958e70d01d906f50e0e2103674c68a0822de16309ce6abfa17e1883d04c1a7c7160 SHA512 9794a2cd535557155735e3805d99b6825f27e827a82b505042e15cfc53d4912c384fc3d9687bdb5eb2474ebac3f3a08d84946e2a617bb18729c2d80ba59a4fe6
diff --git a/dev-python/stripe/stripe-8.2.0.ebuild b/dev-python/stripe/stripe-8.2.0.ebuild
deleted file mode 100644
index bc668d50723a..000000000000
--- a/dev-python/stripe/stripe-8.2.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.181.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index cce20953442f..7e2f8a510c2b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index e6cb57b0f84f..e17828973626 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.3.268.tar.gz 465726 BLAKE2B 63eef0d0e4cd00fc72834a8b570fa4c6e9b050fe3485135da6e9dbdaa9748b770253f06778cbbe6587740cd27ac3917dfbf7a3dcd38fc6b37579c8f74ae28000 SHA512 73ec06371d958d6bb7a891210334f7517d46befda164ec80f46346f712d46781583348ce72557c6ff5abf0bf73df655912e0a0ba9929913374c141f913973e24
 DIST spirv-headers-1.3.275.tar.gz 466308 BLAKE2B 58444631219665694a3c7cd646bcfd7701259b6ed30d7ce3002a801e8ebd695ae4957438cf4e28e12e8554d052992d68e283afed6c8e4cb0e4b963375c94d3ca SHA512 409dc2b582ac63b69315b04b493eed5ffca95439a949536feb5a90ada5db92ef7edf926f9c1a6eb6475dd52e8c20c68eee42143fb75b1b119e23a6f9ab773474
-EBUILD spirv-headers-1.3.268.ebuild 492 BLAKE2B 848e0e85909b37be2a3b2599ecb9a4f36855f64920d4e1727871ee89eacf153f6bdaecbff1aaab56172bbb9c0986ea4d3c6252bb03e4c527dbb4a1f27237ccb4 SHA512 52050b29a4498982e3b43e067113138b801780d4166a378993d01c0d3183aa43b73b35cf5e813a11f8a690554f0f03756cc785bb64cc6939108d0daeaf58467b
 EBUILD spirv-headers-1.3.275.ebuild 492 BLAKE2B a11c57aa902b8a9cfa9f6bbc5f519fd4f12d96e5801ba07fbaa30997c4dfee33bc6ae1c20ff7028cd5178b143e76a5eaea217ff94bcfb354ef3244c6777e5ae9 SHA512 28cec635773edc379c57bc43ef260552b0da058deda84e2c237799fc333f9f1f4133cc81c0f2b8af4687ae3a0f6f987442ebfcec20407d24697582697c1b70a5
 EBUILD spirv-headers-99999999.ebuild 627 BLAKE2B 2afb9324b81fe1eba43b57ae833bcddf2e3604d5a9c3ff7642c953ee7c851d53659dab2657b5837df1de2881813b572a112553ea74a6db5a639e2dfdd1b3ec87 SHA512 905adf590cc16585ab05d5ebb8e397f144c4fcdb542ebb4b95f68dd0edc2335d3bf352817484c276e8e4f08fc70115a96a1ef865be6e870f02b008d693649758
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.268.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.268.ebuild
deleted file mode 100644
index b139535133e3..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.268.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://registry.khronos.org/SPIR-V/"
-EGIT_COMMIT="vulkan-sdk-${PV}"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index c4819ca0da84..7d3c53af1829 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-tools-1.3.268.tar.gz 3148758 BLAKE2B ddf4c132dcea80d2f631a001d545b46f3f23f72600edd880d90b9693060d7cc57ad45faa0b752c520c43b9f1c199f6656e988a95256bfae064eeccd21277fc6f SHA512 317ce91ae229efddb98028840fbb6c9000c6a09aace2f04c2f59fdeb3a73b8fdb75048bf5a2189135a734a30b1ead57dc7dc5fcfd70a7267d17c743238a19899
 DIST spirv-tools-1.3.275.tar.gz 3153781 BLAKE2B 963504946f9e7b89959da8e280c15027ebe330877e6878d1c03ee163ed5b464f62f3203bd9efc1fcfd85842ff9acfb939ee89029642ac304de44395861a402f3 SHA512 f17692509ecfbd753a853eaa01d559c06b06fa15b287971da814044418da71a94813606acfe536fa519e8aeba92bdfc80971acb749dab6e7cc395773c4f05693
-EBUILD spirv-tools-1.3.268.ebuild 1146 BLAKE2B ddc648c113855670d87f7f3fba387db4f2b092c6da32db6f464e5704637a801e4d37068dfa9893798d9fd9876972a6c72b1fe99e791b5bb9dc1aa5691059cefe SHA512 2b7a584585aadad2b29dd5e449bb191fa7139b0f85a8bd272113ec27ba634c2337c2b0f1475b87cdbd8f2c0bde4be78cdc3b74c768b00c5cd7e32b41510a2cdf
 EBUILD spirv-tools-1.3.275.ebuild 1146 BLAKE2B aefd516d4cb667739ff430c2f4c170bf1fd907fad1446ca0456fe333f2fbb361d56c7f73f975ec93efe5b93d884facbae9973a2dae14f94ea9cce674b7795e83 SHA512 da06e97b7ae13cf9cdf3473ec0d53780fcf53952102be2781b71c2fe527eb49cdda518352c5c2c8a4cd0538892ef574e517ff2c964c1e895f75b17c1417332c9
 EBUILD spirv-tools-99999999.ebuild 1148 BLAKE2B e4093574ecbb82263180ef72f2bb93841ece149065561868aaf13456cfa7c2f80ac7f36f6b095445e1c0ad56dc2be8f70df30f6e058a206be4afee23e494f242 SHA512 0734ff5a8c4566f097e495fd508845d14dafaafc14b33481e3ee7e2b1fdfbbd2735d04069d689e0b9fd38c8fc0af1a929987a118d94c3bf05d2022178afc49b9
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.268.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.268.ebuild
deleted file mode 100644
index b32a82166767..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.268.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=SPIRV-Tools
-PYTHON_COMPAT=( python3_{9..12} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="vulkan-sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-DEPEND="~dev-util/spirv-headers-${PV}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/
-		-DSPIRV_WERROR=OFF
-		-DSPIRV_TOOLS_BUILD_STATIC=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index a059148ae6c3..60b84ca92a26 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,5 +1,3 @@
-DIST stripe-mock-0.181.0.tar.gz 1510851 BLAKE2B f1cecc0db71aa962d36060b5b5b59d6547e5f94a052ddc92048dcaf2170416118d5b00deff877810fb96fe199b4944b0f22f3d8fd6c09cd1802cba5164fe4c9e SHA512 a1b1f3ce17757233650c5082d795404fe1e18f622719e3dd2a31aa9e9558db72324167e09307f02dc9b4d28e85d9e4101c239d3035aa7746eda20a0484a166d7
 DIST stripe-mock-0.182.0.tar.gz 1531682 BLAKE2B 35a2b81646cd3bcd57b9b45b12bfa19f16be8337ac3261e163fd68daf33b2fce2eb6b655bf17b7858ef6d63296c404dae7798195ec957b7f73752365688b1f0e SHA512 cdfab6c73554e978bec77047eaff74af9d3a3e48f79b7118c8f9603275adcf825076e70fcf84c49bd561de0748c496df5ff4a2cf4d366e39ab82d7c734f8c456
-EBUILD stripe-mock-0.181.0.ebuild 504 BLAKE2B 0c5bb03539d8951adf39cbd0136ba6e5030f7aa78d56c654a751b5cc64d609687b57f900f92f661d567195a1f25ae2f7ab25da886dba72190feba7298949f4fc SHA512 923f0c772ac40e8e7261f62cb3d0e7cb3aa6c400e706b6508a769ec6f7c56535d24afac724040c61430b3309ac4c25d2d0d5835e521d46b87f2555a9fd3562ab
 EBUILD stripe-mock-0.182.0.ebuild 504 BLAKE2B 0c5bb03539d8951adf39cbd0136ba6e5030f7aa78d56c654a751b5cc64d609687b57f900f92f661d567195a1f25ae2f7ab25da886dba72190feba7298949f4fc SHA512 923f0c772ac40e8e7261f62cb3d0e7cb3aa6c400e706b6508a769ec6f7c56535d24afac724040c61430b3309ac4c25d2d0d5835e521d46b87f2555a9fd3562ab
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.181.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.181.0.ebuild
deleted file mode 100644
index c010548e4abc..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.181.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock/"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin stripe-mock
-	einstalldocs
-}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index dc96d4cd682e..5b67aa56b505 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.3.268.tar.gz 2133179 BLAKE2B bf2fe22d711a9eefd01d9096e856ba38b25fc5147785f329c9abab2d62aa87fe9f26918ece0fdfe6bc1ac247d61f30997ff4e0076e02fab011bbc45d2ca05576 SHA512 adab4c97050aeb396445cd5352e4252b74d2a02856ffd369caa0df50ba544b8b8ab9e1630f30ce73c56751c987e2435263214547457b8ca9430c5ad2dadaabaf
 DIST vulkan-headers-1.3.275.tar.gz 2199831 BLAKE2B 3862635bbbc965de8653d1a2e9bf34e3ec010cbadaf7c16da351260b56bb4b5f4f82cb52a96d1fdaf9a8590c3ac620eb38a9ee5dcb7cd8afd9981a34d7cf35e6 SHA512 e4ceb5d5d4e66bb683fb1c4ce97edeb559f833d391b75e1b095ee0eabb96e4bebb964d37f57719ac14f95657d4e39282b8450add5f4ee325f45c3a257d99ea39
-EBUILD vulkan-headers-1.3.268.ebuild 614 BLAKE2B 4fc38a602496c5672eb40669996c72bc092a0fb9d999254551460f038674da1519d31e91d7841dc57fbfe96da6ef3d8dbcf3b903e8b6bc48733fdd6ea3f60278 SHA512 7a03dbf93e16431a43336fb99cb601ab255bae204694ab9bd040703bf6a1dd8cf34980d8bc7a5a528bb00ffc9dc5b11002581c8c8c9b803d0e218d031e6c07a0
 EBUILD vulkan-headers-1.3.275.ebuild 614 BLAKE2B fe8abe55fcad965fa66cd5178c6ca05fb0cd49e31994ea072f9efd36b15496e281b219adc0903606107c3f16d9a23bf749e22528171563f39b3d3a1665e26b73 SHA512 b806b95341d0da01f56cff8e6eca4465313916a5d7327e124c14ea4c8f22e4ae802df982a1581d8b1ea38f04cb11fb47b15288e0e55363d4aade8a43e1679cc2
 EBUILD vulkan-headers-9999.ebuild 600 BLAKE2B 0daf239aa649fb07a0cf75f53b709fdd45da34d5ab5d03bea21de97dd15871a440859ace5089d7de99665af2b1eac52ab4b312bad809d22ccb5a1ba858828a8b SHA512 c5c5e86b12dec0b97c1dcc1ef5edfa993665f99ff573892e7426ee7533829a72884e8b5eb4b19ec27d289c8cdb0c383299aa41c05f543e6af54455b2ecf06a1c
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild
deleted file mode 100644
index 3d5ccab4fa22..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 91befa42c887..7afaf367bbff 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-tools-1.3.268.tar.gz 778556 BLAKE2B a406a110894e9cc95d0b16f5cf4e11fbcce1d31d1c6378172eb955e014ee2381a12a1625288bd5b5308b702824c2ba1e854e6df88e42976ae1dc39fac5076498 SHA512 9359e9528bfe507870bd83f9e8860b3d82555c0d8a6a19284f150dd2288b204f2c9dc9b3f62be4efbbb5e2983862459b2131de126a603cc5531ef8df72f4458f
 DIST vulkan-tools-1.3.275.tar.gz 755289 BLAKE2B 2366a0c55982ef9ef13495ac62d958d0055fcbbbd7cdaab9530ebf15af9369a71bf3b8d3d6479f3a0ee02d44ace027e0fd57b2b93d6a9a373781c60529a48663 SHA512 5d70498341b8d2447128cd5ab3fd081b706830f5f85d9f7e752dfca9c74fa4c1567207eef6e34e9bf99ff65ec2855b835eb30362fd544e1cf61ecc7a7119df06
-EBUILD vulkan-tools-1.3.268.ebuild 1936 BLAKE2B 58d440b509c29fa0287114a1097d4df594d151e346b4663b120a4a367b915355c3a142869a72b0a79e45af817a1c6c4b990f708efda6e7962edca408b386f1c1 SHA512 9315855e68c073943b3293dd770de975a4983105705dc042d9c22bcfcff4cdb64c1adc6bdd465aad90ef678fdde4bcc73bc4635136827c51f53a35c1b0e83fbc
 EBUILD vulkan-tools-1.3.275.ebuild 1938 BLAKE2B b7d8535c88d5d3cba35ecdb6f4c6f777628902094a67d83e855f61b0db7e4d848672824003ce863dc8bd8b9b2190dd929047fdc2819c6f331bf395ff977b30f7 SHA512 74f5879b5e53e516b5f3fbd311a57f77ae4d07bf83eaff7a0411f45e95e21df34a1c0e942b474e78031bc14c61fba56623e3da36ef8236a3da4722071383b870
 EBUILD vulkan-tools-9999.ebuild 1891 BLAKE2B f0415527fb56402fdae1005e36c1a3f4a2059a0bccaea4a547cea00d4a94d60b4089f820a254ab5d9a929c7e53af49d555ec3748f8b305d5b28369ee2f7f742f SHA512 862a357cb7d2f098eaeb7c6699c0c52c5de30df3e541a5d8debf2eda91ab4e8e24782c15e5348d7f620e6076b69bffee66074c1c95312b0f33a1003ebdf602fc
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild
deleted file mode 100644
index 7f62d164f649..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-REQUIRED_USE="cube? ( || ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	~dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube-wayland
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index 869b755288eb..cdb4200c9a99 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,7 +1,4 @@
-DIST vulkan-utility-libraries-1.3.268.tar.gz 165464 BLAKE2B da08853b6be3e53b79b3e7e22a34dc2b8decc1bb67a6dfef79af4fca829f9989b04dadcbf7910834d1fde8beadb17b64fb3be928c4e1b3856626eb1fd0f96d32 SHA512 4bcb3f5f9a1567427675c5186a04c9d152b791989aaaba5f43a46cc8db7a8ab08626d5f9a101234b595fe283aa493655e26a521c17cf28752d30437d896fce40
 DIST vulkan-utility-libraries-1.3.275.tar.gz 167313 BLAKE2B 5ee970f7c3472f696df4a9483fe057ef63f671d2299a51164d01f0e625f11ece11ada7ea4493af3795cd4fe8f6c9d84049dd5bf235c425e311b02abaf77264f3 SHA512 113be0cc1b7c3f7cce8c8cfe2459ed36e5b906e55b34f03ce1c211889a9a5a9539d2fa608919e8506e372c3bca521a23cdd1c20d4834e7914696dce33a95fc71
-EBUILD vulkan-utility-libraries-1.3.268-r1.ebuild 1068 BLAKE2B 1b15a2e0222b6ab84a67463ccba39f0ce726c52e646bcd9e534f9457c692fd6c712e079c11b4719d20da70be3c93f8aab216f511fbfa747c0d46656e48c589c2 SHA512 96797ca6b57d672e0c957a1f48d2a7b5207f5829e8c28be95c3ab7039d9324fe6be856e6b0a378b9ce50cdb1482b1dbad7af12ff560fe27de8ff35545ce179c3
-EBUILD vulkan-utility-libraries-1.3.268.ebuild 848 BLAKE2B cea0510a2aef1499a2ae9687e9247283d8fa21febfca55b67637edc981d6496a5129d2be34dac0847eb39c36f405aae452bc7a6340ed26b568aeb6b784904024 SHA512 bf8e4afdf5572edb3f489831eae3a0e7b3ac176d82b640884c93b014c6cfa749bc22f654e1822180b23e89a194c9a0f58bd330b593216a33b118675fb1083211
 EBUILD vulkan-utility-libraries-1.3.275.ebuild 1062 BLAKE2B 1be494f9d81c0dc671e3ab6cc2dab536fece03fb333f7e796e8ecb3c5e770308f1bf096b1e6ed88c2512690617fe506f81edd482714c2d0b2a3f579bc8c4b5c2 SHA512 56be555dc37726816e7118229749f3fced69cfc960dd2354b5626c113e29a480f6753acf2bc66b4b3e806d222d3986666c4f33349bb19cad4ad055c665cb3035
 EBUILD vulkan-utility-libraries-9999.ebuild 1061 BLAKE2B dc39c9481f86588c0225f66fa285202d598ee5d054d0ac1622cabaf0e873c02d755be26e04d2fcc21a1562e9e64556166286a131499ec35932262ff914b681ab SHA512 ca4837d740385b668acf7173507556afe23067c3cb8b94be0b141edaff5b00f493b2cee9588f0ade4870293c1f3dff33cbc4bbfc3a0241523886b22f73e5d16d
 MISC metadata.xml 442 BLAKE2B cd315d7e91cf05f2d05be32c171ef6145e818f9868d17886cc7b5a2cb5e5fb8d58961414f585b15ca6c9d989244c0004c366d022464bd3b3b70ea451a2b67c7d SHA512 3e059e27de852aa76dbfdcc3dac69f0f472f496c64e1ca2a9053799f090b9091800e397a92012b7e546fa8240702546a5ca0dd6b2be6cfee356f539e73439c94
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268-r1.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268-r1.ebuild
deleted file mode 100644
index 4ba40158e92a..000000000000
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Utility-Libraries
-PYTHON_COMPAT=( python3_{9..12} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="vulkan-sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Share code across various Vulkan repositories"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="~dev-util/vulkan-headers-${PV}
-	test? (
-		dev-cpp/gtest
-		>=dev-cpp/magic_enum-0.9.2
-	)"
-RDEPEND="!<media-libs/vulkan-layers-1.3.268"
-BDEPEND="${PYTHON_DEPS}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild
deleted file mode 100644
index 9fc8792461fc..000000000000
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Utility-Libraries
-PYTHON_COMPAT=( python3_{9..12} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="vulkan-sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Share code across various Vulkan repositories"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="~dev-util/vulkan-headers-${PV}"
-RDEPEND="!<media-libs/vulkan-layers-1.3.268"
-BDEPEND="${PYTHON_DEPS}"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index adc5207cbd1c..fe68e8f858cc 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index f53e2c23f4f8..8f56511032c8 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -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
 
 # @ECLASS: vdr-plugin-2.eclass
@@ -83,7 +83,7 @@ S="${WORKDIR}/${VDRPLUGIN}-${PV}"
 # depend on headers for DVB-driver and vdr-scripts
 BDEPEND="virtual/pkgconfig"
 DEPEND="media-tv/gentoo-vdr-scripts
-	virtual/linuxtv-dvb-headers"
+	sys-kernel/linux-headers"
 RDEPEND="media-tv/gentoo-vdr-scripts
 	app-eselect/eselect-vdr"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e14f27d8049d..fec7bb77ddc3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest
index c021a5b7b6ed..a13f4d8e7e7d 100644
--- a/media-libs/libdisplay-info/Manifest
+++ b/media-libs/libdisplay-info/Manifest
@@ -1,3 +1,3 @@
 DIST libdisplay-info-0.1.1.tar.xz 76864 BLAKE2B 262f275a61efefaa57ec48558c4b9f9dd9cb6d8012e50a9873e10a593e1b03e2cc37c2d690be392f26ded171be9dcc8a7e80139129d2b4d85ebc7f9ef0eedaf9 SHA512 95c199211504af96816d92ec8e531bea993dd5d4a2935f1977f1e665b924b1628df25b81cd20da29543d008a8e6d757bdbceb09c74e031c0c213d60be9a10d7a
-EBUILD libdisplay-info-0.1.1.ebuild 652 BLAKE2B 4db592b4185d8671fec7f00084758397e8dd26881e5e948cb3002cd913d7b161a4cf9ca05f0bcd9bd64cea6d76bebc0c7070a8c83f246be37bb2dbe993a9e233 SHA512 16da28d639cd1292606a12d2014b9af9abf82da24d7cbd1aef3aa6f458470b1b78311324de951af2355366912eb81f8c399f599850fbf021ed04e42428d9521a
+EBUILD libdisplay-info-0.1.1.ebuild 636 BLAKE2B a5a1a6fa3d9aa86aed2c74055f25f63c06afc4ef21230bf932b76f80a55850190b05b675e2523b467be42c72a6441f4922eeb7033f7a24c26b741d0b5592a819 SHA512 2d84954d2f7c90e6e807d7dd0961365b97db75d679512024b41713cab838caecefc92dd086ef2fcb8ee8950b9be47609c85f9c5c83144de8bad74b24b4e9f713
 MISC metadata.xml 349 BLAKE2B 0a82833d63b02c6572b7ee005a433ab4768fc3b6b4f6af5ef1bcbb2651d48bf8638cb32994c12370347302f0b8fb66e17b85b188177e1df8bb98e0a2bc65f920 SHA512 e5c06e09ec11cf204a2cf82176778d0fac91c658813d20e7da4e6dbb80ba6b2e27eb4a12b1daa244dceee894c24e9617c313a2d07732f5ca8ee2aa79cc162cf5
diff --git a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
index fed0aff9333a..4d86d742c195 100644
--- a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
+++ b/media-libs/libdisplay-info/libdisplay-info-0.1.1.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson python-any-r1
 
-DESCRIPTION="Simple framework for writing Vulkan layers"
+DESCRIPTION="EDID and DisplayID library"
 HOMEPAGE="https://gitlab.freedesktop.org/emersion/libdisplay-info"
 SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
 KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
diff --git a/media-libs/libsvgtiny-pixbuf/Manifest b/media-libs/libsvgtiny-pixbuf/Manifest
index 9cdec0180ea4..00b9f501e1af 100644
--- a/media-libs/libsvgtiny-pixbuf/Manifest
+++ b/media-libs/libsvgtiny-pixbuf/Manifest
@@ -1,3 +1,3 @@
 DIST libsvgtiny-pixbuf-0.0.2.tar.xz 263100 BLAKE2B 1afebcfaf77dbd765ee6c6b4dae1decab2f5458bd7ccfcae8a4b5b02e71c53999d130f698b9d5619fff40ecb96a98f7d63f984e182a525720c3c9df9fc5dc227 SHA512 bf657fd341cab1f9b7ff81f9d517096176e6b82d14c2d6be12e0b6a8420e787bd8c9d7324ecccad8c0a01c839b9de0ecf6f998996571dcba8e9b6c22c28bbe56
-EBUILD libsvgtiny-pixbuf-0.0.2.ebuild 676 BLAKE2B 3da9b1dea732532e01f07137ee09433c177e1bcdaf10cdb80c22037e090f406ef29d10faeb6f3ae956f72228d1f5cf52b9702700259466dc41edaf70808a6e7a SHA512 d272d9db5fb7aa033a74773502029e1e5fa60b20c091cf26516de3797f917a6121a107f6685be734ff0660c1ab90ac1f9af8197e55a5da06be31db505f28b87d
+EBUILD libsvgtiny-pixbuf-0.0.2.ebuild 667 BLAKE2B 0291ac41f65092a59b2f00a9a81e74237a2b4f5e8853efc47a63d88faa1da718b8af1a115787d317c40bcfeb90d67ec959c808073abfde932f12087d17ad76bb SHA512 1a3cdcfbb8d26a03cbb801e2644ad4253cd60695bf8f6894707c082a5df7bafbe45430861830b29403b43a3f872346b8d0bae674ff275491b5f3d1a3ad2d8658
 MISC metadata.xml 410 BLAKE2B 477e5b88250e37a88df946d5cf13995c80986d3a6e14916a8f94f74a3c0a08f026923a0aa0aa6e7c1952022671e54a5727e4d7dc42135ff48d875bd5c3e1720b SHA512 e3431d0ef28a06ec69371eb190be35f21b3b0e52b981496b1e5294ec592663c2bd58241a771189e2b06e7a9f102ca406851bfd277adb75f4f1c994a42dfd0dbd
diff --git a/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild b/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
index b573b0ae84af..8f8ea2a0abab 100644
--- a/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
+++ b/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.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
@@ -8,8 +8,7 @@ HOMEPAGE="https://michael.orlitzky.com/code/libsvgtiny-pixbuf.xhtml"
 SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.xz"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/libxml2:=
 	media-libs/libsvgtiny:=
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index 0357162e201e..048748916e30 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,4 +1,4 @@
 DIST libsvgtiny-0.1.8-src.tar.gz 764959 BLAKE2B 846ff04efe2f1a696ae43826233ee8ff9a348e3e816792294aab865db70f72b122e5da71ffe88eae3282483f3d932305970d305d7740826bb8f692584cbeb30b SHA512 86015bf5b662950ca25351303c6e2f31d197166757a96aa1163234dffc06328028ceba8d927ac701da3f9ebdb7c74d89c3865b1decbdc26dc3d83290c6628ea2
-EBUILD libsvgtiny-0.1.8.ebuild 742 BLAKE2B fcab35c3205875f86f63fe6288d7fbc4e020432a37a815c2a2d0cd087b597de995f9eb7401e8d94b38d54d5661a0b092f8b303cb9b8a42b96728a467ca301888 SHA512 26b5dc96ace37104a74cc6cb6ab316de4451eeca6a7a612fcf8d8bca423e11e9f48dbe03be6203a49a95ffe668d0a79da0e312fee3d85e314682f46e420d6358
+EBUILD libsvgtiny-0.1.8.ebuild 741 BLAKE2B 6979064163e0661a519291241826b03a9c2b275cb48234207fd3aceba7bd682e17ab7f8f738e82083dbc6820b0d36cee67d37814a7ae53e4209d2cf25c995591 SHA512 087202901a16f2e703102fac8887677904cc1aac8f1473bcf902f45d99e4330b5918cc483774815faea974311e338a1bdd911fd46728b381d382778091cb762f
 EBUILD libsvgtiny-9999.ebuild 721 BLAKE2B 2f00910177430a5ad177ebaacdb9b716b59aa39897391c8b05456e1c26bae4b1004f287bd964ee0a132b994b1ff7171e036e95c840174adf2abbba75970144a6 SHA512 89df8561087e8f88371d282aae1e0039032fadff0be14731c6c3d70cfaee72ef1c5c848488246c24f50722fe5ffeb5909896d79e242d2057baeb77ce35c89def
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild
index b2fd0472c935..da983003623a 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	net-libs/libdom[xml]
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index da55608c8b08..680a239cb761 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,5 +1,5 @@
 DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033
 DIST phonon-backend-vlc-0.12.0.tar.xz 71664 BLAKE2B 9ace1020d8e9a9e97243706ff81703d3f22bf892f402e44451147a24547d09bcf12f5745377c01d65b4d1fb03cd975b323b2cab62f8136880d1d9c004cca7d7b SHA512 78f5ead829d5025c7cb9e01b33819514d795651d1d932c03bd8cc2ad5d427e5aaaeeb6016820d5a7bb9907f6df1142a0fbc097830d7c63b01f77d2167a0c9264
 EBUILD phonon-vlc-0.11.3-r1.ebuild 736 BLAKE2B 68e053bf42c51ecbbad2f94e76cb8b1d982d706320cd4913aa9954cff08b7f4f6332d1f8739bf664c6dda930dbec3ec88177dd6a530c95a36caf6ec59467fa6a SHA512 f5c1296f63b6d71265c4d77b224b38bbc2ccc3b70349bd07db9432643796407f4661d3da97b8a75a556bc50e560a3290c47e4a264a3303c92d060e6fc1b4039e
-EBUILD phonon-vlc-0.12.0.ebuild 1012 BLAKE2B 7136746914bcee3a5b95744639ce852709f425004d8fcf3de69ae728236cc299a746c70b2b745dc762f8b2ef715b6f70fab40aa10d898a91e6316b3ae181998a SHA512 0dbd0c0497afa81012ce9af5ed952c211a78a0da0c636be08931007d0698d4572e06d2cd636d8849bd504ab7ef4600beca89d009ccc438195145d379c3e50f11
+EBUILD phonon-vlc-0.12.0-r1.ebuild 1786 BLAKE2B 4189ecf5eb77de0b1eb4b48862dec2f4562fa4bb23fe2457cbde82650954023c3b31ab15c8fb051be95a2fa2b6e3ef55d66bcd964ba90fb264e1cfd3d792ba89 SHA512 ddfe137f75c78c7309eda5eb9cf1e49320b2e2266ef98237d349305f6c5c772d01d04b2b4255d9358f91fad7d925e42a7e0720e9b667ff6599d1881aa709e92a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..bae71d282ec3
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.12.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic kde.org multibuild
+
+DESCRIPTION="VLC backend for the Phonon multimedia library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+	S="${WORKDIR}"/phonon-backend-vlc-${PV}
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug +qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	>=media-libs/phonon-4.12.0[qt5=,qt6=]
+	media-video/vlc:=[dbus,ogg,vorbis(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/libpcre2:*
+	virtual/pkgconfig
+	qt5? (
+		dev-qt/linguist-tools:5
+		>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	)
+	qt6? (
+		dev-qt/qttools:6[linguist]
+		>=kde-frameworks/extra-cmake-modules-6.0.0:*
+	)
+"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	myconfigure() {
+		local mycmakeargs=(
+			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
+			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
+			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DPHONON_BUILD_QT5=OFF )
+		else
+			mycmakeargs+=( -DPHONON_BUILD_QT6=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
deleted file mode 100644
index 62401f9834d8..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ecm kde.org
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
-	S="${WORKDIR}"/phonon-backend-vlc-${PV}
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="+qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-	>=media-libs/phonon-4.12.0[qt5=,qt6=]
-	media-video/vlc:=[dbus,ogg,vorbis(+)]
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_QT5=$(usex qt5)
-		-DPHONON_BUILD_QT6=$(usex qt6)
-	)
-	ecm_src_configure
-}
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 3f348fca130f..8aa70fc045c4 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -2,5 +2,5 @@ AUX phonon-4.11.1-clang-16.patch 1356 BLAKE2B 2adbe00797db0efab8a065c455b8122bea
 DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a
 EBUILD phonon-4.11.1-r2.ebuild 1307 BLAKE2B 69c75e346c77710c52591a8debe93bb09c34217584a520622dbfcfb2b4442b3039f1705ee5550f4b35edef1fc65a33286517deb24373264adceef2d365679ebd SHA512 daae7f938573ea831c299c0ef584ae4526570e64e3cb0790cfc7dae34b364fb4bb72ac0f312d0733fb17de6bcc3f74e3dbd9a08247c5d43e2776bae5deb8ec3b
-EBUILD phonon-4.12.0.ebuild 1456 BLAKE2B 01b08b2a71cc3a00e9d17d6cb5c495da19812cce2b5be202f4a3dc3f619f3745902c41963949189e8bc0e4abcd1adbd467a817c42372e783510653704abdeab0 SHA512 e1239d965243c5cfb48ac4e05b82bfaef57aab0c01003d67a6fbd3bcff3291d6e6fea5ec59c8e39283e9a8225855b94cd1d0eaeffe84c47074bba96d93df4466
+EBUILD phonon-4.12.0-r1.ebuild 2328 BLAKE2B 115e00846beaffee89aea5a68885fc006fb463cea10e1bf97d7f7d7e65ecd43b196e250ea9f865307363e1124d0b6da41f5fbfd1afe261cc24a3081034d73b27 SHA512 b973515a50ed308451de8bd910a8926396afa3b0ee2bcdf4e30922effec089111b7309206e3a955dae0ac85115768df5a72a052f4886f92702e84a1c1fbbd675
 MISC metadata.xml 463 BLAKE2B 856a539bfa489dac4d6550f9fb4104b419dc6dd12a5d6ec67ac7d9f743fa31d96c3323937558704b7941a914c1ca342b5a6030e9f16b7d84f2339f93d2a1fb9f SHA512 c6aa1e0f8f11e813c228619f9c857bfa3e15d3278a1b5af3910f8f789a7d93f889a9adb9121f19b4b52abbfa0b4a67d89a037679ae0eab00b0db04ed5e16526e
diff --git a/media-libs/phonon/phonon-4.12.0-r1.ebuild b/media-libs/phonon/phonon-4.12.0-r1.ebuild
new file mode 100644
index 000000000000..9efc34081dc0
--- /dev/null
+++ b/media-libs/phonon/phonon-4.12.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic kde.org multibuild
+
+DESCRIPTION="KDE multimedia abstraction library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
+SLOT="0"
+IUSE="debug designer pulseaudio +qt5 qt6 +vlc"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libpulse[glib]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	qt6? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[gui,widgets]
+		designer? ( dev-qt/qttools:6[designer] )
+	)
+"
+RDEPEND="${DEPEND}
+	|| (
+		kde-frameworks/breeze-icons:*
+		kde-frameworks/oxygen-icons:*
+	)
+"
+BDEPEND="
+	dev-libs/libpcre2:*
+	virtual/pkgconfig
+	qt5? (
+		dev-qt/linguist-tools:5
+		>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	)
+	qt6? (
+		dev-qt/qttools:6[linguist]
+		>=kde-frameworks/extra-cmake-modules-6.0.0:*
+	)
+"
+PDEPEND="
+	vlc? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
+"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	myconfigure() {
+		local mycmakeargs=(
+			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
+			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
+			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+			-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+			-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
+			-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=(
+				-DPHONON_BUILD_QT5=OFF
+				-DPHONON_BUILD_SETTINGS=ON
+			)
+		else
+			mycmakeargs+=(
+				-DPHONON_BUILD_QT6=OFF
+				-DPHONON_BUILD_SETTINGS=$(usex !qt6)
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+	make_desktop_entry "${PN}settings" \
+		"Phonon Audio and Video" preferences-desktop-sound
+}
diff --git a/media-libs/phonon/phonon-4.12.0.ebuild b/media-libs/phonon/phonon-4.12.0.ebuild
deleted file mode 100644
index 63d504edbc32..000000000000
--- a/media-libs/phonon/phonon-4.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop ecm kde.org
-
-DESCRIPTION="KDE multimedia abstraction library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
-SLOT="0"
-IUSE="designer pulseaudio +qt5 qt6 +vlc"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libpulse[glib]
-	)
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-	qt6? (
-		dev-qt/qt5compat:6
-		dev-qt/qtbase:6[gui,widgets]
-		designer? ( dev-qt/qttools:6[designer] )
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	virtual/pkgconfig
-"
-PDEPEND="
-	vlc? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		-DPHONON_BUILD_QT5=$(usex qt5)
-		-DPHONON_BUILD_QT6=$(usex qt6)
-		-DPHONON_BUILD_SETTINGS=ON
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	make_desktop_entry "${PN}settings" \
-		"Phonon Audio and Video" preferences-desktop-sound
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 56a3d9e37ac1..4501ef4116e6 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,5 @@
 AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413
-DIST vulkan-layers-1.3.268.tar.gz 5004147 BLAKE2B 228a146e436f3c91df85d853d9fb5f58fe244a3dbbd66ffdaff2fcd27734969b041c1fe8df7cc2142857ac5742c14465cbc6f86a6401c75736e712222c1d2123 SHA512 74282cede73f67ee39ab78b99cd53f78ac0427ec6ca897ec41eb28b0e2d1106006d688bfbfdb2f0924b84149d516d42b1abe3680cdc6019c66457451f19b44dd
 DIST vulkan-layers-1.3.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
-EBUILD vulkan-layers-1.3.268.ebuild 1677 BLAKE2B d27d66c2adbf7be1075fec40b950805512e252b3f47789c06f5182f8f4a4b6d36ea62f4dce138c0a2ee9390a9a983ef6ab18e2e489372756f1291d1810cc4d46 SHA512 c6635e5ac32357a4347ad1ffa4c0eed38a5dec96e4d88065051c6ac43708e574c8f155650cbbfd7d7b9c700bbda2e35d9b13d0e43201c17ff1835b2e4f639515
 EBUILD vulkan-layers-1.3.275.ebuild 1644 BLAKE2B 5d03caef5de18f10040bbe5fcfa23526c51684ef95fd9953efdfaa1b217cf11d5e6561ffeb14390c62ab32ea6bd38fcd002120b3a4b0fed80d386ffde9d9f08b SHA512 bd2e9eced89d8161eca83c07d27342abb68e147d60094285437c83aeb9089ff30eef038ff8d70679f24a71eb18f772532df5d91b1223306a02107e9c75dee537
 EBUILD vulkan-layers-9999.ebuild 1642 BLAKE2B 4f3b7567bb5a183f3d3a1929531349a67c732c2dfe9fe2375c4516513f1af16675a622c566b8f47df1a3cc4b575601e1a25acf87c790c2a971d1adfdb5b69bf5 SHA512 7ca20decc9501fc86cddb8b14bab9ec1945d7e2f2a3c6634f02c35b95823be376a875da1941b354d5c76901e29b97b5a470657aea92c9fe0eab875f311ab789e
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild
deleted file mode 100644
index 3dba3a5951c4..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/spirv-headers-${PV}
-	~dev-util/vulkan-headers-${PV}
-	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name \*.a -delete || die
-}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 6e6d35543cbb..3257220d4f01 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-loader-1.3.268.tar.gz 1689273 BLAKE2B 6d7c1bfe82f594a68f3298d884efb61556b6d408357eb0360db2103af17bd47f981916dcc7584f8380c2530a88f05d59faa0754993975219e1955941dd3d32d8 SHA512 01e5f281efd5702b9930cecf3148aad9a79812c54e780a5a8ff2df2326ae10511001f1b6e3ebde19e47de229a9c97f6195b6b1e9fb7b3b4c88a4d1b6746f7aea
 DIST vulkan-loader-1.3.275.tar.gz 1701415 BLAKE2B c92cc2d3ff3c90eaaa820f0f857030ab6f957d0691f7cbaf53985bd4d4c6f0f2b4222623740bd2c433c2e0116545af37b8ac9959b554b800ca95a978fd1b14b5 SHA512 7af0110083ab827e4ea8b4ea3e3ce00d9387f27f5725cefd426fa4dee4b80bc83210248c2968577a90bb82de8efb1a68691a1bdb93769f2f04600c5a3d3eff91
-EBUILD vulkan-loader-1.3.268.ebuild 1568 BLAKE2B 153b080da25011f793dbe68054820ee26b7068d42fead991a002f56cf36920ae4da07c9c99896a954b09d4b7b6f346d791d6d793fbc18946d2dff75225752657 SHA512 6e05bfd8d3ea9a12148724fb2737d4dd1c21420cc4f1c862c181c392e5ab78aacc1902e5f1174ab8db9681bb3cdc4e3586ace00f30dc844161e31e95258ac145
 EBUILD vulkan-loader-1.3.275.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69
 EBUILD vulkan-loader-9999.ebuild 1562 BLAKE2B 19ca31786af5a26cc88d508374efebd1bb3f2bd7929ad0236b4a1bd70fbd5c54e44b149e8de23bb51ec8448a7bdc8573dca7adc4de45517b157f98b87ddfac2f SHA512 89f8b81fa6b47fa6a94abd3fa15e9b52b184de225b2e0a5df4cf833f9db804b7dd087c73fa12167ffc4d06414cdd50487f4ea462f78127810f0d23eadd3e8d1b
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild
deleted file mode 100644
index a28952b5780a..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-Loader
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-		-DENABLE_WERROR=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ac47a5f595e5..a16b24acbc58 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/denonavr-cli/Manifest b/media-sound/denonavr-cli/Manifest
index 7df3d3583121..d68868ace612 100644
--- a/media-sound/denonavr-cli/Manifest
+++ b/media-sound/denonavr-cli/Manifest
@@ -1,3 +1,3 @@
 DIST denonavr-cli-3.gh.tar.gz 7508 BLAKE2B 4084cbc87363858cb0132847b88c486795332ae28d1c24efb46c22a8985711aa18dfe6b2634f6457ea3108789bb4812ffba17a50edb429fb64a29ca90bbeedaa SHA512 f2bdf442fd3bec788d9ac684d93314da6c7750d946fc563ceb71a52ef1663e1fe06c62653d4e5ff69625749f1eefacc41c92ebcfdf0f6ff7fdf7c7b703d7408d
-EBUILD denonavr-cli-3.ebuild 629 BLAKE2B 0f5e0a5b66f9a5071386149460b60f1cf4c3b4f756ee215b70dc35a3656ec5ff97a05820e06228e4e65257d0adcd3f518a629c2087b8811634dc24f87040fc15 SHA512 60172179d773d20365e98e9bf6571a7cd718d0f8cd61823a23312c57134a3cc1dbc3fdac652a2d80d0595e91564432bd1265b08457a1790df7dc691447fcb2ae
+EBUILD denonavr-cli-3.ebuild 630 BLAKE2B b4053f5e38b15a379baa084110a087bfa858e67434c8cc6c35ec23387ebe025943ff2f36b33098408b5af293dbf42189e0c75a7eb33dfee72e1c6465cb5c0da3 SHA512 c35a73645a0fee7a0eeffa433edd2fe877bc40a951e29381abf6146422c64627a3573a3d2ce4bcc4553e4d9e02ffa1ed7b9f005398c93cb08f6e3f7debf3b1e9
 MISC metadata.xml 382 BLAKE2B a06574b6f08b44797f49336791d2fcf1adc24337f2115d415c943f03d11b2683f4bf91bddaeac420ca0dae375a31e6def8a0c871d30d9bd04eccd85fe5d19a87 SHA512 045f5bfc1d64b0b65f72aaa0096dd2c76e814fe0aa319b48ab35626abe2514648a1bd30aaee5673902f4760b81115b685cab63a21093814a9b8899a369cddec9
diff --git a/media-sound/denonavr-cli/denonavr-cli-3.ebuild b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
index 0aa6fdf91b46..f41e9cfeafd6 100644
--- a/media-sound/denonavr-cli/denonavr-cli-3.ebuild
+++ b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index cad9e7620038..2747d11169fe 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dvbstream/Manifest b/media-tv/dvbstream/Manifest
index f2a5a247f422..0f692a98cb48 100644
--- a/media-tv/dvbstream/Manifest
+++ b/media-tv/dvbstream/Manifest
@@ -1,5 +1,5 @@
 AUX dvbstream-0.7_pre20080302-telnet-port-switch.diff 976 BLAKE2B 54ab99dee8e90efc1e3bb623102156aa21cca6697d6edc3662d81284430ad0a7e295f53aa855e81776ba50bc8f05c315fbe2c7606977a3c3ae3341dcd063f368 SHA512 84f4cb764db871e1f3d42fdff7e550be2866caf21b725a065abce500a29f8db52087d02ac2446891c1a14f08521deb175362bdc2ffe00d5cb6bc237b31c02781
 AUX dvbstream-0.7_pre20080516-update.diff 334 BLAKE2B d729def0db777e853cbdd36bb8034885f84ccb5debc816d9d8d2f902c61044b1aa60c05b50d9c7f509be36e3cd3b3ef15fc980b44734a891873d1e31189d0aab SHA512 c22d5e25dc9cad4fe864864b9f4100d6e335236f865f4c8a15b29ce0dd22f1aef77dd9777aeea0529e0cdf0402cc76e55b6140595a8d62231ffa6145f868be92
 DIST dvbstream-snapshot-20080302.tar.bz2 58089 BLAKE2B 9dd2fdd5e1dfa3741554b84cd5361697cef16b0ecba6ee5a8a2890959678dfc1497e54003d9b5ebb9e0092e5f3e71a4b5786a2c2e224d31a9243ecaafeea98e1 SHA512 7116310435584b61c51f642d38cfdbbdf706df27448af7824b5a050e374ad72d3d08c2eb03de0d5ed6ec1cb15461e3be90ee8bd3b045b6ba858b5896c5546671
-EBUILD dvbstream-0.7_pre20080516-r1.ebuild 1512 BLAKE2B 92badf96eb2ed47a161e0b26c83d32f8f1dcfe8cdfb6c7ae2f94ed6dea877ccbe75304515dd7c49eb55f0d1c6dcf1617169436d89dfe3a2ae14f8f43c5170d81 SHA512 4e397dbc1299ed296a7637e695c1ad969488d763bf1f61d93d7fe84542ff535dc10777810a6c3a514ab06c9ae081b2b84961f3739e4305004957d996f3522491
+EBUILD dvbstream-0.7_pre20080516-r1.ebuild 1498 BLAKE2B 7f8ee799766a104bc062bd4093a720c2a3183320ffce3323e43fe86b9ea885e38310bffd267612236ac58a2b3337976a2a3121e9baa3d53359351ab00b90a10a SHA512 baf113abd0de82a2d1d5b3c783bab7194f168154797bbbf6bf801cc619d597813137c327fca1e0f3562be28b30fb4985f4ade25813462521077786dfb648bd1b
 MISC metadata.xml 246 BLAKE2B 9785204690c05d78ef635eeb1d4f25663e074130c2bf8afd751f02fd464f8b14347f4ea6982b45bb849b5d220ea94f21a842412216f340c99c8c30be71d80f53 SHA512 29081d9671eafec8bc17c174ae0d096f07cdfeb5b747b1c1eabd63af71388ebea853a5a8299af0f0a6a35c1d523a66a285a962c7b37015dd2cde32ecb72e621a
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
index f8e76f402c4a..9dfe663f071a 100644
--- a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,9 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl"
-DEPEND="virtual/linuxtv-dvb-headers"
+DEPEND="sys-kernel/linux-headers"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-tv/dvbtune/Manifest b/media-tv/dvbtune/Manifest
index 3f17ef82df52..c0c1290b3407 100644
--- a/media-tv/dvbtune/Manifest
+++ b/media-tv/dvbtune/Manifest
@@ -1,5 +1,5 @@
 AUX dvbtune-0.5-r1-gentoo.diff 470 BLAKE2B f8539f72cfc3e8ba3a299aa01717c87cd8f12f6c3619cde1f156870b2cbe3788c279b071f1c4fed349721aa958218ce380b79d1f8f0ac7438510b3711a5ffab6 SHA512 ca68cd368483414e8ecbe61c706ddf1abc8a24af1bfb3131645f21b24e930597617613ac25b5cc9d330da131229eee1426b023dcf5fe1dffdb44651b2f6b5a11
 AUX dvbtune-0.5-stdint.patch 251 BLAKE2B 200e2663edb6fae39638e40c0cbccd256054796d605b2b00faa97b27dc45a02c023fce949d4482511d73cd5631bd90c77ac67e71350c3a29bc03205460ecd88f SHA512 2f7408cd2f98276363465ea892294c165e61232cbcd4aaae6a3e4b325a48a02ebc2083646388079a47585f097dc7e09ea5b616610850f0e4b592226a79cc70f0
 DIST dvbtune-0.5.tar.gz 20601 BLAKE2B 6e788e44c0c228506599a6a32baf527050e09d0802692ece635bf5432a47cb81f738be49c0577ceb4597f9da7ced6607ea102a6d04dfcf991c24b5a1b3db7532 SHA512 0c6e8b8b4185b1b63638f0eff3e07b2c5e4b3bb9d95debb1625973cec2293315754487702ba9f7ed6bd6a0a518b09c8333d9ac4cd40b61f56c311c3d624fd365
-EBUILD dvbtune-0.5-r1.ebuild 707 BLAKE2B 2d3a5879f4965beb30f1250d50c67f552c5bb923527f90432aed8fe49f1a207a979b322b5ed8b3943eaf5c5b915db1c2b99de43c998268c4ffcf01698c5e2925 SHA512 a14d3b47eb2a684a435d67728cbdbe1fbdc22182272047e69458c5df7895ddaf9e8e9cffc971bee07ca76eeeae993e014f19f4b313038950ca5c71ee1fd49e72
+EBUILD dvbtune-0.5-r1.ebuild 704 BLAKE2B c644666bc4a970cc5fc56bb7e13a381ac46480dc8ef851f34e8e3ac6222e0fa436d866da85c7ccebed542e08fa6fa547971677c94de94987bd4eda0d2bd035e8 SHA512 7f81e272488665aaa3c51c2aab0449c692488a904d09c70e040382c8361ad8b1f110e23e2d9032f4c81edc42753c3d988a67378bf0d0eefd530e8f4bc5cf8f1b
 MISC metadata.xml 246 BLAKE2B 9785204690c05d78ef635eeb1d4f25663e074130c2bf8afd751f02fd464f8b14347f4ea6982b45bb849b5d220ea94f21a842412216f340c99c8c30be71d80f53 SHA512 29081d9671eafec8bc17c174ae0d096f07cdfeb5b747b1c1eabd63af71388ebea853a5a8299af0f0a6a35c1d523a66a285a962c7b37015dd2cde32ecb72e621a
diff --git a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
index e4cb2c114c24..1d2b4cece0ae 100644
--- a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
+++ b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ IUSE="xml"
 
 RDEPEND="xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
-	virtual/linuxtv-dvb-headers"
+	sys-kernel/linux-headers"
 
 PATCHES=(
 	"${FILESDIR}"/${PF}-gentoo.diff
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index a282e815881c..1481bfa6b105 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -6,5 +6,5 @@ AUX linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch 413 BLAKE2B 0d66160c487ef9f952e1
 AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
-EBUILD linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild 2331 BLAKE2B 0febeff7853a680f2f1e7371ee82f5cf203de889620a9c8f5ee7348cfddf6c75ea7b5b31510e9a71d4b716bf3219ddc67d154b3589e9d98b206a952d5eed71cc SHA512 ce7dbbc1165d4c617c11b69f6ea1cd07c99b308e8d378fdbdbe7d9a67bc957321612064a49a3a1fd8f57465836a12d86e16db5e6f2c568c5f2b9be5f24de84cd
+EBUILD linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild 2328 BLAKE2B d3be7a8d14f063382b1f4fddc9fe1a574f55efa57d645e491dcdfb89446f504a28a2b5e33d8cc1eb517d8483488c40d0a5cd5999a923c510e9fcc64d0022d8d3 SHA512 0c30d649fcff7ebc14f7f7c644e9cfdc586c308f08819303b41b9b61bb8fd13a6374f8e9a43f020347c78275fc07f5f9459ccc063987296650efdeab5fde9770
 MISC metadata.xml 231 BLAKE2B b5dc028019638020965a9345da438ade5810c8573efbc39a05c4ad7f8271992c7a7bd46ea9724032078bf79ea23fe396cef68c1cafa889a36377865981c59ddf SHA512 bcee889112d8fb0374dd6de6c65ab3795d65390818416a6cb783d3adaeae012c186b972dfe5f285b3a8f82f18af5bb0430888fd90ce5bd6f703218aa9492f59b
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild
index 2b5377d5ba58..8fe3e2af5236 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-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=7
@@ -26,7 +26,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	virtual/linuxtv-dvb-headers
+	sys-kernel/linux-headers
 	dev-libs/libusb-compat
 "
 RDEPEND+="
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 3ae6d29f678e..cfb42e78a7a1 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -11,6 +11,6 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 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 4136 BLAKE2B a396af07ce2cad71c62f96b0042a348e113a4603f53c62ef8649df86994dad804c14f21f71b5e496d38000d228bb4cf9c042088201eeddd54797fa457fa6c595 SHA512 b05058899e8b60bb4265fe4e251979691fd1fdd3ba6c63ad319b8fd027d80d1699051d840c2d596490feebd4c38f028bda7c849b299086e5a641453a09cf5804
+EBUILD tvheadend-4.2.8-r2.ebuild 3611 BLAKE2B 80411facff811cbff41124e5a68cdb80f6a5b4e4ad44e182bcb9358ef7ced1bfb25dface222d16599f4b401c90a65adb0b9e7e7538b0fb7e5be2fd906a0088b6 SHA512 37932ec32c4cc7dda757c13246954e60a1d9ebf33f401f7ac54e580db753f8aff19ab89ffbd45469a050bd654bbdfd24845e8fbcbafcff22b7bd86bf9b6cc31c
+EBUILD tvheadend-9999.ebuild 4121 BLAKE2B c1c812da0780c5939859716927dfd24a6131269bbb306e3cb31c8ce3090868c431b4cde097914c6be36026f9cd7c1fc00ec0be330df3ccb296a0b5393c28ffe1 SHA512 e8296cbcbe1400cde1c2ce40c4b4c037e61069f9d10e1c4ff2282907802ba5190713e25e0c96b1af39e2b452a6fec1e8e9a2aa675c6bf8bd94a62a164c912ade
 MISC metadata.xml 1446 BLAKE2B 622295d497db162d2a214c94187f0e15a9c23b8cc7d484255618f2bb3d10c5de9ecd9aaacbceeb05c27e5d53ffa2338fcd2678cdfdc386104033c1c57aa51c96 SHA512 5e34e61e7ecec9a997ece8b50f6a45f1158e203df0759e08e8d3735a4973baa795a556f9bcac1aaf8069cd25974655adc3f393c0f1670cf6e6a3762903d84759
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index 138048f41d63..11b918469163 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-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
@@ -39,7 +39,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 "
 
 RDEPEND+="
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 27ebacd3cd42..570fce9e982d 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -13,7 +13,6 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 
 IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
 
@@ -41,7 +40,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	ffmpeg? (
 		opus? ( media-libs/opus )
 		vpx? ( media-libs/libvpx )
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index 2f67e37a6d67..d2c2f2517aaa 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -1,4 +1,4 @@
 AUX w_scan-20170107-fno-common.patch 911 BLAKE2B d41b1bdbd25f56789b48a045385810a1f46bd253593360f88cd00bd4b2cfbd3bf6195bc9b80605a907dc6fa77d2bf902f5fd456a106ca1c192d4c63010af4776 SHA512 e1b3c7752a25ae6faff0a90cf77f00aca3871e875d6a5a5cadbf311764a4f51b82141340914dda96152cbc5c6b373b2da89571a4fc57362d6688b6aed5c823d8
 DIST w_scan-20170107.tar.bz2 245517 BLAKE2B 049d555f47935118be26f0bb8a8fc6baa43c273692ff6bc4c95ae912f00f1bda0e5834919c018539b1f891e436ec6556b29ad8c68d69de4a93911e5c7fb265b6 SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a
-EBUILD w_scan-20170107.ebuild 607 BLAKE2B 33d4f8bea3765975957a35dc5aec230a83eac88ea6c6b1ebcc32c6723155770f01c86a050d880fc413a5f401ff9a39e07beed52bd78ed1c895c8af3db0ada0c7 SHA512 fcd7153b0d663afcb56acbf6e734532099b9abde485e4379ce3c174304c3e0f5f397f033059f06734a99aae7a14eb0c2c3acb65260cb0fcf072d88374c57afca
+EBUILD w_scan-20170107.ebuild 598 BLAKE2B e8f7fbcf860e202ad676daab64f94ec37e542d9096e83a34b13dcbb92c27038abaa1fc658710878d6dc13719e1e42ad483c62a6bed169e83a40b697277d170ae SHA512 a99f765cdd855b6696d41ef8e3b6a8bf8a39cf70291dec480813f61a7ad96024f409219df7177d075e6eff64613b67484d7160b292666ab159945356e4abdb1b
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild
index e7f8514fbc17..e1b05fc2f86e 100644
--- a/media-tv/w_scan/w_scan-20170107.ebuild
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
-DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
+DEPEND="sys-kernel/linux-headers"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 67517799e289..53f99e0f3edc 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvbsnoop/Manifest b/media-video/dvbsnoop/Manifest
index 802ee9c190e3..360b3ec14d65 100644
--- a/media-video/dvbsnoop/Manifest
+++ b/media-video/dvbsnoop/Manifest
@@ -1,5 +1,5 @@
 AUX dvbsnoop-1.4.50-crc32.patch 2031 BLAKE2B c8255a57e2b27a4297cfe50ea813558d51c4eddefd747d00469d5e1c216dba28ee54b8c2c959703b616f66c6e0e171f885f8adce9f6c7d66ffbf4fe6d0096849 SHA512 29b0b0b4814680840df4ff5e9b480b939b2ed916357ae6cfaec26bf8275f2d1ab700b2d550384f437650932f2b1e98690afc470bb01e537ac4f556d15651d7a1
 DIST dvbsnoop-1.4.50.tar.gz 333992 BLAKE2B edd860feedbdc6457c9b55707fcdeaf2918e2fd96cad511967bf6909bc4f64a71697697f39f7ace314030308c4ded17a018fdb597de506c51b9b0a12f56f25ea SHA512 288b98e9205b9ee6638b65cd0d7c463c2c243c1f7e650a6df8592acd3f40eca3352a563cc8a1a04f0f2731b3718e6dc3d09f56f59da4b59fbe25b86acf434f81
-EBUILD dvbsnoop-1.4.50-r2.ebuild 391 BLAKE2B 86e32dd10fbc3cedb6a5dd6032e0efd7021186100fc61c5d44edf47efcdbabc87dce811741d02c17a928a0b86b3ce49c917ca5e8c1482c769ad172e7cddc5235 SHA512 62f9a3cfa9ef06ae79f3a7e77ef4a2a84db0b8295cb409e7e29b8df1a693a0c625df77a942a1d6c047a36fec11f79266ee761c3051743364642e2bf3eb5da72a
-EBUILD dvbsnoop-1.4.50-r3.ebuild 522 BLAKE2B de1de918657eb9dacda55fd64546d7a2fb8be0d166bec988cac59fec420f05d7fb969c9806406fcb808d8e9c4caf97cab1b1ac25f18258ba347a43d0f4915dfb SHA512 0220fce360147bdbca428f01ed70c92e44064379ae50e4abbd1b10ead559a4a56382da08e377ac5e22ad1bd4148df0c29eb4db4194c4dfbda136ab84e45c2a95
+EBUILD dvbsnoop-1.4.50-r2.ebuild 388 BLAKE2B ff3ad5c21c36007d9e55d193eaeb17584e7d57d40daf8efe6292fcd786985e4d07292e7a5870a5fabef76bed71d97391f9551760ab18bb2ba52613ed9146dc6c SHA512 8abb090727093b10f37786fc8d73f8df6a6e37cad089f02e20ac87b9597072c6c597dffd4aeaf7a4abab52bf7530720cd2168159ec97158a5433f127bd7e2414
+EBUILD dvbsnoop-1.4.50-r3.ebuild 519 BLAKE2B b3c48a572758b57709eead187c4195312f501c77b2460e2d60de8f2090c4b7de28af1c9caa4d89522e4af58518c0eabbe38210dc1397e4582b74674161769d00 SHA512 82c53cd4255f8e9fe60ffbf38e57a8ea633b340d647a892eb6c5fdd70a63fec95ef7333c82f4b6420a0278a7fe3a5951926d37ef3672d029c0fe2d58ac55237a
 MISC metadata.xml 246 BLAKE2B a0da340a3669959aef01ea3eaf3b20e16749f33bf3440424d4005c95f1b08a1f4e71a39290ed23739f06dfa621bbf458c35be6f6beaaa829c9b753ce2ab69194 SHA512 d7982f3a6a6cf91666c3792f09b4d23f95938fa57f8dfeb6ec377bdead8148da87098e925a1e25534e922901f99ac8d2c44cd85d03e41a2e7d1b59279fff123f
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
index 51ab1051f484..cb7dbe43fd2d 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-DEPEND="virtual/linuxtv-dvb-headers"
+DEPEND="sys-kernel/linux-headers"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-crc32.patch
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild
index 3ba1ff4b8ca8..0d5d026fa7f2 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="virtual/linuxtv-dvb-headers"
+DEPEND="sys-kernel/linux-headers"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-crc32.patch
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 127302562b67..98ffb5a286ca 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -7,8 +7,8 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e7
 DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73
 DIST mplayer-1.5_p20230618.tar.xz 15101476 BLAKE2B 74f1d2d579c83330d8bf1e1ce2a89592f62142f361ff0e4107710c80de4351a5807e344869cb55ff5b5856efaedb6cfe242483f8e7f97521b805f84ca23e3818 SHA512 874e76b3edfccb7475349d954ed49860f92a5e99f0374084f5da53af35326365bb064c460fb6527d2fb6d8ae20d9e059ba197f45d4de42bc7a78992b5191a7cb
 DIST mplayer-1.5_p20231206.tar.xz 15212032 BLAKE2B c4658a0070296a9e24bb8388787a2ef322fefad4f4ea095bbf3f95b20f2e32b0423814ae311e43c9a6ef20afe0970540abd5d6d0ae0ebd59df74a8beb7abe3df SHA512 480502c735fb8d24ea1761a2b3f7daf1872df268f44791c7141f5b444b583beb0e4ecebe94e04129d27aae27656baddfb2da50406a431f1df39c589baac69432
-EBUILD mplayer-1.5_p20230215.ebuild 17321 BLAKE2B 384cf25a0087368f9b8a479a9615560a123c8aceede713ba9390565a39b597132bdbfbfe0452b3afe632edd32317ffa029bd382e2132ed8484ac1c48f268b6d4 SHA512 2ab705e4c518ebc2babf5a829f6cd3708d247ed7f00f38f9e85519fa52e4ac1f00815a5659ea5b6bbdb1bf54d85f2fe490089fccbe4a2ad82ef6fdb0ef6091cd
-EBUILD mplayer-1.5_p20230618.ebuild 17713 BLAKE2B dc61a134048d0b5f2477e746d8aae7e8c436b073744c5115c470e77d282907c2bac1c60bcb5a472e798f7ddf75522d2be72be554ef4097e10c9178aa72539a14 SHA512 15b24060d149ee59b3021d0b5e1ad293c56ea3796a7b52d0e68f22bebe97ab434d576b344f0b2a671fd65a00533c5a0b1b71180feff4a9c610965a74647ec504
-EBUILD mplayer-1.5_p20231206.ebuild 17673 BLAKE2B 62f3f5aac6c9965526cd8bce1ebacc879b180454af984e500eafa03d583d1b699de257238667af7fed58bc0c18cca946d7ed1d3df516d9a7e2800409b40d288a SHA512 9c7078f8348a1e3c2c599ac77280cf54f67b5ce07d8391acbb82ad926188401927dd320a0832041e2e599d710247294f5c14898fa0bcc44fb35072ebd85855d3
-EBUILD mplayer-9999.ebuild 17673 BLAKE2B 62f3f5aac6c9965526cd8bce1ebacc879b180454af984e500eafa03d583d1b699de257238667af7fed58bc0c18cca946d7ed1d3df516d9a7e2800409b40d288a SHA512 9c7078f8348a1e3c2c599ac77280cf54f67b5ce07d8391acbb82ad926188401927dd320a0832041e2e599d710247294f5c14898fa0bcc44fb35072ebd85855d3
+EBUILD mplayer-1.5_p20230215.ebuild 17318 BLAKE2B 5ca26f009166416bd9b482cd33de92299ab2763cd5a25a9e20d9fe7e84439a95afa670f605873ed740104e62ef6cd338e0d4ea721c069d7a3d383ad1b77536b0 SHA512 ed4c0ca4d8060d634723b93a71b20698e39e197a1129509506cd92fc7d1efda1503ea4932cb608d1a1d0516bc74334e2b8b7ba43fe2e4fb6292ee6a3f21f86f9
+EBUILD mplayer-1.5_p20230618.ebuild 17710 BLAKE2B 629f1fd20bda0c294661a7ab154b4f27df4b827ea4cbf6fbc14d914da4e104015badeae1b4d9776b488ec853bdff7fe877c192d9fc93277192b0104a53045b82 SHA512 b5fb20ff19db293597d6462116d7b06e6c21afafa62220ff2adc5442b55044ac2fff3b6fff2b0c00f2864bf77c1643eb37ba06046d28ac304d1fff7fa5abf264
+EBUILD mplayer-1.5_p20231206.ebuild 17670 BLAKE2B 4bb0c156e686367330fe9136dbc906f1bdef821b751ab703a8b01e8693aef6751cca1e27f06dcab4cafb30005970ff54d9f6667ac016a7a13c054e3f014a0e07 SHA512 a9ddcdc03a4564a19792a073ce2ff919ad37d2aaeb68f86b548ce255df1ee0939c86d8ddbcaaeb3b87f938b2686002b7408bff9974a9a16a0c17ee7bfd46b96c
+EBUILD mplayer-9999.ebuild 17670 BLAKE2B 4bb0c156e686367330fe9136dbc906f1bdef821b751ab703a8b01e8693aef6751cca1e27f06dcab4cafb30005970ff54d9f6667ac016a7a13c054e3f014a0e07 SHA512 a9ddcdc03a4564a19792a073ce2ff919ad37d2aaeb68f86b548ce255df1ee0939c86d8ddbcaaeb3b87f938b2686002b7408bff9974a9a16a0c17ee7bfd46b96c
 MISC metadata.xml 2475 BLAKE2B 5a083ce5b8ed729245ec9eaf544be95f6cbdb9fcb5b80d3a21195557c3aede46d09bd93a0d1acd3830fc796f90dd5f15a17a3d3c69ba2a1a54a0676264dd02de SHA512 f04082ffd63adf9102dd82eb5b4c628fbf912701c7dae69f0b00bbad4e0957355e43369912e9422acc087200de982920c212efb60ba9c26675f74fd5f37fd739
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index 02a665bdb3cb..24111b326b98 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.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
@@ -145,7 +145,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 9a7535cdde6b..7d993f709bce 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.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
@@ -148,7 +148,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mplayer/mplayer-1.5_p20231206.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
index 59ad25c596aa..61a74ddb2ad9 100644
--- a/media-video/mplayer/mplayer-1.5_p20231206.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20231206.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
@@ -148,7 +148,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 59ad25c596aa..61a74ddb2ad9 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-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=8
@@ -148,7 +148,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 21cd0efd92de..d5fa6510ae61 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,6 +1,6 @@
 AUX mpv-0.37.0-drm-fix.patch 1444 BLAKE2B e0645e9b12ebbd0088b10aed34cabadbdb1b06d9cab14c40e9108c09d068c1ccba133dd91ba4c1d0735c67d0a8010003c77b85466343504cb220498fa24ac964 SHA512 8ce946f6043abb274b3051e787f5445ad40a3ea404cb2effcf9a4415a589483861381e54762e31f72d03c4975d01b67b662b6fb8a8a9194d7cd7d8acb4cab084
 DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
-EBUILD mpv-0.37.0-r1.ebuild 6995 BLAKE2B a4a45da1baa5d2157a9727e8e41d94ada7cb15e0052970a758f93a35de2f5f50159a7fd35f344641dba5049986bd849a92505943a21b57b5e661c3aeb81bb94b SHA512 84c5e2e834728e470af2b221cfb87d9824defa069da231b2ea9fcc88871396562c0e01fed72b2924b68a5c1d94a268186aaa5fcfb3efd922506aad75aa1cd1c0
-EBUILD mpv-0.37.0.ebuild 7090 BLAKE2B 4c1e7df2155e0efa7bedb2b86d37644763a47cb4ad7f086adee9348a01ac5cea3e4ec13ac7191cb5d7784c24af3e3b1443a8be228e2c10e7660c22664c144e6a SHA512 a48defc31dbead64f4beabcce63db757d2ad3a03e18b55e37135ffc25c744c0829184155b75d8dd78f56bd6d83cacb96139f67f635e6857bc12d0ebae2831272
-EBUILD mpv-9999.ebuild 6884 BLAKE2B d8c7ee354ba8a03ff08742fe12584614cbbc59877ef5e4ab70b37ed40a53271e6d0cce78169d52210621307757b0b14901cac0081e63691180e0b2d2664e4226 SHA512 9108731725f0c5bc38eebe3728c94d834337ac7602b62fc64a1b32e3d36b98ad9a2f4ff85d5419d272f9b95a0c2175d9cbcfa9d5297e5e82a436d990187360f6
+EBUILD mpv-0.37.0-r1.ebuild 6992 BLAKE2B dcb4a3d408033fcb0f2b1994cbe6071600e265219813782858568bbc172fca4e0824a87b647505ede1390ba8e2a3f34d4f4f729e1fecb01661ee0eae80b9fbd7 SHA512 f55c5aa81b3553fea5ca0edf1dbba18bc79e4839a8e6f26905ac5fe972308961f01caf958501b618947665000f8f4456a30bed5384acc6c47502d3533a4f232e
+EBUILD mpv-0.37.0.ebuild 7087 BLAKE2B 322689b3988e47e41ae050e596518ca46d9f12048568d5d8920c98fe92f48adc28430a6fd92734cbf06ee9d01c74dea7f6aed133a9c8eb7aed50e2ffd2b5c0fb SHA512 b38640e3fae2cdaa8db042779516ce4143af50162af42548e49129c259d44bf76b217744d8541a7cc223f4385f1f9c55ba2fc8e7ea1c257a9034994a3b7f859d
+EBUILD mpv-9999.ebuild 6881 BLAKE2B d440452a44439fb4f0a74ff6a3e221a98c80b8a910a5f0230fd8425c34580f4f4fdcf0a3a587f92d564e207d4db087952e7aa99815b60bc82ab52dc970395bda SHA512 c20624072cc97e353589793e1fee3da0edc49fc95d041c67cfa396fa54fe1bebd166425d5f51a17b81cc5045c9d8307e59673fe820f01e965c6b4a74def90087
 MISC metadata.xml 2248 BLAKE2B 384962e209948418c928a4a8d903f57a226116929db253847e7977d0febbf3fc23b18f947e9896b5a16e816267eb06c0e64145fc15270f66dca4fe7321c36897 SHA512 c4f1191adacde565a5d6ff6fdf10a9dedc84fae3d04792baac456e37fabcd80f04858031f442dcf1dd07c3d59e2343319c955969b23d0aef456c2d927a76bcbf
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild b/media-video/mpv/mpv-0.37.0-r1.ebuild
index df733bafe674..9ac7b7e545b7 100644
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.37.0-r1.ebuild
@@ -116,7 +116,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	nvenc? ( media-libs/nv-codec-headers )
 	wayland? ( dev-libs/wayland-protocols )
 "
diff --git a/media-video/mpv/mpv-0.37.0.ebuild b/media-video/mpv/mpv-0.37.0.ebuild
index 4120f51db273..f7dd7257fca2 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.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
@@ -123,7 +123,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	nvenc? ( media-libs/nv-codec-headers )
 	wayland? ( dev-libs/wayland-protocols )
 "
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index c10b20b3c11a..a79aeac37bd3 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -113,7 +113,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( sys-kernel/linux-headers )
 	nvenc? ( media-libs/nv-codec-headers )
 	wayland? ( dev-libs/wayland-protocols )
 "
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 91060f984deb..a3053399d361 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -22,7 +22,7 @@ DIST vdr-2.6.4_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f66
 DIST vdr-2.6.6.tbz2 946758 BLAKE2B 22ad6d0d4048347ff16a48ad137900f32dda7adfc7fb54bb1501f14cfc426185f942ffa4997de1e0318ca8c6b67a7dfc48d49b30bfda9367d7337b2d601544fc SHA512 4e798d3e39be0e851ec2e7f7cc563b070c3aa9438165a6aab8fcfc1cee5d7255cdc7dd4f6d4c4c84be770223491a9660bb41874e7b4d1ae504bbb16fe11f2a71
 DIST vdr-2.6.6_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f SHA512 590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r7.ebuild 8240 BLAKE2B 4ce894b7b579a3d2d9e6c0d3f30b8aac6600479152f2d0d7377d7ae829b35d98ecf7b269a1889084d1cd2c09ece2dbf6c372607d944978e37e11dc2717c3efd4 SHA512 7bed97818724be9f25ebafe1e1256ec0b683ad908306eaceea32a47efaea6b1d5ac5ca43163587d0de7158691b63d61fc88a23ca3a79bb53356f6255f35c4f4f
-EBUILD vdr-2.6.4.ebuild 5530 BLAKE2B 653860cfe981b10ed41174eec75154ba94815b35f2f8336c59a2d75bfaf860094ac24793e2f5f138c8e04376c25aa7eb74228cb5244c7f98fd7c164df748051d SHA512 a2946956e9125db3974a19d235082bfe472526f6f3c1f325ab8c1f4b0f53fb36cfd52067aadb5252af078b88f284b8122c3c99dceba7bb483b3d07a0a8a767dc
-EBUILD vdr-2.6.6.ebuild 5525 BLAKE2B 83930c4b2a70434a3f1e08576a60c7749a89c2c9dd0f290983db359d8c83851b592544291bae991fe07885ef89a2bdd8146da9756bba6854437b9aa5466d4bef SHA512 1a6588ad003fc823481051f60157b60af7fabab25f8232937ec224e2ae3d7c69d0893d3b649f5458b808b0b945d4295a8dfb1cc4078fc6221d198f675ba10c4f
+EBUILD vdr-2.2.0-r7.ebuild 8236 BLAKE2B da3fa4a0871018e4e72e188448a4aa6f8efe3bd843ea3543665f71403bbc0ed4a951b9f87c634a8df361bbb23474270eb14f5b7db77ae5ac2cb27f02f20a0944 SHA512 5e451b6eb64d224c5ea48e5a88335daf03c893a89f3466a798fa3250c442759e5b9d2f8819b48065ea9424c301cbddbfd299f3fa6980f16d9db54f9a87df58d4
+EBUILD vdr-2.6.4.ebuild 5521 BLAKE2B 4a19364f8c1b889c839b05c89bb7c765c4f4758aa7f8181107b0fe4c60674ff0eedf7e1b7126dbaf0938572c8e18dfa99c2f1d63d91bca0a77096a6c3feac6ef SHA512 e0cd45456383445c0005cfc2b61074dba8b7692a3021e5ddf29980632002406d85781e84f5eec8cc5a1a7f9395213758f6a333dbe27fe931df0b225789d2a93e
+EBUILD vdr-2.6.6.ebuild 5516 BLAKE2B 9e6854338b8d142fbd651758677a78fdc54f46eaa12c67a3965c315846b0464682720004044dc6be9c8d9d5472c21b80f30998d040a698e90476c2f402eb9da2 SHA512 111643235442488c1918bfe90b6b481c3c20540ca17c5ef22d28b58b303b79e4d1ad5827123539d03079cb4a2cbfb8fdcf2a262fdb23366b23dfb83e7f1150c1
 MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31
diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild
index bba06dbbb477..1f82375d5508 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2"
 DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
+	sys-kernel/linux-headers"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	>=media-tv/gentoo-vdr-scripts-2.7
diff --git a/media-video/vdr/vdr-2.6.4.ebuild b/media-video/vdr/vdr-2.6.4.ebuild
index f28d9906f94e..2381f57f8276 100644
--- a/media-video/vdr/vdr-2.6.4.ebuild
+++ b/media-video/vdr/vdr-2.6.4.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
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	sys-libs/libcap"
 DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
+	sys-kernel/linux-headers"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	media-tv/gentoo-vdr-scripts
diff --git a/media-video/vdr/vdr-2.6.6.ebuild b/media-video/vdr/vdr-2.6.6.ebuild
index 5a5ed1d5cd51..60383295f581 100644
--- a/media-video/vdr/vdr-2.6.6.ebuild
+++ b/media-video/vdr/vdr-2.6.6.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	sys-libs/libcap"
 DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
+	sys-kernel/linux-headers"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	media-tv/gentoo-vdr-scripts
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index deb7904937b7..499b5c5978ea 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c2909617c431..378167f96467 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Mar 2024 11:10:04 +0000
+Sun, 03 Mar 2024 17:10:08 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c20c28fc931e..480ffce60eab 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 569335 BLAKE2B 07f6153cc527f8ef0be40a2cc21b4fbdd6901249b5c3c569cd1c78321017cd55d98800cf292cc33ffbd6842d685a59c8343e534c4ede0d598730df983a8c33f4 SHA512 5d341348a510bcd14cd0388e2d6bdaccf622bfa08eed783dcee916769bbf2f8d31fa0fb57d0f3bfcce315df08c0e1c93572bfdc703a005d69ab200628e23c99b
-TIMESTAMP 2024-03-03T11:10:07Z
+TIMESTAMP 2024-03-03T17:10:15Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXkWo9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXkrvdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDprQ/+P1jdZLsbnsnEpeFKf0zP0E9ycaS9aMA+TEVbWOEGqmD8Wj7qyoBiRCjj
-VPohEWoyfZsibud4boP6gMaOOZj4coPNJ1cv1bz9/tKey5AzCQeUMXg5z6enAld3
-wlc9uzWVL2091WCuqPMqfVb2sMTwCnzVcp4Q+9ixQeLE1F6fF9ErcySaVRC2AOj0
-US4xbbZaG8WKXvx25hqy/hVBohN1hOCISzEi8zmoRtjoFSFAUuHv2pjdLU0u4Y09
-NNzXq9fqM4w+9T0udcmoGEvbhMwBhX09k7grXgiK+Uu++6i9uXyAzdJl9Fdy/zyi
-3nU07WIojOZJCQHFNB4FFmLFWed8vzLiyroC97mH1CyAdDiLDp/nsDrf+rHbzWyq
-gRoRaBEC/99m11yYdiH2Lm77HeIxZyRYwTit/8/ubjyv4adUQbfzd6G5nyZd4x9W
-JFMsUsNLGJgohkcsyB7L2oWZR+RYuBCKgMM4cF0zdgk4ReMSe5zluqz9HxUAPPts
-KS8tpAptmjff5qAId+QPoUBEQP0FMiwHD+6BoSMGdcUeq463jfiwzUzAzTAAAlty
-sFKLSYI6LNdjkLHhJ2oAfi55NMCTylEEfEJ1pig7niDA0FObHDAbn4vS5kgiKD4J
-YeiM6nxnKhBVTihfWiJZVH7B8Czq3vqpDbUZF/Revyhoztk9eZs=
-=AjQl
+klCluQ//Qwsixd/pmDCYbUBsJQOw0XzQ/MHv0W/daCU8saA21MX7Pc+VF1uatfho
+cxH1SRKuwPV6Y8uNJMnSRRJno6Qj9/Ph8gq9LyCDnezWU7l2YvOx+6ecD2Y2XK4Y
+FYh8UdqSdx/URJMtzr9E6ft4BarOXX56ulWQcysdHHJzDuEifVw+efTLElpn24Hr
+sVIW66qX7Ix/c9Q+bX1Fo4xJ0ZTwCqHqm0fJvP88SFXBrwTYgzCeptr7Z5zgSpmw
+gFvPHiE/kZd3E2DIRwCzFX8QhjpR0METZgiIK+qPpWO/ROqoGB8pGWrX0H2kTi1u
+i74Hyn5rM5zXEGwL+W8JL57usPZYF8gKzA5wgWuYFybMEkBrKrzaVR2ZomdKkEmG
+rig+daRzLiJE+o8wUuNynbivI6a+0/W2uvMhlhIFrNs5bQzA5w0Jdcw23PLG00C4
+FULvv5949FSL6Im30T7wk8ZlzdQvcRZFW2HNSR8xtjmOQx6nnYZ4EANhzDpQiOpA
+OEm0VpCEwA5WVRW2eDsf7cXJOBLPODygxPRs217rKXZLnkk8UjtqdpQylVwdiy7i
+PWFjhCmcalhPNUEXDOFmJFL0G5ZyezyIvnBN7ObutFjn5D+2821eK0JvJb8EjR1u
+/8w3mMbSr5zLeyD5+83EPpzDibNb5Kry2aNY/6yCGwyDRf3uM8c=
+=WdTU
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b1272ed41947..378167f96467 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Mar 2024 11:10:05 +0000
+Sun, 03 Mar 2024 17:10:08 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 39b9aa544ee5..eaa11e74513b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 2ded88b4e80f..33f4e00a587f 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.5-r1 b/metadata/md5-cache/app-cdr/cdemu-3.2.5-r1
new file mode 100644
index 000000000000..4f5f87493c1e
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Command-line tool for controlling cdemu-daemon
+EAPI=8
+HOMEPAGE=https://cdemu.sourceforge.io
+INHERIT=bash-completion-r1 cmake python-single-r1 xdg-utils
+IUSE=+cdemu-daemon python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] ) cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/cdemu/cdemu-client/cdemu-client-3.2.5.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=41d11596343ae0d7e640e5577fd9f6d5
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.6-r1 b/metadata/md5-cache/app-cdr/gcdemu-3.2.6-r1
new file mode 100644
index 000000000000..69fd8b105f6b
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
+EAPI=8
+HOMEPAGE=https://cdemu.sourceforge.io
+INHERIT=cmake gnome2-utils python-single-r1 xdg-utils
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-cdr/cdemu-daemon:0/7 python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] ) gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/cdemu/gcdemu/gcdemu-3.2.6.tar.xz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnome2-utils	30dbce54b89e77b86f366548f94419ad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d0f618f0c301e04ddb566d6feb7059ec
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 192269e5a7bf..e09521b1a176 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/glep63-check-11 b/metadata/md5-cache/app-crypt/glep63-check-11
index a9357b342fa5..2ff4e60c4ec3 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-11
+++ b/metadata/md5-cache/app-crypt/glep63-check-11
@@ -1,17 +1,17 @@
-BDEPEND=test? ( app-crypt/gnupg python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[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/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( app-crypt/gnupg python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[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 ) 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/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=app-crypt/gnupg-2.3.3 sys-libs/libfaketime )
 DESCRIPTION=GLEP 63 compliance checker for OpenPGP keys
 EAPI=8
 HOMEPAGE=https://github.com/projg2/glep63-check/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
-RDEPEND=app-crypt/gnupg 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=app-crypt/gnupg 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 )
 SLOT=0
 SRC_URI=https://github.com/projg2/glep63-check/archive/v11.tar.gz -> glep63-check-11.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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_=fd4f9e67f56df0281e51d3ead548ad8d
+_md5_=352ae99aac82480c70bd48830afd356c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 7559caf5bd83..9cc8ae86d9bb 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/votrify-5-r1 b/metadata/md5-cache/app-misc/votrify-5-r1
index b0d3695e1d3f..1b1afa1542fd 100644
--- a/metadata/md5-cache/app-misc/votrify-5-r1
+++ b/metadata/md5-cache/app-misc/votrify-5-r1
@@ -3,12 +3,12 @@ DESCRIPTION=Tool for community verification of Gentoo elections
 EAPI=8
 HOMEPAGE=https://github.com/projg2/votrify/
 INHERIT=python-single-r1
-IUSE=python_single_target_python3_10 python_single_target_python3_11
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-misc/gentoo-elections
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-misc/gentoo-elections
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/projg2/votrify/archive/v5.tar.gz -> votrify-5.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bca9d93d20b098e136658b7b4b66e0a9
+_md5_=807d7e693d765399c1a518c9719c5b94
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index e0b56c5b6e36..431860eef830 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
index 806a32465676..0d648fcbd41c 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
@@ -1,15 +1,15 @@
-BDEPEND=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(-)?]
+BDEPEND=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
 DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
 EAPI=8
 HOMEPAGE=https://github.com/projg2/diffmask/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=sys-apps/portage[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=sys-apps/portage[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 )
 SLOT=0
 SRC_URI=https://github.com/projg2/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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_=38f609c068cd2f4b050a84533647e6d7
+_md5_=ac99f62af7bb6de5d9440f658edba5a0
diff --git a/metadata/md5-cache/app-portage/gverify-2 b/metadata/md5-cache/app-portage/gverify-2
index d19352060e89..2e1256479d73 100644
--- a/metadata/md5-cache/app-portage/gverify-2
+++ b/metadata/md5-cache/app-portage/gverify-2
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
 DEFINED_PHASES=compile install setup
 DESCRIPTION=gentoo.git signature verification tool
 EAPI=8
 HOMEPAGE=https://github.com/projg2/gverify/
 INHERIT=python-single-r1
-IUSE=python_single_target_python3_10 python_single_target_python3_11
+IUSE=python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-crypt/gnupg sec-keys/openpgp-keys-gentoo-auth dev-vcs/git
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-crypt/gnupg sec-keys/openpgp-keys-gentoo-auth dev-vcs/git
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/projg2/gverify/archive/v2.tar.gz -> gverify-2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f842bfbb18274686632bd58e1218643a
+_md5_=47b64ab277f35b1dc9efd3781bd021e8
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index a3bbdfc218f7..87a043e65593 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.11 b/metadata/md5-cache/app-shells/bash-completion-2.11
index 6e05be2bc4c9..8c3661361371 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.11
+++ b/metadata/md5-cache/app-shells/bash-completion-2.11
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( dev-lang/python:3.11 dev-python/pexpect[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pexpect[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) )
+BDEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( dev-lang/python:3.12 dev-python/pexpect[python_targets_python3_12(-)] dev-python/pytest[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pexpect[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pexpect[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) )
 DEFINED_PHASES=install postinst prepare setup test
 DESCRIPTION=Programmable Completion for bash
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz eselect? ( https://github.com/projg2/bashcomp2/releases/download/v2.0.3/bashcomp-2.0.3.tar.gz )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=42064791e33d172b3546cd02d678ca74
+_md5_=2b9db47973830ba14555e5bbd77cce69
diff --git a/metadata/md5-cache/app-shells/bash-completion-9999 b/metadata/md5-cache/app-shells/bash-completion-9999
index d7fba209d08d..72d04311d5e4 100644
--- a/metadata/md5-cache/app-shells/bash-completion-9999
+++ b/metadata/md5-cache/app-shells/bash-completion-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( dev-lang/python:3.11 dev-python/pexpect[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pexpect[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) ) 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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc || ( ( dev-lang/python:3.12 dev-python/pexpect[python_targets_python3_12(-)] dev-python/pytest[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pexpect[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pexpect[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) ) 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst prepare setup test unpack
 DESCRIPTION=Programmable Completion for bash
 EAPI=8
@@ -12,4 +12,4 @@ RDEPEND=>=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !!net-fs/mc
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7d1cb71bdfc7258fca1eeca8292263f9
+_md5_=1bfd1295063a337cbb9dc8f09deff7cb
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index a31fef32659a..4b7857e2fc96 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1 b/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
index 1046b8371d25..5fc8da67cfa0 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
@@ -13,4 +13,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.20.1-ga.tar.gz -> openjdk-11.0.20.1_p1.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0979cabacbd7e7375503501f9ebb0156
+_md5_=b8a6570d8c13f385ba42bbdc9ff01d84
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1 b/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
index 333aad7c2d3e..486d8a717e66 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
@@ -13,4 +13,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.8.1-ga.tar.gz -> openjdk-17.0.8.1_p1.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=422f958e944f062c306ddfe42bae54ff
+_md5_=bffdc0f0a95353aa89c3da0ebd111f97
diff --git a/metadata/md5-cache/dev-java/openjdk-21.0.1_p12 b/metadata/md5-cache/dev-java/openjdk-21.0.1_p12
index a1788aa8a519..8d18ac8eeeac 100644
--- a/metadata/md5-cache/dev-java/openjdk-21.0.1_p12
+++ b/metadata/md5-cache/dev-java/openjdk-21.0.1_p12
@@ -13,4 +13,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) !s
 SLOT=21
 SRC_URI=https://github.com/openjdk/jdk21u/archive/refs/tags/jdk-21.0.1-ga.tar.gz -> openjdk-21.0.1_p12.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-21.0.0_p35-x86.tar.xz ) )
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=37c8048aabcdbc104722cfb54ffa991b
+_md5_=396541e364b7ce7ff714c64f9672847e
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 330908aff204..34d6304ee9fa 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/libei-1.1.0 b/metadata/md5-cache/dev-libs/libei-1.1.0
deleted file mode 100644
index df4deb06089c..000000000000
--- a/metadata/md5-cache/dev-libs/libei-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.12 dev-python/attrs[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/attrs[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/attrs[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/pytest[python_targets_python3_12(-)] dev-python/python-dbusmock[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] dev-python/structlog[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/structlog[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/structlog[python_targets_python3_10(-)] ) ) ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libevdev-1.9.902 || ( systemd? ( >=sys-apps/systemd-237 ) elogind? ( >=sys-auth/elogind-237 ) sys-libs/basu )
-DESCRIPTION=Library for Emulated Input, primarily aimed at the Wayland stack
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/libinput/libei
-INHERIT=meson python-any-r1
-IUSE=elogind systemd test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libevdev-1.9.902 || ( systemd? ( >=sys-apps/systemd-237 ) elogind? ( >=sys-auth/elogind-237 ) sys-libs/basu )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/libinput/libei/-/archive/1.1.0/libei-1.1.0.tar.bz2 https://github.com/nemequ/munit/archive/fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz -> munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	meson	3cbe71221342fc0089ce6e0b4725e476	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=648e7bf7edbd3311578a8d35e96155da
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
deleted file mode 100644
index 098be8e8a0e2..000000000000
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-build/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=C library for building efficient parsers
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
-INHERIT=flag-o-matic netsurf
-IUSE=iconv test
-KEYWORDS=amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/0.2.4
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	netsurf	3a16932a52467058f19b48ced2e15c4a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=279f49231abbd9d918c38fcfed1ca0bc
diff --git a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1 b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1
index f8b818ed33ed..4e582258e4de 100644
--- a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1
+++ b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.netsurf-browser.org/projects/libwapcaplet/
 INHERIT=netsurf
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libwapcaplet-0.4.3-src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	netsurf	3a16932a52467058f19b48ced2e15c4a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3eba5250d09c1554369cd22d7005f0bd
+_md5_=8eda21f10129e1b886fad9c5840ecb9f
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0
deleted file mode 100644
index 5509df4460e8..000000000000
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Plasma Specific Protocols for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c2c71a742d8fa842b4c1b07cafe7d08e
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0-r1 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0-r1
new file mode 100644
index 000000000000..960d899cf3cb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0-r1
@@ -0,0 +1,12 @@
+BDEPEND=dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.115.0:* || ( dev-qt/qtbase:6 dev-qt/qtcore:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Plasma Specific Protocols for Wayland
+EAPI=8
+HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
+INHERIT=cmake kde.org
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.tar.xz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e158503577835ca9cb8376c580a7f7e0
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.14.1.0 b/metadata/md5-cache/dev-libs/skalibs-2.14.1.0
deleted file mode 100644
index 20d0be338662..000000000000
--- a/metadata/md5-cache/dev-libs/skalibs-2.14.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare
-DESCRIPTION=General-purpose libraries from skarnet.org
-EAPI=8
-HOMEPAGE=https://www.skarnet.org/software/skalibs/
-INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ~riscv x86
-LICENSE=ISC
-SLOT=0/2.14
-SRC_URI=https://www.skarnet.org/software/skalibs/skalibs-2.14.1.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8b3133e341979861124d1270e0be20b3
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 7bb9f6d0196a..dfe5fe48ed1e 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.4.2 b/metadata/md5-cache/dev-lisp/sbcl-2.4.2
new file mode 100644
index 000000000000..cde099708609
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.4.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lisp/asdf-3.3:= prefix? ( dev-util/patchelf ) dev-debug/strace doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=8
+HOMEPAGE=https://www.sbcl.org/ http://sbcl.sourceforge.net/
+INHERIT=flag-o-matic pax-utils toolchain-funcs
+IUSE=system-bootstrap debug doc source +threads +unicode +zstd
+KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.3:= prefix? ( dev-util/patchelf ) zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/2.4.2
+SRC_URI=mirror://sourceforge/sbcl/sbcl-2.4.2-source.tar.bz2 https://dev.gentoo.org/~grozin/bsd-sockets-test-2.3.6.patch.gz !system-bootstrap? ( x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.4.2-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) ppc64? ( mirror://sourceforge/sbcl/sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-2.3.3-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) )
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=25dd38b47173d3f4f516703eab9820da
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e787e2b31812..bacd4085a110 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.5 b/metadata/md5-cache/dev-python/docutils-glep-1.5
index 61edc3640f6b..a7cc849a56f5 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.5
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.5
@@ -1,15 +1,15 @@
-BDEPEND=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/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=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/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Gentoo GLEP support for docutils
 EAPI=8
 HOMEPAGE=https://github.com/projg2/docutils-glep/ https://pypi.org/project/docutils-glep/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=public-domain
-RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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=>=dev-python/docutils-0.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[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 )
 SLOT=0
 SRC_URI=https://github.com/projg2/docutils-glep/archive/v1.5.tar.gz -> docutils-glep-1.5.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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_=0734721ad3cea3f22d2cda45b0f86e6d
+_md5_=a2a2673d7c27076ba7a20a199fbdea8b
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.5.1 b/metadata/md5-cache/dev-python/jwcrypto-1.5.1
deleted file mode 100644
index 93cfcf108029..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-1.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) 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_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=8
-HOMEPAGE=https://github.com/latchset/jwcrypto/ https://pypi.org/project/jwcrypto/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) 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_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/latchset/jwcrypto/archive/v1.5.1.tar.gz -> jwcrypto-1.5.1.gh.tar.gz
-_eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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_=dd5af2f11fa8fe49c8f14eb597745327
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.5.3 b/metadata/md5-cache/dev-python/jwcrypto-1.5.3
deleted file mode 100644
index b8596795fd0d..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-1.5.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) 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_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=8
-HOMEPAGE=https://github.com/latchset/jwcrypto/ https://pypi.org/project/jwcrypto/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) 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_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/latchset/jwcrypto/archive/v1.5.3.tar.gz -> jwcrypto-1.5.3.gh.tar.gz
-_eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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_=df155d7ab05df306d2d8cb28c7a4005c
diff --git a/metadata/md5-cache/dev-python/stripe-8.2.0 b/metadata/md5-cache/dev-python/stripe-8.2.0
deleted file mode 100644
index 312b920530f0..000000000000
--- a/metadata/md5-cache/dev-python/stripe-8.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.181.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) 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_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stripe python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-INHERIT=distutils-r1 pypi
-IUSE=telemetry test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) 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_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/stripe/stripe-8.2.0.tar.gz
-_eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f2fe3553dfffeb9aff02644d1fb224d1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 67699b1c296b..e98cf85d9d69 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.268 b/metadata/md5-cache/dev-util/spirv-headers-1.3.268
deleted file mode 100644
index 8ec616f17678..000000000000
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.268
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Machine-readable files for the SPIR-V Registry
-EAPI=8
-HOMEPAGE=https://registry.khronos.org/SPIR-V/
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-1.3.268.tar.gz -> spirv-headers-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=da5835428d60e43edf85e2545a9c76db
diff --git a/metadata/md5-cache/dev-util/spirv-tools-1.3.268 b/metadata/md5-cache/dev-util/spirv-tools-1.3.268
deleted file mode 100644
index 05abca1c9c39..000000000000
--- a/metadata/md5-cache/dev-util/spirv-tools-1.3.268
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-headers-1.3.268
-DESCRIPTION=Provides an API and commands for processing SPIR-V modules
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
-INHERIT=cmake-multilib python-any-r1
-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 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/vulkan-sdk-1.3.268.0.tar.gz -> spirv-tools-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=75c146a56a34059d0d645f8d0c091652
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.181.0 b/metadata/md5-cache/dev-util/stripe-mock-0.181.0
deleted file mode 100644
index 3337395dec4b..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.181.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-mock/
-INHERIT=go-module
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.181.0.tar.gz -> stripe-mock-0.181.0.tar.gz
-_eclasses_=go-env	96e1747610bbb2f5c5d3fb16f0f3a83a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=655a38d19829e595a0101a9ea3a01f27
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.3.268 b/metadata/md5-cache/dev-util/vulkan-headers-1.3.268
deleted file mode 100644
index 6c0482113faa..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.3.268
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/vulkan-sdk-1.3.268.0.tar.gz -> vulkan-headers-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8062d5071642fa9f6eb6d56c78bce62b
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.3.268 b/metadata/md5-cache/dev-util/vulkan-tools-1.3.268
deleted file mode 100644
index d1c01e38c0d0..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.3.268
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) cube? ( ~dev-util/glslang-1.3.268:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~media-libs/vulkan-loader-1.3.268:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,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/libXrandr:=[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/vulkan-headers-1.3.268
-DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=cube 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=amd64 arm arm64 ~loong ppc ppc64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=~media-libs/vulkan-loader-1.3.268:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,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/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=cube? ( || ( X wayland ) )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/vulkan-sdk-1.3.268.0.tar.gz -> vulkan-tools-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a3ebfdae27745af97749c5e3dbd07ad5
diff --git a/metadata/md5-cache/dev-util/vulkan-utility-libraries-1.3.268 b/metadata/md5-cache/dev-util/vulkan-utility-libraries-1.3.268
deleted file mode 100644
index 116fcb2ec1f0..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-utility-libraries-1.3.268
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/vulkan-headers-1.3.268
-DESCRIPTION=Share code across various Vulkan repositories
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Utility-Libraries
-INHERIT=cmake-multilib python-any-r1
-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 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=!<media-libs/vulkan-layers-1.3.268
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-1.3.268.0.tar.gz -> vulkan-utility-libraries-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=163b398e21e57be5ce8b78e1280a8d21
diff --git a/metadata/md5-cache/dev-util/vulkan-utility-libraries-1.3.268-r1 b/metadata/md5-cache/dev-util/vulkan-utility-libraries-1.3.268-r1
deleted file mode 100644
index 633015d96bd7..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-utility-libraries-1.3.268-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/vulkan-headers-1.3.268 test? ( dev-cpp/gtest >=dev-cpp/magic_enum-0.9.2 )
-DESCRIPTION=Share code across various Vulkan repositories
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Utility-Libraries
-INHERIT=cmake-multilib python-any-r1
-IUSE=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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<media-libs/vulkan-layers-1.3.268
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-1.3.268.0.tar.gz -> vulkan-utility-libraries-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=28b71508b7a9e8bf271682bc3eaa1990
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 5c03851ed01b..040a7c20b585 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/libdisplay-info-0.1.1 b/metadata/md5-cache/media-libs/libdisplay-info-0.1.1
index f8c42334557e..1d39dce2f41a 100644
--- a/metadata/md5-cache/media-libs/libdisplay-info-0.1.1
+++ b/metadata/md5-cache/media-libs/libdisplay-info-0.1.1
@@ -1,7 +1,7 @@
 BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig test? ( >=sys-apps/edid-decode-0_pre20230131 ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install setup test
 DEPEND=sys-apps/hwdata
-DESCRIPTION=Simple framework for writing Vulkan layers
+DESCRIPTION=EDID and DisplayID library
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/emersion/libdisplay-info
 INHERIT=meson python-any-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/libdisplay-info-0.1.1.tar.xz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	meson	3cbe71221342fc0089ce6e0b4725e476	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3bc414f2f0b509869d41a60c099969be
+_md5_=81fb183b13914ce41dd23112e6b1182f
diff --git a/metadata/md5-cache/media-libs/libsvgtiny-0.1.8 b/metadata/md5-cache/media-libs/libsvgtiny-0.1.8
index 7b6cc19c890d..c7205de6cc43 100644
--- a/metadata/md5-cache/media-libs/libsvgtiny-0.1.8
+++ b/metadata/md5-cache/media-libs/libsvgtiny-0.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=Small and portable C library to parse SVG
 EAPI=8
 HOMEPAGE=https://www.netsurf-browser.org/projects/libsvgtiny/
 INHERIT=netsurf
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=net-libs/libdom[xml] dev-libs/libwapcaplet
 SLOT=0/0.1.8
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libsvgtiny-0.1.8-src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	netsurf	3a16932a52467058f19b48ced2e15c4a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3eb7cefce03dcf56137d6bfbb9f5eb27
+_md5_=d099a72670c7880b851e09a81b93b785
diff --git a/metadata/md5-cache/media-libs/libsvgtiny-pixbuf-0.0.2 b/metadata/md5-cache/media-libs/libsvgtiny-pixbuf-0.0.2
index b21baccac14e..71d52487f2d8 100644
--- a/metadata/md5-cache/media-libs/libsvgtiny-pixbuf-0.0.2
+++ b/metadata/md5-cache/media-libs/libsvgtiny-pixbuf-0.0.2
@@ -4,9 +4,9 @@ DEPEND=dev-libs/libxml2:= media-libs/libsvgtiny:= x11-libs/cairo:= x11-libs/gdk-
 DESCRIPTION=Add SVG support to GTK without librsvg
 EAPI=8
 HOMEPAGE=https://michael.orlitzky.com/code/libsvgtiny-pixbuf.xhtml
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=AGPL-3
 RDEPEND=dev-libs/libxml2:= media-libs/libsvgtiny:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
 SLOT=0
 SRC_URI=https://michael.orlitzky.com/code/releases/libsvgtiny-pixbuf-0.0.2.tar.xz
-_md5_=b16a7deb7439fd3e3d7034e6441896a3
+_md5_=82720c4a9d5d08b908abce432a3a87d6
diff --git a/metadata/md5-cache/media-libs/phonon-4.12.0 b/metadata/md5-cache/media-libs/phonon-4.12.0
deleted file mode 100644
index 46f298e594e5..000000000000
--- a/metadata/md5-cache/media-libs/phonon-4.12.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=pulseaudio? ( dev-libs/glib:2 media-libs/libpulse[glib] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[gui,widgets] designer? ( dev-qt/qttools:6[designer] ) ) dev-qt/qtcore:5
-DESCRIPTION=KDE multimedia abstraction library
-EAPI=8
-HOMEPAGE=https://community.kde.org/Phonon
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop ecm kde.org
-IUSE=designer pulseaudio +qt5 qt6 +vlc debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )
-PDEPEND=vlc? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
-RDEPEND=pulseaudio? ( dev-libs/glib:2 media-libs/libpulse[glib] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[gui,widgets] designer? ( dev-qt/qttools:6[designer] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( qt5 qt6 )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/4.12.0/phonon-4.12.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=793bf0308111a65d93c80294a9a6c959
diff --git a/metadata/md5-cache/media-libs/phonon-4.12.0-r1 b/metadata/md5-cache/media-libs/phonon-4.12.0-r1
new file mode 100644
index 000000000000..97d96c24f44b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-4.12.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libpcre2:* virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 >=kde-frameworks/extra-cmake-modules-5.115.0:* ) qt6? ( dev-qt/qttools:6[linguist] >=kde-frameworks/extra-cmake-modules-6.0.0:* ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DEPEND=pulseaudio? ( dev-libs/glib:2 media-libs/libpulse[glib] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[gui,widgets] designer? ( dev-qt/qttools:6[designer] ) )
+DESCRIPTION=KDE multimedia abstraction library
+EAPI=8
+HOMEPAGE=https://community.kde.org/Phonon
+INHERIT=cmake desktop flag-o-matic kde.org multibuild
+IUSE=debug designer pulseaudio +qt5 qt6 +vlc
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )
+PDEPEND=vlc? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
+RDEPEND=pulseaudio? ( dev-libs/glib:2 media-libs/libpulse[glib] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[gui,widgets] designer? ( dev-qt/qttools:6[designer] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* )
+REQUIRED_USE=|| ( qt5 qt6 )
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/4.12.0/phonon-4.12.0.tar.xz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	kde.org	60fcb935e4206806bf9f38e3537521a2	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5cfcf8a5a709fa40449a327c3783ebba
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.12.0 b/metadata/md5-cache/media-libs/phonon-vlc-0.12.0
deleted file mode 100644
index 89dc38a52311..000000000000
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.12.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=media-libs/phonon-4.12.0[qt5=,qt6=] media-video/vlc:=[dbus,ogg,vorbis(+)] qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) dev-qt/qtcore:5
-DESCRIPTION=VLC backend for the Phonon multimedia library
-EAPI=8
-HOMEPAGE=https://community.kde.org/Phonon
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm kde.org
-IUSE=+qt5 qt6 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=media-libs/phonon-4.12.0[qt5=,qt6=] media-video/vlc:=[dbus,ogg,vorbis(+)] qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( qt5 qt6 )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.12.0/phonon-backend-vlc-0.12.0.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ef2c6483b359dff102fd9d4d94f25aa
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.12.0-r1 b/metadata/md5-cache/media-libs/phonon-vlc-0.12.0-r1
new file mode 100644
index 000000000000..874594e23c7a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.12.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libpcre2:* virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 >=kde-frameworks/extra-cmake-modules-5.115.0:* ) qt6? ( dev-qt/qttools:6[linguist] >=kde-frameworks/extra-cmake-modules-6.0.0:* ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DEPEND=>=media-libs/phonon-4.12.0[qt5=,qt6=] media-video/vlc:=[dbus,ogg,vorbis(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+DESCRIPTION=VLC backend for the Phonon multimedia library
+EAPI=8
+HOMEPAGE=https://community.kde.org/Phonon
+INHERIT=cmake flag-o-matic kde.org multibuild
+IUSE=debug +qt5 qt6
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=media-libs/phonon-4.12.0[qt5=,qt6=] media-video/vlc:=[dbus,ogg,vorbis(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
+REQUIRED_USE=|| ( qt5 qt6 )
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.12.0/phonon-backend-vlc-0.12.0.tar.xz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	kde.org	60fcb935e4206806bf9f38e3537521a2	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=33fe7a030b4b810b2fc5aa40c21061a0
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.3.268 b/metadata/md5-cache/media-libs/vulkan-layers-1.3.268
deleted file mode 100644
index e1985cb4463b..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.3.268
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-tools-1.3.268:=[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-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-cpp/robin-hood-hashing-3.11.5 ~dev-util/glslang-1.3.268:=[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/spirv-headers-1.3.268 ~dev-util/vulkan-headers-1.3.268 ~dev-util/vulkan-utility-libraries-1.3.268:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Vulkan Validation Layers
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
-INHERIT=cmake-multilib python-any-r1
-IUSE=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=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-util/spirv-tools-1.3.268:=[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://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/vulkan-sdk-1.3.268.0.tar.gz -> vulkan-layers-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3d53403cc113a61740f4904f0657733a
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.3.268 b/metadata/md5-cache/media-libs/vulkan-loader-1.3.268
deleted file mode 100644
index 1c9614b4eaa4..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.3.268
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/vulkan-headers-1.3.268 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/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-INHERIT=flag-o-matic cmake-multilib toolchain-funcs
-IUSE=layers 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=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[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://github.com/KhronosGroup/Vulkan-Loader/archive/vulkan-sdk-1.3.268.tar.gz -> vulkan-loader-1.3.268.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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_=f0d5434dc90653ff8dfc7d986fdcc667
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index d15111c56b78..da0d412e1ded 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1 b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
index 17437637137c..6c6ba457d0d5 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.23 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.23 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: control a horz. or vert. actuator attached through the parallel port
 EAPI=7
 HOMEPAGE=https://ventoso.org/luca/vdr/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://ventoso.org/luca/vdr/vdr-actuator-1.2.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=dc8c3189031d74ac7b5b64f7720c45a1
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025 b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
index 37aceea3a68c..e9de55b29cf8 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: control a horz. or vert. actuator attached through the parallel port
 EAPI=7
 HOMEPAGE=https://ventoso.org/luca/vdr/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/olivluca/vdr-actuator-plugin/archive/c810abffbf6dc6f1f354b0c545abe65311203fd8.tar.gz -> vdr-actuator-2.4.1_pre20181025.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=9d779b34a20be25373626a09fd363993
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
index ed979e910058..6ed683298c0e 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Automatic Video Aspect Ratio Detection and Signaling
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/avards/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.4.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=3918630bcee92ecdb62bb02ffd0dcd5e
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
index a94f1846f3aa..6aec67d549b9 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Automatic Video Aspect Ratio Detection and Signaling
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/avards/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.6.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=a93235141234334e07961e07725632bb
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2 b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
index e8147dc67e5e..36b9a1a552a1 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Use the PC speaker to signalize some events (shutdown, cut done ...)
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-beep/vdr-beep-0.1.2.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=c467feb10e2a2e79f1c51b0f445917a1
diff --git a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5 b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
index 3cefd177c7c5..3642a22041b2 100644
--- a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
+++ b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: OSD Calculator
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-calc/vdr-calc-0[1].0.1-rc5.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5e349da83a3e807360ff13f652bce0c6
diff --git a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2 b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
index b104ca163c39..8cb30f45ff1a 100644
--- a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: CD-PLAYER
 EAPI=7
 HOMEPAGE=https://www.uli-eckhardt.de/vdr/cdplayer.en.shtml
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://www.uli-eckhardt.de/vdr/download/vdr-cdplayer-1.2.2.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=f4d776e9daba5a695c1f4268ea00bf70
diff --git a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5 b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
index 68d02e04c444..1be886648573 100644
--- a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Show black bars to hide station logo
 EAPI=7
 HOMEPAGE=http://www.egal-vdr.de/plugins/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-cinebars-0.0.5.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=572a26682e3fe2cb7afaebefd9dd2952
diff --git a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2 b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
index 69e9330ec50c..09e41f59382b 100644
--- a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Tea clock, clock
 EAPI=7
 HOMEPAGE=https://github.com/madmartin/vdr-clock
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/madmartin/vdr-clock/archive/v1.0.0.tar.gz -> vdr-clock-1.0.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=f3cf0ce18bf07a3cd0fe5f87c9ad028c
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
index 8c3e9909a123..f2e5195cc822 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: DDCI2 - Digital Devices CI support
 EAPI=8
 HOMEPAGE=https://github.com/jasmin-j/vdr-plugin-ddci2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.4.tar.gz -> vdr-ddci2-1.0.4.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=608c7029bac6660bae2ba15463190232
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
index 2e39703cb708..fce005bf664c 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: DDCI2 - Digital Devices CI support
 EAPI=8
 HOMEPAGE=https://github.com/jasmin-j/vdr-plugin-ddci2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.5.tar.gz -> vdr-ddci2-1.0.5.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=608c7029bac6660bae2ba15463190232
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-9999 b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
index a6acc22b1c3c..9414ed88b0e7 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-9999
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: DDCI2 - Digital Devices CI support
 EAPI=8
 HOMEPAGE=https://github.com/jasmin-j/vdr-plugin-ddci2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=608c7029bac6660bae2ba15463190232
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
index 8fa78bff6cb8..0aace4452b80 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: display the usage status of the available DVB devices
 EAPI=7
 HOMEPAGE=https://www.u32.de/vdr.html
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5a6f89bd3bf0e713d584c41ca6bc9849
diff --git a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
index 3ab427ba578d..fc459224e961 100644
--- a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: dummy output device ,for recording server without any output devices
 EAPI=7
 HOMEPAGE=http://phivdr.dyndns.org/vdr/vdr-dummydevice/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-dummydevice/vdr-dummydevice-2.0.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=b81bbfe0ffc0059cf0922dd983d94380
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1 b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
index 8dcf3b24772e..c9ad17367f98 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: show duplicated records
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-duplicates/repository
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-duplicates.git/snapshot/vdr-plugin-duplicates-68739fd72beb9745b3e47b9e466311ef23a8ca97.tar.gz -> vdr-duplicates-1.0.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=7561edb06967a092efd0ddc0c5fcc46c
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
index b1240fbbfb2b..3a0841caa98e 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: allows connect VDR to OScam
 EAPI=7
 HOMEPAGE=https://github.com/manio/vdr-plugin-dvbapi
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.5.tar.gz -> vdr-plugin-dvbapi-2.2.5.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=7d24b3936d584fb40bed134ca55bd12c
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
index 09a6dfca30d6..fa91816d3d8f 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.39 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.39 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card
 EAPI=7
 HOMEPAGE=https://bitbucket.org/powARman/dvbhddevice
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/60c58ae453d0.tar.gz -> dvbhddevice-2.1.3_p20140115.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=c9d4e09c84b87bf99157cf9c875ece78
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
index df9d6a4c7f1c..650113fb50d1 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card
 EAPI=7
 HOMEPAGE=https://bitbucket.org/powARman/dvbhddevice
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/6a3e75484d90.tar.bz2 -> vdr-dvbhddevice-2.2.0_p20180420.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=72e7a48e265b569b05971a29e748619b
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2
index 1f893a689a41..535e133baadc 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: output device for the 'Full Featured' SD DVB Card
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://ftp.tvdr.de/Plugins/vdr-dvbsddevice-2.2.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=2515e50a3ef7fc2799337fca6b1cb31f
diff --git a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4 b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4
index 1a972e368d8e..6093c1420c04 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4
+++ b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: DVD-Player
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/dvdplugin
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvd-cvs-20090106.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5a460fc5ee8386a96fb9fb4c01316e3d
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
index 4922959e4600..de265600e58a 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: to play dvds and dvd file structures
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-dvdswitch
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1323/vdr-dvdswitch-0.2.2.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=2b4723259b88f85c33dfffa4675a3851
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
index 5bf3cfc2596d..a9cc8bc1516a 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: to play dvds and dvd file structures
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-dvdswitch
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2084/vdr-dvdswitch-0.2.3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=2bdb61208ef1e0be8d2fe32381d7e902
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1
index 28cf13a49f28..5486b67fc247 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1
@@ -1,6 +1,6 @@
 BDEPEND=sys-apps/groff dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: create timers from epg content based on saved search expressions
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/epgsearch/index_eng.html
@@ -12,5 +12,5 @@ RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) m
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-cff8dfe58853aa0cc4f6e9a8896104a920b98730.tar.gz -> vdr-epgsearch-2.4.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=91e408f723ed286d1d467ee1bedde8f3
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
index 62b660b273bb..e2e025b6f430 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice
 EAPI=7
 HOMEPAGE=https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=995aecb7b7562d47e3c0bde9d170d25e
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
index 651a0180ecd9..560beb698ee4 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice
 EAPI=7
 HOMEPAGE=https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=be25caceeb0fd0dd16ade97648332aab
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.2 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.2
index 570f3e7fad04..021755fa1f10 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice
 EAPI=8
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-epgsync/ https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-epgsync/archive/refs/tags/1.0.2.tar.gz -> vdr-epgsync-1.0.2.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=acd5155d6689536f739b0518aeb96029
diff --git a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3 b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
index 92c31bc8bdf5..e625c0ecda50 100644
--- a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Exec commands like timers at defined times
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-exec/vdr-exec-0.0.3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=e7be1624275e12c5e7f5348e96491781
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
index 93df986f986b..e7793a3f69ca 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Extended recordings menu
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-extrecmenu
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.tar.gz -> vdr-extrecmenu-1.2.4-r2.tar.gz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=4f9cda07e0edce508a4d0b95d6f163ba
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0 b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
index a5c6cee51213..7e1f77a9cd9d 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: DVB Frontend Status Monitor (signal strength/noise)
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-femon
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-femon/archive/v2.4.0.tar.gz -> vdr-femon-2.4.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=13134e833112e52956c78df0ee3aa5e3
diff --git a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2 b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
index 31071d2d3140..7e2e6f7393dc 100644
--- a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Provides an easy way of connecting possible streaming clients to VDR
 EAPI=8
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-ffnetdev
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/837/vdr-ffnetdev-0.1.2.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=98b3ee784e4bab2f0b1f9409057e4b7e
diff --git a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.3_p20210521 b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.3_p20210521
index 2ee6b300792c..ed0d4b1f3e02 100644
--- a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.3_p20210521
+++ b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.3_p20210521
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.4.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: file manager plugin for moving or renaming files in VDR
 EAPI=7
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-filebrowser
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-1.4.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-filebrowser/archive/e09ba5519cf6db68190a2b176f0b6b442c870057.tar.gz -> vdr-filebrowser-0.2.3_p20210521.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5cfa75310090dc5241f977340420521b
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
index 30df22a446eb..48ab8d846899 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: play 'Freecell' on the On Screen Display
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=a78ca9d81ec713d0abf535cadb312a07
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
index e1ca13c1a6a9..f6bdfb7b9f93 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=dev-libs/libgcrypt:= dev-libs/boost:= media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=dev-libs/libgcrypt:= dev-libs/boost:= media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook
 EAPI=7
 HOMEPAGE=https://github.com/jowi24/vdr-fritz
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libgcrypt:= dev-libs/boost:= media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/vdr-fritzbox-1.5.3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=e7e2af0cf511394cbe99caab7a4a53f9
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2 b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2
index c6d8d4772360..b9b1600732a1 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: support output on Graphical LCD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-graphlcd
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-graphlcd.git/snapshot/vdr-plugin-graphlcd-1.0.1.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=f3aa6a327510190b3ead2070ddd4a948
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.3-r1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.3-r1
index 2f84dabbd5aa..e1790970da39 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/freetype virtual/udev media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-libs/freetype virtual/udev media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: shows information about the current state of VDR on iMON LCD
 EAPI=8
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-imonlcd/wiki
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype virtual/udev media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-imonlcd/archive/refs/tags/1.0.3.tar.gz -> vdr-imonlcd-1.0.3.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=1246a2c499c31928b9176619a0b78695
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
index 0903086ca25b..7d9d87c0ea1a 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.6 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.6 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Add a logical device capable of receiving IPTV
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-iptv
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.1.6 net-misc/curl media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-iptv/archive/v2.2.1.tar.gz -> vdr-iptv-2.2.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5756a47a862b8fc8f0b9e2f84c0e2313
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0 b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
index 82c81ebf1d03..49c42846ba1c 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Add a logical device capable of receiving IPTV
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-iptv
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 net-misc/curl media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-iptv/archive/v2.4.0.tar.gz -> vdr-iptv-2.4.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=8177d715d8f60f27cb1a9feff6801e38
diff --git a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3 b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
index 053cd9d1a4ed..dad37fa91837 100644
--- a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: allows using a joystick as a remote control for VDR
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-joystick/vdr-joystick-0.0.3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5a785b4793ccfd4e8e989b4618b53a60
diff --git a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1 b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1
index eb5c651ad653..0190a5dc6a2b 100644
--- a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: launch other plugins - even when their menu-entry is hidden
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/launcher/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/launcher/downloads/vdr-launcher-0.0.4.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=9473456b9c65a0d9523f136225f95acc
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
index ba9d8fa24b0a..4122c52371d2 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: use LCD device for additional output
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-lcdproc
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=84b08e03f15c4aef814090b4807bc583
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
index 974ddf706d7a..7222af571bf5 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=app-misc/lcdproc-0.4.3 >=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=app-misc/lcdproc-0.4.3 >=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: use LCD device for additional output
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-lcdproc
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=1dc0729a56f74523f679e8fe554f660d
diff --git a/metadata/md5-cache/media-plugins/vdr-live-3.0.6 b/metadata/md5-cache/media-plugins/vdr-live-3.0.6
index a0dcf42d1676..0769b8747d0f 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-3.0.6
+++ b/metadata/md5-cache/media-plugins/vdr-live-3.0.6
@@ -1,6 +1,6 @@
 BDEPEND=ssl? ( dev-libs/openssl ) virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=dev-libs/tntnet-3[ssl=] >=dev-libs/cxxtools-3 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr >=dev-libs/tntnet-3[ssl=] >=dev-libs/cxxtools-3 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Web Access To Settings
 EAPI=7
 HOMEPAGE=https://github.com/MarkusEh/vdr-plugin-live
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 GPL-2+ RSA
 RDEPEND=media-video/vdr >=dev-libs/tntnet-3[ssl=] >=dev-libs/cxxtools-3 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/MarkusEh/vdr-plugin-live/archive/v3.0.6.tar.gz -> vdr-live-3.0.6.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=0e0ae46f7b3ae05bc14fa567a506bc2c
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
index 8a62d7233f0b..2ec23329b038 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR : Loadepg Plugin; Canal+ group (Mediahighway)
 EAPI=7
 HOMEPAGE=https://lukkinosat.altervista.org/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://lukkinosat.altervista.org/vdr-loadepg-0.2.7.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=504c5a478d86fbe1685ba1a5460a89bc
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1
index 192ae40965e2..9a5e09b16908 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: make osd menu configurable via config-file
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-menuorg
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1312/vdr-menuorg-0.5.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=7f0352d11e655a5739d4aecf63616e71
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.2 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.2
index bcacb29f08ee..c3f9a87f2cf4 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.2
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: make osd menu configurable via config-file
 EAPI=8
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-menuorg
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-menuorg/archive/refs/tags/0.5.2.tar.gz -> vdr-menuorg-0.5.2.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=3e9e6f5aee7197daafb9d0a42b633f17
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2 b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
index ed215630c87d..6e82a6765edc 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Show a history of the last OSD message
 EAPI=7
 HOMEPAGE=https://github.com/jowi24/vdr-mlist
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-mlist/archive/1.0.2.tar.gz -> vdr-mlist-1.0.2.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=10f13e3882336f65f9da2b59123e52b2
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5
index 61f8c0ebb5f2..e683461f5a90 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/imlib2 media-libs/libmad media-libs/libid3tag:= media-libs/libsndfile media-video/vdr sys-libs/zlib vorbis? ( media-libs/libvorbis ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-libs/imlib2 media-libs/libmad media-libs/libid3tag:= media-libs/libsndfile media-video/vdr sys-libs/zlib vorbis? ( media-libs/libvorbis ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: play mp3 and ogg on VDR
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mp3ng/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=cfdd8adcf0904aa7a22f0027f901eea6
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
index afb7f234b9ce..4d0f2cd57e56 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.4.2 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Play video files not supported by VDR with mplayer (divx and more)
 EAPI=7
 HOMEPAGE=https://www.muempf.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.2 media-video/mplay-sh sys-apps/util-linux media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=75f7259c2f9410fd59a52ea0a45f104b
diff --git a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4 b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
index 38dec6770037..b12fa7833dc8 100644
--- a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.2.6 net-misc/wget media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.2.6 net-misc/wget media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Show rdf Newsticker on TV
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-newsticker/vdr-newsticker-0.0.4.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=24ce89394cbf3fe9bdb2206104dd0cf6
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
index 991ee74bbb8c..c838327d180d 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: will replace the noepg-patch with the new cEpgHandler
 EAPI=7
 HOMEPAGE=https://github.com/flensrocker/vdr-plugin-noepg
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.4.tar.gz -> vdr-noepg-0.0.4.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=54e9303daec358a8d0ad12fc5ad9e5f4
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
index cd8b0ea92ffa..27d13eea5965 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: will replace the noepg-patch with the new cEpgHandler
 EAPI=7
 HOMEPAGE=https://github.com/flensrocker/vdr-plugin-noepg
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.5.tar.gz -> vdr-noepg-0.0.5.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=c7e6090a00034475769d8879da32bf37
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
index a36e73891299..36ab6717b1df 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.20 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.20 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: VDR OSD access for ext. programs through a TCP/IP socket connection
 EAPI=7
 HOMEPAGE=https://www.udo-richter.de/vdr/osdserver.en.html
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=02ea7bff0ce85b9c54d421c5a8c5cb66
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
index 596a8c7b163d..abaa1adc5e61 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v0.9.8.tar.gz -> vdr-osdteletext-0.9.8.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=c88e4c08aeada3209253a38076395ebe
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
index 4c84011afe30..f6cf65fd290a 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v2.2.1.tar.gz -> vdr-osdteletext-2.2.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=730a1ba2bc3d78cdf5e43e9a5fec7f32
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
index 6e59c8224508..4418e20e7702 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=acct-group/vdr acct-user/vdr media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=acct-group/vdr acct-user/vdr media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=8
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=acct-group/vdr acct-user/vdr media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v2.3.1.tar.gz -> vdr-osdteletext-2.3.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=952a6eaf423af21cfa1635a9e4908bfe
diff --git a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1 b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
index 4bf70a9030c3..9c6b962eabf6 100644
--- a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=~media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=~media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: peer-to-peer between multiple VDRs
 EAPI=7
 HOMEPAGE=https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://vdr.schmirler.de/peer/vdr-peer-0.0.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=d0ee245cb964ed7a86267fd6f4839159
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
index fd8f560e5f55..7771ab4d1cdc 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=~media-video/vdr-2.2.0[permashift] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=~media-video/vdr-2.2.0[permashift] media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: permanent timeshift by recording live TV on RAM
 EAPI=7
 HOMEPAGE=https://ein-eike.de/vdr-plugin-permashift-english/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=~media-video/vdr-2.2.0[permashift] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://ein-eike.de/wordpress/wp-content/uploads/2014/11/vdr-permashift-1.0.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=1a5477e6ea526768d7f6c402a9483191
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
index a0bfa1952485..d49be95d9bbf 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: permanent timeshift by recording live TV on RAM
 EAPI=7
 HOMEPAGE=https://ein-eike.de/vdr-plugin-permashift-english/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/eikesauer/Permashift/archive/f3541d7c0e3e201daf06a49304db0a0d7d5f8dd1.tar.gz -> vdr-permashift-1.0.4_pre20200301.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=f5081546453d0db7f454ef2bb20cdabf
diff --git a/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1 b/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1
index 76cffa23acd8..7abf369fdd74 100644
--- a/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr[pinplugin] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr[pinplugin] media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: enable/disable parentalrating in records
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-pin
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr[pinplugin] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-pin.git/snapshot/vdr-plugin-pin-9f8fb2260b73971d69691962df472c992d94b123.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=3057dd54c7581718c75d5fe973e2cd1b
diff --git a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5 b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
index cf2d1bfc07d9..3b0d64998d11 100644
--- a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR PLUGIN: support the Powermate device
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-powermate/vdr-powermate-0.0.5.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=c8747200383bbccf81dd8e4b2d4ec787
diff --git a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5 b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
index 3e4ffe587c85..ae722a3771fa 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
+++ b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: use a PVR350 as output device
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-pvr350
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1657/vdr-pvr350-1.7.5.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=34b7dd2c8af4e90909a4f3e7633ec5a5
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1 b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
index 8901d67a3e9a..5ca437ac527b 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
+++ b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: show background image for radio and decode RDS Text
 EAPI=7
 HOMEPAGE=http://www.vdr-portal.de/board/thread.php?threadid=58795
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-radio-0.9.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=970102551be020ec37bc5076d99a172f
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0 b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
index 7e8360bda8fb..0f2251b9c872 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: show background image for radio and decode RDS Text
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/vdr-plugin-radio
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-radio.git/snapshot/vdr-plugin-radio-1.1.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=30b8ab5e53be5b7c3a6fb0aaec180159
diff --git a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
index 6b0ada1e96aa..0015dfd6f122 100644
--- a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Remote Control Unit consists mainly of an IR receiver, PIC 16C84
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/remote.htm
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-rcu-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-rcu-2.2.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=7b579ecc7b0a56a02ea744e6f199082e
diff --git a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7 b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
index 8ffdac6a698a..b877daf2a3b7 100644
--- a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
+++ b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Search through your recordings and find the one you are looking for
 EAPI=7
 HOMEPAGE=https://github.com/flensrocker/vdr-plugin-recsearch
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-recsearch/releases/download/v0.3.7/vdr-recsearch-0.3.7.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=46d96959df6abdd5f0cc3d73431af11e
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1 b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
index 64f69f964e61..8782284fd4c4 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: use various devices for controlling vdr (keyboards, lirc...)
 EAPI=7
 HOMEPAGE=http://www.escape-edv.de/endriss/vdr/
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.7.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=b7d8db54b54cb2325127cc3f4f2b4398
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
index 836c1e437e2d..1f6422a91428 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: server/client remoteosd
 EAPI=7
 HOMEPAGE=https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=1d762f5b479333e1fb7a737e5e7baca6
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
index e6834d0cdc1f..5ba92c7e83cd 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: server/client remoteosd
 EAPI=7
 HOMEPAGE=https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=f86102262118459494b5d41758cb0a54
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.1 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.1
index db7fe42a4b31..8379e5dee5eb 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: server/client remoteosd
 EAPI=8
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-remoteosd https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-remoteosd/archive/refs/tags/1.0.1.tar.gz -> vdr-remoteosd-1.0.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=05243a8ca48197942f41ba9790ca7243
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
index 0963f6c5f850..03f4ab12362c 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Output Device for Raspberry Pi
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-rpihddevice
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2045/vdr-rpihddevice-1.0.3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=b2f851590f067995b300d79f5b60f6f4
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
index f9c0f31620dc..12b3688d6632 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Output Device for Raspberry Pi
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-rpihddevice
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2193/vdr-rpihddevice-1.0.5.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=b613abedfc81cf7316c95be5b8e712f0
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1
index c0a16af81e2d..d13ad17a2a6d 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: RSS reader
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-rssreader
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-rssreader/archive/v2.4.0.tar.gz -> vdr-rssreader-2.4.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=928381516ada62aea7f3ca75b946a3a2
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
index 63dc6dea5798..9ae4d6e8a85f 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-satip
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/v2.2.5.tar.gz -> vdr-satip-2.2.5.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=6c6d0f4c4260b98339c36c5782646ab9
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.4.1 b/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
index cdda0b2a7b31..38f73b4fff4c 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-satip
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/v2.4.1.tar.gz -> vdr-satip-2.4.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=ea2160f5fbce17bb86788a2c43e280b9
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
index e600fdc7a7d9..d689d6e134a2 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.7 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: allows to control externel jobs from within VDR
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/scheduler/index.html
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=550e7c47a800e0aca1a28ff157368f57
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
index fc6e7164f5e1..fd1e62b8801d 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.3.5 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.3.5 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: allows to control externel jobs from within VDR
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/scheduler/index.html
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.6.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=95cd000862b37b6c2fa0c48a49f759b4
diff --git a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15 b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
index 183492eaad96..92e482adb0a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
+++ b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: takes screenshots of the current video or tv screen
 EAPI=7
 HOMEPAGE=https://github.com/jowi24/vdr-screenshot
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-screenshot/archive/0.0.15.tar.gz -> vdr-screenshot-0.0.15.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=fc2b01283de4950c3d15214c46119126
diff --git a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1 b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
index aeaebb59304c..d64fa3634c3c 100644
--- a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
+++ b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: attach some buttons with diodes to the serial port
 EAPI=7
 HOMEPAGE=http://www.lf-klueber.de/vdr.htm
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.lf-klueber.de/vdr-serial-0.0.6a.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=d599ef5d713936af752b472819e5f035
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
index 3d5ae8c15662..820f80c7287a 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=~media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=~media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: show content of menu in a shell window
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skincurses-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-skincurses-2.2.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5619cb19cb2eb9df3b02bb91067c05cc
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
index 48b929785318..dc7571e168df 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Skin Plugin: skinelchi
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/skinelchi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=934f9d106676d70dd913da91ffb1a3d9
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
index 5941396f6fc1..8f1a15a3ee56 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Skin Plugin: skinelchi
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/skinelchi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=874e907af68b311802ba93e5c0d7b5a0
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
index 1d8ade9b2e0e..d787a49bdf8b 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Skin Plugin: soppalusikka
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-skinsoppalusikka
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 x11-themes/vdr-channel-logos media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-skinsoppalusikka/archive/v2.4.0.tar.gz -> vdr-skinsoppalusikka-2.4.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=1a544799ae3e8da6de16c3194eb74845
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
index cab8a051f67f..95a71993ab11 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.2.6 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.2.6 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Sleeptimer
 EAPI=7
 HOMEPAGE=http://linvdr.org/download/vdr-sleeptimer
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=db7b6423b8d5ecfe68c06793f0cc0b2d
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1
index ae7cf4e39563..d55617d25cf6 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.2.6 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.2.6 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Sleeptimer
 EAPI=7
 HOMEPAGE=http://linvdr.org/download/vdr-sleeptimer
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=9938c5dfd162ddba87881c6ff9cdec9d
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
index 00b5e58eed8e..aae8c5186bb3 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Control the vol level of diff controls of your soundcard
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-sndctl
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-sndctl/vdr-sndctl-0.1.5.1.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=55c3ac7c4ee9265f5cbba150953967df
diff --git a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3 b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
index f80c2ff7455b..829fff8fd322 100644
--- a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.25 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.3.25 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Solitaire game
 EAPI=8
 HOMEPAGE=https://web.archive.org/web/20150928211126/http://www.djdagobert.com/vdr/solitaire/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.25 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://web.archive.org/web/20150928211126/http://www.djdagobert.com/vdr/solitaire/vdr-solitaire-0.0.3.tbz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=e93465fca4fda5d362980d5da31b682b
diff --git a/metadata/md5-cache/media-plugins/vdr-span-0.0.7 b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
index 344da3464e5d..3cc77eaf77ae 100644
--- a/metadata/md5-cache/media-plugins/vdr-span-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: Spectrum Analyzer (SpAn)
 EAPI=7
 HOMEPAGE=http://lcr.vdr-developer.org/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-span-0.0.7.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=c384c44b1a6671a0a6c8c920be18f49c
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
index b976b64d9f82..e01820240469 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Client/Server and http streaming plugin
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-streamdev
@@ -12,5 +12,5 @@ RDEPEND=>=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts app-eselect/eselect-vd
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5b0defa3bf660d2c8f6631e107d64943
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.3 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.3
index c3e895ced55e..67c0404e8414 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.3
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.3
@@ -1,6 +1,6 @@
 BDEPEND=acct-user/vdr >=media-video/vdr-2.3 virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=acct-user/vdr >=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=acct-user/vdr >=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Client/Server and http streaming plugin
 EAPI=8
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-streamdev
@@ -12,5 +12,5 @@ RDEPEND=acct-user/vdr >=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts app-esel
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-streamdev/archive/refs/tags/0.6.3.tar.gz -> vdr-streamdev-0.6.3.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=64c3439fd5b4e6e09c568c4c1fa7769c
diff --git a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1
index 9e406172a767..f84ad5048bba 100644
--- a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Show still image instead of live tv to safe cpu
 EAPI=7
 HOMEPAGE=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.0.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=e2d43ad9c54bd1e46c637a6b32ccc6dc
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
index abb8fa380b97..ee4b9825dede 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: export OSD via TCP to vdr-remoteosd
 EAPI=7
 HOMEPAGE=https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://vdr.schmirler.de/svdrposd/vdr-svdrposd-1.0.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=85183f2cb895c4a38391ff1e988b0b20
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
index cc6e59b2ecda..6bd933c4306d 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: offers SVDRP connections as a service to other plugins
 EAPI=7
 HOMEPAGE=https://vdr.schmirler.de/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-1.0.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=13ea1e7aed993ec8ef8f83e3b579fd3d
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1
index 6553801167fd..a9b1d80226aa 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: systeminfo
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/systeminfo/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm-sensors app-admin/hddtemp media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.4.tar.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=cf6ea566982206573f7eec0c1b25b5af
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
index 5b9dc2726183..8d7b4a85bb7e 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: displaying, recording and replaying teletext based subtitles
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-ttxtsubs
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=b7ede07a9c442f041b9434819c8da022
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3
index f3565e0ee5af..8da8422e505a 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: displaying, recording and replaying teletext based subtitles
 EAPI=8
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-ttxtsubs
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-ttxtsubs/archive/refs/tags/v0.3.0.tar.gz -> vdr-ttxtsubs-0.3.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=5b5363230780c411fd110a183d0e0504
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.1_pre1 b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.1_pre1
index beb10957fe1e..3f7ee1668e6b 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.1_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.1_pre1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Recover deleted recordings of VDR
 EAPI=7
 HOMEPAGE=http://phivdr.dyndns.org/vdr/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> vdr-undelete-2.3.1_pre1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=d6a7ed5d050a73ccbed000cddd6d61e9
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
index 7ab8933be7d1..d5e39e9dcdea 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: play video cds
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=cf75d7e2816c3db04a63b9800c7c3b55
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14 b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
index cf14b372cd97..fcd5b27fcab4 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+++ b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig ssl? ( dev-libs/openssl )
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 ssl? ( dev-libs/openssl ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 ssl? ( dev-libs/openssl ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: remote programming VDR using VDR-Manager running on Android devices
 EAPI=8
 HOMEPAGE=https://projects.vdr-developer.org/projects/vdr-manager/wiki
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1971/vdr-vdrmanager-0.14.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=4e9d07594386f531aadc805eba882394
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
index d31759983304..c64ef532580c 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.1 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: server part for MediaMVP device
 EAPI=7
 HOMEPAGE=https://www.loggytronic.com/vomp.php
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://www.loggytronic.com/dl/vdr-vompserver-0.5.1.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=54ad74959d5881c1ccf834d2659f9260
diff --git a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1 b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
index 8a26cc60d6b5..8729d3d2868f 100644
--- a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR plugin: show weather for specified place
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -11,5 +11,5 @@ LICENSE=GPL-2 stardock-images
 RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-weatherng/vdr-weatherng-0.0.8-pre3.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=dfcaec1b0b2e3bd9ff5a9d4e8872417c
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
index 138dcafbb2c2..79fb1fa11a7e 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards
 EAPI=7
 HOMEPAGE=https://github.com/CvH/vdr-plugin-wirbelscan
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.7.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=1e0bd1779b5f2329abb34d0890dd281b
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
index 40c6b2d96056..fc0c7635eff6 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards
 EAPI=7
 HOMEPAGE=https://github.com/CvH/vdr-plugin-wirbelscan
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/CvH/vdr-plugin-wirbelscan/archive/e1377b95312a138a41f93d7b06b3adb4ed4e7324.tar.gz -> vdr-wirbelscan-2018.11.04.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=d115850927fa4b47d92b91d816ca1bc4
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
index eacda1692976..021bbc3ff837 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) virtual/pkgconfig sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) virtual/pkgconfig sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
@@ -12,5 +12,5 @@ RDEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-lib
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=83bb9be74d34a6ea1df0308f53858d71
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
index a2dc7c46527c..4804e2f0da20 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
@@ -12,5 +12,5 @@ RDEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-lib
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz http://vdr.websitec.de/download/vdr-xineliboutput/vdr-xineliboutput-2.2.0_clang.patch.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=a1fc2a0a918c9f4704fc32e94837a924
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r5 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r5
index ec0bd0a8c7e9..e5bc894e01a5 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r5
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) opengl? ( virtual/opengl ) vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) opengl? ( virtual/opengl ) vaapi? ( media-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
@@ -12,5 +12,5 @@ RDEPEND=vdr? ( media-video/vdr caps? ( sys-libs/libcap ) ) xine? ( ( >=media-lib
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz http://vdr.websitec.de/download/vdr-xineliboutput/vdr-xineliboutput-2.2.0_clang.patch.bz2
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=ab52101b123af85dd6725f0ee3bb64b2
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
index 5d0431e044bc..6ed052527d20 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( >=media-video/vdr-1.6.0 caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( media-libs/libjpeg-turbo:= ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) vdr? ( media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers )
+DEPEND=vdr? ( >=media-video/vdr-1.6.0 caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( media-libs/libjpeg-turbo:= ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) vdr? ( media-tv/gentoo-vdr-scripts sys-kernel/linux-headers )
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=vdr? ( >=media-video/vdr-1.6.0 caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( media-libs/libjpeg-turbo:= ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) vdr? ( media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr )
 SLOT=0
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=90e4b6b67179841717e5a863598bfa88
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
index d2ea4d58b50a..58b825102e80 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts sys-kernel/linux-headers
 DESCRIPTION=VDR Plugin: browse fast the EPG information without being to switch to a channel
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-zappilot
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	e6a286b9150326e37b05fd4698becf7d
+_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	vdr-plugin-2	f458bc50b20714e236ea825fd38ce817
 _md5_=07528e62e2c305b0d29db5529b536c3e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 050c5c65d5cd..9f6c4c643807 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/denonavr-cli-3 b/metadata/md5-cache/media-sound/denonavr-cli-3
index f8c6745510aa..0a91d32a491b 100644
--- a/metadata/md5-cache/media-sound/denonavr-cli-3
+++ b/metadata/md5-cache/media-sound/denonavr-cli-3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/denonavr[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/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/denonavr[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/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A simple CLI for Denon AV receivers
 EAPI=8
 HOMEPAGE=https://github.com/projg2/denonavr-cli/ https://pypi.org/project/denonavr-cli/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/denonavr[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=dev-python/denonavr[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 )
 SLOT=0
 SRC_URI=https://github.com/projg2/denonavr-cli/archive/v3.tar.gz -> denonavr-cli-3.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	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_=4fd26660b1c6f79af1c9b3665ccc5792
+_md5_=30df8dfeaefed97688985f85ca0ee45a
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index e044ed7266b6..4391b16cea5a 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/dvbstream-0.7_pre20080516-r1 b/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
index 9221b88f74bf..11cdd4bf795d 100644
--- a/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
+++ b/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/linuxtv-dvb-headers
+DEPEND=sys-kernel/linux-headers
 DESCRIPTION=RTP multicast stream server and other tools for DVB cards
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/dvbtools
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/dvbstream-snapshot-20080302.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=846f499e7e88bc4111cfdd72510ca691
+_md5_=568968c0c54375122e04c31688ea30fd
diff --git a/metadata/md5-cache/media-tv/dvbtune-0.5-r1 b/metadata/md5-cache/media-tv/dvbtune-0.5-r1
index bf33d68abfa8..a782af0e5be2 100644
--- a/metadata/md5-cache/media-tv/dvbtune-0.5-r1
+++ b/metadata/md5-cache/media-tv/dvbtune-0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=xml? ( dev-libs/libxml2 ) virtual/linuxtv-dvb-headers
+DEPEND=xml? ( dev-libs/libxml2 ) sys-kernel/linux-headers
 DESCRIPTION=simple tuning app for DVB cards
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/dvbtools
@@ -11,4 +11,4 @@ RDEPEND=xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvbtools/dvbtune-0.5.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9ea25010a3d3d792d83d7dbfab342443
+_md5_=35bf0915dfb147737f22433ba96b67ec
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r2 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r2
index 8f41d1578b1f..53d938930d26 100644
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r2
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) dev-lang/perl virtual/linuxtv-dvb-headers dev-libs/libusb-compat
+DEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) dev-lang/perl sys-kernel/linux-headers dev-libs/libusb-compat
 DESCRIPTION=Small utils for DVB to scan, zap, view signal strength
 EAPI=7
 HOMEPAGE=https://www.linuxtv.org/
@@ -11,4 +11,4 @@ RDEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sy
 SLOT=0
 SRC_URI=https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> linuxtv-dvb-apps-1.1.1.20140321.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=a2f40359b42dd91329c3a78f59c39549
+_md5_=42f2aa3daa41dfff37379c6666e3bc1c
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2 b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
index 57c34052cb5d..b6c55201509a 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup
-DEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( <media-video/ffmpeg-5:= ) 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 )
+DEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( <media-video/ffmpeg-5:= ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( sys-kernel/linux-headers )
 DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=8
 HOMEPAGE=https://tvheadend.org/
@@ -13,4 +13,4 @@ REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
 SLOT=0
 SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.8.tar.gz -> tvheadend-4.2.8.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f5696af6264b58a5fa2c16c45c875198
+_md5_=a2fa7c466e70716739d7aa27d8dc7c26
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index 5f54eb10e4d4..0dffdd58a990 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.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:=[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? ( sys-kernel/linux-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/
@@ -12,4 +12,4 @@ RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( m
 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_=0aa093e66f806520b8df50106f4c10d6
+_md5_=1cab634162f38a805ab3590f60b2fcd4
diff --git a/metadata/md5-cache/media-tv/w_scan-20170107 b/metadata/md5-cache/media-tv/w_scan-20170107
index e72bcd22d620..8f0466b6e55f 100644
--- a/metadata/md5-cache/media-tv/w_scan-20170107
+++ b/metadata/md5-cache/media-tv/w_scan-20170107
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=>=virtual/linuxtv-dvb-headers-5.8
+DEPEND=sys-kernel/linux-headers
 DESCRIPTION=Scan DVB-C/DVB-T/DVB-S channels
 EAPI=7
 HOMEPAGE=http://wirbel.htpc-forum.de/w_scan/index2.html
@@ -8,4 +8,4 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/w_scan/w_scan-20170107.tar.bz2
-_md5_=7e5596eb579bfb2aefa87a5fa2e48861
+_md5_=fc2126c77da5fa892975573cbbd6b72d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index e50d463a2e38..ae2c54f846c0 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/dvbsnoop-1.4.50-r2 b/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r2
index 23d2a55e314e..26a70c1e29f9 100644
--- a/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r2
+++ b/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=-
-DEPEND=virtual/linuxtv-dvb-headers
+DEPEND=sys-kernel/linux-headers
 DESCRIPTION=DVB/MPEG stream analyzer program
 EAPI=8
 HOMEPAGE=http://dvbsnoop.sourceforge.net/
@@ -7,4 +7,4 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dvbsnoop/dvbsnoop-1.4.50.tar.gz
-_md5_=e7e4fdd72ee5656615bb88a1fd38675b
+_md5_=dfcc3560deb03413597870cd60f6d2ef
diff --git a/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r3 b/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r3
index e20603a011fa..ff693960e1fa 100644
--- a/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r3
+++ b/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r3
@@ -1,6 +1,6 @@
 BDEPEND=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
-DEPEND=virtual/linuxtv-dvb-headers
+DEPEND=sys-kernel/linux-headers
 DESCRIPTION=DVB/MPEG stream analyzer program
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/dvbsnoop/
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dvbsnoop/dvbsnoop-1.4.50.tar.gz
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d1c7625ddb215efdffb2675c83e429d1
+_md5_=67f431ec030230f079983d45a3855bc8
diff --git a/metadata/md5-cache/media-video/mplayer-1.5_p20230215 b/metadata/md5-cache/media-video/mplayer-1.5_p20230215
index ac860b91fdce..ee50f42632b6 100644
--- a/metadata/md5-cache/media-video/mplayer-1.5_p20230215
+++ b/metadata/md5-cache/media-video/mplayer-1.5_p20230215
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig amd64? ( dev-lang/yasm ) doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxslt ) x86? ( dev-lang/yasm )
 DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
+DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
 DESCRIPTION=Media Player for Linux
 EAPI=8
 HOMEPAGE=http://www.mplayerhq.hu/
@@ -14,4 +14,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/media-video/mplayer/mplayer-1.5_p20230215.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=345efd9e989155ed312ac8bac8c8969e
+_md5_=69e748d3b52f803c2a0f74c21ec3a838
diff --git a/metadata/md5-cache/media-video/mplayer-1.5_p20230618 b/metadata/md5-cache/media-video/mplayer-1.5_p20230618
index 2cbd52208bc0..63f3413387d1 100644
--- a/metadata/md5-cache/media-video/mplayer-1.5_p20230618
+++ b/metadata/md5-cache/media-video/mplayer-1.5_p20230618
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig amd64? ( dev-lang/yasm ) doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxslt ) x86? ( dev-lang/yasm )
 DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
+DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
 DESCRIPTION=Media Player for Linux
 EAPI=8
 HOMEPAGE=http://www.mplayerhq.hu/
@@ -14,4 +14,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/media-video/mplayer/mplayer-1.5_p20230618.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9482c6051c0addb5f38f7fa32faedd81
+_md5_=a942bbb99afb6a9f52c32c8c5764009f
diff --git a/metadata/md5-cache/media-video/mplayer-1.5_p20231206 b/metadata/md5-cache/media-video/mplayer-1.5_p20231206
index 0cef28b56a60..3f1278592c7e 100644
--- a/metadata/md5-cache/media-video/mplayer-1.5_p20231206
+++ b/metadata/md5-cache/media-video/mplayer-1.5_p20231206
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig amd64? ( dev-lang/nasm ) doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxslt ) x86? ( dev-lang/nasm )
 DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
+DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
 DESCRIPTION=Media Player for Linux
 EAPI=8
 HOMEPAGE=http://www.mplayerhq.hu/
@@ -14,4 +14,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/media-video/mplayer/mplayer-1.5_p20231206.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f3ca01c68489e9025bafdf2aee25757d
+_md5_=9d7527834930e5689ac26998a6aae56d
diff --git a/metadata/md5-cache/media-video/mplayer-9999 b/metadata/md5-cache/media-video/mplayer-9999
index 8be3fb2e200e..2973db47852b 100644
--- a/metadata/md5-cache/media-video/mplayer-9999
+++ b/metadata/md5-cache/media-video/mplayer-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig amd64? ( dev-lang/nasm ) doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxslt ) x86? ( dev-lang/nasm ) dev-vcs/subversion[http(+)] net-misc/rsync >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
+DEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) dga? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto )
 DESCRIPTION=Media Player for Linux
 EAPI=8
 HOMEPAGE=http://www.mplayerhq.hu/
@@ -14,4 +14,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	subversion	44c6a1cae0381c100a526e3b348622cd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f3ca01c68489e9025bafdf2aee25757d
+_md5_=9d7527834930e5689ac26998a6aae56d
diff --git a/metadata/md5-cache/media-video/mpv-0.37.0 b/metadata/md5-cache/media-video/mpv-0.37.0
index f065705f3989..9beefa7e6bca 100644
--- a/metadata/md5-cache/media-video/mpv-0.37.0
+++ b/metadata/md5-cache/media-video/mpv-0.37.0
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) virtual/pkgconfig cli? ( dev-python/docutils ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( || ( media-libs/raspberrypi-userland-bin media-libs/raspberrypi-userland ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols )
+DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( || ( media-libs/raspberrypi-userland-bin media-libs/raspberrypi-userland ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=Media player for the command line
 EAPI=8
 HOMEPAGE=https://mpv.io/
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.37.0.tar.gz -> mpv-0.37.0.tar.gz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	3cbe71221342fc0089ce6e0b4725e476	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=20d7a6dbd5cf7f797df02ebc8f4de18f
+_md5_=87e509a0448492c2ca94d09414e75216
diff --git a/metadata/md5-cache/media-video/mpv-0.37.0-r1 b/metadata/md5-cache/media-video/mpv-0.37.0-r1
index 10c24877d88a..4e75b32078ef 100644
--- a/metadata/md5-cache/media-video/mpv-0.37.0-r1
+++ b/metadata/md5-cache/media-video/mpv-0.37.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) virtual/pkgconfig cli? ( dev-python/docutils ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols )
+DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=Media player for the command line
 EAPI=8
 HOMEPAGE=https://mpv.io/
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.37.0.tar.gz -> mpv-0.37.0.tar.gz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	3cbe71221342fc0089ce6e0b4725e476	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a8035620fefac30ea9378ad945732bec
+_md5_=43e6e1a962f3dd456bc36fa7d80cc74b
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 4889aecf7ec1..a238456899e5 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) virtual/pkgconfig cli? ( dev-python/docutils ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst setup test unpack
-DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( virtual/linuxtv-dvb-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols )
+DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=Media player for the command line
 EAPI=8
 HOMEPAGE=https://mpv.io/
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	3cbe71221342fc0089ce6e0b4725e476	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a0117087f7d4b7db8a3814d398ca7454
+_md5_=c357494ba8d80fc3addb754ee4e26e13
diff --git a/metadata/md5-cache/media-video/vdr-2.2.0-r7 b/metadata/md5-cache/media-video/vdr-2.2.0-r7
index 7b3e0172a063..1ae344cf0275 100644
--- a/metadata/md5-cache/media-video/vdr-2.2.0-r7
+++ b/metadata/md5-cache/media-video/vdr-2.2.0-r7
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=media-libs/libjpeg-turbo sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 >=virtual/linuxtv-dvb-headers-5.3
+DEPEND=media-libs/libjpeg-turbo sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 sys-kernel/linux-headers
 DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/
@@ -12,4 +12,4 @@ RDEPEND=media-libs/libjpeg-turbo sys-libs/libcap >=media-libs/fontconfig-2.4.2 >
 SLOT=0
 SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.2.0.tar.bz2 mirror://gentoo/extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=93c0efc882223d15075046dee62aa93c
+_md5_=eacfc2f4574e5d23ee3b12b39c7faedc
diff --git a/metadata/md5-cache/media-video/vdr-2.6.4 b/metadata/md5-cache/media-video/vdr-2.6.4
index d294451d9f2a..647177362ffd 100644
--- a/metadata/md5-cache/media-video/vdr-2.6.4
+++ b/metadata/md5-cache/media-video/vdr-2.6.4
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo:= sys-libs/libcap >=virtual/linuxtv-dvb-headers-5.3
+DEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo:= sys-libs/libcap sys-kernel/linux-headers
 DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
 EAPI=8
 HOMEPAGE=http://www.tvdr.de/
@@ -13,4 +13,4 @@ REQUIRED_USE=permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.6.4;sf=tbz2 -> vdr-2.6.4.tbz2 menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff ) ttxtsubs? ( https://md11.it.cx/download/vdr/vdr-2.6.4_ttxtsubs_v2.patch )
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f784777e4d149358dd29657de4a7bfbb
+_md5_=2ac962ef1825f3b3e126a0b4af59938d
diff --git a/metadata/md5-cache/media-video/vdr-2.6.6 b/metadata/md5-cache/media-video/vdr-2.6.6
index 1cfb38dfea7b..878391fb2d31 100644
--- a/metadata/md5-cache/media-video/vdr-2.6.6
+++ b/metadata/md5-cache/media-video/vdr-2.6.6
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo:= sys-libs/libcap >=virtual/linuxtv-dvb-headers-5.3
+DEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo:= sys-libs/libcap sys-kernel/linux-headers
 DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
 EAPI=8
 HOMEPAGE=http://www.tvdr.de/
@@ -13,4 +13,4 @@ REQUIRED_USE=permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.6.6;sf=tbz2 -> vdr-2.6.6.tbz2 menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff ) ttxtsubs? ( https://md11.it.cx/download/vdr/vdr-2.6.6_ttxtsubs_v2.patch )
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=90c077b879622a7e9c11b158ac6dde8d
+_md5_=4242ca78e26e4f9976af8691d9224643
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index d38df51ca83e..f713eb8f5f1a 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libdom-0.4.2 b/metadata/md5-cache/net-libs/libdom-0.4.2
index 7bb16ae1a40a..f78c538b895d 100644
--- a/metadata/md5-cache/net-libs/libdom-0.4.2
+++ b/metadata/md5-cache/net-libs/libdom-0.4.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.netsurf-browser.org/projects/libdom/
 INHERIT=netsurf
 IUSE=expat test xml
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libparserutils dev-libs/libwapcaplet net-libs/libhubbub xml? ( expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) )
 REQUIRED_USE=test? ( xml )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libdom-0.4.2-src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	netsurf	3a16932a52467058f19b48ced2e15c4a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=33f99105d78257c51ea28e60689fc8ee
+_md5_=4d3c002e64b6a0b8364cae9708f61d53
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.7 b/metadata/md5-cache/net-libs/libhubbub-0.3.7
deleted file mode 100644
index f53ace8e0083..000000000000
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/netsurf-buildsystem virtual/pkgconfig doc? ( app-text/doxygen ) test? ( dev-lang/perl )
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/libparserutils:= test? ( dev-libs/json-c )
-DESCRIPTION=HTML5 compliant parsing library, written in C
-EAPI=7
-HOMEPAGE=https://www.netsurf-browser.org/projects/hubbub/
-INHERIT=netsurf flag-o-matic
-IUSE=doc test
-KEYWORDS=amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-libs/libparserutils:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.7
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libhubbub-0.3.7-src.tar.gz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	netsurf	3a16932a52467058f19b48ced2e15c4a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=161c52438e6f4f1ab5ca1a5447d5e8fa
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 01101fc46840..3f2849509bef 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.2-r2 b/metadata/md5-cache/sys-fs/mdadm-4.2-r2
index 10e93bb1e4e9..9a92b0f0c7aa 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.2-r2
+++ b/metadata/md5-cache/sys-fs/mdadm-4.2-r2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.2~rc2-7.debian.tar.xz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=d610186ef8600b84c3981cf5163127e9
+_md5_=6c2d381c6fba25ff7557acb927e78a03
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.2-r3 b/metadata/md5-cache/sys-fs/mdadm-4.2-r3
index bb884008cfed..8664c9428743 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.2-r3
+++ b/metadata/md5-cache/sys-fs/mdadm-4.2-r3
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.2~rc2-7.debian.tar.xz
 _eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=bf56849591a2f99e547eddb6a3504661
+_md5_=abd157c6346c39cace2a6ba79f078ec9
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index b1675a56a975..f6a022ad62c6 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8 b/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8
deleted file mode 100644
index 90aad1f91ac8..000000000000
--- a/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual Package installing the Header files for DVB
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-RDEPEND=>=sys-kernel/linux-headers-3.7
-SLOT=0
-_md5_=b21d4c43d1c18e40d8c566a97f436e5c
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 8cb511873dec..1a9ce13299d8 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/igt-gpu-tools-1.27.1-r1 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.27.1-r1
deleted file mode 100644
index aaeefd40045c..000000000000
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.27.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c:=[curl] sci-libs/gsl:= media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind:= ) valgrind? ( dev-debug/valgrind ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) man? ( dev-python/docutils ) overlay? ( >=dev-util/peg-0.1.18 x11-base/xorg-proto ) video_cards_intel? ( app-alternatives/yacc app-alternatives/lex )
-DESCRIPTION=Intel GPU userland tools
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/drm/igt-gpu-tools
-INHERIT=meson python-any-r1
-IUSE=chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c:=[curl] sci-libs/gsl:= media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind:= ) valgrind? ( dev-debug/valgrind )
-REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) doc? ( tests ) runner? ( tests )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.27.1.tar.xz https://dev.gentoo.org/~sam/distfiles/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1-patches.tar.xz
-_eclasses_=flag-o-matic	24c947ff5f858625cf0b33c15eed4425	meson	3cbe71221342fc0089ce6e0b4725e476	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=af6988a1f1d008b1a2db5bf7c3a3c59d
diff --git a/metadata/md5-cache/x11-apps/xbiff-1.0.4 b/metadata/md5-cache/x11-apps/xbiff-1.0.4
deleted file mode 100644
index 96a08c76b2a7..000000000000
--- a/metadata/md5-cache/x11-apps/xbiff-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext x11-base/xorg-proto
-DESCRIPTION=mailbox flag for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xbiff
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xbiff-1.0.4.tar.bz2
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	2093d675f9b0882f91143352a79d06d7
-_md5_=bd68c12cf9146ef19e806e1e64c3662f
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 82db0e25925b..03cb886e95d2 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.5 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.5
deleted file mode 100644
index 8265a4ee1116..000000000000
--- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/lex app-alternatives/yacc 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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
-DESCRIPTION=X.Org Xaw3d library
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXaw3d
-INHERIT=xorg-3
-IUSE=xpm
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXaw3d-1.6.5.tar.xz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	2093d675f9b0882f91143352a79d06d7
-_md5_=e4c36bc226abf870a9072ad22d77f889
diff --git a/metadata/md5-cache/x11-libs/pixman-0.42.2 b/metadata/md5-cache/x11-libs/pixman-0.42.2
deleted file mode 100644
index 8e4e4492fde9..000000000000
--- a/metadata/md5-cache/x11-libs/pixman-0.42.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DESCRIPTION=Low-level pixel manipulation routines
-EAPI=7
-HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-INHERIT=flag-o-matic meson-multilib multiprocessing toolchain-funcs
-IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.42.2.tar.xz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	meson	3cbe71221342fc0089ce6e0b4725e476	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_=209a157a54163f730f66df5311737ab9
diff --git a/metadata/md5-cache/x11-libs/pixman-0.43.0 b/metadata/md5-cache/x11-libs/pixman-0.43.0
deleted file mode 100644
index 3a835f3445ca..000000000000
--- a/metadata/md5-cache/x11-libs/pixman-0.43.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DESCRIPTION=Low-level pixel manipulation routines
-EAPI=7
-HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-INHERIT=flag-o-matic meson-multilib multiprocessing toolchain-funcs
-IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.43.0.tar.xz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	meson	3cbe71221342fc0089ce6e0b4725e476	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_=0c089bf3a8248290dd8b78083e917875
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index d8181d76027f..77b6862d4073 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.9 b/metadata/md5-cache/x11-misc/imake-1.0.9
deleted file mode 100644
index a9ca71c7516f..000000000000
--- a/metadata/md5-cache/x11-misc/imake-1.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=C preprocessor interface to the make utility
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
-INHERIT=toolchain-funcs xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=x11-misc/xorg-cf-files
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.9.tar.xz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	24c947ff5f858625cf0b33c15eed4425	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	2093d675f9b0882f91143352a79d06d7
-_md5_=42836b2702b067a455a7d9b59ad1b78f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7fb72087a9c9..7e9aa4eb4b5f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 16949 BLAKE2B 9b8ecbdd697a427f20ca2d97da0f281c600291e550c7453a0600204bf307290b966bf9643b72625e530520ec5705529f09655572fff3b93464413cf55480f853 SHA512 62737cf53c402be7ced50622f2efb50ef6c78491ae97a38ebdb7facf1577db9042e75dc1446c32fe92d0fba7bca893daa58a19919ce30f7a8f77487668addd1a
-TIMESTAMP 2024-03-03T11:10:07Z
+TIMESTAMP 2024-03-03T17:10:15Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXkWo9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXkrvdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB5EQ/+JtKboR5iqjXStuZ7t6a3umsU7GDxTFZ9G6tuHhnM/F+AQLtPKgP6FS5K
-0I+HtqK6uy9cQRlmjDLVducF/JrTGwcQ29iMrrqgCK9Tt0gTMadiKIhLQbfYNMCu
-z/pICaNWbC/JtzBJt9Pze0TffP4ciYohANStOE0HlxGiPt1S+G6lAQeNEJ/KEvwG
-W84vjSaL0Y65p5xjc0imhJoRXCXLIFUpTaiMBIsSCeo9XqnmHYbN9K1U/b8rsIfr
-TzuMAvp4iNzgxbXRj12AfjMgg6AsjEO9S3SUSnQ/dEbocIs1VG1KvpxwZbh6jaFo
-Wdy458hcWXoo9sKZ1t472p4lw9JaLQ3BHEwdnv5q5sn1mhMCHRIoLdCQj64qUmYG
-MvdYyX/6BZp29A0o93SdJ+EUT31sif1KeA92LNzW1riZ1AsLkOeQoLo3Hf+PWaYd
-PizoLvb9B3n9DjugfozstpaL8VlD0HZq8xSla0cddwDur07bAyuzdJtdLoFNHo19
-vTFJkBqppi9F0Sw4acXazbqZzuQjQ8QiZsFkTAz/NDPkcMtMMlm18T7678T5W0Jx
-hyiPD/FnFl07LrJIEOii10tr15oxuS5p7JsHUacUlqkSxifGdPrEFrsx5WtO+0H0
-nVTBgF3Q4QO92SAXEaJNoL+H7xKPFAQz3Nm17C2svR+AuXU7dhc=
-=wK4b
+klB1zBAAhDuTXv/s+amsgE3TxwthDNFI5sBThKqQmO1mHHMVTE8YTFCltR8t6Fmq
+7FB+maeZlMwEeFvzzYc/51jTTJ2D9+xkXj08S6WEeW8iUZJuvZWJMskFd+P43WTL
+LWMOJkdrYE4OrGlrooIgtQZDtDkrW0K3nYHgfOdlFNKB4B9MHUbCgC0wSFBC3W5V
+kKn3yVcdYGWCAtlIc+hJ7QaGXWeI4gudGwYFbSveh/FcYVBszctS3+haPhWlaGDW
+uQHS4IoXSTm9Ym3W5yQx2fxgrhncInzgKmBuXBa9JOiw6ho34pMXvw0n9X6iw4oO
+uAuC38y1QYWp9osDOIbjyDHTbFUGoRkF3wCq0Hjf6dSWO+/WIBqkBCxnNPyRcVl3
+F1mpDZ1NECe4G/7gukskkDYpLZu9rtBrGefsZNBOj+ikYQFqARgRWS0ZChPGU+9W
+cScHuVdCDQWUFgj3aTuTw8zbygJKrNXx7M2k2IjNAlPijmsLtL3FEFFdOlybl6dV
+OdzREnnKrVM6xYG9+A3Hqe/hWB0aB0PObxDxC07XfB+VcQnVcBXYIqSUbT+E7rIu
+ukT/pMtt0HDkqA0kHryvk/5Lggjt3L16byTHqvrgrXqu8K/j8Vxs5BNJLOJbcm/f
+sOC+2Aa6RMrf9YOdphFV0/NgpSGtgYARYJvF+PJb6n5e1r2HKhU=
+=2rZ8
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b1272ed41947..378167f96467 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Mar 2024 11:10:05 +0000
+Sun, 03 Mar 2024 17:10:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9f6fac8c6239..e3d4371a8f2b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Mar  3 11:10:04 AM UTC 2024
+Sun Mar  3 05:10:08 PM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 85b8c00b5616..9264e503d594 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Mar 2024 11:15:00 +0000
+Sun, 03 Mar 2024 17:15:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index def7a95a2b04..f14267eb65a1 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-682fe0a96b260891c613d60251f10489c4628fa9 1709462015 2024-03-03T10:33:35+00:00
+953ab22a090f656e9d545e53bcbcd18afac6db04 1709485124 2024-03-03T16:58:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5fa38aaa3322..f34ce9008a8c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1709464201 Sun 03 Mar 2024 11:10:01 AM UTC
+1709485800 Sun 03 Mar 2024 05:10:00 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c2909617c431..378167f96467 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Mar 2024 11:10:04 +0000
+Sun, 03 Mar 2024 17:10:08 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 98eafb438758..6fd1f628ede9 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index b852804a52a5..0fb3b119c65f 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,5 +1,5 @@
 AUX libdom-0.4.2-musl.patch 905 BLAKE2B 1c3b8383c34729307b0cd1deb6fc94bee31e4570f731baa5c0ebbaec9b2b97b4c34a810e6c2ae1dc8526d526513dd7fd30c4dee24d765ffe30eefdcb5f77199a SHA512 403815420b292c4aca219b5dd5583f5ee1a63535afff07c160173b712d89c7851868e9f7bbf8cc4d66a4abad32fd6cf18f616318bcbe1995d3a62629a5cb9641
 DIST libdom-0.4.2-src.tar.gz 878706 BLAKE2B 2a320452b50c3da719ef76683e133582bb0f657ceb8552a252204bbab89d85076af596cd615770dd357aaa9dbec31fabf39b2946019d004352b2273585134914 SHA512 85ce95a545c48af2cc082896d8153f016f7452315c67390884181cde19c999c7122c913846d404e40957d07abedc22c5ef8342d69eee139309e7c221d0580bb6
-EBUILD libdom-0.4.2.ebuild 1174 BLAKE2B 61eef1044163610724de90f7bbcb22b6d495f853865b3f1576369aef3c5a011e3ec6f58c31f8c039e83c62ae27b7f70c10e07564902d7c1b631e42d411f5d50d SHA512 843ab81eb6d7ce458db5daeb78a5a5bca010f72037ad3366b759deeeeb9ae5320824a53f9da2f5099a00813affa4f190a2aac1beb85e53f217120ce856592f14
+EBUILD libdom-0.4.2.ebuild 1173 BLAKE2B c11eb1091d9b0e11deb24515f6e1f5d6c73f149b0b7020bea4946bf8d5bc5197d350d0b603e0928ed22a0471e5b84282638d1cd6611ee818d045887a1934ce43 SHA512 8239aa1d3f6add909a5e70f8b3f796de5a098ac67d38ded2257ebd1414e81c7a016a07a7355ebe73482abd34bee943d281b58cdf4cb38b7d5904536a8357cb10
 EBUILD libdom-9999.ebuild 1057 BLAKE2B e4a16dd3a69026580795eb3cc76b79a94efa9aed1c4232c43e6e05505f9a4927637f058c67eb62a9e56dabdf693e5b9bd67342079d48eead594c8229dad403be SHA512 2905ab7d38888f0593bf4b25ededd160d91f3fa674796326325e76dcfc228b6045804b6c1bf2bb52a5be0b10a3faac15185cea90c62bddfdf6d63d7b880f9e59
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/net-libs/libdom/libdom-0.4.2.ebuild b/net-libs/libdom/libdom-0.4.2.ebuild
index ac1c7fd3df91..8ebbecdf46ff 100644
--- a/net-libs/libdom/libdom-0.4.2.ebuild
+++ b/net-libs/libdom/libdom-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="expat test xml"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index c61ccd260b48..52ac2d1482b9 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,6 +1,3 @@
-AUX libhubbub-0.3.6-json-c.patch 1020 BLAKE2B ddeeec6a9dce9329b91fd09afd347663aaaf1bd3b5cae0ecbc96520d8e4f034e6f1a2b8d6caee19419f38ae8aca96f51baba64b072d8c8affdf8769b8cf9966a SHA512 33c8cae170757b5890d7168c8c2e7ceb013aedbb322eb8b57854264bd6e470472ad88a737ca360ef2eaa6d732f3f0ee9f6592def2b1803d83335ae47f02f5ad8
-DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
 DIST libhubbub-0.3.8-src.tar.gz 780549 BLAKE2B f3db98971246b08452df0383d960f528e4c0a0def4318bd074fbdb02a045691c6476a55b3b2a851a058785b358a839cb9a8e05abab091127f2affad04bd26936 SHA512 7f0e4a2494a73a1a84e6d41f18deb9aa8c2f16da7b39bdf9cb96110567b17f50b6c65e0d3a91d5393829ae1b8651d153fb678085747f59664cad4209b6a1a96b
-EBUILD libhubbub-0.3.7.ebuild 1222 BLAKE2B c4ee15755a81d4adc8fe44aafa0e0b2991944e8bc5cfb364b1a8e84070eaebb3ddb47f9c2d405ea508aaa17062b446e622c23183b3c41f3f54e30c4cd8a52d8a SHA512 b79fbf068788954854485d5f6734473ec21e04ec26e9c039a7a49ee6030fb59bc7e3ad6e6b727096a814ea8aa2fb5c4797d18266af1792215aaa572acb38ce06
 EBUILD libhubbub-0.3.8.ebuild 1167 BLAKE2B 5e6c0ff9e8c294f7cb5aff96f886e458232ac4ea2ae0a2768dc69df27fcfde788b2c578d0323c465263e0865142a7c184ee324ef830f97977a71b7eeedb18e01 SHA512 f70d6169727c8c65ab34f97f0f54f9b9a3a18a5acaeea525ccefba1775d3fccd141aa5d44ddd374661afcd01743f6b4c34c90a78e0c888bda676f7d381b13840
 MISC metadata.xml 495 BLAKE2B 46d4a88164e0e39d037239285a009538f05b31ce5bb819f3379c356404c9924763bbb9b1d705e58684cfcf82d378187e448ba206a5fde1a1d61b2004c99e605b SHA512 90387fa992cb76ab5afa0d4eb774515bab608b96006107d40c4550abf5d8505ba369c37618d48d3be1093d0b35480ec50b23ff010a7ce150d96c7c11a0452f05
diff --git a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
deleted file mode 100644
index 4373666c8ee4..000000000000
--- a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://git.netsurf-browser.org/libhubbub.git/commit/?id=c0c4d702b5560c0590d73af4ea055514cab38e4f
-https://bugs.gentoo.org/699746
-https://bugs.gentoo.org/694042
-diff -u -rb libhubbub-0.3.6/test.o/tokeniser2.c libhubbub-0.3.6/test/tokeniser2.c
---- libhubbub-0.3.6/test.o/tokeniser2.c	2019-06-26 22:39:57.000000000 +0200
-+++ libhubbub-0.3.6/test/tokeniser2.c	2019-11-06 13:09:02.321068038 +0200
-@@ -48,7 +48,7 @@
- 	}
- 
- 	json = json_object_from_file(argv[1]);
--	assert(!is_error(json));
-+	assert(json);
- 
- 	assert(strcmp((char *) ((json_object_get_object(json)->head)->k),
- 			"tests") == 0);
-diff -u -rb libhubbub-0.3.6/test.o/tokeniser3.c libhubbub-0.3.6/test/tokeniser3.c
---- libhubbub-0.3.6/test.o/tokeniser3.c	2019-06-26 22:39:57.000000000 +0200
-+++ libhubbub-0.3.6/test/tokeniser3.c	2019-11-06 13:13:03.162538564 +0200
-@@ -46,7 +46,7 @@
- 	}
- 
- 	json = json_object_from_file(argv[1]);
--	assert(!is_error(json));
-+	assert(json);
- 
- 	assert(strcmp((char *) ((json_object_get_object(json)->head)->k),
- 			"tests") == 0);
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
deleted file mode 100644
index 1244680bb622..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf flag-o-matic
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="doc test"
-
-BDEPEND="
-	dev-build/netsurf-buildsystem
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	test? ( dev-lang/perl )
-"
-RDEPEND="dev-libs/libparserutils:="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/json-c )"
-RESTRICT="!test? ( test )"
-
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
-
-src_prepare() {
-	default
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-}
-
-_emake() {
-	netsurf_define_makeconf
-	append-cflags -Wno-error
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-	use doc && _emake docs
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	use doc && HTML_DOCS=( docs/html/. )
-	einstalldocs
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8c90604a35ea..298e7c8c2a07 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc
index 258d9754e5bb..6c178b086158 100644
--- a/profiles/releases/23.0/profile.bashrc
+++ b/profiles/releases/23.0/profile.bashrc
@@ -1,4 +1,4 @@
-if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
+if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then
 	if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then
 		eerror ""
 		eerror "Your profile is of type merged-usr, but your directories"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0d94e773eb97..43284174693e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 1acec881da51..69871bb1e38b 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -9,6 +9,6 @@ AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
 DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a42310157b1acb969e7152af61556fbbe6f17bf6af4dfaf5543e49b1c982d2baeedf1c39b000032f4db7f5502 SHA512 57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d
 DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6
-EBUILD mdadm-4.2-r2.ebuild 2602 BLAKE2B 903dea02a5e4a49465b1be7fac0cbc9ecc5409b3300b4fb7a0427175c6642cc5bc90496a5d2d21955493821514803a3a8fe7d4caf424128b401a6ce054c5ecb0 SHA512 76cc8fa6251420d28e5895769ce5f940f5399c306831e0f7102766ec4ed57584de495d092b32c64eda49188b8629cc921efbf5e2c3d64f285c9eab4c9b6e8f58
-EBUILD mdadm-4.2-r3.ebuild 2703 BLAKE2B 89f471003ff8b27ac2a7616e9792b048be48698d37f41dec14627d908101bbbc1c1f65b22113ad8a99b74cade6ecb85c0ab76fb8a490c34dc90095f3436c723a SHA512 82e8d15b88846d543e6c7867315d76a0c36c75d8d71c09441589865f841e625231421c54f4e777692a8d68f59bf2b516fbf93cdb28bd8361d1ec20957a8c55c2
+EBUILD mdadm-4.2-r2.ebuild 2674 BLAKE2B f44db51fb6c836fbb71b3c8f892d5c9ed26b64b0a150a7c9c1b5b0073daa3353d9be0927fcbf90185af03963a105a37e2d08a302c2e83d12cba4dc5ee5603008 SHA512 1034d0120646bab24cea2d7d44c67871f19324a59af9396534a2bace2634e125b933e592f0a8898b2ebc4faf2101ad1cbd944878b85e4b6753fcc87f840f091a
+EBUILD mdadm-4.2-r3.ebuild 2775 BLAKE2B 1cf844454c5cf2974113bb7a58185c37132c18c143f3f7fe561666c9148e1874fa753a95a01aadf0a3504ea093aa63281b1cc9c4fd86522f4504e911bd9dbd53 SHA512 fde500eea5fb965196e76fb0c07ec74425ee531e0b36c4c69470c029c478d26c110d5689d6f2852a43ced4ad7245755d2ca2f4a395abf54a8767752f77cfd8fd
 MISC metadata.xml 339 BLAKE2B 68b5c6f497a2396786b76d8cb10a076933ebff54b319ccaba2d8c5af18fb62a56519c5a42b248d7a92624514f3de635be5ff1180ef0b0a7deb8d391324680560 SHA512 3aba8c92057ff5dc92e2a9455f986bea0fcfb84d4c7ecbca2782d983cbd6ca11c1ee4443a217cbaea87d2903659390b04b26adc156782a2672d249254925071b
diff --git a/sys-fs/mdadm/mdadm-4.2-r2.ebuild b/sys-fs/mdadm/mdadm-4.2-r2.ebuild
index 9dc8510225da..99bbc83b039d 100644
--- a/sys-fs/mdadm/mdadm-4.2-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-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=7
@@ -60,6 +60,9 @@ src_compile() {
 	# CPPFLAGS won't work for this
 	use udev || append-cflags -DNO_LIBUDEV
 
+	# bug 907082
+	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
 	mdadm_emake all
 }
 
diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
index 176f5e80c06c..35a62d211b39 100644
--- a/sys-fs/mdadm/mdadm-4.2-r3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-r3.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
@@ -61,6 +61,9 @@ src_compile() {
 	# CPPFLAGS won't work for this
 	use udev || append-cflags -DNO_LIBUDEV
 
+	# bug 907082
+	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
 	mdadm_emake all
 }
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index ebe9bf448328..946d5bdf9e74 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/linuxtv-dvb-headers/Manifest b/virtual/linuxtv-dvb-headers/Manifest
deleted file mode 100644
index ecf707f48150..000000000000
--- a/virtual/linuxtv-dvb-headers/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD linuxtv-dvb-headers-5.8.ebuild 352 BLAKE2B f178d0ff1eb1133eae81e737357ce6083675dcdd1d9bf4713c3e5a0ead9a2ddc413ce01884eef96d0f209f9d43cb06736b52d8d3f74dd0af1e83527edcc02719 SHA512 6ffe66e3524ba027a2f298a07da232d41cbb14c4aaeba9646665b881d340a783c6830a78a7d71454f016fcab3f4bbf51b05271868b7df775255a73db5a2a4614
-MISC metadata.xml 438 BLAKE2B e056f1bddbd7fa9a0e7a9ccf7aa7227dce22af6bfaa24ce9328708a935df072c95772a710060e60edf12fc8314465de2e6c586f5829a6f7cb46ad4b6b9c9f67d SHA512 d177f29a8d05947ffee7c3610296e5fc1c75b6a47403f6c0c5848c2b3125bfecde520d8a5824851a7f80b2c65249cc2eed8724ad80e02074b2c60640c5ca9b9c
diff --git a/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild b/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild
deleted file mode 100644
index a8bcb0283499..000000000000
--- a/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual Package installing the Header files for DVB"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=sys-kernel/linux-headers-3.7"
diff --git a/virtual/linuxtv-dvb-headers/metadata.xml b/virtual/linuxtv-dvb-headers/metadata.xml
deleted file mode 100644
index 241b5e6e7446..000000000000
--- a/virtual/linuxtv-dvb-headers/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		This package contains the header files for the DVB drivers
-		from linuxtv.org needed to compile any application
-		accessing the DVB-hardware to record/watch tv or
-		use internet over satellite connection.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index f33176aa894f..02158a8a22f2 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 003cf5e42d0b..847b3f08a423 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,7 +1,4 @@
-DIST igt-gpu-tools-1.27.1-patches.tar.xz 5608 BLAKE2B 01c3cd14a7e920930dea96de6136c3b0236204998d9ad39775f6f9d6e1eb248bfb67651cabc23d50ec88b052c4e35194da2fe0ac05fe7084b771892cd9e2f328 SHA512 ef00c789374bd3a2961d6d989f557026f68f94e929c74ffb1c078c6106c734960f40442cae5d3b7b2b5fef99f8ffdaccb2ef8bdb5d93fe430cc0038e5f32baa8
-DIST igt-gpu-tools-1.27.1.tar.xz 2321940 BLAKE2B b6c4fee31c97cd5005c1f2cd5c18c181582adfb27e92444a8e78d1c105acb78a424bd4e4af8d13333776c81531fbfd24dc4b7db0da9858f5b803f64962d6269d SHA512 20923505e9afe6e5064bf8f4056e027ff0321cd29d8982157a608369aea6fbef24c93756de96ef6296e09d539957fc6cdad4097cbab5af33f8828f762da0d8c0
 DIST igt-gpu-tools-1.28.tar.xz 2597284 BLAKE2B c15a5b0142f2bf54d0b002b5a17ca705b9cc33662b902edb18e0860c8a1d66c911a082f1c60b3b41f184bd72d7f568554a11d69f9b70978d176eef2cdd1f4e38 SHA512 b0bed7fce28a309f5e5b1f044952abf06ede806ef691b4ddbd52ee437bc9c3701822d65c761c69a8ae5b40695d121193f30aa772cdfaf9ab16c800d7fbcd0abc
-EBUILD igt-gpu-tools-1.27.1-r1.ebuild 2669 BLAKE2B b85478d41fc0357d7a06c58977963880a9604202ed208ae9e2988f5d33076afefc6ea86949fd9cb52fe96c531846b7dc440d9fd42e45ccb55f24c59e28c62928 SHA512 19b9c484eaa8fa93275e0efccf46c7874eb539f4597b85a5ac1eea756fff704da357ed7333d53f9c334c7a87ae7fe91fa5018b43a179cecdf03b071f63cc1af8
 EBUILD igt-gpu-tools-1.28.ebuild 2518 BLAKE2B 878640ee2be72f5c3b56e3371d0d49a503cefcfc3dc3877832187435ab5af026aff6210f590ed02396118e27629f3c4984dd5c48c4af0352fdbbd62463d8efdb SHA512 36758d89627cdef238a7852f090a783465cda77bc72a8873340b034eb5373422576ec7fb6d5aba38a0fca7aa8d433d41d57cd0ac17f00631994e6d7c6054e707
 EBUILD igt-gpu-tools-9999.ebuild 2518 BLAKE2B 878640ee2be72f5c3b56e3371d0d49a503cefcfc3dc3877832187435ab5af026aff6210f590ed02396118e27629f3c4984dd5c48c4af0352fdbbd62463d8efdb SHA512 36758d89627cdef238a7852f090a783465cda77bc72a8873340b034eb5373422576ec7fb6d5aba38a0fca7aa8d433d41d57cd0ac17f00631994e6d7c6054e707
 MISC metadata.xml 743 BLAKE2B 41f82413bcc0ca4cae3b142bca8871403fa73cba2f54328b283854336e637128b53c01f33655c65d65dbb132b56a3e1a6e0dd889cf840eb3f5f25fd9f8fb14cf SHA512 812de04b016d8154e0255abae0174ff89a89dcb2eb2430e198284a0dac2bd93dfea0e0268abbae5a97c5b7fb6a9cc2c70f398844de634b8b2bab118057e2bc2a
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1-r1.ebuild
deleted file mode 100644
index c6fee17ec7fd..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit ${GIT_ECLASS} meson python-any-r1
-
-DESCRIPTION="Intel GPU userland tools"
-
-HOMEPAGE="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
-	# Only needed for 1.27.1, fixed in git, just for procps-4 support
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
-fi
-LICENSE="MIT"
-SLOT="0"
-IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
-REQUIRED_USE="
-	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
-	overlay? (
-		video_cards_intel
-		|| ( X xv )
-	)
-	doc? ( tests )
-	runner? ( tests )
-"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/glib:2
-	sys-apps/kmod:=
-	sys-libs/zlib:=
-	sys-process/procps:=
-	virtual/libudev:=
-	>=x11-libs/cairo-1.12.0[X?]
-	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/pixman
-	chamelium? (
-		dev-libs/xmlrpc-c:=[curl]
-		sci-libs/gsl:=
-		media-libs/alsa-lib:=
-	)
-	overlay? (
-		>=x11-libs/libXrandr-1.3
-		xv? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXv
-		)
-	)
-	runner? ( dev-libs/json-c:= )
-	unwind? ( sys-libs/libunwind:= )
-	valgrind? ( dev-debug/valgrind )
-	"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )
-	man? ( dev-python/docutils )
-	overlay? (
-		>=dev-util/peg-0.1.18
-		x11-base/xorg-proto
-	)
-	video_cards_intel? (
-		app-alternatives/yacc
-		app-alternatives/lex
-	)
-"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patches
-)
-
-src_prepare() {
-	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
-	default_src_prepare
-}
-
-src_configure() {
-	local gpus=""
-	use video_cards_amdgpu  && gpus+="amdgpu,"
-	use video_cards_intel   && gpus+="intel,"
-	use video_cards_nouveau && gpus+="nouveau,"
-
-	local overlay_backends=""
-	use overlay && use xv && overlay_backends+="xv,"
-	use overlay && use X && overlay_backends+="x,"
-
-	local emesonargs=(
-		$(meson_feature chamelium)
-		$(meson_feature doc docs)
-		$(meson_feature man)
-		$(meson_feature overlay)
-		$(meson_feature runner)
-		$(meson_feature tests)
-		$(meson_feature valgrind)
-		$(meson_feature unwind libunwind)
-		-Doverlay_backends=${overlay_backends%?}
-		-Dlibdrm_drivers=${gpus%?}
-	)
-	meson_src_configure
-}
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
index d9c846b15e75..10f94cd02e4f 100644
--- a/x11-apps/xbiff/Manifest
+++ b/x11-apps/xbiff/Manifest
@@ -1,5 +1,3 @@
-DIST xbiff-1.0.4.tar.bz2 133455 BLAKE2B ce79afefbd394b32fd543b64e966276cddc551bfacdf25e80a3463e65eb538469e252d105aeddb60a16227c30a5abfa996af89718d77e075f85b70d71e45710f SHA512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac
 DIST xbiff-1.0.5.tar.xz 128432 BLAKE2B 8e6b438720d4c1fe669a4505350ca8e98d779288ca453610764924c755e5ce22a807abd784187f57be224c34ceeec493ce232f83c08ee2868811ce495a1597f7 SHA512 4dd8943daf670dffb6e108b192977f6ad313d6b0535da0c809699e05f0509aba45be81c72af341e1fef31f59d0a5f209d87441230b3fdcecb4a7a8fe7a9c0658
-EBUILD xbiff-1.0.4.ebuild 376 BLAKE2B 79cabf0242407c6f048f50530f53c9a7a1cc66cc611f45789d121ec0502c340ae6a306c303f416ff1460737375ce8dccbf495fa593c23402bc5816b32fc2ce9b SHA512 293a7afe3546dcd8506364ee76a2197ce3ec9f126b4515ef7f956b325474b4ac9372db97c14efb61b412190db707c563c7b948522b1cee7e8a98333d2d2c7b10
 EBUILD xbiff-1.0.5.ebuild 412 BLAKE2B 10aa7e06f5c74ecd8b6661b8e5be3bfe387073514740feba74e3850763f90582d318c9a83f519fd167b104cd3c7fdad6120b6e4c5906d505a3c3457153cb7492 SHA512 f70ac1c24f63a57827f437c70becac5df409499493465a54dba684e34dc30e6d8db459b955ef07585676896044c5d3650f76143db0947c8cb65307b102e57a02
 MISC metadata.xml 336 BLAKE2B 6214fdedf087c4537adcd59bc72de58fa628ff5ae2580b45912f7bffa3770485ee336df0052648d3f78f3ebbcd3c0032cdf1b90ce2bfc9202435c6fd42858c47 SHA512 32c19b29456eee46515477817bcf5c6a35d306b22f8c346fb1dc48f587d853aef3ac88f33b297994158dc5026b5b54914ae4db8d0f68bef8392f1a147b18bbe9
diff --git a/x11-apps/xbiff/xbiff-1.0.4.ebuild b/x11-apps/xbiff/xbiff-1.0.4.ebuild
deleted file mode 100644
index d6dd4cf64fd8..000000000000
--- a/x11-apps/xbiff/xbiff-1.0.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="mailbox flag for X"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libX11
-	x11-misc/xbitmaps
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index dfe006d444fc..de1571a125b6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 96e02c725136..a55332db8f6c 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -2,6 +2,5 @@ AUX libXaw3d-1.6.5-c99.patch 1677 BLAKE2B fbf1666fc9e06ed7f14feec41a479f144beffc
 DIST libXaw3d-1.6.5.tar.xz 483496 BLAKE2B 54dc1bb06b40685e3e2f00bc1aa8447a23ff61226c0b8d20cb0fe070bb7d914290cc4a5f2c70925da528bd9f02a283748178cb2b17111a56fbcc938a1eae25c9 SHA512 b2fbceffcbaff7c332f37769fd6b496ac820de8a80fbf9777416f1895b74a07e4efc3f2bd64db3f584983b24d2b10e9b60cf4aae3ec4a30c06510ae7c213a663
 DIST libXaw3d-1.6.6.tar.xz 482040 BLAKE2B d0c7be64283837a7b32f67a2671eebd6d608818819afc4055c360d46152a3348d895159e9a7b7321913b2fea5ec8c587043e921127043d4d37f929a4b71bd27d SHA512 f324ddb1117ae6f8d50137390b2e82b638b53a6b170cce8f7bd8108fd98ce956badc7dede6b49065419f1565f9f4304571880842e799f7f48fb36bebe3dc3603
 EBUILD libXaw3d-1.6.5-r1.ebuild 805 BLAKE2B 1e7631a4a668d272ab47dcffc2a773c75730e614206597cee98f9088434e3ab1f9411aa40670ce7c42361dacbdac09526d80548cf5910b4780f41171605175c2 SHA512 a614be58044ff75eb14b490207f35079ce0f2323cedfb5db1b45d5b63e2330e0f2f297eb85b45cb88e4bbb612930dfd1a7b492323e5aeb0de876dc642b9550c4
-EBUILD libXaw3d-1.6.5.ebuild 755 BLAKE2B 2eb6cc33d8713f8461d5da4cff0b567604cc720bc067d0260f8c07670ca0816944f13df7d526febf28508ee3f583495f4f7a2c63db0c4f66a39d9392b8b803f1 SHA512 e9cc2e44a22fe524d83277be1f9b125589afb8109d63cdd5d3c1d3666a9117b69243273ede385fc0775e197127a1adbca2cfe371cbc243f9477eb5b523004e77
 EBUILD libXaw3d-1.6.6.ebuild 762 BLAKE2B c7d88b6200484bb7d772fa8b0e4545832839a0bebd2717dabec49f4860363506c4040d8fa615cafcef3d2ff5308057cc2e8beed2479bcdf0d7fe1a3acd3c17af SHA512 7dce0b1bad62ba37ba2282d919630d664ec77fa88a5ac9cdbb71ab537752b7b83337b3b4c82f48543ee44ced11e8c91e3e5379718abaa0164d27f08eafce193a
 MISC metadata.xml 339 BLAKE2B 60635a05848869d4aba7783f45cb02a672045a8a9b1bed933f1587ecd0ab81aa32ecc63e8a6742b4eee50a14c3e32b17b6bf14b3797e5f11e0dd74a8b582b4bf SHA512 1ed17cca85445b70786acfd900c7a75eb765001e7218e576356ef76d3e9e6399df3a45413f4650e555d2404d0c9e5f0f20f814c1bc1d08e1e8138aedbacfe50d
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.5.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.5.ebuild
deleted file mode 100644
index e6a9a306cb1d..000000000000
--- a/x11-libs/libXaw3d/libXaw3d-1.6.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="X.Org Xaw3d library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="xpm"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	app-alternatives/lex
-	app-alternatives/yacc"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-internationalization
-		$(use_enable xpm multiplane-bitmaps)
-		--enable-gray-stipples
-		--enable-arrow-scrollbars
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 41ad19690a12..5c797abc9919 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,9 +1,5 @@
-DIST pixman-0.42.2.tar.xz 652984 BLAKE2B 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 SHA512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8
-DIST pixman-0.43.0.tar.xz 638236 BLAKE2B 1a807d4d5598a5fe6077d6bbc7786cba41a698a1f03801cc5367ade8707500ee215a0faf65afe85f9e040b0380f1074c2fdfd31c0805dc41a4e5e34e36416764 SHA512 a90399b8c6aec218abb2f419fb5d6894acf9f4c7acb4fd3893b0b7c805ba47c82ee7efb363be59bb1a15b6997b2dddb7dba062a165503b035e1124fff1b271c9
 DIST pixman-0.43.2.tar.xz 637976 BLAKE2B 82734efb7cede5b1aeff3a865bfa2a81ff3176be50edc10deb1b5541f160b2dfd21303c1eccba53c0df83f471f3489084479a423dc2f818019af97d4b41dad68 SHA512 1a1d21b86b3c6784c4c2606b7069723b4dbb747eac9fce95bca86516787840379ffd49abc42d11e7143e85c32c85496f33c2562c7a910ca6f963599affdc3224
 DIST pixman-0.43.4.tar.xz 636900 BLAKE2B c31e5700bfadcd72f522af50509a4a6cd7bbf90c918c75b108e50246f1c76e858125138902a222040ada192710ec788deb43eb65085416f3eff88e3ed970933e SHA512 b40fb05bd58dc78f4e4e9b19c86991ab0611b708657c9a7fb42bfe82d57820a0fde01a34b00a0848a41da6c3fb90c2213942a70f435a0e9467631695d3bc7e36
-EBUILD pixman-0.42.2.ebuild 2154 BLAKE2B a70bb012160d42a2161407b435c0f079fc6dae548042f2e3c6fde16a37dfccf0cfd2712c2fbfd03e8bd1c8de662efc36021f6fdb0e0846312257ea35e0213b01 SHA512 121d4e66a5a43a3c126cf486c15191827429c2f861aa44ab851c50f2ca5faf466668af36ff7500d54ff4089e01acc21a16baa405512c5bfd19962f742b20e123
-EBUILD pixman-0.43.0.ebuild 2165 BLAKE2B b4203fc7f0f7561d14f178809db7405c620d1582c8af2b2e0934a9de2a9e2bb0ff9c1261e1a27571e80d8fcf700634968b585c06732b466f60c7fa3cbab2b86b SHA512 f85c5ddd7a98c312c2045c77ebb0ed96b2915808a02faafe16313836da0e91acf2201a2c08dd66e96623c48ecd87a5f5c00856b8555d23510afd324aa45920cb
 EBUILD pixman-0.43.2.ebuild 2157 BLAKE2B e0616551b979988f6b8c527adf6167a0346dfbc70663ede0939119570c68de2c92ae5153b29be138b55b3a6310a63544f93a81654a3dc2225e267b5d9cf862aa SHA512 83267c5c3222f86288d9c7bd72720e49d63ab50e358cd0d5c339a3d8cc9f2a162a79ea9d9f1f11066c8d9c8d52b043f1e6a103fb4a1270069a161d6f7b48addf
 EBUILD pixman-0.43.4.ebuild 2165 BLAKE2B b4203fc7f0f7561d14f178809db7405c620d1582c8af2b2e0934a9de2a9e2bb0ff9c1261e1a27571e80d8fcf700634968b585c06732b466f60c7fa3cbab2b86b SHA512 f85c5ddd7a98c312c2045c77ebb0ed96b2915808a02faafe16313836da0e91acf2201a2c08dd66e96623c48ecd87a5f5c00856b8555d23510afd324aa45920cb
 EBUILD pixman-9999.ebuild 2165 BLAKE2B b4203fc7f0f7561d14f178809db7405c620d1582c8af2b2e0934a9de2a9e2bb0ff9c1261e1a27571e80d8fcf700634968b585c06732b466f60c7fa3cbab2b86b SHA512 f85c5ddd7a98c312c2045c77ebb0ed96b2915808a02faafe16313836da0e91acf2201a2c08dd66e96623c48ecd87a5f5c00856b8555d23510afd324aa45920cb
diff --git a/x11-libs/pixman/pixman-0.42.2.ebuild b/x11-libs/pixman/pixman-0.42.2.ebuild
deleted file mode 100644
index e80504458bf2..000000000000
--- a/x11-libs/pixman/pixman-0.42.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs
-
-DESCRIPTION="Low-level pixel manipulation routines"
-HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-multilib_src_configure() {
-	if ( use arm || use arm64 ) && tc-is-clang ; then
-		# See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
-		append-cflags $(test-flags-CC -fno-integrated-as)
-	fi
-
-	local emesonargs=(
-		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
-		$(meson_use     cpu_flags_arm_iwmmxt2 iwmmxt2)
-		$(meson_feature cpu_flags_x86_mmxext mmx)
-		$(meson_feature cpu_flags_x86_sse2 sse2)
-		$(meson_feature cpu_flags_x86_ssse3 ssse3)
-		$(meson_feature cpu_flags_ppc_altivec vmx)
-		$(meson_feature loongson2f loongson-mmi)
-		$(meson_feature test openmp) # only used in unit tests
-		$(meson_feature test tests)
-		-Ddefault_library=$(usex static-libs both shared)
-		-Dgtk=disabled
-		-Dlibpng=disabled
-	)
-
-	if [[ ${ABI} == arm64 ]]; then
-		emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
-	elif [[ ${ABI} == arm ]]; then
-		emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson_src_test -t 100
-}
diff --git a/x11-libs/pixman/pixman-0.43.0.ebuild b/x11-libs/pixman/pixman-0.43.0.ebuild
deleted file mode 100644
index 64f5bc702b84..000000000000
--- a/x11-libs/pixman/pixman-0.43.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs
-
-DESCRIPTION="Low-level pixel manipulation routines"
-HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-multilib_src_configure() {
-	if ( use arm || use arm64 ) && tc-is-clang ; then
-		# See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
-		append-cflags $(test-flags-CC -fno-integrated-as)
-	fi
-
-	local emesonargs=(
-		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
-		$(meson_use     cpu_flags_arm_iwmmxt2 iwmmxt2)
-		$(meson_feature cpu_flags_x86_mmxext mmx)
-		$(meson_feature cpu_flags_x86_sse2 sse2)
-		$(meson_feature cpu_flags_x86_ssse3 ssse3)
-		$(meson_feature cpu_flags_ppc_altivec vmx)
-		$(meson_feature loongson2f loongson-mmi)
-		$(meson_feature test openmp) # only used in unit tests
-		$(meson_feature test tests)
-		-Ddefault_library=$(usex static-libs both shared)
-		-Ddemos=disabled
-		-Dgtk=disabled
-		-Dlibpng=disabled
-	)
-
-	if [[ ${ABI} == arm64 ]]; then
-		emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
-	elif [[ ${ABI} == arm ]]; then
-		emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson_src_test -t 100
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 28f6d2d90dfb..dd89642a10d7 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 76ecfe13076d..af57f81ff062 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -3,7 +3,5 @@ AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 AUX imake-1.0.9-no-get-gcc.patch 1048 BLAKE2B 0ff949e2e12afcb59cefc81b60e9801d14bf9b98f19ebe62b6a5ad857ea3b1e1bd3244309953eb450b7f3e29ae9663c695ff790fbaa6a8d202dc062734c21381 SHA512 67f5e4789b739c4d53d331592e83b9455a1e01ff29f9b95db04a25225f70549ced920010dd09b6f9f6e1b70017e1864f7b344fdc4fcd8962f2a9a2853e0b0644
 DIST imake-1.0.10.tar.xz 155284 BLAKE2B 85ea5d14280b0e4e3d07f806b1ebc777f1c6f431af05e94571e1d7908028f1497c4b5edb6e808c858429e98f314fe6c3cee84e265a30fce02d7ebeaa2111ab8d SHA512 ea96db27a6da13ea2d64652936e508b5e3d5d712347a2eb248376dc1f262c18720d9934b8ae69b4c0fc65b135c847be42da084fe924e4825ce1d359f4ef7e60f
-DIST imake-1.0.9.tar.xz 153332 BLAKE2B d9de997016112833e50d1151448366c538b9796622630724552cc0476deed165621edc1a01318a83b577a85fcfc78b753e6fa9fbdf4c71413319abe542f1beca SHA512 e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
 EBUILD imake-1.0.10.ebuild 699 BLAKE2B d6ed6cd017265af9bfca64c54fcc20037b38cda85c5996c80a54b8fe32b05e8ca6243ad02065ca545e91a1c7a86c93bc00f0b4ed6234a4e2a9393e49a42b63f4 SHA512 01a8721c650272fc5490f6389784d8da2cb36384b106a2e993b46c88cf6c9f2ba87d27a4883523b208248429cfb8cd0135194adc2d8bc062d8e78e1a78a776eb
-EBUILD imake-1.0.9.ebuild 699 BLAKE2B 0078e32e939b91d0f73b63fddf4814536cd30b9ad7f2ae14a37349b2e4619371faaaa92d4afe9b1052b03fd9b9d0cfdd27d5afda6e8c8e6408460743158b44f0 SHA512 3c1233538453930b5280d43c3e16fce1444d63c9afc247bee304bfc57747ee0ecc4117729ba63d671e6a02679dff56b019d0975de5dbd9188babe754faf43982
 MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/imake-1.0.9.ebuild b/x11-misc/imake/imake-1.0.9.ebuild
deleted file mode 100644
index 0850e3453c4f..000000000000
--- a/x11-misc/imake/imake-1.0.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-XORG_TARBALL_SUFFIX="xz"
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="x11-misc/xorg-cf-files"
-DEPEND="x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.8-cpp-args.patch
-	"${FILESDIR}"/${PN}-1.0.9-no-get-gcc.patch
-	"${FILESDIR}"/${PN}-1.0.8-respect-LD.patch
-	"${FILESDIR}"/${PN}-1.0.8-xmkmf-pass-cc-ld.patch
-)
-
-src_configure() {
-	econf CPP="$(tc-getPROG CPP cpp)" #722046
-}
author	V3n3RiX <venerix@koprulu.sector>	2024-03-03 17:42:46 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-03-03 17:42:46 +0000
commit	9b39c5fa703e6f57558ea8a2ca68a5a0bfce1edd (patch)
tree	a1cff8bbd255e47010ff280f6e836bd7ac53b096
parent	194313a653d5ba077627c85051de73377b95672a (diff)