gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-video
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
133 files changed, 742 insertions, 1247 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index c0e830564d42..11dc78445117 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index a18219627aca..44e65eb58727 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -5,7 +5,7 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 B
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2446 BLAKE2B 5b1a5556829fbcd5d10ad869af5dcce4c6227dbc9d460094f237448a4aac9e07a9752039ab857a3556d062297cd0101e71ace0b4d3643f481e7479f16ccdf2e3 SHA512 f5171353ac14806166e26c4b335e6c7d9e111ba1eb68c3160fc9f802e1e3de659df48c4be180a0a25c67f7733007c8875c191436314ccfc9d7696a1f8a1fa719
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3524 BLAKE2B 0cabead7524421c8eb0aef0aaa420257bde80b91f472caa10a1974eb62cf618e18929d6b834976f35e11961cf608138481172b8c4a1eb95b3fd4a0d22641ea51 SHA512 75d0d42d3cba04d06e866ce4717fa6cc4382f092edcd6d3e765038d6341785731fc23de961c2bf3b0688e1b768bbc4025f441b2f3c5fe4d92c1bf53e87ac2187
-EBUILD aegisub-3.2.2_p20160518-r3.ebuild 3574 BLAKE2B cacf3998041b76dcdedebca8cba602e0c53b085c6846cb76f8552b8fd0538d6abe6576c3484e30525cbfac0244346be4ad1fa0fb50ad338820dba46e381ee003 SHA512 ede03a3ad19881f77c9b1d0d1797e78207d5c5c9d9fb2ade53f63b0c102f1fb12d43f1af964e71540524764c6ce50562c26336a4308ea447c6b2986ffd7548a5
+EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3551 BLAKE2B cff2e09de3983eb5f9bdc8f6ef68e1a4ba9b714707d1048dfd87d88b869bf2a50d671fdb779fc5ac23e46e4216609fcf6f294c95da22659483ad51f69fcdcaaa SHA512 f8455fe7205c84ebd039173ccfe7119068917f424839da5c0232922d8e02e17cde06fdf4ca06504e9a0e92c824dd888641a7643f8e777de01240ec8e79caac49
+EBUILD aegisub-3.2.2_p20160518-r3.ebuild 3601 BLAKE2B 53f7443999f2a1f07bd3d24c39315cca83df4dfbcba3ea42bf4ac6ef71dda782086f7ab86f0ae059f73500d991995606d58798e885ad1d736d879dfadbd39d8e SHA512 4eb7caa739fb28df49d8bc366452d0e465802a03e1d1341011d066ef3891d1150f2ed0257020b4bad2c2bfab9976cb3dc71bb5be3b199c690af996a0e1605993
 EBUILD aegisub-9999.ebuild 2945 BLAKE2B d326d141f8ad42c303b9522a14dcf3a4b698f9dec30028121654c80448db0ed273d5a95fb9e66b546814a425dd65c18c3bd6b9b9e5f857f1e3e2dd1189b9c4ea SHA512 931be2866081feb74286996ca058e5663f703ecf47b3a7f88a03d3f8c63e2a23273a1752b07d856915e754c597328a1f44ecb0f82559f474631d3223960945a6
 MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
index bef93fffa85b..1a0ea043f038 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+RESTRICT="!test? ( test )"
 
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
 # Unfortunately, luabins upstream is practically dead since 2010.
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild
index 563691cc85a6..3ca8cba21bb9 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+RESTRICT="!test? ( test )"
 
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
 # Unfortunately, luabins upstream is practically dead since 2010.
diff --git a/media-video/alevt/Manifest b/media-video/alevt/Manifest
index 24f9d0ad106d..9b158cf4499b 100644
--- a/media-video/alevt/Manifest
+++ b/media-video/alevt/Manifest
@@ -1,5 +1,5 @@
-AUX alevt-1.6.2-libpng15.patch 179 BLAKE2B 9d3c4f20fd6b43e1574af1d9a1a3dffd89050cab64f64ececfaf31e18a4a39a8ca6690eaee3ec8c91618efad39440f4ef4341bb61abee763ca546925a84b158e SHA512 f97967c6eab94a4e302b0ded693c9c7ea1150fc698bf949959077bf680a446632f11798a29c11bcae86b97266e1afa644afc428c31f0e7a21f4ee31365b6cbb3
-AUX alevt-1.6.2-respectflags.patch 1178 BLAKE2B f9059064ad67d538fec73817adc2db453b60a5299a695664e32add959980c4023465d1d68b000cd7f1b4d72677a2260d5c167fba74b28ace7b6859ffe39954f9 SHA512 e3450a688c1e0c010b0644d70e4a07675dc84b0823b15902730f651df3e1156d0f1bbedae6a086082dc3f4de12ae3d265e0d68fee4a8e27025237e3784d796e9
+AUX alevt-1.6.2-libpng15.patch 183 BLAKE2B a50dfcd01e7bb0e75206bae94e46cb463580284205a0d58d72d4b77b6c1d5b8ec066247d733ec95218f6c02c4208e814e19011ef205e6831f794629e6b0a7b15 SHA512 c445d02a782ff9d3b9b92418a11ef08af2c3062234ea6d3b1111cfbed41447cfa6d3c67fae8274acd372ca3f751e5414953df283babee1fb70b9fedd75029763
+AUX alevt-1.6.2-respectflags.patch 1378 BLAKE2B e337cdac7339238bedad7abe500805d2e7a80dd1af49a6d1edcce3113f252b25d62b38681349d73f4c15c09b1d9a7ec85f5c8b123ab57262d66de94d009652ee SHA512 50350fcb1c4a9e4b44c9cbfcb5d4ca20140f9ef6f8ec0b7031a03658198e3b107ebe9a837a97978107b326ea920e1edf2e11c1df5fb0d70e5756a131b75a28f6
 DIST alevt-1.6.2.tar.gz 133234 BLAKE2B f252fb2ce1fbbad6c1aeb7649fea8b83aacfb62c38b7efa205680b32ad3c5dd7e60efa8be754c42040488860a59ff8a1cee235cf5adb75a5c738a503ee369db1 SHA512 8ddc0b03065b186bff8b705ec6ee8581460c4da4e65f97d15915d3bf708c7898661f61fa5fe004c7634adc9f850747b3fa08fe9ec94a5155482fcda479a884ed
-EBUILD alevt-1.6.2.ebuild 1015 BLAKE2B 6e8d7a0154f11fe4dccc9e222c5e7a865a1c82e08fd3657dc43399fe3bcee8b4d41cbc5c7dcebdae4e71a60b540283f68df4c12c22467ab24978a2003a876224 SHA512 67b43f695ca17db2582f6887464074e61d069a4ee049a500b590f234fa89621abbf6fc7a1fca2e075c61720474ef5d2c479ea0484c838f89b4cedf3704fe959f
+EBUILD alevt-1.6.2.ebuild 872 BLAKE2B d4f181ac1b4fcd2ed9db1bcd21ff80ff0a435f2b9c84d141f3b164a76ceb10cc4f2928d2256f53002bdd805a04979f6a83b6261465476b9d26ee0dbd372f96c2 SHA512 5b7ec693f2c06e2551b219f952d09c23c427255a978a620a221f54b7d16fec311d97bd4602bffb950dc2793aa102c58dfead662c75b00f12af489ee0a8609bf5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild
index d93fd6f0ccb3..efa778cbc210 100644
--- a/media-video/alevt/alevt-1.6.2.ebuild
+++ b/media-video/alevt/alevt-1.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Teletext viewer for X11"
 HOMEPAGE="http://www.goron.de/~froese/"
@@ -11,37 +12,30 @@ SRC_URI="http://www.goron.de/~froese/alevt/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
+RESTRICT="strip"
 
-RDEPEND="x11-libs/libX11
-	>=media-libs/libpng-1.4"
+RDEPEND="
+	x11-libs/libX11
+	media-libs/libpng:="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-RESTRICT="strip"
-
-src_prepare() {
-	cp -va Makefile{,.orig}
+PATCHES=(
+	"${FILESDIR}"/${P}-respectflags.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+)
 
-	epatch \
-		"${FILESDIR}"/${P}-respectflags.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-	emake CC="$(tc-getCC)"
+src_configure() {
+	append-cflags -fno-strict-aliasing
+	tc-export BUILD_CC CC
 }
 
 src_install() {
 	dobin alevt alevt-cap alevt-date
 	doman alevt.1x alevt-date.1 alevt-cap.1
-	dodoc CHANGELOG README
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins contrib/mini-alevt.xpm alevt.xpm
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins contrib/icon48x48.xpm alevt.xpm
+	einstalldocs
 
+	newicon -s 16 contrib/mini-alevt.xpm alevt.xpm
+	newicon -s 48 contrib/icon48x48.xpm alevt.xpm
 	make_desktop_entry alevt "AleVT" alevt
 }
diff --git a/media-video/alevt/files/alevt-1.6.2-libpng15.patch b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
index 337a6f7c709f..a134fd014051 100644
--- a/media-video/alevt/files/alevt-1.6.2-libpng15.patch
+++ b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
@@ -1,5 +1,5 @@
---- exp-gfx.c
-+++ exp-gfx.c
+--- a/exp-gfx.c
++++ b/exp-gfx.c
 @@ -4,6 +4,8 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/media-video/alevt/files/alevt-1.6.2-respectflags.patch b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
index 368b0ff614cd..62716d0e8f43 100644
--- a/media-video/alevt/files/alevt-1.6.2-respectflags.patch
+++ b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
@@ -1,21 +1,25 @@
---- alevt-1.6.2/Makefile.orig	2007-12-03 06:19:54.000000000 +0100
-+++ alevt-1.6.2/Makefile	2009-05-14 10:17:39.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,5 +1,4 @@
  VER=1.6.2
 -OPT=-O2 -s -w
  #OPT=-O -g
  DEFS=-DWITH_PNG
  FONT=vtxt
-@@ -11,7 +10,7 @@
+@@ -7,11 +6,10 @@
+ #USR_X11R6=/usr
+ MAN_DIR=man
+ #MAN_DIR=share/man
+-HOSTCC=$(CC)
  # a smaller and thinner font
  #FONT=neep9
  
 -CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
-+CFLAGS += -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
++CPPFLAGS += -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
  
  EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
  OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
-@@ -25,13 +24,13 @@
+@@ -25,13 +23,13 @@
  all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
  
  alevt: $(OBJS)
@@ -32,3 +36,12 @@
  
  font.o: font1.xbm font2.xbm
  fontsize.h: font1.xbm font2.xbm
+@@ -44,7 +42,7 @@
+ 	./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
+ 
+ bdf2xbm: bdf2xbm.c
+-	$(HOSTCC) bdf2xbm.c -o bdf2xbm
++	$(BUILD_CC) bdf2xbm.c -o bdf2xbm
+ 
+ alevt.1x: alevt.1x.in
+ 	sed s/VERSION/$(VER)/g <alevt.1x.in >alevt.1x
diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest
index d5dea0ec41c3..3648fbab1601 100644
--- a/media-video/atomicparsley/Manifest
+++ b/media-video/atomicparsley/Manifest
@@ -1,5 +1,5 @@
 AUX atomicparsley-0.9.0-environment.patch 6195 BLAKE2B 86b8f11524c5f1011ea66fefc84ceb2559ce51824ef17c951640ba63c1fe59b3cc0b0f738754d0ad23ffa4cb395bf4bcae140d39f17a79a5b6b85d07a107271a SHA512 99e871d3ec76a4d6ff0c254241a9eca591786712ddce906d4f6df26a57142e28e489c4d289b4d24977cbbe2352d5e537532f82a561d57476cc63e07d2c7e2eb3
 AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 BLAKE2B 5f1304e85beed2697787511641a4043d989e532b3aaf0b61c9e50576a2276bae0d60757a35884bcb7dad8b322e9248d33d963d6223c8d51732366c38958ff5b3 SHA512 a139ec08b6918d1a879c97a294f6ec7cafe7c98eb81db977987ca274334347c7954a3f71d9facad72642654e79b3de742ea7ea2c5ec008b79ac89cfb6c936874
 DIST AtomicParsley-source-0.9.0.zip 172616 BLAKE2B 6e2fa904cde622524ec51e3d084d89dd86c04db9942a27fae67b0d12db0542705d28e723c26db94d234f26c7249c6b8d4fd01a2bce891d2310a3a912667e1d84 SHA512 a4733893bb0d8bf824ee46d7da7f8c2ab9338ae56ea89810db1ac40282554e7e095b3e88631786b248a66aba878f166b9ac403769c66ef3ad45ac8ff7d411982
-EBUILD atomicparsley-0.9.0.ebuild 892 BLAKE2B 38d0fa7419202d5e9b95840760ee891373e95414088a4130798adf257194538c44cb94b5b99d2df9ee58e52b200f56d3d37ba1f35105a6c3e1efc75b42710b95 SHA512 3482d8caa0237cd3085a955d7da60aab856e81e6cf2686aea9682bed5771610a195e016100989008ccf933a496dd4486bc5fc54afbb305943aae1d26e104106a
+EBUILD atomicparsley-0.9.0.ebuild 830 BLAKE2B ad1da9c3c599ca89de5f1fc4ebd4ea20fb658579e5bc94035ad55d670ee05df2c59e70135c26636077f5648dc4daadee08d6b02b254fcc54c8b305ed4b20635b SHA512 7c58729243aa0b4fc03810e76d6dbbd466c8f7302e4f931311fc8add9ba73893fe632ed37fdcc64e3b648c0c9d5d9a3000549da07b6f4ebee37768c5d216251d
 MISC metadata.xml 306 BLAKE2B afa52c1ff7cee6d04dc054ec1e488532f4631ee0b34ca1f9a46971a2fe264354bf7704e27898e69f69ce29686593f48251c0d4fa72b700614431fade78128525 SHA512 db5fd17c01260020d0e1df5ffc2dcb3f4c904467b627256f004e13aad5de0c89ea67fe53d7a8092a0549ee6e4acbf30d6a6820329ac45511c210504e94aeae2a
diff --git a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
index c80ea969acdf..3002e5401e2b 100644
--- a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
+++ b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 MY_P=AtomicParsley-source-${PV}
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files"
+DESCRIPTION="Command line program for manipulating iTunes-style metadata in MPEG4 files"
 HOMEPAGE="http://atomicparsley.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch \
-		"${FILESDIR}"/${P}-environment.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-environment.patch
+)
 
 src_compile() {
 	# APar_sha1.cpp:116:47 and 117:43: warning: dereferencing type-punned
diff --git a/media-video/bbtools/Manifest b/media-video/bbtools/Manifest
index 079650858952..2f882c11b880 100644
--- a/media-video/bbtools/Manifest
+++ b/media-video/bbtools/Manifest
@@ -1,4 +1,4 @@
-AUX bbtools-1.9-gentoo.patch 2816 BLAKE2B a7c944ae07d9151eebde047b275889353257e3f0451ece8f19c8ac4a9d1998969818d733219b6f542bd44374bd5dd5fb12f8e26d51aedc929049a3fdb06a3a23 SHA512 7ed795bbf5042b8ae70234d2d90139d7f6cf0b610c94688d0c5e401a028f733df9f53894e61b01f91acf8fd58f1253e6db229628775d5cb4a7e8c278f3e23e09
+AUX bbtools-1.9-gentoo.patch 2688 BLAKE2B 13203a771aef5d3ca2cff45aa0e61b95a1a2f7dd543f756d41b1701d40b6b855cbf8e9f4d3220a678c6685dd02213acf67894b1693a94c61e0e9c8dfb4c26183 SHA512 fb406f85ae4c4bcc46689ad92de47585d4b0b46a14f767e24c52bcc083253f4e80caf0b97d33ca1f14a43caa0f86f15aba7f6526f4bf2b00f0506c826aef0539
 DIST bbtool19_src.zip 68080 BLAKE2B b831d5fa2f6321df31f55970851049fd1e361dfcdc5f1f03617f5c3ffda547ef3b350c26cd6de83d463d93c13d0d37fd814d2f7598632fa4288612e55300a259 SHA512 7d22a3934e0b5a8fa228963989b20387b493a672026adcac1761256030f64681fdc936f15934bb7ecf019db43f3bdfbebbf94782534b21883c5c5c3674d073c7
-EBUILD bbtools-1.9.ebuild 783 BLAKE2B 24b4e46f535f43c2a85369fd3bb84fee7dfcb9f08a5f046832ff1218ad751171fc5d69468103f152467ac22977f6328e6dcd0ff610634dea0b2e85e8472480e0 SHA512 de5abc7824c872a710bf940377369127430803c1248dbcf3832deb174075413ae494d1c57acd5523f779c2dd8a5237d073f287a182bf49447e6a0959448b5891
+EBUILD bbtools-1.9.ebuild 814 BLAKE2B 136b86e19f71d67a9b502b41877fc117747cdd747ab9878308a06478080889cfb17d7e03a8bdf2a843713c93435b3607dc5e700feb21e99ec8124d6d37b90a71 SHA512 90c960fee4d512bbdfedb0fe2f968b14baaf8f09a951299dd2e38f9951779142957a8f48aaba4659c1a678173ab0f077671e544ac99ed6e58eaaac34fc7f6547
 MISC metadata.xml 554 BLAKE2B ed3c9c52f0e914b48bdae335870acfd84b25b9b7c06119234e665c4eb432037feb8b69980246e93ec3d6360c09f59051b87fb1953d1c88cbe8cd06896985bcff SHA512 ca7a79616518939ae835c8d2e327aadd7f7d48d9ab28af61ad61b7ab435b9384c285d45614f0ee10a0222fa556739b02cfe4ed0f78b9233a4007fbb8b41f0ad7
diff --git a/media-video/bbtools/bbtools-1.9.ebuild b/media-video/bbtools/bbtools-1.9.ebuild
index f824754bccb5..392e8c0d3afe 100644
--- a/media-video/bbtools/bbtools-1.9.ebuild
+++ b/media-video/bbtools/bbtools-1.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -12,22 +12,25 @@ SRC_URI="http://files.digital-digest.com/downloads/files/encode/bbtool${PV/./}_s
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
+PATCHES=( "${FILESDIR}"/bbtools-${PV}-gentoo.patch )
+
 src_prepare() {
 	mv BBINFO.cpp bbinfo.cpp || die
 	mv BITS.CPP bits.cpp || die
 	mv BITS.H bits.h || die
 	mv bbdmux.CPP bbdmux.cpp || die
-	rm *.ide
+	rm *.ide || die
 	edos2unix *.cpp *.h
 
-	epatch "${FILESDIR}"/bbtools-${PV}-gentoo.patch
+	default
+}
 
+src_configure() {
 	append-lfs-flags
 	tc-export CXX
 }
diff --git a/media-video/bbtools/files/bbtools-1.9-gentoo.patch b/media-video/bbtools/files/bbtools-1.9-gentoo.patch
index 7f9ff7ab6279..98efb8e534de 100644
--- a/media-video/bbtools/files/bbtools-1.9-gentoo.patch
+++ b/media-video/bbtools/files/bbtools-1.9-gentoo.patch
@@ -1,13 +1,13 @@
---- bits.h
-+++ bits.h	2003-10-20 22:04:30.000000000 +0000
+--- a/bits.h
++++ b/bits.h
 @@ -15,4 +15,4 @@
  int seek_sync(unsigned int sync, int N);
  unsigned int look_ahead(int N);
  
 -
 +#define strlwr(x)
---- bbainfo.cpp
-+++ bbainfo.cpp	2003-10-20 22:19:15.000000000 +0000
+--- a/bbainfo.cpp
++++ b/bbainfo.cpp
 @@ -97,8 +97,8 @@
  {
    int i, framesize, skip;
@@ -19,8 +19,8 @@
  
    if (padding_bit)
      framesize++;
---- bbinfo.cpp
-+++ bbinfo.cpp	2003-10-20 22:16:43.000000000 +0000
+--- a/bbinfo.cpp
++++ b/bbinfo.cpp
 @@ -984,7 +984,7 @@
                            bit_rate = (k & 0xF0) >> 4;
                            freq = (k & 0x0C) >> 2;
@@ -48,8 +48,8 @@
                                        frequency[freq]) * slots[3 - layer]) - 4;
                      if (padding_bit)
                        streams[PID]->audio_sync += 1;
---- Makefile
-+++ Makefile	2003-10-20 22:26:07.000000000 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -0,0 +1,25 @@
 +all: bbainfo bbdmux bbinfo bbvinfo
 +
diff --git a/media-video/gnome-mpv/Manifest b/media-video/celluloid/Manifest
index 045938b46206..556e4180aeba 100644
--- a/media-video/gnome-mpv/Manifest
+++ b/media-video/celluloid/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-mpv-0.16.tar.xz 320676 BLAKE2B ea92b94096b2bc13dd48ac54acec7aa19f23ffd53f40a90dd52fa7e9221a82bfc6159eb204eec98a1073d9ccd14ab4a4b8b380714098120deafaa4c3183d64f3 SHA512 b730cba7388e9c64014a17b7aa2bdeab344a80bcff46ed2f47566ef02f24e2b5b07ed3fbae65443dc7ae58b70bd03e065a4da6ab8860fb506bdaad8bbccc0fce
-EBUILD gnome-mpv-0.16.ebuild 732 BLAKE2B 878351a69845c4f0a1549d105de27159190386cbbefe43089768676d4f4b351174dd1eb573748a5bfcf26f4653fc3cd3c0894ae06304e1e6566ad3bc6a646155 SHA512 cd4fcde6d67624779e1c819e032c017ceb86678be6a0d3cf8100e026114e36b11259eaaa1a9d795310ecd4badc93d399b9456352166ff37e68e1f0ce11d50281
+EBUILD celluloid-0.16.ebuild 781 BLAKE2B 8f9fc0d517de7062d5221e7b8560fc55b8fdbd14ecd939a2d1eb69c4d02e9652ca40262bf1f5f25fe954f8141ce4fa7d74dadb0ff771749e4bac9f3a8349c028 SHA512 e1b6d6808159af4e706f66b11f17fa400bb7c65cdaf4f05c4a7952ad43856e4e4e9c25aee370622502bcf71dbbe5af883114a4df66917ad20caffb729f36aac7
 MISC metadata.xml 240 BLAKE2B 9fdc2353993b08138d11aacc71a6026e52430fe7b4b4d0a195dd03a5334b6c18dba7a88279e18c6b97cfbd1e0c818f5310b5d1419e77b3ede373c62321f4c2e6 SHA512 3b569f3b00bb1b30eb7c5f2e3c372f3b87d96cb333d36857973c85d8b5da1f480918ad7f3b1ed9cdbe7db6bcd1db35b454d34559a430c28008b5a1dccc65776b
diff --git a/media-video/gnome-mpv/gnome-mpv-0.16.ebuild b/media-video/celluloid/celluloid-0.16.ebuild
index ab9a3c03e455..a2decad92d1d 100644
--- a/media-video/gnome-mpv/gnome-mpv-0.16.ebuild
+++ b/media-video/celluloid/celluloid-0.16.ebuild
@@ -6,8 +6,9 @@ EAPI=6
 inherit gnome2-utils xdg-utils meson
 
 DESCRIPTION="A simple GTK+ frontend for mpv"
