gentoo resync : 08.01.2021

25 files changed, 300 insertions, 315 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b060b66d6da5..081aa1af6d23 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest
index 43d9ffd56152..9f36f0a0e046 100644
--- a/media-video/dirac/Manifest
+++ b/media-video/dirac/Manifest
@@ -1,4 +1,4 @@
 AUX dirac-0.5.2-doc.patch 2304 BLAKE2B 1753b2645553deac3479ffc776eba95e9c100ce2d1ee18fd5a43af1d333608ac1df885ff6d10954414357b0cf76110c101d246d9ef66e7691bf4ff03a9387ea1 SHA512 1cac4ce26efd5f28b1d671258d5b8b0612815ac41dff230eda0db2c3a0f7414e2266ed1f92de728c97c40319e5d035f42fd1882233f85e3ccfd83b36b84ac099
 DIST dirac-1.0.2.tar.gz 918366 BLAKE2B 16fb215958e0d772c0c7a89ee25603b25115b422a2e669d3256ea1384b5376e4df2bbf3303000ff26f08c3290a96958ace3391898bebe086b29116cf04180046 SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c
-EBUILD dirac-1.0.2-r1.ebuild 1464 BLAKE2B b339cb850ba1b23abf139937a86ea29d8a64aed5cd5ce2befe4eeb3437bd4bf4cefb7f9b0f9841ad6cef53c94e19317a129860484b8108281d39bb83d0aa0a5e SHA512 58be206027b8e0541bdd5a90e32a1f776cede1c52c1a56a51603ab67075d7837661503ef37ca0f0fcaba04d625adf2d568e60778f6c1c818a8f3e8729d258fe9
+EBUILD dirac-1.0.2-r1.ebuild 1453 BLAKE2B bbf6238fc5bfa881f0f43d49fb3b9b8bcc1f80aa127018ea9b5302ee9b54f945bddde0afbff180f5c75e33834c3145e0dd32b2ed0fa141d1ad8bf53c0a6bde0d SHA512 c7ee9ce20888bfea473ee2ab7a99defe84f331aff5b82fa4b13d6295c2a9e81c57d16c0f1731b1cfea9e460d1d7841c3badd0b336bac549a3f578d8e02e68d8e
 MISC metadata.xml 298 BLAKE2B f1f8662f90d8bb126d611299d7b184d5b0d4fe7ca39415c7a1e9aa0f87f911469f7d423fd4f77c29e6734512131971a062b4eaf41ef2fed46f9e10b82aea3e84 SHA512 af4dca87e12f4378990ff854d7f6ad5af7ccc083694a3ad34521dece8cc740508aa2cecaf6ab8aae3cac66069ba9d6becc5fd7e0856af532a5011db50041dff6
diff --git a/media-video/dirac/dirac-1.0.2-r1.ebuild b/media-video/dirac/dirac-1.0.2-r1.ebuild
index 28013c2da072..e2ed5bb1e327 100644
--- a/media-video/dirac/dirac-1.0.2-r1.ebuild
+++ b/media-video/dirac/dirac-1.0.2-r1.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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 0b7eebc01fa4..766d9e891c2e 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,3 +1,5 @@
+AUX gxine-0.5.909-fno-common.patch 559 BLAKE2B 070ac7218be823a96287e067fec31c3f7f70ab4d6aaff495eaea940e3cd77c3ef27d3f11b64c84a47bb5dd5352d855d996b91e32dd993a895771f2f5cd3a88a8 SHA512 6bff8ce76588f9a25e3006f0b669332d1f0dc0326334f449e7dd3b7f3840d8c0e631e8c301b7d7726d5ad9e3630dc50d318b2f918ab4f2508c60de06568a8030
 DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215
+EBUILD gxine-0.5.909-r1.ebuild 1532 BLAKE2B d228dacbd8115e5c5033f911b466aac2208c75e687ab66f8691f7bb7909437f957c2f35568ad71db30e840a8a88c72ad00347c76dcbc5ef686c029d4b64d24eb SHA512 604509ec7e0dc6a8d963a33358e4477e3a1138bcff69d4386767ca27163b225326b016cbbe690943d848e20cc7557b88d03af9eeaad5a10e29292e2c6b86f8b3
 EBUILD gxine-0.5.909.ebuild 2040 BLAKE2B 68a161a5a1639615b8d976df2e78ba22a969140377e3bce3d4f900617b5074875e87243f8e1c76efd0eb9741dc193e0ff52e0fd7733b4de13a8624109dbe057e SHA512 4705f92285382af777273ae36d77ea72fae400f3cdc82ec5b1b6c9e21bc13848da73e1b968aa444b1f791c9ebb1422739155241fa6a55999ea968e8784e30e4b
 MISC metadata.xml 305 BLAKE2B 0704c2d6ae4a0e249d693a63f719b4ec470a08e1cf1b64342571dad7514fd2a14616bf0812aa8f6a0732049c702ee3e00ab005c5b650723577526413c8337ad5 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587
