bump, better systemd support wrt bug 353492#33; added --keep-going paramter to vdrplugin-rebuild script, thx to M.Dummer

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

3 files changed, 151 insertions, 5 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index d928decd3c83..7fb924d557e8 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.126 2014/09/23 11:54:24 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.127 2014/10/18 19:48:46 hd_brummy Exp $
+
+*gentoo-vdr-scripts-2.5_rc2 (18 Oct 2014)
+
+  18 Oct 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +gentoo-vdr-scripts-2.5_rc2.ebuild:
+  bump, better systemd support wrt bug 353492#33; added --keep-going paramter
+  to vdrplugin-rebuild script, thx to M.Dummer
 
 *gentoo-vdr-scripts-2.5_rc1 (23 Sep 2014)
 
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 40023a40b06f..a85f4ae33cc2 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -4,16 +4,18 @@ 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
 DIST gentoo-vdr-scripts-2.5_rc1.tar.bz2 39085 SHA256 73668d3a5c9edfe964f25a2101e0f3f93046c156c41bd7def5157d904b3ac918 SHA512 770ba626091aa39e243a0d880b873da9d25f7a60eecb2f27cf02ebed81b17e472c5184b60f2a75ea1b2607e34d0f7a695d086f705bd96238694983f1d09a7071 WHIRLPOOL 74ed839e9f80c4b1959be5c55d0d88907aeae7897b04e608f7cf0973f7ddbf2cbdeaed9d8f84d6732429cb11f80c3d097a1530bef52d0073b26babc4e996843f
+DIST gentoo-vdr-scripts-2.5_rc2.tar.bz2 39312 SHA256 1dd8a44c7fd6194fbd827dededfb8ab162ce9d7b3a4e26844d32d4df600eb756 SHA512 6719a9df16234cb317f6a0ac285e11fb2989885b82c47c7e945c127181881eb7bcee03843443590c1c0af55242a6b8990666c0a467bec5b78e50552fc35c13ab WHIRLPOOL f26e03bc3e8e410ad32aad15a3e4e72a71f5a0b39d3661cad2cb91e61ac14489140b7f50b224e4ae5c2a816afbef072b7ba62a7a4a564484cf6934ff5489d092
 EBUILD gentoo-vdr-scripts-0.5.3.ebuild 3924 SHA256 9c9d727315b8d3a8cd23fe4b7451ea91b1f6620900ddb7555b45933e7047ee10 SHA512 25c58888c1034cfbf2bad7b497ea1fe3a6c668f385ee06a70eaf015eb298fb8940a9461fb6be445fa60e6210e38b82f423970005bf9eaa67db55eb82bd40114a WHIRLPOOL 57258720562cfda8723012c642c1c08789812caeb5a65a13d7ac66f459b17a0b22dc79e102ae1e7f97bf935ef6c3701cc2cc662b7994e056b6d6d32e908f33b8
 EBUILD gentoo-vdr-scripts-2.0.0.ebuild 3652 SHA256 62b52927e9a537b69e7838569c804f312482959014012dddb0f8b30d9da2cd0f SHA512 9dc070c627fc35e285f753521f2928e2c49f6fa5e6afc8381c51abb62382297eba6379b77f0209fbd9b693954f4001089968b90d06b0695a54ba423233097a9c WHIRLPOOL 03fc204c7c5f70dd33ec4d6e0769b9c0cc98e290a2c2ec1146ee93e8bb497cf31a4b3ff8117355df908b89b4ef1478f6614695a6d8d87149a854b6b14d654ffd
 EBUILD gentoo-vdr-scripts-2.5_rc1.ebuild 3922 SHA256 b1dd9e9a2cd372f5a4d8c190ae5c3641fd757f783c55f9c68627c5e5053152f2 SHA512 f09989659140ecd7d3ecb7e6d484dced20236ac5c43a7f074c49966056b455d128fdf173009299dc482e36dd58965faadf0255f96a258964eee07826fdc61e24 WHIRLPOOL 292999667f2817cf8c6a443fd9d6c494382a01c9f369d32b46fb5223e823e9c4df2318d69b0d7547cc229b772719f419f7e4f4d89bdcad3375ebf47d0b0d03ca