-HOMEPAGE="https://gnome-mpv.github.io/"
-SRC_URI="https://github.com/gnome-mpv/gnome-mpv/releases/download/v${PV}/${P}.tar.xz"
+HOMEPAGE="https://celluloid-player.github.io/"
+SRC_URI="https://github.com/gnome-mpv/gnome-mpv/releases/download/v${PV}/gnome-mpv-${PV}.tar.xz"
+S="${WORKDIR}/gnome-mpv-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/media-video/gnome-mpv/metadata.xml b/media-video/celluloid/metadata.xml
index f059324b0976..f059324b0976 100644
--- a/media-video/gnome-mpv/metadata.xml
+++ b/media-video/celluloid/metadata.xml
diff --git a/media-video/chaplin/Manifest b/media-video/chaplin/Manifest
index d71a7161490a..74b205c079a9 100644
--- a/media-video/chaplin/Manifest
+++ b/media-video/chaplin/Manifest
@@ -1,5 +1,5 @@
 AUX chaplin-1.10-asneeded.patch 828 BLAKE2B bb6d686def9a44bad75c6fe3ccefdedcf1258c94348e76a3abcb7f944bcf4e47be9cc90665dd2da5771396dacb63d11448e1b830fede050b662f0ae8ccf7bef3 SHA512 610acdaa8c20e7a0246f3c493c2d75e82d6386d02033a11fda473714ee105ab7f5238149160c8a0a835333c66dbbf678d38d52a66b3bfebe2b891f3ec032abc0
 AUX chaplin-1.10-libdvdread-0.9.6.patch 334 BLAKE2B 0a96cb49f7c3886d4a57f069a28c51deb1fa8e05a7e84b9e8ce275961f566b50b1f72616e0db4af3fccdeb2db45b714c896fb1530a4f32966da146f9c3909d4a SHA512 47fa6e41a05f141e64f06f7d62049006c6292f89c04fcbc63250860215f90da1c683b1b537dad4136897bf4a68f03507340c60c7abf033703c9acc3d7172a922
 DIST chaplin-1.10.tgz 23843 BLAKE2B b0a385fd8586bca400a50ad77f72a2a4f6eacfc225dd0ee02cd626911a8c59dabfe71a472d7fe019bd0ee1b37908f85f8236ac1be3dc10a19119422f3a856a71 SHA512 6d4434149fc157dfa8d7c1e1fe079d66b57a18717f0263ebfc95a14c847d97c018b0563b3dc1f8f8430670ef1f64a1f4c573462e5f0db2fcd8e53c939f58793d
-EBUILD chaplin-1.10-r2.ebuild 816 BLAKE2B b09f8a683d5952332da477eba6b1f99a35218449d51d0995d34bdd9a38db07e04dce1fd3ab334571bf5121b74584e218b30b5388465a9dc757c8726eeae45a7d SHA512 c4716b525945ab1b3d3e55221f5b5da05e48bcad6b650cf3564266813568b589a3dd9957aee3d155b3be90f86d96aea21dc5e7c53c716d95541b4bb35a741123
+EBUILD chaplin-1.10-r2.ebuild 775 BLAKE2B 240f0b5299550266f67b684798f566af9331f7d9f92c1a15a5a94c280d0c34cb528288ac5092e7ac3416f2dc7a253441aebf3b24aa08797044caf57a19fe4fad SHA512 ef16689ed4ce17ba54c81981d54e6abff64d74b7a6110f52c85a8ee3b0fb191cbbf65aad7f51deee0b33fd41d8292ed96e9d761ccc83f28211a892e6597383a1
 MISC metadata.xml 313 BLAKE2B f74c14c80dd06b0293a2a91cf1fdec874ce1a50b9aeb7dfe723c16221b601f4081805c4a8ae7d108059338a5130cc62913bb1f8b70c94bbd489c54d671935e02 SHA512 b1bf468c26cd683d0655677a57330b93579c41b0d4e2584b6fd56f4c6106aa3381cc47531bdb9e9376b207750fdd5edbe9bd4a1bbc75b29f0e1c400233774dc0
diff --git a/media-video/chaplin/chaplin-1.10-r2.ebuild b/media-video/chaplin/chaplin-1.10-r2.ebuild
index 452d808b53e7..0e12d020955d 100644
--- a/media-video/chaplin/chaplin-1.10-r2.ebuild
+++ b/media-video/chaplin/chaplin-1.10-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="This is a program to raw copy chapters from a dvd using libdvdread"
 HOMEPAGE="http://www.lallafa.de/bp/chaplin.html"
@@ -17,15 +18,15 @@ DEPEND=">=media-libs/libdvdread-0.9.4"
 RDEPEND="${DEPEND}
 	virtual/imagemagick-tools
 	media-video/mjpegtools
-	transcode? ( >=media-video/transcode-0.6.2 )
-	vcd? ( >=media-video/vcdimager-0.7.2 )"
+	transcode? ( media-video/transcode )
+	vcd? ( media-video/vcdimager )"
 
 S=${WORKDIR}/${PN}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libdvdread-0.9.6.patch \
-		"${FILESDIR}"/${P}-asneeded.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-libdvdread-0.9.6.patch
+	"${FILESDIR}"/${P}-asneeded.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 6cd16ddf859a..a7e7bff06931 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,5 @@
 DIST cheese-3.30.0.tar.xz 1546680 BLAKE2B 32cfc9553e1c9ebfe7d3eb5fdf19d74b49e9f69ea005f4c79097d69caa2125803c5c319e98ccd3e8f72157a5fd86c018f1be7af7045f6541ecd36d4162c5cdd1 SHA512 622910cedc8eadec4161f60e2bb3f02cbe11352b2431fdd9783f724b4119ffae6254b1566e1144c25491067f9c683a55eb85b265ef28992d852adce02fbdc8b4
 DIST cheese-3.32.1.tar.xz 1487792 BLAKE2B 6e27b68f590aa4f90a8bbbc72972bed96fe9741b4efd849d226751cfd6abe37241fa214240c4a8b0449fb2bc53de1043ac0abd60a06bc884796a4272c07212af SHA512 bdd0ae72e3df596d19ad467dc0222a49b028f2ad8c285d55360813624ca2dac1956463cfd9cea4f2a6ff123070966544cd7254ee2891e973dca42d07061a6c94
 EBUILD cheese-3.30.0.ebuild 1945 BLAKE2B 389b37c1dbb908d1b41b2ad91c4064059861e949d5c860d7ef226d51bcb4d20cab4fbc8221834b89b880d61ece209519cb06615cc5f7166cac71e5cc91ff8260 SHA512 9e0a2b41c23aba4915e83d44fa6e2dab3f7a89ff87060ae9a53e4cf37ccba0ec2c516cc47479001041fbaa693adf0ddbef862c6957d6d050d1a98dc014de1d52
-EBUILD cheese-3.32.1.ebuild 1947 BLAKE2B 4dd833885868bcf63ab430c82eab305db35f3dfaa0eb3d3c0546efafee2c616ec4a9ccc833f003573a766fdca36a340fd2df7d683fe289edc9d1cdd4908d7997 SHA512 19315044c141f29b373b41f44a6e65d0c3180073cdec6ba7b6289ad4c2712a8c781b30e1b2bf20e5a33757a99ba1431629bbcaaf8f3e5b7a12dbabf4884f03c4
+EBUILD cheese-3.32.1.ebuild 1945 BLAKE2B 389b37c1dbb908d1b41b2ad91c4064059861e949d5c860d7ef226d51bcb4d20cab4fbc8221834b89b880d61ece209519cb06615cc5f7166cac71e5cc91ff8260 SHA512 9e0a2b41c23aba4915e83d44fa6e2dab3f7a89ff87060ae9a53e4cf37ccba0ec2c516cc47479001041fbaa693adf0ddbef862c6957d6d050d1a98dc014de1d52
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.32.1.ebuild b/media-video/cheese/cheese-3.32.1.ebuild
index 9107e56ee5a7..417c6ee59b6c 100644
--- a/media-video/cheese/cheese-3.32.1.ebuild
+++ b/media-video/cheese/cheese-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.90:2
diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
index d1b6bcb636d7..ea02fb638211 100644
--- a/media-video/clive/Manifest
+++ b/media-video/clive/Manifest
@@ -1,3 +1,3 @@
 DIST clive-2.3.0.1.tar.gz 43551 BLAKE2B eea428fdce2598e01e85a81f90110f2f1e4a7d9e8033d39745817d97886f80ddadfe2ba649e9778ab84f11c2f6fe2360eefda24cf5d0285c1a1a248ee7f6b1b6 SHA512 7426d6e8f19c358b30a7d33257d7ee536802eb35442d3cac68f6742613696ab1b280457a65d980237b53b692c5cf311725e46a5d8c27c7f2200172d050337cfc
-EBUILD clive-2.3.0.1.ebuild 1666 BLAKE2B 2cf205e74f406c1a3d4a0be15c9fe3930f4bf36f41d53e6ab5c7b756814c7ede032bae58fcc03f7a08de75026bc9442bee106268a2b26b594d0f816107bc3a4a SHA512 164172c4c4862cf5bf7981a79a5c346d1e9f9db418eb72aaae85cb337b50db5d4ab40a32c70b62f6f2b6f54ee629a50bbf75412af6b2dec4a915c20d56596ece
+EBUILD clive-2.3.0.1.ebuild 1693 BLAKE2B 4e7901be83753258205d9a1da385bc4682378f40a05e2c530aeb96337964a272893d1c11f74ad8bfa85d0647d70ae18b5a6e274f472e3e9a7ec20f925f9cf72d SHA512 e4290fdced6b331e13a9c7c8f669ff380625f829421a756f63d64a23020e53e13f7f7c42615270b0344ebcd9843d2357dfb368321a231460ee7d17b0493e5180
 MISC metadata.xml 699 BLAKE2B 02c38e22deea866093aae3022592371163a1d7bba6b60e35831018711e6f9c6a42a80eb11ccc4ef956ab39aa6ce1d327a6f583164247cb218c1b6881f90d647d SHA512 c58b34f4586809b4dc9fc151cf75a066a95b6872a6487276cefa5c71ca5a8c6c043e2b11de07240f095fe025a6a042e5c9c52555f6ce841a8b12cb2dd6e75ada
diff --git a/media-video/clive/clive-2.3.0.1.ebuild b/media-video/clive/clive-2.3.0.1.ebuild
index 9d5ff02dec34..60f93ec9b36b 100644
--- a/media-video/clive/clive-2.3.0.1.ebuild
+++ b/media-video/clive/clive-2.3.0.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="clipboard pager password test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-perl/BerkeleyDB-0.34
 	>=dev-perl/Config-Tiny-2.12
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index a9817e94b41b..f3a1c25c9dbe 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,7 +1,6 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
 DIST devedeng-4.15.0.tar.bz2 1759602 BLAKE2B 31f08dec66623f68fba17bbaf657d5865796ca63b37f3e0a72213692ac1fa79fd14123d33112dc4713c42d682fb216fa61b971454efa4304ec7ce10015af4c99 SHA512 90a1dd5f2e7dfd78bff38fb682e021e6bb489a0ca16cc29b533926b242e4a3322372ad383acf61338dea7873448f649534fe9a2ac9e22294de490b95df55a4f0
 DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
-EBUILD devedeng-4.15.0.ebuild 1267 BLAKE2B f2b046673112dbac5d91024cc98c41109c2a46cbdbee928ec55aa0f2fcf384e9b18b3d1d8fd86a6457892dbb0d23459351c743bbf8bfed12e8e9da19be308879 SHA512 592d029b4d9c2c4bb10d2d87b631876c977fb84dd907a8c4d28e8ed202af51aeafc467143bc453e087192fa25a5d8632c789a36b1818c8aeaae31eeaab90a3ab
-EBUILD devedeng-4.16.0.ebuild 1267 BLAKE2B f2b046673112dbac5d91024cc98c41109c2a46cbdbee928ec55aa0f2fcf384e9b18b3d1d8fd86a6457892dbb0d23459351c743bbf8bfed12e8e9da19be308879 SHA512 592d029b4d9c2c4bb10d2d87b631876c977fb84dd907a8c4d28e8ed202af51aeafc467143bc453e087192fa25a5d8632c789a36b1818c8aeaae31eeaab90a3ab
-EBUILD devedeng-9999.ebuild 894 BLAKE2B a1e93a8d4cf4c013ca4bcf74677f231c9b528c91b8f3f8643f1a82d11fbd792b08c3f55a243cb2fec5c385b2d5df356d5b656338f5a12184d0e928df18b28bae SHA512 bf0af6a2b4f1b6cabb58d717039c4f7f473f6a7e1d881bc8fd3652b95fe028438b951477b53fa9c9fec9d57d403b096f8f537aca1a4ddebd6261048a109c8e4c
+EBUILD devedeng-4.15.0.ebuild 1177 BLAKE2B b4c966dcf013b6c262d7d415a1caf513ad1b5d0d5846ecc20a419c36930c622271e1cddd37b6f2907943c3dc25c7c67789712893858494cbfcde370a01856763 SHA512 cd784dbadb9348f82cc035f13fdbe0acb3370a999bb9ae19600f11c57a3e414f640ab96824d7187ca02a5b1dca9f589ad1cb0490661616a860ae59bed88defeb
+EBUILD devedeng-4.16.0.ebuild 1177 BLAKE2B b4c966dcf013b6c262d7d415a1caf513ad1b5d0d5846ecc20a419c36930c622271e1cddd37b6f2907943c3dc25c7c67789712893858494cbfcde370a01856763 SHA512 cd784dbadb9348f82cc035f13fdbe0acb3370a999bb9ae19600f11c57a3e414f640ab96824d7187ca02a5b1dca9f589ad1cb0490661616a860ae59bed88defeb
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.15.0.ebuild b/media-video/devedeng/devedeng-4.15.0.ebuild
index 29da18849893..49f2ddc96b22 100644
--- a/media-video/devedeng/devedeng-4.15.0.ebuild
+++ b/media-video/devedeng/devedeng-4.15.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg
 
 DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
 HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
