From 79fd68b0e4b35bf86079794b555455091c9f5163 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Sat, 19 Apr 2008 12:23:23 +0000 Subject: Fix wakeup-reboot-script for baselayout-1. (Portage version: 2.1.5_rc4) --- media-tv/gentoo-vdr-scripts/ChangeLog | 9 +- ...gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff | 12 ++ .../gentoo-vdr-scripts-0.4.3-r1.ebuild | 154 +++++++++++++++++++++ 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff create mode 100644 media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild (limited to 'media-tv/gentoo-vdr-scripts') diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog index 9186509383eb..20e770247b2c 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.90 2008/03/22 17:00:05 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.91 2008/04/19 12:23:23 zzam Exp $ + +*gentoo-vdr-scripts-0.4.3-r1 (19 Apr 2008) + + 19 Apr 2008; Matthias Schwarzott + +files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff, + +gentoo-vdr-scripts-0.4.3-r1.ebuild: + Fix wakeup-reboot-script for baselayout-1. 22 Mar 2008; Matthias Schwarzott gentoo-vdr-scripts-0.4.3.ebuild: diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff new file mode 100644 index 000000000000..9ea6957bda53 --- /dev/null +++ b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff @@ -0,0 +1,12 @@ +diff -ru gentoo-vdr-scripts-0.4.3-orig/etc/init.d/wakeup-reboot-halt gentoo-vdr-scripts-0.4.3/etc/init.d/wakeup-reboot-halt +--- gentoo-vdr-scripts-0.4.3-orig/etc/init.d/wakeup-reboot-halt 2008-04-19 14:13:33.322545533 +0200 ++++ gentoo-vdr-scripts-0.4.3/etc/init.d/wakeup-reboot-halt 2008-04-19 14:13:56.422544885 +0200 +@@ -3,7 +3,7 @@ + # Distributed under the terms of the GNU General Public License v2 + # $Id: gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff,v 1.1 2008/04/19 12:23:23 zzam Exp $ + +-extra_commands="mark_for_reboot" ++opts="${opts} mark_for_reboot" + + STATEFILE=/force_reboot_shutdown + diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild new file mode 100644 index 000000000000..819c1499a4ed --- /dev/null +++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2008 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.3-r1.ebuild,v 1.1 2008/04/19 12:23:23 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/~zzam/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 + !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_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-fix-wakeup-reboot.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 "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 +} -- cgit v1.2.3-65-gdbad