Set default log-level to 3 to make logs more usefull.

Make the time to wait for running vdr configurable.
Move start-log file to tmp-folder.
Store list of plugins when starting vdr, to call correct rcaddons at stopping.
Creating empty channels.conf if none exists.
Added none-wakeup methode
Package-Manager: portage-2.1.1-r2

4 files changed, 184 insertions, 9 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 36049517defd..bbb465b24a4b 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,17 @@
 # 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.70 2007/01/18 20:18:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.71 2007/01/31 21:38:29 hd_brummy Exp $
+
+*gentoo-vdr-scripts-0.3.8 (31 Jan 2007)
+
+  31 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +gentoo-vdr-scripts-0.3.8.ebuild:
+  Set default log-level to 3 to make logs more usefull.
+  Make the time to wait for running vdr configurable.
+  Move start-log file to tmp-folder.
+  Store list of plugins when starting vdr, to call correct rcaddons at stopping.
+  Creating empty channels.conf if none exists.
+  Added none-wakeup methode
 
   18 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
   -gentoo-vdr-scripts-0.3.6.ebuild:
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index f0cf01f25e1f..48b69af0b307 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 DIST gentoo-vdr-scripts-0.3.7.tar.bz2 24794 RMD160 29715b69be2f9f1a22caa79aa54d259c42c4582b SHA1 e3b73d51204ff98a63d3edaba5f38ad913302d53 SHA256 5f71ee9461b1963e5e88166b636230ed4a00f84fc38c44799477ba811c902ead
+DIST gentoo-vdr-scripts-0.3.8.tar.bz2 26450 RMD160 681c08fc2502269229d677b2ffc05cb3705f4fde SHA1 31532746f4f72be7c712177902ac7ba5c0d886e8 SHA256 6a7cd90d83dca22be79a55665c422dcd92755a019594f86b741a04a6742cc2ce
 EBUILD gentoo-vdr-scripts-0.3.7.ebuild 3960 RMD160 a104bf817dabf51e368d0be70d4ea2e45a113322 SHA1 c1e40cab8e51a586b5122a75b887a71cccacb246 SHA256 9f01dfdcc96dc43d1711a0f2fbb32e29fc356880c80eb59e8b970a5a6652ee1d
 MD5 c4b33c2b79b799121122f82828c0e805 gentoo-vdr-scripts-0.3.7.ebuild 3960
 RMD160 a104bf817dabf51e368d0be70d4ea2e45a113322 gentoo-vdr-scripts-0.3.7.ebuild 3960
 SHA256 9f01dfdcc96dc43d1711a0f2fbb32e29fc356880c80eb59e8b970a5a6652ee1d gentoo-vdr-scripts-0.3.7.ebuild 3960
-MISC ChangeLog 14191 RMD160 8600e9010dc62227b7b9a2436d2f9c1e9d1db10e SHA1 7133abc99e300cb0e6ebe1e90a974160aac31513 SHA256 f25349a841ea195e9424a844ff1e674f5829c758e014f90fb58db9f4a51528af
-MD5 e914b75cdb81431ecd922a85cfc85a11 ChangeLog 14191
-RMD160 8600e9010dc62227b7b9a2436d2f9c1e9d1db10e ChangeLog 14191
-SHA256 f25349a841ea195e9424a844ff1e674f5829c758e014f90fb58db9f4a51528af ChangeLog 14191
+EBUILD gentoo-vdr-scripts-0.3.8.ebuild 3974 RMD160 164b4538a539bf6658b53b1fa6a96eef2bf1eb14 SHA1 0e1720b5d773212dd81b5a30d936fd0ef223f973 SHA256 223a8988ac6890e43cb4fc7838bed16d6903ff94b9a06dc8d3d5824f51f4fbbd
+MD5 a6d25226ea93dce16fb012b014bdec99 gentoo-vdr-scripts-0.3.8.ebuild 3974
+RMD160 164b4538a539bf6658b53b1fa6a96eef2bf1eb14 gentoo-vdr-scripts-0.3.8.ebuild 3974
+SHA256 223a8988ac6890e43cb4fc7838bed16d6903ff94b9a06dc8d3d5824f51f4fbbd gentoo-vdr-scripts-0.3.8.ebuild 3974
+MISC ChangeLog 14632 RMD160 245d437fa5e5b232827a454d8f7fb24aa605382f SHA1 71abf87bf7562cbdb5bd2aba7fe99696d0c69bca SHA256 97589bd58a8e11b7837cf82208a702059f77ce27b76b95edcdfba461ccd92326
+MD5 751dea1935d30c65555bcd996d7f17da ChangeLog 14632
+RMD160 245d437fa5e5b232827a454d8f7fb24aa605382f ChangeLog 14632
+SHA256 97589bd58a8e11b7837cf82208a702059f77ce27b76b95edcdfba461ccd92326 ChangeLog 14632
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -17,10 +22,14 @@ SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26 metadata
 MD5 3849aeb7ead6f00c37130ee15a1a2b29 files/digest-gentoo-vdr-scripts-0.3.7 274
 RMD160 1f7971361d61fecdc4a26026cf99f0814648da2e files/digest-gentoo-vdr-scripts-0.3.7 274
 SHA256 eca1b7d417903c9f3fee98c870f6b3b4d640b9818aba1fab1fd608e60005c09d files/digest-gentoo-vdr-scripts-0.3.7 274
