commit: 2b27bd106f5bc37e6fa0b0e445e3b5b45583adb7
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 12:57:58 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 12:57:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b27bd10
media-tv/gentoo-vdr-scripts: drop 2.8, 2.8-r1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
media-tv/gentoo-vdr-scripts/Manifest | 2 -
.../files/systemd-fix-environment.patch | 18 -----
.../gentoo-vdr-scripts/files/systemd-tmpfiles.conf | 3 -
.../gentoo-vdr-scripts-2.8-r1.ebuild | 76 --------------------
.../gentoo-vdr-scripts-2.8.ebuild | 82 ----------------------
5 files changed, 181 deletions(-)
diff --git a/media-tv/gentoo-vdr-scripts/Manifest
b/media-tv/gentoo-vdr-scripts/Manifest
index 781a68cca916..92e182128379 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,3 +1 @@
-DIST gentoo-vdr-scripts-2.8.tar.bz2 49662 BLAKE2B
1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa
SHA512
587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf
-DIST gentoo-vdr-scripts-2.8.tbz2 49484 BLAKE2B
6b746e69ae396225c7def07d4d177f71690793eeac51202f8a5c33c20a089d6537e84ed2784f8b85cf04285fbf7288f26bfa45b7e984f8ad18ad54d122fe5b94
SHA512
3d47b8d048ae8c1e218ba825731f73562ee34e02388361f41fcc9aec5b4d54c6f66338b26cf17742b39c86a9676bf26bc9b6b2bd3249b798e1e3de61eb8ef355
DIST gentoo-vdr-scripts-3.0_rc2.tar.gz 59284 BLAKE2B
88666442e27646a06a1e7d4b7389a02196b48eee3a14c20c70281b5db862237cac8982e989628810e5c6721ebca32347fbf2a80f29e0ff2d839760f076d50d2a
SHA512
d1ba41190565a129b6bd69aedd32590a5479a6390fb17a8d2a9e8926dd35260b3581b25b049da84e35e0d047b81c326512b67d45b488aa60ad10acafe93432d9
diff --git a/media-tv/gentoo-vdr-scripts/files/systemd-fix-environment.patch
b/media-tv/gentoo-vdr-scripts/files/systemd-fix-environment.patch
deleted file mode 100644
index b3ebb58bc994..000000000000
--- a/media-tv/gentoo-vdr-scripts/files/systemd-fix-environment.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur gentoo-vdr-scripts-2.8.orig/etc/sudoers.d/vdr
gentoo-vdr-scripts-2.8/etc/sudoers.d/vdr
---- gentoo-vdr-scripts-2.8.orig/etc/sudoers.d/vdr 2019-12-15
01:04:54.000000000 +0100
-+++ gentoo-vdr-scripts-2.8/etc/sudoers.d/vdr 2021-05-29 16:26:34.623489561
+0200
-@@ -1 +1,2 @@
- vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh
-+vdr ALL=NOPASSWD:/bin/systemctl daemon-reload
-diff -Naur
gentoo-vdr-scripts-2.8.orig/usr/share/vdr/systemd/vdr-systemd_helper.sh
gentoo-vdr-scripts-2.8/usr/share/vdr/systemd/vdr-systemd_helper.sh
---- gentoo-vdr-scripts-2.8.orig/usr/share/vdr/systemd/vdr-systemd_helper.sh
2019-12-15 01:04:54.000000000 +0100
-+++ gentoo-vdr-scripts-2.8/usr/share/vdr/systemd/vdr-systemd_helper.sh
2021-05-29 17:19:16.810413833 +0200
-@@ -105,7 +105,7 @@
- # as the user under which vdr will run is controlled by systemd
- sed -e "s:'-u' 'vdr' ::" -i ${SYSTEMD_ENV_FILE}
-
-- sync
-+ sudo systemctl daemon-reload
- eend "--start-pre"
- elif [ "$1" = "--start-post" ]; then
- ebegin "--start-post"
diff --git a/media-tv/gentoo-vdr-scripts/files/systemd-tmpfiles.conf
b/media-tv/gentoo-vdr-scripts/files/systemd-tmpfiles.conf
deleted file mode 100644
index ee0910b6dfe8..000000000000
--- a/media-tv/gentoo-vdr-scripts/files/systemd-tmpfiles.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-d %HOME%/tmp 0755 vdr vdr -
-d /var/cache/vdr 0755 vdr vdr -
-
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8-r1.ebuild
b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8-r1.ebuild
deleted file mode 100644
index 0dcd0874358a..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tmpfiles user-info
-
-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/${P}.tar.bz2
-> ${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-DEPEND="
- acct-group/vdr
- acct-user/vdr"
-RDEPEND="${DEPEND}
- app-admin/sudo
- sys-process/wait_on_pid"
-BDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/systemd-fix-environment.patch" )
-
-pkg_setup() {
- VDR_HOME="$(egethome vdr)"
- echo "VDR_HOME=${VDR_HOME}"
-}
-
-src_prepare() {
- default
- cp "${FILESDIR}"/systemd-tmpfiles.conf "${WORKDIR}/${PN}.conf" || die
- sed -i -e "s|%HOME%|$VDR_HOME|" "${WORKDIR}/${PN}.conf" || die
-}
-
-src_install() {
- default
- diropts -ovdr -gvdr
- keepdir "${VDR_HOME}"
- keepdir "${VDR_HOME}/shutdown-data"
- keepdir "${VDR_HOME}/merged-config-files"
- keepdir "${VDR_HOME}/dvd-images"
- dotmpfiles "${WORKDIR}/${PN}.conf"
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
-
- 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 "Read about it in /usr/share/doc/${PF}/README.systemd"
-
- elog "Plugins which should be used are configured in"
- elog "the config-file /etc/conf.d/vdr.plugins"
- elog "or enable/disable them with \"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
-
- if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh
"${EROOT}"/etc/sudoers; then
- ewarn "Please remove the following deprecated line from
/etc/sudoers:"
- ewarn " vdr
ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
- ewarn "sudoers handling is now supported by:"
- ewarn "/etc/sudoers.d/vdr"
- 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
deleted file mode 100644
index 8b3b09f8b22a..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 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
-}
