From aa3bbeb881b99043488b3354b0d36d1ff0107aac Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 10 May 2020 23:15:26 +0100 Subject: 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 --- media-tv/tvheadend/files/tvheadend.confd | 2 +- media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 128 +++++++++++++++++++++++++++ media-tv/tvheadend/tvheadend-4.2.8.ebuild | 122 ------------------------- media-tv/tvheadend/tvheadend-9999.ebuild | 22 +++-- 4 files changed, 143 insertions(+), 131 deletions(-) create mode 100644 media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild delete mode 100644 media-tv/tvheadend/tvheadend-4.2.8.ebuild (limited to 'media-tv') 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/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild new file mode 100644 index 000000000000..2c44c55ed179 --- /dev/null +++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info systemd toolchain-funcs + +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=" + acct-user/tvheadend + virtual/libiconv + dbus? ( sys-apps/dbus ) + dvbcsa? ( media-libs/libdvbcsa ) + dvben50221? ( media-tv/linuxtv-dvb-apps ) + ffmpeg? ( media-video/ffmpeg:0= ) + 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,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 +) + +DOCS=( README.md ) + +pkg_setup() { + use inotify && + CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup +} + +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 +} + +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." + + . "${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-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild deleted file mode 100644 index a20bac30f228..000000000000 --- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild +++ /dev/null @@ -1,122 +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= ) - 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,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 -) - -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 -} - -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." -} diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 692d4ec897c3..ddd46284395b 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 } -- cgit v1.2.3-65-gdbad