support >=vdr-2.1.10, fix some deprecated warnings in new vdr major release

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

3 files changed, 150 insertions, 6 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 53446f6d9290..06cc0606aa96 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.135 2015/02/06 16:30:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.136 2015/02/18 00:06:13 hd_brummy Exp $
+
+*gentoo-vdr-scripts-2.7 (18 Feb 2015)
+
+  18 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +gentoo-vdr-scripts-2.7.ebuild:
+  support >=vdr-2.1.10, fix some deprecated warnings in new vdr major release
 
   06 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
   gentoo-vdr-scripts-2.6.ebuild:
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 75a888cd29b3..a897595da24a 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-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.6.tar.bz2 40483 SHA256 797e7bd055d648d7eeda085aa0be2783e3292369823558f0313a99e96d539a3c SHA512 001c2519e9937b5d34af5a50662186a7914d1c9413e6a37d04df0fb943a920418dfbcd7e721c96e00fb4e236fc484780974d5e46bd1aa104b493a6962c871690 WHIRLPOOL 08a5149049c557fea68fdeca9e6b93e62fe83087e6261b521e7e39fe4151d38a58aa8f7cfd7046e801889770353c85cec299f89ddf9a3517a795188d1d7d376a
+DIST gentoo-vdr-scripts-2.7.tar.bz2 46618 SHA256 40f6e50e684b4dde9c026887119e80c9680212bfe41854c6526cc1346c0ae2a2 SHA512 95db4d2632d07cc86394fbc2898050d47175f01cc60b61230ba5363c770ba6ad5c5935987ac6a1131bc575887633ed6c8f6242f7de225fc875d0871123665bc5 WHIRLPOOL 889e2379fa9df6ae9992f6569779d4f485488e84c9c1065c43717ae07d15c601ce9a731e612e6bfaaf7df55d5eb4c7901f16bbf0eff680bc5b4ea25662885790
 EBUILD gentoo-vdr-scripts-2.0.0.ebuild 3652 SHA256 62b52927e9a537b69e7838569c804f312482959014012dddb0f8b30d9da2cd0f SHA512 9dc070c627fc35e285f753521f2928e2c49f6fa5e6afc8381c51abb62382297eba6379b77f0209fbd9b693954f4001089968b90d06b0695a54ba423233097a9c WHIRLPOOL 03fc204c7c5f70dd33ec4d6e0769b9c0cc98e290a2c2ec1146ee93e8bb497cf31a4b3ff8117355df908b89b4ef1478f6614695a6d8d87149a854b6b14d654ffd
 EBUILD gentoo-vdr-scripts-2.5.ebuild 3840 SHA256 80688c8701a9b362c2090770794f77a0d1877e1041d2ab2d204a7236a8f355bb SHA512 1bfcf931861fdf9e815749eaa0958960320ad1fcc4581cd115b7c2dc550992ccac843f1307d02e39c56b738e13fb3c650e212e9af1e721fdca59cbcb1902c267 WHIRLPOOL 76e7225deeb62fd1d104dd8e8e657346e77f367bdbf89dbe22f94ee012cae2be2877bc26c648456a52b8efd4d8002d106e9173ff0add2b751b9991260a837c65
 EBUILD gentoo-vdr-scripts-2.6.ebuild 3777 SHA256 7efd4432367c0ed4d5e946cb4578749a45c130d7ace99dc2732f34a429442623 SHA512 cc617be6bd2871ecb045aeae63fd7f9aad44ee82df005d09520d5311ac3631816dd3ac15e52b03e8ab8fef7ab322d066b9c3a1c8edd111b61cd2e8fc6abb279a WHIRLPOOL a796cb40cf7e8624e3aa379873ef98805d24933ab285f697ae733e49f587c7834d89de41730d9be274f14029b06bba31eab048cd9b46dc15ae66efb9e345c24a
-MISC ChangeLog 26851 SHA256 bafd2d1378c9340862b38e5f326df4769cdf64cd84e45ab0d606c695442d5500 SHA512 14f307400cd5abc64ad4f81086fb4b60162111489d97f0bb0fcf1c1ae0c6e0abce5b90215360d9b0923b9b985a3d9272d0871b5dd1d854cb2e05d4fdec398fc7 WHIRLPOOL 24ea6156f0660ece241f7720871ed6f0a80f23801015837096b027ace53049cd7f3e0820a47a9ac9a3d4f2a1065859231dcd9c3c1e973eed8b7768a21afa98f8
+EBUILD gentoo-vdr-scripts-2.7.ebuild 3777 SHA256 d8cc8ac27e1cb6f7cf17af8b781c7119d0b28b6da715040707441b6799489b7a SHA512 361c9e488899a5423b755a1fb92e1b873cd62bc27179bc03836e24163b2773a18e45071ea11073d257d975a88667edd6d7deb3d24f722827401b2b82165e4c78 WHIRLPOOL ab528d27856222cc034ee91a8b8e305133f90ff767029ffccddde1d2a9cb063d114b8ddbd7a886c676cbfc6e203a4dfc92b07995bdc7d0ed0145c6efb0a5195e
+MISC ChangeLog 27058 SHA256 eda87c169975ee30a4a141115fbd769da4fbb57a8ff23db84fb9ca65fedca3f8 SHA512 d682c7f74800cc7a989a505211049997ed60c4c2fc84d93e5e979a23cc5a68183560ebfeecac93a14495349261a8802a2451e94961338c3d185923044000674b WHIRLPOOL db491e06672a7efa45baf72956d154ed265247021e80589608bdb8213b7bf173df398625fecc2781e1a1016b7b8a16e786ef5d166ac4315726f9db45996c000e
 MISC metadata.xml 366 SHA256 a92d2326d3f734f176d63173dd3a19fa2cd3b9744ee142cd3e4fb0771d08fd29 SHA512 f292ea44800b14564b12cf4f12be80fb822e69586e6ef6e8d4f57aa9bc52c59b57ec85b1bad329b27ac628c186255aa4121250d0026cecaadf7fb2c726951956 WHIRLPOOL 429e33decc3b1c25dae8ba99449f0b40246780649a53038b363505c7db7db25aa0c646a6d5e785556d977d88591488d1a2aca25fb2f26cdb65ea8d8f3a344340
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFU1OwTdn07HTTCgIoRCFWOAKCAsBAqlBRFnskcJZ1BET/xGrqtFACdHR5n
-D9ckrzV9W3Y9U537X01ECFg=
-=E/En
+iD8DBQFU49d6dn07HTTCgIoRCHFnAKC8eSq/9OYPQVrVGS5znLSalZJf8ACdEsHd
+SznubBkEexDwIc2hgJi7YI8=
+=1Frr
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
new file mode 100644
index 000000000000..118a4f4cc49d
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
@@ -0,0 +1,136 @@
+# 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.7.ebuild,v 1.1 2015/02/18 00:06:13 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() {
+	default
+	nonfatal 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; 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=$?
+
+	has_version "<${CATEGORY}/${PN}-2.6"
+	previous_less_than_2_6=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
+		elog "Please do not override this with the EPGFILE variable\n"
+
+		elog "svdrp port 2001 support removed\n"
+
+		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		elog "${CATEGORY}/${PN} supports now a init script"
+		elog "to start a X server"
+		elog "Please refer for detailed info to"
+		elog "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	if use nvram; then
+		elog "nvram wakeup is optional."
+		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
+	fi
+
+	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.\n"
+
+	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
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Please read for detailed info on this"
+	elog "${CATEGORY}/${PN} README.systemd"
+}
+
+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
+}