Added a patch to make the skip_plugin method work also on stopping of vdr.

Package-Manager: portage-2.1.1_pre1-r1

3 files changed, 18 insertions, 128 deletions

diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 3517fd277a27..e8b89d7c7175 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758 RMD160 7d887d26d27064db44ca03dfe589a8364c406eb9 SHA1 1f7858caf67a3a83b12ac4e8c69b72a1225d454e SHA256 d61f177162708398802eb644090f74f351e0595d60093f0d19272c6c09498af0
+MD5 ee33557bed3731d8baf7689e38025f1a files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758
+RMD160 7d887d26d27064db44ca03dfe589a8364c406eb9 files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758
+SHA256 d61f177162708398802eb644090f74f351e0595d60093f0d19272c6c09498af0 files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758
 AUX vdr-bg-quoting.patch 256 RMD160 094ce8cdd40307f1b5805da48cf25117ad5ffefd SHA1 37bad796e23501abeaf1990101606cb9904ac8e0 SHA256 ccf3ac1e05ec88795453b532dd6426acf0ba6bcbd36667644a3f3e179ceb7794
 MD5 102afb0ab8456cb129a8f3ae1e2b77ca files/vdr-bg-quoting.patch 256
 RMD160 094ce8cdd40307f1b5805da48cf25117ad5ffefd files/vdr-bg-quoting.patch 256
@@ -21,14 +25,14 @@ EBUILD gentoo-vdr-scripts-0.3.4-r1.ebuild 2729 RMD160 e9ed38e0daf4d5ae115792bbdd
 MD5 d214028dbecdd166c691098e68182869 gentoo-vdr-scripts-0.3.4-r1.ebuild 2729
 RMD160 e9ed38e0daf4d5ae115792bbdd06b2f3de2bc541 gentoo-vdr-scripts-0.3.4-r1.ebuild 2729
 SHA256 fb2cdb8ece5d846d6afed6f6e24214a6893ffdafcb21ba67fac3e6a2c80c3a4c gentoo-vdr-scripts-0.3.4-r1.ebuild 2729
-EBUILD gentoo-vdr-scripts-0.3.5.ebuild 2635 RMD160 284eeeac22b1aa4a79d709e646fcba80f47dd5b4 SHA1 8daede7864f817fc72d30b8ee354126b7b1a6b83 SHA256 bd4d7a8e7afca69a0ddb8af5c4832f0e11e59de8bff72b8bd630165ec5fae6bb
-MD5 cbf195c973548d42375225146a8ab045 gentoo-vdr-scripts-0.3.5.ebuild 2635
-RMD160 284eeeac22b1aa4a79d709e646fcba80f47dd5b4 gentoo-vdr-scripts-0.3.5.ebuild 2635
-SHA256 bd4d7a8e7afca69a0ddb8af5c4832f0e11e59de8bff72b8bd630165ec5fae6bb gentoo-vdr-scripts-0.3.5.ebuild 2635
-MISC ChangeLog 11445 RMD160 137b1a92faa0fcbf3dd75457834f3d13bed45afc SHA1 4d57d860c14dd002cc68d2c99d1b84fc09b93087 SHA256 3559475360cd42cab888515b7eb4a701da7d9cdd348c319ddda6d8ade7b95edb
-MD5 3eb505dd7ed4291c94eab2b4e9b71c00 ChangeLog 11445
-RMD160 137b1a92faa0fcbf3dd75457834f3d13bed45afc ChangeLog 11445
-SHA256 3559475360cd42cab888515b7eb4a701da7d9cdd348c319ddda6d8ade7b95edb ChangeLog 11445
+EBUILD gentoo-vdr-scripts-0.3.5-r1.ebuild 2712 RMD160 b68d0678f5c993bc825709946eb305cec948c054 SHA1 82ebcbe634413e3411c434b7ff7554209972d2a6 SHA256 33ed7af5f25eeacd02d18061476898555b60c315a9082a813fb0b40304da2f98
+MD5 a3b5f506cc438e7fd04536ee5a5576b2 gentoo-vdr-scripts-0.3.5-r1.ebuild 2712
+RMD160 b68d0678f5c993bc825709946eb305cec948c054 gentoo-vdr-scripts-0.3.5-r1.ebuild 2712
+SHA256 33ed7af5f25eeacd02d18061476898555b60c315a9082a813fb0b40304da2f98 gentoo-vdr-scripts-0.3.5-r1.ebuild 2712
+MISC ChangeLog 11745 RMD160 0981424b0c3afb830fbe279152149d0781997ed1 SHA1 e98b0c448cbe724f6d84930eea71572ae9ac1d83 SHA256 05d0a702957c2b6fea9bf4d19066ea8dd563a48dad959dc03e1e70c916b39393
+MD5 1db2f4ae166b19cc81f360c451bdc97e ChangeLog 11745
+RMD160 0981424b0c3afb830fbe279152149d0781997ed1 ChangeLog 11745
+SHA256 05d0a702957c2b6fea9bf4d19066ea8dd563a48dad959dc03e1e70c916b39393 ChangeLog 11745
 MISC metadata.xml 259 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 SHA1 71c8f0604523f99ac8b7849a01d861d721a191fd SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
