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

["James Le Cuirot" <chewi@gentoo.org>]

commit:     aa3bbeb881b99043488b3354b0d36d1ff0107aac
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 22:15:26 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 10 22:15:26 2020 +0000
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 <chewi <AT> 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-9999.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-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 692d4ec897c..ddd46284395 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 )
@@ -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 tvheadend:video /etc/tvheadend
 }
 
 pkg_postinst() {
@@ -143,4 +138,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
 }