Version bumped. This version adds better support for vdr-1.5

Package-Manager: portage-2.1.3_rc6

4 files changed, 166 insertions, 9 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 97382bc9039c..4a4518045cca 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,12 @@
 # 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.81 2007/06/12 11:58:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.82 2007/07/07 12:56:59 zzam Exp $
+
+*gentoo-vdr-scripts-0.4.0 (07 Jul 2007)
+
+  07 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +gentoo-vdr-scripts-0.4.0.ebuild:
+  Version bumped. This version adds better support for vdr-1.5
 
 *gentoo-vdr-scripts-0.3.10 (12 Jun 2007)
 
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 0dd1de06402d..572d6482d4c7 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -12,6 +12,7 @@ SHA256 fe774d08ae41e3831bd1ad16520526308a761c77913fd0f59400e5ea3e88d9d4 files/ge
 DIST gentoo-vdr-scripts-0.3.10.tar.bz2 27333 RMD160 9785706390b9445f54ac6db0666897d46c39444c SHA1 743f1b535d0d3c5786e7539133cf3b0973076e6a SHA256 b0011c67785ec7e5c1cfc29883245f1258dfad392146c7e2a3e7be773cde0bdd
 DIST gentoo-vdr-scripts-0.3.8.tar.bz2 26450 RMD160 681c08fc2502269229d677b2ffc05cb3705f4fde SHA1 31532746f4f72be7c712177902ac7ba5c0d886e8 SHA256 6a7cd90d83dca22be79a55665c422dcd92755a019594f86b741a04a6742cc2ce
 DIST gentoo-vdr-scripts-0.3.9.tar.bz2 26395 RMD160 b7577c30b240f55862318bdb220995196f03c4c2 SHA1 a72fb3f7f09640e7e9230d7cb271c12c392a3209 SHA256 3d8c2aa3c579b5869c5afc7398275fe9dc2439d49ef105bb4fcbcd4702d8ed03
+DIST gentoo-vdr-scripts-0.4.0.tar.bz2 27936 RMD160 221063e8296281087b9d0f0031f7a37c405ff72d SHA1 d8f76b4c2977c0dc6d159111519ba0001b922440 SHA256 71ed687787aef0e9d263824505bd1244b6527bda95c0aa2c8ed408be53d2a301
 EBUILD gentoo-vdr-scripts-0.3.10.ebuild 3619 RMD160 73dd845a449feb47d477fac7f4f6c65893c0e281 SHA1 de69e83880694a05227d921493a37b9e947f6bc7 SHA256 5bf9da44eb87dc089a4d2283522d9e61b48c1d74c2ce89230219b670cabbd251
 MD5 4326a1f783f59356420a620de63375b4 gentoo-vdr-scripts-0.3.10.ebuild 3619
 RMD160 73dd845a449feb47d477fac7f4f6c65893c0e281 gentoo-vdr-scripts-0.3.10.ebuild 3619
@@ -28,10 +29,14 @@ EBUILD gentoo-vdr-scripts-0.3.9-r1.ebuild 3779 RMD160 18e4d5355bfd4360172e351689
 MD5 ec42c94135ce8cdcfb401749dc8b8c4b gentoo-vdr-scripts-0.3.9-r1.ebuild 3779
 RMD160 18e4d5355bfd4360172e35168983a66f27e76ba8 gentoo-vdr-scripts-0.3.9-r1.ebuild 3779
 SHA256 6d64ecb0876b41cd890e969d4dbd52b6a240696e09ec2d210237535bb9d9cd7b gentoo-vdr-scripts-0.3.9-r1.ebuild 3779
