11 files changed, 12 insertions, 281 deletions
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 85af7405e7b9..ac76dcab4201 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index e2fb5bc21e12..0eb396222b4c 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,6 +1,6 @@
 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
 DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7e9ce5c83eb9486ea1b398f3565ed027863057f143ae15c196fa01489f17fa71082ac878f49dac653da8967673872cb3e298f99cd59376c82ee39 SHA512 806fadcfc767d09dc9b474af089c2fa68ccafd91e110b74dc47f3a2ea90ebb74f80633831a20a51578fce3fbd4556a23c6bca9f7139be7c3de8eff79d2ee321c
-EBUILD dtv-scan-tables-0_p20171003.ebuild 744 BLAKE2B 28b07ee6e3b3f5b00db5ef257ddaca946ce56c5a92e27c0585587d9a8b3fceb0e6fdb65f85d461fcfd6fef5fc195310c2d69c5e1a067dd4fc407161ac2e1e577 SHA512 4f38f1175232d793ad428b687fbc1597504cd930edf7bfeb8ec4f7e0c3ac771f0aa79c8aef8813e426d34cb195d7024911d3aa8a8ea9be66e2e7de23ad01f87c
-EBUILD dtv-scan-tables-0_p20190922.ebuild 756 BLAKE2B 3c9145ba4a6e22b6432cceac25a23eb5e37e27317071edb7c06674932b5e2520df00ac2bab8f43e0b97e368678ecde9fb5ae402da8cfe61d1e12cc2d38c4c85c SHA512 6c7a28249f067bed3ac39e71e64bee3aa6baf79c55af2f7e75713d774896f8494a5d32011729bb5030cf70dc75c9cb1c48a849d0298013eb3b75511bcfc68da6
-EBUILD dtv-scan-tables-9999.ebuild 756 BLAKE2B 3c9145ba4a6e22b6432cceac25a23eb5e37e27317071edb7c06674932b5e2520df00ac2bab8f43e0b97e368678ecde9fb5ae402da8cfe61d1e12cc2d38c4c85c SHA512 6c7a28249f067bed3ac39e71e64bee3aa6baf79c55af2f7e75713d774896f8494a5d32011729bb5030cf70dc75c9cb1c48a849d0298013eb3b75511bcfc68da6
+EBUILD dtv-scan-tables-0_p20171003.ebuild 737 BLAKE2B 239cd08dda04b32e1090c15edbea043c5319af646256c89389bb28f1dfaf32051365ee54b395932bea67fc31f13b0ed28b66edda834b0884c88bd0c1cbc3c821 SHA512 b75a884494995705e88bd2a5808e0671511487c3e3d9d891816034d24d285b31aad5a0d580e62a990c2ed158226da3f993babe6b75cdc71c10bb1489561610f6
+EBUILD dtv-scan-tables-0_p20190922.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
+EBUILD dtv-scan-tables-9999.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
index 8c3d27e71d2f..790a52972747 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="c1986d5148d8"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ppc x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
index 83e1459c072c..d30627e88e3f 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="f07bde777d4d"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
index 83e1459c072c..d30627e88e3f 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="f07bde777d4d"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index e9ac67da17fe..54dc04c263da 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,10 +1,4 @@
-AUX v4l-utils-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
 AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
-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.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
 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 2328 BLAKE2B b02b2f4359b2cbbb97fc0a803990b050d816e4be8408e7554f4d9b4bc289ecabd53a75141126ec373b2def2f3f2c1fd4e6f72f3672a2d5f61b62bac12ab761c7 SHA512 bc8b2d08e9cd0cea1435f6d45179f4b418cf129573e66772ae86517f7c986aab50d874ca95d36d752ba3887d26ff92dd2e58e4c7f1f754c34fa7ea2746de53a5
