Removed dvbsplash support to finally stop all related problems.

(Portage version: 2.1.2.3)

4 files changed, 176 insertions, 1 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index a6e9c572b839..e995aafac8ce 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.76 2007/03/19 18:02:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.77 2007/04/15 13:04:44 zzam Exp $
+
+*gentoo-vdr-scripts-0.3.8-r1 (15 Apr 2007)
+
+  15 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff,
+  +gentoo-vdr-scripts-0.3.8-r1.ebuild:
+  Removed dvbsplash support to finally stop all related problems.
 
   19 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
   -gentoo-vdr-scripts-0.3.7.ebuild:
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.8-r1 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.8-r1
new file mode 100644
index 000000000000..9ba74d4456f1
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.8-r1
@@ -0,0 +1,3 @@
+MD5 18c6192aaa35bab17484e3de8ddd0581 gentoo-vdr-scripts-0.3.8.tar.bz2 26450
+RMD160 681c08fc2502269229d677b2ffc05cb3705f4fde gentoo-vdr-scripts-0.3.8.tar.bz2 26450
+SHA256 6a7cd90d83dca22be79a55665c422dcd92755a019594f86b741a04a6742cc2ce gentoo-vdr-scripts-0.3.8.tar.bz2 26450
diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff
new file mode 100644
index 000000000000..5ba94b5bfd68
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff
@@ -0,0 +1,19 @@
+--- a/etc/init.d/vdr	(Revision 423)
++++ b/etc/init.d/vdr	(Arbeitskopie)
+@@ -8,7 +8,7 @@
+ include rc-functions
+ 
+ depend() {
+-	use lircd dvbsplash net coldplug
++	use lircd net coldplug
+ 	after checkroot
+ }
+ 
+@@ -35,7 +35,6 @@
+ 	#
+ 	# finally start vdr
+ 	# 
+-	/usr/bin/dvbsplash stop 2>/dev/null >/dev/null
+ 	unset MAIL
+ 
+ 	vdr_home=/var/vdr
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8-r1.ebuild
new file mode 100644
index 000000000000..b09f1f908b07
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8-r1.ebuild
@@ -0,0 +1,146 @@
+# 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.3.8-r1.ebuild,v 1.1 2007/04/15 13:04:44 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/~hd_brummy/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_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-kill-dvbsplash.diff"
+}
+
+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
+}