Moved wait_on_pid to its own package.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 146 insertions, 6 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 865d0552a811..0b7c5cd23acb 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.101 2009/03/03 11:19:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.102 2009/12/28 13:10:01 zzam Exp $
+
+*gentoo-vdr-scripts-0.4.6-r1 (28 Dec 2009)
+
+  28 Dec 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +gentoo-vdr-scripts-0.4.6-r1.ebuild:
+  Moved wait_on_pid to its own package.
 
   03 Mar 2009; Matthias Schwarzott <zzam@gentoo.org>
   gentoo-vdr-scripts-0.4.6.ebuild:
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 8cdd2d1aa62f..2b0bebd54f2b 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -20,13 +20,14 @@ EBUILD gentoo-vdr-scripts-0.4.4.ebuild 4160 RMD160 554687fb50f3f4d704d8804c29489
 EBUILD gentoo-vdr-scripts-0.4.5.ebuild 3474 RMD160 18581f62c0b56c46f9a75324ad7ef5594ea63a52 SHA1 7672c3743e8f7b7a7ff9e9d1b7ea3a16b01c8c1b SHA256 b28163f1f96d38f8db2ef952d4d8febe564d52bc693b0a8e669f4c6e66a28636
 EBUILD gentoo-vdr-scripts-0.4.5_rc1.ebuild 3479 RMD160 f6ad4d93df837464deb881d78c47f03d43f536ff SHA1 0a6209c42218c1bd4705fa7087fbb015028b4fc2 SHA256 7e9a4c5ae3e33bafaa5900169e852ff067e3520e279a417daef91896c03a3a95
 EBUILD gentoo-vdr-scripts-0.4.5_rc2.ebuild 3479 RMD160 52eae58354fe566ec0b28c4d59154b3b6b7b645a SHA1 57a92543084caa9dea51d156b285d36f08b45593 SHA256 3763270693a927aef1e34123f8ff87f39c9f6681b00b21a411531d8026c377da
+EBUILD gentoo-vdr-scripts-0.4.6-r1.ebuild 3634 RMD160 fc4a9f5969c1ef1a720c8f65b85621cce718c79d SHA1 29bef634e41cae18b5f622a10a87061bb0ec61e2 SHA256 20109067ef000b32054a9eba8d004b3288039faeb1dd9f9af18b684d74e4cbd7
 EBUILD gentoo-vdr-scripts-0.4.6.ebuild 3474 RMD160 a6933cde8605941ed9da5c04b5bd2e627d49c884 SHA1 299ac3cdbeaad4076b53a2832e22b4ea2d5bf412 SHA256 d4d82629fab55b38a9f3049f419219c1a4708e5228a732e38788ba577e340e46
-MISC ChangeLog 20343 RMD160 936244843bb69ebab78c3701a57d0646f0de01f9 SHA1 cac556aff633096c207ed47ed44539cde9f83428 SHA256 dabfc5c886af9d8e4fc1808ca3f3b6ea3f2547072eb82105324e9c1994244b28
+MISC ChangeLog 20520 RMD160 acbb68bd3cc42e491c54b74509d0f7cf33acf279 SHA1 5fbdf4cf8432aa83deb2ec20cd0b315f70598e70 SHA256 15afe98e375cb6db574259012cbcfcbbd3d8e56c907b68d728ddd70b9db910ed
 MISC metadata.xml 366 RMD160 2c6ee9297820274dce664dfc05d65b36b5342984 SHA1 6e0c2ac753886340601e6058e5c306e0fbc1c760 SHA256 a92d2326d3f734f176d63173dd3a19fa2cd3b9744ee142cd3e4fb0771d08fd29
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkmtElQACgkQt2vP6XvVdOeYCACgznaE0UfZQvz29h34/mDznSXj
-CGQAoJWRbiuxA/yNqBt91BPekA0TdmyO
-=QzDF
+iEYEARECAAYFAks4rjkACgkQt2vP6XvVdOc3OQCeL7nObYqB7llaSstBBTzkhOHM
+OkYAoL/r7bNMhRDm9JvFjVY1C7WDTJQV
+=pKk1
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..3ffe0b2eb95c
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2009 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.6-r1.ebuild,v 1.1 2009/12/28 13:10:01 zzam 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/~zzam/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~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
+}