gentoo resync : 05.02.2020

7 files changed, 4 insertions, 163 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 074b051e8b78..674a0fd8a123 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 34153d75d01d..a7a59056a38e 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,7 +1,5 @@
 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.8.tar.bz2 49662 BLAKE2B 1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa SHA512 587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf
 EBUILD gentoo-vdr-scripts-2.7.3.ebuild 3667 BLAKE2B d424ade9018e652c8f10da7909950758146c544a1e9c514393d3538b772e3cbd6689e02ba91c0a84da5189354903db41dc6067ca2f3966f5cdf51d2789df9549 SHA512 d48efb3d75d25a15786942e6c1c30c90a31d1f11ad8c2911b6fe33702802a39878360308a9e351e21aa891ffb67781367c5b851eb348d73b83c6c36207214520
-EBUILD gentoo-vdr-scripts-2.7.5.1.ebuild 3546 BLAKE2B ac8e75c6839c65802be894b9db12e4945cd44664503f34ad4175c358c73871022a4ba978519921ce8b0161ef8211fcc06409119624d2c4d001faa3b84913349e SHA512 273fd9d1425e3fff0ea6b783d4bddd407dda669a328bdabcbe488118e228717c8c2fea9de63bd45158c0c7abadcc5152066a8e16727cfbb269350739146d0421
-EBUILD gentoo-vdr-scripts-2.8.ebuild 2381 BLAKE2B 5a42866917ed7f81c26e2222e87792b5a1da6c9ada7a666da1530b07ab26cab90a466d2d8d2710fc70c599c1c73b67224485b5051056ef05a2279b664bf03a59 SHA512 05499d1ff6e7908fe09ab4b2cd34a8e5c3d4104256050db2d6569729a606e60ceec634ebdb899d4328ab92f9d78629ade2b57049461301ca36eb9d188a7e331f
+EBUILD gentoo-vdr-scripts-2.8.ebuild 2379 BLAKE2B c815ccb8ba882381c07f21e5b61908858e6c371f26fc6c753923dc5a750a7bd514bfa3f2bca66b82ff077e8af801ac1a4f18a7f7062ada038f7104e23641da75 SHA512 b73a0f45d467503f5986688657312fad9b4cf17815600dd6deec180e3b36ed25f6abb8a7823e960e3738b0510d04d83a84adeb8b68eedceb0d4cde7fa234b80c
 MISC metadata.xml 354 BLAKE2B 74ce746b4c49b338ad17df430f4aa1c11cad86684bf3c3003f2c2c2fc979435b53b5e30a997f009c53ea57d8441d09cc113b45ceaabc0a1d62f58e78ba73daae SHA512 9607950224075c12bcd9a43aef5cc3dd640cedee6689986713b10b2df1441a7694f8a527f03b66c15139dcaab917249ebd0899031432f545fe74a62aeabdce9d
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild
deleted file mode 100644
index ef0ad7526045..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
-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 ~arm64 ~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.8.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
index fd2aabc27022..8b3b09f8b22a 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/snapshot/gentoo-v
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE=""
 
 RDEPEND="app-admin/sudo
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 5d3627762f1d..80e85c0935e9 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,9 +1,8 @@
-AUX v4l-utils-1.14.1-sysmacros.patch 808 BLAKE2B 1dc608e836120e65140ffed8f9f4d19868eafbfb2e729665ad553fc44da4386d2197eb327f3f36ffafe8af45bea7adff72808d7cd7890e05c7fe5f3ba570ff8c SHA512 593f53b92ce947b1c2f75e7e1090b3f1e9ff3c39a69fcb96c4a6f1825db947b92bf4d45b93dc14eef7f439104d4a4090ef1823a38bd5e39687587afd6657671a
 AUX v4l-utils-1.6.2-sysmacros.patch 1853 BLAKE2B ed1f474be9650b0b4e5812746499935ac8a483ea71b335183c1648f97309d1d01209df1dbaf70f4e5b8e0d838ca97750bc37b4943dbeadbcac7c31ed9077969f SHA512 ea3e4a19c8b57833519b6356e647572021ac2a6a00942394a89949ff02aa3e0f70a72b0ef0f025615a7c81c0c79f1cacaa01a82161a05d806e3c8c792995353d
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
-EBUILD v4l-utils-1.10.1.ebuild 1675 BLAKE2B 69daa4e235f777b1f7005c19925f33aadc16c7d89425e061150050800399109506738157b5ca364a6ffaea398c90806c12a6208be12965236ea0f7a6370de89e SHA512 bcb4480a20b25d7c9f5d7e4cea0fa9b07e4af1fd2a3775ab932c47b49360328f07c15020f6baf309cc62fb87f28abb7ca3a299a16f43192b93976e15192511cd
+EBUILD v4l-utils-1.10.1.ebuild 1676 BLAKE2B 002bf242379beef51417aff53b95a735d4201a6d13edf371f54f21912fb94943987b17730fc4dd150688ffb0ac4cca2d37de93528ff04c6b67562097d274b0ad SHA512 d7427aad1d10208c5b8c9a4468f33d047d58d678e1766cee829ee5a419ba182d948c0f8bfef7460496675a818efe21d5c6636fe561bd46ec1da4a93619fc4c5f
 EBUILD v4l-utils-1.16.3-r1.ebuild 1843 BLAKE2B 46f25960bd80a69c923cfa3ea1a62bd2eed6a2c20d5ad61164dec5ce0dbd6da656e526cbcd094b3bb40e77d6a0ba24f61f6c904887ab70fd1ca949af531fdd12 SHA512 9ea267b9ed6d2abe7d04e6a53df4a1337dcebf133f42783b7fc5ef853f26e560bf10f94965e203e14e56f8da46357275b23eed59c243823dd9dfcb2091377c42
 EBUILD v4l-utils-1.16.3.ebuild 1768 BLAKE2B ed5b2f5884fa03440735d060ad8fac1931bafafb53eb14aaa68ff68a163c038592d7d099c00c0886050b7a751a1d163d09613886bd72f57e4003d55733af840b SHA512 9063665b2994026a6087f80630fc5d351f93be02d87afa69a7ddd72832185e1d06cd1163a3c2e636409845770e1cb8caf52da6cc5af4274912d2f0c38fcc3b0e
 EBUILD v4l-utils-1.16.6.ebuild 1842 BLAKE2B e451ebba2c6b61568944c482bd0a5631ce59db238b6ba56fd84b529cfea66b7f2594cda88395146aabe85efe6b119633ee0453debf29c204e3ccd2203b665812 SHA512 faafb1198ce491cdd892e5839d5a2d8844023fac82373969ebd16241514ea3a5f45e6e4374b3e4509971b33177d82334ab0dccb8cd76f19e984bfcdc0e3681ed
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch b/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
deleted file mode 100644
index b8190507fc7d..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
-===================================================================
---- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c
-+++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,9 +20,7 @@
-  */
- 
- #include <sys/types.h>
--#if defined(MAJOR_IN_SYSMACROS)
- #include <sys/sysmacros.h>
--#endif
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
-===================================================================
---- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp
-+++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
-@@ -21,6 +21,7 @@
-  */
- 
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
index 29db604a1927..35cf31c0ed1b 100644
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="qt5 udev"
 
 RDEPEND=">=media-libs/libv4l-${PV}