gentoo auto-resync : 24:03:2024 - 19:00:40

3 files changed, 184 insertions, 9 deletions

diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index cfb42e78a7a1..a1712275e543 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -11,6 +11,8 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
+DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0 SHA512 068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da
 EBUILD tvheadend-4.2.8-r2.ebuild 3611 BLAKE2B 80411facff811cbff41124e5a68cdb80f6a5b4e4ad44e182bcb9358ef7ced1bfb25dface222d16599f4b401c90a65adb0b9e7e7538b0fb7e5be2fd906a0088b6 SHA512 37932ec32c4cc7dda757c13246954e60a1d9ebf33f401f7ac54e580db753f8aff19ab89ffbd45469a050bd654bbdfd24845e8fbcbafcff22b7bd86bf9b6cc31c
-EBUILD tvheadend-9999.ebuild 4121 BLAKE2B c1c812da0780c5939859716927dfd24a6131269bbb306e3cb31c8ce3090868c431b4cde097914c6be36026f9cd7c1fc00ec0be330df3ccb296a0b5393c28ffe1 SHA512 e8296cbcbe1400cde1c2ce40c4b4c037e61069f9d10e1c4ff2282907802ba5190713e25e0c96b1af39e2b452a6fec1e8e9a2aa675c6bf8bd94a62a164c912ade
+EBUILD tvheadend-4.3_p20240322.ebuild 4421 BLAKE2B 9c7dfd7d285362784c56f4d64f5a71f46e85419d4bec05c11e457bad4f41f4a7595ef6f6b18f5fd81c839ebe3a5023d7be1a856451056efa9eb1ae8a0d83c52d SHA512 0906e76c9112ceb53dcfaad5c381e3f592b69983c616edab4282ccfd5ef862753cc79f79b34a72e140cef690774e719c6bfe04c1a56a48e9aa5b77b87408cad6
+EBUILD tvheadend-9999.ebuild 4273 BLAKE2B df25cdcc7f9bebcb423711cebac099e355d514ca2816ad99f358e5f18efd8e450f68f66bb1541dfa257c83eb6d482899e5dc6eb2f247d44cd549cec3f0002847 SHA512 32496bc56999d7ba908e6b3b1aa175365a18f4cacd331a8e4e7eecd82d66681615ccd24928ec7b45ac936e593803188af88030dc6c9e2f57d91a42e7586e8c43
 MISC metadata.xml 1446 BLAKE2B 622295d497db162d2a214c94187f0e15a9c23b8cc7d484255618f2bb3d10c5de9ecd9aaacbceeb05c27e5d53ffa2338fcd2678cdfdc386104033c1c57aa51c96 SHA512 5e34e61e7ecec9a997ece8b50f6a45f1158e203df0759e08e8d3735a4973baa795a556f9bcac1aaf8069cd25974655adc3f393c0f1670cf6e6a3762903d84759
diff --git a/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild b/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
new file mode 100644
index 000000000000..d151d6b97eea
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="c63115464d8f6556fb4cac93ce8740afea1b00d5"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit linux-info python-single-r1 systemd toolchain-funcs
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/"
+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
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-user/tvheadend
+	virtual/libiconv
+	dbus? ( sys-apps/dbus )
+	dvbcsa? ( media-libs/libdvbcsa )
+	ffmpeg? ( media-video/ffmpeg:=[opus?,vpx?,x264?,x265?] )
+	hdhomerun? ( media-libs/libhdhomerun )
+	dev-libs/openssl:0=
+	uriparser? ( dev-libs/uriparser )
+	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? ( sys-kernel/linux-headers )
+	ffmpeg? (
+		opus? ( media-libs/opus )
+		vpx? ( media-libs/libvpx )
+		x264? ( media-libs/x264 )
+		x265? ( media-libs/x265 )
+	)
+"
+
+RDEPEND+="
+	$(python_gen_cond_dep '
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	dvb? ( media-tv/dtv-scan-tables )
+	xmltv? ( media-tv/xmltv )
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# Some patches from:
+# https://github.com/rpmfusion/tvheadend
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
+	"${FILESDIR}"/${PN}-4.3-hdhomerun.patch
+	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
+	"${FILESDIR}"/${PN}-4.2.7-python3.patch
+)
+
+DOCS=( README.md )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	use inotify &&
+		CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
+}
+
+# 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="$(tc-getPKG_CONFIG)" \
+	econf \
+		--disable-bundle \
+		--disable-ccache \
+		--disable-dvbscan \
+		--disable-ffmpeg_static \
+		--disable-hdhomerun_static \
+		--enable-libfdkaac \
+		--enable-libtheora \
+		--enable-libvorbis \
+		--nowerror \
+		$(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) \
+		$(use_enable inotify) \
+		$(use_enable iptv) \
+		$(use_enable opus libopus) \
+		$(use_enable satip satip_server) \
+		$(use_enable satip satip_client) \
+		$(use_enable systemd libsystemd_daemon) \
+		$(use_enable timeshift) \
+		$(use_enable uriparser) \
+		$(use_enable vpx libvpx) \
+		$(use_enable x264 libx264) \
+		$(use_enable x265 libx265) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable zlib)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"/usr/bin/
+
+	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-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 570fce9e982d..21d9095d7d84 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.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+="
+	$(python_gen_cond_dep '
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
 	dvb? ( media-tv/dtv-scan-tables )
 	xmltv? ( media-tv/xmltv )
 "
 
-REQUIRED_USE="
-	ddci? ( dvb )
-"
-
 # Some patches from:
 # https://github.com/rpmfusion/tvheadend
 
@@ -71,7 +75,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 +134,7 @@ src_compile() {
 
 src_install() {
 	default
+	python_fix_shebang "${ED}"/usr/bin/
 
 	newinitd "${FILESDIR}"/tvheadend.initd tvheadend
 	newconfd "${FILESDIR}"/tvheadend.confd tvheadend