subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-tv\/tvheadend\/"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2024-03-24 Thread James Le Cuirot

commit: 78abc588b5811a3b597cc476a58f9881efc6adb9
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar 24 15:36:31 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Mar 24 15:36:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78abc588

media-tv/tvheadend: Bump to 20240322 snapshot for ffmpeg 5+, fix Python deps

Bug: https://bugs.gentoo.org/834399
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/Manifest|  1 +
 ...-.ebuild => tvheadend-4.3_p20240322.ebuild} | 25 +++---
 media-tv/tvheadend/tvheadend-.ebuild   | 21 +++---
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index a4b0579a1fa6..66b6b6e2df8e 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1 +1,2 @@
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B 
fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00
 SHA512 
e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
+DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B 
b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0
 SHA512 
068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
similarity index 89%
copy from media-tv/tvheadend/tvheadend-.ebuild
copy to media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
index 570fce9e982d..d151d6b97eea 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
@@ -3,19 +3,25 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+COMMIT="c63115464d8f6556fb4cac93ce8740afea1b00d5"
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs
+inherit linux-info python-single-r1 systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+SRC_URI="https://github.com/tvheadend/tvheadend/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
 
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   ddci? ( dvb )
+"
+
 BDEPEND="
${PYTHON_DEPS}
sys-devel/gettext
@@ -23,6 +29,7 @@ BDEPEND="
 "
 
 RDEPEND="
+   ${PYTHON_DEPS}
acct-user/tvheadend
virtual/libiconv
dbus? ( sys-apps/dbus )
@@ -50,13 +57,14 @@ DEPEND="
 "
 
 RDEPEND+="
