bump, init script vdr-x11 added

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

3 files changed, 147 insertions, 5 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index ddd5f5a4fcf7..66acde949e6e 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.133 2015/02/03 20:25:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.134 2015/02/06 11:56:23 hd_brummy Exp $
+
+*gentoo-vdr-scripts-2.6 (06 Feb 2015)
+
+  06 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +gentoo-vdr-scripts-2.6.ebuild:
+  bump, init script vdr-x11 added
 
   03 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
   gentoo-vdr-scripts-2.5.ebuild:
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index e5335d552a18..990a6a56409b 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -3,15 +3,17 @@ 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
 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
-MISC ChangeLog 26559 SHA256 900f4d63a5b068ffce7bf2b7b40e1f3f820f94e6f8b8340ce612978d226a59b7 SHA512 3c4ca464e37d59d63c07278fbf0ffb3a8bc9d8f5cb4216117a42f40d7e210a63acb8b292a48fbc44ebae0dd08f69aea90112e0b8ff1dc68846811b3f5b27b6fc WHIRLPOOL 07787e49c1f81bba4f60b4c712969747ab1641270d823ea53abe78e14640d271ac7acb9795bbb95c85257961fb68e6a16f58f509684c60f98c97f12a6713f677
+EBUILD gentoo-vdr-scripts-2.6.ebuild 3768 SHA256 c1434814f58b4186d715790259d96f916911b7360da0f788f9f5cf7c20d2fc13 SHA512 7b27d05d18ac1fee84e33cd207a65959db3c13157af19d52f12e16ecf941658a7d0a5948504de60a7811368f452ea7416af9a7dca5fd1d73291412311b51cb1e WHIRLPOOL c9161908a789660c23471b31eef6f701a0619339c543caf032259381b8485626de074daeccb62fa48e5bcf0945b9667e8bc8a0219feab53214810778026ba366
+MISC ChangeLog 26722 SHA256 b66ee8b0ebbb1a748d8cc10ec4b423431b56eae297f763c35b7b802c9f139a58 SHA512 1322045c3a890a6c11b0a8d58f66a9a397a6ec116e8a2b7fb68199cc830b73b34995a5cdd4e72fec0bb9131d851b117e57db4ccbc59efead8051be71f72e3099 WHIRLPOOL f9b81af2a0bc2a8304a84d459dc55f607bc45c4caee4aaf2098ba26c2eae23c26e8821f7d1547a149afeedb948964860ad41566eddcc12659023f4113f22b6b1
 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
 
-iD8DBQFU0S7Zdn07HTTCgIoRCFq2AJ44vOWqcYtdoMd07iN9ord12tCCsgCcDeWX
-mTK1ptELz8m5XyvPTs1Igec=
-=X3YC
+iD8DBQFU1Kvtdn07HTTCgIoRCFzhAJ91PmmMvxMJJE1IliQSIxOzXF0gXgCfQuEa
+9s1efKBubcZcI4Ng1DbNYAo=
+=6dQa
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.6.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.6.ebuild
new file mode 100644
index 000000000000..9473a047fb30
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.6.ebuild
@@ -0,0 +1,134 @@
+# 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.6.ebuild,v 1.1 2015/02/06 11:56:23 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
+		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
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		einfo "${CATEGORY}/${PN} supports now a init script"
+		einfo "to start a X server"
+		einfo "Please refert for detailed info to"
+		einfo "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	einfo "nvram wakeup is optional."
+	einfo "To make use of it emerge sys-power/nvram-wakeup.\n"
+
+	einfo "Plugins which should be used are now set via its"
+	einfo "own config-file called /etc/conf.d/vdr.plugins"
+	einfo "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
+
+	einfo "systemd is supported by ${CATEGORY}/${PN}"
+	einfo "Please read for detailed info on this"
+	einfo "${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
+}