From: Matthias Schwarzott <zzam@gentoo.org>
Date: Sun, 15 Apr 2007 13:04:44 +0000 (+0000)
Subject: Removed dvbsplash support to finally stop all related problems.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e54b3f390b98d88e5fc4e9a0df466844f673ba85;p=gentoo.git

Removed dvbsplash support to finally stop all related problems.
Package-Manager: portage-2.1.2.3
---

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/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 83b8f9c12702..49b0ca206d88 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff 340 RMD160 29cdb4aa6cc5b9c22a921a7ac764d101c951424a SHA1 114549c6601d232e19ce4a0c98f1f28d3387372f SHA256 ae366edb256f21a81c2fe4d168be2dfeaf1ffa2ad5f8258ffb5d3774884f002d
+MD5 1fc45da83050d50a549e03e629598246 files/gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff 340
+RMD160 29cdb4aa6cc5b9c22a921a7ac764d101c951424a files/gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff 340
+SHA256 ae366edb256f21a81c2fe4d168be2dfeaf1ffa2ad5f8258ffb5d3774884f002d files/gentoo-vdr-scripts-0.3.8-kill-dvbsplash.diff 340
 DIST gentoo-vdr-scripts-0.3.8.tar.bz2 26450 RMD160 681c08fc2502269229d677b2ffc05cb3705f4fde SHA1 31532746f4f72be7c712177902ac7ba5c0d886e8 SHA256 6a7cd90d83dca22be79a55665c422dcd92755a019594f86b741a04a6742cc2ce
+EBUILD gentoo-vdr-scripts-0.3.8-r1.ebuild 3789 RMD160 dd16db7f55c5f52bfd2b13b299e429b7f988b31d SHA1 49815039e07a80c616f010522e9794af0e56d2f7 SHA256 bc7f110488310c3a9af33a0c0d5634ead5acb2e497380821bf36fe01df349f22
+MD5 ed8fb670bf17601d1044443d7be08314 gentoo-vdr-scripts-0.3.8-r1.ebuild 3789
+RMD160 dd16db7f55c5f52bfd2b13b299e429b7f988b31d gentoo-vdr-scripts-0.3.8-r1.ebuild 3789
+SHA256 bc7f110488310c3a9af33a0c0d5634ead5acb2e497380821bf36fe01df349f22 gentoo-vdr-scripts-0.3.8-r1.ebuild 3789
 EBUILD gentoo-vdr-scripts-0.3.8.ebuild 3643 RMD160 2fbedddcb229f6326337dc805196af2c2a26a129 SHA1 73285a60c66999a945c57831e3eaf4d3d29b5ca2 SHA256 fd56bd6323a7cdf3792cdd8c854fe2457e29760dc6708f36dcfc907f1de0e828
 MD5 08e97389ec1cb40ab0c225fe54393590 gentoo-vdr-scripts-0.3.8.ebuild 3643
 RMD160 2fbedddcb229f6326337dc805196af2c2a26a129 gentoo-vdr-scripts-0.3.8.ebuild 3643
 SHA256 fd56bd6323a7cdf3792cdd8c854fe2457e29760dc6708f36dcfc907f1de0e828 gentoo-vdr-scripts-0.3.8.ebuild 3643
-MISC ChangeLog 15390 RMD160 442b313455e23007a24e7b22dee6597c708abb0e SHA1 56b4a078441fd12a08c9f5b7b903debbd040c682 SHA256 c2983597c9517f19e35a36551a6c8e72f982803d9597f4dd66b33c8d1dabe0c8
-MD5 aaf6f7e5c1f278a19f6e53a08b115530 ChangeLog 15390
-RMD160 442b313455e23007a24e7b22dee6597c708abb0e ChangeLog 15390
-SHA256 c2983597c9517f19e35a36551a6c8e72f982803d9597f4dd66b33c8d1dabe0c8 ChangeLog 15390
+MISC ChangeLog 15648 RMD160 837c6761abc284db8ab6cd842da2f4758a815b36 SHA1 9cd433f6e49ec02695c7272ca2e8805b321fa3be SHA256 95d67bc9c6e4a344874b601e2eb158527489c1c1473792a10059574b2a28da4f
+MD5 53fda0d41ce3a2ee09c07bf312aa656d ChangeLog 15648
+RMD160 837c6761abc284db8ab6cd842da2f4758a815b36 ChangeLog 15648
+SHA256 95d67bc9c6e4a344874b601e2eb158527489c1c1473792a10059574b2a28da4f ChangeLog 15648
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -17,10 +25,13 @@ SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26 metadata
 MD5 5aca44920c9216a8e7d435e80259247c files/digest-gentoo-vdr-scripts-0.3.8 274
 RMD160 fae0bec13596f0b2cd936730e246cfbcaa2bbb6f files/digest-gentoo-vdr-scripts-0.3.8 274
 SHA256 3aca0cd650e4513d72878d443ae584cff62a624d848e82e0fccfcd8a05fda7ec files/digest-gentoo-vdr-scripts-0.3.8 274
+MD5 5aca44920c9216a8e7d435e80259247c files/digest-gentoo-vdr-scripts-0.3.8-r1 274
+RMD160 fae0bec13596f0b2cd936730e246cfbcaa2bbb6f files/digest-gentoo-vdr-scripts-0.3.8-r1 274
+SHA256 3aca0cd650e4513d72878d443ae584cff62a624d848e82e0fccfcd8a05fda7ec files/digest-gentoo-vdr-scripts-0.3.8-r1 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/tBHt2vP6XvVdOcRAqf0AKCEMsmBn2EmOcB+cQvRuBrVYvEQrgCg29O3
-EPB5n4n2yu5b4CQiXfPIUlc=
-=QMXf
+iD8DBQFGIiL4t2vP6XvVdOcRAmnHAKDcKolIqv2RsVGJvz+jWjfireU+tACfWE08
++tEby7395LSwr7n5Co5Rc48=
+=Z8B/
 -----END PGP SIGNATURE-----
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
+}