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 /metadata/md5-cache
parent: 194313a653d5ba077627c85051de73377b95672a (diff)
197 files changed, 387 insertions, 677 deletions
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
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 /metadata/md5-cache
parent	194313a653d5ba077627c85051de73377b95672a (diff)