diff --git a/media-video/gxine/files/gxine-0.5.909-fno-common.patch b/media-video/gxine/files/gxine-0.5.909-fno-common.patch
new file mode 100644
index 000000000000..32ad6c3770b2
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.909-fno-common.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/709306
+--- a/src/main.c
++++ b/src/main.c
+@@ -75,6 +75,7 @@
+  * globals
+  */
+ 
++extern int gxine_init_count;
+ int             verbosity;
+ GtkWidget      *app = NULL;
+ const char     *plugindir, *bindir, *logodir, *pixmapdir, *icondir, *miscdir, *confdir;
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -108,7 +108,7 @@ void do_pending_events (void);
+ 
+ const char *get_copyright_notice (void);
+ 
+-int gxine_init_count;
++extern int gxine_init_count;
+ static inline void gxine_init_add (GSourceFunc func, gpointer data)
+ {
+   ++gxine_init_count;
diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild b/media-video/gxine/gxine-0.5.909-r1.ebuild
new file mode 100644
index 000000000000..5c5965807691
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.909-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="l10n_cs l10n_de lirc nls udev xinerama"
+
+DEPEND="
+	media-libs/xine-lib[gtk]
+	x11-libs/gtk+:2
+	dev-lang/spidermonkey:0
+	dev-libs/glib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	udev? ( dev-libs/libgudev:= )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare() {
+	default
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == 0 ]]; then
+		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-watchdog \
+		--with-xcb \
+		--without-browser-plugin \
+		--without-dbus \
+		--without-hal \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		$(use_with udev gudev) \
+		$(use_with xinerama)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		docsdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
+
+	use l10n_cs && dodoc README.cs
+	use l10n_de && dodoc README.de
+}
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 02af79235c77..ce26b52f1b7e 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,8 +1,11 @@
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
 DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de522a4063b80c4cafe38cc6917b99deb6394570592d3ed29a0ff7b92f819b9bbc9eb2a8f3b70077625a2714f70ee1959e SHA512 b3412349234ad2923953296674926ee7cb33c43ce17df8942f751789f0208064a4557ca16e1a5878a4e1b35e5bbbd415a9c9f182ffb24e589ac4757e990576b5
+DIST libva-utils-2.9.1.tar.bz2 1037281 BLAKE2B 862b52ae8b1552e1150fadff9e45371e7065bf1c1fc9244a5ad0466a3109d56e9f3dd4d937f7474e6df2eaf806e93d520b1f2a986a0aa6bad7328f89d458706b SHA512 6573a2aa4844c10fd34fb5ed6edded33e15e65b7bd55d437da45a22dd5ef2116a3f137966433d986177705d544e6ea9a2a6582f49bb2eca6756970f341283d35
 DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a0431062d1d9803d8ccb1e5c3b534edf4f91288009d5940a0ddab49beeadae92bf361bec0bee8a3214f04f3c6767b0992 SHA512 39d79d4eed1fc0890fbf89d5689d4f01f704d3c71b4986e0eaf4c4a2f836cc36338d0a01630092a31b740588426398d0381eae1dc0302b0df94859d9161d8378
