Fixed shutdown problems of version 0.3.9.

(Portage version: 2.1.2.4)

4 files changed, 93 insertions, 2 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index f982b5919b42..de8b73cdf0aa 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.78 2007/04/23 14:02:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.79 2007/04/24 18:11:44 zzam Exp $
+
+*gentoo-vdr-scripts-0.3.9-r1 (24 Apr 2007)
+
+  24 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/gentoo-vdr-scripts-0.3.9-fix-shutdown.diff,
+  -gentoo-vdr-scripts-0.3.9.ebuild, +gentoo-vdr-scripts-0.3.9-r1.ebuild:
+  Fixed shutdown problems of version 0.3.9.
 
 *gentoo-vdr-scripts-0.3.9 (23 Apr 2007)
 
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.9 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.9-r1
index 68f683dea5bd..68f683dea5bd 100644
--- a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.9
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.9-r1
diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.9-fix-shutdown.diff b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.9-fix-shutdown.diff
new file mode 100644
index 000000000000..db85843cf4de
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.9-fix-shutdown.diff
@@ -0,0 +1,79 @@
+diff -ru --ignore-matching-lines=Id --exclude=.svn tags/0.3.9/ChangeLog trunk/ChangeLog
+--- tags/0.3.9/ChangeLog	2007-04-23 15:54:12.000000000 +0200
++++ trunk/ChangeLog	2007-04-24 12:59:14.000000000 +0200
+@@ -1,5 +1,13 @@
+ # ChangeLog for gentoo-vdr-scripts
+-# $Id: ChangeLog 446 2007-04-23 13:54:12Z zzam $
++# $Id: ChangeLog 448 2007-04-24 10:59:13Z zzam $
++
++  24 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
++  usr/share/vdr/bin/vdrshutdown-gate.sh:
++  Added better check for usable pre-shutdown hook.
++
++  24 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
++  usr/share/vdr/bin/vdrshutdown-gate.sh:
++  Fixed quoting of the queued commands in shutdown-gate.
+ 
+ *gentoo-vdr-scripts-0.3.9 (23 Apr 2007)
+ 
+Nur in tags/0.3.9/: gentoo-vdr-scripts-0.3.9.tar.bz2.
+diff -ru --ignore-matching-lines=Id --exclude=.svn tags/0.3.9/usr/share/vdr/bin/vdrshutdown-gate.sh trunk/usr/share/vdr/bin/vdrshutdown-gate.sh
+--- tags/0.3.9/usr/share/vdr/bin/vdrshutdown-gate.sh	2007-04-23 15:54:12.000000000 +0200
++++ trunk/usr/share/vdr/bin/vdrshutdown-gate.sh	2007-04-24 13:02:58.000000000 +0200
+@@ -53,14 +53,14 @@
+ 
+ queue_add_wait() {
+ 	: ${qindex:=1}
+-	eval svdrpqueue_${qindex}="sleep $1"
++	eval svdrpqueue_${qindex}="\"sleep $1\""
+ 	qindex=$((qindex+1))
+ }
+ 
+ svdrp_add_queue() {
+ 	: ${qindex:=1}
+ 	logger "vdrshutdown-gate sending per svdrp: $1"
+-	eval svdrpqueue_${qindex}="${SVDRPCMD} $1"
++	eval svdrpqueue_${qindex}="\"${SVDRPCMD} $1\""
+ 	qindex=$((qindex+1))
+ }
+ 
+@@ -136,14 +136,14 @@
+ 	fi
+ }
+ 
+-shutdown_common() {
++shutdown_abort_common() {
+ 	ABORT_MESSAGE="${1}"
+ 	SHUTDOWN_ABORT="1"
+-	set_try_again "${SHUTDOWN_DEFAULT_RETRY_TIME}"
++	set_retry_time "${SHUTDOWN_DEFAULT_RETRY_TIME}"
+ }
+ 
+ shutdown_abort() {
+-	shutdown_common "${1}"
++	shutdown_abort_common "${1}"
+ 	disable_forced_shutdown
+ }
+ 
+@@ -153,7 +153,7 @@
+ 		echo FORCED: ${1}
+ 		SHUTDOWN_FORCE_COUNT=$((SHUTDOWN_FORCE_COUNT+1))
+ 	else
+-		shutdown_common "${1}"
++		shutdown_abort_common "${1}"
+ 	fi
+ }
+ 
+@@ -222,9 +222,9 @@
+ execute_hooks() {
+ 	local HOOK
+ 	for HOOK in $HOOKDIR/pre-shutdown-*.sh; do
+-		if [ -f "${HOOK}" ]; then
+-			. "${HOOK}"
+-		fi
++		[ -r "${HOOK}" ] || continue
++		sh -n "${HOOK}" || continue
++		. "${HOOK}"
+ 	done
+ }
+ 
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.9.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.9-r1.ebuild
index d80e13a43a87..705024242871 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.9.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.9.ebuild,v 1.1 2007/04/23 14:02:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.9-r1.ebuild,v 1.1 2007/04/24 18:11:44 zzam Exp $
 
 inherit eutils
 
@@ -29,6 +29,11 @@ pkg_setup() {
 	#   cdrom - playing dvds/audio-cds ...
 	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
 }
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix-shutdown.diff"
+}
 
 src_install() {
 	local myopts=""