+EBUILD v4l-utils-1.20.0.ebuild 2326 BLAKE2B a61b00d2d730d4ee9471df2ce6fa59de587dc5d28ce73fd22673a5d64bd1cd8a4a33d96cc26ba41bf8ff717597e45ab08b0afba44b112fe4606f830b0b3ce325 SHA512 a2ea528c025b0e67abe795acee8070736acb4b8514485fd799181e0d2359400c73c42576fdc59c4eb005b58cf2896b77eb366e355f7845fad07c81d9f46ac7cf
 MISC metadata.xml 322 BLAKE2B 0e97d8cbd1e3c9efd375500604308990419a8a1684241309406bf2516eab3b2c381c3efeb3838715c1f55fa72d906d9e7a05e6130619b7be0235621b63659f5d SHA512 e5f448069693b582de3044925082100a530a1c7e246b3d61a81accaa49918548a48f39b3785e96462c702361409b45d1aa95040dcdc33d742f45126d8531c9d2
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch b/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
deleted file mode 100644
index 33855c682b63..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 26 Feb 2020 11:07:29 +0100
-Subject: Fix GCC 10 / -fno-common
-
-* GCC 10 switches its default symbol emission mode
-  to cause linker errors when an object is defined
-  more than once.
-
-Bug: https://bugs.gentoo.org/706756
-Signed-off-by: David Seifert <soap@gentoo.org>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
----
- lib/include/libdvbv5/desc_t2_delivery.h |  2 +-
- lib/libdvbv5/dvb-v5.h                   | 26 +++++++++++++-------------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h
-index 93594b76..8c11fa9a 100644
---- a/lib/include/libdvbv5/desc_t2_delivery.h
-+++ b/lib/include/libdvbv5/desc_t2_delivery.h
-@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[];
-  * @brief converts from internal representation to string the SISO_MISO
-  *	  field of dvb_desc_t2_delivery:SISO_MISO field.
-  */
--const char *siso_miso[4];
-+extern const char *siso_miso[4];
- 
- #ifdef __cplusplus
- }
-diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
-index 45aaddda..3540bac1 100644
---- a/lib/libdvbv5/dvb-v5.h
-+++ b/lib/libdvbv5/dvb-v5.h
-@@ -14,17 +14,17 @@ struct fe_status_name {
- 	char *name;
- };
- extern struct fe_status_name fe_status_name[8];
--const char *fe_code_rate_name[14];
--const char *fe_modulation_name[15];
--const char *fe_transmission_mode_name[10];
--const unsigned fe_bandwidth_name[8];
--const char *fe_guard_interval_name[12];
--const char *fe_hierarchy_name[6];
--const char *fe_voltage_name[4];
--const char *fe_tone_name[3];
--const char *fe_inversion_name[4];
--const char *fe_pilot_name[4];
--const char *fe_rolloff_name[5];
--const char *dvb_v5_name[72];
--const char *delivery_system_name[20];
-+extern const char *fe_code_rate_name[14];
-+extern const char *fe_modulation_name[15];
-+extern const char *fe_transmission_mode_name[10];
-+extern const unsigned fe_bandwidth_name[8];
-+extern const char *fe_guard_interval_name[12];
-+extern const char *fe_hierarchy_name[6];
-+extern const char *fe_voltage_name[4];
-+extern const char *fe_tone_name[3];
-+extern const char *fe_inversion_name[4];
-+extern const char *fe_pilot_name[4];
-+extern const char *fe_rolloff_name[5];
-+extern const char *dvb_v5_name[72];
-+extern const char *delivery_system_name[20];
- #endif
--- 
-cgit v1.2.1
-
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch b/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
deleted file mode 100644
index fe5636ae5ecb..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/580910
-
-From 8edd80d3654843d9441fb5e43dfbf2b3e81f84b5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 14 Mar 2016 16:56:40 -0400
-Subject: [PATCH] include sys/sysmacros.h for major() & minor()
-
-Linux C libraries are looking to disentangle sysmacros.h from the
-sys/types.h header to clean up namespace pollution.  Since these
-macros are provided in glibc/etc... today, switch to pulling in
-this header directly.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- contrib/test/mc_nextgen_test.c            | 1 +
- lib/libv4lconvert/control/libv4lcontrol.c | 1 +
- utils/libmedia_dev/get_media_devices.c    | 1 +
- utils/media-ctl/libmediactl.c             | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
-index 3c8335c..59f28b1 100644
---- a/lib/libv4lconvert/control/libv4lcontrol.c
-+++ b/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-diff --git a/utils/libmedia_dev/get_media_devices.c b/utils/libmedia_dev/get_media_devices.c
-index e3a2200..edfeb41 100644
---- a/utils/libmedia_dev/get_media_devices.c
-+++ b/utils/libmedia_dev/get_media_devices.c
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c
-index 4a82d24..16dddbe 100644
---- a/utils/media-ctl/libmediactl.c
-+++ b/utils/media-ctl/libmediactl.c
-@@ -24,6 +24,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- #include <ctype.h>
- #include <errno.h>
--- 
-2.6.2
-
diff --git a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
deleted file mode 100644
index 911dc9e62692..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic udev
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~sparc x86"
-IUSE="qt5 udev"
-
-RDEPEND=">=media-libs/libv4l-${PV}[dvb(+)]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		virtual/opengl
-		media-libs/alsa-lib
-	)
-	udev? ( virtual/libudev )
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.6.2-sysmacros.patch #580910
-	eapply_user
-}
-
-src_configure() {
-	if use qt5; then
-		append-cxxflags -std=c++11
-		local qt5_paths=( \
-			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
-			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
-			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
-		)
-	fi
-	# Hard disable the flags that apply only to the libs.
-	econf \
-		--disable-static \
-		$(use_enable qt5 qv4l2) \
-		$(use_with udev libudev) \
-		--with-udevdir="$(get_udevdir)" \
-		--without-jpeg \
-		"${qt5_paths[@]}"
-}
-
-src_install() {
-	emake -C utils DESTDIR="${D}" install
-	emake -C contrib DESTDIR="${D}" install
-
-	dodoc README
-	newdoc utils/libv4l2util/TODO TODO.libv4l2util
-	newdoc utils/libmedia_dev/README README.libmedia_dev
-	newdoc utils/dvb/README README.dvb
-	newdoc utils/xc3028-firmware/README README.xc3028-firmware
-	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
-}
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
deleted file mode 100644
index 9ce273040219..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic udev xdg-utils
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
-IUSE="+bpf opengl qt5"
-
-RDEPEND=">=media-libs/libv4l-${PV}[dvb(+),jpeg]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
-		media-libs/alsa-lib
-	)
-	virtual/libudev
-	>=virtual/jpeg-0-r2:0=
-	bpf? ( virtual/libelf:= )
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
-
-src_configure() {
-	if use qt5; then
-		append-cxxflags -std=c++11
-		local qt5_paths=( \
-			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
-			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
-			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
-		)
-		if use !opengl; then
-			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
-		fi
-	fi
-	# Hard disable the flags that apply only to the libs.
-	econf \
-		--disable-static \
-		$(use_enable qt5 qv4l2) \
-		$(use_enable qt5 qvidcap) \
-		$(use_enable bpf) \
-		--with-udevdir="$(get_udevdir)" \
-		--with-jpeg \
-		"${qt5_paths[@]}"
-}
-
-src_install() {
-	emake -C utils DESTDIR="${D}" install
-	emake -C contrib DESTDIR="${D}" install
-
-	dodoc README
-	newdoc utils/libv4l2util/TODO TODO.libv4l2util
-	newdoc utils/libmedia_dev/README README.libmedia_dev
-	newdoc utils/dvb/README README.dvb
-	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
-}
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
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 e8360516a0a4..a200a8d31f7c 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="