Bumped version. Main change: The shutdown-script called via sudo was moved, call emerge --config gentoo-vdr-scripts to update.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 151 insertions, 8 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 66333f45fa0b..c5e14546896b 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.61 2006/07/06 13:45:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.62 2006/07/09 16:32:53 zzam Exp $
+
+*gentoo-vdr-scripts-0.3.6 (09 Jul 2006)
+
+  09 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +gentoo-vdr-scripts-0.3.6.ebuild:
+  Bumped version. Main change: The shutdown-script called via sudo was moved,
+  call emerge --config gentoo-vdr-scripts to update.
 
   06 Jul 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 80cc64023ce7..dcba206660f2 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -15,6 +15,7 @@ RMD160 094ce8cdd40307f1b5805da48cf25117ad5ffefd files/vdr-bg-quoting.patch 256
 SHA256 ccf3ac1e05ec88795453b532dd6426acf0ba6bcbd36667644a3f3e179ceb7794 files/vdr-bg-quoting.patch 256
 DIST gentoo-vdr-scripts-0.3.4.tar.bz2 21460 RMD160 0797e337559b081e95ef77b428d808b78245aaac SHA1 ff8ec5b0c20fbd01bd9844644fa2c59ae3679575 SHA256 2086f451d8a274d9bd489c0e9d24a37b07db15e8ebb6ca684ab6a24e807407da
 DIST gentoo-vdr-scripts-0.3.5.tar.bz2 22643 RMD160 5782d55d2b62c11cd74193dd09588e4c9ca27b9a SHA1 8939dbcc97ef12118a7def8dffd3c7cd356523c5 SHA256 c099dc98b7979b7dc036268adc8f90082f180d9d7f225bdbdfce35fa8376b83d
+DIST gentoo-vdr-scripts-0.3.6.tar.bz2 23246 RMD160 e0c0ea7db23d77b419bb85cdd7c8e38357bd763e SHA1 04692027720b11ac79e24574524862cd7d5c937e SHA256 60c3889714f188a7412c9528bfcdd7c8a371ac4ec1ce35c27078a7776c96e896
 EBUILD gentoo-vdr-scripts-0.3.4-r1.ebuild 2728 RMD160 51790a6a6da97b565d7fe1e2c0140faef92840e5 SHA1 ad5e4505d63e68239771b041c09851d91e25cabf SHA256 0e903d3844c358678bf4b316f750fab76b92d6dd0abebbc3e78de469e9baf513
 MD5 376e51a0be2a7b2677a956514e78f5d0 gentoo-vdr-scripts-0.3.4-r1.ebuild 2728
 RMD160 51790a6a6da97b565d7fe1e2c0140faef92840e5 gentoo-vdr-scripts-0.3.4-r1.ebuild 2728
@@ -23,10 +24,14 @@ EBUILD gentoo-vdr-scripts-0.3.5-r2.ebuild 2766 RMD160 ab579360fe5703e646a65b0a78
 MD5 e4d1bb4a798e5ba588f12dd1e88bda66 gentoo-vdr-scripts-0.3.5-r2.ebuild 2766
 RMD160 ab579360fe5703e646a65b0a7852e78048a207f8 gentoo-vdr-scripts-0.3.5-r2.ebuild 2766
 SHA256 e4af36b58f97ad2581415bb2562a7c58bd49556e314b27020385da699b57ead4 gentoo-vdr-scripts-0.3.5-r2.ebuild 2766
-MISC ChangeLog 12506 RMD160 d0351fd8f3c3799bcb78db396ac1707f65fafb0a SHA1 031c1240c63b50d5e8afa6ea60cb6d291d114048 SHA256 2dc3d931fa3ca3912b7f6e1d4220da76e86e123e8b694c0f30183a19d2afd560
-MD5 4ff2886fff82a45479315b5f60f46c14 ChangeLog 12506
-RMD160 d0351fd8f3c3799bcb78db396ac1707f65fafb0a ChangeLog 12506
-SHA256 2dc3d931fa3ca3912b7f6e1d4220da76e86e123e8b694c0f30183a19d2afd560 ChangeLog 12506
+EBUILD gentoo-vdr-scripts-0.3.6.ebuild 2971 RMD160 570430a5d91481356be8167fcdf71f6215d2e7c5 SHA1 3cbaec3ccdb632afefae77cdbb0955d8c6019ea3 SHA256 7fbf00a9d8b2124e29d2ef2edd31a3c469c4bd255cee819976ff0c932c126e16
+MD5 6b68eef7e7a33581d7360f98f913d569 gentoo-vdr-scripts-0.3.6.ebuild 2971
+RMD160 570430a5d91481356be8167fcdf71f6215d2e7c5 gentoo-vdr-scripts-0.3.6.ebuild 2971
+SHA256 7fbf00a9d8b2124e29d2ef2edd31a3c469c4bd255cee819976ff0c932c126e16 gentoo-vdr-scripts-0.3.6.ebuild 2971
+MISC ChangeLog 12768 RMD160 1c969ee53496bcc69731ee4696b13e1e85923c3a SHA1 65cc58bbbe81f9d14a7f6531f1ca16bba81734a9 SHA256 54757613243f793640425d14b8ab96f5279a00f85bbd2fb6bcdbe662aee4f513
+MD5 96d9031b5e139260fcbe0bc7575d67c0 ChangeLog 12768
+RMD160 1c969ee53496bcc69731ee4696b13e1e85923c3a ChangeLog 12768
+SHA256 54757613243f793640425d14b8ab96f5279a00f85bbd2fb6bcdbe662aee4f513 ChangeLog 12768
 MISC metadata.xml 259 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 SHA1 71c8f0604523f99ac8b7849a01d861d721a191fd SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