-MISC ChangeLog 25130 SHA256 bdc42c4acef4def5592a90d13b4200aa2a60c086eecdd2c3a363f9e143677d75 SHA512 8a480b7f2856759f2bce6fba24d9f65b0355eb47ab5b0ac4da167598602c661ff948aae7e81dc2b4f23e90d004a531a821518e9a11980c17d81582c026eab7c6 WHIRLPOOL 5bca46d07c0a5827291327bf3578955275022ed64f7489b755d13da36e18b9977018557fc649822099c9a9a58f059a56331f1098215e67acccc0cfdfa7f80cc5
+EBUILD gentoo-vdr-scripts-2.5_rc2.ebuild 3922 SHA256 fa5f5237c7f077bb46c82e81fb0505faad011aa79ec392a47cb8d6313e8ac838 SHA512 45aba511e748fb3b6afddb02dd3f85cef57f3a6f3bc21678ac9c629cd69bf91ecafb0bf3b2c98ae76f33605a4a607087a3a97e70f754365185ae040eb774ffcf WHIRLPOOL 823c97efb9cf402b4f008834adf9a71e5bbf025d69efaffc214a766dff3932232d3fa6f21ecb6962c86337623c674a9e2e2ad37cab76d7f03bfb5cfa82ee1545
+MISC ChangeLog 25392 SHA256 1fda3e0264b338853d7ff96345ec549a32fe30d5fdef460eac0ae0c880ac7128 SHA512 b7ce98ab0addfb9729b5eca2b645fcd6b0d206c9187e139c85e60d3c8a8d38eb073a45c7a4eef9e4f7f08dc90953390e457c0d65a1eda7fda7964b7d78079217 WHIRLPOOL 823b72e96ddfa9d3071f3389e426f539cb0ce6991ed0778ccf0646a83e7825ebdb4d2d69f541f7fa5c9e44387ac684ea764735a351915954d6755ad825d5cfb0
 MISC metadata.xml 366 SHA256 a92d2326d3f734f176d63173dd3a19fa2cd3b9744ee142cd3e4fb0771d08fd29 SHA512 f292ea44800b14564b12cf4f12be80fb822e69586e6ef6e8d4f57aa9bc52c59b57ec85b1bad329b27ac628c186255aa4121250d0026cecaadf7fb2c726951956 WHIRLPOOL 429e33decc3b1c25dae8ba99449f0b40246780649a53038b363505c7db7db25aa0c646a6d5e785556d977d88591488d1a2aca25fb2f26cdb65ea8d8f3a344340
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFUIV91dn07HTTCgIoRCLFpAJ9vUzLNGBxmR74eBhH0Wm2A9GkuPwCgpanF
-+JFkqT9z4GhU+pksJP+RNik=
-=t9XX
+iD8DBQFUQsQjdn07HTTCgIoRCLIjAKCg1Y0N4+X+LM0sAk6lht5P2xf5NwCcCquf
+vV0iixGVimoAKve7L+P85wc=
+=Qy0T
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5_rc2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5_rc2.ebuild
new file mode 100644
index 000000000000..f2b6fe420358
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5_rc2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2014 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.5_rc2.ebuild,v 1.1 2014/10/18 19:48:46 hd_brummy Exp $
+
+EAPI=5
+
+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 README.grub2
+
+	# 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.4"
+	previous_less_than_0_5_4=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		einfo "\nVDR use now default the --cachedir parameter to store the epg.file"
+		einfo "Please do not override this with the EPGFILE variable\n"
+
+		einfo "svdrp port 2001 support removed\n"
+
+		einfo "--rcu support removed, use media-plugin/vdr-rcu\n"
+	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
+
+	einfo "Up from this version systemd is supported by gentoo-vdr-scripts"
+	einfo "Please see for detailed info on this:"
+	einfo "Also please report problems with sytemd on gentoo-vdr-scripts direct in this bug"
+	einfo "https://bugs.gentoo.org/show_bug.cgi?id=353492"
+
+}
+
+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
+}