Block vdr-streamdev package. Fix minor errors.

Package-Manager: portage-2.1.5.6

4 files changed, 35 insertions, 26 deletions

diff --git a/media-plugins/vdr-streamdev-server/ChangeLog b/media-plugins/vdr-streamdev-server/ChangeLog
index 3bc2f71b5e75..ba4474974a3c 100644
--- a/media-plugins/vdr-streamdev-server/ChangeLog
+++ b/media-plugins/vdr-streamdev-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-streamdev-server
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.18 2007/05/10 18:35:06 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.19 2008/06/18 16:34:10 zzam Exp $
+
+  18 Jun 2008; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-streamdev-server-0.3.3_pre20060502.ebuild,
+  vdr-streamdev-server-0.3.3_pre20061206.ebuild,
+  vdr-streamdev-server-0.3.3_pre20070510.ebuild:
+  Block vdr-streamdev package. Fix minor errors.
 
   10 May 2007; Matthias Schwarzott <zzam@gentoo.org>
   files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff:
diff --git a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild
index 8c067e77835e..18dddf75c7ef 100644
--- a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild
+++ b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild,v 1.6 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild,v 1.7 2008/06/18 16:34:10 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -14,10 +14,11 @@ SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.24"
+DEPEND=">=media-video/vdr-1.3.24
+	!media-plugins/vdr-streamdev"
 
 S=${WORKDIR}/${VDRPLUGIN_BASE}
 
@@ -25,10 +26,10 @@ VDRPLUGIN_MAKE_TARGET="libvdr-${VDRPLUGIN}.so"
 
 src_unpack() {
 	vdr-plugin_src_unpack
-	cd ${S}
+	cd "${S}"
 
 	if grep -q "virtual bool Active" /usr/include/vdr/plugin.h; then
-		epatch ${FILESDIR}/${PN}-${MY_PV}-old-vdr-headers.diff
+		epatch "${FILESDIR}/${PN}-${MY_PV}-old-vdr-headers.diff"
 	fi
 
 	# make subdir libdvbmpeg respect CXXFLAGS
@@ -41,8 +42,8 @@ src_unpack() {
 src_install() {
 	vdr-plugin_src_install
 
-	cd ${S}
+	cd "${S}"
 	insinto /etc/vdr/plugins
 	newins streamdevhosts.conf.example streamdevhosts.conf
-	chown vdr:vdr ${D}/etc/vdr -R
+	chown vdr:vdr "${D}"/etc/vdr -R
 }
diff --git a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20061206.ebuild b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20061206.ebuild
index 59dcf796244d..bcb67160c42c 100644
--- a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20061206.ebuild
+++ b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20061206.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20061206.ebuild,v 1.4 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20061206.ebuild,v 1.5 2008/06/18 16:34:10 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -14,10 +14,11 @@ SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.24"
+DEPEND=">=media-video/vdr-1.3.24
+	!media-plugins/vdr-streamdev"
 
 S=${WORKDIR}/${MY_P}
 
@@ -27,7 +28,7 @@ EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh
 
 src_unpack() {
 	vdr-plugin_src_unpack
-	cd ${S}
+	cd "${S}"
 
 	#seems to no longer work, if needed, please open a bug
 	#if grep -q "virtual bool Active" /usr/include/vdr/plugin.h; then
@@ -48,10 +49,10 @@ src_unpack() {
 src_install() {
 	vdr-plugin_src_install
 
-	cd ${S}
+	cd "${S}"
 	insinto /etc/vdr/plugins
 	newins streamdevhosts.conf.example streamdevhosts.conf
-	chown vdr:vdr ${D}/etc/vdr -R
+	chown vdr:vdr "${D}"/etc/vdr -R
 }
 
 pkg_postinst() {
diff --git a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild
index bf7743fa4209..a5468e85bb8b 100644
--- a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild
+++ b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild,v 1.3 2007/05/10 15:51:43 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild,v 1.4 2008/06/18 16:34:10 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -15,14 +15,15 @@ SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.24"
+DEPEND=">=media-video/vdr-1.3.24
+	!media-plugins/vdr-streamdev"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES="${FILESDIR}/${P}-gentoo.diff"
+PATCHES=("${FILESDIR}/${P}-gentoo.diff")
 
 VDRPLUGIN_MAKE_TARGET="libvdr-${VDRPLUGIN}.so"
 
@@ -30,7 +31,7 @@ EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh
 
 src_unpack() {
 	vdr-plugin_src_unpack
-	cd ${S}
+	cd "${S}"
 
 	#seems to no longer work, if needed, please open a bug
 	#if grep -q "virtual bool Active" /usr/include/vdr/plugin.h; then
@@ -53,10 +54,10 @@ src_unpack() {
 src_install() {
 	vdr-plugin_src_install
 
-	cd ${S}
+	cd "${S}"
 	insinto /etc/vdr/plugins/streamdev
 	newins streamdevhosts.conf.example streamdevhosts.conf
-	chown vdr:vdr ${D}/etc/vdr -R
+	chown vdr:vdr "${D}"/etc/vdr -R
 }
 
 pkg_postinst() {
@@ -66,7 +67,7 @@ pkg_postinst() {
 
 	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
+		mv "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf
 	fi
 
 }