gentoo resync : 29.12.2022

3 files changed, 97 insertions, 10 deletions

diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest
index 5d4bd3bd120c..206412667485 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -1,5 +1,7 @@
 AUX confd-0.6.0 763 BLAKE2B 0034f680c9505a3af427d137d58ac4c64903662bf9ccd91692c5ea2f5aea4566557bbbc04872a04807751d55276316521d62ab8a526269235ddc7eee39ae4d19 SHA512 4e903271bd71ae285e83032ed6694053e1335346e4b27e1bde5b5545c2e0f1ce01e548f09cb15c938ed2f227fb565a1af2d43c774098b5aa5ed457a9d7ed1767
 AUX rc-addon-0.6.0.sh 727 BLAKE2B 88b49c42909fd14da2f428255a3abe0683c43532a4a2186a9a51673fad075ce2d1f309ed0d6140d016fd2cf9a8f91944021c3e3730ebc4fed0aa451a03864900 SHA512 36a04a5bcd7d0cc097b3b245108eb8451450c8a1d02afd6fdbc543e99c6e4613d8d93de9cbca0cfc526e177db39220009a77fd53f54e7b64b04a69fdf9ffa494
 DIST vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2 163403 BLAKE2B 4cacadc091ab8d28ccd4318eaf18aaef8f45e6caab86ef461d1b1047039ec921984ebad091d29420779982b5b37606defe5aa6c6828e8f28788886ba9839efea SHA512 e1eb69f62785178c06fa6700bd1b94ac12f2c58b1a7b8067312613279b59c5ef8157474e27863e8b2d0e47700f67fca7a61595c49809512e9e1efdb27c85eac8
+DIST vdr-streamdev-0.6.3.tar.gz 196906 BLAKE2B 300c24aac6f0c59fc438eafa9a300e0b68dbfb43064cf887ab9d1fbdc1b22a8ec5349a38fa5c2188ef78dbc1ac7f238e88abe0ed9d1cbcd01e4a1afde7b890cf SHA512 2c949f08f399f2570a54da67809235b6882d594fc5583b27df96b3e87951bcfc62f96c9aef715130540620cbe54f028106598941fe8cbdb80b3d0943009c039f
 EBUILD vdr-streamdev-0.6.1_p20170930.ebuild 2218 BLAKE2B 32074008f255993549ba8d5096280dfdbcc62b8a9c9f6ec288f1e687ac3d54375751dc26eaae07f5a123a4aec5ace97e8db2075b4694b864caab4969e1c9afb0 SHA512 f1e8c981d96222aa0ef8462671038f0b25c5a6808e683edf34d0f70cbac3457d9fe2163c99e0b6c4ee2cf58113dbd738b7c1063a06db5678c16409a8700a027f
-MISC metadata.xml 541 BLAKE2B e9305e10e44db453419b3c14fe7e204430792b06c4750f495742e14bb5029ef0d73544e390c6336f897bccb066aaf0f0784aa3614a14f6647206bfeb18457583 SHA512 a058d60cb4f9aae3b8eab0dc8ca97883a5e3607dbf108d8447f9121bcb20557425666a26ca445fa6553cb73f6ecac9644eec1451701e0f3774b77f0282221293
+EBUILD vdr-streamdev-0.6.3.ebuild 2196 BLAKE2B 95817625ae55fd0ef9eb4760531cc74f18e0335fb7001ecc0854b617a2ed26c0ac09e2c5d9c6690e8f303c096e897a71ea6db27e6a4260dcd224767caa972071 SHA512 04004ee42b6b359749e0bf2575a9cf54e5f331d72cbd74e291f4302edf879122bf18adf2bef22870c1f6c631d518cc5d79ebce5037ec1be15f61eb3225bc6d53
+MISC metadata.xml 926 BLAKE2B c84cee225cdde5fc88af25fc506ec0c90aa18aa675ddca16a42af3801007c8a688befd24feb1393f515393dadeaaeb5c410ece8d7af74f9599cd9cfa82b2bbda SHA512 a8e079a26afe5b74424eb691bfa08758eaf5968b894fe2b4311dea9b0d1910faa53a4ddc6c66879322fe67c9714f0aaf631a3a8e1f5f7cfc7d95a87e23186114
diff --git a/media-plugins/vdr-streamdev/metadata.xml b/media-plugins/vdr-streamdev/metadata.xml
index 6ecec60aea2b..a4f638e9ccf0 100644
--- a/media-plugins/vdr-streamdev/metadata.xml
+++ b/media-plugins/vdr-streamdev/metadata.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<use>
-		<flag name="client">
-			Compile the VDR plugin vdr-streamdev-client
-			that acts like a dvb-budget card
-		</flag>
-		<flag name="server">
-			Compile the VDR plugin vdr-streamdev-server
-			that allows remote systems to access the
-			DVB cards used for the local VDR
-		</flag>
+		<flag name="client">Compile the VDR plugin vdr-streamdev-client that can connect a vdr to a
+			remote streamdev-server instance</flag>
+		<flag name="server">Compile the VDR plugin vdr-streamdev-server that allows remote systems to access the
+			vdr using streamdev-specific VTP and HTTP protocol</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">vdr-projects/vdr-plugin-streamdev</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
new file mode 100644
index 000000000000..3565a40465d6
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
+HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-streamdev"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vdr-plugin-streamdev-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="client +server"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="acct-user/vdr
+	>=media-video/vdr-2.3"
+BDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-streamdev-.*
+	usr/lib64/vdr/plugins/libvdr-streamdev-.*"
+
+# vdr-plugin-2.eclass changes
+PO_SUBDIR="client server"
+
+src_prepare() {
+	# make detection in vdr-plugin-2.eclass for new Makefile handling happy
+	echo "# SOFILE" >> Makefile || die "modify Makefile failed"
+
+	# remove unnecessary include
+	sed -i Makefile -e "s:-I\$(VDRDIR)/include::" || die "modify Makefile failed"
+
+	vdr-plugin-2_src_prepare
+
+	local flag
+	for flag in client server; do
+		if ! use ${flag}; then
+			sed -i Makefile \
+				-e '/^.PHONY:/s/'${flag}'//' \
+				-e '/^.PHONY:/s/'install-${flag}'//' \
+				-e '/^all:/s/'${flag}'//' \
+				-e '/^install:/s/'install-${flag}'//' || die "modify Makefile failed"
+		fi
+	done
+
+	fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	if use server; then
+		insinto /usr/share/vdr/streamdev
+		doins streamdev-server/externremux.sh
+
+		insinto /usr/share/vdr/rcscript
+		newins "${FILESDIR}"/rc-addon-0.6.0.sh plugin-streamdev-server.sh
+
+		newconfd "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server
+
+		insinto /etc/vdr/plugins/streamdev-server
+		newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
+		fowners vdr:vdr /etc/vdr -R
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if [[ -e "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf ]]; then
+		einfo "move config file to new config DIR ${EROOT}/etc/vdr/plugins/streamdev-server/"
+		mv "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf "${EROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf || die
+	fi
+}