[gentoo-commits] proj/vdr/devel:master commit in: media-tv/gentoo-vdr-scripts/

[Jörg Bornkessel]

commit:     308b0d08d0a69789e4b6059e0f0ba7cd86ee3772
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 18:54:04 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 18:54:04 2020 +0000
URL:        https://gitweb.gentoo.org/proj/vdr/devel.git/commit/?id=308b0d08

media-tv/gentoo-vdr-scripts: add gentoo-vdr-scripts-9999.3.ebuild, minor fixes

this ebuild is mainly used to checkout the gvs-3.x branch
moved src_uri from git to https
removed nvram use-flag handling

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Manifest-Sign-Key: 0x68C51DE6D770E4A6!
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-tv/gentoo-vdr-scripts/Manifest               | 21 +++---
 .../gentoo-vdr-scripts-9999.3.ebuild               | 76 ++++++++++++++++++++++
 .../gentoo-vdr-scripts-9999.ebuild                 |  9 ++-
 media-tv/gentoo-vdr-scripts/metadata.xml           |  3 -
 4 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 66af98f..f9c8a4e 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -3,20 +3,21 @@ Hash: SHA256
 
 DIST gentoo-vdr-scripts-3.0_rc1.tar.bz2 46962 BLAKE2B ad790680a5ece8df15939b09cb8cd389c89d4f262fcc1734936b0d6c42f546106d411b07be81b0471daa2b7f397fd4bfa935a9f4674b734d0b8b8cf4725c9467 SHA512 06db8eef1061fa87f887adea5194ea79997329c5145631c3009cf8247782000d3401bc492a519ff05ab5add95f7d9583882910fc72ab563935c6ee3965ba17f0
 EBUILD gentoo-vdr-scripts-3.0_rc1.ebuild 2292 BLAKE2B 0d896d148f86efe3af90153b0124af4bfb5c646c6ea744f929166b6c6d7bf8ede1fe11df4d9bb2ce24c345d61f38cf1fbde245694daf19e9a175b332b59d75e8 SHA512 15f4058a70d3a1ec39f5296b17131ebcb7c6d6a5d546c58e5bfecfa38d9d1cd744e8e55f21c245dc4af6dc7783a02d0cf2937130d65947074aad6ad3dc627a29
-EBUILD gentoo-vdr-scripts-9999.ebuild 1035 BLAKE2B 1772fdf80fe7508d84679b73ae68db510c093b93e2fd6421d4d22fdd1381321bd9ec76a4f8d8c7c13b2401737e3ae1b944b53efc95b6799e48af250564b80a81 SHA512 efe0d3f3709c1efbe98e6d238faa5fd5fdbc11e8a13642804753970289603cb7a3fcd564294288799e645311db04ff5cfdd60ea1a3e5bdcd04868ed2d0b8e2c0
-MISC metadata.xml 456 BLAKE2B c703bb7781705223a6a89957a45e4215b83aec3830a158ed15d1d1a812cc6ac6a04d924f07e7de14ce51252f2056cc7e1d5c434ba37e275ef0097a2ee0a44ccf SHA512 4d568a384c73d5c3750cfa2248d3ec37d9e92dfc9c0c7b51fc8c840cf0fe499546f492b7b84cd79e1700050f329c4ac43879fe0a77d21d480f1a55e9ff3f3e0f
+EBUILD gentoo-vdr-scripts-9999.3.ebuild 2072 BLAKE2B 57aee0950013eb8ee1b75a855253144a60df1a17c196d05ea91438ba84f9d15ab97c2e5d07cb324043cc260bb5988721903b9412d5a22b6ff23c391bc7e89f78 SHA512 94ae4568437f7931eb6215ee51df8efc8f598f08e8ccae0c55864f398a9d8c889b50ff539a605e868070226fc6b773472bcd809d82071fcc6edc03e7e1ecc494
+EBUILD gentoo-vdr-scripts-9999.ebuild 1005 BLAKE2B 98e3120f183249f0a6b845126d33003f3694f73f2105a1f2073902ed42eece8a960372d1d48d26e59f74ddd10886fedcf18ecdddcf05d32bac7ab311f6dabfec SHA512 0b23659c2c736ee0c8feda8ec722378c50f72c5bf90acedd66f76f9cf75d29698769ad2d1236b00bda1e06365883665f552d10304451ae2b79a195b0d32d4b1a
+MISC metadata.xml 354 BLAKE2B ac25dae19d9da5ea0baaa63d9de21dc7ca866301178796fa2bedd68cc5ac39db87f8aa45b155b0526811fbc5a53e1816d641f8002c89ee7e98ffa161a7cf004f SHA512 bc067d5d74ea6b54e73ce9845943ab2bbbd2d44542b7c096f946871196782d57f3f569cdc9ce5731fa2468f91f0926857e2103e78a789e95bee70569f3cee8b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: Signed-off-by: Jörg Bornkessel <hd_brummy@g.o>
 
