Fixed rc-addon, and added a new version with moved mute-directory.

(Portage version: 2.1.2_pre2-r6)

8 files changed, 92 insertions, 14 deletions

diff --git a/media-plugins/vdr-bitstreamout/ChangeLog b/media-plugins/vdr-bitstreamout/ChangeLog
index 7c286cd48350..e50f19c8a5f2 100644
--- a/media-plugins/vdr-bitstreamout/ChangeLog
+++ b/media-plugins/vdr-bitstreamout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-bitstreamout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/ChangeLog,v 1.6 2006/08/16 08:34:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/ChangeLog,v 1.7 2006/10/08 13:54:06 zzam Exp $
+
+*vdr-bitstreamout-0.85-r1 (08 Oct 2006)
+
+  08 Oct 2006; Matthias Schwarzott <zzam@gentoo.org> +files/confd-0.85,
+  +files/rc-addon.sh-0.85, files/confd, files/rc-addon.sh,
+  vdr-bitstreamout-0.85.ebuild, +vdr-bitstreamout-0.85-r1.ebuild:
+  Fixed rc-addon, and added a new version with moved mute-directory.
 
   16 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
   -vdr-bitstreamout-0.84.ebuild, vdr-bitstreamout-0.85.ebuild:
diff --git a/media-plugins/vdr-bitstreamout/files/confd b/media-plugins/vdr-bitstreamout/files/confd
index d626bdaaa01f..5e1e87d666db 100644
--- a/media-plugins/vdr-bitstreamout/files/confd
+++ b/media-plugins/vdr-bitstreamout/files/confd
@@ -1,12 +1,11 @@
 # /etc/conf.d/vdr.bitstreamout:
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/files/confd,v 1.2 2006/03/14 19:36:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/files/confd,v 1.3 2006/10/08 13:54:07 zzam Exp $
 
 # Global config file for vdr plugin bitstreamout
 
-# You may use mute.sh for muting the S/P-DIF out of the
-# sound card even if not used for AC3.  Note that this
-# script is designed for a C-Media PCI CMI8738 based sound card.
-# Please modify vdr_mute.sh depending of your sound-card
-#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_cmi8738.sh"
-#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_soundblaster.sh"
+# You may use some mute-script for muting the S/P-DIF out of the
+# sound card even if not used for AC3.
+# You can create your own mute-script under /usr/share/vdr/bitstreamout if needed
+#BITSTREAMOUT_MUTE="cmi8738"
+#BITSTREAMOUT_MUTE="soundblaster"
 
diff --git a/media-plugins/vdr-bitstreamout/files/confd-0.85 b/media-plugins/vdr-bitstreamout/files/confd-0.85
new file mode 100644
index 000000000000..cabb1d23552e
--- /dev/null
+++ b/media-plugins/vdr-bitstreamout/files/confd-0.85
@@ -0,0 +1,12 @@
+# /etc/conf.d/vdr.bitstreamout:
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/files/confd-0.85,v 1.1 2006/10/08 13:54:07 zzam Exp $
+
+# Global config file for vdr plugin bitstreamout
+
+# You may use mute.sh for muting the S/P-DIF out of the
+# sound card even if not used for AC3.  Note that this
+# script is designed for a C-Media PCI CMI8738 based sound card.
+# Please modify vdr_mute.sh depending of your sound-card
+#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_cmi8738.sh"
+#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_soundblaster.sh"
+
diff --git a/media-plugins/vdr-bitstreamout/files/digest-vdr-bitstreamout-0.85-r1 b/media-plugins/vdr-bitstreamout/files/digest-vdr-bitstreamout-0.85-r1
new file mode 100644
index 000000000000..153710435901
--- /dev/null
+++ b/media-plugins/vdr-bitstreamout/files/digest-vdr-bitstreamout-0.85-r1
@@ -0,0 +1,3 @@
+MD5 f30e23e10ecad1e4ecf24bd261f7b8ba vdr-bitstreamout-0.85.tar.bz2 168603
+RMD160 053cbb7434df36639117c15185fd40b055e89d16 vdr-bitstreamout-0.85.tar.bz2 168603
+SHA256 8c7084defdce262f57adb37b5dc053675689c340813d10783cf26a4eb781d3e8 vdr-bitstreamout-0.85.tar.bz2 168603
diff --git a/media-plugins/vdr-bitstreamout/files/rc-addon.sh b/media-plugins/vdr-bitstreamout/files/rc-addon.sh
index a6815bf3a955..38e34ad6ee91 100755
--- a/media-plugins/vdr-bitstreamout/files/rc-addon.sh
+++ b/media-plugins/vdr-bitstreamout/files/rc-addon.sh
@@ -1,10 +1,19 @@
 # plugin-startup-skript for bitstreamout-plugin
 
 plugin_pre_vdr_start() {
-	[[ -n "${BITSTREAMOUT_MUTE}" ]] && "--mute=${BITSTREAMOUT_MUTE}"
-}
+	if [[ -n "${BITSTREAMOUT_MUTE}" ]]; then
+		local mydir=/usr/share/vdr/bitstreamout
+
+		if [[ ${BITSTREAMOUT_MUTE:0:1} != "/" ]] && [[ -x ${mydir}/mute_${BITSTREAMOUT_MUTE}.sh ]]; then
+			BITSTREAMOUT_MUTE=${mydir}/mute_${BITSTREAMOUT_MUTE}.sh
+		fi
 
