cleanup; stable amd64 x86, bug 422117

(Portage version: 2.1.10.11/cvs/Linux i686)

6 files changed, 9 insertions, 187 deletions

diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog
index 0658ffa6ca8b..3381758745fd 100644
--- a/media-plugins/vdr-streamdev/ChangeLog
+++ b/media-plugins/vdr-streamdev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-streamdev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.18 2012/05/12 16:16:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.19 2012/07/01 14:50:16 hd_brummy Exp $
+
+  01 Jul 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-streamdev-0.3.4-gentoo.diff, -vdr-streamdev-0.5.1-r1.ebuild,
+  -vdr-streamdev-0.5.1_p20120311.ebuild,
+  -files/vdr-streamdev-0.5.1_vdr-1.7.25.diff, vdr-streamdev-0.5.2.ebuild:
+  cleanup; stable amd64 x86, bug 422117
 
 *vdr-streamdev-0.5.2 (12 May 2012)
 
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.3.4-gentoo.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.3.4-gentoo.diff
deleted file mode 100644
index 5a5278f6d364..000000000000
--- a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.3.4-gentoo.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-will change config dir to /etc/vdr/plugins/${pluginname}
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 10 May 2007
-
-diff -Naur streamdev-20070510.orig/server/server.h streamdev-20070510/server/server.h
---- streamdev-20070510.orig/server/server.h	2007-05-10 17:02:45.084274870 +0200
-+++ streamdev-20070510/server/server.h	2007-05-10 17:10:32.652139993 +0200
-@@ -10,7 +10,7 @@
- #include "server/component.h"
- #include "server/connection.h"
- 
--#define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory(), "streamdevhosts.conf"))
-+#define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory( "streamdev" ), "streamdevhosts.conf"))
- 
- class cStreamdevServer: public cThread {
- private:
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff
deleted file mode 100644
index 32b9cc9664f2..000000000000
--- a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- streamdev/client/device.c.bak	2012-03-03 15:27:48.000000000 +0100
-+++ streamdev/client/device.c	2012-03-03 15:28:07.000000000 +0100
-@@ -313,8 +313,8 @@
- 		m_Device->Lock();
- 		if (m_Device->m_UpdatePriority && ClientSocket.DataSocket(siLive)) {
- 			int Priority = m_Device->Priority();
--			if (m_Device == cDevice::ActualDevice() && Priority < Setup.PrimaryLimit)
--				Priority = Setup.PrimaryLimit;
-+			if (m_Device == cDevice::ActualDevice() && Priority < 0)
-+				Priority = 0;
- 			if (m_Device->m_Priority != Priority && ClientSocket.SetPriority(Priority))
- 				m_Device->m_Priority = Priority;
- 		}
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild
deleted file mode 100644
index 442f2c4bec17..000000000000
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 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.1-r1.ebuild,v 1.1 2012/03/03 20:52:08 hd_brummy Exp $
-
-EAPI="4"
-
-inherit vdr-plugin
-
-VERSION="497" # every bump, new version !
-
-DESCRIPTION="VDR Plugin: Client/Server streaming plugin"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-streamdev"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="client +server"
-
-DEPEND=">=media-video/vdr-1.5.9"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=" || ( client server ) "
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.25"; then
-		epatch "${FILESDIR}/${P}_vdr-1.7.25.diff"
-	fi
-
-	# 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
-
-	sed -i server/Makefile \
-		-i client/Makefile \
-		-e "s:\$(CXXFLAGS) -shared:\$(CXXFLAGS) \$(LDFLAGS) -shared:"
-
-	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.1_p20120311.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1_p20120311.ebuild
deleted file mode 100644
index 627b4aefb7f3..000000000000
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1_p20120311.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 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.1_p20120311.ebuild,v 1.2 2012/05/01 17:45:08 hd_brummy Exp $
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-#VERSION="497" # every bump, new version !
-
-DESCRIPTION="VDR Plugin: Client/Server streaming plugin"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-streamdev"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="client +server"
-
-DEPEND=">=media-video/vdr-1.5.9"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=" || ( client server ) "
-
-# vdr-plugin-2.eclass changes
-PO_SUBDIR="client server"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	# 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
-
-	sed -i server/Makefile \
-		-i client/Makefile \
-		-e "s:\$(CXXFLAGS) -shared:\$(CXXFLAGS) \$(LDFLAGS) -shared:"
-
-	fix_vdr_libsi_include server/livestreamer.c
-}
-
-src_install() {
-	vdr-plugin-2_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-2_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.2.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild
index 32089234cff1..61b7b52acfde 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2.ebuild,v 1.1 2012/05/12 16:16:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild,v 1.2 2012/07/01 14:50:16 hd_brummy Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="client +server"
 
 DEPEND=">=media-video/vdr-1.6"