cleanup, version bump (taken from vdr-devel overlay)

(Portage version: 2.1.9.24/cvs/Linux i686)

8 files changed, 110 insertions, 248 deletions

diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog
index fafaf31266c9..47ec30b36e5b 100644
--- a/media-plugins/vdr-streamdev/ChangeLog
+++ b/media-plugins/vdr-streamdev/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-plugins/vdr-streamdev
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.10 2010/05/05 15:17:49 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.11 2011/01/17 17:07:34 hd_brummy Exp $
+
+*vdr-streamdev-0.5.0 (17 Jan 2011)
+
+  17 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-streamdev-0.5.0_pre20090706.ebuild,
+  -vdr-streamdev-0.5.0_pre20100124.ebuild,
+  -vdr-streamdev-0.5.0_pre20100505.ebuild, +files/confd-0.5.0,
+  +vdr-streamdev-0.5.0.ebuild,
+  -files/vdr-streamdev-0.5.0-externremux-path.diff,
+  +files/rc-addon-0.5.0.sh:
+  cleanup, version bump (taken from vdr-devel overlay)
 
 *vdr-streamdev-0.5.0_pre20100505 (05 May 2010)
 
diff --git a/media-plugins/vdr-streamdev/files/confd-0.5.0 b/media-plugins/vdr-streamdev/files/confd-0.5.0
new file mode 100644
index 000000000000..e57f06dc5ada
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/confd-0.5.0
@@ -0,0 +1,10 @@
+# /etc/conf.d/vdr.streamdev
+
+# Use your own remux script 
+#
+# default streamdevserver remux script used
+# take a look in the README for handling
+#
+# allowed values: way to your script
+
+#STREAMDEV_REMUX_SCRIPT="/way/to/your/remux-script"
diff --git a/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh b/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh
new file mode 100644
index 000000000000..96da8712d579
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh
@@ -0,0 +1,12 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh,v 1.1 2011/01/17 17:07:34 hd_brummy Exp $
+#
+# rc-addon-script for plugin streamdev-server
+#
+# Joerg Bornkessel <hd_brummy@g.o>
+
+plugin_pre_vdr_start() {
+
+		: ${STREAMDEV_REMUX_SCRIPT:=/usr/share/vdr/streamdev/externremux.sh}
+
+		add_plugin_param "-r ${STREAMDEV_REMUX_SCRIPT}"
+}
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.0-externremux-path.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.0-externremux-path.diff
deleted file mode 100644
index 9b1ebe342e8d..000000000000
--- a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.0-externremux-path.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur streamdev-0.5.0.20090611.orig/server/server.h streamdev-0.5.0.20090611/server/server.h
---- streamdev-0.5.0.20090611.orig/server/server.h	2009-07-05 05:04:55.000000000 +0200
-+++ streamdev-0.5.0.20090611/server/server.h	2009-07-05 05:07:31.000000000 +0200
-@@ -10,7 +10,7 @@
- #include "server/component.h"
- #include "server/connection.h"
- 
--#define DEFAULT_EXTERNREMUX (*AddDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N), "externremux.sh"))
-+#define DEFAULT_EXTERNREMUX (*AddDirectory("/usr/share/vdr/streamdev", "externremux.sh"))
- #define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N), "streamdevhosts.conf"))
- 
- extern char *opt_auth;
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0.ebuild
new file mode 100644
index 000000000000..ae5b615e812b
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0.ebuild,v 1.1 2011/01/17 17:07:34 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="VDR Plugin: Client/Server streaming plugin"
+HOMEPAGE="http://streamdev.vdr-developer.org/"
+SRC_URI="http://streamdev.vdr-developer.org/releases/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+client +server"
+
+DEPEND=">=media-video/vdr-1.5.9"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	if ! use client && ! use server; then
+		die "no plugins selected, change useflags and enable at least client or server!"
+	fi
+}
+
+src_prepare() {
+	vdr-plugin_src_prepare
+	cd "${S}"
+
+	# make subdir libdvbmpeg respect CXXFLAGS
+	sed -i Makefile \
+		-e '/CXXFLAGS.*+=/s:^:#:'
+
+	for flag in client server; do
+		if ! use ${flag}; then
+			sed -i Makefile \
+				-e '/^.PHONY:/s/'${flag}'//' \
+				-e '/^all:/s/'${flag}'//'
+		fi
+	done
+
+	fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	cd "${S}"
+	if use server; then
+		insinto /etc/vdr/plugins/streamdev-server
+		newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
+		chown vdr:vdr "${D}"/etc/vdr -R
+
+		insinto /usr/share/vdr/streamdev
+		doins streamdev-server/externremux.sh
+
+		insinto /usr/share/vdr/rcscript
+		newins "${FILESDIR}"/rc-addon-0.5.0.sh plugin-streamdev-server.sh
+
+		insinto /etc/conf.d
+		newins "${FILESDIR}"/confd-0.5.0 vdr.streamdev-server
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	if [[ -e "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf ]]; then
+		einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev-server/"
+		mv "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf
+	fi
+}
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20090706.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20090706.ebuild
deleted file mode 100644
index 787a9676cf61..000000000000
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20090706.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20090706.ebuild,v 1.2 2010/05/05 15:17:49 hd_brummy Exp $
-
-EAPI="1"
-
-MY_P=${PN}-${PV/_pre/-pre-}
-inherit vdr-plugin eutils
-
-DESCRIPTION="Video Disk Recorder Client/Server streaming plugin"
-HOMEPAGE="http://streamdev.vdr-developer.org/"
-SRC_URI="http://streamdev.vdr-developer.org/snapshots/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +server"
-
-DEPEND=">=media-video/vdr-1.6.0
-	!media-plugins/vdr-streamdev-client
-	!media-plugins/vdr-streamdev-server"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use client && ! use server; then
-		die "no plugins selected, change useflags and enable at least client or server!"
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-	cd "${S}"
-
-	epatch "${FILESDIR}/vdr-streamdev-0.5.0-externremux-path.diff"
-
-	# make subdir libdvbmpeg respect CXXFLAGS
-	sed -i libdvbmpeg/Makefile \
-		-e 's:CFLAGS =  -g -Wall -O2:CFLAGS = $(CXXFLAGS) :'
-
-	for flag in client server; do
-		if ! use ${flag}; then
-			sed -i Makefile \
-				-e '/^all:/s/libvdr-$(PLUGIN)-'${flag}'.so//'
-		fi
-	done
-
-	fix_vdr_libsi_include server/livestreamer.c
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"
-	if use server; then
-		insinto /etc/vdr/plugins/streamdev
-		doins streamdev/streamdevhosts.conf
-		chown vdr:vdr "${D}"/etc/vdr -R
-
-		dodoc streamdev/externremux.sh
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-	elog "If you want to use the externremux-feature, then put"
-	elog "your custom script as /usr/share/vdr/streamdev/externremux.sh"
-
-	if [[ -e "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf ]]; then
-		einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev/"
-		mv "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf
-	fi
-}
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100124.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100124.ebuild
deleted file mode 100644
index 34fbf6cde99f..000000000000
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100124.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100124.ebuild,v 1.2 2010/05/05 15:17:49 hd_brummy Exp $
-
-EAPI="2"
-
-MY_P="${PN}-${PV/_pre/-pre-}"
-inherit vdr-plugin eutils
-
-DESCRIPTION="vdr Plugin: Client/Server streaming plugin"
-HOMEPAGE="http://streamdev.vdr-developer.org/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+client +server"
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use client && ! use server; then
-		die "no plugins selected, change useflags and enable at least client or server!"
-	fi
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-	cd "${S}"
-
-	# Moving externremux.sh out of /root
-	sed -i remux/extern.c \
-		-e "s#/root/externremux.sh#${EXTERNREMUX_PATH}#"
-
-	# make subdir libdvbmpeg respect CXXFLAGS
-	sed -i Makefile \
-		-e '/CXXFLAGS.*+=/s:^:#:'
-	sed -i libdvbmpeg/Makefile \
-		-e 's:CFLAGS =  -g -Wall -O2:CFLAGS = $(CXXFLAGS) :'
-
-	for flag in client server; do
-		if ! use ${flag}; then
-			sed -i Makefile \
-				-e '/^all:/s/libvdr-$(PLUGIN)-'${flag}'.so//'
-		fi
-	done
-
-	fix_vdr_libsi_include server/livestreamer.c
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"
-	if use server; then
-		insinto /etc/vdr/plugins/streamdev
-		newins streamdev/streamdevhosts.conf streamdevhosts.conf
-		chown vdr:vdr "${D}"/etc/vdr -R
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	elog "If you want to use the externremux-feature, then put"
-	elog "your custom script as ${EXTERNREMUX_PATH}."
-
-	if [[ -e "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf ]]; then
-		einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev/"
-		mv "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf
-	fi
-}
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100505.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100505.ebuild
deleted file mode 100644
index 6da7874adbdf..000000000000
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100505.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.5.0_pre20100505.ebuild,v 1.1 2010/05/05 15:17:49 hd_brummy Exp $
-
-EAPI="2"
-
-MY_P="${PN}-${PV/_pre/-pre-}"
-inherit vdr-plugin eutils
-
-DESCRIPTION="vdr Plugin: Client/Server streaming plugin"
-HOMEPAGE="http://streamdev.vdr-developer.org/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+client +server"
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use client && ! use server; then
-		die "no plugins selected, change useflags and enable at least client or server!"
-	fi
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-	cd "${S}"
-
-	# Moving externremux.sh out of /root
-	sed -i remux/extern.c \
-		-e "s#/root/externremux.sh#${EXTERNREMUX_PATH}#"
-
-	# make subdir libdvbmpeg respect CXXFLAGS
-	sed -i Makefile \
-		-e '/CXXFLAGS.*+=/s:^:#:'
-	sed -i libdvbmpeg/Makefile \
-		-e 's:CFLAGS =  -g -Wall -O2:CFLAGS = $(CXXFLAGS) :'
-
-	for flag in client server; do
-		if ! use ${flag}; then
-			sed -i Makefile \
-				-e '/^all:/s/libvdr-$(PLUGIN)-'${flag}'.so//'
-		fi
-	done
-
-	fix_vdr_libsi_include server/livestreamer.c
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"
-	if use server; then
-		insinto /etc/vdr/plugins/streamdev
-		newins streamdev/streamdevhosts.conf streamdevhosts.conf
-		chown vdr:vdr "${D}"/etc/vdr -R
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	elog "If you want to use the externremux-feature, then put"
-	elog "your custom script as ${EXTERNREMUX_PATH}."
-
-	if [[ -e "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf ]]; then
-		einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev/"
-		mv "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf
-	fi
-}