@@ -42,11 +42,3 @@ src_prepare() {
 	# Desktop icon
 	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/devedeng/devedeng-4.16.0.ebuild b/media-video/devedeng/devedeng-4.16.0.ebuild
index 29da18849893..49f2ddc96b22 100644
--- a/media-video/devedeng/devedeng-4.16.0.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg
 
 DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
 HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
@@ -42,11 +42,3 @@ src_prepare() {
 	# Desktop icon
 	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/devedeng/devedeng-9999.ebuild b/media-video/devedeng/devedeng-9999.ebuild
deleted file mode 100644
index ec88d3c85ab4..000000000000
--- a/media-video/devedeng/devedeng-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 git-r3 gnome2-utils
-
-DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
-HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/rastersoft/${PN}.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="libav"
-
-RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3
-	|| ( media-video/vlc media-video/mpv media-video/mplayer )
-	!libav? ( media-video/ffmpeg )
-	libav? ( media-video/libav )
-	media-video/dvdauthor
-	media-video/vcdimager
-	virtual/cdrtools
-	|| ( app-cdr/brasero kde-apps/k3b )"
-
-DEPEND="${PYTHON_DEPS}"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/dvbsnoop/Manifest b/media-video/dvbsnoop/Manifest
index a9ec7e613e5c..f729787bf1dc 100644
--- a/media-video/dvbsnoop/Manifest
+++ b/media-video/dvbsnoop/Manifest
@@ -1,4 +1,4 @@
 AUX dvbsnoop-1.4.50-crc32.patch 2031 BLAKE2B c8255a57e2b27a4297cfe50ea813558d51c4eddefd747d00469d5e1c216dba28ee54b8c2c959703b616f66c6e0e171f885f8adce9f6c7d66ffbf4fe6d0096849 SHA512 29b0b0b4814680840df4ff5e9b480b939b2ed916357ae6cfaec26bf8275f2d1ab700b2d550384f437650932f2b1e98690afc470bb01e537ac4f556d15651d7a1
 DIST dvbsnoop-1.4.50.tar.gz 333992 BLAKE2B edd860feedbdc6457c9b55707fcdeaf2918e2fd96cad511967bf6909bc4f64a71697697f39f7ace314030308c4ded17a018fdb597de506c51b9b0a12f56f25ea SHA512 288b98e9205b9ee6638b65cd0d7c463c2c243c1f7e650a6df8592acd3f40eca3352a563cc8a1a04f0f2731b3718e6dc3d09f56f59da4b59fbe25b86acf434f81
-EBUILD dvbsnoop-1.4.50-r1.ebuild 555 BLAKE2B 160e42828ea78b841b0807e670eec4ea9de3b2dc75182c0c22444c0ab73152a2352778af8ad3d76d790d44321d34675d48b907516df02f67b30a8c11a6e2a936 SHA512 285963b55d4f5d23190a41817c793801921fbff9ef7d6956bf2102d73fa1819b002a788fedd86c45956aac7228100c36ea4af9cda53b5c93b801afcd06ad5481
+EBUILD dvbsnoop-1.4.50-r1.ebuild 525 BLAKE2B 6a3d6a2d4d7043c8125992a1b87e11423dcc3d96ba8b4a8e9e921caa397d589ea71ce89ad8572cbab2c8630870e297935a98ebcdd8d97ee3c66fd7aba2a96401 SHA512 99087bbe762f50783c80be76893215278fc0659cedb0e39c462801bed794d6dc92e7844567953fcbc8c3b7541cc6228fab34de1642ead2856a9356fada6fc83a
 MISC metadata.xml 245 BLAKE2B af5332ff76105b86622c00a07d180449fa4aef354bbbfe782338fd515fce4b329fb3e6cbdf90c08dd4e0b97b21033817d74bc47fba703235fe2ff703214480b5 SHA512 0b34b35bb16bcc796c549cb5b35da06ff468bcab0d1ea72eb9fd50c36fa44a5b0cb6e9db38b5a8007b0a3fd45c97a9a25bb9858f5d9ed12bda54a406380a1ec1
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
index f43b51400d77..9072540ce20a 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
@@ -21,7 +21,7 @@ src_prepare () {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-video/emovix/Manifest b/media-video/emovix/Manifest
deleted file mode 100644
index 9962948a671a..000000000000
--- a/media-video/emovix/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST emovix-0.9.0.tar.gz 11297252 BLAKE2B 38e077285443ab5b447a4e3e4ede52474e63003601335b5ef012d6764a9501ba28066ebf46f2de60887ae7d1485b52bd9e05b7f7bce288d67931c4077c780bb0 SHA512 87df6f124d8478d0704472adf80e541b3573bc448836f4525d99b614aba5bffbeea8f73b0b8e0b4a9a95375ee78d0f78352254eeb4f99be67611f4d17f5c3e2a
-EBUILD emovix-0.9.0.ebuild 534 BLAKE2B 05b46bc62b88f53b4a1bc7cba0194e963034df7bc1dfc559cc260ac36aa6a191590e43bf44913dbe9e06e50695df8bd21e9c34bf6c4a016eb43074875678acbf SHA512 d3144a7eb2f500e182b03ec9c1ef32a3716f0149161374ac60ef3df10337fff24fd30d0c96030958e7fec4ff7225f4b23069f285c0351000fd33b361f1c405bf
-MISC metadata.xml 298 BLAKE2B 869929382a92e3868813734d914dc0b43f8de6eea72d4503b4131c34ede406b0f1516c4625c04e0e35fc5f726c27ab5c62e2acb9a3defb079b4316bd2a21d890 SHA512 1a8c14b452885e3e7bf4baf9468df6d5fdf58676031fd7f97b75ba78f5701abb9ce1b6a6b449745cf509b2d8ced78e3fa337b243885ec09988ebc45ba36c46d6
diff --git a/media-video/emovix/emovix-0.9.0.ebuild b/media-video/emovix/emovix-0.9.0.ebuild
deleted file mode 100644
index 338095e2c030..000000000000
--- a/media-video/emovix/emovix-0.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Micro Linux distro to boot from a CD and play videos"
-HOMEPAGE="http://movix.sourceforge.net"
-SRC_URI="mirror://sourceforge/movix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-
-RDEPEND="virtual/cdrtools"
-DEPEND="dev-lang/perl
-	virtual/awk"
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README* TODO
-	dosym /usr/lib/win32 /usr/share/emovix/codecs
-}
diff --git a/media-video/emovix/metadata.xml b/media-video/emovix/metadata.xml
deleted file mode 100644
index aac6d852016d..000000000000
--- a/media-video/emovix/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">movix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 018a9828679d..634d498543bc 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,9 +5,9 @@ DIST ffmpeg-3.4.6.tar.bz2 10190001 BLAKE2B 4c7842900171cf871f8524f08f435797b1a16
 DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
 DIST ffmpeg-4.1.4.tar.bz2 10691784 BLAKE2B 5f1f0b3c78cdd913e44bef448ff4d26fc5ea01e1a002baf98461fe0d8870bc2b0f29a1770377df8ff4f0c45febd532d6436c6627f5d1fb97125e92d9929f9284 SHA512 0c2d5bf4873b2bf12aff8c8b576d58dc3c5984ca727f48e1247293cbebda382e9070e8b7fac99870ec2ae0cef3be0a187d5ec5d58ee3e861cd673cae961b5947
 DIST ffmpeg-4.2.1.tar.bz2 10953293 BLAKE2B efc60a7e4a185d48a9ae7a5737fa930dea35ca19f1e2505fc4355815a8216f365134a018fb7a5eb7be8709989d27c2c0a56f7783e3f27eb12795e005fd6dc28d SHA512 5bd556546716ccb5292289c3092c11f216e573d0b09a015fdb568dee7544878d057d922a63758867f0343a09262d7b51023e862b70cefc529875f2319e716de4
-EBUILD ffmpeg-3.4.6-r1.ebuild 15637 BLAKE2B df4a750c330163286e9cc0c9ab8ca5975b7d19ea4242e60fdd21aad9e61a4c90d09ad06a473de37803e780bd57a62bc90ab29e99fc320a5500cd4e92a98e3f23 SHA512 a66e8ee9ebc465ecb54be3761b46cdb250620ea3d9028b9cd8e7015dc612e49b469d9fdb43937704b36f88666f1d6eca7467483de2c302b33019ef22b0c71826
-EBUILD ffmpeg-4.1.3.ebuild 17081 BLAKE2B fe513d3729129ee7458981e6ce4a94d2613b6e04dec532e4461908082213c0cad38a1addb641cb0097470e3ba8f899b6ae23a0532b25980a2424640e3f5bfcbd SHA512 1d4e6f4837e116f4fc3478a45c97579291849776cee767d6eae2ac17c39a3adf7732b8542c9106530ac1a788eac7cc99c91ae5cd5aee5c64a25f532242892f1a
-EBUILD ffmpeg-4.1.4.ebuild 17089 BLAKE2B 6f7f4c6ea186dc45af104335c929aa35efe4c8815b9817642691f6cde17fb88cd725ce4828c6de2cf5fa0b4d3b73ad0c9e49e9ba5ea2c23176115b1c47682fcf SHA512 ebd06587fcec467bb810521ea4cabe08f4f475789737f308f5bab660edfb3407b6f79578af8f9f8539518877635cd78572507817b02e3d33a1c35309979cec2a
-EBUILD ffmpeg-4.2.1.ebuild 17763 BLAKE2B 8433f382d62fbb6eb6b228062fed31aff73389e372c9d61ad1011edd443cb788f23d294bd52cbd9c0d01bcc86f6238a8a550781a4a12f4aa4d548a1c010b7101 SHA512 c8ac88b2464efafa3c23ddd271d320ed323019e48222a7abeee87b8cb654d37cf01e24aaab162d0d7b36cdd7cd345cc279ab87d9107ff23b716a984020c10b4f
-EBUILD ffmpeg-9999.ebuild 17769 BLAKE2B 304436501113119dc5491ad4ba56fcbc2732617e76580b7f8acaff22f4b7349ce48fb5fd6a93dc40da64eaddfbc071bd4b8bebfedfa65afaf6c066c52e9fb6cd SHA512 f8fc9bfa3b4801568a7b5348e6a516f15c3baf78a719f81d38105cda5cfff6f925e1df00242d53b4b2ad3dc8eed2bfd349a95476a117f8e06538f9996bfad303
+EBUILD ffmpeg-3.4.6-r1.ebuild 15654 BLAKE2B c10baf625da1c508acad431bf07955342774e8f2b5ed988678dcac73af8b3d53f2fab4d327bb061e7a92032e8077629c75184e0fb701b7abaa7692e4ac48924d SHA512 d2c53a5b5d06fe2996282aafd484b99fd3c092c6cbf1a6894c75a8735ce21de991305189a30fb9c5619766b3e587ce7e8e17c950c69ae0b47555e2f585fc95ac
+EBUILD ffmpeg-4.1.3.ebuild 17098 BLAKE2B 4c936534afb8a35b729e2849a6ddb176896d0b1a7b1aa08f0adc44c6fffff2d29eeef94e7eb14192fb8e05912ae5b8d70c256d964e025bc5c03aedd6ad155b33 SHA512 7ab700e8b432d9545121b6c628eb72c6fda4239383e77f1277a3437262237f3cdc4bff4f2b84af84a7a1b2aafb9e0707a2a370e85a4854b0ee18eb5ee243800e
+EBUILD ffmpeg-4.1.4.ebuild 17106 BLAKE2B e1935375a52038b6a3c06570fded41a858bb484b4d33e5237fbd843728074712066bc04baab87c711e6cdeb5d45bcc434ae29b92a2a42e754a6bbc08caa1b562 SHA512 f84db133fa01cdf91cd5c60dc3ca410545493d0b9903751c9636ab7210e3bd19f69bc51e2237c80c213c68562dcced2a431c0fc7082214bf1edc7d3ea69217c2
+EBUILD ffmpeg-4.2.1.ebuild 17780 BLAKE2B be10a290333454fdb75b531b9055559667fcc1441a695bc5df78f980a739823001d3e18a599b7e276dd44e6be5fadaeeb2507c6b36604ac0b5a540c5392b01b6 SHA512 0f56840c9d916cc74a19e06d8bfd7711b2db34974f89bed23247b9e5924244bb4c544889c5ef3d31851d0e53d04763e4ba1b60f86b01e2ed9a0efe6fea451fcd
+EBUILD ffmpeg-9999.ebuild 17786 BLAKE2B f3480d115f1c4b3a56f562634cf48e870539c122d7ab51e5d52a28b9c554e9e4544baae5facd0aceece14fee19d179a1817116f7d710c7f1901bca38f7fe48e0 SHA512 58853bf44426aae9010621c404502c4252c13d55279df0f53a0b35c1749b4161c0acc8907cbdd734013e7f08e536b87639a0466af95e357dacfec8a91b03d46c
 MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc
diff --git a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
index 57488e979b6c..0f688cd61b0b 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
@@ -282,6 +282,7 @@ REQUIRED_USE="
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
+	!test? ( test )
 	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index dde475dd768a..5f730eea9235 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -300,6 +300,7 @@ REQUIRED_USE="
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
+	!test? ( test )
 	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 "
 
diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
index 6aae30ff2717..8130eda690a5 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
@@ -300,6 +300,7 @@ REQUIRED_USE="
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
+	!test? ( test )
 	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 "
 
diff --git a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
index 30af5b7ec27a..1cdef0857c6c 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
@@ -312,6 +312,7 @@ REQUIRED_USE="
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
+	!test? ( test )
 	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 "
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 6c78527aa36a..69bdf4e82bac 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -312,6 +312,7 @@ REQUIRED_USE="
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
 RESTRICT="
+	!test? ( test )
 	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 "
 
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 86014a780d26..4d6f924fbe2e 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch 675 BLAKE2B b6b00228900e3fb1894eb4ca4872a2be645cb3a6aecbb9d3581ff1fc00b7290eab72196fb9c5f6ac4924eb3e4b1b82093669128fe32c01ce56e4c36ee53528b4 SHA512 facfdf9693710c93896590b8814af0b6ed98fe9fe4ecde013a3554032ed733b3ab713a4a840212808c84b1277c9c4e7951fd1fbc641ad9c001f78635e4e539be
 DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
-EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1130 BLAKE2B 7933952ba835112a095e4e8aa3300789c6391b3443ce12bfd357e071ceae45fa4f3d657de737c32bfae220144ea330bbcd2ad870ed93f1e9fb43c4609ac6a6b1 SHA512 bffdfe8240be8e7a45fbe0b627c507427c5649eb588e4235e311857a3456000a38b87f86f0c934bcb0638f5ebbc7bd2b48c4e93a757d6c720d419a263029e0c7
+EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1157 BLAKE2B 16f27b9d247139ed5a956ae1310e8bf39b8a844541f4f185f989559e05a20916083e9bd609fa259400cb22bf94175e9e8e7bcdb605f48ce064684faef0f53e97 SHA512 77994fabeb2540f3d5e3183029025bc83927a2c5ac278e8c43451be6f599716a914f2909e7f0e111fc58c0b861a9a8945db4cd201bd1d7d099b929b18c16347b
 MISC metadata.xml 375 BLAKE2B 95c0757230dcb40e028a904cfeb17bc44d651e2c5840fb9bd45222f56217ab72cee863157c014fa301a69611eee2e5b574fe9351f066bba1a846ad2b458ae52e SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
index 3dc2ba06cd44..4f247e2eb8b2 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="gnome gtk jpeg libav png test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="gnome? ( gtk )
 	test? ( png jpeg )"
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 77edc27db442..06a86fdc68d1 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -2,7 +2,7 @@ AUX gaupol-1.7-fix-tests.patch 5986 BLAKE2B f161262ad64c0a5fe02119522353b0348ecd
 DIST gaupol-1.5.tar.gz 537279 BLAKE2B 1ba8644b49832ee80e61bf304b7978275064acbe2e5e733a991b280f947c4064f0d4f385055e580bd3aa2d9ee2291d64fd1ee4bd8a1ba4f8eaaaaf9a137085ff SHA512 48f3eda460c2fb3e4bdaf52c42645599f0d5ce8eae05f7a2a9c608192a27a8b86b83830584216dc73105968f544aeab30e171b2c176d9a3f5047e93510413b85
 DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
 DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
-EBUILD gaupol-1.5.ebuild 1388 BLAKE2B 22b463f0a3c04e67962baf2f4b89e571d34ca566b9686db48bf2fedfc7ad3c70970dc43767bf538b638395e5f699cc78762db8a99fc5ec2253c1116bf49ee83e SHA512 1c449ea679eac67662f60462acc6658674c523952af58b3e2dddfda6fafa025d1fea62b4c41bb1a72fb1e705e940d484884dc6fe49b9a00191444cad978e5228
-EBUILD gaupol-1.6.ebuild 1391 BLAKE2B d9cbeef16f7cdb25c934276e839ece9c4c40794ad656956b6ad7071f4e4d3d27bbf64f01d436ab8596d1fb6bf9189310d032f867902258e5250efa768bdaff57 SHA512 76ebf50ff227cff32a6661ef0492c56bb14a1849ebf6ffb9664415dacf5e0b5f67205fcacfb210d0fc10920400f84fd78364ccc020211819e401d00116e9cc3a
-EBUILD gaupol-1.7.ebuild 1563 BLAKE2B d799e487dcd0041def428005511f62a71af15d9ef4d3268f2c4115eb9ed103cb5966b407345c081a186e38107d078cc7e1db59b05a8a70e0b323450cdbbd2cdb SHA512 d8f896d762dd863c28d8e40bd5d273b87216c6e1d471ba3c9eb98ea89689ff985183e5d0c1e9db7bcf0e7a8e5313eac2d7f6f8e2e866e2701e984eaf3e032c38
+EBUILD gaupol-1.5.ebuild 1415 BLAKE2B da61e1b64b867ae1c95c635eacee570f5bd4ccf956622271fb9d75be4748f507f3391cff10fcc82781df5ebf0efc17662017e3b5ccbf3e260413e82e50cdd21e SHA512 b363c09db0de7ddd4f1431709d65771bcc5b7f25652fb3ee2aff3e131a6c7a8a8e9e240ff9ec771ab8762514bbdd60ecf597db04d83a4ea2f5f18bf674ba2ebd
+EBUILD gaupol-1.6.ebuild 1418 BLAKE2B 94b8905d6040f79341106848cdab64fb1a9a399d832ce059ffef2d667ae85a955ea1722454dcc92dee57fae0ba9913387e827d688590322468cc34b7f5bb2b72 SHA512 72b41ed62994e5c98fe9d5832bad68fddfb81d628d7dda8bc2312cf5b6905f41cae132bcd772f4303d2d78cbdc54bbcf27d646e14abcb612df9c5a8f1fffce57
+EBUILD gaupol-1.7.ebuild 1587 BLAKE2B 7769bc4934541d1e70df9be6818381c2c8a4546bf82243c811ddb228805b7f1b5885e22d98b2ad646df376d5d228e2869a2798db4f6d4dc7376973ff56842d1f SHA512 083d7257c57503759dd770c422a4f4179103864afe9f98bc5687c2ef6b4ad01b80f8830c5e69b629cd1083f2c526d58824ce268c61657d40057c29491360dd85
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/gaupol-1.5.ebuild b/media-video/gaupol/gaupol-1.5.ebuild
index 97ec542ffa98..37108f0087bb 100644
--- a/media-video/gaupol/gaupol-1.5.ebuild
+++ b/media-video/gaupol/gaupol-1.5.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 IUSE="spell test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/iso-codes
diff --git a/media-video/gaupol/gaupol-1.6.ebuild b/media-video/gaupol/gaupol-1.6.ebuild
index aaf18f26072d..1c23b089e22f 100644
--- a/media-video/gaupol/gaupol-1.6.ebuild
+++ b/media-video/gaupol/gaupol-1.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="spell test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/iso-codes
diff --git a/media-video/gaupol/gaupol-1.7.ebuild b/media-video/gaupol/gaupol-1.7.ebuild
index 22fc8a04293e..2963b31a1fec 100644
--- a/media-video/gaupol/gaupol-1.7.ebuild
+++ b/media-video/gaupol/gaupol-1.7.ebuild
@@ -13,8 +13,9 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="spell test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/iso-codes
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index dd2a4c31128c..576a83dfcdeb 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,11 +1,12 @@
 AUX handbrake-1.2.2-backport-hardware-configure.patch 6394 BLAKE2B 64009363b658bea4aaa588339e0f596790eaf584a377b0c76ad5fded84652fa4fc93ef626e5e221b1a742b1cbc34f8a97e2f92bc875fb8e018a34c93948ede3c SHA512 62d8c54ca0148fcac76f356dd4588b1cdfdbec7621fe9a8b426a39ee7b2dc1eb3085f17e8c1ebe23f5d45b69e59e52c7c8dd113308598b3f2378bad32dec6bd5
+AUX handbrake-1.2.2-fix-missing-x265-link-flag.patch 357 BLAKE2B 8d59306ef238520326223f18331feea230ae73d0f4a48f54b5c09d07a0a699a4e46ba60b59570347babb85ee30676e7ab083027bfe0fb024f24097823db06045 SHA512 9ca716b290f384db839609d176b6883c4dc1aaf31206b206cfd1f29c85bb134e29fbf72bda1a8589f76e1885019dbdee5a39d8299f7f0a20a6ef8a01868f4845
+AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
 AUX handbrake-1.3.0-missing-linker-flags.patch 1283 BLAKE2B 83e20def829699eff6ad8473261cdcdb736e0fb395bebc941a75a4ba7384ad4509958f5e900ce57ed04713bd2ac4e10408dea4c93433edefe450fc8d8a710484 SHA512 810b1329ab47eac284fbb9cf9302cdbe453c2ddf2c8fa5665ae6a7b82ca612ef411fa63cb2aae74504b7ef9b513e42f7e8a4e7c058ffd02e2d9268ef3f837a4e
-AUX handbrake-9999-libdl-link.patch 882 BLAKE2B 74b6f367828d267ccefa33a1a88cfe53bf06e7f090e70593800cccec1bbb64df9952851efd94e20ec0e61e73e4ef0657c8238acdccccc85372591bc8b25bc024 SHA512 9990842947ea8eaf738c9d34859444d352a06c46cb15ee18018cdd10d1c666fb953fffb7d15d44d077aca52c1eef21bdc5585f44a94a04ddefcd1656a72dadaa
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
 DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
-EBUILD handbrake-1.2.2-r2.ebuild 4123 BLAKE2B 8195f875d49e0ec7f951e81fed5ab36b82dd989cbfe0845a6414abdd1bee9025f0d84a752b7400fe8d049b5fc64243ca8792cc58f5db88cfa47a293d2cee3adb SHA512 424866e13dff945b238f97686c1c48c42826823be3e924fb6989f1f74a330ed674c45a5e7bb4a0dd222a7b75d12035db37e73bfa8209abc38dc2fc0b98747e8c
-EBUILD handbrake-1.3.0-r1.ebuild 4235 BLAKE2B 781eb931d58a00490bfa50757a80fa6bf806289406df840320b3026f4d7bf6d43d934ed5c48e6d4ada466e67b8fee79bd63b313fb7050cc9d61326520b81a069 SHA512 01448c46f48f0ac1dd20b268ecff54558e400a66b82fb520d860d186c7dae304f146a9c97a3a4692cb39e51dcce68075befce131359a74af0cd44ad0fda29ae1
-EBUILD handbrake-9999.ebuild 4183 BLAKE2B 3d09bd94db5587d966e9f8ddf0c4c50617fdb1d8b8a522367346c3a21c00169de1f12d623ec28c00f0624f4d249a8fff396e8f30e7f6ac9e2ac5371eec4faced SHA512 7f1cf99309f39a290494e019fe4a2983131107650af4c9a33e3c0c632c269843f27219e6ca017ab9b5f0a5234afa123d9e92988bee9942b2d61ed52dca11a23f
+EBUILD handbrake-1.2.2-r3.ebuild 4117 BLAKE2B 03d2185c1a1e8533dcb3b99b1c3ac2c2b48aee108ca6bd5c6901781b5e8d571616f7f50cd99801499c2df06c72731da885e5b86d9d0f5362376ca81c9de84ec1 SHA512 3dd3f38c4881fe5a90257019b8989081ef8dbf5f55120759953af31a75266df8d5c7fe547548ebbfcdaeae4e4ba43f3e33ae991fae530279079332d9a89a4c5b
+EBUILD handbrake-1.3.0-r2.ebuild 4285 BLAKE2B 76b3ac6dcfc035d42744250557a8676f7a9b0e76ba839fea6fca83d511b10814352f5dec8c92586ee118f301744b87243ad035992df43214895f94e6038c53ef SHA512 e248267ead141ffce001b95ed92fdf395e4cd5cf8be35bf5faae90ae8a7e0b0f55eed12349dd508a45c719a66e094ff3f373e1c977f3d91875032ca9da25f3d8
+EBUILD handbrake-9999.ebuild 4223 BLAKE2B 238d1e5802944693bdbfb7c2f69e9829e16046c17dae1159c77257ed2868f93e4a267bce7d878121bd5d79715823db52f3568ccfb048b91f25d3a731ff42e048 SHA512 9685e8afaa1a62d7410484ff5722fa3a47596fc9cd62d540fbe5e57f7102162783eb3583877248881619d34793f5ec7262dc448db12e6f75107e8423634eb4eb
 MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
new file mode 100644
index 000000000000..a999fc325646
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley <pefoley2@pefoley.com>
+Gentoo Bug: #552792
+
+--- ./test/module.defs.bak	2015-06-21 13:19:40.626249439 -0400
++++ ./test/module.defs	2015-06-21 13:19:54.919757726 -0400
+@@ -25,6 +25,7 @@
+ 
+ ifeq (1,$(FEATURE.x265))
+     TEST.GCC.D += USE_X265
++    TEST.GCC.l += x265
+ endif
+ 
+ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
new file mode 100644
index 000000000000..551a64ee3817
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
@@ -0,0 +1,27 @@
+diff --git a/configure b/configure
+index 5c870e1d7..2f5834083 100755
+--- a/configure
++++ b/configure
+@@ -14,20 +14,8 @@ inpath()
+ }
+ 
+ if ( inpath bash ); then
+-    pp=""
+-    for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
+-    do
+-        if ( inpath $p ); then
+-            pp="$p"
+-            break
+-        fi
+-    done
+-    if [ pp != "" ]; then
+-        exec $pp `dirname $0`/make/configure.py "$@"
+-        exit 0
+-    else
+-        echo "ERROR: no suitable version of python found."
+-    fi
++    exec python `dirname $0`/make/configure.py "$@"
++    exit 0
+ else
+     echo "ERROR: bash shell not found."
+ fi
diff --git a/media-video/handbrake/files/handbrake-9999-libdl-link.patch b/media-video/handbrake/files/handbrake-9999-libdl-link.patch
deleted file mode 100644
index ace1528053a0..000000000000
--- a/media-video/handbrake/files/handbrake-9999-libdl-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
- 
- GHB_CFLAGS="$HBINC $GHB_CFLAGS"
- 
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
- 
- if test "x$use_fdk_aac" = "xyes" ; then
-     HB_LIBS="$HB_LIBS -lfdk-aac"
diff --git a/media-video/handbrake/handbrake-1.2.2-r2.ebuild b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
index 6d9379f30132..a2e9041ccde2 100644
--- a/media-video/handbrake/handbrake-1.2.2-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
@@ -86,7 +86,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
 
 	# Fix missing x265 link flag
-	"${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch"
+	"${FILESDIR}/${P}-fix-missing-x265-link-flag.patch"
 
 	# Allow disabling nvenc etc
 	"${FILESDIR}/${P}-backport-hardware-configure.patch"
diff --git a/media-video/handbrake/handbrake-1.3.0-r1.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
index ddd530597452..21bb95bbbdbb 100644
--- a/media-video/handbrake/handbrake-1.3.0-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -90,11 +90,10 @@ PATCHES=(
 
 	# Fix missing flags
 	"${FILESDIR}/${P}-missing-linker-flags.patch"
-)
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
+	# Use whichever python is set by portage
+	"${FILESDIR}/${P}-dont-search-for-python.patch"
+)
 
 src_prepare() {
 	# Get rid of leftover bundled library build definitions,
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 13e3bf9a6ad8..cfc362cad18f 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
+IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -71,7 +71,7 @@ RDEPEND="
 		x11-libs/pango
 	)
 	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-2.9:0= )
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
 	"
 
 DEPEND="${RDEPEND}
@@ -88,14 +88,10 @@ PATCHES=(
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
 	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
 
-	# Fix missing -ldl
-	"${FILESDIR}/${PN}-9999-libdl-link.patch"
+	# Use whichever python is set by portage
+	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
 )
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	# Get rid of leftover bundled library build definitions,
 	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
@@ -125,6 +121,7 @@ src_configure() {
 		$(use_enable fdk fdk-aac) \
 		$(usex !gtk --disable-gtk) \
 		$(usex !gstreamer --disable-gst) \
+		$(use_enable numa) \
 		$(use_enable nvenc) \
 		$(use_enable x265) || die "Configure failed."
 }
diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
index cf4b095d7477..a724e728a197 100644
--- a/media-video/imagination/Manifest
+++ b/media-video/imagination/Manifest
@@ -1,4 +1,6 @@
 AUX imagination-3.0-cflags.patch 834 BLAKE2B 7f3a995282a4e6fb0c505a6ad6fd1cb813a550c3a43ac131498ab38487a9c286b19518898f87cd11b51bf846a409ce15890c08b4cd466fe76f76f83e89d4bf38 SHA512 0afdeb7b3b4b25c08180eabe74631d3689a7eeff8a4f8ca930d6c093d75c29ae8e6c31fc82dcac65ba4dd5efaff21e64114ef8e7218e379845c8dd72aaa93369
+AUX imagination-3.0-enable-translations.patch 231 BLAKE2B 210deeb69fdc4d9236519f0eec6571789236c4ff2e8a9379312a11f0c8792e3d1ec4e078d805c91ebc21265e5fa90737ef2d3643904829425712da52cd77a5c8 SHA512 5c086aaf8fc28494250c08655b4f6a05f16efd853d42c47cef503e2e846bec2665a6ec339660aad63de47d094aa29cafddcb4ac0e46e24f2fd27660fd2dc417a
+AUX imagination-3.0-fix-htmldir.patch 2198 BLAKE2B bca0f907f386ebde1ec46db6c5c5a7952557fa3ef9a16984f133c175c5ee70897bfa88204c00250f9c243dc5e157ef370478a1fe94e53fb03a9a4ffecdb31b24 SHA512 e7537354418f71ffa50666a197cc9dc46a3b4a8441ee75bd3b31b1e8b5636e7f304b8b9df6a1df4012ac31b9538a2c73a26b888e02850c2d6fbda8ae1531ffad
 DIST imagination-3.0.tar.gz 3327784 BLAKE2B 0322a68ab6c44e2b0d47bb89de6522249ca3507808ee3733f2f195923c4269591c2225271ef27b24c648cb6784a5c85bd6ca97142072e52641bdf7f80b9a9bc7 SHA512 0780ab572d8f4fc1e728befef79f974169438d723f67205e677c06cbe0dac06745868936e7d3eab5fc42728902f6b06eb5f9d7e836532c289df005ddab2104b8
-EBUILD imagination-3.0-r1.ebuild 877 BLAKE2B aba9416246dd074a8d0f3266e1e5c3813209d8902ed4a133b92bce3b6ac2ffc55b90418e79fe7c06680edb07a8f6af1c5221cffd9d49506873e35fc47c12d2a3 SHA512 bd905ef216979793e05121bb0fefff215d1e25cfffb8bfffcb13e255ef31e410bc912f0f92b12a8c39c8dcf89781eca5e1fb8751d28b57ef0d828bf8c140f952
+EBUILD imagination-3.0-r1.ebuild 755 BLAKE2B b891b9d212085e971cf000ef79499c0db65da7d511c316ed62d12efd2ce0561de434ed0938b09601cf91c58e3ed17b81edb25d650d405c847939fcf77fa59d39 SHA512 5e4369fea43a47dc348d03c53f26d34bd5bfcb792f0cf4671ba3399827ac82428b8d908a4146e26b2c46c567979bd8cbb4dea93d7687b5c768bb933c932c529f
 MISC metadata.xml 248 BLAKE2B 3ab98ae1a4ef9f5b48116280f559a78a05aff568f1464a23c3ffd8c25e0f788481c046c094d2b76a8cb8e9198c1caadc4234efcda268ec4517d53f4d86df9838 SHA512 edb9d1136a99fbf3a5340bcd6957639bbd0b75a8772a319f60ce6505404cacd90d4fc6aabd06c3529c87f7471a3dce7f96a6e11b2fe1a6c6913164bad7ac04fd
diff --git a/media-video/imagination/files/imagination-3.0-enable-translations.patch b/media-video/imagination/files/imagination-3.0-enable-translations.patch
new file mode 100644
index 000000000000..d829129d8c77
--- /dev/null
+++ b/media-video/imagination/files/imagination-3.0-enable-translations.patch
@@ -0,0 +1,11 @@
+--- a/src/support.h
++++ b/src/support.h
+@@ -20,7 +20,7 @@
+ #ifndef __IMAGINATION_SUPPORT_H
+ #define __IMAGINATION_SUPPORT_H
+ 
+-#define PLUGINS_INSTALLED 0
++#define PLUGINS_INSTALLED 1
+ 
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
diff --git a/media-video/imagination/files/imagination-3.0-fix-htmldir.patch b/media-video/imagination/files/imagination-3.0-fix-htmldir.patch
new file mode 100644
index 000000000000..14e6f3a508fa
--- /dev/null
+++ b/media-video/imagination/files/imagination-3.0-fix-htmldir.patch
@@ -0,0 +1,95 @@
+--- a/doc/en/images/Makefile.am
++++ b/doc/en/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/en/images
++imagesdir = $(htmldir)/en/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/en/Makefile.am
++++ b/doc/en/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/en
++TARGET_DIR = $(htmldir)/en
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
+--- a/doc/es/images/Makefile.am
++++ b/doc/es/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/es/images
++imagesdir = $(htmldir)/es/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/es/Makefile.am
++++ b/doc/es/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/es
++TARGET_DIR = $(htmldir)/es
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
+--- a/doc/fr/images/Makefile.am
++++ b/doc/fr/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/fr/images
++imagesdir = $(htmldir)/fr/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/fr/Makefile.am
++++ b/doc/fr/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/fr
++TARGET_DIR = $(htmldir)/fr
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ SUBDIRS =							\
+ 	en es fr pt_BR
+ 
+-cssdir = $(datadir)/doc/imagination/html
++cssdir = $(htmldir)
+ css_DATA =							\
+ 	imagination.css
+ 	
+--- a/doc/pt_BR/images/Makefile.am
++++ b/doc/pt_BR/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/pt_BR/images
++imagesdir = $(htmldir)/pt_BR/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/pt_BR/Makefile.am
++++ b/doc/pt_BR/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/pt_BR
++TARGET_DIR = $(htmldir)/pt_BR
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
diff --git a/media-video/imagination/imagination-3.0-r1.ebuild b/media-video/imagination/imagination-3.0-r1.ebuild
index 030aa01ae125..dbf5d971be68 100644
--- a/media-video/imagination/imagination-3.0-r1.ebuild
+++ b/media-video/imagination/imagination-3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 DESCRIPTION="Simple DVD slideshow maker"
 HOMEPAGE="http://imagination.sourceforge.net/"
