commit:     832251698a5928764e2aeb6486cbb07f82a42944
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 01:05:14 2019 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 01:05:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83225169

media-tv/gentoo-vdr-scripts: bump to 2.8

this bump will fix:
SYMLINK_LIB=no / 17.1 profiles break VDR plugins
fails to shutdown pc for sleep
shuts the vdr down even if nvram-wakup fails
disabled login for user vdr
ebuild cleanup
cleanup old

Bug: https://bugs.gentoo.org/688174
Bug: https://bugs.gentoo.org/646518
Bug: https://bugs.gentoo.org/298785
Closes: https://bugs.gentoo.org/688174
Closes: https://bugs.gentoo.org/646518
Closes: https://bugs.gentoo.org/298785
Package-Manager: Portage-2.3.81, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-tv/gentoo-vdr-scripts/Manifest               |   6 +-
 .../gentoo-vdr-scripts-2.0.0.ebuild                | 130 --------------------
 .../gentoo-vdr-scripts-2.5.ebuild                  | 133 --------------------
 .../gentoo-vdr-scripts-2.7.2.ebuild                | 135 ---------------------
 .../gentoo-vdr-scripts-2.7.5.ebuild                | 130 --------------------
 .../gentoo-vdr-scripts-2.7.ebuild                  | 135 ---------------------
 .../gentoo-vdr-scripts-2.8.ebuild                  |  82 +++++++++++++
 7 files changed, 83 insertions(+), 668 deletions(-)

diff --git a/media-tv/gentoo-vdr-scripts/Manifest 
b/media-tv/gentoo-vdr-scripts/Manifest
index d95af15c2ea..32cdcfe2b74 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,7 +1,3 @@
-DIST gentoo-vdr-scripts-2.0.0.tar.bz2 37438 BLAKE2B 
b7662b188809d17bd08186eb44444811408cbbaf37dfadc52d75f3d2ecdc934f68cf60c4631b1e92425e0cc827d1901763dd0e90ef049d68f9c851a35beac735
 SHA512 
0214b390e1e4fe4f65ceb940a1d092f88fe5263eda3c97ebfa7d2925a772165af3a3c62bfc964e577e374ce723aefccb29082f8219fda918ad17f966ad8ad392
-DIST gentoo-vdr-scripts-2.5.tar.bz2 39893 BLAKE2B 
5cfee26bd0187776169c5fd23e95681be2bfd4e983cb45c17c2479e29b270e241a898609ecc0619ca367d1c21bac11fd1b0f3f6a7d335b4bc38f36dd52fea802
 SHA512 
bed3db4e3c4f8195d5715d274a32485d067fa2e539ace417c2d73bac1294d46736754be589d5e18b77e0baa1b4d9cd7df5ff8a13db2850d92d2eb992f9b131a6
-DIST gentoo-vdr-scripts-2.7.2.tar.bz2 48584 BLAKE2B 
f2841f0d996f2db025d06d80b54c07fdbbcac6d131ff534447ad940ed5d7af6fb2fa14ca6280f9973e11fd2a7ae6019e0a118d01822829891eb11cd3ed66b272
 SHA512 
cb0297c7e78e4c110097d1c08a5f6642d8194d01dd47308f7a41c6d76f7b1675cc612d47a7725eb4f47a393086b034ca09703af0867ae02a36af4be12701f861
 DIST gentoo-vdr-scripts-2.7.3.tar.bz2 49156 BLAKE2B 
b5aaeb2cc704a2d43e05cb30cc6ea0d01f6f1b00dbfdf8a61d87cfc0360a86f2e7fb10daaeae7210eac46bca36ce72e4e928e1ce0752ffa3343fac83392b530b
 SHA512 
9d00acaf77bbbf52f4a4d4b8284d94b9d191c354de52ea6f7bba0751be661feec4915cca20be3d24a0471efe4b3f24c5dcc025e3e8b0cc6b2c37f8843b91a520
 DIST gentoo-vdr-scripts-2.7.5.1.tar.bz2 49537 BLAKE2B 
a6f01cc7b30b8d289317cbebed21bd4790865ebcf2f9f1b81375a35332784d2f2603aabb852808cca764dbd748469f815dbd83b296d71249dd6a4fd2709a6e31
 SHA512 