@@ -42,13 +46,13 @@ SHA256 23f42dc04b7dfa3197038e8164193318f1b432e3c64ef66f91823bc9c16967f2 files/di
 MD5 be31a32d518744306e311099eaba790a files/digest-gentoo-vdr-scripts-0.3.4-r1 274
 RMD160 43a4648e6c8d3d78b03df2fd087812608a7d999a files/digest-gentoo-vdr-scripts-0.3.4-r1 274
 SHA256 f60bfc422f8868bc6afb822f1192af2f3738e80e1f078ccbd16dfbdc66113936 files/digest-gentoo-vdr-scripts-0.3.4-r1 274
-MD5 5660c4d171795ffb0118f52dccd536a6 files/digest-gentoo-vdr-scripts-0.3.5 274
-RMD160 7d68fef3d6dfc1690b228ca473cdb759c94ff57f files/digest-gentoo-vdr-scripts-0.3.5 274
-SHA256 bbbc9f334c6a05dd546add518388a36d002f8d014e698484b4933bdabe27a38e files/digest-gentoo-vdr-scripts-0.3.5 274
+MD5 5660c4d171795ffb0118f52dccd536a6 files/digest-gentoo-vdr-scripts-0.3.5-r1 274
+RMD160 7d68fef3d6dfc1690b228ca473cdb759c94ff57f files/digest-gentoo-vdr-scripts-0.3.5-r1 274
+SHA256 bbbc9f334c6a05dd546add518388a36d002f8d014e698484b4933bdabe27a38e files/digest-gentoo-vdr-scripts-0.3.5-r1 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEkq+sZfSl1Kp5KmoRAmwxAJ0bni8h6qUaZpry0N6yvbNlScn9VACfcscK
-OlZxaelZhwRXqZ8Dr50sIuo=
-=zAU0
+iD8DBQFElogbZfSl1Kp5KmoRAlibAJ9DgZ/Od9V5Mk+iuyWdtzmLd9wPugCdGAI9
+J+nR+V8w3GeP0CIb2esrGQ8=
+=Wmvm
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.5 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.5
deleted file mode 100644
index 4b4129a8360c..000000000000
--- a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ab528a3a017c3cdd4ed5cc28b18f5f6b gentoo-vdr-scripts-0.3.5.tar.bz2 22643
-RMD160 5782d55d2b62c11cd74193dd09588e4c9ca27b9a gentoo-vdr-scripts-0.3.5.tar.bz2 22643
-SHA256 c099dc98b7979b7dc036268adc8f90082f180d9d7f225bdbdfce35fa8376b83d gentoo-vdr-scripts-0.3.5.tar.bz2 22643
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.5.ebuild
deleted file mode 100644
index 1eecc7a80da1..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 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.5.ebuild,v 1.1 2006/06/16 13:18:27 zzam Exp $
-
-inherit eutils
-
-IUSE="nvram"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-DESCRIPTION="scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) )
-		app-admin/sudo"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-	enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video,audio,cdrom
-}
-
-src_install() {
-	local myopts=""
-	if use nvram; then
-		if use x86; then
-			myopts="${myopts} NVRAM=1"
-		else
-			ewarn "nvram-wakeup is not available on this architecture."
-		fi
-	fi
-
-	make install DESTDIR="${D}" ${myopts} || die "make install failed"
-	dodoc README TODO ChangeLog
-
-
-	keepdir /var/vdr/shutdown-data
-	keepdir /var/vdr/merged-config-files
-	keepdir /var/vdr/dvd-images
-
-	local MAKE_VIDEO_DIR=1
-	local testd
-	for testd in video0 video00 video.0 video.00; do
-		[[ -d ${ROOT}/var/vdr/${testd} ]] && MAKE_VIDEO_DIR=0
-	done
-	if [[ ${MAKE_VIDEO_DIR} == 1 ]]; then
-		keepdir /var/vdr/video
-	fi
-
-	chown vdr:vdr -R ${D}/var/vdr
-}
-
-pkg_preinst() {
-	local owner
-	local d
-	for d in /etc/vdr /var/vdr; do
-		if [[ -d ${d} ]]; then
-			owner=$(stat ${d} -c "%U")
-			if [[ ${owner} != vdr ]]; then
-				einfo "Changing ownership of ${d}"
-				chown -R vdr:vdr ${d}
-			fi
-		fi
-	done
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/lib/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	einfo
-	einfo "To make shutdown work add this line to /etc/sudoers"
-	einfo "    $VDRSUDOENTRY"
-	einfo
-	einfo "or execute this command:"
-	einfo "    emerge --config gentoo-vdr-scripts"
-	einfo
-	ewarn "The default video directory was moved to /var/vdr/video"
-	ewarn "If you have your video directory anywhere else, then"
-	ewarn "change the setting VIDEO in the file /etc/conf.d/vdr."
-	ewarn
-	if use x86 && use !nvram; then
-		ewarn "nvram wakeup is now optional."
-		ewarn "To make use of it enable the use flag nvram."
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/lib/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 "" >> \${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
-}
-