[gentoo-dev] [PATCH 1/2] */*: Replace dependency to virtual/linuxtv-dvb-headers by sys-kernel/linux-headers

[Matthias Schwarzott <zzam@gentoo.org>]

virtual/linuxtv-dvb-headers has been important in the past when
linux-headers was not yet up-to-date.
Now it just pulls in >=sys-kernel/linux-headers-3.7.
Even that could be dropped as it is part of @system.

Bug: https://bugs.gentoo.org/924398
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
---
 eclass/vdr-plugin-2.eclass                                   | 4 ++--
 media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild       | 5 ++---
 media-tv/dvbtune/dvbtune-0.5-r1.ebuild                       | 4 ++--
 .../linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild                | 4 ++--
 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild                 | 4 ++--
 media-tv/tvheadend/tvheadend-9999.ebuild                     | 2 +-
 media-tv/w_scan/w_scan-20170107.ebuild                       | 4 ++--
 media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild               | 4 ++--
 media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild               | 2 +-
 media-video/mplayer/mplayer-1.5_p20230215.ebuild             | 4 ++--
 media-video/mplayer/mplayer-1.5_p20230618.ebuild             | 4 ++--
 media-video/mplayer/mplayer-1.5_p20231206.ebuild             | 4 ++--
 media-video/mplayer/mplayer-9999.ebuild                      | 4 ++--
 media-video/mpv/mpv-0.36.0-r1.ebuild                         | 4 ++--
 media-video/mpv/mpv-0.37.0-r1.ebuild                         | 2 +-
 media-video/mpv/mpv-0.37.0.ebuild                            | 4 ++--
 media-video/mpv/mpv-9999.ebuild                              | 2 +-
 media-video/vdr/vdr-2.2.0-r7.ebuild                          | 4 ++--
 media-video/vdr/vdr-2.6.3.ebuild                             | 4 ++--
 media-video/vdr/vdr-2.6.4.ebuild                             | 4 ++--
 20 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index f53e2c23f4f8..cf07058f6177 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vdr-plugin-2.eclass
@@ -83,7 +83,7 @@ S="${WORKDIR}/${VDRPLUGIN}-${PV}"
 # depend on headers for DVB-driver and vdr-scripts
 BDEPEND="virtual/pkgconfig"
 DEPEND="media-tv/gentoo-vdr-scripts
-	virtual/linuxtv-dvb-headers"
+	>=sys-kernel/linux-headers-3.7"
 RDEPEND="media-tv/gentoo-vdr-scripts
 	app-eselect/eselect-vdr"
 
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
index f8e76f402c4a..cb605b78912f 100644
--- a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,9 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl"
-DEPEND="virtual/linuxtv-dvb-headers"
+DEPEND=">=sys-kernel/linux-headers-3.7"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
index e4cb2c114c24..f7917665451a 100644
--- a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
+++ b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ IUSE="xml"
 
 RDEPEND="xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
-	virtual/linuxtv-dvb-headers"
+	>=sys-kernel/linux-headers-3.7"
 
 PATCHES=(
 	"${FILESDIR}"/${PF}-gentoo.diff
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild
index 2b5377d5ba58..f46f64bd78e9 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	virtual/linuxtv-dvb-headers
+	>=sys-kernel/linux-headers-3.7
 	dev-libs/libusb-compat
 "
 RDEPEND+="
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index 138048f41d63..e1d4ec07444e 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,7 +39,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 "
 
 RDEPEND+="
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 27ebacd3cd42..ac2a8ace57ea 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	ffmpeg? (
 		opus? ( media-libs/opus )
 		vpx? ( media-libs/libvpx )
diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild
index e7f8514fbc17..97ccaabf6876 100644
--- a/media-tv/w_scan/w_scan-20170107.ebuild
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
-DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
+DEPEND=">=sys-kernel/linux-headers-3.7"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
index 51ab1051f484..2d0cd7ea0643 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-DEPEND="virtual/linuxtv-dvb-headers"
+DEPEND=">=sys-kernel/linux-headers-3.7"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-crc32.patch
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild
index 3ba1ff4b8ca8..5438de29ec24 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="virtual/linuxtv-dvb-headers"
+DEPEND=">=sys-kernel/linux-headers-3.7"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-crc32.patch
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index 02a665bdb3cb..a61f42fdd9e5 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -145,7 +145,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 9a7535cdde6b..2667207c1ebd 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -148,7 +148,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mplayer/mplayer-1.5_p20231206.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
index 59ad25c596aa..733145f0ff04 100644
--- a/media-video/mplayer/mplayer-1.5_p20231206.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -148,7 +148,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 59ad25c596aa..733145f0ff04 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -148,7 +148,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dga? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	X? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 	xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild b/media-video/mpv/mpv-0.36.0-r1.ebuild
index 7aa8c51ed9aa..9041325fe14b 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -124,7 +124,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	nvenc? ( media-libs/nv-codec-headers )
 	wayland? ( dev-libs/wayland-protocols )"
 BDEPEND="
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild b/media-video/mpv/mpv-0.37.0-r1.ebuild
index 731cc45c2106..9ce839af5283 100644
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.37.0-r1.ebuild
@@ -116,7 +116,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	nvenc? ( media-libs/nv-codec-headers )
 	wayland? ( dev-libs/wayland-protocols )
 "
diff --git a/media-video/mpv/mpv-0.37.0.ebuild b/media-video/mpv/mpv-0.37.0.ebuild
index 4120f51db273..305bb826cef5 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -123,7 +123,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	nvenc? ( media-libs/nv-codec-headers )
 	wayland? ( dev-libs/wayland-protocols )
 "
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 6c05026b003d..f903d09a6e55 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -113,7 +113,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
-	dvb? ( virtual/linuxtv-dvb-headers )
+	dvb? ( >=sys-kernel/linux-headers-3.7 )
 	nvenc? ( media-libs/nv-codec-headers )
 	wayland? ( dev-libs/wayland-protocols )
 "
diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild
index bba06dbbb477..ad2c64b87664 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2"
 DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
+	>=sys-kernel/linux-headers-3.7"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	>=media-tv/gentoo-vdr-scripts-2.7
diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
index 9dfbf7706e9a..50f2e905465c 100644
--- a/media-video/vdr/vdr-2.6.3.ebuild
+++ b/media-video/vdr/vdr-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	sys-libs/libcap"
 DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
+	>=sys-kernel/linux-headers-3.7"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	media-tv/gentoo-vdr-scripts
diff --git a/media-video/vdr/vdr-2.6.4.ebuild b/media-video/vdr/vdr-2.6.4.ebuild
index f28d9906f94e..6929745c86e2 100644
--- a/media-video/vdr/vdr-2.6.4.ebuild
+++ b/media-video/vdr/vdr-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	sys-libs/libcap"
 DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
+	>=sys-kernel/linux-headers-3.7"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	media-tv/gentoo-vdr-scripts
-- 
2.43.1