+   $(python_gen_cond_dep '
+   dev-python/requests[${PYTHON_USEDEP}]
+   ')
dvb? ( media-tv/dtv-scan-tables )
xmltv? ( media-tv/xmltv )
 "
 
-REQUIRED_USE="
-   ddci? ( dvb )
-"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 # Some patches from:
 # https://github.com/rpmfusion/tvheadend
@@ -71,7 +79,7 @@ PATCHES=(
 DOCS=( README.md )
 
 pkg_setup() {
-   python-any-r1_pkg_setup
+   python-single-r1_pkg_setup
 
use inotify &&
CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
@@ -130,6 +138,7 @@ src_compile() {
 
 src_install() {
default
+   python_fix_shebang "${ED}"/usr/bin/
 
newinitd "${FILESDIR}"/tvheadend.initd tvheadend
newconfd "${FILESDIR}"/tvheadend.confd tvheadend

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 570fce9e982d..21d9095d7d84 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs
+inherit git-r3 linux-info python-single-r1 systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
@@ -13,9 +13,13 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 
 LICENSE="GPL-3"
 SLOT="0"
-
 IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
 
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   ddci? ( dvb )
+"
+
 BDEPEND="
${PYTHON_DEPS}
sys-devel/gettext
@@ -23,6 +27,7 @@ BDEPEND="
 "
 
 RDEPEND="
+   ${PYTHON_DEPS}
acct-user/tvheadend
virtual/libiconv
dbus? ( sys-apps/dbus )
@@ -50,14 +55,13 @@ DEPEND="
 "
 
 RDEPEND+="
+

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2024-01-16 Thread James Le Cuirot

commit: 78a226133fe05ba29e96a54405c1b84e0efb69be
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 16 21:37:32 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 16 21:37:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a22613

media-tv/tvheadend: Drop ffmpeg version constraint from 

Version 5+ works now.

Closes: https://bugs.gentoo.org/922186
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index e9692775e140..27ebacd3cd42 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs
 
@@ -28,7 +28,7 @@ RDEPEND="
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
-   ffmpeg? (

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2023-02-18 Thread James Le Cuirot

commit: f9fb6a166c619020e33c332deff5f04dc31de703
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 18 14:24:24 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 18 14:24:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9fb6a16

media-tv/tvheadend: Python 3.11

Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 2 +-
 media-tv/tvheadend/tvheadend-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index 38480771d8e1..138048f41d63 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index e3947829f01b..e01b8f79a4a1 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2023-02-18 Thread James Le Cuirot

commit: e26eaf1ecb3069d31dcf6de494872dd2ffd53ad2
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 18 14:25:00 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 18 14:25:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26eaf1e

media-tv/tvheadend: Restrict ffmpeg version in 

Latest git still doesn't support ffmpeg 5.

Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index e01b8f79a4a1..e9692775e140 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
-   ffmpeg? ( media-video/ffmpeg:0=[opus?,vpx?,x264?,x265?] )
+   ffmpeg? (

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2023-02-14 Thread Sam James

commit: d46a719da13dfcdae9a1689fe3b6d2f37242cff9
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 15 06:19:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 15 06:19:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46a719d

media-tv/tvheadend: depend on https://bugs.gentoo.org/834399
Signed-off-by: Sam James  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index 2c50315a5d31..38480771d8e1 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -22,14 +22,14 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig
 "
-
+# https://github.com/tvheadend/tvheadend/pull/1460
 RDEPEND="
acct-user/tvheadend
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
dvben50221? ( media-tv/linuxtv-dvb-apps )
-   ffmpeg? ( media-video/ffmpeg:0= )
+   ffmpeg? (

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2022-05-26 Thread James Le Cuirot

commit: 7ae4b4d1afe4a94b28f35f55b72874b5ec9020cf
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu May 26 22:08:09 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu May 26 22:08:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae4b4d1

media-tv/tvheadend: Add Python 3.10, EAPI 8

Closes: https://bugs.gentoo.org/846095
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 6 +++---
 media-tv/tvheadend/tvheadend-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index 28147deb7b63..096fa5c7d960 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index d76b7874b6e6..dd79d793e523 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2021-10-15 Thread Sam James

commit: 3eed336525892e36debe27abbe607da5f0811d9a
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 16 00:45:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 16 00:45:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eed3365

media-tv/tvheadend: Stabilize 4.2.8-r2 arm, #799659

Signed-off-by: Sam James  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index dc2993fb7b9..28147deb7b6 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf 
zlib"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2021-08-01 Thread Sam James

commit: 7ac2b6e6dc65d0de97a466254acdf30dce5bd5eb
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  2 02:24:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  2 02:24:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac2b6e6

media-tv/tvheadend: Stabilize 4.2.8-r2 arm64, #799659

Signed-off-by: Sam James  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index d38ebf0d7b8..dc2993fb7b9 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf 
zlib"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2021-07-30 Thread Sam James

commit: f4c39958f5ab0e8ab4a285711e9a0ca78346d476
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 30 06:12:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 30 06:12:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c39958

media-tv/tvheadend: Stabilize 4.2.8-r2 x86, #799659

Signed-off-by: Sam James  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index 6a3050a9e5a..d38ebf0d7b8 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf 
zlib"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2021-07-27 Thread Sam James

commit: 7161eb8047bcb6097a13e3eae77319dcaf5827e5
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 27 20:34:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 27 20:34:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7161eb80

media-tv/tvheadend: Stabilize 4.2.8-r2 amd64, #799659

Signed-off-by: Sam James  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index f78d37d3f76..6a3050a9e5a 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf 
zlib"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2021-06-18 Thread David Seifert

commit: 5298a74f9951ba07ddc148e9f4c54d90688e3315
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 18 21:07:20 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun 18 21:07:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5298a74f

media-tv/tvheadend: use tc-getPKG_CONFIG

Closes: https://github.com/gentoo/gentoo/pull/20644
Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: David Seifert  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 2 +-
 media-tv/tvheadend/tvheadend-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index f003420b860..f78d37d3f76 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -73,7 +73,7 @@ pkg_setup() {
 
 src_configure() {
CC="$(tc-getCC)" \
-   PKG_CONFIG="${CHOST}-pkg-config" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
econf \
--disable-bundle \
--disable-ccache \

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index fba166a03f6..d76b7874b6e 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -87,7 +87,7 @@ pkg_setup() {
 
 src_configure() {
CC="$(tc-getCC)" \
-   PKG_CONFIG="${CHOST}-pkg-config" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
econf \
--disable-bundle \
--disable-ccache \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2021-05-30 Thread James Le Cuirot

commit: de8d29d5038faa33c3bdb099df5192abc89f2172
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 30 14:39:44 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 30 14:39:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8d29d5

media-tv/tvheadend: Fix variable handling in systemd service file

Closes: https://bugs.gentoo.org/792456
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/files/tvheadend.service  | 2 +-
 .../tvheadend/{tvheadend-4.2.8-r1.ebuild => tvheadend-4.2.8-r2.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/files/tvheadend.service 
b/media-tv/tvheadend/files/tvheadend.service
index cd5c5e7f911..11d3fe7a814 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -9,7 +9,7 @@ Group=video
 RuntimeDirectory=tvheadend
 PIDFile=/run/tvheadend/tvheadend.pid
 EnvironmentFile=/etc/conf.d/tvheadend
-ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c 
${TVHEADEND_CONFIG} ${TVHEADEND_OPTIONS}
+ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c 
${TVHEADEND_CONFIG} $TVHEADEND_OPTIONS
 TimeoutStartSec=1m
 TimeoutStopSec=20s
 Restart=always

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
similarity index 100%
rename from media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
rename to media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2021-05-02 Thread Mikle Kolyada

commit: 941390af61b788243d18fa37ca078428dde61866
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 14:54:37 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 15:07:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941390af

media-tv/tvheadend: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 5 ++---
 media-tv/tvheadend/tvheadend-.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index c0805930fb4..f003420b860 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf 
zlib"
 
 BDEPEND="
${PYTHON_DEPS}
@@ -31,8 +31,7 @@ RDEPEND="
dvben50221? ( media-tv/linuxtv-dvb-apps )
ffmpeg? ( media-video/ffmpeg:0= )
hdhomerun? ( media-libs/libhdhomerun )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )
zlib? ( sys-libs/zlib )

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index eb1fefae461..fba166a03f6 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf 
zlib"
+IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
 
 BDEPEND="
${PYTHON_DEPS}
@@ -30,8 +30,7 @@ RDEPEND="
dvbcsa? ( media-libs/libdvbcsa )
ffmpeg? ( media-video/ffmpeg:0=[opus?,vpx?,x264?,x265?] )
hdhomerun? ( media-libs/libhdhomerun )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )
zlib? ( sys-libs/zlib )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2021-02-11 Thread James Le Cuirot

commit: cc7ba3931f2eb4cd30a0bfc283e41d180859422e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Feb 11 23:09:35 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Feb 11 23:09:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7ba393

media-tv/tvheadend: Use python-any-r1 eclass

Closes: https://bugs.gentoo.org/770112
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 21 +++--
 media-tv/tvheadend/tvheadend-.ebuild | 21 +++--
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 17189591cf0..c0805930fb4 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-info systemd toolchain-funcs
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
@@ -16,8 +18,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"
 
 BDEPEND="
+   ${PYTHON_DEPS}
sys-devel/gettext
-   virtual/pkgconfig"
+   virtual/pkgconfig
+"
 
 RDEPEND="
acct-user/tvheadend
@@ -31,15 +35,18 @@ RDEPEND="
libressl? ( dev-libs/libressl:= )
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )
-   zlib? ( sys-libs/zlib )"
+   zlib? ( sys-libs/zlib )
+"
 
 DEPEND="
${RDEPEND}
-   dvb? ( virtual/linuxtv-dvb-headers )"
+   dvb? ( virtual/linuxtv-dvb-headers )
+"
 
 RDEPEND+="
dvb? ( media-tv/dtv-scan-tables )
-   xmltv? ( media-tv/xmltv )"
+   xmltv? ( media-tv/xmltv )
+"
 
 REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
 
@@ -59,6 +66,8 @@ PATCHES=(
 DOCS=( README.md )
 
 pkg_setup() {
+   python-any-r1_pkg_setup
+
use inotify &&
CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
 }

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index ddd46284395..eb1fefae461 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 linux-info systemd toolchain-funcs
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
@@ -16,8 +18,10 @@ KEYWORDS=""
 IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf 
zlib"
 
 BDEPEND="
+   ${PYTHON_DEPS}
sys-devel/gettext
-   virtual/pkgconfig"
+   virtual/pkgconfig
+"
 
 RDEPEND="
acct-user/tvheadend
@@ -30,7 +34,8 @@ RDEPEND="
libressl? ( dev-libs/libressl:= )
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )
-   zlib? ( sys-libs/zlib )"
+   zlib? ( sys-libs/zlib )
+"
 
 # ffmpeg sub-dependencies needed for headers only. Check under
 # src/transcoding/codec/codecs/libs for include statements.
@@ -43,11 +48,13 @@ DEPEND="
vpx? ( media-libs/libvpx )
x264? ( media-libs/x264 )
x265? ( media-libs/x265 )
-   )"
+   )
+"
 
 RDEPEND+="
dvb? ( media-tv/dtv-scan-tables )
-   xmltv? ( media-tv/xmltv )"
+   xmltv? ( media-tv/xmltv )
+"
 
 REQUIRED_USE="
ddci? ( dvb )
@@ -66,6 +73,8 @@ PATCHES=(
 DOCS=( README.md )
 
 pkg_setup() {
+   python-any-r1_pkg_setup
+
use inotify &&
CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
 }

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2020-06-22 Thread Mart Raudsepp

commit: 67175b75122ac4b287e61c80d7484dda6da2c149
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Mon Jun 22 05:34:17 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jun 22 19:02:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67175b75

media-tv/tvheadend: arm64 keyworded (bug #722280)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 9c12a6de1a1..17189591cf0 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2020-06-03 Thread James Le Cuirot

commit: c2e18b814591f4ca98a3672ec93bd1f8926ab73d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jun  3 20:09:33 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jun  3 20:09:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e18b81

media-tv/tvheadend: Upstream merged a couple of patches to master

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 43d6c88ec8d..ddd46284395 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -61,8 +61,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.3-hdhomerun.patch
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
"${FILESDIR}"/${PN}-4.2.7-python3.patch
-   "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
-   "${FILESDIR}"/${PN}-4.2.8-fno-common.patch
 )
 
 DOCS=( README.md )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/

2020-05-24 Thread James Le Cuirot

commit: 774e5570787961d0c03ae16185095c3f5bc9b72e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 24 16:19:14 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 24 16:19:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774e5570

media-tv/tvheadend: Fix building with -fno-common

Closes: https://bugs.gentoo.org/707768
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/tvheadend-4.2.8-fno-common.patch | 55 ++
 media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild   |  1 +
 media-tv/tvheadend/tvheadend-.ebuild   |  1 +
 3 files changed, 57 insertions(+)

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
new file mode 100644
index 000..23f48652f9d
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
@@ -0,0 +1,55 @@
+From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Fri, 15 May 2020 17:45:30 +0100
+Subject: [PATCH] Fix building with -fno-common (default from GCC 10)
+
+---
+ src/input.h| 4 ++--
+ src/input/mpegts.c | 2 ++
+ src/input/mpegts.h | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/input.h b/src/input.h
+index a9c96df04..3dce355c6 100644
+--- a/src/input.h
 b/src/input.h
+@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
+ extern const idclass_t tvh_input_class;
+ extern const idclass_t tvh_input_instance_class;
+ 
+-tvh_input_list_ttvh_inputs;
+-tvh_hardware_list_t tvh_hardware;
++extern tvh_input_list_ttvh_inputs;
++extern tvh_hardware_list_t tvh_hardware;
+ 
+ #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, _inputs, ti_link)
+ #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, _hardware, th_link)
+diff --git a/src/input/mpegts.c b/src/input/mpegts.c
+index e02d491f1..fca4f3429 100644
+--- a/src/input/mpegts.c
 b/src/input/mpegts.c
+@@ -20,6 +20,8 @@
+ #include "mpegts/fastscan.h"
+ #include "memoryinfo.h"
+ 
++struct mpegts_listeners mpegts_listeners;
++
+ extern memoryinfo_t mpegts_input_queue_memoryinfo;
+ extern memoryinfo_t mpegts_input_table_memoryinfo;
+ 
+diff --git a/src/input/mpegts.h b/src/input/mpegts.h
+index 9dda3baca..9c4c57b73 100644
+--- a/src/input/mpegts.h
 b/src/input/mpegts.h
+@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener
+   void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
+ } mpegts_listener_t;
+ 
+-LIST_HEAD(,mpegts_listener) mpegts_listeners;
++extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners;
+ 
+ #define mpegts_add_listener(ml)\
+   LIST_INSERT_HEAD(_listeners, ml, ml_link)
+-- 
+2.26.2
+

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 7886d755c7d..9c12a6de1a1 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.7-python3.patch
"${FILESDIR}"/${PN}-4.2.8-gcc9.patch
"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
+   "${FILESDIR}"/${PN}-4.2.8-fno-common.patch
 )
 
 DOCS=( README.md )

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index e8e5c2814ed..43d6c88ec8d 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
"${FILESDIR}"/${PN}-4.2.7-python3.patch
"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
+   "${FILESDIR}"/${PN}-4.2.8-fno-common.patch
 )
 
 DOCS=( README.md )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2020-05-10 Thread James Le Cuirot

commit: 4d3156597c2c25b6063a9b3328f95e9f1250021d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 10 22:16:36 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 10 22:16:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d315659

media-tv/tvheadend: Fix build with USE=-dvb

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/tvheadend-4.2.8-no-dvb-fix.patch | 28 ++
 media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild   |  1 +
 media-tv/tvheadend/tvheadend-.ebuild   |  1 +
 3 files changed, 30 insertions(+)

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
new file mode 100644
index 000..b398064292e
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
@@ -0,0 +1,28 @@
+From 27ec1008df054072fac6b58ffb8d820423522442 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sun, 10 May 2020 23:02:14 +0100
+Subject: [PATCH] dvbpsi: Fix build when DVB is not enabled at all
+
+---
+ src/input/mpegts/dvb_psi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
+index 15203d98c..96b1689fb 100644
+--- a/src/input/mpegts/dvb_psi.c
 b/src/input/mpegts/dvb_psi.c
+@@ -2331,9 +2331,11 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t 
*mm,
+ psi_tables_atsc_t(mm);
+ break;
+   case DVB_SYS_DVBC_ANNEX_B:
++#if ENABLE_MPEGTS_DVB
+ if (idnode_is_instance(>mm_id, _mux_dvbc_class))
+   psi_tables_dvb(mm);
+ else
++#endif
+   psi_tables_atsc_c(mm);
+ break;
+   case DVB_SYS_NONE:
+-- 
+2.26.2
+

diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 2c44c55ed17..7886d755c7d 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
"${FILESDIR}"/${PN}-4.2.7-python3.patch
"${FILESDIR}"/${PN}-4.2.8-gcc9.patch
+   "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
 )
 
 DOCS=( README.md )

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index ddd46284395..e8e5c2814ed 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.3-hdhomerun.patch
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
"${FILESDIR}"/${PN}-4.2.7-python3.patch
+   "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
 )
 
 DOCS=( README.md )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/

2020-05-10 Thread James Le Cuirot

commit: 2b4d221c8a5c4aee7a1330beba243636767d6dfc
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 10 22:17:32 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 10 22:17:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b4d221c

media-tv/tvheadend: Fix bad quoting in systemd service file

Closes: https://bugs.gentoo.org/720720
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/files/tvheadend.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/files/tvheadend.service 
b/media-tv/tvheadend/files/tvheadend.service
index 6d1e27445b7..cd5c5e7f911 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -9,7 +9,7 @@ Group=video
 RuntimeDirectory=tvheadend
 PIDFile=/run/tvheadend/tvheadend.pid
 EnvironmentFile=/etc/conf.d/tvheadend
-ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c 
"${TVHEADEND_CONFIG}" ${TVHEADEND_OPTIONS}
+ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c 
${TVHEADEND_CONFIG} ${TVHEADEND_OPTIONS}
 TimeoutStartSec=1m
 TimeoutStopSec=20s
 Restart=always

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/

2020-05-10 Thread James Le Cuirot

commit: aa3bbeb881b99043488b3354b0d36d1ff0107aac
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 10 22:15:26 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 10 22:15:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3bbeb8

media-tv/tvheadend: Apply GLEP 81 and move default config directory

This moves the HOME directory for the tvheadend user, and hence the
config directory, from /etc/tvheadend to /var/lib/tvheadend. The
daemon does not check the HOME directory so no change is effectively
made until TVHEADEND_CONFIG in /etc/conf.d/tvheadend is updated.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/files/tvheadend.confd   |  2 +-
 ...dend-4.2.8.ebuild => tvheadend-4.2.8-r1.ebuild} | 22 ++
 media-tv/tvheadend/tvheadend-.ebuild   | 22 ++
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/media-tv/tvheadend/files/tvheadend.confd 
b/media-tv/tvheadend/files/tvheadend.confd
index 8be4a5dadce..bac19ece3ac 100644
--- a/media-tv/tvheadend/files/tvheadend.confd
+++ b/media-tv/tvheadend/files/tvheadend.confd
@@ -8,7 +8,7 @@ TVHEADEND_USER="tvheadend"
 TVHEADEND_GROUP="video"
 
 # Path to Tvheadend config.
-TVHEADEND_CONFIG="/etc/tvheadend"
+TVHEADEND_CONFIG="/var/lib/tvheadend"
 
 # Other options you want to pass to Tvheadend.
 TVHEADEND_OPTIONS=""

diff --git a/media-tv/tvheadend/tvheadend-4.2.8.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
similarity index 83%
rename from media-tv/tvheadend/tvheadend-4.2.8.ebuild
rename to media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index a20bac30f22..2c44c55ed17 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-info systemd toolchain-funcs user
+inherit linux-info systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
@@ -20,6 +20,7 @@ BDEPEND="
virtual/pkgconfig"
 
 RDEPEND="
+   acct-user/tvheadend
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
@@ -58,8 +59,6 @@ DOCS=( README.md )
 pkg_setup() {
use inotify &&
CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
-   enewuser tvheadend -1 -1 /etc/tvheadend video
 }
 
 src_configure() {
@@ -106,10 +105,6 @@ src_install() {
 
use systemd &&
systemd_dounit "${FILESDIR}"/tvheadend.service
-
-   dodir /etc/tvheadend
-   fperms 0700 /etc/tvheadend
-   fowners tvheadend:video /etc/tvheadend
 }
 
 pkg_postinst() {
@@ -119,4 +114,15 @@ pkg_postinst() {
elog "Make sure that you change the default username"
elog "and password via the Configuration / Access control"
elog "tab in the web interface."
+
+   . "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
+
+   if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
+   echo
+   ewarn "The HOME directory for the tvheadend user has changed 
from"
+   ewarn "${EPREFIX}/etc/tvheadend to 
${EPREFIX}/var/lib/tvheadend. The daemon will continue"
+   ewarn "to use the old location until you update 
TVHEADEND_CONFIG in"
+   ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move 
your existing files"
+   ewarn "before you do so."
+   fi
 }

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 692d4ec897c..ddd46284395 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 linux-info systemd toolchain-funcs user
+inherit git-r3 linux-info systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
@@ -20,6 +20,7 @@ BDEPEND="
virtual/pkgconfig"
 
 RDEPEND="
+   acct-user/tvheadend
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
@@ -67,8 +68,6 @@ DOCS=( README.md )
 pkg_setup() {
use inotify &&
CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
-   enewuser tvheadend -1 -1 /etc/tvheadend video
 }
 
 # We unconditionally enable codecs that do not require additional
@@ -130,10 +129,6 @@ src_install() {
 
use systemd &&
systemd_dounit "${FILESDIR}"/tvheadend.service
-
-   dodir /etc/tvheadend
-   fperms 0700 /etc/tvheadend
-   fowners

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/

2019-11-02 Thread James Le Cuirot

commit: 1d77ca72c6de413343b61c2a4658b20f2fda8fc4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Nov  2 11:52:01 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Nov  2 12:04:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d77ca72

media-tv/tvheadend: Add Python 3 and GCC 9 patches from RPM Fusion

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 .../tvheadend/files/tvheadend-4.2.7-python3.patch  | 91 ++
 .../tvheadend/files/tvheadend-4.2.8-gcc9.patch | 36 +
 media-tv/tvheadend/tvheadend-4.2.8.ebuild  |  2 +
 media-tv/tvheadend/tvheadend-.ebuild   |  1 +
 4 files changed, 130 insertions(+)

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch
new file mode 100644
index 000..752b17ba08f
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch
@@ -0,0 +1,91 @@
+diff -up ./lib/py/tvh/tsreader.py.orig ./lib/py/tvh/tsreader.py
+--- ./lib/py/tvh/tsreader.py.orig  2018-10-08 14:37:05.0 +0200
 ./lib/py/tvh/tsreader.py   2018-10-15 11:53:53.766850060 +0200
+@@ -31,7 +31,7 @@ def encode_utf8(c):
+ 
+ def conv_8859(tnum, data):
+ r = u''
+-print 'TBL %d' % tnum
++print('TBL %d' % tnum)
+ tbl = conv_8859_table[tnum]
+ for c in data:
+ if ord(c) <= 0x7f:
+@@ -46,8 +46,8 @@ def conv_8859(tnum, data):
+ 
+ 
+ def dvb_convert_string(data, conv):
+-print 'convert(%d)' % conv
+-print repr(data)
++print('convert(%d)' % conv)
++print(repr(data))
+ if not conv:
+ return data
+ return conv_8859(conv, data)
+@@ -83,8 +83,8 @@ class TsSection(object):
+ # print self.tid, self.len, len(data)
+ 
+ def process(self):
+-print 'TS Section:'
+-print self.tid, self.len, len(self.data)
++print('TS Section:')
++print(self.tid, self.len, len(self.data))
+ # print str2hex(self.data, 16)
+ # print self.data
+ 
+@@ -112,7 +112,7 @@ class TsSection(object):
+ if l + 1 > dlen:
+ return (None, -1)
+ c = ord(data[1])
+-print c
++print(c)
+ conv = None
+ if c == 0:
+ return (None, -1)
+@@ -162,14 +162,14 @@ class TsSection(object):
+ eid = (hdr[0] << 8) + hdr[1]
+ start = dvb_convert_date(hdr[2:])
+ 
+-print 'process event (%d):' % dllen
+-print '  EID   :   %d' % eid
+-print '  START : %d' % start
++print('process event (%d):' % dllen)
++print('  EID   :   %d' % eid)
++print('  START : %d' % start)
+ 
+ while dllen > 2:
+ dtag = ord(data[0])
+ dlen = ord(data[1])
+-print 'dtag = 0x%02x, dlen = %d' % (dtag, dlen)
++print('dtag = 0x%02x, dlen = %d' % (dtag, dlen))
+ 
+ dllen = dllen - 2
+ data = data[2:]
+@@ -178,8 +178,8 @@ class TsSection(object):
+ 
+ if dtag == 0x4d:
+ (title, summary) = self.short_event(data, dlen)
+-print '  TITLE : %s' % title
+-print '  SUMMARY   : %s' % summary
++print('  TITLE : %s' % title)
++print('  SUMMARY   : %s' % summary)
+ 
+ dllen = dllen - dlen
+ data = data[dlen:]
+@@ -216,7 +216,7 @@ if __name__ == '__main__':
+ # Complete?
+ if cur:
+ if len(cur.data) >= cur.len:
+-print 'Process Section:'
++print('Process Section:')
+ # try:
+ cur.process()
+ # except: pass
+@@ -224,7 +224,7 @@ if __name__ == '__main__':
+ print
+ sys.exit(0)
+ else:
+-print 'waiting for %d bytes' % (cur.len - len(cur.data))
++print('waiting for %d bytes' % (cur.len - len(cur.data)))
+ 
+ # Next
+ if nxt:

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
new file mode 100644
index 000..9ccadb44c42
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
@@ -0,0 +1,36 @@
+diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
+--- ./src/plumbing/transcoding.c.orig  2019-01-12 09:58:47.0 +0100
 ./src/plumbing/transcoding.c   2019-03-12 15:49:24.922314869 +0100
+@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s
+   char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)];
+   int codec_match=0;
+ 
+-  strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
++  memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
+ 
+   tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n",
+ tp->tp_src_vcodec,
+@@ -2130,10

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2019-11-02 Thread James Le Cuirot

commit: 7cafcb0803138fba20bc535c732115d6658a9b93
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Nov  2 12:02:57 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Nov  2 12:04:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cafcb08

media-tv/tvheadend: Take upstream patch for libhdhomerun-20190621

Closes: https://bugs.gentoo.org/698592
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/tvheadend-4.2.8-hdhomerun.patch  | 29 ++
 media-tv/tvheadend/tvheadend-4.2.8.ebuild  |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
new file mode 100644
index 000..c30af8aba2a
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
@@ -0,0 +1,29 @@
+From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001
+From: Michael Marley 
+Date: Wed, 26 Jun 2019 19:35:50 -0400
+Subject: [PATCH] Fix compilation with libhdhomerun 20190621
+
+They renamed the symbol that was used to determine whether the
+"hdhomerun_discover_find_devices_custom" needed to be aliased,
+causing an FTBFS.  Instead, recognize both the old and new symbols.
+---
+ src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c 
b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+index 58dec51ab..18068faf5 100644
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
 b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+@@ -32,7 +32,8 @@
+ 
+ #include "config.h"
+ 
+-#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN
++#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \
++   || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED)
+ #define hdhomerun_discover_find_devices_custom \
+hdhomerun_discover_find_devices_custom_v2
+ #endif
+-- 
+2.23.0
+

diff --git a/media-tv/tvheadend/tvheadend-4.2.8.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
index 4a49b1460b5..a20bac30f22 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
@@ -47,7 +47,7 @@ REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
-   "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
+   "${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
"${FILESDIR}"/${PN}-4.2.7-python3.patch
"${FILESDIR}"/${PN}-4.2.8-gcc9.patch

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/

2019-01-20 Thread James Le Cuirot

commit: 3674bd90bada921616390a2d91be199e3365f363
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan 20 21:15:57 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan 20 21:15:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3674bd90

media-tv/tvheadend: Update hdhomerun patch for 

Closes: https://bugs.gentoo.org/675916
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 .../tvheadend/files/tvheadend-4.3-hdhomerun.patch  | 36 ++
 media-tv/tvheadend/tvheadend-.ebuild   |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/files/tvheadend-4.3-hdhomerun.patch 
b/media-tv/tvheadend/files/tvheadend-4.3-hdhomerun.patch
new file mode 100644
index 000..1689c2e4051
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.3-hdhomerun.patch
@@ -0,0 +1,36 @@
+diff -Naur a/configure b/configure
+--- a/configure2019-01-20 21:12:12.634450200 +
 b/configure2019-01-20 21:12:52.502298542 +
+@@ -411,7 +411,7 @@
+ else
+ 
+   if enabled_or_auto hdhomerun_client; then
+-if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
++if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
+   enable  hdhomerun_client
+   LDFLAGS="$LDFLAGS -lhdhomerun"
+ fi
+diff -Naur a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c 
b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c   2019-01-20 
21:12:12.707451725 +
 b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c   2019-01-20 
21:12:35.990947079 +
+@@ -17,7 +17,7 @@
+  *  along with this program.  If not, see .
+  */
+ 
+-#include "libhdhomerun/hdhomerun.h"
++#include 
+ 
+ #include "tvheadend.h"
+ #include "input.h"
+diff -Naur a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c 
b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c  2019-01-20 
21:12:12.707451725 +
 b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c  2019-01-20 
21:12:35.991947101 +
+@@ -17,7 +17,7 @@
+  *  along with this program.  If not, see .
+  */
+ 
+-#include "libhdhomerun/hdhomerun.h"
++#include 
+ 
+ #include 
+ #include "tvheadend.h"

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 700a7cc5a1d..7fa2c9c7f25 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -57,7 +57,7 @@ REQUIRED_USE="
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
-   "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
+   "${FILESDIR}"/${PN}-4.3-hdhomerun.patch
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
 )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2019-01-20 Thread James Le Cuirot

commit: de29ffbf0822d0f53bf6fcb10b91e4c036fa172b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan 20 15:17:12 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan 20 15:30:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de29ffbf

media-tv/tvheadend: Version bump to 4.2.8, loosen ffmpeg dependency

It builds against ffmpeg 4 now.

Closes: https://bugs.gentoo.org/673062
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/Manifest|  1 +
 ...vheadend-.ebuild => tvheadend-4.2.8.ebuild} | 49 ++
 media-tv/tvheadend/tvheadend-.ebuild   |  2 +-
 3 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 7026baf3a26..f1516f1c434 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1 +1,2 @@
 DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 
2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537
 SHA512 
14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9
+DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B 
fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00
 SHA512 
e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
similarity index 63%
copy from media-tv/tvheadend/tvheadend-.ebuild
copy to media-tv/tvheadend/tvheadend-4.2.8.ebuild
index 8aa2d256431..0673c7bc7a3 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
@@ -3,17 +3,17 @@
 
 EAPI=7
 
-inherit git-r3 linux-info systemd toolchain-funcs user
+inherit linux-info systemd toolchain-funcs user
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf 
zlib"
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"
 
 BDEPEND="
sys-devel/gettext
@@ -23,7 +23,8 @@ RDEPEND="
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
-   ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
+   dvben50221? ( media-tv/linuxtv-dvb-apps )
+   ffmpeg? ( media-video/ffmpeg:0= )
hdhomerun? ( media-libs/libhdhomerun )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
@@ -31,26 +32,15 @@ RDEPEND="
zeroconf? ( net-dns/avahi )
zlib? ( sys-libs/zlib )"
 
-# ffmpeg sub-dependencies needed for headers only. Check under
-# src/transcoding/codec/codecs/libs for include statements.
-
 DEPEND="
${RDEPEND}
-   dvb? ( virtual/linuxtv-dvb-headers )
-   ffmpeg? (
-   opus? ( media-libs/opus )
-   vpx? ( media-libs/libvpx )
-   x264? ( media-libs/x264 )
-   x265? ( media-libs/x265 )
-   )"
+   dvb? ( virtual/linuxtv-dvb-headers )"
 
 RDEPEND+="
dvb? ( media-tv/dtv-scan-tables )
xmltv? ( media-tv/xmltv )"
 
-REQUIRED_USE="
-   ddci? ( dvb )
-"
+REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
 
 # Some patches from:
 # https://github.com/rpmfusion/tvheadend
@@ -70,13 +60,6 @@ pkg_setup() {
enewuser tvheadend -1 -1 /etc/tvheadend video
 }
 
-# We unconditionally enable codecs that do not require additional
-# dependencies when building tvheadend. If support is missing from
-# ffmpeg at runtime then tvheadend will simply disable these codecs.
-
-# It is not necessary to specific all the --disable-*-static options as
-# most of them only take effect when --enable-ffmpeg_static is given.
-
 src_configure() {
CC="$(tc-getCC)" \
PKG_CONFIG="${CHOST}-pkg-config" \
@@ -86,33 +69,25 @@ src_configure() {
--disable-dvbscan \
--disable-ffmpeg_static \
--disable-hdhomerun_static \
-   --enable-libfdkaac \
-   --enable-libtheora \
-   --enable-libvorbis \
--nowerror \
+   $(use_enable capmt) \
+   $(use_enable constcw) \
+   $(use_enable cwc) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2019-01-20 Thread James Le Cuirot

commit: 82cad0512e17dc97ad55e9722664c4e822a7ac44
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan 20 15:31:04 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan 20 15:31:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82cad051

media-tv/tvheadend: Drop old 4.2.7

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/Manifest   |   1 -
 media-tv/tvheadend/tvheadend-4.2.7.ebuild | 120 --
 2 files changed, 121 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index f1516f1c434..a4b0579a1fa 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1 @@
-DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 
2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537
 SHA512 
14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B 
fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00
 SHA512 
e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f

diff --git a/media-tv/tvheadend/tvheadend-4.2.7.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.7.ebuild
deleted file mode 100644
index 604b181ffec..000
--- a/media-tv/tvheadend/tvheadend-4.2.7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs user
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"
-
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-RDEPEND="
-   virtual/libiconv
-   dbus? ( sys-apps/dbus )
-   dvbcsa? ( media-libs/libdvbcsa )
-   dvben50221? ( media-tv/linuxtv-dvb-apps )
-   ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
-   hdhomerun? ( media-libs/libhdhomerun )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   uriparser? ( dev-libs/uriparser )
-   zeroconf? ( net-dns/avahi )
-   zlib? ( sys-libs/zlib )"
-
-DEPEND="
-   ${RDEPEND}
-   dvb? ( virtual/linuxtv-dvb-headers )"
-
-RDEPEND+="
-   dvb? ( media-tv/dtv-scan-tables )
-   xmltv? ( media-tv/xmltv )"
-
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
-
-# Some patches from:
-# https://github.com/rpmfusion/tvheadend
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
-   "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
-   "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
-)
-
-DOCS=( README.md )
-
-pkg_setup() {
-   use inotify &&
-   CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
-   enewuser tvheadend -1 -1 /etc/tvheadend video
-}
-
-src_configure() {
-   CC="$(tc-getCC)" \
-   PKG_CONFIG="${CHOST}-pkg-config" \
-   econf \
-   --disable-bundle \
-   --disable-ccache \
-   --disable-dvbscan \
-   --disable-ffmpeg_static \
-   --disable-hdhomerun_static \
-   --nowerror \
-   $(use_enable capmt) \
-   $(use_enable constcw) \
-   $(use_enable cwc) \
-   $(use_enable dbus dbus_1) \
-   $(use_enable debug trace) \
-   $(use_enable dvb linuxdvb) \
-   $(use_enable dvbcsa) \
-   $(use_enable dvben50221) \
-   $(use_enable ffmpeg libav) \
-   $(use_enable hdhomerun hdhomerun_client) \
-   $(use_enable imagecache) \
-   $(use_enable inotify) \
-   $(use_enable iptv) \
-   $(use_enable satip satip_server) \
-   $(use_enable satip satip_client) \
-   $(use_enable systemd libsystemd_daemon) \
-   $(use_enable timeshift) \
-   $(use_enable uriparser) \
-   $(use_enable zeroconf avahi) \
-   $(use_enable zlib)
-}
-
-src_compile() {
-   emake CC="$(tc-getCC)"
-}
-
-src_install() {
-   default
-
-   newinitd "${FILESDIR}"/tvheadend.initd tvheadend
-   newconfd "${FILESDIR}"/tvheadend.confd tvheadend
-
-   use systemd &&
-   systemd_dounit "${FILESDIR}"/tvheadend.service
-
-   dodir /etc/tvheadend
-   fperms 0700 /etc/tvheadend

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2019-01-07 Thread Lars Wendler

commit: 590e247e639e9fca62b04349f69bf294544d3241
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan  7 19:13:16 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan  7 19:15:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590e247e

media-tv/tvheadend: Adjusted slot dependency on dev-libs/openssl

source-based packages should never depend on any other openssl slot
than slot 0.

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-tv/tvheadend/tvheadend-4.2.7.ebuild | 4 ++--
 media-tv/tvheadend/tvheadend-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.7.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.7.ebuild
index e72ceb2f7e3..604b181ffec 100644
--- a/media-tv/tvheadend/tvheadend-4.2.7.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="
dvben50221? ( media-tv/linuxtv-dvb-apps )
ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
hdhomerun? ( media-libs/libhdhomerun )
-   !libressl? ( dev-libs/openssl:= )
+   !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 96ff9acc83c..8aa2d256431 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="
dvbcsa? ( media-libs/libdvbcsa )
ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
hdhomerun? ( media-libs/libhdhomerun )
-   !libressl? ( dev-libs/openssl:= )
+   !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2018-11-10 Thread James Le Cuirot

commit: b77d4a2c460d0c29a87f7b61bc7df50231e2e2f4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Nov 10 15:20:11 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Nov 10 15:21:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77d4a2c

media-tv/tvheadend: Drop old 4.2.6

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/Manifest|   1 -
 .../files/tvheadend-4.2.5-ffmpeg_3.5.patch | 115 
 .../tvheadend/files/tvheadend-4.2.5-gcc8.patch | 110 ---
 media-tv/tvheadend/tvheadend-4.2.6.ebuild  | 120 -
 4 files changed, 346 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 4f11f8ea5bd..7026baf3a26 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1 @@
-DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 
358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419
 SHA512 
6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709
 DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 
2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537
 SHA512 
14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch
deleted file mode 100644
index eaec90eabce..000
--- a/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -up ./src/muxer/muxer_libav.c.orig ./src/muxer/muxer_libav.c
 ./src/muxer/muxer_libav.c.orig 2017-12-18 09:57:28.0 +0100
-+++ ./src/muxer/muxer_libav.c  2018-01-23 14:24:07.923509542 +0100
-@@ -174,7 +174,7 @@ lav_muxer_add_stream(lav_muxer_t *lm,
-   }
- 
-   if(lm->lm_oc->oformat->flags & AVFMT_GLOBALHEADER)
--c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-   return 0;
- }
-diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
 ./src/plumbing/transcoding.c.orig  2017-12-18 09:57:28.0 +0100
-+++ ./src/plumbing/transcoding.c   2018-01-23 14:43:14.873964416 +0100
-@@ -19,7 +19,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
- #include 
- #include 
- #include 
-@@ -574,7 +574,7 @@ transcoder_stream_audio(transcoder_t *t,
- octx->channels= as->aud_channels ? as->aud_channels : 
ictx->channels;
- octx->channel_layout  = transcode_get_channel_layout(>channels, 
ocodec);
- octx->bit_rate= as->aud_bitrate  ? as->aud_bitrate  : 0;
--octx->flags  |= CODEC_FLAG_GLOBAL_HEADER;
-+octx->flags  |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- if (!octx->sample_rate) {
-   tvherror(LS_TRANSCODE, "%04X: audio encoder has no suitable sample 
rate!", shortid(t));
-@@ -619,7 +619,7 @@ transcoder_stream_audio(transcoder_t *t,
-   break;
- 
- case SCT_AAC:
--  octx->flags |= CODEC_FLAG_BITEXACT;
-+  octx->flags |= AV_CODEC_FLAG_BITEXACT;
-   // use 64 kbit per channel as default
-   if (octx->bit_rate == 0) {
- octx->bit_rate = octx->channels * 64000;
-@@ -630,10 +630,10 @@ transcoder_stream_audio(transcoder_t *t,
-   // use vbr with quality setting as default
-   // and also use a user specified bitrate < 16 kbit as quality setting
-   if (octx->bit_rate == 0) {
--octx->flags |= CODEC_FLAG_QSCALE;
-+octx->flags |= AV_CODEC_FLAG_QSCALE;
- octx->global_quality = 4 * FF_QP2LAMBDA;
-   } else if (t->t_props.tp_abitrate < 16) {
--octx->flags |= CODEC_FLAG_QSCALE;
-+octx->flags |= AV_CODEC_FLAG_QSCALE;
- octx->global_quality = t->t_props.tp_abitrate * FF_QP2LAMBDA;
- octx->bit_rate = 0;
-   }
-@@ -1048,7 +1048,7 @@ create_video_filter(video_stream_t *vs,
- AVCodecContext *ictx, AVCodecContext *octx)
- {
-   AVFilterInOut *flt_inputs, *flt_outputs;
--  AVFilter *flt_bufsrc, *flt_bufsink;
-+  const AVFilter *flt_bufsrc, *flt_bufsink;
-   enum AVPixelFormat pix_fmts[] = { 0, AV_PIX_FMT_NONE };
-   char opt[128];
-   int err;
-@@ -1289,12 +1289,12 @@ transcoder_stream_video(transcoder_t *t,
-   else
-   octx->pix_fmt= AV_PIX_FMT_YUV420P;
- 
--  octx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+  octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-   if (t->t_props.tp_vbitrate < 64) {
- // encode with specified quality and optimize for low latency
- // valid values for quality are 2-31, smaller means better quality, 
use 5 as default
--octx->flags  |=

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2018-11-10 Thread James Le Cuirot

commit: 69a42800d4e4089e4ef83e0b5790b30f759c99b5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Nov 10 15:10:14 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Nov 10 15:21:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a42800

media-tv/tvheadend: Version bump to 4.2.7, EAPI 7

Closes: https://bugs.gentoo.org/670228
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-tv/tvheadend/Manifest|  1 +
 ...vheadend-.ebuild => tvheadend-4.2.7.ebuild} | 59 +++---
 media-tv/tvheadend/tvheadend-.ebuild   |  8 +--
 3 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 6c7435bed2c..4f11f8ea5bd 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1 +1,2 @@
 DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 
358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419
 SHA512 
6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709
+DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 
2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537
 SHA512 
14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.7.ebuild
similarity index 61%
copy from media-tv/tvheadend/tvheadend-.ebuild
copy to media-tv/tvheadend/tvheadend-4.2.7.ebuild
index 8ee4fdaf118..e72ceb2f7e3 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.7.ebuild
@@ -1,25 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit git-r3 linux-info systemd toolchain-funcs user
+inherit linux-info systemd toolchain-funcs user
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf 
zlib"
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"
+
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig"
 
 RDEPEND="
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
-   ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
+   dvben50221? ( media-tv/linuxtv-dvb-apps )
+   ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
hdhomerun? ( media-libs/libhdhomerun )
!libressl? ( dev-libs/openssl:= )
libressl? ( dev-libs/libressl:= )
@@ -27,28 +32,15 @@ RDEPEND="
zeroconf? ( net-dns/avahi )
zlib? ( sys-libs/zlib )"
 
-# ffmpeg sub-dependencies needed for headers only. Check under
-# src/transcoding/codec/codecs/libs for include statements.
-
 DEPEND="
${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   dvb? ( virtual/linuxtv-dvb-headers )
-   ffmpeg? (
-   opus? ( media-libs/opus )
-   vpx? ( media-libs/libvpx )
-   x264? ( media-libs/x264 )
-   x265? ( media-libs/x265 )
-   )"
+   dvb? ( virtual/linuxtv-dvb-headers )"
 
 RDEPEND+="
dvb? ( media-tv/dtv-scan-tables )
xmltv? ( media-tv/xmltv )"
 
-REQUIRED_USE="
-   ddci? ( dvb )
-"
+REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
 
 # Some patches from:
 # https://github.com/rpmfusion/tvheadend
@@ -68,13 +60,6 @@ pkg_setup() {
enewuser tvheadend -1 -1 /etc/tvheadend video
 }
 
-# We unconditionally enable codecs that do not require additional
-# dependencies when building tvheadend. If support is missing from
-# ffmpeg at runtime then tvheadend will simply disable these codecs.
-
-# It is not necessary to specific all the --disable-*-static options as
-# most of them only take effect when --enable-ffmpeg_static is given.
-
 src_configure() {
CC="$(tc-getCC)" \
PKG_CONFIG="${CHOST}-pkg-config" \
@@ -84,33 +69,25 @@ src_configure() {
--disable-dvbscan \
--disable-ffmpeg_static \
--disable-hdhomerun_static \
-   --enable-libfdkaac \
-   --enable-libtheora \
-

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/

2018-09-02 Thread James Le Cuirot

commit: bafd025d7fee68b12f2a66056fc4b1a14b134436
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep  2 11:10:43 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep  2 11:43:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bafd025d

media-tv/tvheadend: Change init script to non-fatal "use net"

We don't want network failure to cause missed recordings.

Closes: https://bugs.gentoo.org/633774
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-tv/tvheadend/files/tvheadend.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/files/tvheadend.initd 
b/media-tv/tvheadend/files/tvheadend.initd
index 27956ccb234..dc3bed76f29 100644
--- a/media-tv/tvheadend/files/tvheadend.initd
+++ b/media-tv/tvheadend/files/tvheadend.initd
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 depend() {
-   need net
+   use net
 }
 
 start() {

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/

2018-09-02 Thread James Le Cuirot

commit: 8085f241c486d2e44a04f6e6f65b778a86325b21
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep  2 11:19:36 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep  2 11:43:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8085f241

media-tv/tvheadend: Fix systemd service unit

I haven't tested this as I don't use systemd.

Closes: https://bugs.gentoo.org/654346
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-tv/tvheadend/files/tvheadend.service | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-tv/tvheadend/files/tvheadend.service 
b/media-tv/tvheadend/files/tvheadend.service
index 2d0573ca910..6d1e27445b7 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -3,19 +3,22 @@ Description=tvheadend
 After=network.target
 
 [Service]
-Type=forking
+Type=simple
 User=tvheadend
 Group=video
 RuntimeDirectory=tvheadend
 PIDFile=/run/tvheadend/tvheadend.pid
-ExecStart=/usr/bin/tvheadend -6 -f -p /run/tvheadend.pid -C -c /etc/tvheadend
+EnvironmentFile=/etc/conf.d/tvheadend
+ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c 
"${TVHEADEND_CONFIG}" ${TVHEADEND_OPTIONS}
+TimeoutStartSec=1m
+TimeoutStopSec=20s
 Restart=always
-RestartSec=5
+RestartSec=5s
 DevicePolicy=closed
-DeviceAllow=char-DVB rw # DVB devices
-DeviceAllow=char-drm rw # GPUs for transcoding
+DeviceAllow=char-DVB rw
+DeviceAllow=char-drm rw
 RestrictAddressFamilies=AF_INET AF_INET6
-ProtectSystem=strict
+ProtectSystem=yes
 ProtectHome=yes
 NoNewPrivileges=yes

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2018-09-02 Thread James Le Cuirot

commit: 739b54d63d1152757c3367ac57f249b751caa990
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep  2 11:27:54 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep  2 11:43:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739b54d6

media-tv/tvheadend: Version bump to 4.2.6

Closes: https://bugs.gentoo.org/665086
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-tv/tvheadend/Manifest|   1 +
 .../files/tvheadend-4.2.5-ffmpeg_3.5.patch | 115 
 .../tvheadend/files/tvheadend-4.2.5-gcc8.patch | 110 +++
 media-tv/tvheadend/tvheadend-4.2.6.ebuild  | 120 +
 4 files changed, 346 insertions(+)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 37bd4a7dfce..931e594621d 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1 +1,2 @@
 DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 
19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796
 SHA512 
333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b1a84c57810035af882df4
+DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 
358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419
 SHA512 
6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch
new file mode 100644
index 000..eaec90eabce
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch
@@ -0,0 +1,115 @@
+diff -up ./src/muxer/muxer_libav.c.orig ./src/muxer/muxer_libav.c
+--- ./src/muxer/muxer_libav.c.orig 2017-12-18 09:57:28.0 +0100
 ./src/muxer/muxer_libav.c  2018-01-23 14:24:07.923509542 +0100
+@@ -174,7 +174,7 @@ lav_muxer_add_stream(lav_muxer_t *lm,
+   }
+ 
+   if(lm->lm_oc->oformat->flags & AVFMT_GLOBALHEADER)
+-c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   return 0;
+ }
+diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
+--- ./src/plumbing/transcoding.c.orig  2017-12-18 09:57:28.0 +0100
 ./src/plumbing/transcoding.c   2018-01-23 14:43:14.873964416 +0100
+@@ -19,7 +19,7 @@
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -574,7 +574,7 @@ transcoder_stream_audio(transcoder_t *t,
+ octx->channels= as->aud_channels ? as->aud_channels : 
ictx->channels;
+ octx->channel_layout  = transcode_get_channel_layout(>channels, 
ocodec);
+ octx->bit_rate= as->aud_bitrate  ? as->aud_bitrate  : 0;
+-octx->flags  |= CODEC_FLAG_GLOBAL_HEADER;
++octx->flags  |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ if (!octx->sample_rate) {
+   tvherror(LS_TRANSCODE, "%04X: audio encoder has no suitable sample 
rate!", shortid(t));
+@@ -619,7 +619,7 @@ transcoder_stream_audio(transcoder_t *t,
+   break;
+ 
+ case SCT_AAC:
+-  octx->flags |= CODEC_FLAG_BITEXACT;
++  octx->flags |= AV_CODEC_FLAG_BITEXACT;
+   // use 64 kbit per channel as default
+   if (octx->bit_rate == 0) {
+ octx->bit_rate = octx->channels * 64000;
+@@ -630,10 +630,10 @@ transcoder_stream_audio(transcoder_t *t,
+   // use vbr with quality setting as default
+   // and also use a user specified bitrate < 16 kbit as quality setting
+   if (octx->bit_rate == 0) {
+-octx->flags |= CODEC_FLAG_QSCALE;
++octx->flags |= AV_CODEC_FLAG_QSCALE;
+ octx->global_quality = 4 * FF_QP2LAMBDA;
+   } else if (t->t_props.tp_abitrate < 16) {
+-octx->flags |= CODEC_FLAG_QSCALE;
++octx->flags |= AV_CODEC_FLAG_QSCALE;
+ octx->global_quality = t->t_props.tp_abitrate * FF_QP2LAMBDA;
+ octx->bit_rate = 0;
+   }
+@@ -1048,7 +1048,7 @@ create_video_filter(video_stream_t *vs,
+ AVCodecContext *ictx, AVCodecContext *octx)
+ {
+   AVFilterInOut *flt_inputs, *flt_outputs;
+-  AVFilter *flt_bufsrc, *flt_bufsink;
++  const AVFilter *flt_bufsrc, *flt_bufsink;
+   enum AVPixelFormat pix_fmts[] = { 0, AV_PIX_FMT_NONE };
+   char opt[128];
+   int err;
+@@ -1289,12 +1289,12 @@ transcoder_stream_video(transcoder_t *t,
+   else
+   octx->pix_fmt= AV_PIX_FMT_YUV420P;
+ 
+-  octx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++  octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   if (t->t_props.tp_vbitrate < 64) {
+ // encode with specified quality and optimize for low latency
+ // valid values for quality are 2-31, smaller means better quality, 
use 5 as default
+-octx->flags  |=

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2018-09-02 Thread James Le Cuirot

commit: c28ee41c8e7f8c0a4cf37680ce79dfda6b0ef453
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep  2 11:41:32 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep  2 11:43:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28ee41c

media-tv/tvheadend: Drop capmt, constcw, cwc USE flags from 

These are all served by libdvbcsa with no further dependencies so we
might as well put them all behind a common dvbcsa flag. Otherwise we
would have had to add yet another flag called cccam.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-tv/tvheadend/tvheadend-.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 04ecda4fb1b..8ee4fdaf118 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-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"
+IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv 
libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf 
zlib"
 
 RDEPEND="
virtual/libiconv
@@ -47,7 +47,6 @@ RDEPEND+="
xmltv? ( media-tv/xmltv )"
 
 REQUIRED_USE="
-   dvbcsa? ( || ( capmt constcw cwc ) )
ddci? ( dvb )
 "
 
@@ -55,9 +54,9 @@ REQUIRED_USE="
 # https://github.com/rpmfusion/tvheadend
 
 PATCHES=(
-   "${FILESDIR}/${PN}-4.0.9-use_system_queue.patch"
-   "${FILESDIR}/${PN}-4.2.1-hdhomerun.patch"
-   "${FILESDIR}/${PN}-4.2.2-dtv_scan_tables.patch"
+   "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
+   "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
+   "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
 )
 
 DOCS=( README.md )
@@ -89,14 +88,15 @@ src_configure() {
--enable-libtheora \
--enable-libvorbis \
--nowerror \
-   $(use_enable capmt) \
-   $(use_enable constcw) \
-   $(use_enable cwc) \
$(use_enable dbus dbus_1) \
$(use_enable debug trace) \
$(use_enable ddci) \
$(use_enable dvb linuxdvb) \
$(use_enable dvbcsa) \
+   $(use_enable dvbcsa capmt) \
+   $(use_enable dvbcsa cccam) \
+   $(use_enable dvbcsa constcw) \
+   $(use_enable dvbcsa cwc) \
$(use_enable ffmpeg libav) \
$(use_enable hdhomerun hdhomerun_client) \
$(use_enable imagecache) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2018-09-02 Thread James Le Cuirot

commit: 6a3281cadf514fd7c7e3f4c69a7290a886a6a5a6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep  2 11:42:58 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep  2 11:43:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3281ca

media-tv/tvheadend: Drop old 4.2.4

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-tv/tvheadend/Manifest   |   1 -
 media-tv/tvheadend/tvheadend-4.2.4.ebuild | 118 --
 2 files changed, 119 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 931e594621d..6c7435bed2c 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1 @@
-DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 
19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796
 SHA512 
333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b1a84c57810035af882df4
 DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 
358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419
 SHA512 
6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709

diff --git a/media-tv/tvheadend/tvheadend-4.2.4.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.4.ebuild
deleted file mode 100644
index 99676db4937..000
--- a/media-tv/tvheadend/tvheadend-4.2.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs user
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"
-
-RDEPEND="
-   virtual/libiconv
-   dbus? ( sys-apps/dbus )
-   dvbcsa? ( media-libs/libdvbcsa )
-   dvben50221? ( media-tv/linuxtv-dvb-apps )
-   ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
-   hdhomerun? ( media-libs/libhdhomerun )
-   !libressl? ( dev-libs/openssl:= )
-   libressl? ( dev-libs/libressl:= )
-   uriparser? ( dev-libs/uriparser )
-   zeroconf? ( net-dns/avahi )
-   zlib? ( sys-libs/zlib )"
-
-DEPEND="
-   ${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   dvb? ( virtual/linuxtv-dvb-headers )"
-
-RDEPEND+="
-   dvb? ( media-tv/dtv-scan-tables )
-   xmltv? ( media-tv/xmltv )"
-
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
-
-# Some patches from:
-# https://github.com/rpmfusion/tvheadend
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.0.9-use_system_queue.patch"
-   "${FILESDIR}/${PN}-4.2.1-hdhomerun.patch"
-   "${FILESDIR}/${PN}-4.2.2-dtv_scan_tables.patch"
-)
-
-DOCS=( README.md )
-
-pkg_setup() {
-   use inotify &&
-   CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
-   enewuser tvheadend -1 -1 /etc/tvheadend video
-}
-
-src_configure() {
-   CC="$(tc-getCC)" \
-   PKG_CONFIG="${CHOST}-pkg-config" \
-   econf \
-   --disable-bundle \
-   --disable-ccache \
-   --disable-dvbscan \
-   --disable-ffmpeg_static \
-   --disable-hdhomerun_static \
-   --nowerror \
-   $(use_enable capmt) \
-   $(use_enable constcw) \
-   $(use_enable cwc) \
-   $(use_enable dbus dbus_1) \
-   $(use_enable debug trace) \
-   $(use_enable dvb linuxdvb) \
-   $(use_enable dvbcsa) \
-   $(use_enable dvben50221) \
-   $(use_enable ffmpeg libav) \
-   $(use_enable hdhomerun hdhomerun_client) \
-   $(use_enable imagecache) \
-   $(use_enable inotify) \
-   $(use_enable iptv) \
-   $(use_enable satip satip_server) \
-   $(use_enable satip satip_client) \
-   $(use_enable systemd libsystemd_daemon) \
-   $(use_enable timeshift) \
-   $(use_enable uriparser) \
-   $(use_enable zeroconf avahi) \
-   $(use_enable zlib)
-}
-
-src_compile() {
-   emake CC="$(tc-getCC)"
-}
-
-src_install() {
-   default
-
-   newinitd "${FILESDIR}"/tvheadend.initd tvheadend
-   newconfd "${FILESDIR}"/tvheadend.confd tvheadend
-
-   use systemd &&
-   systemd_dounit "${FILESDIR}"/tvheadend.service
-
-   dodir /etc/tvheadend
-   fperms 0700 /etc/tvheadend
-   fowners tvheadend:video /etc/tvheadend
-}
-

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2018-04-11 Thread James Le Cuirot

commit: 39b3e2e8ecf04f96ea759292ecb20cf39b21fbde
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Apr 11 21:03:53 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Apr 11 21:03:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b3e2e8

media-tv/tvheadend: Take over as maintainer

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-tv/tvheadend/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index a84bb5eb047..38bdd61b7f9 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   ch...@gentoo.org
+   James Le Cuirot
+   

Enable support for capmt (dvbapi) 
protocol
Enable support for the constcw 
protocol

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2018-04-09 Thread Sam Jorna

commit: 20b603b39ac25b07ea727867a29cae6be86bb056
Author: Sam Jorna  gentoo  org>
AuthorDate: Tue Apr 10 01:02:25 2018 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Tue Apr 10 01:18:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20b603b3

media-tv/tvheadend: drop to maintainer-needed

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-tv/tvheadend/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 0b905954f50..a84bb5eb047 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   wra...@gentoo.org
-   Sam Jorna
-   
+   

Enable support for capmt (dvbapi) 
protocol
Enable support for the constcw 
protocol

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2017-12-17 Thread James Le Cuirot

commit: c41d336317b5a48bf1b62b797e050978f4480487
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec 17 22:52:45 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 17 22:53:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41d3363

media-tv/tvheadend: libdvben50221 is now effectively bundled

The dependency on the no-longer-maintained linuxtv-dvb-apps can now be
dropped. How ironic when I did the first bump in years just a few
weeks ago.

With this dependency gone, we may as well enable DDCI by default.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-tv/tvheadend/tvheadend-.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 952ade3e853..04ecda4fb1b 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -13,13 +13,12 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="+capmt +constcw +cwc dbus debug ddci dvbcsa dvben50221 +dvb +ffmpeg 
hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift 
uriparser vpx x264 x265 xmltv zeroconf zlib"
+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"
 
 RDEPEND="
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
-   dvben50221? ( media-tv/linuxtv-dvb-apps )
ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
hdhomerun? ( media-libs/libhdhomerun )
!libressl? ( dev-libs/openssl:= )
@@ -48,8 +47,8 @@ RDEPEND+="
xmltv? ( media-tv/xmltv )"
 
 REQUIRED_USE="
-   dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
-   ddci? ( dvb dvben50221 )
+   dvbcsa? ( || ( capmt constcw cwc ) )
+   ddci? ( dvb )
 "
 
 # Some patches from:
@@ -98,7 +97,6 @@ src_configure() {
$(use_enable ddci) \
$(use_enable dvb linuxdvb) \
$(use_enable dvbcsa) \
-   $(use_enable dvben50221) \
$(use_enable ffmpeg libav) \
$(use_enable hdhomerun hdhomerun_client) \
$(use_enable imagecache) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2017-12-17 Thread James Le Cuirot

commit: 46b42af633f895b35ddad5eccdba22dad451bc83
Author: Daniel Scheller  gmx  net>
AuthorDate: Sat Dec  2 12:25:09 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 17 22:53:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b42af6

media-tv/tvheadend: add ddci USE flag (support for DDCI hardware)

--enable-ddci enables the recently added support for the Digital Devices
CI hardware (Octopus CI, DuoFlex CI), for which the driver exposes their
functionality via a /dev/dvb/adapterX/secY (recent kernels) or ciY (dddvb
vendor driver package, both supported equally) dev node. This support
will be part of the tvheadend 4.4 release.

Repoman 2.3.3 (portage-2.3.13)
Closes: https://github.com/gentoo/gentoo/pull/6399

 media-tv/tvheadend/metadata.xml  | 1 +
 media-tv/tvheadend/tvheadend-.ebuild | 8 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index ad28ad1f4b6..0b905954f50 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -9,6 +9,7 @@
Enable support for capmt (dvbapi) 
protocol
Enable support for the constcw 
protocol
Enable support for the cwc (newcamd) 
protocol
+   Enable support for DDCI hardware
Enable decryption of the DVB Common 
Scrambling Algorithm
Enable support for hardware CAM
Enable support for the HDHomeRun 
device

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 55773cf0ac9..952ade3e853 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx 
x264 x265 xmltv zeroconf zlib"
+IUSE="+capmt +constcw +cwc dbus debug ddci dvbcsa dvben50221 +dvb +ffmpeg 
hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift 
uriparser vpx x264 x265 xmltv zeroconf zlib"
 
 RDEPEND="
virtual/libiconv
@@ -47,7 +47,10 @@ RDEPEND+="
dvb? ( media-tv/dtv-scan-tables )
xmltv? ( media-tv/xmltv )"
 
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
+REQUIRED_USE="
+   dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
+   ddci? ( dvb dvben50221 )
+"
 
 # Some patches from:
 # https://github.com/rpmfusion/tvheadend
@@ -92,6 +95,7 @@ src_configure() {
$(use_enable cwc) \
$(use_enable dbus dbus_1) \
$(use_enable debug trace) \
+   $(use_enable ddci) \
$(use_enable dvb linuxdvb) \
$(use_enable dvbcsa) \
$(use_enable dvben50221) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2017-12-05 Thread James Le Cuirot

commit: 68b9abf66d23fcaeafc5820af28621e94224b890
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Dec  5 22:35:50 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Dec  5 22:36:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b9abf6

media-tv/tvheadend: Add libressl support via USE flag

Closes: https://bugs.gentoo.org/639940
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-tv/tvheadend/tvheadend-4.2.4.ebuild | 5 +++--
 media-tv/tvheadend/tvheadend-.ebuild  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.2.4.ebuild 
b/media-tv/tvheadend/tvheadend-4.2.4.ebuild
index d56276ff4fc..99676db4937 100644
--- a/media-tv/tvheadend/tvheadend-4.2.4.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.4.ebuild
@@ -13,16 +13,17 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf 
zlib"
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv 
zeroconf zlib"
 
 RDEPEND="
-   dev-libs/openssl:=
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
dvben50221? ( media-tv/linuxtv-dvb-apps )
ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
hdhomerun? ( media-libs/libhdhomerun )
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( dev-libs/libressl:= )
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )
zlib? ( sys-libs/zlib )"

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index b3eb58292b3..55773cf0ac9 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -13,16 +13,17 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 
xmltv zeroconf zlib"
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun 
+imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx 
x264 x265 xmltv zeroconf zlib"
 
 RDEPEND="
-   dev-libs/openssl:=
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
dvben50221? ( media-tv/linuxtv-dvb-apps )
ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
hdhomerun? ( media-libs/libhdhomerun )
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( dev-libs/libressl:= )
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )
zlib? ( sys-libs/zlib )"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/

2017-12-04 Thread James Le Cuirot

commit: 3f38b9c5a0536d3b1effe0af621e28b1dfe11da4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Dec  4 22:28:48 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Dec  4 22:28:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f38b9c5

media-tv/tvheadend: Drop old 4.0.9

Closes: https://bugs.gentoo.org/595032
Closes: https://bugs.gentoo.org/596930
Closes: https://bugs.gentoo.org/633966
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-tv/tvheadend/Manifest|   2 -
 .../files/tvheadend-4.0.9-hdhomerun-include.patch  |  27 -
 media-tv/tvheadend/metadata.xml|   1 -
 media-tv/tvheadend/tvheadend-4.0.9.ebuild  | 117 -
 4 files changed, 147 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 7d3e91d7b72..37bd4a7dfce 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,3 +1 @@
-DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 BLAKE2B 
569987bc91f2060e5bb18b5caf35baebe1e72d95953bc69e19a713b33521668550f04dfc7ba125e3cf5ba6badee5a80c5bcdd37e2a5ca086d5dcc29cb0031c16
 SHA512 
aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609
-DIST tvheadend-4.0.9.tar.gz 15825419 BLAKE2B 
b719032e46df24f37614c4a9d1da690b82f15906b1cff7eaa9573162a08e70e2813515972a9dd478530ad4ba984b01dd3fb3bf178e1c3973465000357b541f7e
 SHA512 
ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e
 DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 
19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796
 SHA512 
333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b1a84c57810035af882df4

diff --git a/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch 
b/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch
deleted file mode 100644
index 8a0768fa6f0..000
--- a/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/configure b/configure
-index 47d2cf2..6f9fcc5 100755
 a/configure
-+++ b/configure
-@@ -290,7 +290,7 @@ if enabled hdhomerun_static; then
- else
- 
-   if enabled_or_auto hdhomerun_client; then
--if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
-+if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
-   enable  hdhomerun_client
-   LDFLAGS="$LDFLAGS -lhdhomerun"
- fi
-diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 
b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
-index 962627a..6d1c52b 100644
 a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
-+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
-@@ -24,7 +24,8 @@
- #include "htsbuf.h"
- #include "tvhdhomerun.h"
- 
--#include 
-+#include 
-+#include 
- 
- typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
- typedef struct tvhdhomerun_device  tvhdhomerun_device_t;

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index f8bdade2268..ad28ad1f4b6 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -10,7 +10,6 @@
Enable support for the constcw 
protocol
Enable support for the cwc (newcamd) 
protocol
Enable decryption of the DVB Common 
Scrambling Algorithm
-   Use scan tables from dtv-scan-tables git 
repository
Enable support for hardware CAM
Enable support for the HDHomeRun 
device
Enable support for image caching

diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
deleted file mode 100644
index d3627e8f13c..000
--- a/media-tv/tvheadend/tvheadend-4.0.9.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-info systemd toolchain-funcs user
-
-DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-   dvbscan? ( 
https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache 
inotify iptv satip +timeshift uriparser xmltv zeroconf zlib"
-
-# does not build with ffmpeg-3 - bug 574990
-# https://tvheadend.org/issues/3597
-RDEPEND="dev-libs/openssl:=
-   virtual/libiconv
-   dbus? ( sys-apps/dbus )
-   ffmpeg? (
-

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2017-12-04 Thread James Le Cuirot

commit: f3544384630a818ea97571db41ee93919ad9c719
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Dec  4 22:11:05 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Dec  4 22:20:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3544384

media-tv/tvheadend: Version bump to 4.2.4 and  update

* Add support for dvbcsa via USE flag
* Add support for dvben50221 via USE flag
* Drop support for libav (fails version checks, missing symbols)
* Source DTV scan tables from new media-tv/dtv-scan-tables package
* Set tvheadend user HOME to /etc/tvheadend to allow for XMLTV data
* Tighten up the systemd service unit
* Add debug USE flag for trace support
* Fix inotify kernel config check
* Add ffmpeg sub-dependencies and associated USE flags ( only)

Closes: https://bugs.gentoo.org/579048
Closes: https://bugs.gentoo.org/579986
Closes: https://bugs.gentoo.org/586448
Closes: https://bugs.gentoo.org/588210
Closes: https://bugs.gentoo.org/626238
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-tv/tvheadend/Manifest|  5 +-
 .../files/tvheadend-4.0.9-use_system_queue.patch   | 12 +++
 .../files/tvheadend-4.2.1-hdhomerun.patch  | 24 ++
 .../files/tvheadend-4.2.2-dtv_scan_tables.patch| 12 +++
 media-tv/tvheadend/files/tvheadend.service | 15 +++-
 media-tv/tvheadend/metadata.xml| 12 ++-
 ...vheadend-.ebuild => tvheadend-4.2.4.ebuild} | 73 +++---
 media-tv/tvheadend/tvheadend-.ebuild   | 90 +++---
 8 files changed, 180 insertions(+), 63 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index f74c515869a..7d3e91d7b72 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1,3 @@
-DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 
83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 
aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609
 WHIRLPOOL 
afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
-DIST tvheadend-4.0.9.tar.gz 15825419 SHA256 
cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977 SHA512 
ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e
 WHIRLPOOL 
c0db6afa8d16201eab5fb188f81d062f84066037395f7e47e496d377e8207e2ffef021a58e07cba4af1217963fb2541b1822681fd33799113858329e9ff287bf
+DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 BLAKE2B 
569987bc91f2060e5bb18b5caf35baebe1e72d95953bc69e19a713b33521668550f04dfc7ba125e3cf5ba6badee5a80c5bcdd37e2a5ca086d5dcc29cb0031c16
 SHA512 
aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609
+DIST tvheadend-4.0.9.tar.gz 15825419 BLAKE2B 
b719032e46df24f37614c4a9d1da690b82f15906b1cff7eaa9573162a08e70e2813515972a9dd478530ad4ba984b01dd3fb3bf178e1c3973465000357b541f7e
 SHA512 
ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e
+DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 
19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796
 SHA512 
333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b1a84c57810035af882df4

diff --git a/media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch 
b/media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch
new file mode 100644
index 000..13ac3573ed2
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch
@@ -0,0 +1,12 @@
+diff -up ./src/queue.h.orig ./src/queue.h
+--- ./src/queue.h.orig 2016-03-14 10:10:57.0 +0100
 ./src/queue.h  2016-07-04 17:47:22.480252171 +0200
+@@ -5,7 +5,7 @@
+ #ifndef HTSQ_H
+ #define HTSQ_H
+ 
+-#include "../vendor/include/sys/queue.h"
++#include 
+ 
+ /*
+  * Extra LIST-ops

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch 
b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
new file mode 100644
index 000..64f6f691b97
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
@@ -0,0 +1,24 @@
+diff -up ./configure.orig ./configure
+--- ./configure.orig   2017-04-21 10:32:22.0 +0200
 ./configure2017-04-23 13:31:08.717237211 +0200
+@@ -357,7 +357,7 @@ if enabled hdhomerun_static; then
+ else
+ 
+   if enabled_or_auto hdhomerun_client; then
+-if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
++if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
+   enable  hdhomerun_client
+   LDFLAGS="$LDFLAGS -lhdhomerun"
+ fi
+diff -up

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2017-11-17 Thread James Le Cuirot

commit: 8368af594a23150a95d5a1a6e19ec0ec3b7edd15
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Nov 17 23:13:17 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Nov 17 23:13:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8368af59

media-tv/tvheadend: Export CC during configure to fix cross-compiling

CC isn't only used by the Makefile.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 media-tv/tvheadend/tvheadend-4.0.9.ebuild | 1 +
 media-tv/tvheadend/tvheadend-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
index 8fe7e735272..d3627e8f13c 100644
--- a/media-tv/tvheadend/tvheadend-4.0.9.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -65,6 +65,7 @@ pkg_setup() {
 }
 
 src_configure() {
+   CC="$(tc-getCC)" \
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
--disable-ccache \

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index ac205c566bb..e6779acb3c1 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -50,6 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
+   CC="$(tc-getCC)" \
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
--disable-hdhomerun_static \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2017-07-30 Thread Michał Górny

commit: da082ba862dd9c0bce4b8425efe27be1db858c05
Author: David Hicks  hicks  id  au>
AuthorDate: Sat Jul 29 17:20:29 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 09:44:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da082ba8

media-tv/tvheadend: use HTTPS for GitHub and SRC_URI

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-tv/tvheadend/tvheadend-4.0.9.ebuild | 4 ++--
 media-tv/tvheadend/tvheadend-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
index 26da9d40c72..8fe7e735272 100644
--- a/media-tv/tvheadend/tvheadend-4.0.9.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-   dvbscan? ( 
http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
 )"
+   dvbscan? ( 
https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
 )"
 
 LICENSE="GPL-3"
 SLOT="0"

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 61069ab3e10..ac205c566bb 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit eutils git-r3 linux-info systemd toolchain-funcs user
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
-EGIT_REPO_URI="git://github.com/tvheadend/tvheadend.git"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 
 LICENSE="GPL-3"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-12-05 Thread Pacho Ramos

commit: d26c7b17b7bb948f990922f6ba149737d473ece5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Dec  5 14:27:13 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Dec  5 15:02:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26c7b17

media-tv/tvheadend: Drop old ebuilds using obsolete avahi USE flag naming

Package-Manager: portage-2.3.2

 media-tv/tvheadend/Manifest|   3 -
 media-tv/tvheadend/tvheadend-3.4.27.ebuild |  97 ---
 media-tv/tvheadend/tvheadend-4.0.6.ebuild  | 119 -
 media-tv/tvheadend/tvheadend-4.0.8.ebuild  | 119 -
 4 files changed, 338 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 2fa330c..f74c515 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,5 +1,2 @@
 DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 
83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 
aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609
 WHIRLPOOL 
afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
-DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 
50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 
fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a
 WHIRLPOOL 
b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
-DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 
348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 
b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266
 WHIRLPOOL 
6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b
-DIST tvheadend-4.0.8.tar.gz 15826229 SHA256 
04f485c25fcca604165622679e9e7be7aee7575d67f326f5ed8b4ceff63d8f4c SHA512 
b506dfbb5a4bbb44e772953cbd9bbdd8fdd3d5d22e13977ea5b186eb61a421c32196ab92d2f851907e48880b1fd2d543cbee95ba0004e4040fa0064156775e59
 WHIRLPOOL 
f89c1d3675762b474857b83edbc61b0c074ead2dac08511efd073855d9573ec5dd16e3e2350f0945960148fea6a55a02f5d61a2fa303d842dcff62ca7047ca45
 DIST tvheadend-4.0.9.tar.gz 15825419 SHA256 
cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977 SHA512 
ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e
 WHIRLPOOL 
c0db6afa8d16201eab5fb188f81d062f84066037395f7e47e496d377e8207e2ffef021a58e07cba4af1217963fb2541b1822681fd33799113858329e9ff287bf

diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild 
b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
deleted file mode 100644
index e999669..
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-info systemd toolchain-funcs user
-
-MY_PV="3.4patch1"
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify xmltv zlib"
-
-REQUIRED_USE="dvbscan? ( dvb )"
-
-# does not build with ffmpeg-3 - bug 574990
-# https://tvheadend.org/issues/3597
-DEPEND="dev-libs/openssl:0=
-   avahi? ( net-dns/avahi )
-   dvb? ( virtual/linuxtv-dvb-headers )
-   ffmpeg? (  src/version.c || die "setting version failed!"
-
-   # remove '-Werror' wrt bug #438424
-   sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
-
-   # imdb changed the search url, bug #536072
-   sed -e 's:akas.imdb.org:akas.imdb.com:' \
-   -i src/webui/static/app/epg.js || die 'sed failed!'
-}
-
-src_configure() {
-   econf --prefix="${EPREFIX}"/usr \
-   --datadir="${EPREFIX}"/usr/share \
-   --mandir="${EPREFIX}"/usr/share/man/man1 \
-   $(use_enable avahi) \
-   --disable-dvbscan \
-   $(use_enable dvb linuxdvb) \
-   $(use_enable ffmpeg libav) \
-   $(use_enable imagecache) \
-   $(use_enable inotify) \
-   $(use_enable zlib)
-}
-
-src_compile() {
-   emake CC="$(tc-getCC)"
-}
-
-src_install() {
-   default
-
-   newinitd "${FILESDIR}/tvheadend.initd" tvheadend
-   newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
-   systemd_dounit "${FILESDIR}/tvheadend.service"
-
-   dodir /etc/tvheadend
-   fperms 0700 /etc/tvheadend
-   fowners

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-10-02 Thread Pacho Ramos

commit: 3886bce03e5e17ee8bb053054ea09971942cd49c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  2 11:35:23 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  2 12:36:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3886bce0

media-tv/tvheadend: Use zeroconf instead of avahi USE flag (#477620)

Package-Manager: portage-2.3.1

 media-tv/tvheadend/tvheadend-4.0.9.ebuild | 6 +++---
 media-tv/tvheadend/tvheadend-.ebuild  | 8 
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
index 939aac7..fa2ad27 100644
--- a/media-tv/tvheadend/tvheadend-4.0.9.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -17,13 +17,12 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+IUSE="capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache 
inotify iptv satip +timeshift uriparser xmltv zeroconf zlib"
 
 # does not build with ffmpeg-3 - bug 574990
 # https://tvheadend.org/issues/3597
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
-   avahi? ( net-dns/avahi )
dbus? ( sys-apps/dbus )
ffmpeg? (
!libav? (

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-08-02 Thread Sven Wegener

commit: 64c207792a906fcf1a9f64073b76d169b4abfb21
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Aug  2 15:23:44 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Aug  2 20:22:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c20779

media-tv/tvheadend: Update ffmpeg static disable option

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index a53fbbc..b7e3928 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -54,7 +54,7 @@ src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
--disable-hdhomerun_static \
-   --disable-libffmpeg_static \
+   --disable-ffmpeg_static \
--disable-ccache \
--disable-dvbscan \
$(use_enable avahi) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-08-02 Thread Sven Wegener

commit: 5cce0441434a66927a1c7e6f45ab788bdcbb8cdd
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Aug  2 15:23:22 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Aug  2 20:22:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cce0441

media-tv/tvheadend: Require >=ffmpeg-3 for live ebuild

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 731463d..a53fbbc 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -21,7 +21,7 @@ RDEPEND="dev-libs/openssl:=
avahi? ( net-dns/avahi )
dbus? ( sys-apps/dbus )
ffmpeg? (
-   !libav? ( media-video/ffmpeg:0= )
+   !libav? ( >=media-video/ffmpeg-3:= )
libav? ( media-video/libav:= )
)
hdhomerun? ( media-libs/libhdhomerun )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-08-02 Thread Sven Wegener

commit: 49c9d9c482554ffea6bb85a2b93e71bb606c11eb
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Aug  2 15:21:01 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Aug  2 20:22:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c9d9c4

media-tv/tvheadend: Merge ffmpeg atoms

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-3.4.27.ebuild | 5 +
 media-tv/tvheadend/tvheadend-4.0.6.ebuild  | 5 +
 media-tv/tvheadend/tvheadend-4.0.8.ebuild  | 5 +
 media-tv/tvheadend/tvheadend-4.0.9.ebuild  | 5 +
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild 
b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index 541c1b0..e999669 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -25,10 +25,7 @@ REQUIRED_USE="dvbscan? ( dvb )"
 DEPEND="dev-libs/openssl:0=
avahi? ( net-dns/avahi )
dvb? ( virtual/linuxtv-dvb-headers )
-   ffmpeg? (
-   virtual/ffmpeg
-

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2016-05-07 Thread Sam Jorna

commit: 1c7530a056684f82f60b801ea2f2fdee235ce976
Author: Sam Jorna  gentoo  org>
AuthorDate: Sat May  7 11:11:30 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sat May  7 15:43:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7530a0

media-tv/tvheadend: bump to 4.0.9

Bumps to v4.0.9, additionally fixes build issue against hdhomerun.

Gentoo-bug: 578816
Package-Manager: portage-2.2.28

 media-tv/tvheadend/Manifest|   1 +
 .../files/tvheadend-4.0.9-hdhomerun-include.patch  |  27 +
 media-tv/tvheadend/tvheadend-4.0.9.ebuild  | 120 +
 3 files changed, 148 insertions(+)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 37da342..2fa330c 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -2,3 +2,4 @@ DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 
83ed1b669009ef325e
 DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 
50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 
fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a
 WHIRLPOOL 
b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
 DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 
348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 
b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266
 WHIRLPOOL 
6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b
 DIST tvheadend-4.0.8.tar.gz 15826229 SHA256 
04f485c25fcca604165622679e9e7be7aee7575d67f326f5ed8b4ceff63d8f4c SHA512 
b506dfbb5a4bbb44e772953cbd9bbdd8fdd3d5d22e13977ea5b186eb61a421c32196ab92d2f851907e48880b1fd2d543cbee95ba0004e4040fa0064156775e59
 WHIRLPOOL 
f89c1d3675762b474857b83edbc61b0c074ead2dac08511efd073855d9573ec5dd16e3e2350f0945960148fea6a55a02f5d61a2fa303d842dcff62ca7047ca45
+DIST tvheadend-4.0.9.tar.gz 15825419 SHA256 
cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977 SHA512 
ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e
 WHIRLPOOL 
c0db6afa8d16201eab5fb188f81d062f84066037395f7e47e496d377e8207e2ffef021a58e07cba4af1217963fb2541b1822681fd33799113858329e9ff287bf

diff --git a/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch 
b/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch
new file mode 100644
index 000..8a0768f
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch
@@ -0,0 +1,27 @@
+diff --git a/configure b/configure
+index 47d2cf2..6f9fcc5 100755
+--- a/configure
 b/configure
+@@ -290,7 +290,7 @@ if enabled hdhomerun_static; then
+ else
+ 
+   if enabled_or_auto hdhomerun_client; then
+-if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
++if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
+   enable  hdhomerun_client
+   LDFLAGS="$LDFLAGS -lhdhomerun"
+ fi
+diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 
b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
+index 962627a..6d1c52b 100644
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
 b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
+@@ -24,7 +24,8 @@
+ #include "htsbuf.h"
+ #include "tvhdhomerun.h"
+ 
+-#include 
++#include 
++#include 
+ 
+ typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
+ typedef struct tvhdhomerun_device  tvhdhomerun_device_t;

diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
new file mode 100644
index 000..770aa5f
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+   dvbscan? ( 
http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+# does not build with ffmpeg-3 - bug 574990
+# https://tvheadend.org/issues/3597
+RDEPEND="dev-libs/openssl:=
+   virtual/libiconv
+   avahi? ( net-dns/avahi )
+   dbus? ( sys-apps/dbus )
+   ffmpeg? (
+   !libav? (
+   media-video/ffmpeg:0=
+

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-04-02 Thread Sam Jorna

commit: 833681a700e6c10b3036e712c9ce255214ea5814
Author: Sam Jorna  gentoo  org>
AuthorDate: Sat Apr  2 11:11:43 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sat Apr  2 14:39:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833681a7

media-tv/tvheadend: restrict build with ffmpeg-3

Does not build with ffmpeg-3 as per upstream.

Gentoo-bug: 574990
Bug: https://tvheadend.org/issues/3597
Package-Manager: portage-2.2.28

 media-tv/tvheadend/tvheadend-4.0.8.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.8.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
index e4c7270..88ebb51 100644
--- a/media-tv/tvheadend/tvheadend-4.0.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
@@ -19,12 +19,17 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
 
+# does not build with ffmpeg-3 - bug 574990
+# https://tvheadend.org/issues/3597
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
dbus? ( sys-apps/dbus )
ffmpeg? (
-   !libav? ( media-video/ffmpeg:0= )
+   !libav? (
+   media-video/ffmpeg:0=
+

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-04-02 Thread Sam Jorna

commit: 990ee0068d05594384b5916959b30c8ffcee9e4f
Author: Sam Jorna  gentoo  org>
AuthorDate: Sat Apr  2 11:14:47 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sat Apr  2 14:39:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=990ee006

media-tv/tvheadend: restrict build with ffmpeg-3

Does not build with ffmpeg-3 as per upstream.

Gentoo-bug: 574990
Bug: https://tvheadend.org/issues/3597
Package-Manager: portage-2.2.28

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 087ea47..88ebb51 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,12 +19,17 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
 
+# does not build with ffmpeg-3 - bug 574990
+# https://tvheadend.org/issues/3597
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
dbus? ( sys-apps/dbus )
ffmpeg? (
-   !libav? ( media-video/ffmpeg:0= )
+   !libav? (
+   media-video/ffmpeg:0=
+

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-04-02 Thread Sam Jorna

commit: 3b9c34b1234f655bfaa843de88c6f7ccd224b3fe
Author: Sam Jorna  gentoo  org>
AuthorDate: Sat Apr  2 11:16:13 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sat Apr  2 14:39:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c34b1

media-tv/tvheadend: restrict build with ffmpeg-3

Does not build with ffmpeg-3 as per upstream.

Gentoo-bug: 574990
Bug: https://tvheadend.org/issues/3597
Package-Manager: portage-2.2.28

 media-tv/tvheadend/tvheadend-3.4.27.ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild 
b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index 03f12f2..541c1b0 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,10 +20,15 @@ IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify xmltv 
zlib"
 
 REQUIRED_USE="dvbscan? ( dvb )"
 
+# does not build with ffmpeg-3 - bug 574990
+# https://tvheadend.org/issues/3597
 DEPEND="dev-libs/openssl:0=
avahi? ( net-dns/avahi )
dvb? ( virtual/linuxtv-dvb-headers )
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? (
+   virtual/ffmpeg
+

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-03-14 Thread Sam Jorna

commit: 3d126cc38347c86c747079c4627a752b2a134636
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Mar 14 23:32:27 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Mar 14 23:32:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d126cc3

media-tv/tvheadend: update metadata

Package-Manager: portage-2.2.28

 media-tv/tvheadend/metadata.xml | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 31bcdfe..9d99f12 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -2,13 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   wra...@wraeth.id.au
+   wra...@gentoo.org
Sam Jorna
-   Proxy maintaner, to be assugned to 
bugs
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers


Enable support for capmt (dvbapi) 
protocol

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Robin H. Johnson

commit: 276e6369400f903da7bf8958dee2211ee0d75ad2
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan 25 06:37:38 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 25 06:37:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276e6369

Fix missing DIST entry in Manifest, and update copyright year (as trivial 
change to ensure manifest update propogates).

Package-Manager: portage-2.2.24

 media-tv/tvheadend/Manifest   | 1 +
 media-tv/tvheadend/tvheadend-4.0.8.ebuild | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 8d82a28..37da342 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,3 +1,4 @@
 DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 
83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 
aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609
 WHIRLPOOL 
afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
 DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 
50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 
fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a
 WHIRLPOOL 
b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
 DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 
348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 
b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266
 WHIRLPOOL 
6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b
+DIST tvheadend-4.0.8.tar.gz 15826229 SHA256 
04f485c25fcca604165622679e9e7be7aee7575d67f326f5ed8b4ceff63d8f4c SHA512 
b506dfbb5a4bbb44e772953cbd9bbdd8fdd3d5d22e13977ea5b186eb61a421c32196ab92d2f851907e48880b1fd2d543cbee95ba0004e4040fa0064156775e59
 WHIRLPOOL 
f89c1d3675762b474857b83edbc61b0c074ead2dac08511efd073855d9573ec5dd16e3e2350f0945960148fea6a55a02f5d61a2fa303d842dcff62ca7047ca45

diff --git a/media-tv/tvheadend/tvheadend-4.0.8.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
index 087ea47..e4c7270 100644
--- a/media-tv/tvheadend/tvheadend-4.0.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: ed222aff0c447ad9901fa8dbc19d4c1775d742bd
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:07 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed222aff

media-tv/tvheadend: Move xmltv to being RDEPEND-only

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index fd8c461..4cab67d 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -31,12 +31,14 @@ RDEPEND="dev-libs/openssl:=
)
hdhomerun? ( media-libs/libhdhomerun )
uriparser? ( dev-libs/uriparser )
-   zlib? ( sys-libs/zlib )
-   xmltv? ( media-tv/xmltv )"
+   zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
+RDEPEND+="
+   xmltv? ( media-tv/xmltv )"
+
 CONFIG_CHECK="~INOTIFY_USER"
 
 DOCS=( README.md )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: 9775c159a2935c425e0827cbbf13ed458f254150
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:10 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9775c159

media-tv/tvheadend: Move headers to being DEPEND-only

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 4cab67d..087ea47 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -22,9 +22,7 @@ IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg 
hdhomerun libav imageca
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
-   capmt? ( virtual/linuxtv-dvb-headers )
dbus? ( sys-apps/dbus )
-   dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? (
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:= )
@@ -34,6 +32,8 @@ RDEPEND="dev-libs/openssl:=
zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
+   dvb? ( virtual/linuxtv-dvb-headers )
+   capmt? ( virtual/linuxtv-dvb-headers )
virtual/pkgconfig"
 
 RDEPEND+="

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: e794d6acafe3608a15b81bb82775387734ea6791
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:21:58 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e794d6ac

media-tv/tvheadend: Remove epoll USE flag

The epoll support is always activated on Linux.
On Darwin and FreeBSD tvheadend automatically uses kqueue support.

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/metadata.xml   | 1 -
 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 99ac1c4..c6e66a8 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -11,7 +11,6 @@
Enable support for capmt (dvbapi) 
protocol
Enable support for the constcw 
protocol
Enable support for the cwc (newcamd) 
protocol
-   Enable epoll Linux system call
Enable support for the HDHomeRun 
device
Enable support for Internet Protocol TV
Enable support for IP-based Satellite 
TV

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 030b890..2f731d4 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
 
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
@@ -77,8 +77,6 @@ src_configure() {
$(use_enable dbus) \
$(use_enable dvb linuxdvb) \
$(use_enable dvbscan) \
-   $(use_enable epoll) \
-   --disable-kqueue \
$(use_enable ffmpeg libav) \
$(use_enable hdhomerun hdhomerun_client) \
$(use_enable imagecache) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: a121e0d2d43e9e1e217993e6556ea5180906c5a5
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:04 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a121e0d2

media-tv/tvheadend: Fixup DEPEND setting

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index ad11c8b..fd8c461 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -34,7 +34,7 @@ RDEPEND="dev-libs/openssl:=
zlib? ( sys-libs/zlib )
xmltv? ( media-tv/xmltv )"
 
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 CONFIG_CHECK="~INOTIFY_USER"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: 3b1a6ca1248eada3588462ab18211e858b7dca69
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:13 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1a6ca1

media-tv/tvheadend: Lower openssl dependency restriction

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 7cbcfde..70a30ba 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 
 IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
 
-DEPEND="dev-libs/openssl:0=
+DEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
dvb? ( virtual/linuxtv-dvb-headers )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: d66ee667c04958ab7e7222bf8983880ebe729bce
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:21:55 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66ee667

media-tv/tvheadend: Remove ccache USE flag

We have the ccache portage feature for that. Also the USE flag didn't do
anything, because we are forcing CC during make, overriding the ccache
command the configure script added to CC.

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/metadata.xml   | 1 -
 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 ++---
 media-tv/tvheadend/tvheadend-.ebuild  | 7 +++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 154ca4b..99ac1c4 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -17,7 +17,6 @@
Enable support for IP-based Satellite 
TV
Enable TimeShift support
Use media-tv/xmltv
-   Use dev-util/ccache
Use 
media-tv/linuxtv-dvb-apps
Enable support for image caching
Use dev-libs/uriparser

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 5512e71..030b890 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -17,13 +17,12 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg 
hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
 
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
capmt? ( virtual/linuxtv-dvb-headers )
-   ccache? ( dev-util/ccache sys-libs/zlib )
dbus? ( sys-apps/dbus )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? (
@@ -70,8 +69,8 @@ src_prepare() {
 src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
+   --disable-ccache \
$(use_enable avahi) \
-   $(use_enable ccache) \
$(use_enable capmt) \
$(use_enable constcw) \
$(use_enable cwc) \

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 184366e..7cbcfde 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -14,12 +14,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv 
zlib"
+IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
 
 DEPEND="dev-libs/openssl:0=
virtual/libiconv
avahi? ( net-dns/avahi )
-   ccache? ( dev-util/ccache )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
uriparser? ( dev-libs/uriparser )
@@ -46,9 +45,9 @@ src_prepare() {
 src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
-   $(use_enable avahi) \
-   $(use_enable ccache) \
+   --disable-ccache \
--disable-dvbscan \
+   $(use_enable avahi) \
$(use_enable dvb linuxdvb) \
$(use_enable ffmpeg libav) \
$(use_enable imagecache) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: b6b23b937f9d4a2dd80c5db45787e3287989393e
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:19 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b23b93

media-tv/tvheadend: Forward port the libav USE flag

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index a8d98b9..584af8a 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -14,12 +14,15 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
+IUSE="avahi +dvb +dvbscan ffmpeg libav imagecache inotify uriparser xmltv zlib"
 
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? (
+   !libav? ( media-video/ffmpeg:0= )
+   libav? ( media-video/libav:= )
+   )
uriparser? ( dev-libs/uriparser )
zlib? ( sys-libs/zlib )"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: a728d8583db95ba7dbe768bbc2e14dfcfed82709
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:21:52 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a728d858

media-tv/tvheadend: Remove iconv patch and USE flag

The patch is wrong. The configure check only checks whether we need to
link against libiconv for the iconv functions. iconv support is always
activated and we need to unconditionally depend on virtual/libiconv.

Signed-off-by: Sven Wegener  gentoo.org>

 .../files/4.0.6-use-glibc-version-iconv.patch  | 40 --
 media-tv/tvheadend/tvheadend-4.0.6.ebuild  |  5 ++-
 media-tv/tvheadend/tvheadend-.ebuild   |  1 +
 3 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch 
b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
deleted file mode 100644
index 9118786..000
--- a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
-From: Olliver Schinagl 
-Date: Sat, 26 Sep 2015 22:36:08 +0200
-Subject: [PATCH] Use glibc version iconv
-
-Signed-off-by: Olliver Schinagl 

- Makefile  | 2 +-
- configure | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 07d6965..0ec0259 100644
 a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,7 @@ else
- LDFLAGS += -ldl -lpthread -lm
- endif
- ifeq ($(CONFIG_LIBICONV),yes)
--LDFLAGS += -liconv
-+LDFLAGS +=
- endif
- ifeq ($(PLATFORM), darwin)
- LDFLAGS += -framework CoreServices
-diff --git a/configure b/configure
-index 487456b..a6cce11 100755
 a/configure
-+++ b/configure
-@@ -214,7 +214,7 @@ int test(void)
-   iconv_t ic = iconv_open("ASCII", "ASCII");
-   return 0;
- }
--' -liconv
-+'
- 
- if enabled_or_auto dvben50221; then
-   check_cc_snippet libdvben50221 '
--- 
-2.4.6
-

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 596042b..5512e71 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -17,9 +17,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg 
hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv 
zlib"
+IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg 
hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
 
 RDEPEND="dev-libs/openssl:=
+   virtual/libiconv
avahi? ( net-dns/avahi )
capmt? ( virtual/linuxtv-dvb-headers )
ccache? ( dev-util/ccache sys-libs/zlib )
@@ -30,7 +31,6 @@ RDEPEND="dev-libs/openssl:=
libav? ( media-video/libav:= )
)
hdhomerun? ( media-libs/libhdhomerun )
-   iconv? ( virtual/libiconv )
imagecache? ( net-misc/curl )
uriparser? ( dev-libs/uriparser )
zlib? ( sys-libs/zlib )
@@ -65,7 +65,6 @@ pkg_setup() {
 src_prepare() {
# remove '-Werror' wrt bug #438424
sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
-   epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
 }
 
 src_configure() {

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 495a3d1..184366e 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -17,6 +17,7 @@ KEYWORDS=""
 IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv 
zlib"
 
 DEPEND="dev-libs/openssl:0=
+   virtual/libiconv
avahi? ( net-dns/avahi )
ccache? ( dev-util/ccache )
dvb? ( virtual/linuxtv-dvb-headers )

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: d17863df0d4fbcb32257f94c3d71bf606a4d406e
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:21:49 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17863df

media-tv/tvheadend: Remove --mandir configure option

That used to be an old workaround.

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 3074292..596042b 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -71,7 +71,6 @@ src_prepare() {
 src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
-   --mandir="${EPREFIX}"/usr/share/man/man1 \
$(use_enable avahi) \
$(use_enable ccache) \
$(use_enable capmt) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: d3572aecbe052f52b1773003a0398870049ea8e9
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 17:55:31 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3572aec

media-tv/tvheadend: Convert to git-r3.eclass

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index b410af8..731463d 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils git-2 linux-info systemd toolchain-funcs user
+inherit eutils git-r3 linux-info systemd toolchain-funcs user
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: 57523b5920eb1250856de0369fc8883daad279c0
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:25 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57523b59

media-tv/tvheadend: Disable building bundled libraries

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index d056a1e..b410af8 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -53,6 +53,8 @@ src_prepare() {
 src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
+   --disable-hdhomerun_static \
+   --disable-libffmpeg_static \
--disable-ccache \
--disable-dvbscan \
$(use_enable avahi) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: 30e6381ccc4ed33229502d5a145942c2924b3d08
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:01 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e6381c

media-tv/tvheadend: Remove curl dependency

There's no single call to curl or libcurl in the code.

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 2f731d4..ad11c8b 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -30,7 +30,6 @@ RDEPEND="dev-libs/openssl:=
libav? ( media-video/libav:= )
)
hdhomerun? ( media-libs/libhdhomerun )
-   imagecache? ( net-misc/curl )
uriparser? ( dev-libs/uriparser )
zlib? ( sys-libs/zlib )
xmltv? ( media-tv/xmltv )"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: bf0e9d0dee4077e1fa014a300f9072813cc52e62
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:21:46 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:03:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0e9d0d

media-tv/tvheadend: Move dtv-scan-tables version to variable

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index ec29285..3074292 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -6,10 +6,12 @@ EAPI=5
 
 inherit eutils linux-info systemd toolchain-funcs user
 
+DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
+
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/;
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-   dvbscan? ( 
http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2015-02-08-f2053b3.tar.bz2
 )"
+   dvbscan? ( 
http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
 )"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -47,7 +49,7 @@ src_unpack() {
if use dvbscan; then
mkdir "${S}/data/dvb-scan" || die
cd "${T}" || die
-   unpack dtv-scan-tables-2015-02-08-f2053b3.tar.bz2
+   unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
rmdir "${S}/data/dvb-scan" || die
mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: c69dc4348380b40e043ec86e35287e737ad97e23
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:22 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69dc434

media-tv/tvheadend: Forward port additional USE flags

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 584af8a..d056a1e 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -14,20 +14,23 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="avahi +dvb +dvbscan ffmpeg libav imagecache inotify uriparser xmltv zlib"
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
 
 RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
+   dbus? ( sys-apps/dbus )
ffmpeg? (
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:= )
)
+   hdhomerun? ( media-libs/libhdhomerun )
uriparser? ( dev-libs/uriparser )
zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
dvb? ( virtual/linuxtv-dvb-headers )
+   capmt? ( virtual/linuxtv-dvb-headers )
virtual/pkgconfig"
 
 RDEPEND+="
@@ -53,10 +56,19 @@ src_configure() {
--disable-ccache \
--disable-dvbscan \
$(use_enable avahi) \
+   $(use_enable capmt) \
+   $(use_enable constcw) \
+   $(use_enable cwc) \
+   $(use_enable dbus) \
$(use_enable dvb linuxdvb) \
$(use_enable ffmpeg libav) \
+   $(use_enable hdhomerun hdhomerun_client) \
$(use_enable imagecache) \
$(use_enable inotify) \
+   $(use_enable iptv) \
+   $(use_enable satip satip_server) \
+   $(use_enable satip satip_client) \
+   $(use_enable timeshift) \
$(use_enable uriparser) \
$(use_enable zlib)
 }

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: a9f122016cc7c7a25c79260fa9bdfb0c516ce6f4
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Jan 24 20:43:30 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f12201

media-tv/tvheadend: Fix IMDb URL, bug #536072

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-3.4.27.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild 
b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index 0a8d85f..03f12f2 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -49,6 +49,10 @@ src_prepare() {
 
# remove '-Werror' wrt bug #438424
sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+
+   # imdb changed the search url, bug #536072
+   sed -e 's:akas.imdb.org:akas.imdb.com:' \
+   -i src/webui/static/app/epg.js || die 'sed failed!'
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: 863f9ab8fc98a98570263fbba4d5c918ba0ab13e
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Jan 24 10:06:54 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=863f9ab8

media-tv/tvheadend: Version bump, bug #572576

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-4.0.8.ebuild | 117 ++
 1 file changed, 117 insertions(+)

diff --git a/media-tv/tvheadend/tvheadend-4.0.8.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
new file mode 100644
index 000..087ea47
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+   dvbscan? ( 
http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav 
imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+RDEPEND="dev-libs/openssl:=
+   virtual/libiconv
+   avahi? ( net-dns/avahi )
+   dbus? ( sys-apps/dbus )
+   ffmpeg? (
+   !libav? ( media-video/ffmpeg:0= )
+   libav? ( media-video/libav:= )
+   )
+   hdhomerun? ( media-libs/libhdhomerun )
+   uriparser? ( dev-libs/uriparser )
+   zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+   dvb? ( virtual/linuxtv-dvb-headers )
+   capmt? ( virtual/linuxtv-dvb-headers )
+   virtual/pkgconfig"
+
+RDEPEND+="
+   xmltv? ( media-tv/xmltv )"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+DOCS=( README.md )
+
+src_unpack() {
+   unpack "${P}.tar.gz"
+
+   if use dvbscan; then
+   mkdir "${S}/data/dvb-scan" || die
+   cd "${T}" || die
+   unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
+   rmdir "${S}/data/dvb-scan" || die
+   mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die
+
+   # This is needed to prevent make from removing files
+   touch "${S}/data/dvb-scan/.stamp" || die
+   fi
+}
+
+pkg_setup() {
+   enewuser tvheadend -1 -1 /dev/null video
+}
+
+src_prepare() {
+   # remove '-Werror' wrt bug #438424
+   sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+}
+
+src_configure() {
+   econf --prefix="${EPREFIX}"/usr \
+   --datadir="${EPREFIX}"/usr/share \
+   --disable-ccache \
+   $(use_enable avahi) \
+   $(use_enable capmt) \
+   $(use_enable constcw) \
+   $(use_enable cwc) \
+   $(use_enable dbus) \
+   $(use_enable dvb linuxdvb) \
+   $(use_enable dvbscan) \
+   $(use_enable ffmpeg libav) \
+   $(use_enable hdhomerun hdhomerun_client) \
+   $(use_enable imagecache) \
+   $(use_enable inotify) \
+   $(use_enable iptv) \
+   $(use_enable satip satip_server) \
+   $(use_enable satip satip_client) \
+   $(use_enable timeshift) \
+   $(use_enable uriparser) \
+   $(use_enable zlib)
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)"
+}
+
+src_install() {
+   default
+
+   newinitd "${FILESDIR}/tvheadend.initd" tvheadend
+   newconfd "${FILESDIR}/tvheadend.confd" tvheadend
+
+   systemd_dounit "${FILESDIR}/tvheadend.service"
+
+   dodir /etc/tvheadend
+   fperms 0700 /etc/tvheadend
+   fowners tvheadend:video /etc/tvheadend
+}
+
+pkg_postinst() {
+   elog "The Tvheadend web interface can be reached at:"
+   elog "http://localhost:9981/;
+   elog
+   elog "Make sure that you change the default username"
+   elog "and password via the Configuration / Access control"
+   elog "tab in the web interface."
+}

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2016-01-24 Thread Sven Wegener

commit: cb2c426549d27d08b58867bd06abed9b17a75c95
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan 23 09:22:16 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 24 23:04:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2c4265

media-tv/tvheadend: Update dependency syntax of live ebuild

Signed-off-by: Sven Wegener  gentoo.org>

 media-tv/tvheadend/tvheadend-.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-.ebuild 
b/media-tv/tvheadend/tvheadend-.ebuild
index 70a30ba..a8d98b9 100644
--- a/media-tv/tvheadend/tvheadend-.ebuild
+++ b/media-tv/tvheadend/tvheadend-.ebuild
@@ -16,16 +16,18 @@ KEYWORDS=""
 
 IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
 
-DEPEND="dev-libs/openssl:=
+RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
-   dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
uriparser? ( dev-libs/uriparser )
-   zlib? ( sys-libs/zlib )
+   zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+   dvb? ( virtual/linuxtv-dvb-headers )
virtual/pkgconfig"
 
-RDEPEND="${DEPEND}
+RDEPEND+="
dvbscan? ( media-tv/linuxtv-dvb-apps )
xmltv? ( media-tv/xmltv )"

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/

2015-10-16 Thread Alexis Ballier

commit: 780239b15f855b764ac81c430d68ab04ce9f9bef
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Oct 16 12:02:39 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Oct 16 12:05:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780239b1

media-tv/tvheadend: Rename patch to match what is used from epatch in the 
ebuild.

Package-Manager: portage-2.2.23

 .../files/{glibc_iconv.patch => 4.0.6-use-glibc-version-iconv.patch}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-tv/tvheadend/files/glibc_iconv.patch 
b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
similarity index 100%
rename from media-tv/tvheadend/files/glibc_iconv.patch
rename to media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2015-10-16 Thread Alexis Ballier

commit: 17bf1b8ccc41efafe8ba23cf98646c4f9eec45e1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Oct 16 12:04:52 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Oct 16 12:05:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17bf1b8c

media-tv/tvheadend: Fix usage of ffmpeg vs libav flags.

ffmpeg flag means enable ffmpeg or libav. libav flags means use libav, lack of 
it use ffmpeg.

Package-Manager: portage-2.2.23

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 512a53d..ec29285 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -23,10 +23,12 @@ RDEPEND="dev-libs/openssl:=
ccache? ( dev-util/ccache sys-libs/zlib )
dbus? ( sys-apps/dbus )
dvb? ( virtual/linuxtv-dvb-headers )
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? (
+   !libav? ( media-video/ffmpeg:0= )
+   libav? ( media-video/libav:= )
+   )
hdhomerun? ( media-libs/libhdhomerun )
iconv? ( virtual/libiconv )
-   libav? ( media-video/libav )
imagecache? ( net-misc/curl )
uriparser? ( dev-libs/uriparser )
zlib? ( sys-libs/zlib )
@@ -80,7 +82,6 @@ src_configure() {
--disable-kqueue \
$(use_enable ffmpeg libav) \
$(use_enable hdhomerun hdhomerun_client) \
-   $(use_enable libav) \
$(use_enable imagecache) \
$(use_enable inotify) \
$(use_enable iptv) \

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/

2015-10-13 Thread Ian Delaney

commit: 52c004ccdbdb19d4a2c51b9e945180b2300e1e92
Author: Ian Delaney  gentoo  org>
AuthorDate: Tue Oct 13 13:06:00 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Oct 13 13:07:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c004cc

media-tv/tvheadend: correction to code missed in src_unpack

Package-Manager: portage-2.2.20.1

 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild 
b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index fc0031e..512a53d 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -44,7 +44,7 @@ src_unpack() {
 
if use dvbscan; then
mkdir "${S}/data/dvb-scan" || die
-   cd "${T}"
+   cd "${T}" || die
unpack dtv-scan-tables-2015-02-08-f2053b3.tar.bz2
rmdir "${S}/data/dvb-scan" || die
mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die

[gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/

2015-10-13 Thread Ian Delaney

commit: 90707a8ef54250b4bca083184beed7d39aff17e3
Author: Ian Delaney  gentoo  org>
AuthorDate: Tue Oct 13 11:22:54 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Oct 13 11:23:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90707a8e

media-tv/tvheadend: bump to -4.0.6, patch to fixing issues re IUSE iconv

patch submitted thanks to Olliver Schinagl, ebuild prepared by new
designated proxy maintainer 'wraeth' submitted via gentoo bug,
old versions removed on request of maintainer.

Gnetoo bug: #551884

Package-Manager: portage-2.2.20.1

 media-tv/tvheadend/Manifest|  4 +-
 media-tv/tvheadend/files/glibc_iconv.patch | 40 
 media-tv/tvheadend/metadata.xml| 33 ++
 media-tv/tvheadend/tvheadend-2.12.ebuild   | 73 --
 media-tv/tvheadend/tvheadend-3.2.ebuild| 71 -
 media-tv/tvheadend/tvheadend-3.4.27.ebuild |  4 +-
 ...eadend-3.4.27.ebuild => tvheadend-4.0.6.ebuild} | 65 +--
 media-tv/tvheadend/tvheadend-.ebuild   |  4 +-
 8 files changed, 113 insertions(+), 181 deletions(-)

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index a40c11b..8d82a28 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,3 +1,3 @@
-DIST hts-tvheadend_2.12.tar.gz 1475053 SHA256 
c2e33384b24356be036bf8e58a026efeed247b001d3674929dc0016bf2b0e11b SHA512 
87808a57454b58f458e8e7db6d381e34917064a0f196ed4e91f2ee912575282e121ada72d11ce6c3f8c5e2913dc4510b0b1e6a7d252b702946c033ef35e85c68
 WHIRLPOOL 
953735a6796972dbf5a7b2f541fc07c7dc2666e4a15f007fdefd92b7445055c227ce8b570088e4fd0810ffebd3271a19af7fd023eb58dfd046b24d45be5053cc
-DIST tvheadend-3.2.tar.gz 2155532 SHA256 
4bda0da2488c2078c6bd7e92ea5099c7c1e6c52fd361af965c83e82070cfb651 SHA512 
f4f87a42c10bf9989606ca932ba916f9c70d0adfc1c0f6ee1f1dd3c23545de8e1699c4f519c56a7f5df0b27521d7f714c02ea5d30432756511baefb00ddd8d22
 WHIRLPOOL 
8dbf8c7eeff31b132f61d7ff8cf5412659e430e3fe47733ec54e7e804b8be608bd9886d8149975a91653608edeb641781e08c6f3df819dc08a4f7d96abe41dfb
+DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 
83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 
aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609
 WHIRLPOOL 
afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
 DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 
50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 
fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a
 WHIRLPOOL 
b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
+DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 
348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 
b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266
 WHIRLPOOL 
6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b

diff --git a/media-tv/tvheadend/files/glibc_iconv.patch 
b/media-tv/tvheadend/files/glibc_iconv.patch
new file mode 100644
index 000..9118786
--- /dev/null
+++ b/media-tv/tvheadend/files/glibc_iconv.patch
@@ -0,0 +1,40 @@
+From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
+From: Olliver Schinagl 
+Date: Sat, 26 Sep 2015 22:36:08 +0200
+Subject: [PATCH] Use glibc version iconv
+
+Signed-off-by: Olliver Schinagl 
+---
+ Makefile  | 2 +-
+ configure | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 07d6965..0ec0259 100644
+--- a/Makefile
 b/Makefile
+@@ -39,7 +39,7 @@ else
+ LDFLAGS += -ldl -lpthread -lm
+ endif
+ ifeq ($(CONFIG_LIBICONV),yes)
+-LDFLAGS += -liconv
++LDFLAGS +=
+ endif
+ ifeq ($(PLATFORM), darwin)
+ LDFLAGS += -framework CoreServices
+diff --git a/configure b/configure
+index 487456b..a6cce11 100755
+--- a/configure
 b/configure
+@@ -214,7 +214,7 @@ int test(void)
+   iconv_t ic = iconv_open("ASCII", "ASCII");
+   return 0;
+ }
+-' -liconv
++'
+ 
+ if enabled_or_auto dvben50221; then
+   check_cc_snippet libdvben50221 '
+-- 
+2.4.6
+

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index e6ede41..8cda002 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,16 +1,25 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  proxy-maintainers
-  
-l...@kraav.com
-Leho Kraav
-  
-  
-Use media-tv/xmltv
-Use dev-util/ccache
-Use media-tv/linuxtv-dvb-apps
-Enable support for image caching
-Use

74 matches

Mail list logo