@@ -13,29 +13,29 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="x11-libs/gtk+:2
-	media-sound/sox"
+DEPEND="
+	media-sound/sox:=
+	x11-libs/cairo:=
+	x11-libs/gtk+:2"
 RDEPEND="${DEPEND}
 	virtual/ffmpeg"
 
-LANGS="cs de en_GB fr it pt_BR sv zh_CN zh_TW"
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-enable-translations.patch
+	"${FILESDIR}"/${P}-fix-htmldir.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	# enable translations. Bug #380011
-	sed -i -e "/#define PLUGINS_INSTALLED/s:0:1:" "${S}"/src/support.h || die
-	rm "${S}"/po/LINGUAS
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm "${S}"/po/${x}.po || die
-		else
-			echo -n "${x} " >> "${S}"/po/LINGUAS
-		fi
-	done
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_install() {
 	default
 	doicon icons/48x48/${PN}.png
+
+	# only plugins
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-video/isight-firmware-tools/Manifest b/media-video/isight-firmware-tools/Manifest
index ab4f8a835c90..c23360a46134 100644
--- a/media-video/isight-firmware-tools/Manifest
+++ b/media-video/isight-firmware-tools/Manifest
@@ -1,4 +1,4 @@
 AUX isight-firmware-tools-1.5.90-build-O0.patch 598 BLAKE2B 7ad3392140e3fd416f6cc932b015cc21e0ececb97bb12a0c889e3059112ffbff4f328db7d0a0a9c3133986b88fc96417e88a319d7fc0283b746ad815b02e7c32 SHA512 f2b781a94f29ab5c539a8b6f0da9abf554e79ae84825d1d3deb63fcb3844efe36db73c831e359b3436a1b08a8a16218aa1dfff941f07f67e3e7007c71e67cc39
 DIST isight-firmware-tools-1.6.tar.gz 229122 BLAKE2B 7838b342bc522a88d06ac01d062fa4cacd44bb4d2cef00ee0eb37d972bcdde2b5b0676efe54df77c59717ae8023bd60cce9550e78d5586ac7a81387ad212e2f4 SHA512 1d72e10d1ff97665c96113c70786307e0b5d1cd24cd8f5fcd15ddd7b608ff1596023139a41f550a9fd288bd8968f69d348b433f5a739179fc0e3f8fa3e143fea
 EBUILD isight-firmware-tools-1.6-r1.ebuild 1587 BLAKE2B 0155789447449823e41b5cac6c2d4b4c3dfce56a995722a367c37807aeed75305b81d23f3e1618e3a3bea2b64f8550b87d8f8544dd9229bceb6b31c60bdeee46 SHA512 32ed20190d789e19c33fb7021d9c973b3c6bfe866064b29fd8f76b396adc6bc6284726b283b0af74429d1fcdf608c1b43bc4a2952887c92883f9f4bcfbd3715a
-MISC metadata.xml 303 BLAKE2B 84a8e36ec04ab65d62f1de3d84cec31a55b10b65df51fe7b31491c3d5875e8607dbb484aba90f3ca30a143278c76c7e3427df28e1b1bc8fee2dd8c0df62028f6 SHA512 5c956a27b99e7c8b7a3dfd46b3ed4dc3f397cbb19c4d2d77f26d71f8f1db051471bb88abb80a4ea876849cddf766767386988fbd232fb47c502bebbfc477b6f0
+MISC metadata.xml 256 BLAKE2B f18a4f169258cc2e2558a1073e13b17dce6ff59b0fafa00d75df30d8a98f6d03e982d8740054004ebd73cc1af1c053f7d19158853fa158a1644a8868b8746362 SHA512 8cf30d78f67983b3cb006d8faa8829aed12f07544c69b3309ce3d8854eef36d5743ba84c78ce4ad5d2f7566b84b4be7d1df20039def8601d269aaf5fa978d64c
diff --git a/media-video/isight-firmware-tools/metadata.xml b/media-video/isight-firmware-tools/metadata.xml
index 1de5fa78159e..a4c75c582c9e 100644
--- a/media-video/isight-firmware-tools/metadata.xml
+++ b/media-video/isight-firmware-tools/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">isight-firmware-tools</remote-id>
 	</upstream>
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 6a5f9298446a..cd5dcfc0eabc 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -2,7 +2,7 @@ AUX libav-12.3-x264.patch 2466 BLAKE2B 8dd7fe5a6699f34bd1662f10eebbe5f189a22c43f
 DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018
 DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
-EBUILD libav-12.3.ebuild 11232 BLAKE2B 0ae9cb567e120853db2ca6e9d86002bd2c579aaf83459ba838772576747c05e9b6e7772479a8e54be5c02a248b8b5df3b885234c272bf7e576e32e1f0fea869a SHA512 2dae79e2edcff70eb696847f5b92162aacaf144e7bc6726dabab6a2df6df4235c6b0a368f0b8fb74ab7e0ce18961767f98745511975cdd06878d5cf823e32ce9
-EBUILD libav-13_pre20171219.ebuild 10615 BLAKE2B 9998c90f11291fe420ffc9ed749338b2d38cb288b920d9a5224684456c08f66ebfe0636ef7c39fdeb5e5a3796cef00651cad725ee44dfaac008999f62b188685 SHA512 086e1a0bd077707b773904b97a5f549ff1e9e7ecaf34c7b273cf15570a2520587432fac0cb0692618925c987227392b609d77c464627b617e0c64f96f951b705
-EBUILD libav-9999.ebuild 10756 BLAKE2B d7833b5fb3b896924124dd4d86d13909d61c48b30284e74b9494aae4c14e5b4e2f162582eb3cbe4c78381d78da10c21e5ad263c611bf5e0e14553aa0bc46a228 SHA512 74b99c2ef7efd84da77e1eb6bf839cbaa67b42360567db18077dd8f50a478129a0df603907d211a6e5dca2f4e42e74f89fdd7ffc6fef7aed12c36818cb98f9c0
+EBUILD libav-12.3.ebuild 11251 BLAKE2B 462ae4959a1584e2fccf80409308f3494531523c66c5d594cf9993a242eb697d9afe626a392292a5f4a83b09e5f33af4b854040a05ceb28da9a14e933034d6c4 SHA512 05711a6c08fff1edaa7187ab7579b1923115d2eddf38d8ee9d4630c2161308dda848ed98e231df7666bd5439051197faa8852bbff4971f89ccf3936ad493fa0c
+EBUILD libav-13_pre20171219.ebuild 10634 BLAKE2B 95e63624680d6540816c98a3149a880ca767069961ed62348ab5b7164cdf7a94c62e4b5d3e7dcea91785cd1ab09d60b4222fb98d496b21a4e56ac7137e0c4fde SHA512 581ad4f2abb15b234246293444f14ba95d5fab2c6148a96745fab4dc21b119e9fea37ca65e081cde8fe0d75ef974919bd5e293f1a305fafa7417047efe4fee0e
+EBUILD libav-9999.ebuild 10775 BLAKE2B da974d58efd0d1810ef13d143b434af9ef384ed4c07384e40774038ddc7ff3f1491863e2fcbb475121574f2cdc31577f911f9f58f70169f5e166b36b89796511 SHA512 2bdd2c8331821ca21f96fdc8b6ed3645e21ff6dec1cc8b3a034c98b028ae7f2ab4fc359af1d71e734ad6f819aa61f0b10455df81ee5670fb0dbc6d951a11b527
 MISC metadata.xml 2601 BLAKE2B d09d7ca403657b7d446f2504ff22c74ebb86303db22d4df43cb4b026ca39c059e754459f5f99ffc5cf6c5a29a189ed47754fbe709bc4897901cab96ed6928ab3 SHA512 12d2a41647e3e9ca824de3276098f742c9a068a8d4b33b2dbc45f32329ccdbdbe13c1f6f52cc4028ef5511c9f8557cea39bf1926c2433c7ae85687bf1f6ea7a1
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
index edeec8edc904..0c3ebdcf4a74 100644
--- a/media-video/libav/libav-12.3.ebuild
+++ b/media-video/libav/libav-12.3.ebuild
@@ -130,7 +130,9 @@ REQUIRED_USE="
 	test? ( encode zlib )
 	fontconfig? ( truetype )
 "
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
+RESTRICT="
+	!test? ( test )
+	faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild
index 73e9a1a3abc9..316231001656 100644
--- a/media-video/libav/libav-13_pre20171219.ebuild
+++ b/media-video/libav/libav-13_pre20171219.ebuild
@@ -126,7 +126,9 @@ REQUIRED_USE="
 	test? ( encode zlib )
 	fontconfig? ( truetype )
 "
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+RESTRICT="
+	!test? ( test )
+	faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 6f5fab3e33e2..72b3d24390d9 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -126,7 +126,9 @@ REQUIRED_USE="
 	test? ( encode zlib )
 	fontconfig? ( truetype )
 "
-RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
+RESTRICT="
+	!test? ( test )
+	faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index f15cbc8e2a01..bde30b8eb4c0 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,4 +1,4 @@
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
-EBUILD libva-utils-2.4.0.ebuild 1240 BLAKE2B a970d0c1e48ef7fc91b535f1cef599458f07fdd5f15353a4091035db0b4face8a57400936c20baa84b861582c6743b310b8de799fc7afcd875cb959be7be610e SHA512 bd4ea74f9e5d47467cded5da5c206ec3371747d9c7fd87d1e79fb62aa848653ceab9c362051fec284473ffd3d804a3dff00f9d47014d14de7059ea97f1a930b5
-EBUILD libva-utils-9999.ebuild 1243 BLAKE2B 61e8d03195a05298aab400f82ad970e2da8324638f0eab1de330518be906ca847b46727493f1c82555ccd5e31548e8ad05c61d194ede83ad53895147d8ac5c49 SHA512 7375fcf7be6c59d86bde4cff1b9578dc66a859043f4e09508e05465fa095910b6f87e142cf21f400984e3d152af4ce4d06be1b79af6732d79e4f5f7e2a018a90
+EBUILD libva-utils-2.4.0.ebuild 1267 BLAKE2B 30b40e6ecaa9e2bb8c0f1a1594168e5c792d3449b97a1479b5aff1b436162792ac5afcf13e8c38ea8613c4d37ac651e0744db85e4f47dfe4fff5037e2f74c600 SHA512 43805f78ce0afa4237612d3880a369fe6bd4243838fba89edd6eb443ba776d286343d4fdaa381eada962ee0efc4ac9d43cc081835d75a7e2e05470b287dc5793
+EBUILD libva-utils-9999.ebuild 1270 BLAKE2B ea8ea408d29affc09374e9b44a16a8f9a79f915c859965033370867b8664012aa7cb9b10f43f1a81a3e29e975126a65ca2b43f8725af3da481a5463732377897 SHA512 c5be30ab9113ad9895f1a2046d39b21d2ee308ce4188c549c713bc48770f2a31f60d48645dedb52fc38d82924f370562a930aef57da2776b3080685374ad5126
 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 8482dda2887c..f9e89f182263 100644
--- a/media-video/libva-utils/libva-utils-2.4.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.4.0.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="+drm test wayland X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( drm wayland X )"
 
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 928d6f126f65..0f311f4f431d 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="+drm test wayland X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( drm wayland X )"
 
diff --git a/media-video/lxdvdrip/Manifest b/media-video/lxdvdrip/Manifest
index 390e977669b8..b5db90fc64d2 100644
--- a/media-video/lxdvdrip/Manifest
+++ b/media-video/lxdvdrip/Manifest
@@ -1,5 +1,5 @@
 AUX lxdvdrip-1.77-makefile.patch 1341 BLAKE2B 8aaea5bfebfb0fa4cbb5be44d9c1e5204edad4c7e2200df848f44d304eeafd51de5f1b1fa258fb9d6dc90483f5cf459de4141a187f44bea5f06dc19d8daebda4 SHA512 4641e48fa2c7f35948788211a093f96506a74a5beee44b83787774627b52b85b36a65043e1b99cde6fb9352dde0a3838070e1f63a810f7f1433849be04e7e4a2
 AUX lxdvdrip-1.77-vamps-makefile.patch 389 BLAKE2B 52911721cd566f0fd648f698fd7fbc1f04cb1f21233924364369cc3e5a4feb9485f3fb550c9e81b43b742a922e18ade5dd886a1e05908d8f81bc432b4be90d0c SHA512 d51a411dd8bee365556b0ee275beccb99f00d4054e40080ca40fbb50f843a6646d2bb5fbc3ae97073dac7411706c0075266b00b7dfafcfa5977442143592e8b4
 DIST lxdvdrip-1.77.tgz 714310 BLAKE2B 07ec19bc7ecd3c8dbe4be50b0f100f9e4ecd04cc09aedb6b0a24a0a1b3396e20628db611bb34ab1a53bbb32c887d34fe67c4002dbc220eb0802a28d1f1754a7b SHA512 d9b3003d52b90ad0f6c02054cb3171b4613b4210b5681c76f2e6e42d4a233438b1323c93b92457fd2e048e7ddef0df2089d82ea8bf3f9983c453ff99f122cca3
-EBUILD lxdvdrip-1.77.ebuild 1181 BLAKE2B 639307c6524948c07ac1ec5a1a49e9e18d8aaf25e92849b1a335d6653bc082bdd8af30a703d73e42920b5ac380befc0ecbf748b039eccfad6761fecd2b831d3d SHA512 a21a4630d2c0f94b2d5b26009dbf2b1e064ac932f2f3a4fa426ae4cd388a2a61451f6f3c3c3cf508533260d0b8f01d3c41f292d92e24c8b113079d75c194db18
+EBUILD lxdvdrip-1.77.ebuild 1069 BLAKE2B b48073b2df4b831e4ca87a17f0f68d8e68df731eaf75f20de1be66f64b805b46aab9a0920202a4d71f977e1f1ff7f6d01f0a491b1c154147947f5500282b31ef SHA512 ed5534cce90faf214a7873cc03d56ba83473a08d09d93ade0c69348735890ce4000fce973e138b7d62053f75a23991f855e52109429e1e9a147996e1504a6f7b
 MISC metadata.xml 301 BLAKE2B 2a1f465bbef5ed15fe8cde02e7239e906611c905d4c5121b873455c79e2ed211b60512160845d8cc23a1c3778ad6f2ae7b109cf1ea6ae5ec72a5920047b7bb3d SHA512 14dce877e9111310fd764182c06b619ab5ef6c64c779e218aff6d996ceb70ad78c42f05f26a6f00adbf99b83e4b2b743c251fa7e65325d154efdf02cddb713f2
diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
index 74763867b526..8dac5c83b2b3 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
@@ -27,14 +27,14 @@ src_prepare() {
 }
 
 src_compile() {
-	CC="$(tc-getCC)" emake || die "emake failed"
+	CC="$(tc-getCC)" emake
 	cd "${S}/vamps"
-	emake CC="$(tc-getCC)" || die "emake lxdvdip vamps failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install () {
-	dobin lxdvdrip || die
-	dobin lxac3scan || die
+	dobin lxdvdrip
+	dobin lxac3scan
 	dodoc doc-pak/Changelog* doc-pak/Credits doc-pak/Debugging.*
 	dodoc doc-pak/lxdvdrip.conf* doc-pak/README*
 	doman lxdvdrip.1
@@ -46,5 +46,5 @@ src_install () {
 	newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
 
 	cd "${S}/vamps"
-	emake PREFIX="${D}/usr" install || die "make install failed for vamps!"
+	emake PREFIX="${D}/usr" install
 }
diff --git a/media-video/m2vrequantizer/Manifest b/media-video/m2vrequantizer/Manifest
index ef249c564118..252257a2ca4d 100644
--- a/media-video/m2vrequantizer/Manifest
+++ b/media-video/m2vrequantizer/Manifest
@@ -1,3 +1,3 @@
 DIST M2VRequantizer-20060306.tgz 25576 BLAKE2B 4b5c3887b9e1b03b2b03ae83ff1c18027b37e4af8e4c5e8b5845b8467ee9828b2df30ddc061547a10274ad15685a2defc88d3303060f6b61d3e29a38b2a9c9b4 SHA512 e3173aa19301028682adb2046bc536b20ca4c3bacfa7e40e0c22a5174411831969a9ed0e6737be7dede00006ba1629fb178822001166c02c507434e66c66b861
-EBUILD m2vrequantizer-0.0.2_pre20060306-r1.ebuild 713 BLAKE2B f0ab82dffc00be4dbe56a2571ec6ef948ed08a8fbe33ef5f865a776be3d50c40c3ec4262b4278b58a35fbc21cd9d00aa4bbd1bead2728c65e654ea47d70cfaa7 SHA512 0448b798d72202b77227b28a00768b0a6b2b7525798847a5bda1ccfa77d0c213f388eab28a6044f6f6f94711298880cfbc62033fc7ecd408d01499495b5a94a9
+EBUILD m2vrequantizer-0.0.2_pre20060306-r1.ebuild 738 BLAKE2B 533a4352cb8ea4147f518cca5c88c261a5b337172bbbbb79c8f9b6673c4855abfbbd4934c83a911a362d85cfcdb739a86aff1e31942e78227667d35768b3d042 SHA512 07c4e2eeebd330a74636fc711c862ab7404a629872504eaafa559b276d3864e3dfc258794228f78d581bdaec7c7f370e0401bb1a44d97587f3ed89149278153c
 MISC metadata.xml 357 BLAKE2B 2969a06704f541160af828c0e4bb2607cc86a22090e867607fd2951b08a22f45070e6c4fcf84ce22d6ec074b288ea4d8e04d42bd77dac69e3ec16600a311d1d0 SHA512 c301a1bb051eefde7856ef1462d13343fba21acfabde35a2fd9feba5c00f3aaf697b9e358132cc56114f59af0b785ffb07998d8a6d084369275cbf1b616a7fa4
diff --git a/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306-r1.ebuild b/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306-r1.ebuild
index e53d8d04db30..598503bc3dcf 100644
--- a/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306-r1.ebuild
+++ b/media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_P="${PN/m2vr/M2VR}-20060306"
 
 DESCRIPTION="Tool to requantize mpeg2 videos"
 HOMEPAGE="http://www.metakine.com/products/dvdremaster/modules.html"
-SRC_URI="mirror://vdrfiles/requant/${MY_P}.tgz"
+SRC_URI="http://vdr.websitec.de/download/${PN}/M2VRequantizer-20060306.tgz"
 
 KEYWORDS="~amd64 x86"
 SLOT="0"
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 14853a43a91a..da3c5e7c3f0f 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,5 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-DIST makemkv-bin-1.14.5.tar.gz 9465109 BLAKE2B 8eccfd5bee60cf1994b96e8f513a1b439193b0e76bda32399afabae922d1ea208e0b41e78c1af37c3fee3c0fde7f46f33dbd6caef3165399e4797c5bed689950 SHA512 9086444f30de71a83d93cf9814f4485b5ebe78940acd722a549029af89408fd39a2a25a145ce2444fb97de90bc3c3acdf2df323865e74bada6e5052d23d94d30
-DIST makemkv-oss-1.14.5.tar.gz 4384596 BLAKE2B 86e684c10c74272be7f4a7f93f41ab9fc1604fcc631bcb42ae78160a74cbd43067a5f1c049beee3c011ebe36b08bf6595d9a74606919ff9d5265d3c69c0225d0 SHA512 22097b70c3cee56bd58fc93e65a2acd0556f1a89717ca8ceda7b3b795692086d88d0a01f875fa9cea9b5fe08f19351e6a03997233ff4eb55fe462bc7ff3bcdc7
-EBUILD makemkv-1.14.5.ebuild 2922 BLAKE2B 5d133b12fe815f3b84ce125ef5c7cc680c3236ac64d7a872d2c2230bf5d712ac6c49c911ebe848fd8b7a71cb4a63bfb04e0816bf76a1cf70a2d8a01e0e031bd3 SHA512 50751938c6bdce72239e22c827fcad151697118b7371feca3b16129779ea4225d08f887dd08d400b32dc84dff8caa91646e61a0e90cfc5c487e034784e14913a
+DIST makemkv-bin-1.14.7.tar.gz 9487718 BLAKE2B ecba22794035ed022863a2f736572a0da207346d6a3e44e3ca8c319fa672228be23835201ac3b023250d1a6457b8dd37e680573c7a83c53bb8fee1e016d00096 SHA512 cdd2eae8a80b2e564b786dfef0273ef36211327e5f4932b0f580a59c1ac288d5a99a2a1fe6fa0059e0f3fec6bcbc07278e7f7580507f36ca6d01f92d47092626
+DIST makemkv-oss-1.14.7.tar.gz 4384451 BLAKE2B f2a2cff901a4c6d03286a5a4cdd54ac0f61e3c0f04d3adb4089f03fc767dda099b0d4b4e8f76a3ad0ba57fb1af85cd2ab8fb6d966f4fbed490e25250f0be283c SHA512 2e8ab96ae1c1e855ff840fffaedd7ba998021630b61e66337d1027c53b8315ef8c303016a85ae8fddbfc52ae006fadab44fd63e0f2cca3602bfd17086a52aa06
+EBUILD makemkv-1.14.7.ebuild 2982 BLAKE2B c6be006dead8d1e25329fe3a5a0d2deb2fd21d9f28e6b807c9c65b2b7717a6cb968ad0bfdddde30e771834011b3a8daca88d7c54de1331c99015dffe3329654f SHA512 0888197206f82289a7ee24e7ba8db09967a18f066e8a1349ef3d6d0c148fd43a8f0d4ae0569060592d488da44113eea34621b6fb0d5856a4d853e434ff5b6787
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/makemkv-1.14.5.ebuild b/media-video/makemkv/makemkv-1.14.7.ebuild
index 84c2ac2f4b41..1d97177013e9 100644
--- a/media-video/makemkv/makemkv-1.14.5.ebuild
+++ b/media-video/makemkv/makemkv-1.14.7.ebuild
@@ -35,9 +35,15 @@ DEPEND="
 	!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
 	libressl? ( dev-libs/libressl:0= )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	media-video/ccextractor
-	net-misc/wget"
+	net-misc/wget
+"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( dev-qt/qtcore:5 )
+"
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
deleted file mode 100644
index c705c6255e63..000000000000
--- a/media-video/minitube/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX minitube-2.5.1-disable-updates.patch 205 BLAKE2B 8cde17ebbedfc986c056fe3f3d54f988d39f4fa71251626d09f074e0fb72e3c313abceb510fc8afc182f16edddb3a334a29360a9307fa94d2ed865a2920341e9 SHA512 9b257652feea431d6ee115fab3ba89f07fd85163290782610b504fa7d556d03a547554d1ede10edd670b98b4b0f042d67cbf546bfcc6e07a8028de42a58b3384
-DIST minitube-2.5.2.tar.gz 1063794 BLAKE2B 511923c85efc8f4b8db621047d1887d54f518ef7f01fa1dc76a05bbc4bc8e1e0038318d2fee280b6e0f06a5e1d46e02ddc547a60f62086ea24ad28849ec728a3 SHA512 4001ea95e6d3b541e9a8a2555830238f6e3a0b4749566dfd67ae48fdc6102ec77a38e162e04fb2637cc5ff2b3dccdca541119531302332ffa3b90d9db8809284
-EBUILD minitube-2.5.2-r1.ebuild 2527 BLAKE2B d815780e5bd4a2ae62893c8cfcf38193cd6a1360b2651a9674920aaff13b8ed95b332d4e5cb68a6bec6b006b462f1cc9d7b62bd7abdf0d293aa694f0887a2dbe SHA512 cd663692314354db858332cc31d73e8f191cf0e0fdc21ddf150aeadb6b06f5ff3bc2b9500bb7f887a553cc50af3f0e3810a49e3bad52ee0a7fa9dfaf0360980e
-MISC metadata.xml 438 BLAKE2B e046cab12e70ee456f4cdac49a0d107ed8edf4ecd51e772a8c88ed45229a3d74e90be842c166c7e9001bf7f28625460f2b2ac01c6db2dd4384d3b70eb229b8ca SHA512 d8ba4788ad9a08c54cb75b509bedc74c06de3542f4048b996583608a8035ec256a2868faa752d1bbcac703dfdf26b21184ffd237518acc5fbf0fca9489f8801b
diff --git a/media-video/minitube/files/minitube-2.5.1-disable-updates.patch b/media-video/minitube/files/minitube-2.5.1-disable-updates.patch
deleted file mode 100644
index a5f496e92b2d..000000000000
--- a/media-video/minitube/files/minitube-2.5.1-disable-updates.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- minitube-2.5.1.orig/src/mainwindow.cpp
-+++ minitube-2.5.1/src/mainwindow.cpp
-@@ -232,8 +232,6 @@
- 
-     ChannelAggregator::instance()->start();
- 
--    checkForUpdate();
--
-     initialized = true;
- }
- 
diff --git a/media-video/minitube/metadata.xml b/media-video/minitube/metadata.xml
deleted file mode 100644
index fb12418babd2..000000000000
--- a/media-video/minitube/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-	<use>
-		<flag name="download">Enable support for downloading YouTube videos</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">flaviotordini/minitube</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/minitube/minitube-2.5.2-r1.ebuild b/media-video/minitube/minitube-2.5.2-r1.ebuild
deleted file mode 100644
index 97e767c3afee..000000000000
--- a/media-video/minitube/minitube-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr he_IL hr hu
-ia it jv nl pl pl_PL pt_BR ro ru sk sl tr zh_CN"
-PLOCALE_BACKUP="en"
-
-inherit l10n qmake-utils
-
-DESCRIPTION="Qt5 YouTube Client"
-HOMEPAGE="https://flavio.tordini.org/minitube"
-SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz ->
-${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug download"
-
-DEPEND="dev-qt/qtgui:5[accessibility]
-	dev-qt/qtdbus:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS CHANGES TODO"
-
-#455976
-PATCHES=( "${FILESDIR}"/${PN}-2.5.1-disable-updates.patch )
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# Remove unneeded translations
-	local trans=
-	for x in $(l10n_get_locales); do
-		trans+="${x}.ts "
-	done
-	if [[ -n ${trans} ]]; then
-		sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
-	fi
-	sed -i \
-		's|include(src/qtsingleapplication/qtsingleapplication.pri)|CONFIG += qtsingleapplication|g' \
-		${PN}.pro || die "Failed to unbundle qtsingleapplication"
-
-	# Enable video downloads. Bug #491344
-	use download && { echo "DEFINES += APP_DOWNLOADS" >> ${PN}.pro; }
-	echo "DEFINES += APP_GOOGLE_API_KEY=${MINITUBE_GOOGLE_API_KEY}" >> ${PN}.pro
-
-	epatch_user
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	newicon images/app.png minitube.png
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Since version 2.4, you need to generate a Google API Key to use"
-	elog "with this application. Please head over to"
-	elog "https://console.developers.google.com/ and"
-	elog "https://github.com/flaviotordini/minitube/blob/master/README.md"
-	elog "for more information. Once you have generated your key,"
-	elog "please put it in QSettings key \"googleApiKey\", e.g.:"
-	elog "# echo 'googleApiKey=YourKeyHere' >> \"\${HOME}/.config/Flavio Tordini/Minitube.conf\""
-	elog ""
-
-	if use download; then
-		elog "You activated the 'download' USE flag. This allows you to"
-		elog "download videos from youtube, which might violate the youtube"
-		elog "terms-of-service (TOS) in some legislations. If downloading"
-		elog "youtube-videos is not allowed in your legislation, please"
-		elog "disable the 'download' use flag. For details on the youtube TOS,"
-		elog "see http://www.youtube.com/t/terms"
-	fi
-}
diff --git a/media-video/mkclean/Manifest b/media-video/mkclean/Manifest
index 9b4d4cd18328..779f8331912b 100644
--- a/media-video/mkclean/Manifest
+++ b/media-video/mkclean/Manifest
@@ -1,3 +1,3 @@
 DIST mkclean-0.8.10.tar.bz2 764380 BLAKE2B 94ce2f7eda5865312e6fdc48b001d824b2216625c36a3a728dd78e93444e23a02e07cacb67281f97e77009e15348c99cdfab19f1c066c4b675c124373196fae9 SHA512 8e12ac906205b14c162f0fd29d9e1a56ee854e7946706adf22c3df40376ddeb2c23a02c499d8146aeafc945381eabb96e16ca33da1323dda5929a1fc1f337892
-EBUILD mkclean-0.8.10.ebuild 982 BLAKE2B 680c61e626456b88d0b87e8510eddf060f69c5ee27d29766787f28b35fedcb25596a6cb2d113893b65a8a64eec37f9ef493cff79602508c4fb286c1aedb53527 SHA512 380a0a9ea83757500d33ad8638b1f32a98fef1d68e97ebf2541f31f7c85f9e24a485caa64e543bb898ecca9cb074638400f017d2c4ef91e9ee035e65d9af6886
+EBUILD mkclean-0.8.10.ebuild 1060 BLAKE2B 98f2e5e808a08590f3f696b52d439abe46ab6b885108bae4a10341d01fc367926dc48d891bb912b355e5b10b3ec812cfba313595925a852d1ecc9593ed81208c SHA512 dfe899cffdc281cddc1fb08f5f817c6f67e53ebc4341c4ed1795f0483e4db16a34159a756fd492228262b26ee596385163a4d739dbcafb0a05fba6308906d8d4
 MISC metadata.xml 948 BLAKE2B 4aa66a16ce8416c47366bf03dc09846ddf74ccafa4559521c75f63725c7efa9c33a836671db63eec2fda997fdee713cfb6a96b57d8e356c3152721d401f461ef SHA512 c246ead2ee597aaf369567b30e4577d6865befa0ef89877f512b1e192913459800d980c84e81f43a06d006e9a8f35204c8d484713a24c2886fa39b5201d226a2
diff --git a/media-video/mkclean/mkclean-0.8.10.ebuild b/media-video/mkclean/mkclean-0.8.10.ebuild
index c094af08ab56..35ddf2b4dfca 100644
--- a/media-video/mkclean/mkclean-0.8.10.ebuild
+++ b/media-video/mkclean/mkclean-0.8.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_configure() {
 	tc-export CC CXX
@@ -23,8 +22,13 @@ src_configure() {
 	./coremake $(corec/tools/coremake/system_output.sh) || die
 
 	# fixing generated makefiles
-	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
-		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak") || die
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		sed \
+			-e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
+			-e 's|^\(STRIP.*=\)|\1 echo|g' \
+			-i "${f}" || die
+	done < <(find -name "*.mak" -type f -print0)
 }
 
 src_compile() {
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 18a9951ab1b9..42f21f16421f 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,6 @@
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
-EBUILD mkvtoolnix-35.0.0.ebuild 2673 BLAKE2B 2e0f0339434a91911d6b09541c1e1ea0a33deb365e82c13cd97a976c0ffff08a340d2402bd5a6949d24a9565e2406c5403a684f582068eb505494938fda9a89e SHA512 55744b23a1f061e14601d157309615bed32a282a0d6c3b84aa2dd1212cdcaf264d6e6b28f345bfbef16759c01e3f88e20457ccb0de40ee2d9f86569dadbb5f06
-EBUILD mkvtoolnix-37.0.0.ebuild 2606 BLAKE2B 8803095ef8a6afec2b048a4d5e56ded7741c537714d151281da52d15a067d8fbfd2a6436f454eeac5a4bcf2bb4284e09cd7c5f333218523e878569a7b3d6cb76 SHA512 71f0476067793a1209e76913cb94844bfd67d33a825fad193fda526fcbc48e4c003367a1a1fbc1e3971574e71753c6f93a96dfc025a37b9b13b1ade2ea392699
-EBUILD mkvtoolnix-9999.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563
+EBUILD mkvtoolnix-35.0.0.ebuild 2700 BLAKE2B 13f7e93d5c8ca53c0d1bdd00548d330e3292b68ce87274a5c3b6288d23cf141ae3c62a3432dd5961f7af7e590f4d1c4cc668a6d48609c993ec2092de1706a5c1 SHA512 3dab2ded309ff0bddf4cad9997692ba2bad5eceb06f6890fcd391ed0c4e734ee672a8a5e0b38056bc121c0236cf34d532bf36037aa332709d97698bda0540533
+EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
+EBUILD mkvtoolnix-9999.ebuild 2637 BLAKE2B d3f785212fe6937fe2f14ba16037daa79810a65d913dc3b108d41c619ea9c60901ef168ac7ef9e25b38e6e1785981aaad00316836cc7f2009eafbb730344ec0d SHA512 5351bb2f789cea5fb3f61d75e6e56e9bd209650dba2b76ddd71871e56a98b4002694827b6b649ee29b4dea9c3353bdfa36e4d2c09ab85bdd5e909746b7d0c2b7
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 3fabd7e2dccb..83ca04cff737 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug nls pch test qt5"
+RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
index ed4d29782167..f29330b7108c 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug nls pch test qt5"
+RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 5fa946801729..99b70cef63ea 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug nls pch test qt5"
+RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
diff --git a/media-video/mpeg2vidcodec/Manifest b/media-video/mpeg2vidcodec/Manifest
index 515e2fce9780..bf1510b727cd 100644
--- a/media-video/mpeg2vidcodec/Manifest
+++ b/media-video/mpeg2vidcodec/Manifest
@@ -1,3 +1,5 @@
+AUX mpeg2vidcodec-12-Wimplicit-function-declaration.patch 1020 BLAKE2B b61c8c45a0a3fa499e6f7c153cced71c80a87d6ddeda0283d51c56932393eb994297f7f192fffa342d952547b6857c8ead2d8aa1a99202c4d3c19ef8adf5cc02 SHA512 2741e393adadc6b74408b53dd978b820ed80483eb8c91ce1b50f2e916bdcaef7c25fb8679e4c8fad5686f0da99c42881738f424e72b2a02a2d098f0d2f99b393
+AUX mpeg2vidcodec-12-fix-build-system.patch 2038 BLAKE2B cb5dedb4c2c4a60e85e23cebabe12d6c6ec95ba3ba5b198da99735e515ff78007aa40b67be87e23d3ab2558b40c390f944417dbcf72a3026550683bb8297bf61 SHA512 04d55902b48f68460e5272a5ddacf1f6b9f1dbe2f3fa4b9955e804a1ae36f533998f51eb1cdae7f9babbcd753d3436b71d37af324f2eac3bf02c9df6f64e99d7
 DIST mpeg2vidcodec_v12.tar.gz 259790 BLAKE2B 528a6bc7ffdf25ff97241752d26accf83860f3dcf6a7f8ce9394308c1cb1ece0cad9d79f8a6ce7b59823900e9ff991a1cc0ff9de8c11749736576d847d07545a SHA512 2a46f486102ac2a1ae99a0f75b196c5aa01f8a99a6230723a2000ca8411adbca6c3e07d70f7cb269b17ce5fa4bf318e6dd4bfa83ecf8e137e8efca2bb352735c
-EBUILD mpeg2vidcodec-12-r1.ebuild 819 BLAKE2B 35eb7318a4e038d5839c098c8df44c780b9ebfb5360ba8b9aa8950cd0beaf4283020420f90585ef667429624c2c83534c3ce016cd9fb0851373d23e08f2ac4a3 SHA512 305bd5edac08bf2447b3cdab9d16ded6151021312574e3a6b58c14c77fdf035c2ddedfaf8bdec6dbcb9d3848f01f832f7f3e18bc19d2264927ff179094a0e2b4
+EBUILD mpeg2vidcodec-12-r1.ebuild 734 BLAKE2B f6f926944da5c386c05b3295607eef66b67dc3b28b958438df6ce5f13a1bfdbcbc7d07c528ea4a19f450ee5e6f1faf82f7bd249e8a321009d6f3fe1ee3cdf51c SHA512 8449e75e6e128e23d41ae3eca6d1f7e563686f52be3db1002d3b6d02f85f0f0bc0fdf766be6f053a0fdaa65fc5efd7fcbd50a26d506ce3e13e346139cb533305
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg2vidcodec/files/mpeg2vidcodec-12-Wimplicit-function-declaration.patch b/media-video/mpeg2vidcodec/files/mpeg2vidcodec-12-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..7f618a2e9f8d
--- /dev/null
+++ b/media-video/mpeg2vidcodec/files/mpeg2vidcodec-12-Wimplicit-function-declaration.patch
@@ -0,0 +1,54 @@
+--- a/src/mpeg2dec/getbits.c
++++ b/src/mpeg2dec/getbits.c
+@@ -34,6 +34,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ #include "config.h"
+ #include "global.h"
+--- a/src/mpeg2dec/mpeg2dec.c
++++ b/src/mpeg2dec/mpeg2dec.c
+@@ -32,6 +32,8 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <unistd.h>
+ 
+ #define GLOBAL
+ #include "config.h"
+--- a/src/mpeg2dec/spatscal.c
++++ b/src/mpeg2dec/spatscal.c
+@@ -1,5 +1,7 @@
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "config.h"
+ #include "global.h"
+ 
+--- a/src/mpeg2dec/store.c
++++ b/src/mpeg2dec/store.c
+@@ -28,8 +28,10 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "config.h"
+ #include "global.h"
+--- a/src/mpeg2dec/subspic.c
++++ b/src/mpeg2dec/subspic.c
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "config.h"
+ #include "global.h"
diff --git a/media-video/mpeg2vidcodec/files/mpeg2vidcodec-12-fix-build-system.patch b/media-video/mpeg2vidcodec/files/mpeg2vidcodec-12-fix-build-system.patch
new file mode 100644
index 000000000000..e278b3a26d76
--- /dev/null
+++ b/media-video/mpeg2vidcodec/files/mpeg2vidcodec-12-fix-build-system.patch
@@ -0,0 +1,78 @@
+--- a/Makefile
++++ b/Makefile
+@@ -53,26 +53,23 @@
+ #
+ # GNU gcc
+ #
+-CC = gcc
+-CFLAGS = -O2
++CFLAGS += -Wall
+ 
+ all: mpeg2decode mpeg2encode
+ 
+ mpeg2decode:
+-	cd src/mpeg2dec; make 'CC=$(CC)' \
+-	'CFLAGS=$(CFLAGS) $(USE_DISP) $(USE_SHMEM) $(INCLUDEDIR)' \
+-	'LIBS=$(LIBS)' 'LIBRARYDIR=$(LIBRARYDIR)'
++	cd src/mpeg2dec && $(MAKE)
+ 
+ mpeg2encode:
+-	cd src/mpeg2enc; make 'CC=$(CC)' 'CFLAGS=$(CFLAGS)'
++	cd src/mpeg2enc && $(MAKE)
+ 
+ pc:
+-	cd src/mpeg2dec; make pc 'CC=$(CC)' 'CFLAGS=$(CFLAGS)'
+-	cd src/mpeg2enc; make pc 'CC=$(CC)' 'CFLAGS=$(CFLAGS)'
++	cd src/mpeg2dec && $(MAKE) pc
++	cd src/mpeg2enc && $(MAKE) pc
+ 
+ clean:
+-	cd src/mpeg2dec; make clean
+-	cd src/mpeg2enc; make clean
++	cd src/mpeg2dec && $(MAKE) clean
++	cd src/mpeg2enc && $(MAKE) clean
+ 
+ test:
+ 	cd verify; ./verify
+--- a/src/mpeg2dec/Makefile
++++ b/src/mpeg2dec/Makefile
+@@ -60,8 +60,7 @@
+ #
+ # GNU gcc
+ #
+-CC = gcc
+-CFLAGS = -O2 $(USE_DISP) $(USE_SHMEM) $(INCLUDEDIR) $(TRACE) $(VERBOSE) $(VERIFY) $(WARNINGS)
++CFLAGS += -Wall
+ 
+ OBJ = mpeg2dec.o getpic.o motion.o getvlc.o gethdr.o getblk.o getbits.o store.o recon.o spatscal.o idct.o idctref.o display.o systems.o subspic.o verify.o
+ 
+@@ -76,7 +75,7 @@
+ 	coff2exe mpeg2dec
+ 
+ mpeg2decode: $(OBJ)
+-	$(CC) $(CFLAGS) $(LIBRARYDIR) -o mpeg2decode $(OBJ) -lm $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARYDIR) -o mpeg2decode $(OBJ) -lm $(LIBS)
+ 
+ display.o : display.c config.h global.h mpeg2dec.h 
+ getbits.o : getbits.c config.h global.h mpeg2dec.h 
+--- a/src/mpeg2enc/Makefile
++++ b/src/mpeg2enc/Makefile
+@@ -32,8 +32,7 @@
+ #
+ # GNU gcc
+ #
+-CC = gcc
+-CFLAGS = -O2 -Wall
++CFLAGS += -Wall
+ 
+ OBJ = mpeg2enc.o conform.o putseq.o putpic.o puthdr.o putmpg.o putvlc.o putbits.o motion.o predict.o readpic.o writepic.o transfrm.o fdctref.o idct.o quantize.o ratectl.o stats.o
+ 
+@@ -48,7 +47,7 @@
+ 	coff2exe mpeg2enc
+ 
+ mpeg2encode: $(OBJ)
+-	$(CC) $(CFLAGS) -o mpeg2encode $(OBJ) -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mpeg2encode $(OBJ) -lm
+ 
+ conform.o : conform.c config.h global.h mpeg2enc.h 
+ fdctref.o : fdctref.c config.h 
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index d3769dd81efc..33d9cdb700f6 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
 MY_P="${PN}_v${PV}"
+
 DESCRIPTION="MPEG Library"
 HOMEPAGE="http://www.mpeg.org/"
 SRC_URI="http://www.mpeg.org/pub_ftp/mpeg/mssg/${MY_P}.tar.gz"
@@ -13,23 +14,20 @@ SRC_URI="http://www.mpeg.org/pub_ftp/mpeg/mssg/${MY_P}.tar.gz"
 LICENSE="mpeg2enc"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
 RESTRICT="mirror bindist" #465088
 
-S=${WORKDIR}/mpeg2
-
-src_prepare() {
-	sed -i -e 's:make:$(MAKE):' Makefile || die
+S="${WORKDIR}/mpeg2"
 
-	sed -i -e 's:$(CC) $(CFLAGS):\0 $(LDFLAGS):' \
-		src/mpeg2enc/Makefile src/mpeg2dec/Makefile || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin src/mpeg2dec/mpeg2decode src/mpeg2enc/mpeg2encode
-	dodoc README doc/*
+	dodoc -r README doc/.
 }
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index ed23f8783230..45d50957e2ef 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -3,7 +3,7 @@ AUX mpv-0.29.1-egl-bound.patch 1060 BLAKE2B 3e2c59c4e4c2929cce59735e37059fb3d6b4
 DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5afd59bce4b423c7b4f3739b540f26a4de947cb3cf87a31a7d3ce03a11a6d1247158250afde596f490321a537 SHA512 ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086
 DIST mpv-0.30.0.tar.gz 3085141 BLAKE2B 314f6830f91e7dc11d3627688415c7535ef0ae462378d2c29cf036d5b851c55025ea5e9d5b0aa3f07ac6ec8c87350be65c882932bd908eab7c4f40b3840bf1a3 SHA512 2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
-EBUILD mpv-0.29.1-r1.ebuild 10339 BLAKE2B dcd76ab00d7cc9c54786ef25fb8b05fefdd8113620f30dd183005943343e54db7ac16e454885835e68e40043f43ff73908b004ec487c191aa613c6d750b4eaa4 SHA512 8b7b5452bd5e5f0b30a9037f3e675c9bb89b56bcdb8fe4a57f866372c7b87053cc3bf7bea9fbef6542fdba069a2f68af673d41e3825b88ac5760b33d40087211
+EBUILD mpv-0.29.1-r1.ebuild 10367 BLAKE2B f470542d7c202e72438e0394b76e40c1bafc20865cd3c5196afad26940619d35b8d121c997dfba8fa9a442b583b7e7a56f791df6b50232dc203019ad47e09864 SHA512 92c16e81be4a2376d16134edac4ed4a7cf98b7fa88f5122f776e7e225e80ed27ccac4bc8bc32330db25ad970584906c716770f13c324d7826dc1b6b02962b38d
 EBUILD mpv-0.30.0.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a
 EBUILD mpv-9999.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a
 MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7
diff --git a/media-video/mpv/mpv-0.29.1-r1.ebuild b/media-video/mpv/mpv-0.29.1-r1.ebuild
index 0022e823df76..2df0619aa036 100644
--- a/media-video/mpv/mpv-0.29.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.29.1-r1.ebuild
@@ -34,6 +34,8 @@ IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
 	selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
 	zsh-completion"
 
+RESTRICT="!test? ( test )"
+
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index 93b090696909..f47e463af9c5 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,5 +1,5 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
 EBUILD openshot-2.4.0-r1.ebuild 1275 BLAKE2B 04d16ebe05301d91fd4692410662618f4d7d1304e719f4ef3c3b3dabb85285c3dc64044fe80920dfae5d52c2f9789c60a7ce535e25d5fce196fe3888f0d89776 SHA512 40495955fe86cb522f12fc78a73e216093a21f08a899667197bc4943e929c858bfd9d807261df0179b4d1079fea9551db3e76c81bc3e1cefb83828432a712751
-EBUILD openshot-2.4.4.ebuild 1210 BLAKE2B 7d6ee91f9bf739c785b57387f9f0ca61f0b372c64210f1f6d86f660ff06b655dce2638494574798fecc789c7732e02e6cec3552061aabe9870d7ef7528f8dfdc SHA512 f1b006b2d1a99c19af6b6c5d26af31205ddbed121010002ebc164ef66cb4bbd5531a80cebb8717dfebb2d494a6f3518d37731bfa00c50233949688f12343d487
+EBUILD openshot-2.4.4.ebuild 1208 BLAKE2B 0a266ec566dd0194e804857e2496426c21f7f7a0f82afeaf9ce74e90e06ba00b28dc783040363bb1620129606fe15462a5ae8547d1c382b1b305f7c40d2ff8a6 SHA512 18b0b8b0d6a0348b99a50a5e58ce9b6b8825e52c0805491a5cfad66550d0bb1ab0cbe158db7a8c1db349663908eccd1e9d4f308522b96cb0a322389b63402983
 MISC metadata.xml 636 BLAKE2B 08e8c695bf15de910bb90ebe5fef7b6883ce1fac03eb6c7de660d280cb402c5a70befd6e99dc281aa76098322439e2c4bff48e63ade946fa390dfe5f1ccbe156 SHA512 1b736005e9564431798291c83f1ccba5de2b03ba18b41a0fe400e2b2b58020fb0863e6aad2c348191f5903f288ed4fef1cef1e7615bbc3e97f2deb35633b5bd4
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4.ebuild
index d252a05676b2..d1d143bbbd74 100644
--- a/media-video/openshot/openshot-2.4.4.ebuild
+++ b/media-video/openshot/openshot-2.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest
index ce1fe980567a..0655ff7d0d12 100644
--- a/media-video/orion/Manifest
+++ b/media-video/orion/Manifest
@@ -1,11 +1,6 @@
-AUX orion-1.6.1-fix_desktop.patch 491 BLAKE2B 70d44443f10c55023120f2ef9f53186e095306d149302e091ecdbb64076cad1d07413018bc4af4b90c5de32371ab609a641d81a34026ffb9a54991dcb03d203d SHA512 82b6a12d3fac7e0283154c961684bef1ae34490b8a1ec065ee1f1876bfeaa7eb9bc5d4e2c6d5b10291af80126c790c5bed1d8d796d81f98e112a419e449cd961
 AUX orion-1.6.6-fix_login.patch 999 BLAKE2B 43f37299be369aa56d612ec6393c4a240c06a65b37a9e22dd499b774497c22eb5fe342ecd6b030912cab2354ef4774d067b10c1fa0288f5a6c8554dea9aef1e3 SHA512 a5b45ca8dae9008bb21ca73a8fa57ccff56da46cdb0aa3f9cc03299ca9d864bfa311a622e7735505a52b4a6c7cc66399756f159fa3757ef17a0f00d7b4304792
 AUX orion-1.6.6-mpv_backwards.patch 4470 BLAKE2B 19ca0d4e5226038d5e8bc528856d2f145a6750a87d9f20591810165d513a1fd3067bda2e483088d3e2cf1a44a963ff7498e530d03099ddc6b6ef2a4661d4ac84 SHA512 79f421e95a97f22e91dda2e350c94e8612230123ee64a18f15926bc111c67a6965dc740def5d9624575024f6b0e11871dfa3c26ce0e4e7abb4e3d3c1811ddd9b
 AUX orion-1.6.6-mpv_compilation.patch 1108 BLAKE2B 021660340ba3f6cf7f70fda13af65544ea26edafb50331b4f5bba0af0b1662840ec25a5993b1f19335c7c2ebb5129c04d487640fad975cb797a1a07bd400ca29 SHA512 ffff325f22eace89c0b2f59701e0f119c759ea3d2f2c5d2422b6e3f0eac74e08fa56e442502895ab78cc41be9fe2182f2a62d036ba872c3dfc9457ad61e324af
-DIST orion-1.6.1.tar.gz 614216 BLAKE2B 8fc0909c1dd433e72d4ed41046d38a861ec48cbe6e93e1a9cc48f31cb3ef381e1b5b998c501d20756883431464eef798859b9ba4d086b89575281dbc17afca69 SHA512 3db0b59a89d2364f2d0586c3f318fc793f73a17d767adb0f44b89830e397be6f24c2ab662b7c84e7d857bc42b952fdf7fa280090313f5e39e37205eb8fb6dc9e
-DIST orion-1.6.5.tar.gz 624005 BLAKE2B ca2c40a299ab3f1abc7f383f2a5f39ebbe1e6ce6737efc3da0acd8cbbc04753dab865f417bd8e39d7e42dd7db8de703dd3b251296b8820a9027ca3ad2cd5de1d SHA512 6add27b81bf2520354e1a8854c2be4caf81d1c7c161003cb86bb4911852965cff938381c0ea481c64dc91c36d45f5af44cfb6e9a6d1c379f8b3b3011bbe47c6f
 DIST orion-1.6.6.tar.gz 629917 BLAKE2B 303af947533aeb26561fb3fc57d4ffbbd6d168e1e51ffe196a0de82fca3406599cfb84c1ae361c9b7b84c9c01b47bb6147b98f62cc5b1dec3d08d0588cbc7327 SHA512 88c7efe1796d1135f18bd53c83a25747df1bbf35163b27c625711ab5027e988425e3ba13ff6e3349d30cdc99d24cae0642d1d058e401a24b240d73c6b47a2aaf
-EBUILD orion-1.6.1.ebuild 972 BLAKE2B 475db2a56a07a0ec72a56e87c5f17f721e0a4dec0278847dde90b2374ce0e009d9f68e45128165d5dc64ea9582a77599a9e6f9f387014233bb1fdaf3c06941a3 SHA512 b6eb5de3734dbae9c8cbcb2f61cf0baf50f83a10b7f8bfa03a0cbabbd5c2985d628df544024e9c45dc282d1f2a5dd7e89b0f473dc8c6a1894032836b76108ffc
-EBUILD orion-1.6.5.ebuild 988 BLAKE2B 9703326fe52193570e84fc3428941167b12680cb40a891920fa4b2e45a0144110322dcf391146b939647b0aacb0a7de5c72641dec5ada927b741cb7393eb68da SHA512 81dd5dd6ef117820bcdfb63449271f31ffec5724e24df52532d53c07fb49be71ea7d5e520db43f863a0f12e22a9ec6963155c9c52500ebdc5031c7ba04866acc
-EBUILD orion-1.6.6.ebuild 1246 BLAKE2B 9e411ef69e8d9ef745fb7b545d2467df0ab10973005b1cded89ebb059d9da36b6c27c7fd39208b88e3122d1f12ebf699c252dabb5615e1c09428a5279c422bbe SHA512 1787dc3362bc1b9e7e13a1cf7e31dac30b2d1d3b442d6bc54143778faf25b4306ad7679ddff691cb2c34034b16332995b0b2551e026721701475f627eaee0652
+EBUILD orion-1.6.6.ebuild 1156 BLAKE2B d1277c411bdcc32e73169f249c0c2e9abad004cb87bb8dcaa12a40596d7d999a3f0f90ee7d57817a4d120aed74c3053b15be5867d3c292ca47c9038e08029fed SHA512 16d0c26553e3afc5ae71f694cc528db25d74b3662079285aba7b7bd1fc3a0b1872a310f558066adf1170df6610c9bb31b425a1a312e80cf136ea30ed33169cc8
 MISC metadata.xml 574 BLAKE2B de16e0fa5f9fbb443c5218a093048811e4ad9e633ec0e23cbd8b00e5322f7709af121ff3fa8cc4ef9cbc164f84d57cbf9ce9c542b7753195f09735e859fb5a55 SHA512 4ffbe221d97a40411dbaefc31fad97978f2ae823d14e1fbfef1aa9d84697c9ea06f7d58c7174ff1daa3b8f64863d62350dc469414e0b55917a227e2953b86bc9
diff --git a/media-video/orion/files/orion-1.6.1-fix_desktop.patch b/media-video/orion/files/orion-1.6.1-fix_desktop.patch
deleted file mode 100644
index 78103fbabea0..000000000000
--- a/media-video/orion/files/orion-1.6.1-fix_desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur orion-1.6.1.orig/distfiles/Orion.desktop orion-1.6.1/distfiles/Orion.desktop
---- orion-1.6.1.orig/distfiles/Orion.desktop	2017-07-06 22:26:29.000000000 +0200
-+++ orion-1.6.1/distfiles/Orion.desktop	2017-09-19 13:36:49.754743707 +0200
-@@ -2,9 +2,9 @@
- Version=1.0
- Type=Application
- Name=Orion
--Icon=/usr/local/share/icons/orion.svg
-+Icon=orion
- Exec=/usr/bin/orion
- Comment=Seek and watch streams on Twitch
--Categories=Games
-+Categories=Game
- Terminal=false
- StartupWMClass=orion
diff --git a/media-video/orion/orion-1.6.1.ebuild b/media-video/orion/orion-1.6.1.ebuild
deleted file mode 100644
index d099513bb932..000000000000
--- a/media-video/orion/orion-1.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-DESCRIPTION="Cross-platform Twitch client"
-HOMEPAGE="https://alamminsalo.github.io/orion/"
-SRC_URI="https://github.com/alamminsalo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mpv"
-
-DEPEND=">=dev-qt/qtquickcontrols2-5.8:5
-	>=dev-qt/qtsvg-5.8:5
-	>=dev-qt/qtwebengine-5.8:5
-	mpv? ( media-video/mpv[libmpv] )
-	!mpv? ( >=dev-qt/qtmultimedia-5.8:5 )"
-RDEPEND="${DEPEND}
-	!mpv? ( media-plugins/gst-plugins-hls )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix_desktop.patch )
-
-src_configure() {
-	# TODO: also supports qtav, not yet in portage
-	local PLAYER
-	if use mpv; then
-		PLAYER=mpv
-	else
-		PLAYER=multimedia
-	fi
-	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
-}
-
-src_install() {
-	dobin ${PN}
-	domenu distfiles/*.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins distfiles/${PN}.svg
-}
diff --git a/media-video/orion/orion-1.6.5.ebuild b/media-video/orion/orion-1.6.5.ebuild
deleted file mode 100644
index 17c83ddd2d0d..000000000000
--- a/media-video/orion/orion-1.6.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils qmake-utils
-
-DESCRIPTION="Cross-platform Twitch client"
-HOMEPAGE="https://alamminsalo.github.io/orion/"
-SRC_URI="https://github.com/alamminsalo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mpv qtav qtmedia"
-
-DEPEND=">=dev-qt/qtquickcontrols2-5.8:5
-	>=dev-qt/qtsvg-5.8:5
-	>=dev-qt/qtwebengine-5.8:5
-	mpv? ( media-video/mpv[libmpv] )
-	qtav? ( media-libs/qtav )
-	qtmedia? ( >=dev-qt/qtmultimedia-5.8:5 )"
-RDEPEND="${DEPEND}
-	!mpv? ( media-plugins/gst-plugins-hls )"
-
-REQUIRED_USE="^^ ( mpv qtav qtmedia )"
-
-src_configure() {
-	local PLAYER
-	if use mpv; then
-		PLAYER=mpv
-	elif use qtav; then
-		PLAYER=qtav
-	else
-		PLAYER=multimedia
-	fi
-	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
-}
-
-src_install() {
-	dobin ${PN}
-	domenu distfiles/*.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins distfiles/${PN}.svg
-}
diff --git a/media-video/orion/orion-1.6.6.ebuild b/media-video/orion/orion-1.6.6.ebuild
index 7fe4e32bd5c9..740953442c02 100644
--- a/media-video/orion/orion-1.6.6.ebuild
+++ b/media-video/orion/orion-1.6.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop qmake-utils xdg-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Cross-platform Twitch client"
 HOMEPAGE="https://alamminsalo.github.io/orion/"
@@ -50,11 +50,3 @@ src_install() {
 	insinto /usr/share/icons/hicolor/scalable/apps
 	doins distfiles/${PN}.svg
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest
index 9487a978c505..c23214137aaf 100644
--- a/media-video/peek/Manifest
+++ b/media-video/peek/Manifest
@@ -1,6 +1,6 @@
 AUX peek-1.4.0-meson.patch 1921 BLAKE2B a96de5120e454290215049023a857b71f32082060aebc007b41c3d310eef46462282b4ee1340e827861080e66cf1c0c6ea17af6b44c63c59c18405f3b7bbf146 SHA512 914d4166345b6e180733a01578564f9351da83aa82d958c4243d08edff4d682a6aec92b6ebb7256224cb17cc23e3146f97e144935a629b937a651805dac53241
 DIST peek-1.3.1.tar.gz 2654939 BLAKE2B f5d2b6c9ca1194891ff6a61c73bcfc63a6e0bbf8a282c4309bbedbd40e29e42ad78d9c37c8a3621ceb6cb2ad85bbf2364702f1db028f6282dd4f93e15d22b34c SHA512 cdf4190c555b0a40051862038c04dc7c164bf8bccf47202d0fcb74f527a8a7d5605bc2e112847e262e51a5a95c3d2b3497e4ec56834880564e8e4127869ad9df
 DIST peek-1.4.0.tar.gz 2647446 BLAKE2B 688acb01e127c31fd9d8c6713757bf01e6b4ed1211a32787f5729b6a26308599a61c4ab057a2a008d3cc388f9492a41e70c34c92e90ded0058bbb325e9f828c8 SHA512 ef1723f72d1c575493b2e9192cee6038807d37d875a797781169e5f4640635deda947362dcf2e1a9149fcfe88de532b8ea05c665b14b1befaa9aa8c982d9aa31
-EBUILD peek-1.3.1-r2.ebuild 1040 BLAKE2B d83b8352923dbb129a49077c056ac1070162ae5fb71e32ef72df6cd691871e29ff1b93c353fc9ea0e062fc17399671c1e3354128e2953132ebb2fb3205b3883b SHA512 99856cfd07363a599c7e4dcefd0e66653d9749ae5aeb70a21e08fa43a74d81a60e7f7326aacd5151a8b629a6c0efe785ba5206b6a94c6c1b1bfb3c7629cca9ca
-EBUILD peek-1.4.0.ebuild 907 BLAKE2B 465cccc3804d3804cc28d3ce7fec881b74b485638fb77e1a274607632b1e5eee5aacf352cf9a0f84e3fcbbd3719c5f5a68520b8deae22d44d5cd4ce42a14cc41 SHA512 07c7c1c98f422ad55dcf24f9183b758d488be2350e697bb53a4acab75ec569d3a25d810b47d4b333101795668492528b90bb181b37ad24e53a7efe5eecf9ad8a
+EBUILD peek-1.3.1-r2.ebuild 1067 BLAKE2B e89292c2cfb18d2e50e755bd7cce8e84b25acb6485ab06762295de303b3c3872c75029d60f08cf4c61ec018155794835983bce575870cd8899d53d873c528a12 SHA512 fae2aec74e1813624eb8467d08277e106e83d52d134ada60300d71c1e206724ef7358fd5b8654f955996e1f2fe58b0cc989d50f4127731d5f93e65f26d8a1c0d
+EBUILD peek-1.4.0.ebuild 934 BLAKE2B f293ed7cb851bcf2c64746702c4868935f84c976a7e5c83030272fe7fadd7b415e8cfe0b84c4fe9039773e3126d5dc9f292a16e5c3e98992531869ed27cb456e SHA512 9856f12f50a3bcb9ef57738b3ba5497d4ea0a1425076f17648e47569717fc876f5e460e391c5a3889e60c582bcfacb1a7e2f8709fbabec45e0f11275e6d19298
 MISC metadata.xml 442 BLAKE2B 0737081df17bd9a248ff54ed5f788f5488c5506cb23de18dd57ade4e87f328a96fc249371cf2e78b8399528b3a3759440ceade1f16d0d1bd11a62263e12b4854 SHA512 c94b68c460e7d302d1761ba0d7adb23530c862e1a64b48f0688b68678a353cc7ae54433e6517c564e457c5ee5dac3ca6325ef967d11c66ae998da2348854296a
diff --git a/media-video/peek/peek-1.3.1-r2.ebuild b/media-video/peek/peek-1.3.1-r2.ebuild
index 93add0710fae..75a4200a7855 100644
--- a/media-video/peek/peek-1.3.1-r2.ebuild
+++ b/media-video/peek/peek-1.3.1-r2.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="keybinder test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.38:2
 	media-video/ffmpeg[X,encode,vpx,xcb]
diff --git a/media-video/peek/peek-1.4.0.ebuild b/media-video/peek/peek-1.4.0.ebuild
index 7cab4b5a3799..569a57259a23 100644
--- a/media-video/peek/peek-1.4.0.ebuild
+++ b/media-video/peek/peek-1.4.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="keybinder test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.38:2
 	media-video/ffmpeg[X,encode,vpx,xcb]
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index d1cef19ed243..82d8abb0eaf8 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,10 +1,4 @@
-AUX pitivi-0.97.1-optional-tests.patch 677 BLAKE2B b0f75f33948cdacb2b73678bc580d3f7ee8ae224e008b7d92629b0a7b7e6991a98cb09696748240c7314719559baf20d2eec4a9eead09571a57dfc06302a2418 SHA512 a56b8e67410301e83a5559481ded4c50fcc81b8ba148c936623d36e59c9a8db3b6215adfb25f48e75edc821b4d8befdb023da0c15dc8b998531bc7551946c5bd
-AUX pitivi-0.98.1-optional-tests.patch 742 BLAKE2B c85f9002504f9314ae4a251d3ecbb8c2e4e70cb217e9328465015f2c3e06436d50a327c91cd5b686a2a765ceb46ec7fc0dfab998bfa96d985cf4855a4cd14919 SHA512 fce5ae7ac4fdd4c340b233529564e20da1dd965261cc2c79d3368ef83ac23931cdee6b492e59a628beaaa25362b81a604ec5bd7bb6270bdb72c15dabb83feac2
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
-DIST pitivi-0.97.1.tar.xz 5096672 BLAKE2B 010b7ef80e0b57f83fe4e7d201a2839f65e2c8b62019d4271cd0d6d49edb44a5083024abdf13e735f94d7e681a77ef45e1d876cf6e5c20e6cc1b1876da5b3a99 SHA512 be5fcf5148349f685f0ee23a82b36d90fe0b7ff6d1d8cdcaf73272b8e5c29ddfe1d6c21353eb95f2d786fe4922a93c747403e5e27141d815f5b46f846a1d95ba
-DIST pitivi-0.98.1.tar.xz 5112280 BLAKE2B 9269163a5c964a6a2b3fd094262594a38bfff4dd052ea0f3673f2ac195f197eb9b888de673e62f884137d056fba2b853d11cf7300e2f81d71c6e49402350cc40 SHA512 b6530b1b5429c4379699d7492c31ec60ddc514c94a003fe240f7e390b6349093d2f4f72abb1edb4253bd938620c73dfb361abf21915d36ff3b75332e8612bcb3
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
-EBUILD pitivi-0.97.1.ebuild 2561 BLAKE2B 93cbd94d740b8d86f650ba7ad041447f3d02093f9c1810fcdfd1bbcf36babed0c7b2ef34d4c1b184fa4c1f226c9f63222b0f684b913e065b78a50341a652d5b7 SHA512 e339a213b259220c09a932acb10916f2c4b2d98fa0f144a0e8b27cdef03bf2b08103cb9effff3ca9fe406e1ae207b7acf2dab1f3f2ee02162a812c0666548e4c
-EBUILD pitivi-0.98.1.ebuild 2282 BLAKE2B f6501afd2a01753d9d74e08f4a49cb546950a56e4628d0f743ea44b287c5eec3e05013fd502df453c82af0bedc71ec6685dec33324f6816939a96ef7ade8931d SHA512 5eb9f95c6eacfa74cfc7b7ab2eafef092cbcd0644cd0708df6d60a162f32bc15043bead287d999be89b89539bb8f6329a41828686c573bf9b79455a77b4efc4f
-EBUILD pitivi-0.999.ebuild 2338 BLAKE2B 52dbbdad2af5e945f2201c5f95ac045c3cd5774839dc89ece93dd95c5ab9a3f97ffccf8c4a737f28ea9ca78b79556d24f80a638f3a8d70465047a5598358323f SHA512 7ea0a7cd804064820266c1e8d2bfbc91b08542d3bd1d37078d96c4196d9fa46f6e7cb5493e6c98feb957358d95bfad95ad742af1edac892e2d4c3b415c240713
+EBUILD pitivi-0.999.ebuild 2365 BLAKE2B 81eb8da38e0c2632ee68056c065476b02f59104763a9d77b7ffd76dcc026f72146d37de6c32d83207015a6dfa857a91c5c170a7bde88817f3ed01d690e06a397 SHA512 d5b8a9ba87abf770f90edf146a378cb257e81f9c4f05b2cb8237fc76604249e43a10f1de92ae70136274038c150646c48df1e09ba88dc9c00a638ceb6c622f3d
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch b/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
deleted file mode 100644
index cfc86dccb1d6..000000000000
--- a/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-make tests optional
-
---- a/meson_options.txt	2016-09-19 23:35:54.944511834 +0200
-+++ b/meson_options.txt	2016-09-19 23:36:10.693485976 +0200
-@@ -1,2 +1,3 @@
- option('enable-xunit', type : 'boolean', value : false)
- option('disable-help', type : 'boolean', value : false)
-+option('enable-tests', type : 'boolean', value : false)
---- a/meson.build	2016-09-19 23:35:06.694590798 +0200
-+++ b/meson.build	2016-09-19 23:35:45.092527990 +0200
-@@ -57,7 +57,9 @@
- if not get_option('disable-help')
-     subdir('help')
- endif
--subdir('tests')
-+if get_option('enable-tests')
-+    subdir('tests')
-+endif
- 
- archiver = find_program('git-archive-all', required : false)
- if archiver.found()
diff --git a/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch b/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch
deleted file mode 100644
index e5f55ffe765f..000000000000
--- a/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Make tests optional
-
---- a/meson_options.txt	2016-09-19 23:35:54.944511834 +0200
-+++ b/meson_options.txt	2016-09-19 23:36:10.693485976 +0200
-@@ -1,2 +1,3 @@
- option('enable-xunit', type : 'boolean', value : false)
- option('disable-help', type : 'boolean', value : false)
-+option('enable-tests', type : 'boolean', value : false)
---- a/meson.build	2017-09-03 22:52:39.681974053 +0200
-+++ b/meson.build	2017-09-03 22:53:29.934556188 +0200
-@@ -71,8 +71,10 @@
- if not get_option('disable-help')
-     subdir('help')
- endif
--subdir('tests')
--subdir('tests/validate-tests')
-+if get_option('enable-tests')
-+  subdir('tests')
-+  subdir('tests/validate-tests')
-+endif
- 
- archiver = find_program('git-archive-all', required : false)
- if archiver.found()
diff --git a/media-video/pitivi/pitivi-0.97.1.ebuild b/media-video/pitivi/pitivi-0.97.1.ebuild
deleted file mode 100644
index 087bc0875c1d..000000000000
--- a/media-video/pitivi/pitivi-0.97.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="v4l test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# XXX: recommends gst-plugins-libav and frei0r-plugins
-
-# Do not forget to check pitivi/check.py for dependencies!!!
-# pycanberra, gnome-desktop, libav, libnotify and liwnck are optional
-GST_VER="1.8.2"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
-	>=x11-libs/cairo-1.10
-
-	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
-	>=media-plugins/gst-transcoder-1.8.2-r1
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.30.0:2
-
-	>=dev-libs/gobject-introspection-1.34:=
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pycanberra[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-
-	gnome-base/librsvg:=
-	gnome-base/gnome-desktop:3=[introspection]
-
-	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
-	>=media-libs/gst-plugins-good-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
-
-	x11-libs/libnotify[introspection]
-	x11-libs/libwnck:3[introspection]
-	>=x11-libs/gtk+-3.20.0:3[introspection]
-
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5
-	>=dev-util/meson-0.28.0
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	# Make tests optional, bug #594096
-	"${FILESDIR}"/${P}-optional-tests.patch
-)
-
-src_configure() {
-	# Not a normal configure
-	# --buildtype=plain needed for honoring CFLAGS/CXXFLAGS and not
-	# defaulting to debug
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--buildtype=plain \
-		--libdir="$(get_libdir)" \
-		-Denable-tests=$(usex test true false) \
-		|| die
-}
-
-src_compile() {
-	# We cannot use 'make' as it won't allow us to build verbosely
-	cd mesonbuild && ninja -v
-}
-
-src_test() {
-	export PITIVI_TOP_LEVEL_DIR="${S}"
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/media-video/pitivi/pitivi-0.98.1.ebuild b/media-video/pitivi/pitivi-0.98.1.ebuild
deleted file mode 100644
index 928c451ff8bd..000000000000
--- a/media-video/pitivi/pitivi-0.98.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome.org meson python-single-r1 virtualx
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="v4l test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# XXX: recommends gst-plugins-libav and frei0r-plugins
-
-# Do not forget to check pitivi/check.py for dependencies!!!
-# pycanberra, libav, libnotify and liwnck are optional
-GST_VER="1.10.2"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
-	>=x11-libs/cairo-1.10
-
-	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
-	>=media-plugins/gst-transcoder-1.8.2-r1
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.30.0:2
-
-	>=dev-libs/gobject-introspection-1.34:=
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pycanberra[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-
-	gnome-base/librsvg:=
-
-	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
-	>=media-libs/gst-plugins-good-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
-
-	x11-libs/libnotify[introspection]
-	x11-libs/libwnck:3[introspection]
-	>=x11-libs/gtk+-3.20.0:3[introspection]
-
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-python/nose2[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	# Make tests optional, bug #594096
-	"${FILESDIR}"/${P}-optional-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Denable-tests=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_test() {
-	export PITIVI_TOP_LEVEL_DIR="${S}"
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/media-video/pitivi/pitivi-0.999.ebuild b/media-video/pitivi/pitivi-0.999.ebuild
index 0f1661aa8e0b..c7703da70ced 100644
--- a/media-video/pitivi/pitivi-0.999.ebuild
+++ b/media-video/pitivi/pitivi-0.999.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 IUSE="v4l test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # XXX: recommends gst-plugins-libav and frei0r-plugins
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
new file mode 100644
index 000000000000..4fa5a330b003
--- /dev/null
+++ b/media-video/rav1e/Manifest
@@ -0,0 +1,2 @@
+EBUILD rav1e-9999.ebuild 686 BLAKE2B dc4e33c45ab8796ddd6c46e82e694e591e2b5c1c0533da1ea25fc9c108b5c3d846db4251812d7b82593a8db2c65425fa56a256b6ecad0b21b67ced2a82a92ce1 SHA512 b946f5d1d4eafba8725a5e180ba8fb730b1141dce771fd4707927b1e39e652cf3d104549d57648149f363a951bf7e6d9f3af474ff21cdbbc8cdf9a0502f8a2f5
+MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/media-video/rav1e/metadata.xml b/media-video/rav1e/metadata.xml
new file mode 100644
index 000000000000..71e948fffb95
--- /dev/null
+++ b/media-video/rav1e/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lu_zero@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-video/rav1e/rav1e-9999.ebuild b/media-video/rav1e/rav1e-9999.ebuild
new file mode 100644
index 000000000000..0136a727b3a0
--- /dev/null
+++ b/media-video/rav1e/rav1e-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.2.0
+
+EAPI=7
+
+inherit cargo
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="The fastest and safest AV1 encoder"
+HOMEPAGE="https://github.com/xiph/rav1e/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+RESTRICT="mirror"
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS=""
+IUSE=""
+
+ASM_DEP=">=dev-lang/nasm-2.14"
+DEPEND="amd64? ( ${ASM_DEP} )"
+RDEPEND=""
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	fi
+}
+
+src_install() {
+	cargo_src_install --path .
+}
diff --git a/media-video/setpwc/Manifest b/media-video/setpwc/Manifest
index 2aaeaaa82129..46cfd753d7c9 100644
--- a/media-video/setpwc/Manifest
+++ b/media-video/setpwc/Manifest
@@ -1,3 +1,4 @@
+AUX setpwc-1.3-fix-build-system.patch 431 BLAKE2B 153d96caff02c439ba345ae9fe8c1a9b6aec42d2deeb42759c70f2060c9570fbc7d5b6d6de18899aaadc24c2529191dcd92396c2a6648b0710afc4836731f7aa SHA512 469971a15dfbf6caba99f9706c0b1aadaecd1752393915b7d01cd6607dcae63b2b51153918e21481b1be8507232bdae97d43db986e7a04bcefdd50b335418aeb
 DIST setpwc-1.3.tgz 9681 BLAKE2B 98ad99fa60eab41626320b9d1c70d994ac71084a16181f255dc79ae5741471952cbd8219ded173ba6f12f82f4ebd46c79e1414f03d43b913fdad576efea5a825 SHA512 17766dcd05003f30183b87dc37a105c26efcc387e77479259ebdbb565011533ca97909ea3b61d979578616b1269db53ffa74475b8b91a6e250cfedb161f535b5
-EBUILD setpwc-1.3.ebuild 614 BLAKE2B db6e2364f1e34bb48b776c24074c977959174184c7ce25cf35e90ead0df75abdad85ae13472d32d051647c75786d7f846c5aa3f9cbc9ce76917ff495f2040c3e SHA512 883102b11d7d0711bbe5bbb8bda4fb4a7bfb2a427dd06b7daed13b44172b764643af4f77a4e19b02d22a42b02ccfb0da965da0259308824683bb3bd32750e19f
+EBUILD setpwc-1.3.ebuild 557 BLAKE2B 642d49c1ad21cebccbb2ac6233691f849cf2687dc12eedfdae2a5fac2d921c825142a8a3a059d00df902909f873d225839bea5a7115734f93d44b15978a9fc65 SHA512 969cc64dc577293e990c630b8f6774aa3a3aa9c3e07bfa9979816e5c1d0cdf803cec914ae495076d022f17d8c257432d38776716253b527371c71e6ae52c403a
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/setpwc/files/setpwc-1.3-fix-build-system.patch b/media-video/setpwc/files/setpwc-1.3-fix-build-system.patch
new file mode 100644
index 000000000000..88152cf63669
--- /dev/null
+++ b/media-video/setpwc/files/setpwc-1.3-fix-build-system.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,18 +13,13 @@
+ # files in the program, then also delete it here.
+ 
+ VERSION=1.3
+-CFLAGS+=-Wall -O2 -DVERSION=\"$(VERSION)\"
+-LDFLAGS=
++CFLAGS+=-Wall
++CPPFLAGS+=-DVERSION=\"$(VERSION)\"
+ 
+ OBJS=setpwc.o
+ 
+ all: setpwc
+ 
+-setpwc: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o setpwc
+-	#
+-	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
+-
+ install: setpwc
+ 	cp setpwc /usr/bin
+ 
diff --git a/media-video/setpwc/setpwc-1.3.ebuild b/media-video/setpwc/setpwc-1.3.ebuild
index 562a6b7419a6..cbc20cad7175 100644
--- a/media-video/setpwc/setpwc-1.3.ebuild
+++ b/media-video/setpwc/setpwc-1.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Control various aspects of Philips (and compatible) webcams"
@@ -11,18 +12,13 @@ SRC_URI="http://www.vanheusden.com/setpwc/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
 
-RDEPEND=""
 DEPEND="sys-kernel/linux-headers"
 
-src_prepare() {
-	sed -i -e '/CFLAGS/s: -O2::' Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/media-video/shrip/Manifest b/media-video/shrip/Manifest
index 4f4017e7f5db..1851a214c6f1 100644
--- a/media-video/shrip/Manifest
+++ b/media-video/shrip/Manifest
@@ -1,3 +1,3 @@
 DIST shrip-0.6.0.tar.gz 337393 BLAKE2B fa80ea35345f2ae98e8924c577efce9dee12cb99bfbcfdfef8cc2e4efdfbb72b5afe9c907a32c1cb23878266f9dd6fcad2d3e85d189d58d2d8cf074028dd218f SHA512 fbc00fd3f436d7ff4adac29d552393bef9523817866cdfb3f3c2d8073dcf38914e6b5b5566fbf655f0716f2bb89b76e2329109b822280702d0e38cb6a1470645
-EBUILD shrip-0.6.0-r1.ebuild 802 BLAKE2B 810d16e74fe89f66647bba07388bc0dd0fd40eb744764b3dfc8c88b3ff7bc6e98922c185b5ce944362792c5f2731e5c186ad6d18b2f385562539e0a5f496a951 SHA512 0adf01f13c4ee190e304b64a31420793da73761b3a09c31ddc08d6ac2b583f1476ee6674188df938c1d506819b68196e7209e811c08a5f32a8e03c81527606d4
+EBUILD shrip-0.6.0-r1.ebuild 788 BLAKE2B 253c1b208b18a720fcf5ad4fb1315011bf156cf1bcde2cb9aade4df613cea1c28f96c7ecd18d8666b7cd374db4a2053c059f74c503a946061c5244b02c580261 SHA512 4bd389c39de906e7b946e88546d00c7bf673d025938d3f33b8ee64ba40f5dcd9ca923b1a16c46926c8b175a0d5e285534635cca4c742313a6b3c02c458f1aeb6
 MISC metadata.xml 335 BLAKE2B 74046d6f562d06328006dc255c51bc323fa6c3fcf89b5567a180cd81fd9b00b5399106fda33d90755fbe10fac3e309db15af32c16fc6a798d01465a58e30f992 SHA512 c27b43dadd7995ca90de6000ccee64c8a6686a8b48eee052e5691e5c8e37bfe7be9fb6dd62d74c8ad94c4546dc550150727463380e935eecb460d724d6e76c13
diff --git a/media-video/shrip/shrip-0.6.0-r1.ebuild b/media-video/shrip/shrip-0.6.0-r1.ebuild
index c39bbd4530d9..cfc6ffb404a2 100644
--- a/media-video/shrip/shrip-0.6.0-r1.ebuild
+++ b/media-video/shrip/shrip-0.6.0-r1.ebuild
@@ -33,9 +33,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README TODO
 
 	insinto /etc
-	doins shrip.conf || die
+	doins shrip.conf
 }
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index 2a03ae14dcd9..cc100a3ff3b7 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -3,5 +3,5 @@ DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3
 DIST subliminal-2.0.5-r2.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
 EBUILD subliminal-2.0.5-r2.ebuild 2387 BLAKE2B 3166277c1cd80023b54103b8ba9cbf2075e16874f8834c973395403b0da0dd42b3ca015dfd192bfcc14822b3eae7244f50688203e3d97c20b757aba51ae0443f SHA512 66e0facc888f2c58351accd0ca1a792278027dc71327307989ba00afca932270b938477acc133ff7c323a928f051b6bd9010661af99f44ce21ecfd9f4b1c08ef
 EBUILD subliminal-2.0.5-r3.ebuild 2475 BLAKE2B d708951ee24309e97054423de7e2b7061b22f4e33f8ffc9838f2615c64e506221dca712c6d7b5ef25314e2397a357d4fd2e4e5767482dce36299e15742601426 SHA512 fc99a04ea7c6d697e6bc8e77f7f2bf42cd7e5ac8a71dcb984b4ce4496959bef2d6b52f67ba74f54b756d16f69cbcf2ae6a363ecdb7f915670f1f7342bb60f105
-EBUILD subliminal-9999.ebuild 2238 BLAKE2B 5375536b8ea031dba6e0c54edf737f8ba25a8a8caa3fc3b7958181cb36aec20e636b93171f01430528eaf661d25b83e36850646caa211c81b217a27c575d1fc4 SHA512 0279f0d36bbc32f4aaf650f5debb39a03c6044a88eaa494e5e6357d67c01634b4876c90182d1bce6459bac767393060f7ddda2446bb589dffc4f1a5abd267fba
+EBUILD subliminal-9999.ebuild 2265 BLAKE2B 05d67974a86f14dd1e1f06a6f538b7a1bc8502807f5bf416927d2af7654d4c4e0ab424697c9a5e1f2848cb7479f23de848917fe827cff6484107f7854a9e4e14 SHA512 6a42eba33e91b887161c6a1388616181c1d8d18128a138cc616662748c5cbaf5e4bbdeca27ee388a5197b821937af0fca68b4f57df9d635f83f3de9756d8f00b
 MISC metadata.xml 350 BLAKE2B 64054ae243f37db216c26428801347c2ef0b61b4f557b01e1e84213ca4d405e0ef44d2a121c97a507cb155c053e190c7b875e7e9e325ecd1d4ee6006fdf8f975 SHA512 573c536a3e3d2859085a60fdeb224475bc457b07c6b3d0ff4554bb7e8f49a7839d1f44489fd10261b404c33e2f6729a25ac8ea09701287c13f968ef2cff0aaad
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 7c83f3864f02..730716b31468 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -18,6 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index 33b01a0931ce..a98ec0d687f7 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,4 +1,4 @@
 AUX subtitleeditor-0.52.1-disable-nls-fix.patch 1080 BLAKE2B fe400d4c2a16508e2889539ca963839f1118b1df916c9cb6c3b2e8d575aa40fa61e32eeb2612406c51ef5f3d56296a42b0980919a14e1f0290ccea3cf4821c94 SHA512 7775e9527a5e1b7f2a469eb3ea5f3d5422797c4ca61f02b486578f60e5a118ab1d6479079cae35ed29324a1579ed3363ed77b18ceda1dad5b10f8def1a11b650
 DIST subtitleeditor-0.54.0.tar.gz 1783077 BLAKE2B a802124c9b81ad5fecc4914b6231e7efaf3326f231115f334fd53b79d8a851bf2f09fdccdee85c53b0cc828fe67c72e9924f47f0881d0438e563b18b1f77f00b SHA512 4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c
 EBUILD subtitleeditor-0.54.0.ebuild 1371 BLAKE2B db6a872622bf126d0d3e7894561bdc3a0be2c97eec5ca32afdbd10e67971edef65452c83c13d774af2ccdcd5e95f30882022fc93df503bfe519ab6fbdf416005 SHA512 8238be6c2963e65434f4300c8b24d2b4a027729a834a136e6ce60a349aea441fc0f9fb98dda319842682007ebaa4b51d4ebea2180c856e525139eecdb0d98a07
-MISC metadata.xml 673 BLAKE2B 8d00e3205d631fa9386d61fc18badd45c3b93f38ec2458e1ab436e45b1b9c773d3b509e243fee9ae84b481a8d9210aad74801b0fe339c081e17d66a2ebc5b426 SHA512 8f1eedec13ae0cbce853aa0172c214c9f3a3b9515a029297db8a2c68013b375bb9c3a5cbe3dc2bec09c9a4cb40f836b610d1533d7b59a2b31175c57de401d4e9
+MISC metadata.xml 565 BLAKE2B bf0285d43aa1d7ac69416d5e6605028f2b7121cf5c195098478f43b4d53d774630b6fe79916ebf46abd041723d97b73ae56116b0a900ad09b8a04035bc2d5f6e SHA512 a40edd48ebb9eacf5b6e731d5ccb838e4918e4e76c982039435de28e1e3a769ab43c109b08ece9c9821fd5ad0dd9da6bb7a0a1068d240ff5536b073f27bb2a88
diff --git a/media-video/subtitleeditor/metadata.xml b/media-video/subtitleeditor/metadata.xml
index 51a0e86f0f0e..f3214d3e2e00 100644
--- a/media-video/subtitleeditor/metadata.xml
+++ b/media-video/subtitleeditor/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>eva@gentoo.org</email>
-	<name>Gilles Dartiguelongue</name>
-</maintainer>
 <maintainer type="project">
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
diff --git a/media-video/subtitler-yuv/Manifest b/media-video/subtitler-yuv/Manifest
index 18fc7e037a61..4053a68f11ba 100644
--- a/media-video/subtitler-yuv/Manifest
+++ b/media-video/subtitler-yuv/Manifest
@@ -1,3 +1,4 @@
+AUX subtitler-yuv-0.6.5-fix-build-system.patch 908 BLAKE2B c0c9e62378c409d29fc14ed3480d23c7d01f441499ea2ecfbd4c75f97c7fa9d794f1f2ac654d855f80268a4d0c9801f2250ae79523f1c64fd61520f691ac4c30 SHA512 f7166cbac4d70e915e39ba00fa6d74a9cc8b71edcbb64d90fbbf505afffb107fec5d87a8421944aaac76103ae106a091bc593443f22e1f8de0688d95ef453f0d
 DIST subtitler-yuv-0.6.5.tgz 568408 BLAKE2B 0e4ff441fbb75bafaf45b3bf3b234336e04dce90400fd1bfc65c2441c9406dca2ba6137c5e04e5b8e6140d1b55c6166f797a865ac88ea9e09cc58368ee9b0c24 SHA512 2dabb720896ef0c1bd54a7b8fdf4ab7097d95ba9e81608b713f4dd62c0f8a156d41bb7fe74cb5113f70f5390186fdea3e7d2e9add5d5748b677657ef356117dc
-EBUILD subtitler-yuv-0.6.5.ebuild 828 BLAKE2B 2f23654f8df7bc3050cf346e24e040a9f55c6f8ff3eaa4ed6d8ceda6471822de6e538761a353485a81e00f39feb937438a5aa44d66514cd73cee6276ead8a17f SHA512 4821e3e58a397cecbd6e26ae6987b5186c79c7e9b4671a52857b81e5a00886fb7c0d91820ac235345b6acb8f3f7f796b803138b47c477afe2f1b94578dc2ffd7
+EBUILD subtitler-yuv-0.6.5.ebuild 665 BLAKE2B a1258fcd0dbc73f3eb7ad8da29fbb01b378ef0748c848ecb1216f093a9def690052c267603a2e555ae69c7307f3b73081c23181b794ccd53a59c3d823f43105e SHA512 b8f1f74491fa39c7c8fa45618b55bd2615a253a1d6edb97ec6eb1ea6f3dbf60642f3fc6417f9cb664aacb8a615fe2923b7fcc8b10935a84d6c5b4eb3098d8ec1
 MISC metadata.xml 334 BLAKE2B da68c733a593f81e7a8096a93827aa43bccee5f9470fccdf66ffdc76a5bb29a9bbeaa163180559714d4c7dca2c7cdd69cd50054d36a79b725100fdaaf093df43 SHA512 ea6800418e6612cab28cc5d0fb977d8227deaef467662b6c8619b974062c47b0658ff1e621b8fb85309c0f87f04afe3903053af1c21c629018a27eeec7f6c8de
diff --git a/media-video/subtitler-yuv/files/subtitler-yuv-0.6.5-fix-build-system.patch b/media-video/subtitler-yuv/files/subtitler-yuv-0.6.5-fix-build-system.patch
new file mode 100644
index 000000000000..da5ec86e40b3
--- /dev/null
+++ b/media-video/subtitler-yuv/files/subtitler-yuv-0.6.5-fix-build-system.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,28 +1,7 @@
+ #need -O2 for io in beep.c
+-CFLAGS = -O2 -Wall
+-
+-#CC = gcc
+-#CC=/usr/local/bin/gcc
+-
+-SRC1 = \
+-subtitler-yuv.c \
+-color_processor.c \
+-frame_list.c \
+-load_font.c \
+-load_pictures.c \
+-load_ppml_file.c \
+-object_list.c \
+-parser.c \
+-text_processing.c \
+-external_programs.c \
+-x11.c
+-
+-SRC2 = \
+-process_wave.c
+-
++CFLAGS += -Wall
+ 
+ OBJECT1 = \
+-subtitler-yuv.o \
+ color_processor.o \
+ frame_list.o \
+ load_font.o \
+@@ -34,20 +13,11 @@
+ external_programs.o \
+ x11.o
+ 
+-OBJECT2 = \
+-process_wave.o
+-
+-LIBRARY1 = -lm -lXt -lXpm -lXaw
+-LIBRARY2 =
++LDLIBS = -lm -lXt -lX11 -lXaw
+ 
+ #$(XLIB) $(XAWLIB) $(XTOOLLIB) $(XLIB)
+ 
+-all:
+-	gcc $(CFLAGS) -c $(SRC1)
+-	gcc $(CFLAGS) -c $(SRC2)
+-
+-	gcc -o subtitler-yuv  -L/usr/X11R6/lib/ $(OBJECT1) $(LIBRARY1)
+-	gcc -o process_wave  -L/usr/X11R6/lib/ $(OBJECT2) $(LIBRARY2)
++subtitler-yuv: $(OBJECT1)
+ 
+ # DEPENDENCIES
+ 
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
index d1e7738874fe..37e21cbb86a2 100644
--- a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
@@ -1,41 +1,35 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="for mjpegtools for adding subtitles, pictures, and effects embedded in the picture"
+DESCRIPTION="for mjpegtools for adding subtitles, pictures & effects embedded in the picture"
 HOMEPAGE="http://panteltje.com/panteltje/subtitles/"
 SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/s:= -O2:+=:' \
-		-e '/CFLAGS/s:gcc:$(CC):' \
-		-e 's:gcc -o:$(CC) $(LDFLAGS) -o:' \
-		-e 's:-L/usr/X11R6/lib/::' \
-		-e 's:-lXpm:-lX11:' \
-		Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake
 }
 
 src_install() {
 	dobin ${PN}
-	dodoc CHANGES HOWTO_USE_THIS README*
+	einstalldocs
+	dodoc HOWTO_USE_THIS
+
 	insinto /usr/share/${PN}
 	doins *.{ppm,ppml,zip}
 }
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 933a1bf5bfb2..2d272fa6d211 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -4,6 +4,6 @@ AUX 3.30.0-vala-errormsg.patch 820 BLAKE2B 6b896371078f59b5e46efb28ccca56ef710cb
 AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742
 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
-EBUILD totem-3.30.0.ebuild 3732 BLAKE2B e1bc6349ed5ba2ba55d498cf27d7d981e2ffed32201e369b1d574a82bd720b19db9bb7c2b52ae80d1d80da7c0b6e8adea9ebae193fd6a611d8731b9562fe0608 SHA512 72a4d6f9f8323d5c7d53d0ff1d228c691b3286e5c634dc825ecc8f0a17cfcfba071d283ab88e0889ae9b003c5372b988cb31dc6e6a9dcb3cfdd4ae9472644ac7
-EBUILD totem-3.32.1-r1.ebuild 3100 BLAKE2B 347a0de828a02b11d1e9e9df85630ca5983ae9bfb7d844d6116641933e049405087436dd54ff8059ce95c82487a784fd4b8fe066266d2b48c2fa4d72475633de SHA512 1a1c03f956ef210824c6078b9c52619ce54d906d8a4d2f585a0bc592f86a89a7fc6dd2145ee8c95138432c7cfcc7dd7338298263237c8ed74f9994635b8b2941
+EBUILD totem-3.30.0.ebuild 3759 BLAKE2B 0889c571bb3129c65529e99fed4d8366b46751a0e815ad26d71e6f4ed3c272140c1c9ecded6a7f5fc881353d17de10722c56975413b2c05098686fea04fdb2e3 SHA512 9e1e598f00e5a33c0a51d5246f9a6dc38e4a47a8239021546c1bff0049970a5cf5e3c2ec9bf59cc217b9f13630ad40694b749fb84339b6cbbf58495e318bf59c
+EBUILD totem-3.32.1-r1.ebuild 3103 BLAKE2B 200bd4012fa7d3563aad00a3907860b9fcc2427f075c4750f6e37553d550919c267587bb422b58ca955fbcb04650e12064e3dbe250caa2629c8f40ba61599b0a SHA512 5d1ce68941374b0f3de8a531dc05b3334a4d0c47b6d356316886b74f9bd0d9721c429a280fb473505218200f9f4ff9966c2fd9de53578fbf193eee07e62fa179
 MISC metadata.xml 1323 BLAKE2B 50a31cc1ea80714ce43b7434888c275acfea44b2231c500b20422ead6f248b3ccb0765909df4dd2c74c05aee333e294c599982037f91364efe77b1dad639c63e SHA512 95686fb2c0a601026587bc759548bc7b3798f7ed1347d34d2deb42a35ed5f424da7412ccb4b6d6fb50ca078855c32f1eb0485ffa4eec919baad7e19b899058be
diff --git a/media-video/totem/totem-3.30.0.ebuild b/media-video/totem/totem-3.30.0.ebuild
index ee7f1d4b1587..9506455784d7 100644
--- a/media-video/totem/totem-3.30.0.ebuild
+++ b/media-video/totem/totem-3.30.0.ebuild
@@ -13,6 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="cdr gtk-doc +introspection lirc nautilus +python test vala"
+RESTRICT="!test? ( test )"
 # see bug #359379
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
diff --git a/media-video/totem/totem-3.32.1-r1.ebuild b/media-video/totem/totem-3.32.1-r1.ebuild
index 492a875756ba..e3a3030b0181 100644
--- a/media-video/totem/totem-3.32.1-r1.ebuild
+++ b/media-video/totem/totem-3.32.1-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6} )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
 
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 4e933c0d7b5f..8a047a817bd5 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,15 +1,11 @@
 AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774a5fd4d5ba103dae957c038d5227e5a300c4ef0db4d418717776ee82e35676dc7e6d0dcdfdaf4195284c803c3e SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d
-AUX vdr-2.0.6_gentoo.patch 2255 BLAKE2B 36b8f013e363990f831d7d5216eeefe79caba9dbba531e1ec5452dc2c8ec49c7047be236b30fbf299f5167e86f5ed59775e59e9aca9babde5bbfc4bd751bf502 SHA512 7bb087d2f362e28700a6f22b2649bd61742a7967344f0132abaaa2ae30d4aef3e9a7afd06d80d2a4a97248abfa273cb5d7e20e419c8409a5a83744fd043fb7e9
 AUX vdr-2.2.0-jpeg-9c.patch 811 BLAKE2B fcfef4fca2e2e412f5f4fda858c98978abca85198cf0b88808059d52e9ef260b66b3bc64c1c6eb6498c11923f6d51ea3b29e4b650d1426dc8457a293db025a5a SHA512 91a90e04fa6790a5efa58c1f55b427f8c4fae9266a7998857508d7c9470ab0b7513de49cf2be28e35dc361fbedb492d092ed6cabf7dce1551646a48e8aa4a544
 AUX vdr-2.2.0_gcc7extpng.patch 705 BLAKE2B da34652e596d39c3a8c210a6034c2c2aba6649f9cd5e194f00a0ed21f3d2b67de68c560a4e6d2e927a262152a1998c5c279e4451248a918a757adc543a4eab03 SHA512 1f319f71c3819d82e83f68979f2876d7169d086c161939c105cd15d2107e68cbc95cda09e7e883a74e6c95c7db5b0dc58eb92662833732c180250322413ac85b
 AUX vdr-2.2.0_gentoo.patch 2395 BLAKE2B 72f238b09ae26f915b9de53c357815a757f158da3b47ec009a5126f38bcfe5adec8657f9ca69dced3202c12f0751e88ce1fec0231feeb9b4e8e019556df3b61b SHA512 64c299db8e2fa0545ba9379330ecc365ec0dda9991ef5e85af3fd3a842bdef196aa811b083b50edca5db757e437e181248b5825e32dd463bd916167b4ddda5c7
 AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a
 AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45
-DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57 SHA512 f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
-DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842 SHA512 070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-EBUILD vdr-2.0.6-r1.ebuild 6921 BLAKE2B bb5925105f29a4ac9d303459adc3742f3b817a352bb575271c20ce5565a3edb980bd89306ee978cfa398c38be4ae8f75cdf253b1fe6526f7384488cd1a917ab9 SHA512 10997c095cb8af5f0ffa00e07247a790cb038f42a9705a4e6b2e5ca715431dd51749dc5faf9beadf899a4170d9e01de92ff61cf1cdf6e21fe87e6dd60afab07b
-EBUILD vdr-2.2.0-r3.ebuild 7640 BLAKE2B 6ce00d92f5acbace24c681f3880f8a329bdc69c5ea24f9d72bbc56d2f0a321b4a1db5205f90b3165b602d44b96584b7e07a21b494a004c63f8e5dfec691fdacc SHA512 b50b96b575b82f89771e6c29220419466723e30e7a5e8cc6cfc729f4058285c23930c1703e678086eadd1660b720ca06089d38ba4777d6e22ae8e53a88b0490c
-EBUILD vdr-2.2.0-r4.ebuild 8102 BLAKE2B 91f99ea7f1b62d207b89b3662dfc7a7cbe4feade9f15468468563550890fef21dc0751484f14c12c5232daeba13d047a29004b73e6014030e72dc1a9df109dae SHA512 3e02b8a0bf4b89360ca79f7389e01157451f58399ebc2714fbc950cb10be26b079aef8119a87cc43524966e24b205fe88d349456ffef5739370802843cce0286
-MISC metadata.xml 2370 BLAKE2B 83f3c1ca39413cba205d9d779f09c314d8ae1c661fb2c7b5e67133bfbd52d2ed58b7f9636824f7f9c42cb9222006c45228645951f838c202e9ee89e9d977d7e2 SHA512 89a56bbefbcf45c38f4bc069d1dc30e7db9c10262db555a61804cf68018a0f0a8106534453780ceaea398ad3fb25285d88baba56460e2de9682376dc4ef52985
+EBUILD vdr-2.2.0-r4.ebuild 8100 BLAKE2B 108a7185466fb38efe0f2644e493b7e874dced3963825a4cf78a96e8afaa7b3aabae17ef10f45e5c3f972a18e921520b772f502f3bccd83362695a61fd6d6aef SHA512 c56c79a147230f0e4dc33c2f5722f35ba97803e7388c41bb498495c3cb644a65b65957269a482218317856d536a14b47ffb7e08aca269fe945168039c238e89a
+EBUILD vdr-2.2.0-r5.ebuild 8111 BLAKE2B 8422450ce89242b7a434a3e413c2a211b417c6eda7b415952dd59774c81b38c8e2b7c348a44d1911b97e159d357c38ceff15c5a5f50d141c0b6d3b8d66b8a655 SHA512 ede37811fa9be88ab1e7732a6dc9949d0258ab62b30205d16e98e3a9d721a45752e5582dbd3d531fd6547473d64b8ccb0a35000ce1d783d2915d38042c459993
+MISC metadata.xml 1665 BLAKE2B a94302446f9bdda540fa5e03f61670325c6a23702dc38f67e876025d60f421d1a54f532c33d02e6938de0d756e91810ca1259f9a8b06ceb425e33dcd3babcc1d SHA512 9482d1a2528354978c7c013816c2672959b109794b8c2a020604ef1e9df28f893a4c1e01ac34b707b7e8f60bad93f44be770daeea4b6f2950a7fb2d276de3223
diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
deleted file mode 100644
index 1641fc8e2ee6..000000000000
--- a/media-video/vdr/files/vdr-2.0.6_gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
---- vdr-2.0.6.orig/Makefile	2014-09-22 22:17:23.000000000 +0200
-+++ vdr-2.0.6/Makefile	2014-09-24 15:22:43.000000000 +0200
-@@ -109,7 +109,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -162,7 +162,7 @@
- 
- PODIR     = po
- LOCALEDIR = locale
--I18Npo    = $(wildcard $(PODIR)/*.po)
-+I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -185,7 +185,7 @@
- 
- install-i18n: i18n
- 	@mkdir -p $(DESTDIR)$(LOCDIR)
--	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -247,7 +247,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -259,11 +259,12 @@
- 
- install-dirs:
- 	@mkdir -p $(DESTDIR)$(VIDEODIR)
--	@mkdir -p $(DESTDIR)$(CONFDIR)
--	@mkdir -p $(DESTDIR)$(CACHEDIR)
-+#	@mkdir -p $(DESTDIR)$(CONFDIR)
-+#	@mkdir -p $(DESTDIR)$(CACHEDIR)
- 	@mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+	@mkdir -p $(DESTDIR)$(CONFDIR)
- 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -290,8 +291,11 @@
- # Includes:
- 
- install-includes: include-dir
--	@mkdir -p $(DESTDIR)$(INCDIR)
--	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+#	@mkdir -p $(DESTDIR)$(INCDIR)
-+#	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
- 
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 246bd87c2005..d0e7ffcbce82 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -16,25 +16,17 @@
 	<use>
 		<flag name="alternatechannel">Use alternate channel on record</flag>
 		<flag name="bidi">fribidi support, for languages, written from right to left</flag>
-		<flag name="ddepgentry">remove duplicate EPG entries</flag>
-		<flag name="dvlvidprefer">controls video-dir choice on recording</flag>
 		<flag name="graphtft">support for vdr-graphtft plugin up from version 0.1.7</flag>
 		<flag name="html">Install HTML documentation</flag>
-		<flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag>
-		<flag name="jumpingseconds">skip seconds in played records</flag>
 		<flag name="kbd">enable keyboard support as remote device</flag>
+		<flag name="keyboard">enable keyboard support as remote device</flag>
 		<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
 		<flag name="menuorg">Enables support for the <pkg>media-plugins/vdr-menuorg</pkg></flag>
 		<flag name="menuselection">adds support for menu hotkeys of double digits</flag>
 		<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag>
 		<flag name="permashift">permanent timeshift by recording live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
-		<flag name="permashift_v1">permanent timeshift by recording live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
 		<flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag>
 		<flag name="resumereset">rreset resume of EOF</flag>
-		<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag>
 		<flag name="ttxtsubs">support for <pkg>media-plugins/vdr-ttxtsubs</pkg></flag>
-		<flag name="vasarajanauloja">replacement for the liemikuutio patch, adds some nice must haves features</flag>
-		<flag name="wareagleicon">Replace original icon set in menu</flag>
-		<flag name="yaepg">Enables support for the vdr-yaepg plugin</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/vdr/vdr-2.0.6-r1.ebuild b/media-video/vdr/vdr-2.0.6-r1.ebuild
deleted file mode 100644
index 63de150c12f6..000000000000
--- a/media-video/vdr/vdr-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1
-	pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v6"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="amd64 ~arm ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="
-	permashift? ( !permashift_v1 )
-	permashift_v1? ( !permashift )"
-
-COMMON_DEPEND="virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.5_rc1
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	# apply maintainace-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-	# support languages, written from right to left
-	BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
-	epatch "${FILESDIR}/${PN}-2.0.6_gentoo.patch"
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# we do not support these patches
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-#	# trick makefile not to create a videodir by supplying it with an existing
-#	# directory
-	emake \
-	VIDEODIR="/" \
-	DESTDIR="${D}" install || die "emake install failed"
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.2.0-r4.ebuild b/media-video/vdr/vdr-2.2.0-r4.ebuild
index 27229bab9fa3..41a6e54da799 100644
--- a/media-video/vdr/vdr-2.2.0-r4.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r4.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r5.ebuild
index dfbfd553e107..740d4182bd84 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
 				mainmenuhooks menuorg menuselection resumereset ttxtsubs"
 
 # names of the use-flags
@@ -15,8 +15,6 @@ EXT_PATCH_FLAGS_RENAMED=""
 # names ext-patch uses internally, here only used for maintainer checks
 EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
 
-IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
 MY_PV="${PV%_p*}"
 MY_P="${PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
@@ -26,34 +24,33 @@ EXT_P="extpng-${P}-gentoo-edition-v1"
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+	mirror://gentoo/${EXT_P}.patch.bz2"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
 
-COMMON_DEPEND="virtual/jpeg:*
+COMMON_DEPEND="
+	virtual/jpeg:*
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2"
-
 DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
+	>=virtual/linuxtv-dvb-headers-5.3"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	>=media-tv/gentoo-vdr-scripts-2.7
 	media-fonts/corefonts
 	bidi? ( dev-libs/fribidi )
 	systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
 
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
 CAPS="# Capabilities of the vdr-executable for use by startscript etc."
 
 pkg_setup() {
-
 	use debug && append-flags -g
 
 	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
@@ -71,12 +68,12 @@ add_cap() {
 enable_patch() {
 	local arg ARG_UPPER
 	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
+		ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
+		echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to Make.config"
 
 		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp"
+		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE || die "cannot write to defines.tmp"
 		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
 	done
 }
@@ -86,7 +83,7 @@ extensions_add_make_conf()
 	# copy all ifdef for extensions-patch to Make.config
 	sed -e '1,/need to touch the following:/d' \
 		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
+		Make.config.template >> Make.config || die "cannot write to Make.config"
 }
 
 extensions_all_defines() {
@@ -94,7 +91,7 @@ extensions_all_defines() {
 	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
 		Make.config.template \
 		| sort \
-		| tr '[:upper:]' '[:lower:]'
+		| tr '[:upper:]' '[:lower:]' || die "error in function extensions_all_defines"
 }
 
 lang_po() {
@@ -107,20 +104,20 @@ src_configure() {
 	# systemd notification support
 	export "SDNOTIFY=$(usex systemd 1 0)"
 	# with/without keyboard
-	export "USE_KBD=$(usex kbd 1 0)"
+	export "USE_KBD=$(usex keyboard 1 0)"
 }
 
 src_prepare() {
-	# apply maintainace-patches
+	# apply maintenance-patches
 	ebegin "Changing paths for gentoo"
 
-	local DVBDIR=/usr/include
+	local DVBDIR="/usr/include"
 	local i
 	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
 		[[ -d ${i} ]] || continue
 		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
 			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
+			DVBDIR="${i}"
 			break
 		fi
 	done
@@ -136,7 +133,7 @@ src_prepare() {
 		die "DVB headers too old"
 	fi
 
-	cat > Make.config <<-EOT
+	cat > Make.config <<-EOT || die "cannot write to Make.config"
 		#
 		# Generated by ebuild ${PF}
 		#
@@ -168,6 +165,7 @@ src_prepare() {
 
 		# Now apply extensions patch
 		eapply "${WORKDIR}/${EXT_P}.patch"
+		sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch] "${S}"/Make.config* || die "sed failed"
 
 		# This allows us to start even if some plugin does not exist
 		# or is not loadable.
@@ -180,10 +178,10 @@ src_prepare() {
 			# (or have them already hard enabled)
 			local IGNORE_PATCHES="pluginmissing"
 
-			extensions_all_defines > "${T}"/new.IUSE
+			extensions_all_defines > "${T}"/new.IUSE || die "cannot write to new.IUSE"
 			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
 					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
+				tr ' ' '\n' |sort > "${T}"/old.IUSE || die "cannot write to old.IUSE"
 			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
 			if [[ -z ${DIFFS} ]]; then
 				einfo "EXT_PATCH_FLAGS are up to date."
@@ -208,7 +206,7 @@ src_prepare() {
 
 		# add defined use-flags compile options to vdr.pc
 		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
+			-i Makefile || die "sed fails on Makefile"
 
 		ebegin "Make depend"
 		emake .dependencies >/dev/null
@@ -226,7 +224,7 @@ src_prepare() {
 	sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
 		-e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
 		-e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
-		-i "${S}"/Makefile
+		-i "${S}"/Makefile || die "sed fails on Makefile"
 
 	eapply_user
 
@@ -260,7 +258,7 @@ src_install() {
 	# directory
 	emake install \
 	VIDEODIR="/" \
-	DESTDIR="${D}" install
+	DESTDIR="${ED}" install
 
 	keepdir "${PLUGIN_LIBDIR}"
 
@@ -283,7 +281,7 @@ src_install() {
 		doins "${FILESDIR}"/channel_alternative.conf
 	fi
 
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
+	chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed"
 }
 
 pkg_postinst() {
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6542609e28f9..60f91e472148 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,7 +4,7 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13060 BLAKE2B 2003cd2e1625476f2857c98eb996fcd8b13539587a730591dedb345bbcc6c6181c5e9e57cce6f7d91d2fb0be3d83ec4a66799c7f8eaff5f719c4594b7286c861 SHA512 11919e27811167ba322640a83a12f3c74c58dd644a1b101ca8316f015e3aebad20fb5287da9ff619a8e382e8dccad931a0f3b879bcc7ae82ea2351d6848b9aa7
-EBUILD vlc-3.0.9999.ebuild 13065 BLAKE2B 6e43d8f3ac4b1e2f7e02e78461085c658c5e5198c7577049dcdb6af593baa1bf520f0a70dfb507f17f2700f297fb71abb508adc20bfd7a6eb55b19383e3c4663 SHA512 bfde9f5f4a76bd8fd55c6d976c2be11549c35fcc9d33186fd4b4991880e018fd16ce4c859ea86850a652ec0ac116c96e24b60131aeaa791bd09dc9c40b4d6fc9
-EBUILD vlc-9999.ebuild 13004 BLAKE2B 82df7a4bb8c9573288c3df49d7a983df7aa3d87f3087678139d5b7fbc31f4debf31ec535d703b0e2e2bb6f0d264e0cec829a4a9d629d34412a8b6a1fd5f4775b SHA512 8417d3bcf672e4bc4aac2fce628c4941b21fe50e49ba1dc4f15f4d9171201c58b5acfc5f316ea4b9b6abd491bcb4460d7207bacba44232e11776ef5dd06132c0
+EBUILD vlc-3.0.8.ebuild 13113 BLAKE2B 74c803645380d5ebdd9a38368e1ea12c6ef30999efcb53303d92e2acdd73ae92b1df473369a5adc3ea465d6c96169bdf87d60104f769ff4a6570fc34667c36ce SHA512 b82d345e198838297d5001ea80191adf694abe151b4bfa6c58d31b0b9cf2794458d341efbe5bf3e97d6a710df65eb05fb22ef79a6b084ec01699eacb6affe95f
+EBUILD vlc-3.0.9999.ebuild 13118 BLAKE2B 3c6f37e7bf28f15ba51a461270657900b11689bf42b2360cc62b13e8d16eccafb1cb02b3cf7f21fc443f9e6d7a9e24af494c5f10a509230fc56b85b9044c35c3 SHA512 ce64b488341416225f9dc3c24b7dcfb2a6e60d734e517a839c2807be10471c06dabc9841e55fb2f9a1b423798805969818d1ed21b14ff5a0c5e764c7638ce1f9
+EBUILD vlc-9999.ebuild 13057 BLAKE2B 357665845d812917c6e6833839a96aca5fb837041fa9b21d8d32293bf7185072a234c8e831cce3150a8d07edda3c25186856da200661d7731a2249d2fa55839d SHA512 6f13e5f234dc210281b411df857dcdab56806ab8613fa07857276354f1552506329379f02a38e7f98ef074ad5811740180beefb5e3d860a7b866b89c033df530
 MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 8c53749a75b0..91eb7fe2f527 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -34,10 +34,10 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
 	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
-	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
-	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
-	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -81,7 +81,7 @@ RDEPEND="
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
-	dav1d? ( media-libs/dav1d )
+	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -241,7 +241,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
-	has_version '>=net-libs/libupnp-1.8.0' && \
+	has_version 'net-libs/libupnp:1.8' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
@@ -294,6 +294,7 @@ src_configure() {
 		$(use_enable chromaprint)
 		$(use_enable chromecast)
 		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable dav1d)
@@ -345,7 +346,6 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
-		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable omxil omxil-vout)
@@ -394,7 +394,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
-		--with-kde-solid=/usr/share/solid/actions
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
@@ -446,7 +446,7 @@ src_configure() {
 	fi
 
 	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
 		myeconfargs+=(
 			--with-default-font=${dejavu}/DejaVuSans.ttf
 			--with-default-font-family=Sans
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index eff579106bd9..8fad44625193 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -34,10 +34,10 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
 	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
-	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
-	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
-	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -81,7 +81,7 @@ RDEPEND="
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
-	dav1d? ( media-libs/dav1d )
+	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -241,7 +241,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
-	has_version '>=net-libs/libupnp-1.8.0' && \
+	has_version 'net-libs/libupnp:1.8' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
@@ -294,6 +294,7 @@ src_configure() {
 		$(use_enable chromaprint)
 		$(use_enable chromecast)
 		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable dav1d)
@@ -345,7 +346,6 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
-		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable omxil omxil-vout)
@@ -394,7 +394,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
-		--with-kde-solid=/usr/share/solid/actions
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
@@ -446,7 +446,7 @@ src_configure() {
 	fi
 
 	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
 		myeconfargs+=(
 			--with-default-font=${dejavu}/DejaVuSans.ttf
 			--with-default-font-family=Sans
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 07483fd7d3a1..6f1c27b496de 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -34,10 +34,10 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms
 	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
-	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
-	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
-	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -81,7 +81,7 @@ RDEPEND="
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
-	dav1d? ( media-libs/dav1d )
+	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -244,7 +244,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
-	has_version '>=net-libs/libupnp-1.8.0' && \
+	has_version 'net-libs/libupnp:1.8' && \
 		eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
@@ -296,6 +296,7 @@ src_configure() {
 		$(use_enable chromaprint)
 		$(use_enable chromecast)
 		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable dav1d)
@@ -349,7 +350,6 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
-		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable opencv)
@@ -396,7 +396,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
-		--with-kde-solid=/usr/share/solid/actions
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
@@ -445,7 +445,7 @@ src_configure() {
 	fi
 
 	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
 		myeconfargs+=(
 			--with-default-font=${dejavu}/DejaVuSans.ttf
 			--with-default-font-family=Sans
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index 8b6e0a3aee82..5cb3f2860c84 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,5 +1,5 @@
 AUX xvattr-1.3-gtk.patch 1255 BLAKE2B 471cfe05fbeaaa405771543d5c3b8900be848642724078a583321aa997b5e8c442894e6d2f6bf4ccb0eeed283f5f059b2be741c654c9a18f888034a105eb2eff SHA512 a81015dfa6c556d99e27765e9d793d1ab745925be212c8a3c21503ac73a6d7bbae5642e7cae067544578e7a1388968a354b759e72edcde1ccb0fa704c929e138
 AUX xvattr-1.3-pod-encoding.patch 303 BLAKE2B 127fa43fe4ab6586d30d85a685d98038f226f54286147c98fc4fa738cc996c2bb802cf8fa962bb9143dfc506d64243b1d3f8af5218705b24f0f435fff85f3256 SHA512 84be4a336efa6caffbacf15f2b68ddb1d6b60cc8212593662194d7a7df5891c6d5cefcb28c25412471e5e943359e6c4f076b77f9c92d1a93e084597d39697484
 DIST xvattr-1.3.tar.gz 82263 BLAKE2B 5e12c3001640c50294693eccf4e6b04c0e034634cc25a7be9e70dcd84c6da73e87be5a092ba4e9d9e5a70469d5018ac016d9812c2099bd68d35247ac6c522730 SHA512 f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0
-EBUILD xvattr-1.3-r3.ebuild 804 BLAKE2B 2930e19dba9235e4204d625d5296f721d7962701cbc5de37c2ad6168f0fdbe230a790de5ef8f1e1c7d12fc504cc052c3d90a08864eb112f81dc47bef5212d3f5 SHA512 1e6f7388a10a4d9fe89ec892154641254daf1c0458d6a7f2df1c74488e83bb1aee957831416c739ed7094b6b1ab1e322a9d8501d32b070a44cffed3f4da13eeb
+EBUILD xvattr-1.3-r3.ebuild 773 BLAKE2B d538490b04c310400b88abdb45daa191f82ca4c45043b3c423c3ce1fb7ca5eadd85223d2515ef3d9b80da34c7762ae5908a9e99a9768928263a077f9b4eeb22f SHA512 88e81549eae790bc5141867ba7bbac2d4f0dd272181cffaf77bdd06c34b9eba3e2e839b9c3adaec42f862cb43f5478b20b3908339d9f5bfc1064c3f415617b5d
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-video/xvattr/xvattr-1.3-r3.ebuild b/media-video/xvattr/xvattr-1.3-r3.ebuild
index be3c419d34db..1a41d60604e0 100644
--- a/media-video/xvattr/xvattr-1.3-r3.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r3.ebuild
@@ -33,6 +33,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index adce2b0d8ddf..1655eb38b942 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,3 @@
 DIST yle-dl-20191022.tar.gz 84694 BLAKE2B bfeab9c5220931b8af5eae94b0f5377d21f6b6fb7b21c5f7bc5360a69e7185b8f1e052a584460187cfdd04d68295a20cb895e749af43c1de4ffd7fcd7bfc3875 SHA512 2d7c6d7f8e60cb8fd54fc04dcf73caf5022e3c65ab78f002c280950184fb2458f88f6934b62c0afaeaf30864b5cc47b1ef9c2a58d2855c5111a563cd195095be
-EBUILD yle-dl-20191022.ebuild 1750 BLAKE2B 7bf27a0871eed096c6831a2e4bd28f1dc3155038b120c645bb8f0e1ae907b1a2c541e2ac5626a82a4c5e02a114c85ff823dd714523bf3f8ab82a0a4baf9edc52 SHA512 2828cb32d0e61a1a1b517d1f5facdeb31736c170ed14981f4418b0b132138d5b454039a917f166afd4aa63f6c8510294d63818699d1fecb5d71c178b8116caf0
+EBUILD yle-dl-20191022-r1.ebuild 1747 BLAKE2B 0221a2a84a8dc3489b1ebffbb3e49b26d0cb8825f05897c152daf62af521edc5f705aba2410424b30e5c83299bfd0b23b1ba4bacfed3d77a066541f7e18e3181 SHA512 b8e1ba894da186d7c1579c3df953d177e18183ee5a237709d0de0b94141b7520bcd50ed2ede8e26cc782bc92975378558e1a018ee85abafb168137ecb5099284
 MISC metadata.xml 415 BLAKE2B 3961cdbc02847f65011c6987b811207c31c49ae40c3bea44b481f35ac04e75dabfa8ceae74f6adc816f211129efb8faaa0ba63700d95eec569b3f51cfe64bd42 SHA512 96f1afba4a47f7b5dca75ba1d5300baf9815bdcf3eda12f5b6044aea7cfc09683c76db210a0b4965626aac050016fc39f44c4e5c63597894e0ae6457dc2aeb90
diff --git a/media-video/yle-dl/yle-dl-20191022.ebuild b/media-video/yle-dl/yle-dl-20191022-r1.ebuild
index 281cc2da933d..2684deeba928 100644
--- a/media-video/yle-dl/yle-dl-20191022.ebuild
+++ b/media-video/yle-dl/yle-dl-20191022-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5..6} )
+PYTHON_COMPAT=( python2_7 python3_{5..7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="libav php test +youtube-dl"
 
@@ -23,7 +23,7 @@ RDEPEND="
 	!libav? ( media-video/ffmpeg )
 	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
 	<=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
+	~dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mini-amf[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-video
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)