-MISC ChangeLog 16504 RMD160 485f9cecb48cb930b94f6ab117721fb36e28121c SHA1 c84b322c18695916a921d02c6f3b2a1099840e08 SHA256 947964edee2ccb9c2784b15ad8f20cd47ff65f31d22dc7aa321ec523d595c94c
-MD5 f4be38f1e1b4ed001e445676cc468868 ChangeLog 16504
-RMD160 485f9cecb48cb930b94f6ab117721fb36e28121c ChangeLog 16504
-SHA256 947964edee2ccb9c2784b15ad8f20cd47ff65f31d22dc7aa321ec523d595c94c ChangeLog 16504
+EBUILD gentoo-vdr-scripts-0.4.0.ebuild 3690 RMD160 54aecded3b20dc1e9e9173fbb4844eaf8c89d33c SHA1 dc55257a3c80c9235def9cbf2e3ca3b23ba2d426 SHA256 68c3d5970c2002da571aa066405c252d5fca2e2d23c21a77e51cf5caecb11938
+MD5 9d44ec531e81d6cb608dd9f251ed62af gentoo-vdr-scripts-0.4.0.ebuild 3690
+RMD160 54aecded3b20dc1e9e9173fbb4844eaf8c89d33c gentoo-vdr-scripts-0.4.0.ebuild 3690
+SHA256 68c3d5970c2002da571aa066405c252d5fca2e2d23c21a77e51cf5caecb11938 gentoo-vdr-scripts-0.4.0.ebuild 3690
+MISC ChangeLog 16698 RMD160 18be29cbf4622ce59cc95eda44fdd1a5a4626903 SHA1 6396b1bd1f7c04f3770b617c17a12048b1431786 SHA256 c0f578460053bc74a367337749cf91d0f848ba42e69204f9cfa76d56a79b43b8
+MD5 20d7770c77f980a88509111ad2aa6066 ChangeLog 16698
+RMD160 18be29cbf4622ce59cc95eda44fdd1a5a4626903 ChangeLog 16698
+SHA256 c0f578460053bc74a367337749cf91d0f848ba42e69204f9cfa76d56a79b43b8 ChangeLog 16698
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -48,10 +53,13 @@ SHA256 3aca0cd650e4513d72878d443ae584cff62a624d848e82e0fccfcd8a05fda7ec files/di
 MD5 4050c7bd5aab37f2b6eb64b455845075 files/digest-gentoo-vdr-scripts-0.3.9-r1 274
 RMD160 90efac36cd6a1bb27f502107f0b54a95dcd93dbf files/digest-gentoo-vdr-scripts-0.3.9-r1 274
 SHA256 6cad498b45bcd1c7302e8df2e746be1e11b256fe2cd9bd3cab4e7ee295f63b30 files/digest-gentoo-vdr-scripts-0.3.9-r1 274
+MD5 dba3f17d57cfc470f6614b45eb9c9dcb files/digest-gentoo-vdr-scripts-0.4.0 274
+RMD160 b3ee41bc32c60c39fac15237ad409a5997d9c3af files/digest-gentoo-vdr-scripts-0.4.0 274
+SHA256 a5ab6946e53cf73e43d47e2e11f3a6b9cc9e1561b8f2e5403ec2103a66d8524a files/digest-gentoo-vdr-scripts-0.4.0 274
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGboqHt2vP6XvVdOcRAvDqAKCNMqhhRfbBnU42Wb5HaiKml5C5GQCgmS6O
-D7L2XYqEeN9TMZ9rBXgvlcI=
-=TriP
+iD8DBQFGj42lt2vP6XvVdOcRAiOsAJ9nGOEm1snjYlNaN1deKj71m81OPQCgtT7W
+Cfed6uaymUXpuu7wCZ3jjds=
+=YqoY
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.4.0 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.4.0
new file mode 100644
index 000000000000..7488c50b7525
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.4.0
@@ -0,0 +1,3 @@
+MD5 f1ecd862054d1982684353d774185a7c gentoo-vdr-scripts-0.4.0.tar.bz2 27936
+RMD160 221063e8296281087b9d0f0031f7a37c405ff72d gentoo-vdr-scripts-0.4.0.tar.bz2 27936
+SHA256 71ed687787aef0e9d263824505bd1244b6527bda95c0aa2c8ed408be53d2a301 gentoo-vdr-scripts-0.4.0.tar.bz2 27936
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.0.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.0.ebuild
new file mode 100644
index 000000000000..fcfbae0e9531
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.0.ebuild
@@ -0,0 +1,140 @@
+# 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.4.0.ebuild,v 1.1 2007/07/07 12:56:59 zzam Exp $
+
+inherit eutils
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	!<media-tv/vdr-dvd-scripts-0.0.2"
+
+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 nvram ; then
+		myopts="${myopts} NVRAM=1"
+	fi
+
+	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
+	dodoc README TODO ChangeLog
+
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images tmp; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+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 ${D}/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} >> ${D}/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 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 "/etc/init.d/dvbsplash will now be deleted"
+		ewarn "as it causes difficult to debug problems."
+		ewarn
+		rm "${ROOT}/etc/init.d/dvbsplash"
+	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
+}