gentoo resync : 15.01.2020

4 files changed, 86 insertions, 6 deletions

diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest
index 7b4d913291ec..f8398d3c16a0 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -1,7 +1,9 @@
 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-674bb5b331240de3ba2a8beb63a1276003e64e3e.tar.bz2 163096 BLAKE2B f451c435b24b69b0b09b5f2f041888ed3593ed7deee727a027672df9dd4d7c9183a68d40751ae5c12765037b4d5520f8ad824ead357b2a6597aaa15be7e573f5 SHA512 f9439a4c3dd453869f9cf3171ddb5e34c2a625d7873cb1648138e4b94715ec3acd8d3db69df5ae5bf1bc21f0401f9b12a126395b0f2696c129ee7725c1715902
+DIST vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2 163403 BLAKE2B 4cacadc091ab8d28ccd4318eaf18aaef8f45e6caab86ef461d1b1047039ec921984ebad091d29420779982b5b37606defe5aa6c6828e8f28788886ba9839efea SHA512 e1eb69f62785178c06fa6700bd1b94ac12f2c58b1a7b8067312613279b59c5ef8157474e27863e8b2d0e47700f67fca7a61595c49809512e9e1efdb27c85eac8
 DIST vdr-streamdev-0.6.1.tgz 186546 BLAKE2B 7d5d92c8ec92e7a57e8e335bdbdf5c91bcbfcdc3ea96fe8154af7015f33d6f2822cf35681a8018cad5b19776199d90870b747bc0a551f42a7b0eedc94f040188 SHA512 bbe6231bd8e69e299c8d94173e7ed4b1f49e5b17b7bcadf2d1e827b5e8dd57c6b975c8c409fd44f252110099b3565a7d4d8c2f7d03636fc2d2e3580d0050d971
-EBUILD vdr-streamdev-0.6.1.ebuild 2960 BLAKE2B 6f051e2857a78856cc9ef8abd7a63635a4ec89ac8063cbf3206b279148c5de86e2c71d3730b1ebb5a194a1280d4f162f2ea867dbf630000659c6f804836ae65d SHA512 3be67d6e4e24a23ec0d92521867cc0ecdad7f230452aeb54417c0953b1ea1b39b87eaf39735bcfb76b4305984bae0f91a57fb8f3840a8aa63fb57cae35135937
-EBUILD vdr-streamdev-0.6.1_p20160320.ebuild 3102 BLAKE2B 275b72276ecc8f22edacdd35b8f743e618aa91e58c58d05756c829cb81af86cbd14082f9b7afc274e4b1f9d1116bab92aaeea60d321fd967834ae61aa36eb513 SHA512 a9cb36573590c62b28087b509dac9bfd4507d176412cd0bb170c8f41255cd9f49e534125121c15f1ed821ee8122c347643b0169e11cc95c0e39098ba85d35dcc
+EBUILD vdr-streamdev-0.6.1.ebuild 2956 BLAKE2B db86b5f2947a2d2a38263a031cf2f51a8275ced65314c645a762c64dce6b860a0620fb585d78dcce0e3c6bb6f7c226d570415d49e228022f7e18791d1edf220c SHA512 59a204d12eee43f9a9bbcd993394e29a4618d13ee9fc6acb129bfcab5f24edadade6049032693edb7f7930382a2c5dfefd08d79fc6ec3cb4a671665446e0a41e
+EBUILD vdr-streamdev-0.6.1_p20160320.ebuild 3098 BLAKE2B c7b3d6db489f772f073077f5a6e25a3cba8f093ec8316e2108e3d1858ad57083d27810cf47c37107f46570c18a55730e22bf886080074855119978efc934c3bc SHA512 37f87dc10bc94c5bd37389292a2617c95879a0f5cea6144db80998bce7ad943c94ca9279e6221200ad006c686adf22472b00d058cfd84ce1877c5055094d7157
+EBUILD vdr-streamdev-0.6.1_p20170930.ebuild 2215 BLAKE2B f960f552495d0bd70e2feffaaea4fa213961921ddbb656acff73de57be61d4f2647ab24cebfbf6e7d5dd57bba3fbf62be0bf97a2c7be9e0361591135dab89743 SHA512 3c605948dcef8ec3d0bc5ac277107f571ec8a13f5b7c70e16b27b5992102e8f7f7c8a3547488ed4adb359ce3609636521f156f4211ab9dbc9d8c92ff2ff4e3ab
 MISC metadata.xml 540 BLAKE2B 3c69478def52669a549baee4a05af5a1b169bd8fb32ff774c465739f73a5b42bd92d7e294e1937c8d23daf7820055175ebe601ddc91b276533381812b5213d25 SHA512 7d8ee3fa799171758e6a5a174da5ad25b1d15b3099e9891f285cbffa163ced341347a550af2aa3a9e33612b1eac571feabf538bf0cccb9bd953568acaebd308b
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild
index bdacdc2493dd..86fe10fda4b8 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="client +server"
+IUSE="client server"
 
 DEPEND=">=media-video/vdr-1.7.25"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild
index 8e69d5831329..855928673f01 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapsho
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="client +server"
+IUSE="client server"
 
 DEPEND=">=media-video/vdr-1.7.25"
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
new file mode 100644
index 000000000000..b5c3b4f0a9cc
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="e2a9b979d3fb92967c7a6a8221e674eb7e55c813"
+
+DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-streamdev"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-${GIT_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="client server"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND=">=media-video/vdr-2.3"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-streamdev-.*
+	usr/lib64/vdr/plugins/libvdr-streamdev-.*"
+S="${WORKDIR}/vdr-plugin-streamdev-${GIT_VERSION}"
+
+# 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"
+
+	# rm unneeded entry
+	sed -i Makefile -e "s:-I\$(VDRDIR)/include::" || die "modify Makefile failed"
+
+	vdr-plugin-2_src_prepare
+
+	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
+	fi
+}