Merge branch 'edge' into next

6 files changed, 65 insertions, 22 deletions

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 2d4e9688769e..c8dbf8d9400e 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -4,11 +4,12 @@ AUX tvheadend-4.2.2-dtv_scan_tables.patch 463 BLAKE2B 4e52d89d75c05d8a3cc6452807
 AUX tvheadend-4.2.7-python3.patch 2952 BLAKE2B c6eee8aea74abd9a6eaacd3206a4b0191a45ce63e9e18bb213f1f6c85702a3836c44c55dd7131df4d739fb1f689c8bd97e24f4924e113649b7b0c9d349d471c7 SHA512 f031a06e5d4db4ea265a3e99bb07bee983ab40e5b028d9e69457971090e538b2057d49258cadda75db7816c2e4e9609819e59ab8a30d3ce848444774bfa1a02f
 AUX tvheadend-4.2.8-gcc9.patch 1772 BLAKE2B dc0033d7f61b8099d3f352cf8f05ff9073f3d6196c10ecac97c1cb1e7af7e01712478b2ef78b991336127ffbfcc9faf49b30b92f9af5e3c500783bc580a8908a SHA512 9b9d74a7d88187dd7895302b3c6142a14a136823fda5840fa464a5d3f3f97c8b59d4f839d10da14bd13bb6b346b75cac07069dab8ae626f68bc3000a70484834
 AUX tvheadend-4.2.8-hdhomerun.patch 1067 BLAKE2B bbbac3dfc8e533770d096bf726c40429358307d5134186693fca5bb69ea7a291afc0f2aa24fb2744d330e72bdfb78ec44ed96f2f2c9a625d9ac63ed2bc913a5c SHA512 118d9086f52c727dd64c0a10471857b12f8c0798887bcd712383823ffcaa0a12a3b487b7941871f8120bc00672608eca596d6ca09cfd47abb9684deef4611faa
+AUX tvheadend-4.2.8-no-dvb-fix.patch 817 BLAKE2B d07b38662175f64c29c166c16aa0fc76240aa86d325a1b715dee3de4733287a615566d9cb53fce9da37cc69ff66992eb228c45e8b7dce77cc125a8dfc303ece8 SHA512 37fe828b3a878913468bd06e115dfd9eec29df840455872019414187bb4a904c50d2476fc0508c465a92029f28068a6e6da54d9089ca2c5957f34a94835dc04a
 AUX tvheadend-4.3-hdhomerun.patch 1435 BLAKE2B 3250c5d1ce2a757a2fdee646cb64136661e171c5ae5b30199560e2e74fbfbfefb6d8284e5c2cb92d179751f5fa814148240e08e132761d4d3e2b66844ccd53b9 SHA512 a013ecb61cf05ff5d976f88be58a4ba5471034ab02d34778a8c472746355f2630a88b90951ba98513c787e616119183087d7560be6a9c89c5ea9c26285fe2d5d
-AUX tvheadend.confd 355 BLAKE2B 36ba5a3466838b643beb877050ef6cc481adb91a433efa7429977104c9db1e6ef54901750d14dc0f43a20c89ddf504a9fc28a10a88d68105e5a5f07820696d50 SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b
+AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060e102b801337fd5a1e3f1376f4e5de59a8da0ae5bfb9a2335c1205504d28a3582ac6f7c095b0623d0 SHA512 11448507059ed12bef972dfd898771ab2a63078927e55a356b44be04c738e461535ba2a621a9aba4b621cb316dfd66e74b3c25c22c45ccf73a28f6dd0ad3cb23
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
-AUX tvheadend.service 577 BLAKE2B f6762aef0f9370a7ad1e438aa4b35c500c40240bd7d66db5e32b061c0dc9776adc2b8de2c395b2299151bd5c6fc8735944a8384828b873b29fbf6c1ed76bafde SHA512 1192b98da179503bc249e0b0d3a0e6c2bf420bfb7d14a72b917fe9e1975a42d1647b5d951ead8f18419999f4c74c352b21e58c28bacc65419012d46bb83270d4
+AUX tvheadend.service 575 BLAKE2B cc332347736f9dccc34ece966311899307d03e3bf852fa8052dd86f4bfe02e0b927da7b3b8b9d78c6fcb85d77ca889ac22c8106636cac825b8550e7bd5e38176 SHA512 c9c0f52dda9f325189f99fd275cd806f6b818761ab1bc00a36ddb934418d5cff4b9dcf594aaa446ec47f3b0004ab8fc75b221a4fb76ac8730c365f751056c522
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-EBUILD tvheadend-4.2.8.ebuild 3059 BLAKE2B 2d2bde0369e364f58f81b93966c14c4e38cb9cbe0ae76f13ceb45ebb3ce557b5324940be0e4617f6d7884178e2143351666d674e4ed181635ab78b4938a7133b SHA512 0fe731a22d0a9ce7061afce2aacae45e9e8cea09c4159151207bfacce6cc15ad6e7a5d2ec6a96a09afac0f436397b7b8c1fc7dcf275931feca5b4aeceae6d318
-EBUILD tvheadend-9999.ebuild 3756 BLAKE2B c3d62f8de1ab35dd91087e624d121fa5c31867b258b4e9eda2e7856e7cdccdbad1ef6982d0e6894ff99f0ec409127a7d5d8067f766338a88d9e868a5bbddea11 SHA512 4457b26c465992f6d57ac29cdc12a223df49d4cafbe8c3864c529b23ae7e2ed240d316e34eb49ff2e6c7f0cb89c3b0e761149a957cf55f63f08ff028cb410602
+EBUILD tvheadend-4.2.8-r1.ebuild 3448 BLAKE2B 9aaefa31ffcec4762a6cdee5e7b77d17ea1d5b22ddd7a8f9b73746e2eb889b95226b2210bbd4f1c3c6e454752ed1da50fda9ba24c9def282619d1181b534ab71 SHA512 c19ae734fa3942876023e98a7a83f9cf651d60feb8f5cbf2eae92cc4ca42e6006fefdd262333d797824b276c1198765a30245e8b937aba1b3a395e7fd65bd093
+EBUILD tvheadend-9999.ebuild 4145 BLAKE2B d9c98a52acb88fef1bc66bfec2ba740006b73c8154dbf2b3a050c3ad766ba5094ff8e441e36e320ca5b0190d1c0240564e12822220069c74d65df24063bd90db SHA512 29fc9ff9763c24444ced296365b0ae9eab9eb9e010865942772469a94867094adba31588969408969eb55bd66f55fd4ff5efffeb534e48c2688e7999e3d5de49
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
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 000000000000..b398064292e5
--- /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 <chewi@gentoo.org>
+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->mm_id, &dvb_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/files/tvheadend.confd b/media-tv/tvheadend/files/tvheadend.confd
index 8be4a5dadce9..bac19ece3ac1 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/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service
index 6d1e27445b73..cd5c5e7f9115 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.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index a20bac30f228..7886d755c7d5 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 )
@@ -51,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 )
@@ -58,8 +60,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 +106,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 +115,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-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 692d4ec897c3..e8e5c2814ed8 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.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 )
@@ -60,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 )
@@ -67,8 +69,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 +130,6 @@ src_install() {
 
 	use systemd &&
 		systemd_dounit "${FILESDIR}"/tvheadend.service
-
-	dodir /etc/tvheadend
-	fperms 0700 /etc/tvheadend
-	fowners tvheadend:video /etc/tvheadend
 }
 
 pkg_postinst() {
@@ -143,4 +139,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
 }