Added a new version that now contains vdrplugin-rebuild. So lets block that ebuild.

Package-Manager: portage-2.1.3.12

4 files changed, 174 insertions, 8 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index d27626bb27b6..7049192183e5 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.86 2007/10/04 14:56:28 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.87 2007/10/08 15:11:16 zzam Exp $
+
+*gentoo-vdr-scripts-0.4.2 (08 Oct 2007)
+
+  08 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +gentoo-vdr-scripts-0.4.2.ebuild:
+  Added a new version that now contains vdrplugin-rebuild. So lets block that
+  ebuild.
 
 *gentoo-vdr-scripts-0.4.1 (04 Oct 2007)
 
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index addb600df5be..8883e095e30e 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST gentoo-vdr-scripts-0.4.0.tar.bz2 27936 RMD160 221063e8296281087b9d0f0031f7a37c405ff72d SHA1 d8f76b4c2977c0dc6d159111519ba0001b922440 SHA256 71ed687787aef0e9d263824505bd1244b6527bda95c0aa2c8ed408be53d2a301
 DIST gentoo-vdr-scripts-0.4.1.tar.bz2 30683 RMD160 5dc4a9ef2e2a6ab6f3cea879c1a546a883ac9b7c SHA1 b29088a0746e27941984e6cf26f4e9046fd6c3f5 SHA256 5e5a826936523208994a64d12fd04421eaaf6de474d7bfa3ff1e6f08233c0d1f
+DIST gentoo-vdr-scripts-0.4.2.tar.bz2 32110 RMD160 7c8bb70cb5a9e766b91ea57ec17786130448812e SHA1 e242092ae444cac1f835b56690f4449b4bffcca5 SHA256 1c3f10166e1a2012f4274d8b2c348243795603899195a3231b8c7cbf005f9e49
 EBUILD gentoo-vdr-scripts-0.4.0.ebuild 3710 RMD160 f96264a5f57907e2a1a34f3c2377f034cfb7244c SHA1 d402f1646a969298887b080512932d12de732eee SHA256 9b0e3bac194f3d2ff374c87a4c775dc88a3b1951e5a6947ede226f31580295ff
 MD5 7ec3507aa2157a855ab069530b6a0cbd gentoo-vdr-scripts-0.4.0.ebuild 3710
 RMD160 f96264a5f57907e2a1a34f3c2377f034cfb7244c gentoo-vdr-scripts-0.4.0.ebuild 3710
@@ -11,10 +12,14 @@ EBUILD gentoo-vdr-scripts-0.4.1.ebuild 4013 RMD160 a3de3f4b0882cb1f44c159173bd88
 MD5 931d724a88021e795f68b8490d1c5dd3 gentoo-vdr-scripts-0.4.1.ebuild 4013
 RMD160 a3de3f4b0882cb1f44c159173bd8843c21d44b36 gentoo-vdr-scripts-0.4.1.ebuild 4013
 SHA256 e20823c197c1fcccb80755a7f7105851a26f9ae80c728b629a48400653896c5b gentoo-vdr-scripts-0.4.1.ebuild 4013
-MISC ChangeLog 17466 RMD160 c6560b28aea62abc2902ccb7040465445103c5c0 SHA1 fce5856452d9b6a6434fc723c80a823457526798 SHA256 76effdc492f0566bdc4043418de03fc1b5efff6c2c1ba1d723d99ab528c38284
-MD5 8330abc0d44c0521b82e94d2037badc5 ChangeLog 17466
-RMD160 c6560b28aea62abc2902ccb7040465445103c5c0 ChangeLog 17466
-SHA256 76effdc492f0566bdc4043418de03fc1b5efff6c2c1ba1d723d99ab528c38284 ChangeLog 17466
+EBUILD gentoo-vdr-scripts-0.4.2.ebuild 4042 RMD160 73fde8d4781196c39198bbb8dd1e59f372e66d08 SHA1 3cef3425f6e6afa92bbdc523bfe62182ae1428f0 SHA256 69efa61ed5580c301677f440abc1bd2a1c9456306ca592e21307b155d48285e6
+MD5 423260e5b87d7b4d3815622ab91092d9 gentoo-vdr-scripts-0.4.2.ebuild 4042
+RMD160 73fde8d4781196c39198bbb8dd1e59f372e66d08 gentoo-vdr-scripts-0.4.2.ebuild 4042
+SHA256 69efa61ed5580c301677f440abc1bd2a1c9456306ca592e21307b155d48285e6 gentoo-vdr-scripts-0.4.2.ebuild 4042
+MISC ChangeLog 17685 RMD160 d71aed963393141f5069724e0e448c7cb5b38420 SHA1 c58d1d20e537681d55197366d5f205a9d9cb0a9b SHA256 2338ebd575133ba8a2c59427cd2d8643c3872ebc1728394fd5bb00b2f6523e10
+MD5 9d1ecd6abed89271c5b6394ef43c6360 ChangeLog 17685
+RMD160 d71aed963393141f5069724e0e448c7cb5b38420 ChangeLog 17685
+SHA256 2338ebd575133ba8a2c59427cd2d8643c3872ebc1728394fd5bb00b2f6523e10 ChangeLog 17685
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -25,10 +30,13 @@ SHA256 a5ab6946e53cf73e43d47e2e11f3a6b9cc9e1561b8f2e5403ec2103a66d8524a files/di
 MD5 81a44ff8705cd86acf26a57968e3fee7 files/digest-gentoo-vdr-scripts-0.4.1 274
 RMD160 272ea62af28a2ccf0ecd1a75a45307eb9508427b files/digest-gentoo-vdr-scripts-0.4.1 274
 SHA256 9ab3442cd46ce247ca04935e2437a2338f7470f2285eff0a65a17e21a8cafdd9 files/digest-gentoo-vdr-scripts-0.4.1 274
+MD5 755273ce9fbbebdab703567f5f265d95 files/digest-gentoo-vdr-scripts-0.4.2 274
+RMD160 be86ccfc769f041e3c15446795c84ca08a9143c7 files/digest-gentoo-vdr-scripts-0.4.2 274
+SHA256 f4c7a8199262155ad4e77bfd32f5f5f4a517f6b83e301ef1efd36a91043d1475 files/digest-gentoo-vdr-scripts-0.4.2 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHBP8lt2vP6XvVdOcRAooZAJ9lxrqj129yxBIcidYamH4onSkN7wCePhWi
-709hELTKSi66uLdumbhv4c4=
-=Uy0M
+iD8DBQFHCkiat2vP6XvVdOcRAvMXAKDH+B5MBBSFOFN+GFEyJp05HjPsJACgqXaT
+QgOCAcf4O+PDxh3r1To1Fdo=
+=gBEY
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.4.2 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.4.2
new file mode 100644
index 000000000000..6cf149831d56
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.4.2
@@ -0,0 +1,3 @@
+MD5 478b187b143224032284f36800494d33 gentoo-vdr-scripts-0.4.2.tar.bz2 32110
+RMD160 7c8bb70cb5a9e766b91ea57ec17786130448812e gentoo-vdr-scripts-0.4.2.tar.bz2 32110
+SHA256 1c3f10166e1a2012f4274d8b2c348243795603899195a3231b8c7cbf005f9e49 gentoo-vdr-scripts-0.4.2.tar.bz2 32110
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.2.ebuild
new file mode 100644
index 000000000000..2ca13432fcec
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.2.ebuild
@@ -0,0 +1,148 @@
+# 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.4.2.ebuild,v 1.1 2007/10/08 15:11:16 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() {
+	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
+
+	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
+}