gentoo auto-resync : 14:06:2024 - 00:09:04

3 files changed, 4 insertions, 84 deletions

diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest
index 9deda12234ff..1e1422c3a1ca 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -1,8 +1,6 @@
 AUX confd-0.6.0 763 BLAKE2B 0034f680c9505a3af427d137d58ac4c64903662bf9ccd91692c5ea2f5aea4566557bbbc04872a04807751d55276316521d62ab8a526269235ddc7eee39ae4d19 SHA512 4e903271bd71ae285e83032ed6694053e1335346e4b27e1bde5b5545c2e0f1ce01e548f09cb15c938ed2f227fb565a1af2d43c774098b5aa5ed457a9d7ed1767
 AUX rc-addon-0.6.0.sh 727 BLAKE2B 88b49c42909fd14da2f428255a3abe0683c43532a4a2186a9a51673fad075ce2d1f309ed0d6140d016fd2cf9a8f91944021c3e3730ebc4fed0aa451a03864900 SHA512 36a04a5bcd7d0cc097b3b245108eb8451450c8a1d02afd6fdbc543e99c6e4613d8d93de9cbca0cfc526e177db39220009a77fd53f54e7b64b04a69fdf9ffa494
 AUX vdr-streamdev-0.6.3-Makefile.patch 1266 BLAKE2B 8b2248a625463df9b37d84d99a158fbeb2912151f385114af286d9106b55caa4e93e73c14dcde5e027bcdfd0c1e66eb480ae4d0ae3f0b1cf9f673af72058018b SHA512 02d7f7dd2f26bf4b2510540f34f87211cfe00b8ff3d6ff0ef3435656d69b0059b3b98f6e8f707287ddee5fee4dee24584383cacfa1118432677d3f8b7e924cd4
-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
-EBUILD vdr-streamdev-0.6.3.ebuild 2299 BLAKE2B 727db551f357a2262ec8fe9a3e750de1c90502715dcc845083ffe623b8c2c170b6eb110b30141d712cc448f52c0952c15ed9a1d747cda80d6aae7e3cc9ed7b9b SHA512 02552f4546377ec4688f815ce1c4fb89614d29abb5f2e6fc6401823669339fed65ca6c3e11c838719c9bed5a3bb86d863a8ae8207f60d452eb379cbefe8612aa
+EBUILD vdr-streamdev-0.6.3.ebuild 2284 BLAKE2B 33f906a055a711b752cca63e7f8de4d5685ce832cd589b44ec4c1f43da64b86e2b7ad5da586a0cad536bcc84af2c94d6f2ee4b8c7c2e7dd94a240d88f4d383b4 SHA512 9f0d67a24d145c75bc4b99eb688135bc0ccaab37a7c4ea96df9a1da57ac7a877192e4a7628c3354037878629fcb278475b48afd61deb85d6e58933cbab40d4dd
 MISC metadata.xml 926 BLAKE2B c84cee225cdde5fc88af25fc506ec0c90aa18aa675ddca16a42af3801007c8a688befd24feb1393f515393dadeaaeb5c410ece8d7af74f9599cd9cfa82b2bbda SHA512 a8e079a26afe5b74424eb691bfa08758eaf5968b894fe2b4311dea9b0d1910faa53a4ddc6c66879322fe67c9714f0aaf631a3a8e1f5f7cfc7d95a87e23186114
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
deleted file mode 100644
index 3be806ff9c96..000000000000
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20170930.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020-2021 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
-}
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
index 378c2ef62603..a4a1120a119c 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,6 @@ REQUIRED_USE="|| ( client server )"
 
 DEPEND="acct-user/vdr
 	>=media-video/vdr-2.3"
-BDEPEND="${DEPEND}"
 RDEPEND="${DEPEND}"
 
 QA_FLAGS_IGNORED="
@@ -79,6 +78,7 @@ 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
+		mv "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf \
+			"${EROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf || die
 	fi
 }