-EBUILD libva-utils-2.4.0.ebuild 1274 BLAKE2B 0f68cfea6a566fd35bf63ff6d655ef8ddcc2e28d8cb6379ae0cf72a69abe3d2efb4df404da98bf454c24bda07e6b78c80ad0a856142d60d459e0fe48f5f226a4 SHA512 97fd99aee8f53392d1df26460ada81f940cad393672adcc3cfff42cceb58effdf841392696f564f27e23014f0799e8430675a9e9d48b7b8b238a8a4953ade38e
-EBUILD libva-utils-2.8.0.ebuild 1277 BLAKE2B fe2f300acb0fcc91b4aa3fbffd7a587b7a06190df5e7f88b2a277cc0001f72d0c8741106db1fe7c46cb2bf16be196bb31b39f215da23a1d3a1765566c4765a6a SHA512 8b649c415532ef439847cc6639a22b2b1ca2cf02bf72b58a4aca8f518b9349801f451122fc0d0f8cba7398b1d772e30ddf26c1ea399f90386d7a3570fd82ea76
-EBUILD libva-utils-2.9.1.ebuild 1283 BLAKE2B f4fe7461cd06c506e6e6291368dd1866aab6fecc2ec4fecd5f20e1778cf8198a46565089f553495e85f6c8b0daa64e4852ffc7153e6ded66f4e8683acf77e1a0 SHA512 a69d691c8b0f7921844e4b8297aaccb7b2488840d35b88fc89202f78a7ef06b9f4f7043be25785b96b4df4937047998bcfa55111e10fe641d48f955a49accecf
-EBUILD libva-utils-9999.ebuild 1276 BLAKE2B 830f4728dcb1e436ae7755097fc55ff341ef8c14c7fa1daa56587aaeb83a94f675c0e89e5d4aff57b54f08785aa96fb2511564159d12a8b046373865751ad089 SHA512 be383fe04d33543acddddae27c843c0773fe875102984e23776582b601b7cc109f3024856aa596770a277b852cd6096a0bae24018a39179529c075aff8ec40b2
+EBUILD libva-utils-2.4.0.ebuild 1260 BLAKE2B 21e0954fabf17181f30f73ab9e04fff01fc1ee90aa37983e83a0937eba1e334154931d854b424072be433afacfeae9fc9abd449e335d5f1b5d0ab44262949d31 SHA512 5cf59b4ad3ab602a9a548b1ba7fdfd19096c92fc09c2d860d7e4277e10d070d80d0ce995b54d6d3140fa5837437c765b58f2b2b926d28b20a90277eaf36361cc
+EBUILD libva-utils-2.8.0-r1.ebuild 1537 BLAKE2B 2c1f7727f4b9c1bbc3360dd20133a56ce641c1fd53ec56ab5b0f736db0ae343c9efbf5b523de2bb9bb50dac477a45f005256fac98ae25b2ffefe8c07469f5f18 SHA512 5f36c0614e05d5ceb11af1bae4aa698cf2a45f3535eb947088546d0f74bf5a725c74d92b054f6cb3a70fd572742d359ab92f68af45e51cfbf8093540a12d95ff
+EBUILD libva-utils-2.8.0.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4fd5ae1ed25a6fc1ca75835c8d791b1805abf20ef9096ffa69bc30d2d9e767d5b9f3f2f47ad1a58ffd50de9cc8789d4 SHA512 ccfccee30aba5857f484b6d8a308a3d895ba89cabac7d7d5b1240f7ed5b9b0d672efef4f02be591864dfa8ce9a530eed848831af971897685e1fc1ced57d3788
+EBUILD libva-utils-2.9.1-r1.ebuild 1538 BLAKE2B 9eadf3aa52ba47a3fb498827c6a0be47c254b46b47e4207695b11f371a4f86df9d8cdd134d60fae63ad47a806f5591589439a54d8832c37310cf8d07fe492619 SHA512 35aff9abeeb2f0b4c0acbaa94b7c46d1e1450948184a93e34701f00bf8a6b8325625409742b3ea4558cc65e3d2b54af26d30d3d74e22475efd51f6be844909bf
+EBUILD libva-utils-2.9.1.ebuild 1269 BLAKE2B 7a67145af77dab26119aada7dc4ce3a341d605802c0e514693dd02de71848a1f0435f8591449af69dbe69554f6d28b700cd8e723e183eb2b39f2d10d7a07bb56 SHA512 0c3d37d06de6b2aa4f2156c3ea09c49a8f4066ea5e11003e077a405767abf299ac1fb37c585c8674f5c21dae94f3585842ccbb83baae4aed96e9db68b5874e1a
+EBUILD libva-utils-9999.ebuild 1538 BLAKE2B 9eadf3aa52ba47a3fb498827c6a0be47c254b46b47e4207695b11f371a4f86df9d8cdd134d60fae63ad47a806f5591589439a54d8832c37310cf8d07fe492619 SHA512 35aff9abeeb2f0b4c0acbaa94b7c46d1e1450948184a93e34701f00bf8a6b8325625409742b3ea4558cc65e3d2b54af26d30d3d74e22475efd51f6be844909bf
 MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