-if [[ ${SCRIPT_API:-1} -lt 2 ]]; then
-	plugin_pre_vdr_start
-fi
+
+		if [[ -x ${BITSTREAMOUT_MUTE} ]]; then
+			add_plugin_param "--mute=${BITSTREAMOUT_MUTE}"
+		else
+			einfo "  bitstreamout: ${BITSTREAMOUT_MUTE} is not executable"
+		fi
+	fi
+}
 
diff --git a/media-plugins/vdr-bitstreamout/files/rc-addon.sh-0.85 b/media-plugins/vdr-bitstreamout/files/rc-addon.sh-0.85
new file mode 100755
index 000000000000..113ccdaed5d6
--- /dev/null
+++ b/media-plugins/vdr-bitstreamout/files/rc-addon.sh-0.85
@@ -0,0 +1,6 @@
+# plugin-startup-skript for bitstreamout-plugin
+
+plugin_pre_vdr_start() {
+	[[ -n "${BITSTREAMOUT_MUTE}" ]] && add_plugin_param "--mute=${BITSTREAMOUT_MUTE}"
+}
+
diff --git a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild
new file mode 100644
index 000000000000..ee6e916990b8
--- /dev/null
+++ b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild,v 1.1 2006/10/08 13:54:06 zzam Exp $
+
+IUSE=""
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: play ac3 sound over SPDIF-port of an alsa-compatible soundcard"
+HOMEPAGE="http://bitstreamout.sourceforge.net"
+SRC_URI="mirror://sourceforge/bitstreamout/${P}.tar.bz2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=media-video/vdr-1.2.6
+	>=media-libs/alsa-lib-0.9.8
+	>=media-sound/alsa-utils-0.9.8
+	>=media-libs/libmad-0.14.2b-r2
+	"
+
+src_install() {
+	vdr-plugin_src_install
+
+	doman vdr-bitstreamout.5
+	dodoc ChangeLog Description PROBLEMS
+	dodoc ${S}/doc/*
+
+	cd ${S}/mute
+	dodoc README*
+
+	insinto /usr/share/vdr/bin
+	insopts -m0755
+
+	for f in *.sh; do
+		newins ${f} mute_${f}
+	done
+}
+
diff --git a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild
index 486e7057bbf9..7893520254aa 100644
--- a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild
+++ b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild,v 1.3 2006/08/16 08:34:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild,v 1.4 2006/10/08 13:54:06 zzam Exp $
 
 IUSE=""
 
@@ -19,6 +19,9 @@ DEPEND=">=media-video/vdr-1.2.6
 	>=media-libs/libmad-0.14.2b-r2
 	"
 
+VDR_CONFD_FILE=${FILESDIR}/confd-0.85
+VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh-0.85
+
 src_install() {
 	vdr-plugin_src_install