5b8f91f73ee42e290966eb9ae95b020b0a2c16f9d2c4eb79766934b8fa2e6bf415db20325254c0c6058abb868b010eb4180acc3714c18b47a5be390ee3e928c9
-DIST gentoo-vdr-scripts-2.7.5.tar.bz2 49457 BLAKE2B 
8c5bb9ee6369ee5b5e9b4bf392116b4f7b08d097b73b8790b4e2e6c1bc8ae9cc0f8f0eddf489af154e2ed5a964d7fce560e901a77f3886604c675dfc72550fc8
 SHA512 
b79460ae73c1914b0057d44469c0ac3e30feab3fc9fa91af618a0753f5061184110af6f2426d0638861e899fe7ef8ddc749bee631e95dbf52da9d32ae3ae7afe
-DIST gentoo-vdr-scripts-2.7.tar.bz2 46618 BLAKE2B 
5677506d8e798ff5a9f1968f6d63baa93cf049b24674ed1be23f4a7d10aa67213c4c20cfa95e3b3091be851aa1ce87eb901df076a3a3b7635b5d897bb978fe45
 SHA512 
95db4d2632d07cc86394fbc2898050d47175f01cc60b61230ba5363c770ba6ad5c5935987ac6a1131bc575887633ed6c8f6242f7de225fc875d0871123665bc5
+DIST gentoo-vdr-scripts-2.8.tar.bz2 49662 BLAKE2B 
1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa
 SHA512 
587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf

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
deleted file mode 100644
index 9bcc52db694..00000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       https://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}"
-       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
-}
-
-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.5.ebuild 
b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
deleted file mode 100644
index 8336694cbce..00000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       https://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}"
-       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 "systemd is now supported by gentoo-vdr-scripts"
-       einfo "Please read for detailed info on this vdr's 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
-}

diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild 
b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild
deleted file mode 100644
index 80c34f17a1c..00000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       https://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
-       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
-}

diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild 
b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild
deleted file mode 100644
index 6fdabc3dcf2..00000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       https://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_install() {
-       local DOCS=( README* TODO ChangeLog )
-
-       default
-
-       # 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
-}

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
deleted file mode 100644
index 50266d56682..00000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://www.gentoo.org/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       https://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
-       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
-}

diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild 
b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
new file mode 100644
index 00000000000..ec0010a562c
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+GVS_VERSION="3ef03483b825a032d2618c2f3fb61865b0fc2f1e"
+
+DESCRIPTION="Scripts necessary for use of VDR as a set-top-box"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/";
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/snapshot/gentoo-vdr-scripts-${GVS_VERSION}.tar.bz2
 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-admin/sudo
+       sys-process/wait_on_pid"
+
+S="${WORKDIR}/${PN}-${GVS_VERSION}"
+
+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 -1 "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_install() {
+       default
+
+       # create necessary directories
+       diropts -ovdr -gvdr
+       keepdir "${VDR_HOME}"
+
+       keepdir "${VDR_HOME}/shutdown-data"
+       keepdir "${VDR_HOME}/merged-config-files"
+       keepdir "${VDR_HOME}/dvd-images"
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+       elog "${CATEGORY}/${PN} supports an init script"
+       elog "to start a X server"
+       elog "Please refer for detailed info to"
+       elog "/usr/share/doc/${PF}/ README.x11-setup\n"
+
+       elog "systemd is supported by ${CATEGORY}/${PN}"
+       elog "This are described in the README.systemd file"
+       elog "in /usr/share/doc/${PF}/\n"
+
+       einfo "nvram wakeup is supported optional."
+       einfo "To make use of it emerge sys-power/nvram-wakeup.\n"
+
+       elog "Plugins which should be used are set via"
+       elog "the config-file called /etc/conf.d/vdr.plugins"
+       elog "or enabled them via the frontend eselect vdr-plugin.\n"
+
+       if [[ -f "${EROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+               grep -q ^DVDSWITCH_BURNSPEED= 
"${EROOT}"/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
+
+       # backup routine for old /etc/sudoers entry
+       if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh 
"${EROOT}"/etc/sudoers; then
+               ewarn "Please remove depricated entry from /etc/sudoers:"
+               ewarn "${VDRSUDOENTRY}"
+               ewarn "sudoers handling is supported by:"
+               ewarn "/etc/sudoers.d/vdr"
+       fi
+}

Reply via email to