-iQGTBAEBCAB9FiEEmjwdqGe+yMep/PbRaMUd5tdw5KYFAl4eLZNfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEmjwdqGe+yMep/PbRaMUd5tdw5KYFAl9IAUVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDlB
 M0MxREE4NjdCRUM4QzdBOUZDRjZEMTY4QzUxREU2RDc3MEU0QTYACgkQaMUd5tdw
-5KaOQwgAlNaxeXKAVwW9u6SWo/btNFwPS/x647K7wOuhPhJ6dWMT0w3ZSGEZObDx
-/6wsxg8pOHI/7nGpT46lGs8vUe4bgpwQHfD/X9XTwlccNLO1VzeTa/n0wkkVBNSs
-FpNVU4Q0e6+upLYX8+L4G9QyHweHTNEKL+VhUQ+GiMUvLgDcgnpQCeLBo0fY7UeU
-Jn4NoVH6vXyLzG0jMhk/Xz2q4t8qK2w/Sk04ZwWihDm+Ab2cQrGjR/BiSWnEGNcU
-pjC0ls3TrBy414qm6QBEuHXvbmgX/U10YGDKpjHHduxvmq2GpJswAlEgSIymqEgH
-ZFwYv1MW3e2QzjCb9TistOSFDDE0Pw==
-=nYDA
+5KZq2QgAlpEkN1s9hmtaknQ5eUqCn3KXdl8Hon+t1nfHtzP8cbJNIauREeEB3ndz
+3uBlwM6CSjUHUV6PaaASvbTbLF+l8yW2OS12Bo6u4bSVAiObOfNNq3dn3aRI6csV
+SmIaoUCogEcbYKcG2iuPUm5STjfMxek1mtDlyXFAdu0R3HabgIGx7R+fBk8WJ3L9
+ZmwG9EYvudCLGVAW36d4EoWqft+LLzIx6Nvn0euCG0mdt9gOZOA/fz++hJS6VoN8
+4iMS8u9cLps/bSx7kJjGqTsVA0oYb56uN9+rQxQAo8DraZbDu4mFvSHX0kUNmTSa
+slTn4EkMrEieMF/+MG0mlh4t+/v9NA==
+=0ckk
 -----END PGP SIGNATURE-----

diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.3.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.3.ebuild
new file mode 100644
index 0000000..499675d
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3
+
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-vdr-scripts.git"
+EGIT_BRANCH="gvs-3.x"
+
+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=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="acct-group/vdr
+	acct-user/vdr
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/lib/vdr
+
+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
+}
+
+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
+}

diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild
index 79b40dc..dd86b0b 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit git-r3 user
 
-EGIT_REPO_URI="git://git.gentoo.org/proj/gentoo-vdr-scripts.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-vdr-scripts.git"
 
 DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
 HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
@@ -14,10 +14,9 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="nvram"
+IUSE=""
 
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
+RDEPEND="app-admin/sudo
 	sys-process/wait_on_pid"
 
 VDR_HOME=/var/vdr

diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index 769dab2..f055a6a 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -9,7 +9,4 @@
 	<email>vdr@g.o</email>
 	<name>Gentoo VDR Project</name>
 </maintainer>
-<use>
-	<flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
-</use>
 </pkgmetadata>