bump; fixed locale handling for systemd, thx to D.Ferdinand wrt bug 530690; fixed misusing 'need net', wrt bug 530828; fixed locale handling openrc

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

3 files changed, 152 insertions, 6 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index af06098abd37..205645f47081 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.129 2014/10/22 10:59:08 hd_brummy Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.130 2015/01/01 17:33:09 hd_brummy Exp $
+
+*gentoo-vdr-scripts-2.5 (01 Jan 2015)
+
+  01 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +gentoo-vdr-scripts-2.5.ebuild:
+  bump; fixed locale handling for systemd, thx to D.Ferdinand wrt bug 530690;
+  fixed misusing 'need net', wrt bug 530828; fixed locale handling openrc
 
 *gentoo-vdr-scripts-2.5_rc4 (22 Oct 2014)
 
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 33f2b097b7aa..c4e0c85a0d3c 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -3,17 +3,19 @@ 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.tar.bz2 39893 SHA256 39a3c5d1cf30f1b07a6218b2154835994bbf9d65358e916260bad970a6ca6432 SHA512 bed3db4e3c4f8195d5715d274a32485d067fa2e539ace417c2d73bac1294d46736754be589d5e18b77e0baa1b4d9cd7df5ff8a13db2850d92d2eb992f9b131a6 WHIRLPOOL 5a7626484784ad49624df92daab0997368f885d4d5f6ad732082c2a77c840f6e23f345cf35816890d43493c57fa70c90eb9a4ab785a8d4ead81f6779714138b9
 DIST gentoo-vdr-scripts-2.5_rc4.tar.bz2 39328 SHA256 e8b3ac27b9bd511f3caaaff089abdf4248bac889e1ca240e2d8e0f74ae84d35c SHA512 c2d743ce7b2c446b3dada0f4e21649f7b9b21447db712cd6f77da0e88a2725563bc08c2a274fb9356f21205df8d2d9db28c3d6b329f4f78a6e979d64b5d2849b WHIRLPOOL 489a913dff361744b1d3e0811eef5566329af231149d4ebf27a0e545f228b68e915ca65ebd04852754afa08ab6071feba79b32697f66dbafb6f9f052059abd9c
 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.ebuild 3986 SHA256 c30d4a14acf582dabbc4f64de941f72af645cf10dd2c440fbe1c65e809dc7c7b SHA512 cf7930fdabff804b6c0f7f19a418e1e0a10cc153b78ceecd8a40df361420cafda52f1c960544d1c6dacd2d212689fc5cf031de879853bc39165a5277fa5b17d2 WHIRLPOOL 82cc7370f2b0b28e312a7836a1a334ad4575c4a2901914789fd016884bef635c3de65f236821db375f2cc891d3278406f115ea3ab1d4c178d7bb41b6fcc2f592
 EBUILD gentoo-vdr-scripts-2.5_rc4.ebuild 3923 SHA256 997e361b5a8a98c0c42402041debde49320f64bc61f2f5c49cb0dcffb7a2b92e SHA512 0b0441d1f77555e69f7a1ed92357b36304a195335c2e6111d12496b0c12f89f3243b270b9be4513fcfb4eefc380c29af2c1bb7bc45546c51389174d1320621a8 WHIRLPOOL bc2d7fa1d1422a53711eeb33abd0712fb2ea28f552f9bb2b429b7b406eacc27767331a1b2f3db0cf674f279b945dc4f611fcb2ef6b6f6360a3fdf5513507d459
-MISC ChangeLog 25894 SHA256 a5a46868b58fe289ce0534a5429d9136a85e67b8576d8e0130fef01f11e77225 SHA512 5d01052e129bc9607225f1e3de04005bfd319e9f3fe35e07dd3cf41182e2a2efbff0f44e0c2251c5cb7d4c1a2405046f6e6aa9af80ec60096e7ae9319ec0912f WHIRLPOOL 94bba4ca847a20abeb7a82488a5e5f88d6f5534e9a436ef971a8e37ce8c42aedb0c6c36946af830b84660591430b9d5ccb0e953681bbc804bf766ab141e6c113
+MISC ChangeLog 26175 SHA256 e8319f37b1e517fc2101c9173eb8810a8e5a8078c94d32df32b6a1e6f071fca2 SHA512 90ca720670f01ecd88ad596a278f9c9d8917c9fb8c52bb1aa52a96c1e1372392734a2cf4ca2a60eca5802cdabca4dc96229b58ffb5eb13a6a999bd34ed11dbc7 WHIRLPOOL 1989abbcda397e2b623118d27a211a7fb06bf87f60d2a9585920c0c77fd7c425d43c9fe004081c9f80e2ae925a1c769fd17d4984e840e50ebee7488c86c52729
 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
 
-iD8DBQFUR44Udn07HTTCgIoRCOcYAJ43lJeBoEgw9DVPtgZjYBmK5MTZRgCguS9e
-uilIBH8extsEENpGcCJxzt8=
-=MwQS
+iD8DBQFUpYTadn07HTTCgIoRCL5SAKC2YfnHJcXb4wU+xNPSBELhUd5TJgCeJUuz
+U9UPCKNBNpdQTRAy4Rn7b/8=
+=qk7U
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
new file mode 100644
index 000000000000..6575e5b01513
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 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.ebuild,v 1.1 2015/01/01 17:33:09 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 README.shutdown README.shutdown-jobs README.systemd README.vdrcaps
+
+	# 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 systemd 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
+}