diff --git a/media-video/libva-utils/libva-utils-2.4.0.ebuild b/media-video/libva-utils/libva-utils-2.4.0.ebuild
index e9e8647bce72..d415c24deb9d 100644
--- a/media-video/libva-utils/libva-utils-2.4.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
+if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 fi
diff --git a/media-video/libva-utils/libva-utils-2.8.0-r1.ebuild b/media-video/libva-utils/libva-utils-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..d25c79ae5645
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.8.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+fi
+
+if [[ ${PV} = 2.8.0 ]]; then
+	AUTOCONFIGURED="true"
+else
+	AUTOCONFIGURED="false"
+fi
+
+if ! ${AUTOCONFIGURED}; then
+	inherit autotools
+fi
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} != *9999* ]] ; then
+	if ${AUTOCONFIGURED}; then
+		SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	else
+		SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm test wayland X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( drm wayland X )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=x11-libs/libva-${PV}:=[drm?,wayland?,X?]
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? ( >=x11-libs/libX11-1.6.2 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( NEWS )
+
+src_prepare() {
+	default
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	if ${AUTOCONFIGURED}; then
+		sed -e 's/-Werror//' -i test/Makefile.in || die
+		touch ./configure || die
+	else
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	[[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
+	default
+}
diff --git a/media-video/libva-utils/libva-utils-2.8.0.ebuild b/media-video/libva-utils/libva-utils-2.8.0.ebuild
index b6f4b82a5e3f..f5a0b8cea6d2 100644
--- a/media-video/libva-utils/libva-utils-2.8.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.8.0.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
+if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 fi
+
 inherit autotools
 
 DESCRIPTION="Collection of utilities and tests for VA-API"
diff --git a/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild b/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..93c23cd9a5ca
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.9.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+fi
+
+if [[ ${PV} = 2.9.1 ]]; then
+	AUTOCONFIGURED="true"
+else
+	AUTOCONFIGURED="false"
+fi
+
+if ! ${AUTOCONFIGURED}; then
+	inherit autotools
+fi
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} != *9999* ]] ; then
+	if ${AUTOCONFIGURED}; then
+		SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	else
+		SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm test wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=x11-libs/libva-2.9.0:=[drm?,wayland?,X?]
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? ( >=x11-libs/libX11-1.6.2 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( NEWS )
+
+src_prepare() {
+	default
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	if ${AUTOCONFIGURED}; then
+		sed -e 's/-Werror//' -i test/Makefile.in || die
+		touch ./configure || die
+	else
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	[[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
+	default
+}
diff --git a/media-video/libva-utils/libva-utils-2.9.1.ebuild b/media-video/libva-utils/libva-utils-2.9.1.ebuild
index c560f3968fb9..5c4c9e2040af 100644
--- a/media-video/libva-utils/libva-utils-2.9.1.ebuild
+++ b/media-video/libva-utils/libva-utils-2.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
+if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 fi
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 61b1748bbee5..93c23cd9a5ca 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -1,19 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
+if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 fi
-inherit autotools
+
+if [[ ${PV} = 2.9.1 ]]; then
+	AUTOCONFIGURED="true"
+else
+	AUTOCONFIGURED="false"
+fi
+
+if ! ${AUTOCONFIGURED}; then
+	inherit autotools
+fi
 
 DESCRIPTION="Collection of utilities and tests for VA-API"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 if [[ ${PV} != *9999* ]] ; then
-	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	if ${AUTOCONFIGURED}; then
+		SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	else
+		SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
@@ -27,14 +40,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
+	>=x11-libs/libva-2.9.0:=[drm?,wayland?,X?]
 	wayland? ( >=dev-libs/wayland-1.0.6 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
+	X? ( >=x11-libs/libX11-1.6.2 )
 "
 RDEPEND="${DEPEND}"
 
@@ -43,7 +51,12 @@ DOCS=( NEWS )
 src_prepare() {
 	default
 	sed -e 's/-Werror//' -i test/Makefile.am || die
-	eautoreconf
+	if ${AUTOCONFIGURED}; then
+		sed -e 's/-Werror//' -i test/Makefile.in || die
+		touch ./configure || die
+	else
+		eautoreconf
+	fi
 }
 
 src_configure() {
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 757bd42c964b..32e3f5a45dae 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -6,5 +6,5 @@ AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed2
 DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
 EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
-EBUILD motion-4.3.2.ebuild 2236 BLAKE2B 3ec7e973cc902ecda2c17f48234aa2551b3f8b5e888ef1ae85ac48081b5fa06c958dac9a67c7ccbdc3ece7fff24608c2fec9c01afc6f755b90c495db625317e4 SHA512 449b61cacce85d6b183b43424881535b7ea861e5588ef4f5605b799de7b4f156dccc1120fdd9942034450af96f7e1d4f9891c26ae1eecd107f423c8f629ef8be
+EBUILD motion-4.3.2.ebuild 2234 BLAKE2B 7adc8b1b4b3b552fd80a5580bd2baa2969f28cd0d5df6712ca93836a362c085b12e6d6baa1af478adba2039f35ba21200a365ae27b6e41a0444f463791e39678 SHA512 c94be53b5ea1f5511b6dbd57f3bf815ed8e5a3e46c04f4b21d76683fcc95e34c14e2e296fb0e8310c9c90608681512330a77d5d7ad632a0d250c9ce2c4fb8026
 MISC metadata.xml 850 BLAKE2B b9ead6c9f74bb359c2bb282c0f6f8c33707fbd42aa458314c93bc754e2f707dc51fcfe5e0e0e2216af8435c2aa10d9e1c5885a838236b1ea274453c84f95f303 SHA512 419521643cbaefd58973bc764594ec44fdc927890c837eda0733af575073a8655e58da76f4a22467ae1d014898d828b84e9de85bb442cd9505911af1a04395b1
diff --git a/media-video/motion/motion-4.3.2.ebuild b/media-video/motion/motion-4.3.2.ebuild
index 19e930a8ae01..10749fd8c447 100644
--- a/media-video/motion/motion-4.3.2.ebuild
+++ b/media-video/motion/motion-4.3.2.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://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="ffmpeg mariadb mmal mysql postgres sqlite v4l webp"
 
 RDEPEND="
diff --git a/media-video/mpgtx/Manifest b/media-video/mpgtx/Manifest
index 3b9782cffccb..490cdf9718aa 100644
--- a/media-video/mpgtx/Manifest
+++ b/media-video/mpgtx/Manifest
@@ -1,5 +1,5 @@
 AUX mpgtx-1.3.1-configure.patch 2414 BLAKE2B 542e4e504040a190ec131d9339f943cbb6d11a65d23e1b29003c34e3e7111dfa5c8d9c27a5e17fa7f9d2cd9a0827530d5ab5870d3f89eeaee3e143576d18bbea SHA512 038ae7bb3ff09f65b01ebfe1d60c44d21f1c7347710191be86e65286de83b84ffe35c7f2a97795b4a6ac9eb50189e5a2b50bf452bb49cffa615c2bbc7ebfcad3
 AUX mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 BLAKE2B decbf12e2ba6fc66b98a0aa861ef9fa5af6cfb93c2ec44c24fd5ff828ad29d762a1015455807f4d14cc66ed9684b17fb7dbdeff89a0eeab20bb61326de096ebf SHA512 5845b7ad6d9ca7200074d8c90588b97cb623e08c2946c2902bca49e7861273468471db0b74d268d4ec458920f0c2c698208d768c6afd179c2ed9abd199e636aa
 DIST mpgtx-1.3.1.tar.gz 89170 BLAKE2B 30286aa86f5c073a10619bb09eb6f1a5fcde70792839de43a5fe8aa98fb7f94ed61e529288fff76ff64267f2de4582b168176cedd7dda2c19732e6667641f9f3 SHA512 0f568673811f709383b3f262b19d3ec69de6807671c05a98266b21f2bfa6a8b85d2a8b95c3cec38bb012afb9d8add19a3f38b74b3e90f66cf233a1d26aaca805
-EBUILD mpgtx-1.3.1-r2.ebuild 1216 BLAKE2B 1d7fbaa973ec9677644b5b44cd8e7c18dd8e5b39640b9b51a2d50dda22c03a1b67b79dca38df176bd7c4fea8ac7499a253adae09a62b93ddf27a29f0185c2900 SHA512 02e6b6af040c77e69ade0cc3d04e58f5c86a0a542839f7550adbbc2976796258bc08b06d0f6a693d2b1250fc3133bc11667d254299e42e9489bc4974848715c4
+EBUILD mpgtx-1.3.1-r2.ebuild 1202 BLAKE2B 6208c5e780948bb84be3292d71b2a199f74eeb398f784008b0ea24d6771564016d0aa3a520cd77a9c410e31678af17033dfbebbb85fd8eaaf7a3ec972523d4ec SHA512 4657ff284fddaff879ad5bbae49aae3377f5a801fecfa99475301497d157b6bc835b08d80af76da8431f7ced5b6bd1e2bb70ff92c28dc4ca41e6cf5721494be8
 MISC metadata.xml 306 BLAKE2B f4b719952d2e6cf75e8640f793deeafc89acde125263d2fb3fecf0151595805a90750416c23806b308acb4b9163f08ff4e4d74cd1d61227f1abe447afd6cc542 SHA512 4ee62efce019bd77b49de68810efadafdd36db330b147d8bd24a4af29ba6a4e69a3ccb66545a4c42261ade86b3094b2e15d838ac8af7d06be1713b3b07193144
diff --git a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
index 91b95dde1ed1..6d709ee3f1a0 100644
--- a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
+++ b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="http://mpgtx.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index eabe046d573b..8874dceedc18 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,9 +1,7 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
-DIST openshot-2.5.0.tar.gz 60153193 BLAKE2B cdc79c68be7cd5b9e2714c98c4edbb5fc9ec349283da8439e9f9e26b2341688e2b8ae0f108413f59582d6e447faeb96d1da6916503299ca40939d73f5983377f SHA512 0944bff48c8957a4a3c5a37428b4d3e45e8ad6e1664812ea90b7c16d014a3c355daf2fe183ce855586114ccfa36c419b6baacc42c4bf871de29bda4c24f2a814
 DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
-DIST openshot-2.5.1_p20201203.tar.gz 64708017 BLAKE2B b95834b8b75460b60a54b2c1efab1752424c291f5e16fefd33671f7ea9eb9c29d48047a18287a9cf2837c21e3c1ea9a7217fcbdc27440bacc04ff6f8da6202a2 SHA512 668c3155489d469042220e059cb0fc4de50b4d949c28d4ae6e8ef9b6ccdd3235dd4912b5163ae4126758621052d4b40f21aa40c6e1682776a71076f0c45cbcdc
+DIST openshot-2.5.1_p20201227.tar.gz 64708834 BLAKE2B 7b8742eae1865fe510d1690eb1df907ba4e5079093af075308a17304ea184976df064b6065fab6ef2394efbad2e0042174145ea9cd7213e6d8993bf30a865c81 SHA512 3688bee7a7febfbb12351e0bcceb9831c778bec3ae441cc9b10fc01e695747cf20912ceee54a275a956c443aaf1c4fcb0cd6b54f10474e6e95d025685d0bd4bd
 EBUILD openshot-2.4.4-r1.ebuild 1265 BLAKE2B 1a8dc1f69f0b7c357b10bde0a6d49b3a0731798fd714bbfe0202838d19b74de9144db6e2f0c2efd4f3d1027bc6a3aad9c36bf4df0ad5973d8a5e6497fd7aeb27 SHA512 e4d50ed1ed5ca1d417f5aa3e9951e3c107d66b03acef17040007aa2c0985ae9bea16b2e877e23b68e9d084975c76e8c40b78b083206aad3e69296a1cac2444bc
-EBUILD openshot-2.5.0.ebuild 1238 BLAKE2B 3b0d72a809439def72602de855d7a31efb10a6b94196014b0207b54bf115e1064528351d43fee4fab266ba5aef05bfffe671dc2946df1d8c8d2dc771d49f2408 SHA512 6d1e743de1520665bcec187d981f3c4fa27fae6c969308a9532f2f07b2a091d42b529d844bd96f7940e8ec9e40cde686bde0f7c42e335306299cfbf90841abd7
 EBUILD openshot-2.5.1.ebuild 1243 BLAKE2B 471a504e9592f9524192cd87231ea96db33bf19910905394d681aedb0735aa99f0dccbb7877c209de56e341b1cdb63c4affa2d18b1af9c58dea6387c61e76641 SHA512 a1dff240e62fedd8d0e2785c9c1d217c66b04cc177f80bcbd56931d2bb8393776f22c8d5333abe5c8b13a8e6af21a0a2b568b37dec856f1e2d1012a5a26fc3db
-EBUILD openshot-2.5.1_p20201203.ebuild 1339 BLAKE2B a26d66d6761090f48936b73cbae5e4522b9390c80b7587e70b2d54dfaa5e0f9a770aed8c9b42a1c5d2718ddf20d67fe2ef766f4ae1b8a4b3963ebf33f8965e81 SHA512 0b846c7eac6c9a60852325a823f5dde200c41524fcff81a2084abe8d80b4098aff16c2944e7d98fa8925e42cb5af3b4689a97da725b0107efe65cb64b9173ec3
+EBUILD openshot-2.5.1_p20201227.ebuild 1339 BLAKE2B 0ddce84d24aa28af941e2a46bafb9e98c541c2018d35ad6fafc518593e5720cacb2bb495ea89cba673de3a89101ec0677326fd1e7834d46927c124d851e9673e SHA512 ded4a55c639ad039a18c7dcf7a6a5c36889b7c1acb398da4da63ebc9ca827ab684946cb7191d56f6c84f4dd46a458b61692b0f0d02d3d45b0e344192b2e0b31b
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.0.ebuild b/media-video/openshot/openshot-2.5.0.ebuild
deleted file mode 100644
index 3d62b7ccd98f..000000000000
--- a/media-video/openshot/openshot-2.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE=xml
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-MY_PN="${PN}-qt"
-
-DESCRIPTION="An award-winning free and open-source video editor"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
-		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/libopenshot-0.2.4[python,${PYTHON_SINGLE_USEDEP}]
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-	# prevent setup.py from trying to update MIME databases
-	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-video/openshot/openshot-2.5.1_p20201203.ebuild b/media-video/openshot/openshot-2.5.1_p20201227.ebuild
index 53484ce02495..97eb2a8c185e 100644
--- a/media-video/openshot/openshot-2.5.1_p20201203.ebuild
+++ b/media-video/openshot/openshot-2.5.1_p20201227.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
-COMMIT=8c3d90cca72e2051b1b74dc0d731824ed5edf0de
+COMMIT=5056d240c5dff1a9191ca2e0f7a8813c57b5b5ca
 MY_PN="${PN}-qt"
 inherit distutils-r1 xdg
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index ddfb11756305..1962cd2c93a7 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -4,6 +4,5 @@ AUX transcode-1.1.7-swresample.patch 674 BLAKE2B 733a3490d2a25b20555cce3624f8e17
 DIST transcode-1.1.7-ffmpeg4.patch.xz 4880 BLAKE2B 92bf63ba3f9cb69aff3cdc0f7250da0452f8bc0977010d024bbd8bbf9f66b86fb31e819ec3d1069e9176fdb58cba6ec510b866ddc44a65fd252f175cc567807a SHA512 8c44fd1b78dbbafbbef090d6115bbe086605f1d5b5286eba83d9c7c0d5457af286cb5d61ab6d260380694b6b3636f751709476915dcab5cc3109dc868785f424
 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
-EBUILD transcode-1.1.7-r4.ebuild 4218 BLAKE2B e47bb128f52607c24b192daf755c625b0807b48adaffb466550ee6eeee3a1a968c3574a25428f8c642783a07ba497efb6a9810505f8ccb2bcf1a187dda8ab9ab SHA512 0678815f7229f521210419fd57f0204a3066a2c436cc7847631722fbbd60dc12be6716664d9a65e04567dee7c78f19ac9484d678aa9a73f9b88c63af9b1c5288
 EBUILD transcode-1.1.7-r5.ebuild 4351 BLAKE2B d123cd546237ece93c5b25c8c76615b7822ed35e0edd76bc7e5b0b05aa8c4316714657db23def65f62310068ea62cf034769ed1974ae47851943562db7733228 SHA512 8c66ea579849464e6eaca36f62d055cf5913f851178fa9a00950c1db8d9508fc079db0506817f2a2f7741d31a6201658aa108ac7226c2b053e2b0aa995aa13f6
 MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/transcode-1.1.7-r4.ebuild b/media-video/transcode/transcode-1.1.7-r4.ebuild
deleted file mode 100644
index 2eabda9fb10d..000000000000
--- a/media-video/transcode/transcode-1.1.7-r4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2002-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool multilib
-
-DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
-HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
-SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-1.1.7-ffmpeg4.patch.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 sparc x86"
-IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
-
-RDEPEND="
-	>=media-video/ffmpeg-0.10
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faac )
-	alsa? ( media-libs/alsa-lib )
-	dv? ( media-libs/libdv )
-	dvd? ( media-libs/libdvdread:0= )
-	iconv? ( virtual/libiconv )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jpeg? ( virtual/jpeg:0= )
-	lzo? ( >=dev-libs/lzo-2 )
-	mjpeg? ( media-video/mjpegtools )
-	mp3? ( media-sound/lame )
-	mpeg? ( media-libs/libmpeg2 )
-	ogg? ( media-libs/libogg )
-	postproc? ( >=media-video/ffmpeg-0.10 )
-	quicktime? ( >=media-libs/libquicktime-1 )
-	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
-	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2 )
-	v4l? ( media-libs/libv4l )
-	vorbis? ( media-libs/libvorbis )
-	X? ( x11-libs/libXpm x11-libs/libXaw x11-libs/libXv )
-	x264? ( media-libs/x264:= )
-	xml? ( dev-libs/libxml2 )
-	xvid? ( media-libs/xvid )
-	"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	v4l? ( >=sys-kernel/linux-headers-2.6.11 )
-	"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse )
-	cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-	nuv? ( lzo )
-	"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg.patch
-	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.10.patch
-	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.11.patch
-	"${WORKDIR}"/${P}-patchset/${P}-preset-free.patch
-	"${WORKDIR}"/${P}-patchset/${P}-libav-9.patch
-	"${WORKDIR}"/${P}-patchset/${P}-libav-10.patch
-	"${WORKDIR}"/${P}-patchset/${P}-preset-force.patch
-	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg2.patch
-	"${WORKDIR}"/${P}-patchset/${P}-freetype251.patch
-	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
-)
-
-src_prepare() {
-	if has_version '>=media-video/ffmpeg-2.8'; then
-		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch )
-	fi
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch )
-	fi
-
-	if has_version '>=media-video/ffmpeg-4' ;  then
-		PATCHES+=( "${WORKDIR}/transcode-1.1.7-ffmpeg4.patch" )
-	fi
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
-
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_3dnow 3dnow)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable altivec)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l libv4lconvert)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mpeg libmpeg2convert)
-		--enable-experimental
-		--enable-deprecated
-		$(use_enable v4l)
-		$(use_enable oss)
-		$(use_enable alsa)
-		$(use_enable postproc libpostproc)
-		$(use_enable truetype freetype2)
-		$(use_enable mp3 lame)
-		$(use_enable xvid)
-		$(use_enable x264)
-		$(use_enable ogg)
-		$(use_enable vorbis)
-		$(use_enable theora)
-		$(use_enable dvd libdvdread)
-		$(use_enable dv libdv)
-		$(use_enable quicktime libquicktime)
-		$(use_enable lzo)
-		$(use_enable a52)
-		$(use_enable aac faac)
-		$(use_enable xml libxml2)
-		$(use_enable mjpeg mjpegtools)
-		$(use_enable sdl)
-		$(use_enable imagemagick)
-		$(use_enable jpeg libjpeg)
-		$(use_enable iconv)
-		$(use_enable nuv)
-		$(use_with X x)
-		--with-mod-path=/usr/$(get_libdir)/transcode
-		${myconf}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install
-	dodoc AUTHORS ChangeLog README STYLE TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 2325cc1b7305..ee6a6d25fd28 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,7 +1,5 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
-DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-encoder-0.0.20190214.ebuild 2168 BLAKE2B 396282c2737cc9d1482bcbde86d3b96d578504976538b01d55aac329331ccd1e83051576e9ed451dd201949d751fd33ab5261add285a41986b433ae09b3a0c64 SHA512 0e1f119a776b55e8f207bce50628a06774e63196afb28ff9e2b12194dccd8040be12f384e0844e85d92ab8d8a69f8055599ee9c26e21ac62d26771bb7dc09a94
-EBUILD x264-encoder-0.0.20190903.ebuild 2170 BLAKE2B 9d96559f334d3f873e1e00b7e9e15282044068ef676a126a3ecb3b37f03a1f1cf7ff93eb0299569a892ab7868470886a44e637f7a2f8fb945bf11a051187e664 SHA512 7392975f02968d656f16c8864b57718bd79177b2ad31298d228b1be414dadc210d93c53a9dd8aa1cdce1b6a03e7e9ab50c15060c7ef88f91f59512b6b4d5c4b8
+EBUILD x264-encoder-0.0.20190903.ebuild 2168 BLAKE2B 98d449e677bd8d92d89d7a3aa4844b202e3ac0d68b50e177e33cb8e2fe78813b632778607ede92937085c2c9e3e6f27a50100e720c3bdb035c0e7978320fd7ab SHA512 54a1a948c5306f4bb22de621978efcf997539dc1fbd40a2dfbe326b653448b44a22f484295e942528a5614bf5f09be76843b7fef71873f25f1e194ebaae125e4
 EBUILD x264-encoder-9999.ebuild 2170 BLAKE2B 9d96559f334d3f873e1e00b7e9e15282044068ef676a126a3ecb3b37f03a1f1cf7ff93eb0299569a892ab7868470886a44e637f7a2f8fb945bf11a051187e664 SHA512 7392975f02968d656f16c8864b57718bd79177b2ad31298d228b1be414dadc210d93c53a9dd8aa1cdce1b6a03e7e9ab50c15060c7ef88f91f59512b6b4d5c4b8
 MISC metadata.xml 530 BLAKE2B 19afea6649cc9611b31fce82055c949d8bbb8de99df320d390591d0e3abe27126b54af9c91bc7b96a8d2fac705427ba2c8cc19bdcddfadc304419a7966c40617 SHA512 01eabe2c536c89cc9ed8cd4295ce68941a626b6675c808294a4828704f9f3c89c87d70f5898f60f326c783a77d7e1dc8213e3bfbadbbca8b71f268959232a577
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
deleted file mode 100644
index 1c576fa216e7..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
-	SRC_URI=""
-else
-	MY_P="x264-snapshot-$(ver_cut 3)-2245"
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="
-	~media-libs/x264-${PV}[interlaced=,threads=]
-	ffmpeg? ( media-video/ffmpeg:= )
-	ffmpegsource? ( media-libs/ffmpegsource )
-	mp4? ( >=media-video/gpac-0.5.2:= )"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEP} )
-	x86? ( ${ASM_DEP} )
-	x86-fbsd? ( ${ASM_DEP} )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
-src_configure() {
-	tc-export CC
-
-	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
-		export AS="nasm"
-	else
-		export AS="${CC}"
-	fi
-
-	# let upstream pick the optimization level by default
-	use custom-cflags || filter-flags -O?
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--system-libx264 \
-		--host="${CHOST}" \
-		--disable-lsmash \
-		$(usex avs "" "--disable-avs") \
-		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
-		$(usex ffmpegsource "" "--disable-ffms") \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex mp4 "" "--disable-gpac") \
-		$(usex threads "" "--disable-thread") || die
-
-	# this is a nasty workaround for bug #376925 for x264 that also applies
-	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
-	if use custom-cflags; then
-		local cflags
-		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
-		cflags="${cflags//$(get-flag O)/}"
-		cflags="${cflags//-O? /$(get-flag O) }"
-		cflags="${cflags//-g /}"
-		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
-	fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 13b167268ffb..8c3910308498 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.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
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi