gentoo new year resync : 01.01.2021

5 files changed, 10 insertions, 23 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 36074762707e..85af7405e7b9 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index 8a0bb28585a5..88967c5e489f 100644
--- a/media-tv/tvnamer/Manifest
+++ b/media-tv/tvnamer/Manifest
@@ -1,5 +1,3 @@
-DIST tvnamer-2.4.tar.gz 45272 BLAKE2B d00c584b95f2f1e3878dbf8618c9829412838b5ce72086b52620960a5d2a7b79768a78ae5e67230d7a83f12d1918f2428c5c0cccaadd1f08e5d4b1908ae31d34 SHA512 9271dca535910abed3f5ce24de4e65f7b951d2b6f80e07854bef06d52f7cdf40be8eb76934467ebae08bf919503a434c527a37caade1a3e696fbceb4446884fd
 DIST tvnamer-2.5.tar.gz 46030 BLAKE2B 4bad31df673b11671c8fb57c8e5d4ec8e7513ac63df6bf09d02943e06acab1c8d5f4d40f1d56b5e6a489ab27810aa85f82257df0b795a3ad5fdc4f63fcf5d976 SHA512 56233576a4f6e0b93535667f7d4e823cccba2bce785aaaed10415f5da1a3883fc29396a20fbffdca367fb9d3d748c6efa5b670eee43eece2631b28d640a5c180
-EBUILD tvnamer-2.4.ebuild 492 BLAKE2B 1f9ffa330d3c1d13615a8d97538b087e4948690b6f427b4e72281c987fd24c27ba19ae6f041737dc33a15549b348648e91ce0f92d0fcebdd1384e6ec41ec6040 SHA512 5ebff75ac001625b6d8a7e9c2b805771bb808ee7358f6d280b4dd9ca08c2c3da1413272a13ab6d971dd8d484cfb1096225501332973575f8896076f0803a5380
 EBUILD tvnamer-2.5.ebuild 498 BLAKE2B ce0184e321be900ee9659b49ba3778ffb979904b34b59c80e949278b71be07bc0638c7f06213a45905f55e9c78d4732d0f302febeb0aece4c808c274bb27564d SHA512 6dc22686f2395811a8642e5afde4c47d500a50d3c941552cb08916407d3c8f4a6ab556c44bd612dcf6c080fec96bc84cb6b9b2d95f929934033c1769ac244521
 MISC metadata.xml 379 BLAKE2B 79d429f9497154662e75f4693ab95c5251d65ed6ea06d3870e1f2a639cd470a9207d02ade929f10f9d0d7b0e91ad9629a899546ea02f40b6a4e5aeb5f846716e SHA512 d7a09db1fcdc1ec0b6fb78769fd219248bb4c5e858273d45554d5ac2021678a5d97f9b81cfbcd2ae05a1f9446c1c218463e8375d195335613df5834617463ae6
diff --git a/media-tv/tvnamer/tvnamer-2.4.ebuild b/media-tv/tvnamer/tvnamer-2.4.ebuild
deleted file mode 100644
index 3dfad7ee909c..000000000000
--- a/media-tv/tvnamer/tvnamer-2.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
-HOMEPAGE="https://github.com/dbr/tvnamer"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/tvdb_api-1.10_pre[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index a64f207c041b..e9ac67da17fe 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -6,5 +6,5 @@ DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
 EBUILD v4l-utils-1.10.1.ebuild 1678 BLAKE2B eb2011a597123c47921bac2267279ff09c4af54682e7fa166ef7e1096d36534ae7f98bc820e4db8159c41efa672800ed7c39d7bffbd51a1ee41079e43bea8a9b SHA512 f1c5684c7f530bebc44dfff4e2265da131b41a8ca213636f92fa3270415536aa8ecb78cce2dbe3f6e80ab563cf3327e0b02e77f257ea95108e242cc77a53bb3d
 EBUILD v4l-utils-1.16.6.ebuild 1906 BLAKE2B 7fe8c527fedbe0dc969f4cf616b2a72948ebe84f9b6d460a708a2969c8802735a6a2dfb61781246b78cd78f4f43dd06f32105fb44d79149ce02e8ad68250e4cf SHA512 1af08108099c2eccda0f6ae054861cf4c33b79b05ccdf6c7260e55edeafb4d592f4625815cdb08c8450167a89e860e917273984f6aaa7f509fef6683e22ddf61
-EBUILD v4l-utils-1.20.0.ebuild 2067 BLAKE2B 6b5ee3a762345d2574258becfa815188868e78058fb700df786f8e1308d42ba3ff8e6cd0f66076273ae9503e009ef7ae299d3c161c5633a93b2e53a05e0a4257 SHA512 01c38429c9e2cca3c7d39599da9b35978d39c4f36c6c701612c1ce573d1e74f419f991957e702f5b1646088f3e7bf3b1699020d38a9866b85f3a1d07201b12b4
+EBUILD v4l-utils-1.20.0.ebuild 2328 BLAKE2B b02b2f4359b2cbbb97fc0a803990b050d816e4be8408e7554f4d9b4bc289ecabd53a75141126ec373b2def2f3f2c1fd4e6f72f3672a2d5f61b62bac12ab761c7 SHA512 bc8b2d08e9cd0cea1435f6d45179f4b418cf129573e66772ae86517f7c986aab50d874ca95d36d752ba3887d26ff92dd2e58e4c7f1f754c34fa7ea2746de53a5
 MISC metadata.xml 322 BLAKE2B 0e97d8cbd1e3c9efd375500604308990419a8a1684241309406bf2516eab3b2c381c3efeb3838715c1f55fa72d906d9e7a05e6130619b7be0235621b63659f5d SHA512 e5f448069693b582de3044925082100a530a1c7e246b3d61a81accaa49918548a48f39b3785e96462c702361409b45d1aa95040dcdc33d742f45126d8531c9d2
diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 01f52bb05556..e8360516a0a4 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+bpf dvb opengl qt5 +udev"
 
 RDEPEND="
@@ -46,6 +46,14 @@ PATCHES=(
 # Not really prebuilt but BPF objects make our QA checks go crazy.
 QA_PREBUILT="*/rc_keymaps/protocols/*.o"
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
+		local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}
+		${clang} -target bpf -print-supported-cpus &>/dev/null ||
+			die "${clang} does not support the BPF target. Please check LLVM_TARGETS."
+	fi
+}
+
 src_prepare() {
 	default
 	eautoreconf