stable amd64 x86; cleanup

Package-Manager: portage-2.1.11.50/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

5 files changed, 21 insertions, 285 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index c5864623eb10..8f2d8b7153f4 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.124 2013/03/31 10:19:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.125 2013/07/07 09:54:34 hd_brummy Exp $
+
+  07 Jul 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -gentoo-vdr-scripts-0.4.9.ebuild, -gentoo-vdr-scripts-0.5.2.ebuild,
+  gentoo-vdr-scripts-2.0.0.ebuild:
+  stable amd64 x86; cleanup
 
 *gentoo-vdr-scripts-2.0.0 (31 Mar 2013)
 
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 3d428a45664c..633855b04a9d 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,10 +1,17 @@
-DIST gentoo-vdr-scripts-0.4.9.tar.bz2 36868 SHA256 ea5475347d7a2a3b42f0ea216a659a7440b3d23119902c390d4457f8e6631677
-DIST gentoo-vdr-scripts-0.5.2.tar.bz2 36614 SHA256 5d1ea7ff2993384da3e3d85398b0b4cd311f92a953b2c1bfa7178be27d068fa5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gentoo-vdr-scripts-0.5.3.tar.bz2 36820 SHA256 d8cc8f7a42be56cb9a45c269ed0c2042bfe9a68826913893336900d7e0190d0d SHA512 23e1d41f681d363c64402e464c93dd907810a6f7d33e27be12e8d6ddd3d11ad21fa769661a16d4a68defc2c59479435d70fca56eb3f247aaa4bd8312b2ef7522 WHIRLPOOL 9078f39771302e5ecb18d734c612c4b4e62e0a748b39cec107bf1a902fb1ac812a3e8491f3bc189893a8061a1874c6d767cd04d4804a7dece638152f7c8e0d34
 DIST gentoo-vdr-scripts-2.0.0.tar.bz2 37438 SHA256 6c2025714546a25632c5b8103b3fa4b7ca6adf963189800c91e99cb23f7b2a79 SHA512 0214b390e1e4fe4f65ceb940a1d092f88fe5263eda3c97ebfa7d2925a772165af3a3c62bfc964e577e374ce723aefccb29082f8219fda918ad17f966ad8ad392 WHIRLPOOL a3de83d95a51622de997d8231b973d6899a2fa21324492e11eb4001ad3c15dee5c6e65f20ee44fd43ebe2974b2b1acf623956d2d44b955bfee799d1a696ace65
-EBUILD gentoo-vdr-scripts-0.4.9.ebuild 3603 SHA256 e8c8164e616812023581cb6bc23777a1cf137f85c7e300008671987df107f6a5 SHA512 38eb47264f40694dca7a65b8613902333231b17238e795ecd53bac292d12c990d59b06ef078034875e17a7dfcaafe155331c14c5edb5fbfb0279109eeb6db1b7 WHIRLPOOL 1e99c8f7ed2879c0fdf5c13933981945b63bde96279e1c9a101107afe01901a133081ae02b7c736847ad70061cef2294aad766e8aacaf5dc8273f4149fb29410
-EBUILD gentoo-vdr-scripts-0.5.2.ebuild 3924 SHA256 15d0b60e914eb9e2bcfdf0b04688868c1c642ae0bda976a6f5387196370abe1d SHA512 eeeeab054484413bd29adb1148b92a121dfc5c2f7c8e01ef979395eb08bd242fe71d1c81d702830b7a2bb326ffb6f2fe27db6ee9230d71ff960721b026fc0729 WHIRLPOOL 845e5078d1cc07e5cc1c3e6478ce1ef196aab76496c32bf47c22d18b85e759f22d472a295e2e94689d7bc2cfb1a680c167bc85f30c6075bc26d70971c78a4eba
 EBUILD gentoo-vdr-scripts-0.5.3.ebuild 3924 SHA256 9c9d727315b8d3a8cd23fe4b7451ea91b1f6620900ddb7555b45933e7047ee10 SHA512 25c58888c1034cfbf2bad7b497ea1fe3a6c668f385ee06a70eaf015eb298fb8940a9461fb6be445fa60e6210e38b82f423970005bf9eaa67db55eb82bd40114a WHIRLPOOL 57258720562cfda8723012c642c1c08789812caeb5a65a13d7ac66f459b17a0b22dc79e102ae1e7f97bf935ef6c3701cc2cc662b7994e056b6d6d32e908f33b8