@@ -37,10 +42,13 @@ SHA256 f60bfc422f8868bc6afb822f1192af2f3738e80e1f078ccbd16dfbdc66113936 files/di
 MD5 5660c4d171795ffb0118f52dccd536a6 files/digest-gentoo-vdr-scripts-0.3.5-r2 274
 RMD160 7d68fef3d6dfc1690b228ca473cdb759c94ff57f files/digest-gentoo-vdr-scripts-0.3.5-r2 274
 SHA256 bbbc9f334c6a05dd546add518388a36d002f8d014e698484b4933bdabe27a38e files/digest-gentoo-vdr-scripts-0.3.5-r2 274
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFErRQDZfSl1Kp5KmoRAphuAKDEvyX3329M4DeySdQFZyKSNiyHjQCcDb7n
-DMwo7/nKW3V1VaZafDaoRxw=
-=dgdI
+iD8DBQFEsS++t2vP6XvVdOcRAs1lAKC1JR9oAUVoZhgC3R4Bkr04CZG6qgCeJ1M7
+t0fGXfN6Lhg7MBmGtPg5Fm0=
+=vWBp
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.6 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.6
new file mode 100644
index 000000000000..c40d399dfbec
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.6
@@ -0,0 +1,3 @@
+MD5 2c121326d01b0546bb4b25b7fcd0ba27 gentoo-vdr-scripts-0.3.6.tar.bz2 23246
+RMD160 e0c0ea7db23d77b419bb85cdd7c8e38357bd763e gentoo-vdr-scripts-0.3.6.tar.bz2 23246
+SHA256 60c3889714f188a7412c9528bfcdd7c8a371ac4ec1ce35c27078a7776c96e896 gentoo-vdr-scripts-0.3.6.tar.bz2 23246
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.6.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.6.ebuild
new file mode 100644
index 000000000000..981163a70db0
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.6.ebuild
@@ -0,0 +1,125 @@
+# 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.6.ebuild,v 1.1 2006/07/09 16:32:53 zzam Exp $
+
+inherit eutils
+
+IUSE="nvram"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
+
+DESCRIPTION="scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) )
+		app-admin/sudo
+		!<media-tv/vdr-dvd-scripts-0.0.2"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+	enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video,audio,cdrom
+}
+
+src_install() {
+	local myopts=""
+	if use nvram; then
+		if use x86; then
+			myopts="${myopts} NVRAM=1"
+		else
+			ewarn "nvram-wakeup is not available on this architecture."
+		fi
+	fi
+
+	make install DESTDIR="${D}" ${myopts} || die "make install failed"
+	dodoc README TODO ChangeLog
+
+
+	keepdir /var/vdr/shutdown-data
+	keepdir /var/vdr/merged-config-files
+	keepdir /var/vdr/dvd-images
+
+	local MAKE_VIDEO_DIR=1
+	local testd
+	for testd in video0 video00 video.0 video.00; do
+		[[ -d ${ROOT}/var/vdr/${testd} ]] && MAKE_VIDEO_DIR=0
+	done
+	if [[ ${MAKE_VIDEO_DIR} == 1 ]]; then
+		keepdir /var/vdr/video
+	fi
+
+	chown vdr:vdr -R ${D}/var/vdr
+}
+
+pkg_preinst() {
+	local owner
+	local d
+	for d in /etc/vdr /var/vdr; do
+		if [[ -d ${d} ]]; then
+			owner=$(stat ${d} -c "%U")
+			if [[ ${owner} != vdr ]]; then
+				einfo "Changing ownership of ${d}"
+				chown -R vdr:vdr ${d}
+			fi
+		fi
+	done
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	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
+	elog "The default video directory was moved to /var/vdr/video"
+	elog "If you have your video directory anywhere else, then"
+	elog "change the setting VIDEO in the file /etc/conf.d/vdr."
+	elog
+	if use x86 && use !nvram; then
+		elog "nvram wakeup is now optional."
+		elog "To make use of it enable the use flag nvram."
+	fi
+
+	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
+	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 "" >> \${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
+}
+