Version bumped. This has changes to shutdown and locale handling. Ebuild cleanup.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.25-tuxonice-r6 i686

3 files changed, 138 insertions, 5 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index d6ac157b98de..4053e3b26ee6 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.95 2008/06/15 08:13:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.96 2008/08/02 21:03:05 zzam Exp $
+
+*gentoo-vdr-scripts-0.4.5_rc1 (02 Aug 2008)
+
+  02 Aug 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +gentoo-vdr-scripts-0.4.5_rc1.ebuild:
+  Version bumped. This has changes to shutdown and locale handling. Ebuild
+  cleanup.
 
   15 Jun 2008; Zac Medico <zmedico@gentoo.org>
   gentoo-vdr-scripts-0.4.0.ebuild, gentoo-vdr-scripts-0.4.1.ebuild,
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index ec38f2ea2dff..259cf4e29982 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -7,18 +7,20 @@ DIST gentoo-vdr-scripts-0.4.1.tar.bz2 30683 RMD160 5dc4a9ef2e2a6ab6f3cea879c1a54
 DIST gentoo-vdr-scripts-0.4.2.tar.bz2 32110 RMD160 7c8bb70cb5a9e766b91ea57ec17786130448812e SHA1 e242092ae444cac1f835b56690f4449b4bffcca5 SHA256 1c3f10166e1a2012f4274d8b2c348243795603899195a3231b8c7cbf005f9e49
 DIST gentoo-vdr-scripts-0.4.3.tar.bz2 33196 RMD160 29f0b8b1c0fdb6b4ad8d6604ad58dd34cccdf442 SHA1 162b15c6d9d508968040512507ca106f021f3f29 SHA256 68036e2fe63bc40e357b3e9e4a7be991c344875229393a6f2dbe0fc54425348f
 DIST gentoo-vdr-scripts-0.4.4.tar.bz2 33500 RMD160 ef80dc1d3d6e483434ac1486297ce1a5dfdbec13 SHA1 420a6419ac1f0a06d56544b18b385e43def54c73 SHA256 8ee95144942b9ea5164fac2b068dc8698fc1114f34cc951b1c472c58f33ebf3c
+DIST gentoo-vdr-scripts-0.4.5_rc1.tar.bz2 35532 RMD160 9f8640734da9c697cbe0df3ebf51f6b96878c487 SHA1 feb2b52c1f25b1f44bd9e1f2045b0d18817c9088 SHA256 662e7c708dd07e1968c104209cae6d35568bc4722825d4f01e942c0029e3e28c
 EBUILD gentoo-vdr-scripts-0.4.0.ebuild 3829 RMD160 78a0e6f0706e2e98148bd48f9e7e2ecc15dcfff1 SHA1 c736bd058284e4aa350dbe8a1928fc9ff51f22b2 SHA256 0ba19e54c81eed852953ffd8206671fcf0b37baf3ab3e7d85a51f4a2c008edc4
 EBUILD gentoo-vdr-scripts-0.4.1.ebuild 4132 RMD160 7742c5dc2bcafe63ae0954f498e2319983e2f0d3 SHA1 a985f383fc7405ee0bd18036b8af40d4a265ac9c SHA256 6dcb8558464f0fcba8b14c08a66d5b871c890851954601fc80e3e42f0f1c3498
 EBUILD gentoo-vdr-scripts-0.4.2.ebuild 4160 RMD160 49ff19e8f87f83cd924fd00000f940792ecdd846 SHA1 0e61ffcde9ff744d1ab955980dbdd66056ec492c SHA256 7e0397dee5134cf56b156400c5fb935183661b4cbc9b386bd904ef96b9e52e47
 EBUILD gentoo-vdr-scripts-0.4.3-r1.ebuild 4255 RMD160 ed59150dc900a58a8dab685eb692f78ca1bbccc1 SHA1 e1ee853d3510df6d5225bed1be54a22ab329c896 SHA256 d4cb4470d5d61142cca6e351595b892fc63f084d09bd8625cce9b7922486689f
 EBUILD gentoo-vdr-scripts-0.4.3.ebuild 4160 RMD160 7c8f405c8538574a66a0ba01ac5387b437d6aa65 SHA1 7ef58c09f5b824e0422e68c9f852c1e5f26c3990 SHA256 bee752b252028b92aac0da0b0f279b4735eb0d2541a95d3e28bab2ffc79eb2d2
 EBUILD gentoo-vdr-scripts-0.4.4.ebuild 4160 RMD160 554687fb50f3f4d704d8804c29489b987f28346d SHA1 80d3a666d609be4235f162296beee66fb471e749 SHA256 1a12fe3cfb03e8d2cd66630d4bfe024ebc095b04dd4e97c2ebdb2f9b1b62f9bc
-MISC ChangeLog 19301 RMD160 e2742dffd4910aafdae0737760b18a30cf0543a3 SHA1 057504348953ae284e94a736501a5c20689fbad7 SHA256 3ed6a405c2c3395d6bc43b2f9eb9575b5d241b40755968ff19bc39b1cfb79ff5
+EBUILD gentoo-vdr-scripts-0.4.5_rc1.ebuild 3479 RMD160 f6ad4d93df837464deb881d78c47f03d43f536ff SHA1 0a6209c42218c1bd4705fa7087fbb015028b4fc2 SHA256 7e9a4c5ae3e33bafaa5900169e852ff067e3520e279a417daef91896c03a3a95
+MISC ChangeLog 19523 RMD160 a774f1ddcec726334067ca58d1d05378f766f2de SHA1 99a3adecbb15d8f77f0f9ca50d070a040e1f4098 SHA256 458701816b795025edff4828a44ecc51c662cca3d1ffd1c0871dd6516fcdaddd
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhUz08ACgkQ/ejvha5XGaN34ACcCYOWDTtAeaHzlNFGFJDga9sF
-jDwAn3uMUJPPppBGa7U9kgTLJE/6eoH2
-=7CX2
+iEYEARECAAYFAkiUy5MACgkQt2vP6XvVdOdbtwCgi0I+BBHrZPSz/9ZlY196PCvx
+FeAAn1Nds8/i0yBAFzcnBeATtwakyFBi
+=U7EO
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc1.ebuild
new file mode 100644
index 000000000000..eb7779df756a
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc1.ebuild
@@ -0,0 +1,124 @@
+# 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.5_rc1.ebuild,v 1.1 2008/08/02 21:03:05 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_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
+}