-EBUILD gentoo-vdr-scripts-2.0.0.ebuild 3654 SHA256 0b7c50908bf36fd12b076b5a0ea4c2b16bcbd88027e949fdb4c7ea7baeb0d647 SHA512 b8072d579bde8c69165b519922411e8e1fe7960912579b13ba64409a7184d689d13fb86806a804286b0ff29850f6220900a7e37ca650219f0c25580f65b85d24 WHIRLPOOL 401114d34194af94777af74f0df09ec7152d6f5330e7e34f49b994c1e45c39f5e9260be2364e22577fa1be9f284ecbc7d9b3e3d6a24523ff83aab2c9b9e2782d
-MISC ChangeLog 24737 SHA256 6d055583c6e53bd0b85a3233ae4d238d3a65e81468fa465b9ccfc1352d5b50ee SHA512 355e0a73c5f8ab4e22bdb9adefa46065fc473b036d71f66a24bfac54329777f297f939af1b6b8a6d8a0513b19f456b9595d9fd8553f47c9a26029abd3f2f0740 WHIRLPOOL 907aa3993920e414be648219ef3221b8e4084ddff9bca65694db6d7d3dc61bd31eaf7b8c444771533cfe533bd1a0cc39cfd99e6c91f722b7dfe9b96d77f61c8f
+EBUILD gentoo-vdr-scripts-2.0.0.ebuild 3652 SHA256 62b52927e9a537b69e7838569c804f312482959014012dddb0f8b30d9da2cd0f SHA512 9dc070c627fc35e285f753521f2928e2c49f6fa5e6afc8381c51abb62382297eba6379b77f0209fbd9b693954f4001089968b90d06b0695a54ba423233097a9c WHIRLPOOL 03fc204c7c5f70dd33ec4d6e0769b9c0cc98e290a2c2ec1146ee93e8bb497cf31a4b3ff8117355df908b89b4ef1478f6614695a6d8d87149a854b6b14d654ffd
+MISC ChangeLog 24926 SHA256 2a089cb380343edd825f039554ace8b37ed2bbc9fc7770327e0abbd14d84d92a SHA512 8bf73d475b6bb016b99d8c4b95e99491968683e35a9cfe99f09cc063917ce1d5db96c5c919995de17be28686a52468ceecdf2b492ed6bbe643f6d6b82631a4a7 WHIRLPOOL 6f79be0484831cd3985a2be56879e7d49bbff21c81687f6c6affd9d0452883eaf3359323e9829b70fcc7cf62bb1fb85a1e962ba1fac6228697b7734e32a1ee12
 MISC metadata.xml 366 SHA256 a92d2326d3f734f176d63173dd3a19fa2cd3b9744ee142cd3e4fb0771d08fd29 SHA512 f292ea44800b14564b12cf4f12be80fb822e69586e6ef6e8d4f57aa9bc52c59b57ec85b1bad329b27ac628c186255aa4121250d0026cecaadf7fb2c726951956 WHIRLPOOL 429e33decc3b1c25dae8ba99449f0b40246780649a53038b363505c7db7db25aa0c646a6d5e785556d977d88591488d1a2aca25fb2f26cdb65ea8d8f3a344340
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: signed/commited by hd_brummy@gentoo.org
+
+iD8DBQFR2Trbdn07HTTCgIoRCDenAJ47A8kmKNWkj05RL+sOYNCV3aM2igCgq3yU
+WTmzpbirXijCM4ztYeZYS4s=
+=KfyX
+-----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.9.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.9.ebuild
deleted file mode 100644
index 945244e1351e..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 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.9.ebuild,v 1.5 2012/06/09 23:30:58 zmedico Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-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/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-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
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.5.2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.5.2.ebuild
deleted file mode 100644
index 548e43d82822..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.5.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2012 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.5.2.ebuild,v 1.3 2012/10/07 17:20:04 hd_brummy Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-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/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-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
-
-	has_version "<${CATEGORY}/${PN}-0.5.0_rc3"
-	previous_less_than_0_5_0_rc3=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_5_0_rc3 = 0 ]] ; then
-
-		if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-			eerror
-			eerror "Depricated sudo entry in /etc/sudoers"
-			eerror
-		fi
-
-		einfo "new file /etc/sudoers.d/vdr added"
-		echo
-		ewarn "IMPORTEND !!!"
-		ewarn "Please migrate to new sudo handling"
-		echo
-		ewarn "Upgrade Info:"
-		ewarn
-		ewarn "To keep the shutdown work correctly, remove the line from /etc/sudoers"
-		ewarn "\t${VDRSUDOENTRY}"
-		echo
-		ewarn "or execute this command:"
-		ewarn "\temerge --config gentoo-vdr-scripts"
-		echo
-	fi
-
-	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 "Removing depricated entry from /etc/sudoers:"
-		einfo "-  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
-
-		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
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
index f1a795f0ca9a..6c419c71c6a6 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-2.0.0.ebuild,v 1.1 2013/03/31 10:19:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild,v 1.2 2013/07/07 09:54:34 hd_brummy Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="nvram"
 
 RDEPEND="nvram? ( sys-power/nvram-wakeup )