New release. Contains changed configurations of active plugins. Ebuild handles configuration-update. Now install nvram-shutdown-script always. nvram-use-flag now only controlls depend to nvram-wakeup. Removed all hacked ownership code. Generally cleaned it a bit up.

Package-Manager: portage-2.1.2_rc1-r4

4 files changed, 172 insertions, 8 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 804601508932..2a95f179404a 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.66 2006/09/13 21:10:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.67 2006/11/07 20:16:22 zzam Exp $
+
+*gentoo-vdr-scripts-0.3.7 (07 Nov 2006)
+
+  07 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +gentoo-vdr-scripts-0.3.7.ebuild:
+  New release. Contains changed configurations of active plugins. Ebuild
+  handles configuration-update. Now install nvram-shutdown-script always.
+  nvram-use-flag now only controlls depend to nvram-wakeup. Removed all hacked
+  ownership code. Generally cleaned it a bit up.
 
   13 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
   -files/gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff,
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 2b894973905e..87c98861ec43 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.6.tar.bz2 23246 RMD160 e0c0ea7db23d77b419bb85cdd7c8e38357bd763e SHA1 04692027720b11ac79e24574524862cd7d5c937e SHA256 60c3889714f188a7412c9528bfcdd7c8a371ac4ec1ce35c27078a7776c96e896
+DIST gentoo-vdr-scripts-0.3.7.tar.bz2 24794 RMD160 29715b69be2f9f1a22caa79aa54d259c42c4582b SHA1 e3b73d51204ff98a63d3edaba5f38ad913302d53 SHA256 5f71ee9461b1963e5e88166b636230ed4a00f84fc38c44799477ba811c902ead
 EBUILD gentoo-vdr-scripts-0.3.6.ebuild 3101 RMD160 28bf52dc1f73493f0c908bd724495fd8ca434b04 SHA1 0069b626c5b6fbc6868ecb767072015d15d9951e SHA256 6f7ebfc3e7c9c46740a61467590f97bbc3ffd93dd47bba31762945333f4a66e6
 MD5 f872524bd552d5bf2f90901e38159ac2 gentoo-vdr-scripts-0.3.6.ebuild 3101
 RMD160 28bf52dc1f73493f0c908bd724495fd8ca434b04 gentoo-vdr-scripts-0.3.6.ebuild 3101
 SHA256 6f7ebfc3e7c9c46740a61467590f97bbc3ffd93dd47bba31762945333f4a66e6 gentoo-vdr-scripts-0.3.6.ebuild 3101
-MISC ChangeLog 13417 RMD160 9d11d6d21f28b5499247f3135702ac4f05bafd85 SHA1 7908b7b0e4a53287ee0c75f3759a387eeccf8a7b SHA256 b4ae6f5dda4ea904ce7fcf818d4dbf6ed983347d8310a69b153b95fcd9c40911
-MD5 ece2392cba9b62821268afb250279521 ChangeLog 13417
-RMD160 9d11d6d21f28b5499247f3135702ac4f05bafd85 ChangeLog 13417
-SHA256 b4ae6f5dda4ea904ce7fcf818d4dbf6ed983347d8310a69b153b95fcd9c40911 ChangeLog 13417
+EBUILD gentoo-vdr-scripts-0.3.7.ebuild 3767 RMD160 65851caccfd1fee6a22202e5a928b5dfc6d4b1d5 SHA1 c84fe7ae9247a7597bde1f710c03288ed5abdfdd SHA256 6948a998e852cc1bd08ad39a288c7d52cdd5a6c57bd3f9bf7037d4172164042f
+MD5 2e49a025800e8351e58351798c0da5fc gentoo-vdr-scripts-0.3.7.ebuild 3767
+RMD160 65851caccfd1fee6a22202e5a928b5dfc6d4b1d5 gentoo-vdr-scripts-0.3.7.ebuild 3767
+SHA256 6948a998e852cc1bd08ad39a288c7d52cdd5a6c57bd3f9bf7037d4172164042f gentoo-vdr-scripts-0.3.7.ebuild 3767
+MISC ChangeLog 13823 RMD160 0e65984f6a5e225031744f07b919295cc5dc14f4 SHA1 587d5eb6892a36eaadc874e2271f4c33698db66a SHA256 876cef2982eb8c2c812f3f25cdfa0cc7b635f43cb27ef439e7897ba6e3ee24d8
+MD5 c9a0bd604c5e2341eb60e0ad7126621f ChangeLog 13823
+RMD160 0e65984f6a5e225031744f07b919295cc5dc14f4 ChangeLog 13823
+SHA256 876cef2982eb8c2c812f3f25cdfa0cc7b635f43cb27ef439e7897ba6e3ee24d8 ChangeLog 13823
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -17,10 +22,13 @@ SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26 metadata
 MD5 105a6536a3a532d53ac3fa66b9d48314 files/digest-gentoo-vdr-scripts-0.3.6 274
 RMD160 1cfccc40ed457300b960dbcb2584ed9aa758f48d files/digest-gentoo-vdr-scripts-0.3.6 274
 SHA256 d714e62cbbdacf180b62c9b611b6e5d729141c9f7ff6519d67b4095b2a634ed3 files/digest-gentoo-vdr-scripts-0.3.6 274
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCHPFt2vP6XvVdOcRArbuAJ9dNyXRJfLYmDyhmCMgvznMeBwQrwCg1zE3
-wEKFzSzKTil4e7IaZTs2M8w=
-=+5ty
+iD8DBQFFUOmgt2vP6XvVdOcRAu0FAKDH5J+0egafQaPG+AssR5aLVbW1MgCguM4z
+UgJP/km7e2WlSu9p38/C/aY=
+=tj+G
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.7 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.7
new file mode 100644
index 000000000000..132a1111d5c2
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.7
@@ -0,0 +1,3 @@
+MD5 90e68e4b81af1a293037d5d38eb92e76 gentoo-vdr-scripts-0.3.7.tar.bz2 24794
+RMD160 29715b69be2f9f1a22caa79aa54d259c42c4582b gentoo-vdr-scripts-0.3.7.tar.bz2 24794
+SHA256 5f71ee9461b1963e5e88166b636230ed4a00f84fc38c44799477ba811c902ead gentoo-vdr-scripts-0.3.7.tar.bz2 24794
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild
new file mode 100644
index 000000000000..feb0c2afef93
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2006 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.7.ebuild,v 1.1 2006/11/07 20:16:22 zzam 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/~zzam/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; 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 "    emerge --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 "    $VDRSUDOENTRY"
+		elog
+		elog "or execute this command:"
+		elog "    emerge --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
+}
+
+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
+}
+