gentoo resync : 20.03.2022

4 files changed, 74 insertions, 85 deletions

diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index c7d4545e195b..f91428525cff 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,3 +1,3 @@
-DIST gentoo-vdr-scripts-2.8.tar.bz2 49662 BLAKE2B 1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa SHA512 587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf
-EBUILD gentoo-vdr-scripts-2.8.ebuild 2379 BLAKE2B c815ccb8ba882381c07f21e5b61908858e6c371f26fc6c753923dc5a750a7bd514bfa3f2bca66b82ff077e8af801ac1a4f18a7f7062ada038f7104e23641da75 SHA512 b73a0f45d467503f5986688657312fad9b4cf17815600dd6deec180e3b36ed25f6abb8a7823e960e3738b0510d04d83a84adeb8b68eedceb0d4cde7fa234b80c
-MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
+DIST gentoo-vdr-scripts-3.0_rc2.tar.gz 59284 BLAKE2B 88666442e27646a06a1e7d4b7389a02196b48eee3a14c20c70281b5db862237cac8982e989628810e5c6721ebca32347fbf2a80f29e0ff2d839760f076d50d2a SHA512 d1ba41190565a129b6bd69aedd32590a5479a6390fb17a8d2a9e8926dd35260b3581b25b049da84e35e0d047b81c326512b67d45b488aa60ad10acafe93432d9
+EBUILD gentoo-vdr-scripts-3.0_rc2-r1.ebuild 1899 BLAKE2B d1347810f302f4fca6447debc3d73b0c13c3e2fab2b7b667e6777b82c9108460ce23ff803ce23dd1633c1a3178a96d2be943a15f1972ecb70112a30c56a77115 SHA512 3893859fa0a5f4c4de663ae268b2d1e6b95e68ebbad55a4ae0312061418de7e7878cc67972388c92a5297b669daae622dcd74ca29048fad0ba1670d17ff23e95
+MISC metadata.xml 508 BLAKE2B 0e1fd077065c9e960657a6a6b2648f77a96cf106c57732b31c65050d3e85cdb35f3f735944bfc423f79be8382f5f210dcc7acfe04cdc10b294400f579cda251d SHA512 9409dce6ee81e8d7a7541528880eca2b38ba500cfc38a8c2d0eb0636c54ab5b5cb2987befa9f420fbb28b391b0516299ccc02b25b60137bef024cf2e70ee15a3
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
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-3.0_rc2-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-3.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..267957a48b58
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-3.0_rc2-r1.ebuild
@@ -0,0 +1,63 @@
+# 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://github.com/madmartin/gentoo-vdr-scripts/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+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}"
+
+src_install() {
+	default
+
+	local VDR_HOME="$(egethome vdr)"
+	einfo "VDR_HOME=${VDR_HOME}"
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}/shutdown-data" "${VDR_HOME}/merged-config-files" "${VDR_HOME}/dvd-images"
+}
+
+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/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index 2b167a7461de..b4dbb6eb43d2 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>