commit: 14842b1835a433d78a6f845ac6af3c9ea028aa32 Author: Matthias Schwarzott <zzam <AT> gentoo <DOT> org> AuthorDate: Mon Feb 26 05:50:36 2024 +0000 Commit: Matthias Schwarzott <zzam <AT> gentoo <DOT> org> CommitDate: Sun Mar 3 16:35:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14842b18
*/*: Remove dependency on virtual/linuxtv-dvb-headers 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. Even that could be dropped as it is part of @system. But this might not be valid everywhere. Bug: https://bugs.gentoo.org/924398 Signed-off-by: Matthias Schwarzott <zzam <AT> 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 ++-- media-tv/linuxtv-dvb-apps/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 | 3 +-- 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.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.4.ebuild | 4 ++-- media-video/vdr/vdr-2.6.6.ebuild | 2 +- 19 files changed, 33 insertions(+), 35 deletions(-) diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index f53e2c23f4f8..8f56511032c8 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vdr-plugin-2.eclass @@ -83,7 +83,7 @@ S="${WORKDIR}/${VDRPLUGIN}-${PV}" # depend on headers for DVB-driver and vdr-scripts BDEPEND="virtual/pkgconfig" DEPEND="media-tv/gentoo-vdr-scripts - virtual/linuxtv-dvb-headers" + sys-kernel/linux-headers" RDEPEND="media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr" diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild index f8e76f402c4a..9dfe663f071a 100644 --- a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild +++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,10 +13,9 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND="dev-lang/perl" -DEPEND="virtual/linuxtv-dvb-headers" +DEPEND="sys-kernel/linux-headers" S="${WORKDIR}/${PN}" diff --git a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild index e4cb2c114c24..1d2b4cece0ae 100644 --- a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild +++ b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ IUSE="xml" RDEPEND="xml? ( dev-libs/libxml2 )" DEPEND="${RDEPEND} - virtual/linuxtv-dvb-headers" + sys-kernel/linux-headers" PATCHES=( "${FILESDIR}"/${PF}-gentoo.diff diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild index 2b5377d5ba58..8fe3e2af5236 100644 --- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild +++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-lang/perl - virtual/linuxtv-dvb-headers + sys-kernel/linux-headers dev-libs/libusb-compat " RDEPEND+=" diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild index 138048f41d63..11b918469163 100644 --- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild +++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -39,7 +39,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) " RDEPEND+=" diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 27ebacd3cd42..570fce9e982d 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -13,7 +13,6 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib" @@ -41,7 +40,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) ffmpeg? ( opus? ( media-libs/opus ) vpx? ( media-libs/libvpx ) diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild index e7f8514fbc17..e1b05fc2f86e 100644 --- a/media-tv/w_scan/w_scan-20170107.ebuild +++ b/media-tv/w_scan/w_scan-20170107.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="doc examples" -DEPEND=">=virtual/linuxtv-dvb-headers-5.8" +DEPEND="sys-kernel/linux-headers" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild index 51ab1051f484..cb7dbe43fd2d 100644 --- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild +++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -DEPEND="virtual/linuxtv-dvb-headers" +DEPEND="sys-kernel/linux-headers" PATCHES=( "${FILESDIR}"/${P}-crc32.patch diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild index 3ba1ff4b8ca8..0d5d026fa7f2 100644 --- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild +++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r3.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -DEPEND="virtual/linuxtv-dvb-headers" +DEPEND="sys-kernel/linux-headers" PATCHES=( "${FILESDIR}"/${P}-crc32.patch diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild index 02a665bdb3cb..24111b326b98 100644 --- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -145,7 +145,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} dga? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild index 9a7535cdde6b..7d993f709bce 100644 --- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -148,7 +148,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} dga? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) diff --git a/media-video/mplayer/mplayer-1.5_p20231206.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild index 59ad25c596aa..61a74ddb2ad9 100644 --- a/media-video/mplayer/mplayer-1.5_p20231206.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20231206.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -148,7 +148,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} dga? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 59ad25c596aa..61a74ddb2ad9 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -148,7 +148,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} dga? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild b/media-video/mpv/mpv-0.37.0-r1.ebuild index df733bafe674..9ac7b7e545b7 100644 --- a/media-video/mpv/mpv-0.37.0-r1.ebuild +++ b/media-video/mpv/mpv-0.37.0-r1.ebuild @@ -116,7 +116,7 @@ RDEPEND=" DEPEND=" ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols ) " diff --git a/media-video/mpv/mpv-0.37.0.ebuild b/media-video/mpv/mpv-0.37.0.ebuild index 4120f51db273..f7dd7257fca2 100644 --- a/media-video/mpv/mpv-0.37.0.ebuild +++ b/media-video/mpv/mpv-0.37.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -123,7 +123,7 @@ RDEPEND=" DEPEND=" ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols ) " diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index c10b20b3c11a..a79aeac37bd3 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -113,7 +113,7 @@ RDEPEND=" DEPEND=" ${COMMON_DEPEND} X? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) + dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) wayland? ( dev-libs/wayland-protocols ) " diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild index bba06dbbb477..1f82375d5508 100644 --- a/media-video/vdr/vdr-2.2.0-r7.ebuild +++ b/media-video/vdr/vdr-2.2.0-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,7 @@ COMMON_DEPEND=" >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2" DEPEND="${COMMON_DEPEND} - >=virtual/linuxtv-dvb-headers-5.3" + sys-kernel/linux-headers" RDEPEND="${COMMON_DEPEND} dev-lang/perl >=media-tv/gentoo-vdr-scripts-2.7 diff --git a/media-video/vdr/vdr-2.6.4.ebuild b/media-video/vdr/vdr-2.6.4.ebuild index f28d9906f94e..2381f57f8276 100644 --- a/media-video/vdr/vdr-2.6.4.ebuild +++ b/media-video/vdr/vdr-2.6.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ COMMON_DEPEND=" media-libs/libjpeg-turbo:= sys-libs/libcap" DEPEND="${COMMON_DEPEND} - >=virtual/linuxtv-dvb-headers-5.3" + sys-kernel/linux-headers" RDEPEND="${COMMON_DEPEND} dev-lang/perl media-tv/gentoo-vdr-scripts diff --git a/media-video/vdr/vdr-2.6.6.ebuild b/media-video/vdr/vdr-2.6.6.ebuild index 5a5ed1d5cd51..60383295f581 100644 --- a/media-video/vdr/vdr-2.6.6.ebuild +++ b/media-video/vdr/vdr-2.6.6.ebuild @@ -24,7 +24,7 @@ COMMON_DEPEND=" media-libs/libjpeg-turbo:= sys-libs/libcap" DEPEND="${COMMON_DEPEND} - >=virtual/linuxtv-dvb-headers-5.3" + sys-kernel/linux-headers" RDEPEND="${COMMON_DEPEND} dev-lang/perl media-tv/gentoo-vdr-scripts
