test release for bug #263956

Package-Manager: portage-2.1.9.24/cvs/Linux i686

3 files changed, 146 insertions, 5 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 67b47121911a..61b857416ace 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.106 2010/12/05 23:54:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.107 2010/12/07 01:48:11 hd_brummy Exp $
+
+*gentoo-vdr-scripts-0.4.8_rc2 (07 Dec 2010)
+
+  07 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +gentoo-vdr-scripts-0.4.8_rc2.ebuild:
+  test release for bug #263956
 
 *gentoo-vdr-scripts-0.4.8_rc1 (05 Dec 2010)
 
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 6da0aef5a41e..058c662d7b48 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -13,6 +13,7 @@ DIST gentoo-vdr-scripts-0.4.5_rc2.tar.bz2 35423 RMD160 96879f5a5047ba18c49652934
 DIST gentoo-vdr-scripts-0.4.6.tar.bz2 35351 RMD160 7b6339d0964c3bb5b791b99a2c7beff28c8cdcea SHA1 4712bd8176d11e60631012f23b8fd8ecee810dc0 SHA256 5cba625513156b3a8374fa38147a18373c530419da2cc83ef57063061dba5326
 DIST gentoo-vdr-scripts-0.4.7.tar.bz2 35564 RMD160 381c81f51e05e8736615b2f53f13ed4ac29eddc8 SHA1 a7ce08dd43369b2bc1ee8bca0126238c181a5178 SHA256 388181976069ca42dcbe865b7ae19014aa140bb4473f2bc1a085a9fbed79a515
 DIST gentoo-vdr-scripts-0.4.8_rc1.tar.bz2 35711 RMD160 87f26229f6397feef7b40f8ae6c0cedc084cabb7 SHA1 904b403007ed91ccf034551cadd296bf49244084 SHA256 e4c444de77543028d00ed6c8a0115201283bf52e88d802f75aa2a161408b1d7c
+DIST gentoo-vdr-scripts-0.4.8_rc2.tar.bz2 35960 RMD160 b990466d2da4595f9935f3dc2410796aa05f9ea5 SHA1 606bd4e34154036fb1c1c8084ca82dd263cefc9d SHA256 c263fea8c8056becbd462efff6f99a3d3427f6ae6371adac6aaa3e2e00e3f396
 EBUILD gentoo-vdr-scripts-0.4.0.ebuild 3829 RMD160 78a0e6f0706e2e98148bd48f9e7e2ecc15dcfff1 SHA1 c736bd058284e4aa350dbe8a1928fc9ff51f22b2 SHA256 0ba19e54c81eed852953ffd8206671fcf0b37baf3ab3e7d85a51f4a2c008edc4
 EBUILD gentoo-vdr-scripts-0.4.1.ebuild 4132 RMD160 7742c5dc2bcafe63ae0954f498e2319983e2f0d3 SHA1 a985f383fc7405ee0bd18036b8af40d4a265ac9c SHA256 6dcb8558464f0fcba8b14c08a66d5b871c890851954601fc80e3e42f0f1c3498
 EBUILD gentoo-vdr-scripts-0.4.2.ebuild 4160 RMD160 49ff19e8f87f83cd924fd00000f940792ecdd846 SHA1 0e61ffcde9ff744d1ab955980dbdd66056ec492c SHA256 7e0397dee5134cf56b156400c5fb935183661b4cbc9b386bd904ef96b9e52e47
@@ -26,13 +27,14 @@ EBUILD gentoo-vdr-scripts-0.4.6-r1.ebuild 3641 RMD160 7b3a8bce3589daab61046b7fd1
 EBUILD gentoo-vdr-scripts-0.4.6.ebuild 3474 RMD160 a6933cde8605941ed9da5c04b5bd2e627d49c884 SHA1 299ac3cdbeaad4076b53a2832e22b4ea2d5bf412 SHA256 d4d82629fab55b38a9f3049f419219c1a4708e5228a732e38788ba577e340e46
 EBUILD gentoo-vdr-scripts-0.4.7.ebuild 3828 RMD160 e3743d929159a0725bb79d1ecaf5bf441b024546 SHA1 bd5a636fc12c9afd36cf9abeea7ef283bc1ab375 SHA256 2ac78f3d6e97049a135d0d03906f0be088b7de9cb46c56a6a417445da17a82ad
 EBUILD gentoo-vdr-scripts-0.4.8_rc1.ebuild 3652 RMD160 dd29b664fe0f432d4e13f1dd1a3fccf82b455553 SHA1 a3ce9213a6f97e65e0bf47b146f04066378c3354 SHA256 8640d630ef2ecd04849b9826f0491fefce1b6222cf8c6796beea18795f495f61
-MISC ChangeLog 21125 RMD160 03f02172314a03e55591734b267d3ffea26d28ec SHA1 f7105d9dd185378939c46af379c45820b4738788 SHA256 17b67684d580fee1d2a7f90181645af21791992527e3467ddf6897192c02d9fc
+EBUILD gentoo-vdr-scripts-0.4.8_rc2.ebuild 3652 RMD160 2f17acf1dc0731ad889118ed56f170f9f2c9189b SHA1 5a5482e07ad505bd355f7c0432ae39b46ca45644 SHA256 54c528c0d11528d6415de4c93ba6647954b7f3d4f2c37aef993ebe0593ba7b25
+MISC ChangeLog 21297 RMD160 5de7ea4252ac851df5bc34536455f7a9a3503f77 SHA1 05156f2f0829aa60d19ae212df3d4af244a85293 SHA256 7fa9445c20ddb11110e47014f74235b3aa7e75e6689a6e6d05bd96fa90d6a9a2
 MISC metadata.xml 366 RMD160 2c6ee9297820274dce664dfc05d65b36b5342984 SHA1 6e0c2ac753886340601e6058e5c306e0fbc1c760 SHA256 a92d2326d3f734f176d63173dd3a19fa2cd3b9744ee142cd3e4fb0771d08fd29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFM/CY5dn07HTTCgIoRAt9SAKC3F4uN/UUIbIghrzJxC6OVFFR0bgCgvR40
-8CIds/eiHHkWPN6peG1xVwY=
-=3G5H
+iD8DBQFM/ZJ3dn07HTTCgIoRAt6QAJ4oW8cfsQyqTCUYqlkLxTsqbUBmdQCdG56+
+KLxpPKwy48IL8USLx00qhx0=
+=eSW5
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8_rc2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8_rc2.ebuild
new file mode 100644
index 000000000000..7b7188d3a214
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8_rc2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2010 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.8_rc2.ebuild,v 1.1 2010/12/07 01:48:11 hd_brummy Exp $
+
+EAPI="2"
+
+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/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid
+	!media-tv/vdr-dvd-scripts
+	!media-tv/vdrplugin-rebuild"
+
+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_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
+src_install() {
+	emake -s install DESTDIR="${D}" || 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() {
+	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
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		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() {
+	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
+
+	elog "nvram wakeup is optional."
+	elog "To make use of it emerge sys-power/nvram-wakeup."
+	elog
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin."
+	elog
+
+	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
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	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
+}