+MD5 5aca44920c9216a8e7d435e80259247c files/digest-gentoo-vdr-scripts-0.3.8 274
+RMD160 fae0bec13596f0b2cd936730e246cfbcaa2bbb6f files/digest-gentoo-vdr-scripts-0.3.8 274
+SHA256 3aca0cd650e4513d72878d443ae584cff62a624d848e82e0fccfcd8a05fda7ec files/digest-gentoo-vdr-scripts-0.3.8 274
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFFr9ZAt2vP6XvVdOcRAnPPAKCZgU/IOw2hFc2MuS6vD3h/hN4ZygCcCiff
-o47DiCgXf+zq0NAg3CG/VVc=
-=Btmd
+iD8DBQFFwQ0ldn07HTTCgIoRAucbAJ0RHsRK42BtKoZxnOfIzg28ZSjeSQCgpkXC
+RBjDkXZOmbZlv4KPG5iWclg=
+=DQxV
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.8 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.8
new file mode 100644
index 000000000000..9ba74d4456f1
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.8
@@ -0,0 +1,3 @@
+MD5 18c6192aaa35bab17484e3de8ddd0581 gentoo-vdr-scripts-0.3.8.tar.bz2 26450
+RMD160 681c08fc2502269229d677b2ffc05cb3705f4fde gentoo-vdr-scripts-0.3.8.tar.bz2 26450
+SHA256 6a7cd90d83dca22be79a55665c422dcd92755a019594f86b741a04a6742cc2ce gentoo-vdr-scripts-0.3.8.tar.bz2 26450
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild
new file mode 100644
index 000000000000..3f29d65997aa
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild
@@ -0,0 +1,152 @@
+# 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.8.ebuild,v 1.1 2007/01/31 21:38:29 hd_brummy Exp $
+
+inherit eutils
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="0"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/hd_brummy/distfiles/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) )
+		app-admin/sudo
+		!<media-tv/vdr-dvd-scripts-0.0.2"
+
+IUSE="nvram"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_install() {
+	local myopts=""
+	if use x86; then
+		myopts="${myopts} NVRAM=1"
+	fi
+
+	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
+	dodoc README TODO ChangeLog
+
+
+	# create necessary directories
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images tmp; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+
+
+	# Only create video-directory if there is no
+	# alternative video-directory already there.
+	local MAKE_VIDEO_DIR=1
+	local testd
+	for testd in video0 video00 video.0 video.00; do
+		[[ -d ${ROOT}/${VDR_HOME}/${testd} ]] && MAKE_VIDEO_DIR=0
+	done
+	if [[ ${MAKE_VIDEO_DIR} == 1 ]]; then
+		keepdir "${VDR_HOME}"/video
+	fi
+}
+
+pkg_preinst() {
+	einfo "Smart updating /etc/conf.d/vdr.plugins"
+	local PLUGINS_NEW=0
+	if [[ -f ${ROOT}/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' ${ROOT}/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		einfo "Using existing /etc/conf.d/vdr.plugins"
+		cp ${ROOT}/etc/conf.d/vdr.plugins ${IMAGE}/etc/conf.d/vdr.plugins
+	else
+		einfo "Using PLUGINS from /etc/conf.d/vdr"
+		local PLUGIN
+		for PLUGIN in $(source ${ROOT}/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> ${IMAGE}/etc/conf.d/vdr.plugins
+		done
+	fi
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if has_version "<media-tv/gentoo-vdr-scripts-0.3.6"; then
+		ewarn
+		ewarn "A shutdown-file has been changed."
+		ewarn "You really have to execute"
+		ewarn "\temerge --config gentoo-vdr-scripts"
+		ewarn "to keep shutdown working."
+		ewarn
+
+		ebeep 5
+	else
+		elog
+		elog "To make shutdown work add this line to /etc/sudoers"
+		elog "\t$VDRSUDOENTRY"
+		elog
+		elog "or execute this command:"
+		elog "\temerge --config gentoo-vdr-scripts"
+		elog
+	fi
+
+	if use x86 && use !nvram; then
+		elog "nvram wakeup is now optional."
+		elog "To make use of it enable the use flag nvram for ${PN}"
+		elog "or just emerge nvram-wakeup."
+	fi
+
+	if has_version "<media-tv/gentoo-vdr-scripts-0.3.7"; then
+		einfo
+		einfo "Plugins which should be used are now set via its"
+		einfo "own config-file called /etc/conf.d/vdr.plugins"
+		einfo
+		einfo "Smart updating should have moved all your settings"
+		einfo
+	fi
+
+	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
+		ewarn
+		ewarn "You have dvbsplash installed!"
+		ewarn "Please delete /etc/init.d/dvbsplash with:"
+		ewarn "\trm /etc/init.d/dvbsplash"
+		ewarn
+	fi
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh ${ROOT}/etc/sudoers; then
+		einfo "sudoers-entry for vdr already in place."
+	else
+		einfo "Adding this line to /etc/sudoers:"
+		einfo "+  ${VDRSUDOENTRY}"
+
+		cd ${T}
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			echo Commenting out old entry
+			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
+			echo Adding new entry
+			echo "" >> \${1}
+			echo "${VDRSUDOENTRY}" >> \${1}
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL=${T}/sudoedit-vdr.sh visudo -f ${ROOT}/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
+