version bumb; fix for bug #300078, #263956, #3314453

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 10 insertions, 136 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index f1603bc8b54a..fd60e4f04809 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.110 2011/01/23 23:10:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.111 2011/01/25 00:00:08 hd_brummy Exp $
+
+*gentoo-vdr-scripts-0.4.8 (25 Jan 2011)
+
+  25 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -gentoo-vdr-scripts-0.4.8_rc1.ebuild,
+  -gentoo-vdr-scripts-0.4.8_rc2.ebuild, +gentoo-vdr-scripts-0.4.8.ebuild:
+  version bumb; fix for bug #300078, #263956, #3314453
 
   23 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   -gentoo-vdr-scripts-0.4.0.ebuild, -gentoo-vdr-scripts-0.4.1.ebuild,
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8_rc1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8.ebuild
index 6d3f38bab307..24a7bc8c3766 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8_rc1.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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_rc1.ebuild,v 1.1 2010/12/05 23:54:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8.ebuild,v 1.1 2011/01/25 00:00:08 hd_brummy Exp $
 
 EAPI="2"
 
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
deleted file mode 100644
index 7b7188d3a214..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.8_rc2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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
-}