Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/
Date: Sun, 02 Sep 2018 11:43:42
Message-Id: 1535888591.c28ee41c8e7f8c0a4cf37680ce79dfda6b0ef453.chewi@gentoo
1 commit: c28ee41c8e7f8c0a4cf37680ce79dfda6b0ef453
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 2 11:41:32 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 2 11:43:11 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28ee41c
7
8 media-tv/tvheadend: Drop capmt, constcw, cwc USE flags from 9999
9
10 These are all served by libdvbcsa with no further dependencies so we
11 might as well put them all behind a common dvbcsa flag. Otherwise we
12 would have had to add yet another flag called cccam.
13
14 Package-Manager: Portage-2.3.48, Repoman-2.3.10
15
16 media-tv/tvheadend/tvheadend-9999.ebuild | 18 +++++++++---------
17 1 file changed, 9 insertions(+), 9 deletions(-)
18
19 diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
20 index 04ecda4fb1b..8ee4fdaf118 100644
21 --- a/media-tv/tvheadend/tvheadend-9999.ebuild
22 +++ b/media-tv/tvheadend/tvheadend-9999.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -13,7 +13,7 @@ LICENSE="GPL-3"
30 SLOT="0"
31 KEYWORDS=""
32
33 -IUSE="+capmt +constcw +cwc dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
34 +IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
35
36 RDEPEND="
37 virtual/libiconv
38 @@ -47,7 +47,6 @@ RDEPEND+="
39 xmltv? ( media-tv/xmltv )"
40
41 REQUIRED_USE="
42 - dvbcsa? ( || ( capmt constcw cwc ) )
43 ddci? ( dvb )
44 "
45
46 @@ -55,9 +54,9 @@ REQUIRED_USE="
47 # https://github.com/rpmfusion/tvheadend
48
49 PATCHES=(
50 - "${FILESDIR}/${PN}-4.0.9-use_system_queue.patch"
51 - "${FILESDIR}/${PN}-4.2.1-hdhomerun.patch"
52 - "${FILESDIR}/${PN}-4.2.2-dtv_scan_tables.patch"
53 + "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
54 + "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
55 + "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
56 )
57
58 DOCS=( README.md )
59 @@ -89,14 +88,15 @@ src_configure() {
60 --enable-libtheora \
61 --enable-libvorbis \
62 --nowerror \
63 - $(use_enable capmt) \
64 - $(use_enable constcw) \
65 - $(use_enable cwc) \
66 $(use_enable dbus dbus_1) \
67 $(use_enable debug trace) \
68 $(use_enable ddci) \
69 $(use_enable dvb linuxdvb) \
70 $(use_enable dvbcsa) \
71 + $(use_enable dvbcsa capmt) \
72 + $(use_enable dvbcsa cccam) \
73 + $(use_enable dvbcsa constcw) \
74 + $(use_enable dvbcsa cwc) \
75 $(use_enable ffmpeg libav) \
76 $(use_enable hdhomerun hdhomerun_client) \
77 $(use_enable imagecache) \