gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-video
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
91 files changed, 786 insertions, 1783 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ad4fccc28915..1523adda4ca1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 60e9b6fd9091..62d0975bc592 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,6 +1,6 @@
 AUX bino.html 658 BLAKE2B 9eab6fd2e14b72928ce0c73c21a61ac26981bb23df9eaf3f89132729debc32a10fa0d703c5f3340aa758d741aa1ac733df3718e5577148609f1ae1e1e5c4e47f SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be
 DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
-EBUILD bino-1.6.6.ebuild 1469 BLAKE2B 5a37eb68909219a37374989cacde4a7f58925de73c0df6a2985c85fb90913886a409bc5a329990ee9f7c546162e57cb83af0707c3aca8aa60968aed191bb030c SHA512 e5c3a4f551e2e8ef4c94b6c2dc295bc92bcaedd5ed5dd92e51848ea0dd9ea3df5185098a5b3aaba9d3408ef6b0bca05f4216d52ee86b57fcafc5a41a0131ee39
-EBUILD bino-1.6.7.ebuild 1573 BLAKE2B 5fce8361923e30065c970f78f1cbf2c053bba6c84be45f633279373869f9dd40425e8238fc001d61421ccf4d0a3e8ced8f9845800d711fef49021555d5b700ce SHA512 2bd2c283a7983c374263e25b6f46003b3218bdbeb1bc8d26786955c10af6a41587664ccc57cce047a873c55b0412b0b5431d06059f89dcde716a674c791236a7
+EBUILD bino-1.6.6.ebuild 1533 BLAKE2B f3ef2cadffae1632078d5e63807241b37765c9c5f5071070df5753ea723c4d8c0dbbc65b8c7267984f8dd389a75b96d26c2c82f183b7abf8ba6bf0d16b95d6af SHA512 23d5e59093a77295880cf589213a41d81ae6c214655962ba87f3514c673763c7665b6ff8ecdbc4b5431d54ffb506ba3dfeaf05854b77e6cc1eb41da6383325c3
+EBUILD bino-1.6.7.ebuild 1634 BLAKE2B f0272224bebc6610ea459170b96fb4f0ff3d44d403bc49b5ccf3804e92cc1c40433b08a7b1883c4cb6684c8bcf05a144b5eb7e9436ee80261a3d608dfe05881d SHA512 cf0f03d983d0eb05c489c5bcda9326b51a387e6c473d2a77fe6a5a6bea134144410c32ac09f3749c6f35fee8e474b8f0a934de356c5b62b6f153082355af5587
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.6.ebuild b/media-video/bino/bino-1.6.6.ebuild
index b082c236f107..8d2731215ba0 100644
--- a/media-video/bino/bino-1.6.6.ebuild
+++ b/media-video/bino/bino-1.6.6.ebuild
@@ -32,6 +32,9 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
+	# Qt5 now requires C++11, #649282
+	append-cxxflags -std=c++11
+
 	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \
 		&& append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \
 		-L/usr/$(get_libdir)" && append-libs "Xext"
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
index 5a98d40353a7..feefaa39d38b 100644
--- a/media-video/bino/bino-1.6.7.ebuild
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,9 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
+	# Qt5 now requires C++11, #649282
+	append-cxxflags -std=c++11
+
 	if use video_cards_nvidia; then
 		append-cppflags "-I/usr/include/NVCtrl"
 		append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib -L/usr/$(get_libdir)"
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index c88e043c680a..449cd522cd46 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,7 @@
-DIST cheese-3.24.0.tar.xz 1846412 BLAKE2B bc18ee7009f4297df232c0ffdc40f5783891f721efe137e4127c7ea61595dcb033e98b415ea31e5918d93c408355e6534ddd95687a570b5abcc1c5ce0603d262 SHA512 c81d2f3038970f735960a2cbcec3a074ac2e9835d3f1fa6aae83d65299692d0464fed274e71caa59831a105430ce5db56557ea0cda27c72cdb050a59331b3107
+DIST cheese-3.26.0.tar.xz 1841856 BLAKE2B 302a4a12511866197df8cf62ec00ade122f2e5dc6a4adcb78cd252594b23373c328845179135e8ae44526432ec1b6b9a8c26d2808a533833221076be0496a591 SHA512 6fd58623ca257dff0a53b3577005a8b818b706f5c3da4eab51de9a7f6368847b4fe62885f3a7ba6350ac782cbee51c7b35a0c055bf11bb270934041b15388297
 DIST cheese-3.28.0.tar.xz 1544904 BLAKE2B cdad63b4175bb52c3a77ee5ed0058afdd8b5d509ef17b5931d2f01457b9ff327d3ad270ad963e3185c928ddc7203b00163137a789683669d3f8c39d5a9926da8 SHA512 c52b083b132a8c885df55def3d6bf96180fc93c8b7368f48412c8dd63e073a268ff0e86959a977bd8bf372a53e127419b96046d92cb3a96674f86cfb3477ceea
-EBUILD cheese-3.24.0.ebuild 1968 BLAKE2B 8f16d0c1619fb95d25726f100a6c74b79f626e28ca0aa75f9f4c0d8ea8da6500ecf9f4f0ffa22e0377f60eca782fc2aea42f0e01a159f730a337a4fbf1a3af75 SHA512 c3416e1b21277460764e7947019387b76f094fc835f2f9c180f13ca6d85adef794a5550a5b23fc7086d9d8c65991bcfc2330d175770a0730f92809cf39a2403b
-EBUILD cheese-3.28.0.ebuild 1919 BLAKE2B ca6da0952d46277cbc27c996876c1141ed61c16f0b9768ba7c076d977f772293b58aa8085a00a39c69b6bb72bc32422952a2fef1c36397465226ecff866c1140 SHA512 acd4e073d0fb1ab45a7345b364c81aa973e27218743fab0924cabd4fbbb88ac1cb35932ded1c18253aed3bcf8be1eded4b7e93aadfb419dd25d98663f201e703
+DIST cheese-3.30.0.tar.xz 1546680 BLAKE2B 32cfc9553e1c9ebfe7d3eb5fdf19d74b49e9f69ea005f4c79097d69caa2125803c5c319e98ccd3e8f72157a5fd86c018f1be7af7045f6541ecd36d4162c5cdd1 SHA512 622910cedc8eadec4161f60e2bb3f02cbe11352b2431fdd9783f724b4119ffae6254b1566e1144c25491067f9c683a55eb85b265ef28992d852adce02fbdc8b4
+EBUILD cheese-3.26.0.ebuild 1891 BLAKE2B ec91cff21e7a455cb5f62392b3cbd81cafe267e35e6ceb7dde3a26eba6b3e8da9a532d8f79a0a6861fa182000b904297280523ae2e01f06bf120a4b4086ccc14 SHA512 b8ff632cc912151e425d53dfeae989ecc7a0f422244ed0fc9891ed689629eededc852ecb6705ccd8ac2d4b42291bfba872412ca5e0c9c1be638f0848f1c45723
+EBUILD cheese-3.28.0.ebuild 1914 BLAKE2B 16a5f3d9700937e9a148f159a54dcf6b93fdd097a4ebecacb15484b5f20a88ad8f69aa1b36effd4a2aee485957216987039c5e77bdcfa3e27b8472bb98744287 SHA512 ac5cc8112eb52116ca68d8536f1bc0a5600994e0cd71e73499a144dd14864e3fd7d483855b3b05b28014ece14c226995411eace1216bc1dc8b35c24984fb1b00
+EBUILD cheese-3.30.0.ebuild 1916 BLAKE2B f5b32a8170f075f8a534aadf65bb227345aaf9b46525c9f5aaac2193c3a150bb13de1a88b65726b00653c3c242bee34ac890d665f8458b5a57dbafd930a2c9ef SHA512 2e53f96527dacdb3c6e1fa9b3391991a43ef8e99819639370b7ec1448f45b6bdba1f89df7a53dab529270a52d09de97a0bf55364124966da1c4cae51d04b773c
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.24.0.ebuild b/media-video/cheese/cheese-3.26.0.ebuild
index b9978f7735b1..fb4adf9d212d 100644
--- a/media-video/cheese/cheese-3.24.0.ebuild
+++ b/media-video/cheese/cheese-3.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.90:2
@@ -20,7 +20,7 @@ COMMON_DEPEND="
 	>=gnome-base/gnome-desktop-2.91.6:3=
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
+	>=media-libs/clutter-gtk-1:1.0
 	media-libs/clutter-gst:3.0
 	media-libs/cogl:1.0=[introspection?]
 
@@ -42,6 +42,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=media-plugins/gst-plugins-v4l2-1.4:1.0
 	>=media-plugins/gst-plugins-vpx-1.4:1.0
 "
+# libxml2+gdk-pixbuf required for glib-compile-resources
 DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
 	app-text/docbook-xml-dtd:4.3
@@ -49,7 +50,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/appstream-glib
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50
 	dev-util/itstool
@@ -72,6 +72,5 @@ src_configure() {
 }
 
 src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+	virtx emake check
 }
diff --git a/media-video/cheese/cheese-3.28.0.ebuild b/media-video/cheese/cheese-3.28.0.ebuild
index 8b870aafa450..449a1884018e 100644
--- a/media-video/cheese/cheese-3.28.0.ebuild
+++ b/media-video/cheese/cheese-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.90:2
diff --git a/media-video/cheese/cheese-3.30.0.ebuild b/media-video/cheese/cheese-3.30.0.ebuild
new file mode 100644
index 000000000000..31bc873f0bfe
--- /dev/null
+++ b/media-video/cheese/cheese-3.30.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 virtualx
+
+DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
+HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # subslot = libcheese soname version
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.90:2
+	>=x11-libs/gtk+-3.13.4:3[introspection?]
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	media-libs/clutter-gst:3.0
+	media-libs/cogl:1.0=[introspection?]
+
+	media-video/gnome-video-effects
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+	x11-libs/libX11
+	x11-libs/libXtst
+
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+
+	>=media-plugins/gst-plugins-jpeg-1.4:1.0
+	>=media-plugins/gst-plugins-v4l2-1.4:1.0
+	>=media-plugins/gst-plugins-vpx-1.4:1.0
+"
+# libxml2+gdk-pixbuf required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_configure() {
+	gnome2_src_configure \
+		GST_INSPECT=$(type -P true) \
+		GTESTER_REPORT=$(type -P true) \
+		VALAC=$(type -P true) \
+		$(use_enable introspection) \
+		--disable-lcov \
+		--disable-static
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
diff --git a/media-video/dcpomatic/Manifest b/media-video/dcpomatic/Manifest
index 7d3f35d33c99..66e7db440090 100644
--- a/media-video/dcpomatic/Manifest
+++ b/media-video/dcpomatic/Manifest
@@ -12,4 +12,4 @@ EBUILD dcpomatic-2.10.5.ebuild 2486 BLAKE2B 1d2e3ef1033bfb784d12c2484d8d962e7c9b
 EBUILD dcpomatic-2.11.7.ebuild 2808 BLAKE2B 84d7f675a00b32c590ab265e4ec1ce489e1cf4d4585f399cbe8daad144b827178475705021cd023421b44def04477dd32ecb413b0bca3145538c42a0672f4929 SHA512 11d1488679e5847cd3e846c133007971e79b58b4a69e0e44d7cf79974689141cb94da6c884560275ee566d1354d92811d0dddf25d370b63a3a6fec2c346823d5
 EBUILD dcpomatic-2.12.4.ebuild 2829 BLAKE2B ff8b93cd217e7ee8739b61d7c04f317a66e86099f33e19d78caffceefdf985f6167da35d72d14cd588b3e14c6bb7eb2af93757724e080f43306e194d61ff37ec SHA512 56ddd265247e9b095648aebd9d402424839b210bfb029a2ddea298731e966d67caff626840f4fd00f909fb36374b09bdb07b86dd72de84f756a14ef8d6e0aae3
 EBUILD dcpomatic-9999.ebuild 2829 BLAKE2B 8e7fb2e0d6d6e56525d05ea2658e1b14347d317408488156450b99abf4f7d5d4298eb2a33fe1860d3d54a2e631495bea78ec8c6b95d0dc925fa58a6b37321ea0 SHA512 504339fec5b4c9ea4a17044175f4e1b7a55733a38ed17086cf7a281fe36036cfa14ab49c4318aefbe8dad3d0ad669b8c5ec62d0935c37d102bfbdbb62ca3f391
-MISC metadata.xml 896 BLAKE2B f5390ca6e263305d5efa022baade1d4887b227ae9e1ac11c9469481fde496130f722433c7518ab382f9f43ac0f52cae5af307144eb7c6494ad2d138b5c08016e SHA512 e696fdf207bf01e89643304f33c45d0b2b97aa804181b49934ea068131fe0104e19a63fad91d65d929ef8b16b2ea7565541e0ac1121f70a9f005061bdb613295
+MISC metadata.xml 825 BLAKE2B bc4f168f5e2ef9efb6a2918929f3943fbbf1b7924f6515d136d660fec6a0bf4219111015bdb876857fbab7792da92b285f290b1c137562a01c38d00d2ea976cf SHA512 f9412a388e2f3af8be5c501db7105861dd9ec2670b461e99e7c0401846fb9cbe9fd0aeaff343212e8a83631f348182b0371079bf8a29914c68c02bdc4901ee95
diff --git a/media-video/dcpomatic/metadata.xml b/media-video/dcpomatic/metadata.xml
index 1fe7fe154da0..192510bcea57 100644
--- a/media-video/dcpomatic/metadata.xml
+++ b/media-video/dcpomatic/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 DCP-o-matic is a free, open-source program to create Digital Cinema Packages (DCPs) from videos, images, sound and subtitle files. You can use it to make content for playback on DCI-compliant cinema projectors.
 
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index ae24af475cd1..8419b5a2315f 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,7 +1,9 @@
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348 SHA512 958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
+DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b SHA512 9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
 EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2043 BLAKE2B 0a935a359fa358838f74caa04769cbcf3be6b41ce278b5e0036fc49e40cbebc3d25acecb7c191bdcb868fda58928f32ceb76dfe5591e7ea56db57bd1b9e40e19 SHA512 67cc4b9a694ba1ef521c11dd4f02613d3035e7a59247ed95d5ee87a8ed46f65e9dcdcc03759fdd39e84f5bf98d9fb49ae96a7766e333d6ac439b532603750979
+EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2095 BLAKE2B 8be1f69304106a0530cc03b9218efaac0bcbced68770295cb1649a523c282768bc056b7824b5d3a09fad8eb7ff3461058129dbab688e84bc337a89d1d725d612 SHA512 eaadd825c6d54df49716ca77c272d3458bb027e164d6423f3638ca345feb266e2dfc981f9a44d502a4cd5a07da5754e29820698047738f2df6e48c4a64642ed0
 MISC metadata.xml 2256 BLAKE2B d224c6932982a05615b3e5094f1f1aa077682cbbe6589ea9806f47a604e7b51063c8382d542b474a078094657690cc8f785889efa696d2aca25f38ea8b3c9369 SHA512 9672bf9ac08cbd33e4effc8456c152edb1d2d7985fd21028ef06b9698077052c509b29d3f72311b5b62d36400c8cda45699026e91cb92f5d63f2f1f10597bbb6
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
new file mode 100644
index 000000000000..edceb82c0e40
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils xdg-utils
+
+MY_PV=${PV%_pre20140701}
+BIN_PV=${MY_PV}.devel.2014.0701
+RSC_PV=${MY_PV}.devel.2014.0503
+TMT_PV=1.0.2014.0125
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="https://ffdiaporama.tuxfamily.org"
+SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
+	https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
+	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
+	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
+	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-4.0.patch
+	texturemate? ( https://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )"
+
+LICENSE="GPL-2
+	texturemate? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav openclipart texturemate"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	libav? ( >=media-video/libav-11:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-3:0=[encode] )
+	openclipart? ( media-gfx/openclipart[svg,-gzip] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11,ffmpeg-4.0}.patch )
+
+S="${WORKDIR}/ffDiaporama"
+
+src_prepare() {
+	default
+	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
+	if use texturemate; then
+		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
+	fi
+}
+
+src_configure() {
+	eqmake5 QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	if use openclipart; then
+		dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 771e74d6fe0b..ba0e66dfc43b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,4 @@
-AUX chromium-r1.patch 1492 BLAKE2B efa332eb9cc842e2a9fa949c6c00d3c1956ae7ad55b5567e880e48a2fe21325ffcb7a7bc13f726cb8cfad44f0f63e23887c16d9938fcf80ed7427cc2f9253035 SHA512 55d7a06b630ac28c7b8e91112536fd67356664c7c91c3ca38b02733beb91d9a8a28247fd122e4b1d94009ffce5b83d29de10f331323179ae268e42851af10000
+AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
 AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59
 AUX ffmpeg-4.1-vaapi-tools.patch 850 BLAKE2B 2303915fce02ea555118c1dbac8f84ceb803f6ad43de31af7ef2c49cedc37c15bb5f968aa83949ccd393a8710f9b59389eff1fea54940fdd45e52d67eb998d4d SHA512 836b5737e6714daa1a5c9f7f390b9cd473cd7e05ed184c96a860cf5ef145561dcbbfd214e4e55db525d46b1c0dec7ba7b81aca7d5835d9ce4fb9bee1819bdfb0
 AUX ffmpeg32-openjpeg22.patch 4777 BLAKE2B 4ea7ed6b6b31c6d0d3e99358231ce27f18423aab866ceed75c10bf2c4b514ae4d023f9b0f4dd91346773f2ef2014943a08e6093e53266fa307557da69d766c8b SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d
@@ -13,14 +13,14 @@ DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad2199
 DIST ffmpeg-4.0.2.tar.bz2 10424065 BLAKE2B 0d3e072fa31bfae37722d8113f9c9cfd2071067b2a29ed5c7332ae49b388b91e8646b6bc8a816517bcebcdcc8d923d1e8b5a080dbdc63ea2a153aea8ecfb2af9 SHA512 92a3bedcd070df72b26dbe3ebf4a3faea0a02289fbefdb6a6c73d65801cf60a7e11cd832d29ab46b7749a1ffd0a31505cf75bb46bd01ea06423b454ca04e9b7b
 DIST ffmpeg-4.0.3.tar.bz2 10425117 BLAKE2B 1517d66d5a0c931b866df5206ae660a01daf49d375f7750a7b027ce62ab7dc8131fc02b8a6320e5ff7295b9bccdafbbaf25e206c55fad420ea206c1b9638e777 SHA512 8d600adf55f2fc1574a7013700129766a4a3db83bb33ec32fe07759310f1d8804c00e74b58fd1fcbdd91efec214764e4b2fadf7b01c948dc2ccdcd1b4d56e303
 DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
-EBUILD ffmpeg-3.2.6.ebuild 14876 BLAKE2B 000940b7bb4a00288ca50439b5606b6ab482dab2a8956f72a49ecdc8a8055977a0d6b0c36b226003b5a4ab755036563d2f6ad74c0af6d4d84fbe23fa296d79e5 SHA512 83eb5308fb91b93dffc4e91c7fae0f4ea33c15efac04a97a6a1ac7bc2b6e14d305ed96814d64eebf97e4d15a1aba86f01d365f7f8c989b5326d59eabfb3420af
-EBUILD ffmpeg-3.2.7.ebuild 14881 BLAKE2B 8a4c85d008a5cce7c26880721d4a3533eb16794795e96b40f00808c8142c2d0b68f01b1bb0990603e79158be89d8a2d9a4559fbca4469278b38c0444c754bb8c SHA512 3eb99bffa96b0ef1b3df7a47c54aa59918063888e9d7d1c114386283494c26050d66eb1657f51b5157ce18a04f53f076d5185b177f46a37e9d66f27526e747d0
-EBUILD ffmpeg-3.3.4.ebuild 15905 BLAKE2B 2dcb83a3b7dde73f1d92259e339b46d8fb53b5e17400286e1decfccbdce282ff18bd0bdd1f0a50ed0b1505c8053909f68a4d59992bc8ce5bdeb039469679a8f8 SHA512 e7113d98b89182772bdde3ab0624d0754864e081964ad22fa590eb69ab40ddeb437c21ad08e40d1c494fe8e580220b40695f76fa5171267f8686bf2a3c9707b8
-EBUILD ffmpeg-3.3.6.ebuild 15906 BLAKE2B f38762b837642571aa85c5a828e3fe5ae0706f3bd135dad2d32d62f8fb059bd58e7bf57a239471c5829ed29588f0167ddfcfdae4636db251419ee45c91fb9dff SHA512 2755fcf82f8d2a6eaf04bcbc4bf8e753a511588cf0f505f6129ae1eba6868e60cd05c50a47316eb791ee31b87d85005689d923972f2412ab08b33c7378bbb4f9
-EBUILD ffmpeg-3.3.8.ebuild 15912 BLAKE2B 04ec63d4f194045e71e5e4f475ce3881a472a1b6b804f8d62c5b05e8752e09a40793e2304ff6f498edab7de8760b0b95cf99d275d437ad1af8b3b872380a56a3 SHA512 0e8ffd2a55b0dde6238b4cdefb18271df962417c1f77ad4d344414dc9379cbc7945837d5c8168e7649eff1920d391205fcc553ff8dc4a4f9046c9222df320118
-EBUILD ffmpeg-3.4.5.ebuild 15582 BLAKE2B 745bc41a4cf5430e6df447b49378019d80d448fe49f444afae3b8f6dca9cb509d906506c73594a1be77269f6b5cb32440de7c360806f1878d40f996cd50b90db SHA512 cfd435409eb31bea28826f1e7c6aab9e802354f082a70eb1538d7dc6b97294f4da1df08a27e7e85a76e09c545fb450c7c9a6297e184820655a372e5e35eeecd7
-EBUILD ffmpeg-4.0.2.ebuild 16432 BLAKE2B 74f531fda1e944e12b905a99ba9a230bfb14aab073e8d353af26b4d31ffabc157657337e50031472124f2e6c8238918ca8469a64f942bdbd635d34d15cecb689 SHA512 a209772c384428fc390922358580fd6e71185312fe309c0567cfce3f3992c3ce40d5ec969ea9d21044adc7ae007a98afa48560a58ffb327e3a02ab844d0cf0e9
-EBUILD ffmpeg-4.0.3.ebuild 16445 BLAKE2B 6fa2b440e3f04fbf9494a7f49378e2aa32a57ea19b7a356cc7fd3599d9a54415aa68ed0b4feee98b4ad6f5f92b7b284e620a2ddf42669e4b2615629487f99a40 SHA512 3040d9cf18735fa6ae62236fe7deeec8ea3e2a1726da93714d64f83bd0efbaa29c6b8cff3557f117a5adebc57ab25dedacc13c4fd5c670649ecfee9f94caab39
-EBUILD ffmpeg-4.1.ebuild 16483 BLAKE2B d210f2e72f4abe646771ba8cacd585194cb53d071a6c34ab62b09584533113cb90a9ccabec0931e62973be92a76938e4098cf80fe217a8665d5d064667593b4f SHA512 cf7c1bab3dcb0ae72dd770dba58d5e3b8bd946449da3e00f8fa8d2ca49c6e1599d5f3b457852adade08638831a19ada965f82bcf45c98070cdae45c796020a3b
-EBUILD ffmpeg-9999.ebuild 16445 BLAKE2B 6fa2b440e3f04fbf9494a7f49378e2aa32a57ea19b7a356cc7fd3599d9a54415aa68ed0b4feee98b4ad6f5f92b7b284e620a2ddf42669e4b2615629487f99a40 SHA512 3040d9cf18735fa6ae62236fe7deeec8ea3e2a1726da93714d64f83bd0efbaa29c6b8cff3557f117a5adebc57ab25dedacc13c4fd5c670649ecfee9f94caab39
-MISC metadata.xml 5779 BLAKE2B 7c14dc48960ada6ed913ba8b2d39018f95fcfca9e7f601b93c8f394ffd4bc51c89f7b48fea8a5c4307827e5bf0850ce7802d80a55922694b5e0ae229e91f65f7 SHA512 24e0f020434c76af8bb8a1dfb612ad5a2e1b40e4794829fc2f4f630076ab68172038e0bbe9dbc4be8ff1f13180ab0fc1791b5d64072675baaeca479cc4c15996
+EBUILD ffmpeg-3.2.6.ebuild 14779 BLAKE2B b79fb9e74ed3eaf3d84bb14823cd305dde3f14d5cd5bcf236bfac6443daa4d6c678ad2aea23559021af33afc0488c3fa845c4da52e1c27988a3f504a10475b3f SHA512 31fbf5b2294c6ba34960298347bb7c9523070bead6215b2f17ea7f7cf0b46878d14e22f1888959a4586550630e2f3b3e81ce7feae1270aad12a5cf5e297e51c1
+EBUILD ffmpeg-3.2.7.ebuild 14784 BLAKE2B 709df5de9f58af7d57a01a4a90f5eb3eacc132a6dbed7d7f86a74c984774ad119febd904cede6b77f9ef4b05ae48538b6d18a1b50e5c7406a07dcfe567370a52 SHA512 e9b1439ffbdb2299ddffccf9a6fd43a5ee4a99e39c461a82393ae71226623c042e7a73c093a9c4d70b175aba7fd0eccd3926fb9a9d8de24afd97ac44f189ea9f
+EBUILD ffmpeg-3.3.4.ebuild 15808 BLAKE2B c64f1cd480d0bf2e8834073571f40eef01093b6384003653d3da534534f4a23fa1e5315de5e05dc808b1743dedc587439b4959ae843feee252f848b826308d9a SHA512 a29e5beb75cdacb1ce07b34910b419013c7dc8b906c5927aff6492338e02ec9d8ec0813e2d2aabce4d0aca70e027001c8aa50be23e9cfabc1f6aa860975e1b4b
+EBUILD ffmpeg-3.3.6.ebuild 15809 BLAKE2B b78701e736d5b1a8c029bbbec3c5ce40356223c35e78e160cb93a3e30732441abe1a14ab5940d302556abffde9d798de3ad160a98cd274334d467b0e9ba5de80 SHA512 b71dfc45bf7e29e8a5e70402c1dccfe2148223e60a1270a58918c3c3486472193e269e81cd8a1074a792b12b3d24d7a8733f62e3ef5002689d46ce9ce588f605
+EBUILD ffmpeg-3.3.8.ebuild 15815 BLAKE2B 2bce668121996c1bbdf472dcede998450fa4b53b36dfa25ef62b1eaa988cb6b7f8ab216ef29ebefae026ee06b9d4ad001ecb90076efb61e1c6bbaff9b09dce1f SHA512 8650a978d1283d35f37b549e937f9c04cdc860540f7e7ee1871c07b21c13c3c165322075dd00ffbbeaf629d2c79b445b0fd715ae88fba3e59b0fd217b4c3dc72
+EBUILD ffmpeg-3.4.5.ebuild 15589 BLAKE2B 1adf2d23a2f5944d3b4f147ba74704a4868782e5e3f6b285bd940f5d2d81c74764ecf74b9b2dca8583e08e85da4945b1e527ed1fe7d521b7a0d439f29e1e4ece SHA512 4f8809b7f2e7669bb0ad7d7ecac278666dd2249b09db1e91bf11b9340c189fe19c1260d5919f14c9e80ee1b712c88d33fc96d54293a1ae2d5d4d1486249691bd
+EBUILD ffmpeg-4.0.2.ebuild 16672 BLAKE2B b7445d742b2c680e6a179c959b14cada3c26c6e27d0902fb102179c5b645ca61d62c8130003cc39f8caf66ddbf2617af788697e0d9bdb22346ca8681daee35f3 SHA512 0a51a4771a4814c8e5bd3c8243e38a5197ebe1a762b9e152f2e87053ea627cc75cfeae0bf42ebb959867d38e517bd9c11a4e6a99a8a99ca0cfb6b9063465b39f
+EBUILD ffmpeg-4.0.3.ebuild 16747 BLAKE2B 5c56e917ebc473e445238a1b4e8e51055cdf0afc32cb8cd81a64d1c61e4a3c3836ec875b76de726cc70000c19011d6b3a37ef266684e387e79df3e9887647a5c SHA512 511400d8cb89bf7196dda13f5cce8e311d05b441d3b5bf4edec5c0a12c4f63cad2eba6be6653b1c199a01a0e1e3f2adb9e380b7b8a0e5840a2aeb7b224c88427
+EBUILD ffmpeg-4.1.ebuild 17027 BLAKE2B e4fb8eb8b9dbdfc6b331b70654078fdb9aa6282b68c2759d03fcc0caa8827d91d3df7091ea7e0521641ffe21f1e90c760a84d050c10de591eea421e871f56dfe SHA512 510149a5a3b21b4da99e6c6454497698d9a2122ab02a9f4a1c154fec85b28e39c3d0760d6ccb6c6ab30a6db225acfaab7ab07f1d2c79396b8063675b6d34d96e
+EBUILD ffmpeg-9999.ebuild 16970 BLAKE2B be7189ee427dfd09dbd371656111ae40fbc738d03beb0079a670b37b403e3a03f2eba852fb902d40b6d32adf46f97a04120c7e01a80da25444ff5ce1ff0f5713 SHA512 99ad47c1607966ebc23d634488b13fcec81e4848de0b59390a02379a3dd463d79de7fde42bab19cc8d784e2f49802ab91d87708acd443e90df0450c40879f87e
+MISC metadata.xml 5697 BLAKE2B dc170e50190c36f1f6bf5ee36de0a757fd4815bbd41b8c284a55ea29894783ffa89a419b04d57d8489cac17f436df3e9a9d88266c256ca4c4a7672e857e73557 SHA512 ca3a7e0e712fef9fef181e9888dc97c62905b8b5b54623a58ef40743c1a4b58711ed47e9b391960421d720451ac816bfc1625be3fdeeb228d2041480f4f298b0
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index 010f59065ed5..a6291d34e905 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
@@ -216,8 +216,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index b798bf59bc27..ac8492a79dff 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
@@ -216,8 +216,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index e21349699065..d55a0875bac5 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -232,8 +232,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	sofalizer? (
 		>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index 8edfe99d1be6..c86f3c9aece9 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -232,8 +232,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	sofalizer? (
 		>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
index 31f31bd7f750..fe80b8d12625 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -232,8 +232,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	sofalizer? (
 		>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
index 671893a16247..ffd21f6cd093 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
@@ -225,7 +225,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
index 0ecdf810c4ba..4cb26fd90478 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -226,7 +226,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
@@ -310,6 +310,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -446,7 +450,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -454,7 +458,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -472,10 +476,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -491,10 +499,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
index 2a10fdca9482..8e011cb6e0b5 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -71,12 +71,12 @@ FFMPEG_FLAG_MAP=(
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
 		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
@@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
+	alsa chromium doc +encode oss pic static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -226,9 +226,10 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( net-libs/srt[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
@@ -310,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -446,7 +451,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -454,7 +459,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -472,10 +477,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -491,10 +500,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild
index 34b08d7a8e20..7502a685b968 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -71,12 +71,12 @@ FFMPEG_FLAG_MAP=(
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
 		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
@@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
+	alsa chromium doc +encode oss pic static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -226,9 +226,10 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
@@ -311,6 +312,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -404,6 +409,10 @@ multilib_src_configure() {
 		--enable-avfilter
 		--enable-avresample
 		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
 		--disable-libcelt # bug #664158
 		"${myconf[@]}"
 	)
@@ -447,7 +456,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -455,7 +464,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -473,10 +482,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -492,10 +505,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 2a10fdca9482..bf29f67ebbb9 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -71,12 +71,12 @@ FFMPEG_FLAG_MAP=(
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
 		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
@@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
+	alsa chromium doc +encode oss pic static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -226,9 +226,10 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
@@ -310,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -403,6 +408,10 @@ multilib_src_configure() {
 		--enable-avfilter
 		--enable-avresample
 		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
 		--disable-libcelt # bug #664158
 		"${myconf[@]}"
 	)
@@ -446,7 +455,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -454,7 +463,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -472,10 +481,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -491,10 +504,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch
index cfe06a7aec8d..514780035bc0 100644
--- a/media-video/ffmpeg/files/chromium-r1.patch
+++ b/media-video/ffmpeg/files/chromium-r1.patch
@@ -9,17 +9,23 @@ new file mode 100644
 index 0000000..992cf3c
 --- /dev/null
 +++ b/ffbuild/libffmpeg.mak
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,27 @@
 +LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
 +LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
 +
-+libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
-+	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++ifeq ($(CONFIG_SHARED),yes)
++LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++else
++LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
++endif
 +
-+libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++$(LIBFFMPEG): $(LIBFFMPEG_DEPS)
++ifeq ($(CONFIG_SHARED),yes)
 +	$(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
++else
++	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++endif
 +
-+$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED)
 +libffmpeg: $(LIBFFMPEG)
 +
 +install-libffmpeg: $(LIBFFMPEG)
@@ -30,7 +36,7 @@ index 0000000..992cf3c
 +uninstall-libffmpeg:
 +	$(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
 +
-+.PHONY: libffmpeg libffmpeg-* install-libffmpeg
++.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg
 -- 
 2.13.1
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 7ad4c88a08be..35024c9f8c5f 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -49,9 +49,9 @@
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
 	<flag name="postproc">Build and install libpostproc.</flag>
 	<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
-	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
 	<flag name="sofalizer">Enables Sofalizer filter</flag>
+	<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
 	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
deleted file mode 100644
index 8ed35f8e0e1f..000000000000
--- a/media-video/gnome-mplayer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-mplayer-1.0.9.tar.gz 1082199 BLAKE2B c2219b5a6902c9e2c9849dd3a31a29e2270b7ca513945a5e9684fa429073f42e360f6ef698f42b93e61a3d39edef1215f657e92cfab1c9fe3b19d5ea85eac839 SHA512 5aaea17afddaf2f949b798b87d4d6306130b9622d2dae68a7f24abebc2174cac7cb17c3112dac6629a0643e31098865462c10355dfcd43f16d2503848e18fa7d
-EBUILD gnome-mplayer-1.0.9-r1.ebuild 1831 BLAKE2B bdf0def0efec4fbc85a5894dfebb021368f2cf697b074e942a2754530eb7e17529967c7622d3969f92ecf3bfabec58f144747c265a17fbcc1564e3caf7c2dd1c SHA512 57766faefaa347e2a660a4efdb4168ac3f04aaf88096dece82f7690181f86628a887a9e42cfee5794ed68dcea189dbdb42d1db551e931e7e41a60ed51da5d614
-MISC metadata.xml 398 BLAKE2B e6cef861c1aa0178c3ff271532dc97bef997513cf5f5c37ab4a41dfe0e3430d5b2f7fdfcf0f7952a5ff6811a96520139531d23b8a446b226e21f57d6df739a4f SHA512 5916892e84d2f43920e341fce811b49419c27a81a1c95e8e8a6a269b1a9b58702aef3d5728b947afc2699dffc788e877f44dce45380f0024894c4422750c9a87
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild
deleted file mode 100644
index bd9fa8ca7f6d..000000000000
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK+ interface to MPlayer"
-HOMEPAGE="https://code.google.com/p/gnome-mplayer/"
-SRC_URI="https://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="alsa +dbus +dconf gda gnome ipod libnotify pulseaudio"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	>=media-libs/gmtk-${PV}[dconf=]
-	>=x11-libs/gtk+-3.2:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( >=dev-libs/dbus-glib-0.100 )
-	gda? ( gnome-extra/libgda:5 )
-	gnome? ( gnome-base/nautilus )
-	ipod? ( >=media-libs/libgpod-0.7 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	>=media-video/mplayer-1.0_rc4_p20100101[libass]"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="ChangeLog README DOCS/*.txt DOCS/tech/*.txt"
-
-src_configure() {
-	# TODO: temporarily --disable-nemo only because it's untested and new feature in 1.0.9
-	econf \
-		--enable-gtk3 \
-		$(use_enable gnome nautilus) \
-		--disable-nemo \
-		--with-gio \
-		$(use_with dbus) \
-		$(use_with gda libgda) \
-		$(use_with alsa) \
-		$(use_with pulseaudio) \
-		$(use_with libnotify) \
-		$(use_with ipod libgpod) \
-		--without-libmusicbrainz3
-}
-
-src_install() {
-	default
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/media-video/gnome-mplayer/metadata.xml b/media-video/gnome-mplayer/metadata.xml
deleted file mode 100644
index 59723785c6af..000000000000
--- a/media-video/gnome-mplayer/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-  <use>
-    <flag name="dconf">Enable support for <pkg>gnome-base/dconf</pkg></flag>
-    <flag name="gda">Enable support for <pkg>gnome-extra/libgda</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 10e6292297c1..c33d8368efb1 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -8,6 +8,6 @@ AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e2832
 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1.ebuild 3480 BLAKE2B 6e1e83a6bdeb6827cf6927c59d15ef299158e8f24b649c75d53601222d12567e224b64fb68678fb72df9ecf3002ccaaeabe1e63760908937fcb82954038279c8 SHA512 991f1af2143baf56748012d48ef6d9132ba4d03e9e6347d41be0e2dd81742310bc24e5b9a76b0be526efc6a9d6e5bb09f135cd69b03ca377990913457588aaa2
-EBUILD gpac-9999.ebuild 3243 BLAKE2B b9ac1b87c46486616ce0212037494ea238d42939f8b6ce88b943840414f0d7ab409d51969d8c30b1b60bb2c559e742ca388b83290ebbf18776d7ee24024a0fb5 SHA512 9f3ff849d76e8747cd913d2a28ac9768678918b5dfb73c98fa50360eac97d636920cd31e330fd1413da41e900ef6080132f876835cad8ad26ecf0ba2fe252f6a
+EBUILD gpac-0.7.1-r1.ebuild 3413 BLAKE2B a10347bed4a34cbab0f5565cd841140053f12db8a9adc2adaa4b6dd839ebc2cf82122b9acde57269b8137708494d7e216dd8478ecbaf227cdcfd8c75d8302333 SHA512 80c93f26bb891b83bf1e6026e0c1e148f7362b3547d6557e3a55aa14426f4c722e8552e6d67efee27b4f17337c9fb5a746cb68cfa7568e6ebc18fa1c628fad49
+EBUILD gpac-9999.ebuild 3181 BLAKE2B 8c51ec87f24e14deac39139aab5546585a7a84a1ecb80623237390b7189d519bcaccbc9481f64c225d50879cb586b20ee4f02af21f11ae746730ff6c269dbfd3 SHA512 af202c5d441454bc677c7b7e5dc0766530164465e1776b4f764fbe967d07c05fb0f8d3183af4e63a2c9f15988361bfc1b2286a1d8e703f191d992083ab1222e7
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 73698dcdb6b6..470e9607ff77 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}
@@ -23,41 +23,48 @@ IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad ope
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
+	media-libs/libogg
 	a52? ( media-libs/a52dec )
-	aac? ( >=media-libs/faad2-2.0 )
+	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
-	dvb? ( media-tv/linuxtv-dvb-apps )
 	ffmpeg? (
 		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= ) )
-	jack? ( media-sound/jack-audio-connection-kit )
+		libav? ( media-video/libav:0= )
+	)
+	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	mad? ( >=media-libs/libmad-0.15.1b )
-	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-	>=media-libs/libogg-1.1
-	png? ( >=media-libs/libpng-1.4:0= )
-	vorbis? ( >=media-libs/libvorbis-1.1 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	mad? ( media-libs/libmad )
+	opengl? (
+		media-libs/freeglut
+		virtual/glu
+		virtual/opengl
+	)
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
 	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4:2 )
-	xml? ( >=dev-libs/libxml2-2.6.0:2 )
-	xvid? ( >=media-libs/xvid-1.0.1 )
+	truetype? ( media-libs/freetype:2 )
 	sdl? ( media-libs/libsdl )
-	jpeg2k? ( media-libs/openjpeg:0 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
-	pulseaudio? ( media-sound/pulseaudio )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	vorbis? ( media-libs/libvorbis )
 	X? (
 		x11-libs/libXt
 		x11-libs/libX11
 		x11-libs/libXv
 		x11-libs/libXext
 	)
+	xml? ( dev-libs/libxml2:2 )
+	xvid? ( media-libs/xvid )
 "
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	dvb? ( sys-kernel/linux-headers )
+"
 
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
 PATCHES=(
@@ -98,40 +105,45 @@ src_prepare() {
 src_configure() {
 	tc-export CC CXX AR RANLIB
 
-	econf \
-		--enable-svg \
-		--enable-pic \
-		--disable-amr \
-		--use-js=no \
-		--use-ogg=system \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable jack jack yes) \
-		$(use_enable opengl 3d) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulseaudio yes) \
-		$(use_enable sdl) \
-		$(use_enable ssl) \
-		$(use_enable static-libs static-lib) \
-		$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
-		--disable-wx \
-		$(my_use a52) \
-		$(my_use aac faad) \
-		$(my_use dvb dvbx) \
-		$(my_use ffmpeg) \
-		$(my_use jpeg) \
-		$(my_use jpeg2k openjpeg) \
-		$(my_use mad) \
-		$(my_use png) \
-		$(my_use theora) \
-		$(my_use truetype ft) \
-		$(my_use vorbis) \
-		$(my_use xvid) \
-		--extra-cflags="${CFLAGS}" \
-		--cc="$(tc-getCC)" \
-		--libdir="/$(get_libdir)" \
+	local myeconfargs=(
+		--extra-cflags="${CFLAGS}"
+		--cc="$(tc-getCC)"
+		--libdir="/$(get_libdir)"
 		--verbose
+		--enable-pic
+		--enable-svg
+		--disable-amr
+		--disable-wx
+		--use-js=no
+		--use-ogg=system
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable dvb dvb4linux)
+		$(use_enable ipv6)
+		$(use_enable jack jack yes)
+		$(use_enable opengl 3d)
+		$(use_enable oss oss-audio)
+		$(use_enable pulseaudio pulseaudio yes)
+		$(use_enable sdl)
+		$(use_enable ssl)
+		$(use_enable static-libs static-lib)
+		$(use_enable X x11)
+		$(use_enable X x11-shm)
+		$(use_enable X x11-xv)
+		$(my_use a52)
+		$(my_use aac faad)
+		$(my_use dvb dvbx)
+		$(my_use ffmpeg)
+		$(my_use jpeg)
+		$(my_use jpeg2k openjpeg)
+		$(my_use mad)
+		$(my_use png)
+		$(my_use theora)
+		$(my_use truetype ft)
+		$(my_use vorbis)
+		$(my_use xvid)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 0beb2918a9d4..5acc9d8e2d32 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -23,41 +23,48 @@ IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad ope
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
+	media-libs/libogg
 	a52? ( media-libs/a52dec )
-	aac? ( >=media-libs/faad2-2.0 )
+	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
-	dvb? ( media-tv/linuxtv-dvb-apps )
 	ffmpeg? (
 		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= ) )
-	jack? ( media-sound/jack-audio-connection-kit )
+		libav? ( media-video/libav:0= )
+	)
+	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	mad? ( >=media-libs/libmad-0.15.1b )
-	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-	>=media-libs/libogg-1.1
-	png? ( >=media-libs/libpng-1.4:0= )
-	vorbis? ( >=media-libs/libvorbis-1.1 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	mad? ( media-libs/libmad )
+	opengl? (
+		media-libs/freeglut
+		virtual/glu
+		virtual/opengl
+	)
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
 	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4:2 )
-	xml? ( >=dev-libs/libxml2-2.6.0:2 )
-	xvid? ( >=media-libs/xvid-1.0.1 )
+	truetype? ( media-libs/freetype:2 )
 	sdl? ( media-libs/libsdl )
-	jpeg2k? ( media-libs/openjpeg:0 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
-	pulseaudio? ( media-sound/pulseaudio )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	vorbis? ( media-libs/libvorbis )
 	X? (
 		x11-libs/libXt
 		x11-libs/libX11
 		x11-libs/libXv
 		x11-libs/libXext
 	)
+	xml? ( dev-libs/libxml2:2 )
+	xvid? ( media-libs/xvid )
 "
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	dvb? ( sys-kernel/linux-headers )
+"
 
 PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
 
@@ -92,40 +99,45 @@ src_prepare() {
 src_configure() {
 	tc-export CC CXX AR RANLIB
 
-	econf \
-		--enable-svg \
-		--enable-pic \
-		--disable-amr \
-		--use-js=no \
-		--use-ogg=system \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable jack jack yes) \
-		$(use_enable opengl 3d) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulseaudio yes) \
-		$(use_enable sdl) \
-		$(use_enable ssl) \
-		$(use_enable static-libs static-lib) \
-		$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
-		--disable-wx \
-		$(my_use a52) \
-		$(my_use aac faad) \
-		$(my_use dvb dvbx) \
-		$(my_use ffmpeg) \
-		$(my_use jpeg) \
-		$(my_use jpeg2k openjpeg) \
-		$(my_use mad) \
-		$(my_use png) \
-		$(my_use theora) \
-		$(my_use truetype ft) \
-		$(my_use vorbis) \
-		$(my_use xvid) \
-		--extra-cflags="${CFLAGS}" \
-		--cc="$(tc-getCC)" \
-		--libdir="/$(get_libdir)" \
+	local myeconfargs=(
+		--extra-cflags="${CFLAGS}"
+		--cc="$(tc-getCC)"
+		--libdir="/$(get_libdir)"
 		--verbose
+		--enable-pic
+		--enable-svg
+		--disable-amr
+		--disable-wx
+		--use-js=no
+		--use-ogg=system
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable dvb dvb4linux)
+		$(use_enable ipv6)
+		$(use_enable jack jack yes)
+		$(use_enable opengl 3d)
+		$(use_enable oss oss-audio)
+		$(use_enable pulseaudio pulseaudio yes)
+		$(use_enable sdl)
+		$(use_enable ssl)
+		$(use_enable static-libs static-lib)
+		$(use_enable X x11)
+		$(use_enable X x11-shm)
+		$(use_enable X x11-xv)
+		$(my_use a52)
+		$(my_use aac faad)
+		$(my_use dvb dvbx)
+		$(my_use ffmpeg)
+		$(my_use jpeg)
+		$(my_use jpeg2k openjpeg)
+		$(my_use mad)
+		$(my_use png)
+		$(my_use theora)
+		$(my_use truetype ft)
+		$(my_use vorbis)
+		$(my_use xvid)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index f4c6a6fb0e0d..d79d764a3d33 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,9 +1,6 @@
-AUX ffmpeg3.patch 1159 BLAKE2B 537c6ef20c0c1ea7396eaca7488487a335e18c33d8982135272bd4344961c1047ad08571e3721d532d5460e48a61ba7d1b65b716597dff6c51d8f9a0b9fc6b21 SHA512 0707e6ff0fa2098b02c58001014d9ddf09b3b9dc9f211d74143c893b0a3cb1bc12cfbb05a05cacf7599689441934a63294d7fbed1a4b4e273aea0058dc41a6ee
 AUX ffmpeg4.patch 7046 BLAKE2B 570d5a582bd76a11be2fa444cdce9c178590235eb7f1b765827dddd318ca0923206f45849ea29671e3d642b72a46eb9b58d9c2aa9735c0f312dd81f6002a488d SHA512 bc9225d94160a565bdfd524853d37d54594acae7df80c7ffd694e79943273568bd497e9e0ac24c154823bc272cfdc1f697823feb95d191aea829f331ed0daf98
-DIST guvcview-src-2.0.3.tar.gz 1062788 BLAKE2B 18cb79838e5c797fd07219345f7d7ae0a997f4360b95ceabac3c4adddf7cdef57ba23d0514e9038f05a67aef2ce6ab8e656f8a8774c843a7e1db66eaf9a1553a SHA512 976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704
-DIST guvcview-src-2.0.4.tar.gz 1120666 BLAKE2B 582d2b36effda9dd99b5ee54f42f91bdc0001cc885c3a21f67d3fdb49cac95deaf41bb1700021fc9ae438fc64926abfe9cb1366c32ff8b04e84a30ce771edc09 SHA512 9339e9cf7dc5224f1b87bb21e0ad711d9c27f4197d5f758c70edf465eb01c8c9c51542c75d686f0439f9e843a1c14c2f76835e8529b87b35a737fc5ccb01fe0a
 DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb
-EBUILD guvcview-2.0.3.ebuild 1266 BLAKE2B fe89ee1d75f1340b688cbbc344e74b140f337fde49715bbabada8be880d5ef425a2c981ae75fde67092bb43c83079443a86fa0dedfe1129c7602995327f7c494 SHA512 8b2302dd8513622e99895d627006583569c17ffa033df755caa0b0128c83980e33d3163913a76bf83625d17f2a3e0617d3b40a0779aeb87398b0e14648ec9dae
-EBUILD guvcview-2.0.4.ebuild 1320 BLAKE2B 17fcab349c12b7f8aecab83f62dfe79868ecfe58bca8ec847fb5650be3edcd3391a79d59137933b925a6d3883500c0a8f2a83690fca71e7bb481a39181fbbc67 SHA512 593c8fecd6475822e55a7ec9b4b5176e032f16861c97c1f74a6dc8c3a2234991232740ea76d5d3ab1bac52831f4a1d39d979d464f300485e6e7412632427e095
+DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
 EBUILD guvcview-2.0.5.ebuild 1402 BLAKE2B 8601540bb8d20e7090138ffc2111d541858c9bfad0faad5d4df3e20ab86aff0e47df73d6dc4157c117051d15148511634f840b5312ba951ddfa8610e744e782b SHA512 a27b9958971f22e5f7c27fefd8c79e7446885a63e270fdad40ca199f1ac399964cc2c12f9ef20c420582dbfb8b237a4b9cda09c90c2a8a6dea43d58d7bc68616
-MISC metadata.xml 301 BLAKE2B 4364fa7d4b27716ae8088bb8f7268bfceb9a607ea39a8ab794359ee2690d134ae493ae11a344dc2f26a25a7c51cecc1a6aad892102a7d7e2ac692fa18d020ae0 SHA512 c4c12767b33b64b58f02905235bebe4337c18d5a7e33dbb02c50c29effa9d236bc137b41ff8b0948aaeab36deb6f282c57d1770d7594cc087caeac7dc1036b8c
+EBUILD guvcview-2.0.6.ebuild 1579 BLAKE2B 47e4635f1281666660f7a9c2f92b8ef80f08e663f09fc869006949790c117779b9cf42da81b1f0d117518147bdc48b3b685b2cbe24d7e7f210dc335fe518bb68 SHA512 a40bbc2033404fd765d67bce17fe8c61a50625d79745e6c0173727e2cd2edfaeecc9d4a52428cf76001f85effd183a8a5b50ca67df1b24d2aa349abd3ad0bb49
+MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
deleted file mode 100644
index 5397d68834af..000000000000
--- a/media-video/guvcview/files/ffmpeg3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
-===================================================================
---- guvcview-src-2.0.3.orig/gview_v4l2core/jpeg_decoder.c
-+++ guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
-@@ -1436,7 +1436,7 @@ int jpeg_init_decoder(int width, int hei
- 		exit(-1);
- 	}
- 
--	codec_data->context->pix_fmt = PIX_FMT_YUV422P;
-+	codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P;
- 	codec_data->context->width = width;
- 	codec_data->context->height = height;
- 	//jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
-Index: guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
-===================================================================
---- guvcview-src-2.0.3.orig/gview_v4l2core/uvc_h264.c
-+++ guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
-@@ -970,7 +970,7 @@ int h264_init_decoder(int width, int hei
- 	}
- 	
- 	h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
--	h264_ctx->context->pix_fmt = PIX_FMT_YUV420P;
-+	h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
- 	h264_ctx->context->width = width;
- 	h264_ctx->context->height = height;
- 	//h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
diff --git a/media-video/guvcview/guvcview-2.0.3.ebuild b/media-video/guvcview/guvcview-2.0.3.ebuild
deleted file mode 100644
index 434941114598..000000000000
--- a/media-video/guvcview/guvcview-2.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gsl libav pulseaudio qt5"
-
-RDEPEND=">=dev-libs/glib-2.10
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	media-libs/libv4l
-	>=media-libs/portaudio-19_pre
-	!libav? ( >=media-video/ffmpeg-2.8:0= )
-	libav? ( media-video/libav:= )
-	virtual/ffmpeg
-	virtual/libusb:1
-	virtual/udev
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-	gsl? ( >=sci-libs/gsl-1.15 )
-	qt5? ( dev-qt/qtwidgets:5 )
-	!qt5? ( >=x11-libs/gtk+-3.6:3 )
-	!<sys-kernel/linux-headers-3.4-r2" #448260
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/ffmpeg3.patch"
-	sed -i '/^docdir/,/^$/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	export MOC="$(qt5_get_bindir)/moc"
-	econf \
-		--disable-debian-menu \
-		$(use_enable gsl) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5) \
-		$(use_enable !qt5 gtk3)
-}
diff --git a/media-video/guvcview/guvcview-2.0.4.ebuild b/media-video/guvcview/guvcview-2.0.6.ebuild
index 7d6a7794823c..bf243272b545 100644
--- a/media-video/guvcview/guvcview-2.0.4.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic qmake-utils
+EAPI=6
+
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
 
 MY_P=${PN}-src-${PV}
 
-DESCRIPTION="GTK+ UVC Viewer"
+DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
 HOMEPAGE="http://guvcview.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
@@ -15,32 +16,40 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gsl libav pulseaudio qt5"
 
-RDEPEND=">=dev-libs/glib-2.10
+RDEPEND="
+	>=dev-libs/glib-2.10
 	media-libs/libpng:0=
 	media-libs/libsdl2
 	media-libs/libv4l
 	>=media-libs/portaudio-19_pre
-	!libav? ( >=media-video/ffmpeg-2.8:0= )
-	libav? ( media-video/libav:= )
 	virtual/ffmpeg
 	virtual/libusb:1
 	virtual/udev
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 	gsl? ( >=sci-libs/gsl-1.15 )
-	qt5? ( dev-qt/qtwidgets:5 )
+	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	libav? ( media-video/libav:= )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 	!qt5? ( >=x11-libs/gtk+-3.6:3 )
-	!<sys-kernel/linux-headers-3.4-r2" #448260
+"
+# linux-headers: bug 448260
 DEPEND="${RDEPEND}
 	dev-util/intltool
+	sys-devel/autoconf-archive
 	sys-devel/gettext
+	>=sys-kernel/linux-headers-3.4-r2
 	virtual/os-headers
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/ffmpeg3.patch"
+	default
 	sed -i '/^docdir/,/^$/d' Makefile.am || die
 	eautoreconf
 }
@@ -48,10 +57,21 @@ src_prepare() {
 src_configure() {
 	export MOC="$(qt5_get_bindir)/moc"
 	use qt5 && append-cxxflags -std=c++11
-	econf \
-		--disable-debian-menu \
-		$(use_enable gsl) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5) \
+	# 599030
+	tc-export CC CXX
+
+	local myeconfargs=(
+		--disable-debian-menu
+		--disable-static
+		$(use_enable gsl)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5)
 		$(use_enable !qt5 gtk3)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
index 6d3ed0b48f08..ea26ca148e61 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/metadata.xml
@@ -7,4 +7,7 @@
 	<upstream>
 		<remote-id type="sourceforge">guvcview</remote-id>
 	</upstream>
+	<use>
+		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index d1b85af69049..8db0976a6ba8 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -4,7 +4,7 @@ DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f7742
 DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae837086dd38c8c7132ad9b8dee5367be5fb1b8c604b2203a1e2a55f0c3be2a62f825a95a7ace1aceb4593b70 SHA512 f6ffb3b673b01debd71d7c79cd5c3c4d6f6adb975ed0bdb7c791d674efd8a84ac98f7db3943dfbe3756a3f8819ceab2bdf4633c15fefddf0f8e10adfc805c1e1
 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 11357 BLAKE2B 254622da9a02900ded12738c0e6ed1b47778f9fa3a98933e44fa2850d24fd6638020d16043298efa639acf53bc936fcbd753e70107c3f5d086a019dd2f885044 SHA512 6b128ce9d52f94bd47ababe8cc6bfe96de863e30246297b6e3c76c92547bb1867b9654623126750f0e82735c2b56586c0129744c0369c22c9e71ee772319f147
-EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
-EBUILD libav-9999.ebuild 10931 BLAKE2B bc46348d1336751f1b1fea3c8a294d76664db14c6d59358e7a572f668bc296865e9b162fba33df122322c49e3489d9dc810fa5f798d9fd8f1f7ead4a31bdf9bf SHA512 27d47b0442fc8f8511b14d24419666397492eca2264c02abc7931a4ffac07302056e36900954d1356da4637823745da0b96f91b908ac67c9e12a91579e1739f4
-MISC metadata.xml 2787 BLAKE2B 2c92b3be0e4ef7d5ca4d05871d26a4b77f0c7429dd7c54e5f8f7b713c56c57f28e138032ba5a8ee7fe6e2f4cdad23c29f1d34161c91fb0e5c4ded2d5d0802a12 SHA512 36ed399947850d92b85292731ea83e795cf37b0bd47e7c37d2802c77d30036797713acb305c127803fd7fa49fee48217f4214754d68bf9c597497c2e99aa2beb
+EBUILD libav-12.3.ebuild 11192 BLAKE2B ac800b2b8750438ba1326da3823410c7d97f222a35a3ab89297106fc0470b4540a2dd87cd54bf218c908f00171c6e7b2e39b5594155851baaab930cb3970a99c SHA512 2f9607d7b809ed46e9dd562dd87ddca505d57ad45c466581cdb5d1cd217c7aa87da2eff4ab532d415f39da6fff6ea6712786b9d76956f9369340d75afe1123e5
+EBUILD libav-13_pre20171219.ebuild 10622 BLAKE2B 2e885c1abff31ef0d6adfbb503cd3b8a015f5189c9ef2a69903ab5c411e8f9ee71901735bd68ac95b2d8a8f9daeabee65e8fc77858903f3a9134dffda976d471 SHA512 61e0de7fa252785c2284466f79467797eb97226c18f54a0e57b1a5eec84e1528eb3a1ef92b292b88e1d677bddf060db57015491955bc83099333eb1fbc13cc5e
+EBUILD libav-9999.ebuild 10766 BLAKE2B 89157d8d1e2ec75cddf618a5a788f55def679462b4e61cc252528a5fd80bd66811a732b504b0bd969bda48d8634fda53e7eee47f6c88c94c02c8b2aec40dedba SHA512 b0f81f087eb16c64eaf2bd1eea1da95f5ecbcc7c23dd08f50bde7ffee7cdc1cfdcf23d42636f4d59fd86584e9e2ae5cf2935a5356a14b95ee684fb73f9317452
+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 bdf3f3bd00d9..043a37a0eafa 100644
--- a/media-video/libav/libav-12.3.ebuild
+++ b/media-video/libav/libav-12.3.ebuild
@@ -33,7 +33,7 @@ SLOT="0/12"
 [[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	+network nvidia openssl opus oss pic pulseaudio rtmp sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
 
@@ -96,7 +96,6 @@ RDEPEND="
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
@@ -113,7 +112,6 @@ DEPEND="${RDEPEND}
 	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( dev-lang/yasm )
 	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
 	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
@@ -240,7 +238,7 @@ multilib_src_configure() {
 	# Decoders
 	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
 	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=( --enable-lib${i} )
 	done
diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild
index 6bd86f8e6d1b..899dd07f7e13 100644
--- a/media-video/libav/libav-13_pre20171219.ebuild
+++ b/media-video/libav/libav-13_pre20171219.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,7 @@ SLOT="0/13"
 ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
 
@@ -94,7 +94,6 @@ RDEPEND="
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
@@ -111,7 +110,6 @@ DEPEND="${RDEPEND}
 	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 )
 	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
 	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
@@ -229,7 +227,7 @@ multilib_src_configure() {
 	# Decoders
 	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
 	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=( --enable-lib${i} )
 	done
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index dc8296df27e5..9d1c7550d6d4 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -30,7 +30,7 @@ SLOT="0/13"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
 	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
 	wavpack webp x264 x265 xvid +zlib"
 
@@ -92,7 +92,6 @@ RDEPEND="
 		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 	)
 	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
@@ -109,7 +108,6 @@ DEPEND="${RDEPEND}
 	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 )
 	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
 	test? ( sys-devel/bc )
 	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
@@ -230,7 +228,7 @@ multilib_src_configure() {
 	# Decoders
 	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
 	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=( --enable-lib${i} )
 	done
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index b08ce591f470..82ff0f291ef6 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -26,7 +26,6 @@
 	<flag name="pulseaudio">Enable pulseaudio input support.</flag>
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
 	<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp instead the native implementation.</flag>
-	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>net-libs/gnutls</pkg>.</flag>
 	<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
 	<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag>
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 7c73de9f6529..b96999091ffb 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.1.tar.gz 9313691 BLAKE2B cbbb830c20a35d943e8b99bfb05c05942b817b29c986afa441458dfeac5b544caf8256c5ccf361168a3079852cb914e8c2cd4435c37536b9bace1c707bbaa269 SHA512 a3e2f1a41cc430d37d7252e15e5cf04a5c754e1ecb9b4d9e7fd3a3bb6b721d2b4d1d86d55e068d44df0e40912e6bf7a0ebf527b11d2cba07604fc29f5b69943f
-DIST makemkv-oss-1.14.1.tar.gz 4384005 BLAKE2B 56ec40d46b0d807b552b87e44b129ea982ac5c0cfe4baf4e49a32ebefedd5be9bad8edc69cc5f81a06960e8d6a24ce37fc4f0c914dda32320af3242c3b6fe589 SHA512 4d0bf778d2efd417d058b6db339dc47363b3e179734ec51fc5ebd1fe35d4040aac06ca6387a77362dca8598e8eb5d4db6be16aeea00dc7a3655bf36be26998e5
-EBUILD makemkv-1.14.1-r1.ebuild 2871 BLAKE2B eb3e55734070fa944bd19811596646fc229d362f652286c611c85dd3e8b5cdcc00cbaf172a596203b498f5eefe7e4d2f7de1cf7ae3052d5cde860677f597ec7d SHA512 5f9fe9510376ad062451b585371d0a2ae54afd24cbcd4e367dbc8ec3137cd3168384a2e78c8eff689c6d3f07eab3a8b806d706468272e054eb476672ec26592d
+DIST makemkv-bin-1.14.2.tar.gz 9332443 BLAKE2B ef569688aa2134b0549d2474798ca8f50a99eebb42fd45f68502d06fe1334bd9a94abb5f9ca550948db707dd6e7746a9e8e0fdea1a149ab71fb5ae931ffb9a35 SHA512 1c1eb7c5dc7d2db5518823cd2996b427bbe3a38b25e615355d37c75dcda55263b7fbf554abfa7d3e65733707117150cfc408ab678438d868d67afeb9e4021e2d
+DIST makemkv-oss-1.14.2.tar.gz 4384065 BLAKE2B dee07ffc86f95ebbae47d7e56c5b9637462e06e7d75ce93019e7ae7d2845c19b7dee24537bfab38d512e047640803d7df07fd4b3d92ebece553dd3a0c35f16a7 SHA512 cbbe7afa4fcad7e1d21d41badb01c7b4a5a6bb6239d45994d3c405291a0cf651cbd0bbd63ed30884db228457968d17a83ab25dae932a23d3b3aede7ee90437e5
+EBUILD makemkv-1.14.2.ebuild 2871 BLAKE2B eb3e55734070fa944bd19811596646fc229d362f652286c611c85dd3e8b5cdcc00cbaf172a596203b498f5eefe7e4d2f7de1cf7ae3052d5cde860677f597ec7d SHA512 5f9fe9510376ad062451b585371d0a2ae54afd24cbcd4e367dbc8ec3137cd3168384a2e78c8eff689c6d3f07eab3a8b806d706468272e054eb476672ec26592d
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/makemkv-1.14.1-r1.ebuild b/media-video/makemkv/makemkv-1.14.2.ebuild
index 72c2f91d17cd..72c2f91d17cd 100644
--- a/media-video/makemkv/makemkv-1.14.1-r1.ebuild
+++ b/media-video/makemkv/makemkv-1.14.2.ebuild
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 4f7f48ab1b76..fa7659d34c32 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,5 @@
-DIST mediainfo_18.05.tar.xz 1359000 BLAKE2B e82e337f7ec7158bf8b9222fae8fc65b16211a42214f0f24003c0eebee523cf7d383aee827e4170a5317e8c470eb637ebb7154fdd2f104f2c1ce9913e8b4519e SHA512 10ffad5828d7afe83533e6e850f7124499fe1cdce024c9f3f46c5ab2333e19d40747feea641ce0b8a8d37f9aa069db39e205d0ac2bf1f5189ee2b044d6d7e2bf
 DIST mediainfo_18.08.1.tar.xz 1392800 BLAKE2B 426c9b560e31c10e5ba1a3d2a02e7a3cf2e89410e64ec800ff2881939d8774205eb134bfa5685866705e3fe424954edce91cdfea60e060249bb5cb7f10fa4da3 SHA512 ff807138a253dfe8ea79d568a0c742e9391709e1e0ae3c5d0ce0e5345f2306057b541e5eb2bdd6bf0032f287b2387dfc21a506698ccd2c81a9f70679cf518480
-EBUILD mediainfo-18.05.ebuild 1603 BLAKE2B 1d6c4c5e6c9aac199d3b0b6013406c6d206ba593e551a49b4363c535de99e06d68be8fc0ba8d84af8545a72baf767aaf4002657a54a94e9c24527a491dcb5e2f SHA512 927729dcb410b7458fdaf656392e64f4173ef69b158d161c04753cd29bb8c313fd8c574c33a529951a3cc27caa34b6377bea4869b8ca27d1187a4cae3ed0e55a
-EBUILD mediainfo-18.08.1.ebuild 1605 BLAKE2B decd7c6b5e41d3a0f649eb5d197bc399961b7bf7e7155ac85f92ff15aecac309f7d6cc93bfaf926765cdd5c7c9439f04be4d3564b0712f580e685489edc56378 SHA512 d99a91de941f042dc88db5c746efdcee1f6ea93ffd9d99f56edbf8c8dbb385c7a4bd7db19c2fd6c7631605694648dc2e745b371cf1f57563d4d339c37658afc0
+DIST mediainfo_18.12.tar.xz 1397888 BLAKE2B 11ee571136c2f4e82af210c0a345284c1188ef501c3ea8bd0ebad3808334d388f83abbe0e36118bc3752465ffbe989396be3c3578d124736a4579cb1fb64a031 SHA512 f5e70b075516ffa21f41d049b64f00275387366e5bad4bb331211db9e7449035bea2acbe37bf7074499ed56a01d45b8e94b078ca52334591f4dd9b985d3cc3a0
+EBUILD mediainfo-18.08.1.ebuild 1603 BLAKE2B 1d6c4c5e6c9aac199d3b0b6013406c6d206ba593e551a49b4363c535de99e06d68be8fc0ba8d84af8545a72baf767aaf4002657a54a94e9c24527a491dcb5e2f SHA512 927729dcb410b7458fdaf656392e64f4173ef69b158d161c04753cd29bb8c313fd8c574c33a529951a3cc27caa34b6377bea4869b8ca27d1187a4cae3ed0e55a
+EBUILD mediainfo-18.12.ebuild 1602 BLAKE2B bda6db1ccb3274c4b8c4f9c18f912e029e39d47a3cbe23c4a707e9fbb8ff4a29eb22cd6ab13045dbb93645b7186670a00ae12c50c4fc5c56a0a5c56aab7745ac SHA512 1302ea93ac6a557bd3969dbd847911ba447993bee3bfca578df424611d69e7a918fe8bf841a3707ca824dba00aef2479f152720aa4257af8a32ee0da6cc0f38c
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-18.08.1.ebuild b/media-video/mediainfo/mediainfo-18.08.1.ebuild
index 8f0fa38d3856..c1e8e6060b13 100644
--- a/media-video/mediainfo/mediainfo-18.08.1.ebuild
+++ b/media-video/mediainfo/mediainfo-18.08.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/mediainfo/mediainfo-18.05.ebuild b/media-video/mediainfo/mediainfo-18.12.ebuild
index c1e8e6060b13..06548372fa66 100644
--- a/media-video/mediainfo/mediainfo-18.05.ebuild
+++ b/media-video/mediainfo/mediainfo-18.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 4c5d6d2d06e0..11b8d32d5a94 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,9 +2,11 @@ DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce
 DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
 DIST mkvtoolnix-22.0.0.tar.xz 4714712 BLAKE2B 325a0a250db8c6c833b01e6bb613044ca21b4061cbbd516ee6c60388b17c9c3759cf9759af0e2c23091d8044fd86358122e0739bf7d6133be9befca37c6d0294 SHA512 59d299f21d484dc529dafe81a35d3351e4f57abf6a2d8889692d95b9b9ffacdca9b55a3cf373b147f3ff12595590bf98f49af5d22d311b9b2d03f12a4bba00a6
 DIST mkvtoolnix-23.0.0.tar.xz 4729056 BLAKE2B a264b482f141de502fb4c4aadcdc0ec1ed4e34d2ddc906d8d1f6a0b1ea76511a590ab9d90e035955aa138512877848752185012b8e7e1aeed3007c186c796190 SHA512 3c9072b54a4076e6fb934d40a2c2554dfa1316de1cb8d74ab262b0584eda1e679324aaf690195f68590413f9d3ca34d5d2a1f9f5545de065fe2db892eee19ffb
+DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761 SHA512 bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c
 EBUILD mkvtoolnix-21.0.0-r1.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-22.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-23.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
-EBUILD mkvtoolnix-9999.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
+EBUILD mkvtoolnix-29.0.0.ebuild 2920 BLAKE2B 57f7ebdaa2d39f180bc123ccef3f976a28e58aac54b1ec851c0b1f5d7d8a53b5915082718e380d851fddd7173fb53ab90d86ba89fe40f5c89aeb3e914dbb6b60 SHA512 fce50ac64933c2a20d6606395810bb21887756d0e447da65dae01a006db8964d04e303b8b61c7f471209de8c5b553ab189aafb4e96db3f03193181e84dc9df0d
+EBUILD mkvtoolnix-9999.ebuild 2920 BLAKE2B 57f7ebdaa2d39f180bc123ccef3f976a28e58aac54b1ec851c0b1f5d7d8a53b5915082718e380d851fddd7173fb53ab90d86ba89fe40f5c89aeb3e914dbb6b60 SHA512 fce50ac64933c2a20d6606395810bb21887756d0e447da65dae01a006db8964d04e303b8b61c7f471209de8c5b553ab189aafb4e96db3f03193181e84dc9df0d
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
new file mode 100644
index 000000000000..865f816c46ce
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nls pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+# TODO: package fmt (http://fmtlib.net/)
+RDEPEND="
+	>=dev-libs/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.5:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.8:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+	test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable qt5 qt)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--with-boost="${EPREFIX}"/usr
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myeconfargs+=(
+			--with-moc=$(qt5_get_bindir)/moc
+			--with-uic=$(qt5_get_bindir)/uic
+			--with-rcc=$(qt5_get_bindir)/rcc
+			--with-qmake=$(qt5_get_bindir)/qmake
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	doman doc/man/*.1
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index cc20f8c7ff38..865f816c46ce 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,11 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug pch test qt5"
+IUSE="debug nls pch test qt5"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
+# TODO: package fmt (http://fmtlib.net/)
 RDEPEND="
 	>=dev-libs/boost-1.49.0:=
 	>=dev-libs/libebml-1.3.5:=
@@ -34,6 +35,7 @@ RDEPEND="
 	sys-libs/zlib
 	qt5? (
 		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
@@ -44,11 +46,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ruby/rake
-	sys-devel/gettext
 	virtual/pkgconfig
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
-	app-text/po4a
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
 	test? ( dev-cpp/gtest )
 "
 
@@ -70,11 +74,22 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable qt5 qt)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--with-boost="${EPREFIX}"/usr
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
 
 	if use qt5 ; then
 		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myconf+=(
+		myeconfargs+=(
 			--with-moc=$(qt5_get_bindir)/moc
 			--with-uic=$(qt5_get_bindir)/uic
 			--with-rcc=$(qt5_get_bindir)/rcc
@@ -82,16 +97,7 @@ src_configure() {
 		)
 	fi
 
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt5 qt) \
-		$(usex pch "" --disable-precompiled-headers) \
-		"${myconf[@]}" \
-		--disable-update-check \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 40442206fc44..510ed0f689e7 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -10,7 +10,7 @@ DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5a
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.27.2.ebuild 10646 BLAKE2B d540c5bf23ccaca0a46462b64e615468d6f3f7f60d834da91f200e1919db3ab5f8624d3545fe583431908bef16e24aa60fe1023cd11b913840590aecf5519906 SHA512 e233419cec44ddc5d2391a3dca4795772f3c0fec57f8f306e05a9abd53c163b29402458fc11b76a5508cfa6c01a0205d6b8a49eec64b4d9b9097bc36523a2b3c
-EBUILD mpv-0.28.2.ebuild 10447 BLAKE2B 2af786cb54863f244f32f0e509593f1c48ed147a92adfa2985dca7e82740c6358f4610b8b2e8a8788985992b66b234d775fafe5ac1c62672c4661a26fe2af9eb SHA512 cc1b2e724d7c8a55caadee3cdfed66ab94e0e146354f2813109ebb47ffdd82aa3181dd8febc9d84500f739b9e4b2fe6e6f74dd9c9f494edadd8508152962ec44
-EBUILD mpv-0.29.1.ebuild 10223 BLAKE2B eb243469d7a854e1b8d2b5e7dea8f80f39d563e6508b6e9c53d73a11f8277ad66088a0b30d019541228cbb22314f2e6b7cd6698fb73bb0d15a7c4cff3a1803b1 SHA512 7b4a790f6058fa7b168b241b86384479b10331ff50ad091b2c7ba6be94e9b3be657f7411d5d02fb0e6778ff17a092fbcd841bd0e7f379611d248aebec484ca52
-EBUILD mpv-9999.ebuild 10226 BLAKE2B 4a673a4e9febbecdd5be0af8965db6bc6ce83f711fa170993f196b3be62fe1bcf5a22c324c9c44c8241e4a5552c79322b4a5a7de6ad019d4bfb101cd09acea7a SHA512 c39b92265226730c7fb36472dcdfb5fe2a0ccaf9859a9f26ba49966ab28b48476f36c1b17c7852e3f9eaab817da1bacfc0cc0efd5083f4d0e9de3ad43f76bdce
+EBUILD mpv-0.28.2.ebuild 10437 BLAKE2B 7b023dc9fe707d46efdb2947e1efc3d07245f594e52e93bb856f55aa48f0f63ec8d27061ae677431dd4da92e3442014a2cdbf71b5a01e7f216edc18f8482ef8f SHA512 eafcce65554bc4e4c8f64fb52621b87906fc0c3ae02805a59a94a048de4f03d5675b0f53313b7b4b8f9f2d5eda7f21462374ad6ba4831d150f3a404ce222ba8a
+EBUILD mpv-0.29.1.ebuild 10216 BLAKE2B dbebec477d2f15a38dce4efba2e4ca2194a2a7b5081dcf119f0084d07a5a20d34579e8e5f6ecc5e7bcb4c39fb0280600132158570de14e3fc7e560d5c8a1aeb5 SHA512 3588feb116a7f7bd1fdccac7e047c089c3c8769fda71542673dac706e07620b43f3efe918ca2cb87a9143a4a67e7776de382693348cf3b2d37c592c6026b0af0
+EBUILD mpv-9999.ebuild 10216 BLAKE2B dbebec477d2f15a38dce4efba2e4ca2194a2a7b5081dcf119f0084d07a5a20d34579e8e5f6ecc5e7bcb4c39fb0280600132158570de14e3fc7e560d5c8a1aeb5 SHA512 3588feb116a7f7bd1fdccac7e047c089c3c8769fda71542673dac706e07620b43f3efe918ca2cb87a9143a4a67e7776de382693348cf3b2d37c592c6026b0af0
 MISC metadata.xml 2434 BLAKE2B 49d49e82a085bc55ca6ace16fe6d90d66988cc5e63837a4c1cc479b14fe0c83aae87478a9dc0a209f28f03a7f17363e42f64753d9d1496b671669a7add3dab2c SHA512 3a14c0d283f6369fcc3ea160d53dbdf44b41fa5ddcc2c5e724040c2d462542f6638b763984e7b47e1d69eab25a4347d5f821b5ebe5bc4bc5471f0f8b7e615af1
diff --git a/media-video/mpv/mpv-0.28.2.ebuild b/media-video/mpv/mpv-0.28.2.ebuild
index d43b6047c641..feb5199d743b 100644
--- a/media-video/mpv/mpv-0.28.2.ebuild
+++ b/media-video/mpv/mpv-0.28.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/media-video/mpv/mpv-0.29.1.ebuild b/media-video/mpv/mpv-0.29.1.ebuild
index 55c06fc8520b..9607105c7d3f 100644
--- a/media-video/mpv/mpv-0.29.1.ebuild
+++ b/media-video/mpv/mpv-0.29.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index ba554e7956f9..9607105c7d3f 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/media-video/nvidia-video-codec/Manifest b/media-video/nvidia-video-codec/Manifest
index b79673c946f7..f86b6c689da6 100644
--- a/media-video/nvidia-video-codec/Manifest
+++ b/media-video/nvidia-video-codec/Manifest
@@ -1,7 +1,9 @@
 DIST nvidia-video-codec-7.0.1.tar.gz 44283 BLAKE2B ef658547ad8776f77cee3203d3bfa49ef96834ecfcfbe44513658b2966932dcbded8c1bc6327f432bc56ddaba97507ca2c4cbd39e1dcd7b244a93dff56e8c8c3 SHA512 246e7fee4430f755ca93f1343d2628c5a6de8fdb5826694eabb777ec693f5fa944147a582a96fce38f318d1a9e60e94ca94ef4e27313e3b38970b750fa17d3b4
 DIST nvidia-video-codec-7.1.9.tar.gz 44547 BLAKE2B 78f64b7a89f375dfae5061daa291304d09e1c1580a91a7c53f0b850f804e8a52402a58b501b6397626e30a67bb442cd34d33b39865427dc21ec54c8997b5f97f SHA512 8890c668b1ee73de9c6447c0d2ae9ab857927694c7de038d6028ac5a5205c95c0c3629ad8a3950269c7693cd877cf9c9e24f5c4d332a46d27ac79747f2383685
 DIST nvidia-video-codec-8.0.14.tar.gz 47388 BLAKE2B 6d74b201d36f0be21576de858768166ed701068b4105520725af02864378cc68f14ca9e2233404d726d553485edf0e4d5204081c04ef456ca32d77bf4944b12c SHA512 08f8ff6b9c4a595716d423262f96e4647df1e2fa3d57a98ac2c26da031a15d61600aeb84c97c7d05fdfd42cfcf5800be58aff49ae1379f02c0b4408ddda2269c
+DIST nvidia-video-codec-8.2.16.tar.gz 51998 BLAKE2B 3692fe9d7d986e7f54285b57445d28531deb0a4119279a31320a01963d1498e5f080e167c38edfa51f17a8f78d769e92ff380e9a63576f069b10562a8ca03f92 SHA512 d144203b38f6a2e21f7dc0a73e4c2c4a2d2abccd56ae459df0daea0ac79db76af0e7ab2ecf87be8a56c4ebaf8a3fb0857bc6f59c22ab9c29638410742c4d835d
 EBUILD nvidia-video-codec-7.0.1.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193bd3713f5ef00f140dd3b0313bdf7805017bd4496ec80f93f8dd852aaa04ed2c1e736856352a2d2e55166543308c05b3e41d SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a
 EBUILD nvidia-video-codec-7.1.9.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193bd3713f5ef00f140dd3b0313bdf7805017bd4496ec80f93f8dd852aaa04ed2c1e736856352a2d2e55166543308c05b3e41d SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a
 EBUILD nvidia-video-codec-8.0.14.ebuild 543 BLAKE2B 21cbdf9ee4312087212b2b0192193bd3713f5ef00f140dd3b0313bdf7805017bd4496ec80f93f8dd852aaa04ed2c1e736856352a2d2e55166543308c05b3e41d SHA512 450fc1260cea3a1295ad49c56718398f1711917169b3d51b7596725ccefccf6b898d3d5a6f73e9d4c0366d21d53ba257c44af31260894f61135392eea18b8a9a
+EBUILD nvidia-video-codec-8.2.16.ebuild 540 BLAKE2B 06180170f102cf9c52d0774a25d06fe61401671184128990f5f6613c0e907042761c04c7d63980025e97c25a492c345a1bdf37a6ae6805c92120ef29bb03f87d SHA512 30bd0dddfc3f1bf76c863fdc5140179e44d6c2f0bc5faa2ebfe0e5c3d8705813a8f819cbb8af4b063533e68c80a1b0dc674e32f7fed32084510ac9213530985f
 MISC metadata.xml 322 BLAKE2B 631129a38bbe26c8289d032210c2df0d0dd8160aefd5f05fb8da83c9a9fe8bd0e1916dbeaae883389869eae1b3420902c355c0ab473624f0756f29daa72009d2 SHA512 605ce8c99fd9be9627fd9b3afd491df585b9e5aff955af1964fb51482c4fa0b18e8047cc3715be2977bad4ace03cfe0330eed44fdaa5267feb9c2840cd233870
diff --git a/media-video/nvidia-video-codec/nvidia-video-codec-8.2.16.ebuild b/media-video/nvidia-video-codec/nvidia-video-codec-8.2.16.ebuild
new file mode 100644
index 000000000000..c168522364a6
--- /dev/null
+++ b/media-video/nvidia-video-codec/nvidia-video-codec-8.2.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Redistributable headers to build cuvid and nvenc"
+HOMEPAGE="https://github.com/lu-zero/nvidia-video-codec"
+SRC_URI="https://github.com/lu-zero/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-util/nvidia-cuda-toolkit-7.5
+		>=x11-drivers/nvidia-drivers-367.35"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/${PN}/include
+	doins *.h
+	dodoc README.md
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 1f01fb5fef94..6f41b1a1d87d 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,6 @@
-AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac478d4c9606a0f520fb31c0f736f6dad428222cadee5c46b29e2467928fb5adb43f2c4e18aba31db105f6738c3c3e4dca43c5 SHA512 a640a894921f065c58236c2c09a93984f9f3c32a00934bec3a55ad7636d623a0df2e847bd86d9f184ee62284c5bcfe18cb1a9e4943b05260ee6cc0e38dc1bc2a
 AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38
-DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
+AUX obs-studio-22.0.3-fdk-build-fix.patch 1722 BLAKE2B 253b26a37c76d602ec10694af9987c1b91e7360bb01c2af1b346faef98762b2674701f526f7fcebac260904d7607ef84fc679e09e17d38f5e47a669e7bc65412 SHA512 527e24c2231d6191639d3255b6e1be37d58d68a596fce747e0fd1ebf80e35bd458d287c3e736993667cfbae458db8e2ebfab25a5457aaf102c58472144cb222b
 DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04
-EBUILD obs-studio-21.1.2.ebuild 3147 BLAKE2B 8b342dd1f7170333447f848e280e9782d9ebe14de2015be81712cc8c1b025475b5eaef5be1ed2d1eb70084d7de5340ccaa239be8938543143a18802dd5f1d54e SHA512 361d888d91502fb15cfebb87aeee71f953719b5a26987f914cc9dc43d038069bef12c6963e979a77e64e084cb5de3bf5482be65ec1b77d051faeacb3c68f89c1
-EBUILD obs-studio-22.0.3.ebuild 3102 BLAKE2B 7428fb9eee153659fd5df973c73a462db5a4abe5836b2cae38cc36586282388ca95ef18258d5f6bc8e711b3131f559767bb4f8e4db5f5c7e59ec110df3e56fac SHA512 33e4e6f1de604ffedf22d04d5ef428f33af3a8e5c4697edadcc155038db7d029fe061b3edee14ef89ef330734d39c940b80eda30df9fa4886c8510db6b9e86a0
-EBUILD obs-studio-9999.ebuild 3006 BLAKE2B d3956db1caeae26675fe91941fc3b780358cb36e7bcc2eb68ded56d31b5b9b02eaf16d9e2c8b0301780676ad0d734705e387220d720b4471e5c57a2e40675c95 SHA512 16521f48909777b04d3a427adf666616b5498799e63d2ba17350d0e6fa64f3c1beb74eb6d61d59be1bc0cc09955d349f02e3f86a6de5ab12fa89846bd19327a0
+EBUILD obs-studio-22.0.3.ebuild 3168 BLAKE2B 7bbdd693dd3e76732fe4f097295ea179117c1ed3b32911ee8f7958a396d4783b9b300e2e66a35412986b4d443d2dc8e710da77b41b0433a39198749d67fae687 SHA512 06c6b315ea1544e1e48369eff4b9dd22278030ba5045756f55a379bba964db9e2dc14dd1a0766e45db52b1e62e405e8d13c8841d5e0d461795fbf72448acde59
+EBUILD obs-studio-9999.ebuild 3010 BLAKE2B 4669e7f87289f4f2d2530edba03d80681d130daaefc84e29dd5590c163736858180a1807b95dc9f991c96373ec076bf6b1959c0a3e736e4a46d90d7d370563e5 SHA512 5e6f735e6037ada9b35a4eed27b61165ee017e57576deb4f5b3278f1476f6f6ea8035873786c2e243041c2822fd2a1675664452c7404ab66e5dd3d2666a0104c
 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
diff --git a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
deleted file mode 100644
index 6eb7f7c3ca8d..000000000000
--- a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4fd06b9825465ae5eb2a9b862cdb89098f655f14 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Sat, 17 Mar 2018 18:16:39 +0200
-Subject: [PATCH] frontend-tools: Include 'QAction' to fix build against Qt
- 5.11
-
-Some headers are no longer unconditionally included, leading to
-build failures.
-
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
----
- UI/frontend-plugins/frontend-tools/scripts.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/UI/frontend-plugins/frontend-tools/scripts.cpp b/UI/frontend-plugins/frontend-tools/scripts.cpp
-index d923dcf610..364757e48b 100644
---- a/UI/frontend-plugins/frontend-tools/scripts.cpp
-+++ b/UI/frontend-plugins/frontend-tools/scripts.cpp
-@@ -12,6 +12,7 @@
- #include <QFont>
- #include <QDialogButtonBox>
- #include <QResizeEvent>
-+#include <QAction>
- 
- #include <obs.hpp>
- #include <obs-module.h>
diff --git a/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch b/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch
new file mode 100644
index 000000000000..73329cf8040c
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch
@@ -0,0 +1,52 @@
+From 5cf2b5fbf925412620e2a40552d6348203851cb3 Mon Sep 17 00:00:00 2001
+From: pkviet <pkv.stream@gmail.com>
+Date: Thu, 29 Nov 2018 21:10:45 +0100
+Subject: [PATCH] obs-libfdk: Compatibility fix for new API
+
+fdk-aac v2.0.0 (aacenc 4.0.0) changes the AACENC_InfoStruct:
+the encoderDelay parameter is replaced by two, nDelay and
+nDelayCore. This patch checks the lib version and adjust the parameter
+accordingly.
+---
+ plugins/obs-libfdk/obs-libfdk.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/obs-libfdk/obs-libfdk.c b/plugins/obs-libfdk/obs-libfdk.c
+index d6eb496184..94b139de57 100644
+--- a/plugins/obs-libfdk/obs-libfdk.c
++++ b/plugins/obs-libfdk/obs-libfdk.c
+@@ -9,7 +9,6 @@
+ 
+ #include <fdk-aac/aacenc_lib.h>
+ 
+-
+ static const char *libfdk_get_error(AACENC_ERROR err)
+ {
+ 	switch(err) {
+@@ -224,7 +223,7 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
+ 	void *in_ptr;
+ 	void *out_ptr;
+ 	AACENC_ERROR err;
+-
++	int64_t encoderDelay;
+ 
+ 	in_ptr = frame->data[0];
+ 	in_size = enc->frame_size_bytes;
+@@ -261,10 +260,13 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
+ 	}
+ 
+ 	*received_packet = true;
+-
+-	packet->pts  = enc->total_samples -
+-	               enc->info.encoderDelay; // TODO: Just a guess, find out if that's actualy right
+-	packet->dts  = enc->total_samples - enc->info.encoderDelay;
++#if (AACENCODER_LIB_VL0 >= 4)
++	encoderDelay= enc->info.nDelay;
++#else
++	encoderDelay= enc->info.encoderDelay;
++#endif
++	packet->pts  = enc->total_samples - encoderDelay;
++	packet->dts  = enc->total_samples - encoderDelay;
+ 	packet->data = enc->packet_buffer;
+ 	packet->size = out_args.numOutBytes;
+ 	packet->type = OBS_ENCODER_AUDIO;
diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild
deleted file mode 100644
index aa981e49491a..000000000000
--- a/media-video/obs-studio/obs-studio-21.1.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit cmake-utils gnome2-utils python-single-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	luajit? ( dev-lang/luajit:2 )
-	nvenc? (
-		|| (
-			<media-video/ffmpeg-4[nvenc]
-			>=media-video/ffmpeg-4[video_cards_nvidia]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	speex? ( media-libs/speexdsp )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}
-	luajit? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
-	"${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
-)
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DOBS_VERSION_OVERRIDE=${PV}
-		-DUNIX_STRUCTURE=1
-	)
-
-	if use luajit || use python; then
-		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !luajit)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild
index a2403c9502a5..c15bd0ab0710 100644
--- a/media-video/obs-studio/obs-studio-22.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
 inherit cmake-utils gnome2-utils python-single-r1
 
@@ -67,7 +67,10 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
+	"${FILESDIR}/${PN}-22.0.3-fdk-build-fix.patch" # bug 672430
+)
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 991fa7ae9912..9cd8bdd75172 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
 inherit cmake-utils gnome2-utils python-single-r1
 
diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest
index fbaa32043684..552e249fc57a 100644
--- a/media-video/peek/Manifest
+++ b/media-video/peek/Manifest
@@ -1,7 +1,3 @@
-DIST peek-1.2.1.tar.gz 2650099 BLAKE2B 4b53bc6cce94c585029d179937c680a3743fabc9722cc9474dd870f4be1d1d79c994420e528581c0006df81f6b6caaad285fc9f35c0addd1ae0072b40f461786 SHA512 fcb3b30bc7b434e9daafad243f82d2849d308fcd22371cdf790b60f765b78d6009ffb3c519f571718e26cf285d1cc6bc8fdd3f61dbb427f95fd08f1e3cc52a42
-DIST peek-1.2.2.tar.gz 2654168 BLAKE2B 2abce1609889d6cbdee493a94d768c2c201d523690d687cfa023eaa966b74716b9300ed246f443258f2901fdf341392c7428bf8d14891c3fdba9e803b680e06b SHA512 7c6fe42e41d4a3c10649b2052741a11a3c51170dbeaa834198c5b66867597c8525ecb8794694c2955f94a3e12f62c71068f2422e3a551ddfa4957595efbb6c03
 DIST peek-1.3.1.tar.gz 2654939 BLAKE2B f5d2b6c9ca1194891ff6a61c73bcfc63a6e0bbf8a282c4309bbedbd40e29e42ad78d9c37c8a3621ceb6cb2ad85bbf2364702f1db028f6282dd4f93e15d22b34c SHA512 cdf4190c555b0a40051862038c04dc7c164bf8bccf47202d0fcb74f527a8a7d5605bc2e112847e262e51a5a95c3d2b3497e4ec56834880564e8e4127869ad9df
-EBUILD peek-1.2.1.ebuild 1035 BLAKE2B c54cf88f3557196bb414b84818325c518aa330ccd5592f85897c4385933a07917c56391cb329b742024fb82d04afed2c9b98682b680afa1129c07a7d45648219 SHA512 dd916c9ec2668cae67187da7917b6a2d390933fe2c1deb7b8f8280fa4b4deb70bed5f96bc245cdcbde09cef598e3cc570174244d3d0f34545b4496506ed146ef
-EBUILD peek-1.2.2.ebuild 1035 BLAKE2B c54cf88f3557196bb414b84818325c518aa330ccd5592f85897c4385933a07917c56391cb329b742024fb82d04afed2c9b98682b680afa1129c07a7d45648219 SHA512 dd916c9ec2668cae67187da7917b6a2d390933fe2c1deb7b8f8280fa4b4deb70bed5f96bc245cdcbde09cef598e3cc570174244d3d0f34545b4496506ed146ef
-EBUILD peek-1.3.1.ebuild 1035 BLAKE2B c54cf88f3557196bb414b84818325c518aa330ccd5592f85897c4385933a07917c56391cb329b742024fb82d04afed2c9b98682b680afa1129c07a7d45648219 SHA512 dd916c9ec2668cae67187da7917b6a2d390933fe2c1deb7b8f8280fa4b4deb70bed5f96bc245cdcbde09cef598e3cc570174244d3d0f34545b4496506ed146ef
+EBUILD peek-1.3.1-r1.ebuild 1036 BLAKE2B 5e6273df5b3c0b46c50af017e34652a88fb8fad348e1fdc9a537e03bc43c607f939db8dc77add8777b3d64823ce06a443c9b2d03363cc5b0b902ba855e9365c8 SHA512 27077d559fd7911f3e15084c4c2e8fa77dc77ae9b035ec2cf37c2eb2c8db62825a47432f87f1f4a81eaebf9172e2e5445979a2dbb1e9970af5207a1689135943
 MISC metadata.xml 442 BLAKE2B 0737081df17bd9a248ff54ed5f788f5488c5506cb23de18dd57ade4e87f328a96fc249371cf2e78b8399528b3a3759440ceade1f16d0d1bd11a62263e12b4854 SHA512 c94b68c460e7d302d1761ba0d7adb23530c862e1a64b48f0688b68678a353cc7ae54433e6517c564e457c5ee5dac3ca6325ef967d11c66ae998da2348854296a
diff --git a/media-video/peek/peek-1.2.2.ebuild b/media-video/peek/peek-1.2.2.ebuild
deleted file mode 100644
index 8715e8e623aa..000000000000
--- a/media-video/peek/peek-1.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome2 vala cmake-utils
-
-DESCRIPTION="Simple animated Gif screen recorder"
-HOMEPAGE="https://github.com/phw/peek"
-SRC_URI="https://github.com/phw/peek/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="keybinder test"
-
-RDEPEND=">=dev-libs/glib-2.38:2
-	media-video/ffmpeg[X,encode]
-	virtual/imagemagick-tools
-	>=x11-libs/gtk+-3.14:3
-	keybinder? ( dev-libs/keybinder:3 )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/txt2man
-	>=sys-devel/gettext-0.19"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGSETTINGS_COMPILE=OFF
-		-DKEYBINDER_FOUND=$(usex keybinder 1 0)
-		-DVALA_EXECUTABLE="${VALAC}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# Compile helper programs for tests
-	if use test; then
-		cmake-utils_src_make -C tests
-	fi
-}
diff --git a/media-video/peek/peek-1.2.1.ebuild b/media-video/peek/peek-1.3.1-r1.ebuild
index 8715e8e623aa..d6a13683e4e1 100644
--- a/media-video/peek/peek-1.2.1.ebuild
+++ b/media-video/peek/peek-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="keybinder test"
 
 RDEPEND=">=dev-libs/glib-2.38:2
-	media-video/ffmpeg[X,encode]
+	media-video/ffmpeg[X,encode,vpx]
 	virtual/imagemagick-tools
 	>=x11-libs/gtk+-3.14:3
 	keybinder? ( dev-libs/keybinder:3 )"
diff --git a/media-video/peek/peek-1.3.1.ebuild b/media-video/peek/peek-1.3.1.ebuild
deleted file mode 100644
index 8715e8e623aa..000000000000
--- a/media-video/peek/peek-1.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome2 vala cmake-utils
-
-DESCRIPTION="Simple animated Gif screen recorder"
-HOMEPAGE="https://github.com/phw/peek"
-SRC_URI="https://github.com/phw/peek/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="keybinder test"
-
-RDEPEND=">=dev-libs/glib-2.38:2
-	media-video/ffmpeg[X,encode]
-	virtual/imagemagick-tools
-	>=x11-libs/gtk+-3.14:3
-	keybinder? ( dev-libs/keybinder:3 )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/txt2man
-	>=sys-devel/gettext-0.19"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGSETTINGS_COMPILE=OFF
-		-DKEYBINDER_FOUND=$(usex keybinder 1 0)
-		-DVALA_EXECUTABLE="${VALAC}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# Compile helper programs for tests
-	if use test; then
-		cmake-utils_src_make -C tests
-	fi
-}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 788a3a58004c..c15ffe15bdf1 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,10 +1,4 @@
-AUX simplescreenrecorder-0.3.9-cmake.patch 3098 BLAKE2B 5f744c8b56e04022a1048f9fb37924ec4443b12da7bd8c6d8569bab302f39cbe7d697948e578e4b2f19050ff78d7a3d278d0c9481aadafc5b9883e7b84923bc4 SHA512 ffcbc6822d1d0fe833018206fc23bf3c880d5a39bb607346b78dcb6d37e320b357f73b4216d8724c30052cebe70cc0167889fbd4c1ddd2a3713cbaf8ad4ae338
-AUX simplescreenrecorder-0.3.9-pulseaudio_dep.patch 427 BLAKE2B 9ce385a87222d4684f6626db9f6be5d7efc04e84e5175a804e415f053c4c3e4684b0b7338615e74801485f1962d1f8ccc114ec357d6c1446ab56816d0880ede6 SHA512 d9616bf99d784c5ab0a1446b965ebec4e089a3ecafc2ed128dbc04747ad2511a84d679e309530369241816b662f527d7109dfb26df13888d8c4f917a99ea2c72
-DIST simplescreenrecorder-0.3.10.tar.gz 1823448 BLAKE2B 5eef2a803be90b357b08ba6a009cd9bfda73bc7c29200de50c32902598b7044aedaa0a39d9eb71ab0a660bb1a3c03f7d57ae2437203037951f06821ce8a417bb SHA512 dc7b9de386b5f87e8315695ef105dea2491d09b98b19029146dd29562fec001bf6b3fd3f30e91bc87bdb55ec87ff213567b5b17a234b0c06c6b7fe93db63d4ae
 DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
-DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2
-EBUILD simplescreenrecorder-0.3.10.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
-EBUILD simplescreenrecorder-0.3.11.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
-EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2913 BLAKE2B da8680a70094428174dd39a169b38cedaec5a4304c031d1024fe5616832252fee8b391889e0de413d291397f3edf39eefc8027136221202f5341b51e542fc5db SHA512 33b9d71372a3fa47492e8afc0d5341b99a2ab33544ca53badabc8678e4f1b2c71a0f6592f7b7c13f6dc6120ca7390b5863ec34a6193402e9ff98245c4bb1f88f
-EBUILD simplescreenrecorder-9999.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
+EBUILD simplescreenrecorder-0.3.11-r1.ebuild 2889 BLAKE2B c741205598595d625fdf83e9df3cc06032b7e7b440fc84d880402af6bf58e75cb23e3aae45f1bae352b94d2437dfa034294984a4c51273af45975e799828e2dc SHA512 ea236e2ad36e41e0c5ff7344028150f4a18e2561e29c8e9ee668d984657cf997ddf51fdb85e7b06f21df4f0d8a6db2689b1ff62c8f29e6b523286d9c660f9759
+EBUILD simplescreenrecorder-9999.ebuild 2889 BLAKE2B c741205598595d625fdf83e9df3cc06032b7e7b440fc84d880402af6bf58e75cb23e3aae45f1bae352b94d2437dfa034294984a4c51273af45975e799828e2dc SHA512 ea236e2ad36e41e0c5ff7344028150f4a18e2561e29c8e9ee668d984657cf997ddf51fdb85e7b06f21df4f0d8a6db2689b1ff62c8f29e6b523286d9c660f9759
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch
deleted file mode 100644
index 6d9fc1fa607b..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 7f8f72ac5f7ba7b060b4366828200050b96a9df0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 21:28:15 +0100
-Subject: [PATCH 1/3] Fix Qt5LinguistTools detection/lrelease binary location
-
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
-Only available since >= Qt-5.3.1 which is a low enough minimum dependency.
----
- src/CMakeLists.txt              | 10 ++++++----
- src/translations/CMakeLists.txt |  7 ++++++-
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 64652c5..5779a49 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -17,10 +17,12 @@ if(WITH_JACK)
- endif()
- 
- if(WITH_QT5)
--	find_package(Qt5Core REQUIRED)
--	find_package(Qt5Gui REQUIRED)
--	find_package(Qt5Widgets REQUIRED)
--	find_package(Qt5X11Extras REQUIRED)
-+	set(QT_MIN_VERSION "5.3.1")
-+	find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
-+		Gui
-+		Widgets
-+		X11Extras
-+	)
- else()
- 	find_package(Qt4 REQUIRED QtGui)
- endif()
-diff --git a/src/translations/CMakeLists.txt b/src/translations/CMakeLists.txt
-index 455fdb2..0902cfd 100644
---- a/src/translations/CMakeLists.txt
-+++ b/src/translations/CMakeLists.txt
-@@ -1,6 +1,11 @@
- # translations for 'simplescreenrecorder' executable
- 
--find_program(LRELEASE lrelease)
-+if(WITH_QT5)
-+	find_package(Qt5LinguistTools REQUIRED)
-+	set(LRELEASE Qt5::lrelease)
-+else()
-+	find_program(LRELEASE lrelease)
-+endif()
- 
- if(LRELEASE)
- 
--- 
-2.15.1
-
-
-From 24db02e2a689e08f737c4d720e195a3758cba2eb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 21:43:08 +0100
-Subject: [PATCH 2/3] Use FeatureSummary
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e770251..cb36d7d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,7 @@ option(WITH_GLINJECT "Build the 'libssr-glinject' library. Required for OpenGL r
- 
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
-+include(FeatureSummary)
- include(GNUInstallDirs)
- 
- # try to guess the correct 32-bit library path on 64-bit systems
-@@ -106,3 +107,5 @@ if(WITH_SIMPLESCREENRECORDER)
- 	)
- 
- endif()
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.15.1
-
-
-From 329ec866097de4f011cd1bbde9dad784acbb487f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 22:07:39 +0100
-Subject: [PATCH 3/3] FindFFmpeg.cmake: Provide FFMPEG_FOUND
-
----
- cmake/FindFFmpeg.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
-index 117e654..993219b 100644
---- a/cmake/FindFFmpeg.cmake
-+++ b/cmake/FindFFmpeg.cmake
-@@ -28,3 +28,4 @@ mark_as_advanced(SWSCALE_INCLUDE_DIR SWSCALE_LIBRARY)
- 
- set(FFMPEG_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR})
- set(FFMPEG_LIBRARIES ${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY})
-+set(FFMPEG_FOUND ${PC_FFMPEG_FOUND})
--- 
-2.15.1
-
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-pulseaudio_dep.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-pulseaudio_dep.patch
deleted file mode 100644
index b5d914e5ef6c..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-pulseaudio_dep.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/MaartenBaert/ssr/issues/599
-https://bugs.gentoo.org/641680#c10
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,9 +3,11 @@
- find_package(Threads REQUIRED)
- find_package(ALSA REQUIRED)
- find_package(FFmpeg REQUIRED)
--find_package(PulseAudio REQUIRED)
- find_package(X11 REQUIRED)
- 
-+if(WITH_PULSEAUDIO)
-+	find_package(PulseAudio REQUIRED)
-+endif()
- if(WITH_JACK)
- 	find_package(Jack REQUIRED)
- endif()
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild
deleted file mode 100644
index da1692bb1d65..000000000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PKGNAME}-${PV}"
-fi
-
-SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-pkg_setup() {
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-
-	# QT requires -fPIC. Compile fails otherwise.
-	# Recently removed from the default compile options upstream
-	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
-	append-flags -fPIC
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
-		-DENABLE_X86_ASM="$(usex asm)"
-		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="true"
-	)
-
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav ; then
-		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
-	fi
-
-	if multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITH_QT5="true" )
-	else
-		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild
index da1692bb1d65..1cf430a123ec 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-multilib flag-o-matic xdg-utils
+inherit cmake-multilib flag-o-matic gnome2-utils xdg-utils
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -95,9 +95,11 @@ multilib_src_configure() {
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild
deleted file mode 100644
index 2f317e44e5d3..000000000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PKGNAME}-${PV}"
-fi
-
-SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-pulseaudio_dep.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-pkg_setup() {
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-
-	# QT requires -fPIC. Compile fails otherwise.
-	# Recently removed from the default compile options upstream
-	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
-	append-flags -fPIC
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
-		-DENABLE_X86_ASM="$(usex asm)"
-		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="true"
-	)
-
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav ; then
-		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
-	fi
-
-	if multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITH_QT5="true" )
-	else
-		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index da1692bb1d65..1cf430a123ec 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-multilib flag-o-matic xdg-utils
+inherit cmake-multilib flag-o-matic gnome2-utils xdg-utils
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -95,9 +95,11 @@ multilib_src_configure() {
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/media-video/sswf/Manifest b/media-video/sswf/Manifest
deleted file mode 100644
index 78fe88e2c167..000000000000
--- a/media-video/sswf/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST sswf-1.8.2-doc.tar.bz2 4330593 BLAKE2B 381e5b9b6d84e8c05b04ccdfcbbe7e3f7038ca97351504c243eb45d4e13edd5cefb849e6d7f5e7db2e37e8722b6b6ada6e9c533f9bee75ca869650087376262b SHA512 b59664e6a4dd4066b722c951d2f9d74e0cf743d99f9afb8e619dc08d46168c84385802193b9b3d218780b09fac6a9607c40e2af544c00b5e459f2bd42477e211
-DIST sswf-1.8.2-src.tar.bz2 3064805 BLAKE2B 53ecda8391803feabe30d4ab3c5b0a4f220f1f1deb31cd74c40b69dfd40bc77d3855f6e13a7713cae8fb0d53395f5b520190c4d02661f5f87254bbba00598897 SHA512 fe955742dfc8146cc398acc7bb46a3b0626a2ded64fe4061abf654ec6ef26b6c1cbafb8d418daef9a2ea789b171a7b410cee1fb58ef8b9faf660122f307ab622
-DIST sswf-1.8.4-doc.tar.bz2 10242097 BLAKE2B dc3000b171467772112fc1f847b5f2d8f032f5a3fc148fa98fccb3ca0297abfca446886ba2c71a8d13ff776da6ad61d7e9291fbcae19a58d903601e7e6723913 SHA512 1b756931e8b0f5af4a77d920f77db467822642edf9f03d66130f0d6b88c95162cfc75278531f1e35132e213b03c755126ec646aa2b181231d6bc82e63ac25650
-DIST sswf-1.8.4-src.tar.bz2 3087054 BLAKE2B 8ef08644f01c289c338072575a73cd2dc28e29a41bf84a9eadb5bd31b0a5bcfc3b00b6ddc5e2e8bdb5b4966cacfc0909e91f25e247b9aa5c1978d5b40d98c97c SHA512 5d82e805c69fb86873d088be017df3e3157f0c230d7635329cd1a088b74932870e51772801d3feb4cae3f31a4b646fa773c0a3154ea78b16fae7a253887f2077
-EBUILD sswf-1.8.2-r1.ebuild 1061 BLAKE2B 7550599072787bdfb3b1af164d41ca899273ec1974410582ce15725a77490ca4e4000a8aee7c1bc779c89be2f9881a98abd6ca71ea877cf781997a58fb25420e SHA512 560914e6aee2ab2a4c408be464dd09e0913a0f3b03471d179ec9f2c10a20dace0c3b674e05dae2adbd70dbfe1c0fee45f2b321fecb40e9c77b33e74135de120e
-EBUILD sswf-1.8.4-r1.ebuild 1061 BLAKE2B 7550599072787bdfb3b1af164d41ca899273ec1974410582ce15725a77490ca4e4000a8aee7c1bc779c89be2f9881a98abd6ca71ea877cf781997a58fb25420e SHA512 560914e6aee2ab2a4c408be464dd09e0913a0f3b03471d179ec9f2c10a20dace0c3b674e05dae2adbd70dbfe1c0fee45f2b321fecb40e9c77b33e74135de120e
-MISC metadata.xml 305 BLAKE2B e641cd61263ea78834d2b41554a6305172cc52fe3e7e3d2f48f4eba6b31431cb6b042d8129db7a768941907798a2c80728e681489ea573fd82b0bfe030c590f0 SHA512 e8f4672570af16ef824da298222eb2f52a07e255e6869aab59ae3271f32d82e382970328b74748baa0f7b5f0cf982e80f0eb361ba92aebe186efb40ef5862d32
diff --git a/media-video/sswf/metadata.xml b/media-video/sswf/metadata.xml
deleted file mode 100644
index b17ce31cce8f..000000000000
--- a/media-video/sswf/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">sswf</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-video/sswf/sswf-1.8.2-r1.ebuild b/media-video/sswf/sswf-1.8.2-r1.ebuild
deleted file mode 100644
index 84d1e81981f4..000000000000
--- a/media-video/sswf/sswf-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 8"
-HOMEPAGE="https://www.m2osw.com/sswf.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
-	mirror://sourceforge/${PN}/${P}-doc.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="virtual/jpeg
-	media-libs/freetype"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-dependency-tracking --disable-docs \
-		$(use_enable debug) $(use_enable debug yydebug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodoc README.txt doc/{ASC-TODO,AUTHORS,CHANGES,LINKS,NOTES,TODO}.txt
-	rm -f "${D}"/usr/share/${PN}/*.txt
-
-	use examples || rm -rf "${D}"/usr/share/${PN}/samples
-
-	doman doc/man/man1/*.1
-
-	if use doc; then
-		doman doc/man/man3/action_script_v3.3
-		doman doc/man/man3/libsswf*.3
-		doman doc/man/man3/sswf*.3
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-video/sswf/sswf-1.8.4-r1.ebuild b/media-video/sswf/sswf-1.8.4-r1.ebuild
deleted file mode 100644
index 84d1e81981f4..000000000000
--- a/media-video/sswf/sswf-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 8"
-HOMEPAGE="https://www.m2osw.com/sswf.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
-	mirror://sourceforge/${PN}/${P}-doc.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="virtual/jpeg
-	media-libs/freetype"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-dependency-tracking --disable-docs \
-		$(use_enable debug) $(use_enable debug yydebug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodoc README.txt doc/{ASC-TODO,AUTHORS,CHANGES,LINKS,NOTES,TODO}.txt
-	rm -f "${D}"/usr/share/${PN}/*.txt
-
-	use examples || rm -rf "${D}"/usr/share/${PN}/samples
-
-	doman doc/man/man1/*.1
-
-	if use doc; then
-		doman doc/man/man3/action_script_v3.3
-		doman doc/man/man3/libsswf*.3
-		doman doc/man/man3/sswf*.3
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 4afa658fa77d..6dd8eb362712 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,6 +1,4 @@
 AUX subtitlecomposer-0.6.6-cmake.patch 454 BLAKE2B 61bce9ca11c64c243aefdee08994d18e0e11a9dc4f985198ab83131b328da20cfe4d92a439395cda3a4d0b3eae6fc9f05531adf41a2955bdf124fc160421c653 SHA512 cbcfba8c34430640eb6351012e1d0358041b5dbd7b1565ab170b5937d51300c85be4331c52181e1176d60a97a0d995685b71559ead096a188fa3879c487fa9df
-DIST subtitlecomposer-0.6.4.tar.gz 1638176 BLAKE2B b71de34df7f9e98d94a541d029bf5a06aafd6c67ded1b87647c176f0579b3f6e6fe79c797e9f438d850f9aad93cc461704ea43590b31ed855673249f6227f4d0 SHA512 585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e
 DIST subtitlecomposer-0.6.6.tar.gz 1637272 BLAKE2B 0a3a7cc7f0301b5ea8cb7affd4600349c8b65bf8a856480e706a3549d8deb7ddc687faad11258d7753e6484783b50fff99ddbd1fc9f68a35fbd0b4346a7a2748 SHA512 0f1513d3ff0abcbd0979b370e1ec4cd0b92f7e65adef8c922ddbf37e2dbc73fb4cd821356df6dc1ba3d8832ab8cba25573f68297f4f6be05b5c4d824a663872a
-EBUILD subtitlecomposer-0.6.4.ebuild 1637 BLAKE2B 81ccde2b2548926de9af7c5b037a004450ec489496a22d4dbbc76c34ac93da04a857047a10b0d3e31b26a1cddc7dc7b601084b5b4a1eac056b4c9754609f9dbe SHA512 e85d6ee1a174bb5156349091358affc4690002c6da7e7b89a1db707ed3317ec786af9999a927d29451684eb705e04c9997299dbaef07f2ec41ec4a76634703e4
-EBUILD subtitlecomposer-0.6.6.ebuild 1881 BLAKE2B 3f67acfa1643230609445c92ef8ec18f2eaba65f0fdd7b20c9b066b2d153c55dcb755fd5f3c6c48f1ca3942266d7da2ab97d5773e6f9d0b4030ed64e4c43f979 SHA512 5d3d1bab8ae075ad9b00d3e876ec4c4b1426ddbbbce1227a4eb7f1c8a63104adae1a20dcfd9f9c10ff77922cd9a0a34e9cc3a6aac7370a5ed89af590a354288a
+EBUILD subtitlecomposer-0.6.6-r1.ebuild 1887 BLAKE2B 9831047dcacaf709f98c3c6b675985393c2576cef8c0611aa8026b7dd0e82026e87e36434f00b3b2bccf2640e91719745ab8de22d881422aabf51d85d1bc322e SHA512 2195648b03d14a6981f04a63c866de1f062bdcd64d0c1409c6dfb461e8f23393455b399bc034bec14ebb21f757506366194d82bf13246dd3a5ba1829818ba764
 MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
deleted file mode 100644
index 46d66e312171..000000000000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
-SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="mpv unicode xine"
-
-CDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-libs/phonon[qt5(+)]
-	mpv? ( media-video/mpv )
-	unicode? ( dev-libs/icu:= )
-	xine? (
-		media-libs/xine-lib
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${CDPEEND}
-	!media-video/subtitlecomposer:4
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-		$(cmake-utils_use_find_package mpv MPV)
-		$(cmake-utils_use_find_package unicode ICU)
-		$(cmake-utils_use_find_package xine Xine)
-		$(cmake-utils_use_find_package xine XCB)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	echo
-	elog "Some example scripts provided by ${PV} require dev-lang/ruby"
-	elog "or dev-lang/python to be installed."
-	echo
-}
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
index 55b113a40f88..9b10563c6fab 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
 SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer libav mpv unicode xine"
 
 COMMON_DEPEND="
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	)
 	libav? ( media-video/libav:= )
 	!libav? ( media-video/ffmpeg:0= )
-	mpv? ( media-video/mpv )
+	mpv? ( media-video/mpv[libmpv] )
 	unicode? ( dev-libs/icu:= )
 	xine? (
 		media-libs/xine-lib
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 17aba23f2be4..f8e6c4fc73f1 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -2,17 +2,8 @@ AUX commons-daemon-move.patch 337 BLAKE2B 79e847ce6e1c32c3cfbe192d8dce33175e2c0e
 AUX mongod-wrapper 101 BLAKE2B cc52f011b065322fb7ebec982c5d0b188f4c72859770dec98bf002d6bcc9c43d520e0845ceaf1458efc4ed07bbccfb5c723ece61298bf6f2bfdebd363bebe4e7 SHA512 5895a2113cc165275587e9683a2e3a7de20ac5db75fc26b00bf55a619bc8ff18ead3f5465cefe0a02bea996d2d178a4954cc7fba84df76e27ea699d2be9ecc96
 AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2becd9569c8086b568e5c84508f2cc71c81605cc124bc17cd42c884d477b15181dba73544fc254610c1 SHA512 1cd4345daf09a27dcb8528abd076e920e30b6ff7a505acad74fdc291164c94569946cd493563331c5e52cb95c45e18522520aee47555db438fa87c46d07e35c5
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
-DIST unifi-video.Ubuntu16.04_amd64.v3.10.0-beta.1.deb 151614954 BLAKE2B 2c43a9f7d497164ed8bace7cd19c6ed88a8b066669ea85af2dcc3bfd7d6eb23140d32c695b48a7793b76822024190d934d651b38dbccb4cfe4de6e8f0ce5114d SHA512 c84fd0477d42fcb79a6e24f11bca593da6862987cce9e213099695a75a63930928c009ceb99c7921b1db1499a2e617a82400e941c1c069b454a9301e8e295f8f
-DIST unifi-video.Ubuntu16.04_amd64.v3.9.10-beta.1.deb 116146196 BLAKE2B 5becd4bfe7e94066a34e809dd3485b906e39d0d79bb81a302ae9168147ef9f1517df5345ba521175b05847299abc556304f75801cd188c7868211217ef3dad59 SHA512 d5b5f9fb458a463f177212c157fdd2293b6bc696f28539347d64ed8c540408321a2683ac7cb350f4a665d1d83dc216b7f849214b6c51ee392b85451a4c9b33c2
-DIST unifi-video.Ubuntu16.04_amd64.v3.9.7.deb 117374890 BLAKE2B b0f274da3052471472cd2405ec0a5d79fd97cbc30f014ede42a004dcffc4d27b9b5ecc36f32b4f60f8c47ba73b85795d2851345f5472b85192cf836bfb929173 SHA512 9a0f48d81f3935baad4004681cabe2ff46f4f86f8770c260c98fbd724de2949427de8ec706d86d612a9ccbcda69ca227aa4a123c3208e0a4ab7c0a51540c06f8
-DIST unifi-video.Ubuntu16.04_amd64.v3.9.8-beta.1.deb 117380976 BLAKE2B 7fea704c3b780d51c3d0fc1de24b74654ba438b5223b368bbd6b42110b98fb22f0aa29816b6acec9961a9fa4f6dbace54361c64c4c12ae6a39b855c9e91702a1 SHA512 a4782c3b5319d7bc54d5df3dc64fdfec86e729636cc2e5479d7ca3a8f5112c57c83c0ac421be3cc0ce88975d6f47dd7bb57743d6802164531fdafed2bbe484bb
-DIST unifi-video.Ubuntu16.04_amd64.v3.9.8-beta.2.deb 117447150 BLAKE2B f42a916e6ce78d02306559f9bb5c09e2a065facbe3abe3055a921b0a11dd7826f36c119eebda3495c8410560b6d5134e8cbbfb5c5a019e575e6fc4cc803e76b2 SHA512 0d9fc72a45fb0e87c7fc98c389c02336d12263d69ce96f17e255e354781ba84882f1f9cf4a4baa14e2638646491273407ccce93e020e75e3703405b48a2a13dc
-DIST unifi-video.Ubuntu16.04_amd64.v3.9.9.deb 117449304 BLAKE2B 0d3805481d587ee4b96265b69c82e27a35867895ae0a5d6496fd81eea4da946928ae2c7fd8d4184e5fb330d7ea6c94a835eaf17deb4e9598b784bb48d29494e3 SHA512 fc5023377c26484589680c3e4496e6b7c05d16b5c167a587dc026f6d9797d6974fe22eec164afbc62ecaf980f1e51ab828f85e9dd8b0dd31214fe54a93e97f4f
-EBUILD unifi-video-3.10.0_beta1.ebuild 1962 BLAKE2B e8bbe2f7b4dd41fd3f5f2dc57fd22839eae776c37b95802706607068dd7c83329027d75ae7065504217ad7ffbb0108273ff3ae50c560c0668eea3e1205e3d272 SHA512 f2d0185fd07de6e2e6a4ed815577748e66c639f697f1e8eb4ed28a90f0bd9af3a8531fbae3575d363fda68f9b7ac45dd5b65c1cc3d224b82738ef23feeda53a3
-EBUILD unifi-video-3.9.10_beta1.ebuild 1962 BLAKE2B e8bbe2f7b4dd41fd3f5f2dc57fd22839eae776c37b95802706607068dd7c83329027d75ae7065504217ad7ffbb0108273ff3ae50c560c0668eea3e1205e3d272 SHA512 f2d0185fd07de6e2e6a4ed815577748e66c639f697f1e8eb4ed28a90f0bd9af3a8531fbae3575d363fda68f9b7ac45dd5b65c1cc3d224b82738ef23feeda53a3
-EBUILD unifi-video-3.9.7-r1.ebuild 1973 BLAKE2B b0a4ae35006ae86c461115a72d60ed9d543a37a4770d20b3db37adccf89129d3f05583200ee4acfd7b3fc3f2797461cb22c4297b979d7010eb8631fbd0aaebed SHA512 8b8f5b6c763bb8dc0c9140ec21051befc7bb83aeaa1dffec2fc9c677af1a5e4b5f77b80ede09b74a672c4139cdc309270a71e0d81d3b62ded95a04648af9f792
-EBUILD unifi-video-3.9.7.ebuild 1915 BLAKE2B 8f5b52c6fcee9b79c2d26299df1a8b7e4c8db8b39d75355eb620e8bc96dba886f3a89b57ffbf42fbee444dda8151272fe0c6cfdd85f601bcc7507ae4837fba6e SHA512 1f55c2c3722a22fd36593b36460994938db7e1dc5b19f1dfeee6917152527863ee175076556583ab8273eb64e39e7e2c7111e4c88f76e4d654f872368d991d6c
-EBUILD unifi-video-3.9.8_beta1.ebuild 1967 BLAKE2B 05de10417fa46867fb208af436bcbf02850cdf1205386e4c6b99a9fdd6393a5fa0ea09a0d8302defc1a280f4f9752c913166e5fe597ef9b8aa1f3719501e9c25 SHA512 da14718873a2fe7f394b5ecf7e323ad39296096d62fd14f957ec28bcec342187d14839dabb54ece452256b3a15b84ed6772156091f61f02a0cd80f3f286a6236
-EBUILD unifi-video-3.9.8_beta2.ebuild 1965 BLAKE2B fd3816a5bf3486934b551687c239d66e4c04991beb55abeafcf0363bd67d28e268e3d0766abc1af27e84f21f9605765b83cdc9271e5ccd44e4e69d1768a5369d SHA512 f26634247a323888d59c97cec4c32c4afe2714d485423a0032c39af8556cff9e1a417e69be8e4b1b49c389bdb5f5aafecfc6e5e0c89887137beb8b13a4cdfece
-EBUILD unifi-video-3.9.9.ebuild 1968 BLAKE2B 8d4f0bceb418e49bcb75cd63b9d1d9caa1f9cb8b90a44aba0646fc50ca72d68d741dda153f1ee20b2f540d0aee99c744933560319b103a55c61e008cb77a63e8 SHA512 d3c8d2208e22daf7fc2bb2ad5a28d88c08c624c3253e8ffc1d9317a74d4f6f3333b66b92ca7c0a5cb1ea3659b0cda68f1c92371b34bad13f4508af956a4ffdcb
+DIST unifi-video.Ubuntu16.04_amd64.v3.10.0-beta.3.deb 162381340 BLAKE2B 701358a3465c09f234854a217a36e6c2b1d8d7f4a58182c16c2f287587135f25d6941d429e4e1457c325e9fc848ef45b27e5ff6f6cd56255b268167c4b456189 SHA512 108c3eaf073ae23efd2b5ebfd4bc0862bdee6598f5a3d6f304efad5e7f6d8dca5864432baa9fff158c244200b4e2e6fc98be5cb169574d39379721a1dc40d2bc
+DIST unifi-video.Ubuntu16.04_amd64.v3.9.12.deb 117448948 BLAKE2B 83769ec07fccbcd955115493510bcd58b88433b7d7204be29d6329674cf4d6dea7fe4b6aedd0e89f852d89ae9a298a9284386aeb4480f43a91dbe6ea958ab10b SHA512 0e2eaefdee74b6b6c5ae54870673591ce4e2d2e4c07e068987f609597c43a12308aebdce705e316555378e04eeb13aaa0c00b496097123960215773cbfa69348
+EBUILD unifi-video-3.10.0_beta3.ebuild 1962 BLAKE2B e8bbe2f7b4dd41fd3f5f2dc57fd22839eae776c37b95802706607068dd7c83329027d75ae7065504217ad7ffbb0108273ff3ae50c560c0668eea3e1205e3d272 SHA512 f2d0185fd07de6e2e6a4ed815577748e66c639f697f1e8eb4ed28a90f0bd9af3a8531fbae3575d363fda68f9b7ac45dd5b65c1cc3d224b82738ef23feeda53a3
+EBUILD unifi-video-3.9.12.ebuild 1968 BLAKE2B 8d4f0bceb418e49bcb75cd63b9d1d9caa1f9cb8b90a44aba0646fc50ca72d68d741dda153f1ee20b2f540d0aee99c744933560319b103a55c61e008cb77a63e8 SHA512 d3c8d2208e22daf7fc2bb2ad5a28d88c08c624c3253e8ffc1d9317a74d4f6f3333b66b92ca7c0a5cb1ea3659b0cda68f1c92371b34bad13f4508af956a4ffdcb
 MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
diff --git a/media-video/unifi-video/unifi-video-3.10.0_beta1.ebuild b/media-video/unifi-video/unifi-video-3.10.0_beta3.ebuild
index f811db81bec7..f811db81bec7 100644
--- a/media-video/unifi-video/unifi-video-3.10.0_beta1.ebuild
+++ b/media-video/unifi-video/unifi-video-3.10.0_beta3.ebuild
diff --git a/media-video/unifi-video/unifi-video-3.9.10_beta1.ebuild b/media-video/unifi-video/unifi-video-3.9.10_beta1.ebuild
deleted file mode 100644
index f811db81bec7..000000000000
--- a/media-video/unifi-video/unifi-video-3.9.10_beta1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=""
-RDEPEND="dev-db/mongodb
-	dev-java/commons-daemon
-	sys-apps/lsb-release
-	sys-libs/libcap
-	virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-pkg_setup() {
-	enewuser ${PN}
-	enewgroup ${PN}
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/commons-daemon-move.patch
-	sed -i usr/sbin/${PN} \
-		-e '/require_root$/d' \
-		-e '/update_limits$/d' \
-		-e '/ulimit/d' \
-		-e '/coredump_filter/d' || die
-	default
-}
-
-src_install() {
-	static_dir="/usr/$(get_libdir)/${PN}"
-	#install static data
-	insinto ${static_dir}
-	doins -r usr/lib/${PN}/*
-	fperms -R +x ${static_dir}/bin
-	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
-
-	#wrapper to work around mongodb-3.6 compat issue
-	exeinto ${static_dir}/bin/
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	#prepare runtime-data dirs which live in /var but are symlinked from static
-	#data dir, and are writable by non-root user
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	dosym ../../../var/log/${PN} ${static_dir}/logs
-
-	dodir /var/lib/${PN}/work
-	fowners ${PN}:${PN} /var/lib/${PN}/work
-	dosym ../../../var/lib/${PN}/work ${static_dir}/work
-
-	keepdir /var/lib/${PN}/data
-	fowners ${PN}:${PN} /var/lib/${PN}/data
-	dosym ../../../var/lib/${PN}/data ${static_dir}/data
-
-	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	into /usr
-	dosbin usr/sbin/${PN}
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/media-video/unifi-video/unifi-video-3.9.9.ebuild b/media-video/unifi-video/unifi-video-3.9.12.ebuild
index c90d0eb2957a..c90d0eb2957a 100644
--- a/media-video/unifi-video/unifi-video-3.9.9.ebuild
+++ b/media-video/unifi-video/unifi-video-3.9.12.ebuild
diff --git a/media-video/unifi-video/unifi-video-3.9.7-r1.ebuild b/media-video/unifi-video/unifi-video-3.9.7-r1.ebuild
deleted file mode 100644
index c186c92adeeb..000000000000
--- a/media-video/unifi-video/unifi-video-3.9.7-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=""
-RDEPEND="dev-db/mongodb
-	dev-java/commons-daemon
-	sys-apps/lsb-release
-	sys-libs/libcap
-	virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="/usr/lib*/${PN}/lib/*.so /usr/lib*/${PN}/bin/*"
-
-pkg_setup() {
-	enewuser ${PN}
-	enewgroup ${PN}
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/commons-daemon-move.patch
-	sed -i usr/sbin/${PN} \
-		-e '/require_root$/d' \
-		-e '/update_limits$/d' \
-		-e '/ulimit/d' \
-		-e '/coredump_filter/d' || die
-	default
-}
-
-src_install() {
-	static_dir="/usr/$(get_libdir)/${PN}"
-	#install static data
-	insinto ${static_dir}
-	doins -r usr/lib/${PN}/*
-	fperms -R +x ${static_dir}/bin
-	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
-
-	#wrapper to work around mongodb-3.6 compat issue
-	exeinto ${static_dir}/bin/
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	#prepare runtime-data dirs which live in /var but are symlinked from static
-	#data dir, and are writable by non-root user
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	dosym ../../../var/log/${PN} ${static_dir}/logs
-
-	dodir /var/lib/${PN}/work
-	fowners ${PN}:${PN} /var/lib/${PN}/work
-	dosym ../../../var/lib/${PN}/work ${static_dir}/work
-
-	keepdir /var/lib/${PN}/data
-	fowners ${PN}:${PN} /var/lib/${PN}/data
-	dosym ../../../var/lib/${PN}/data ${static_dir}/data
-
-	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	into /usr
-	dosbin usr/sbin/${PN}
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/media-video/unifi-video/unifi-video-3.9.7.ebuild b/media-video/unifi-video/unifi-video-3.9.7.ebuild
deleted file mode 100644
index 8526a98d1ea6..000000000000
--- a/media-video/unifi-video/unifi-video-3.9.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=""
-RDEPEND="dev-db/mongodb
-	dev-java/commons-daemon
-	sys-apps/lsb-release
-	sys-libs/libcap
-	virtual/jre"
-
-S=${WORKDIR}
-QA_PREBUILT="/usr/lib*/${PN}/lib/*.so /usr/lib*/${PN}/bin/*"
-
-pkg_setup() {
-	enewuser ${PN}
-	enewgroup ${PN}
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/commons-daemon-move.patch
-	sed -i usr/sbin/${PN} \
-		-e '/require_root$/d' \
-		-e '/update_limits$/d' \
-		-e '/ulimit/d' \
-		-e '/coredump_filter/d' || die
-	default
-}
-
-src_install() {
-	static_dir="/usr/$(get_libdir)/${PN}"
-	#install static data
-	insinto ${static_dir}
-	doins -r usr/lib/${PN}/*
-	fperms -R +x ${static_dir}/bin
-
-	#wrapper to work around mongodb-3.6 compat issue
-	exeinto ${static_dir}/bin/
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	#prepare runtime-data dirs which live in /var but are symlinked from static
-	#data dir, and are writable by non-root user
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	dosym ../../../var/log/${PN} ${static_dir}/logs
-
-	dodir /var/lib/${PN}/work
-	fowners ${PN}:${PN} /var/lib/${PN}/work
-	dosym ../../../var/lib/${PN}/work ${static_dir}/work
-
-	keepdir /var/lib/${PN}/data
-	fowners ${PN}:${PN} /var/lib/${PN}/data
-	dosym ../../../var/lib/${PN}/data ${static_dir}/data
-
-	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	into /usr
-	dosbin usr/sbin/${PN}
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/media-video/unifi-video/unifi-video-3.9.8_beta1.ebuild b/media-video/unifi-video/unifi-video-3.9.8_beta1.ebuild
deleted file mode 100644
index 3b4c14cd3ad4..000000000000
--- a/media-video/unifi-video/unifi-video-3.9.8_beta1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=""
-RDEPEND="dev-db/mongodb
-	dev-java/commons-daemon
-	sys-apps/lsb-release
-	sys-libs/libcap
-	virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="/usr/lib*/${PN}/lib/*.so /usr/lib*/${PN}/bin/*"
-
-pkg_setup() {
-	enewuser ${PN}
-	enewgroup ${PN}
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/commons-daemon-move.patch
-	sed -i usr/sbin/${PN} \
-		-e '/require_root$/d' \
-		-e '/update_limits$/d' \
-		-e '/ulimit/d' \
-		-e '/coredump_filter/d' || die
-	default
-}
-
-src_install() {
-	static_dir="/usr/$(get_libdir)/${PN}"
-	#install static data
-	insinto ${static_dir}
-	doins -r usr/lib/${PN}/*
-	fperms -R +x ${static_dir}/bin
-	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
-
-	#wrapper to work around mongodb-3.6 compat issue
-	exeinto ${static_dir}/bin/
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	#prepare runtime-data dirs which live in /var but are symlinked from static
-	#data dir, and are writable by non-root user
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	dosym ../../../var/log/${PN} ${static_dir}/logs
-
-	dodir /var/lib/${PN}/work
-	fowners ${PN}:${PN} /var/lib/${PN}/work
-	dosym ../../../var/lib/${PN}/work ${static_dir}/work
-
-	keepdir /var/lib/${PN}/data
-	fowners ${PN}:${PN} /var/lib/${PN}/data
-	dosym ../../../var/lib/${PN}/data ${static_dir}/data
-
-	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	into /usr
-	dosbin usr/sbin/${PN}
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/media-video/unifi-video/unifi-video-3.9.8_beta2.ebuild b/media-video/unifi-video/unifi-video-3.9.8_beta2.ebuild
deleted file mode 100644
index 23414586dcf0..000000000000
--- a/media-video/unifi-video/unifi-video-3.9.8_beta2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu16.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=""
-RDEPEND="dev-db/mongodb
-	dev-java/commons-daemon
-	sys-apps/lsb-release
-	sys-libs/libcap
-	virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-pkg_setup() {
-	enewuser ${PN}
-	enewgroup ${PN}
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/commons-daemon-move.patch
-	sed -i usr/sbin/${PN} \
-		-e '/require_root$/d' \
-		-e '/update_limits$/d' \
-		-e '/ulimit/d' \
-		-e '/coredump_filter/d' || die
-	default
-}
-
-src_install() {
-	static_dir="/usr/$(get_libdir)/${PN}"
-	#install static data
-	insinto ${static_dir}
-	doins -r usr/lib/${PN}/*
-	fperms -R +x ${static_dir}/bin
-	fowners -R ${PN}:${PN} ${static_dir}/conf/evostream/
-
-	#wrapper to work around mongodb-3.6 compat issue
-	exeinto ${static_dir}/bin/
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	#prepare runtime-data dirs which live in /var but are symlinked from static
-	#data dir, and are writable by non-root user
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	dosym ../../../var/log/${PN} ${static_dir}/logs
-
-	dodir /var/lib/${PN}/work
-	fowners ${PN}:${PN} /var/lib/${PN}/work
-	dosym ../../../var/lib/${PN}/work ${static_dir}/work
-
-	keepdir /var/lib/${PN}/data
-	fowners ${PN}:${PN} /var/lib/${PN}/data
-	dosym ../../../var/lib/${PN}/data ${static_dir}/data
-
-	echo "CONFIG_PROTECT=\"/var/lib/${PN}/data/system.properties\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	into /usr
-	dosbin usr/sbin/${PN}
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 533f65fa875f..0da6906d1586 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -3,5 +3,5 @@ AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601b
 DIST vcdimager-0.7.24.tar.gz 1066815 BLAKE2B b58648a4ab54b3151448c2aa17306105ada45d9708375c7461c7f9087b851339f8288855c0d38d1521317b303c79b432b5e99b39ca7b8f59da8ae7aff7238582 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
 EBUILD vcdimager-0.7.24.ebuild 1494 BLAKE2B d6d71aa03fef4ee2af9c7f160a8218448b4b2eb2f84b64726e5d38ac1a4a0a5f36ca5c69d896354ced7f2cf11b73324c9157ce917413d519b9dd96599c2bb781 SHA512 5800c746da2facc0537f54b40d3a66ed1b9065ae4e2e05cd6713712f366d435c3fe7c5b180642948d97eabd3950b4045ce1652891f69e26fe5a5f8223e72b072
-EBUILD vcdimager-2.0.1.ebuild 1407 BLAKE2B 1ed743ec16d361953097bb2b67c10908935cdc710ea801dc2826095e1861e1b0a58db1b57e9b3c5ad6f2ae91e52c631aa9f9fadfedc326a5832599671fa8957e SHA512 c636df31d081c9264f99d591cb04488c1ce27e9100aeb9b65917618fd70c15215c1f5be88ef6d7575f6e484d00798e041975e6da0deb9d2599e51c5278c36a50
+EBUILD vcdimager-2.0.1.ebuild 1400 BLAKE2B b9d1d864856f025c57536f6ebc3135bb8ca01fd61c072a18647166187772289354a243ac9876c5a52d85e7e2e0f9bc31f60bea9d0486350b0d3f415ee7544cd6 SHA512 d898fa4c3ad5ad1ad10cf6d66f98786c5f3ebd7ae5a83e04e7c13754f5a561450a8a62b266687bfef533e11613dea8855a424fd3cde59a1709d9400b81d56ba4
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild
index 0eed4a6d6233..ce43e32b0d6a 100644
--- a/media-video/vcdimager/vcdimager-2.0.1.ebuild
+++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs +xml"
 
 RDEPEND="
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 4bdf2036dad3..c8894c269ac0 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,7 +1,5 @@
 AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
 AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
-DIST xine-ui-0.99.9.tar.xz 1759568 BLAKE2B 5e8d94c64d254f52c0e5f6926b5c0e8cc7ba065f00363e728e48d6dafb26e2cd5496fb20e3d81a1c4f5bf6165b6f13ed2b28eea31e6efd4f9e9256bed5bafc49 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7
 EBUILD xine-ui-0.99.10.ebuild 2038 BLAKE2B 8d5ca5a102dff2b51d5dd1185897d5025ba5715fcd395de1793c3fe9d8c2e05d33a751e00f7fffe89473dd6322d7acb8270f23cabc34208418c38536b16a797e SHA512 e2c630d90fa484047d1cd4e19956d81d583ad042c69d21b1ea9bd5c943b5ca337dfa6bf31d178afdb46c8b0eb2446acfe25fb33a00bba5d21bf2df2edbd5e939
-EBUILD xine-ui-0.99.9.ebuild 1896 BLAKE2B 06d87ab48f19bf0fdfee3cecac3f1961fa10ea7bcf2bbdc21fd598a82d97be8cb8742174a7ac1324184cf469b8dea1322e08e40133b986983ef5f7c196942da2 SHA512 ae3d41e072d4c65f50721d0ef22b75dac11db5f5a8e432b4f625a32c6c16a73665dbe3e79fa9804dbda58018fe8a3679fd4c7738fe14263cca578a39ad6053df
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/xine-ui-0.99.9.ebuild b/media-video/xine-ui/xine-ui-0.99.9.ebuild
deleted file mode 100644
index 87e7ac371634..000000000000
--- a/media-video/xine-ui/xine-ui-0.99.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND="|| ( app-arch/tar app-arch/libarchive )
-	media-libs/libpng:0=
-	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
-	virtual/jpeg:0
-	aalib? ( media-libs/aalib:= )
-	curl? ( >=net-misc/curl-7.10.2:= )
-	libcaca? ( media-libs/libcaca:= )
-	lirc? ( app-misc/lirc:= )
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-6.2:= )
-	X? (
-		x11-libs/libICE:=
-		x11-libs/libSM:=
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXft:=
-		x11-libs/libXrender:=
-		x11-libs/libXScrnSaver:=
-		x11-libs/libXtst:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		xinerama? ( x11-libs/libXinerama:= )
-		)"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.18.3 )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-		)
-	virtual/pkgconfig"
-
-src_prepare() {
-	rm -f misc/xine-bugreport
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable lirc) \
-		$(use_enable vdr vdr-keys) \
-		--disable-nvtvsimple \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with readline) \
-		$(use_with curl) \
-		$(use_with aalib) \
-		$(use_with libcaca caca) \
-		--without-fb
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		docsdir="/usr/share/doc/${PF}" \
-		install
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-video
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)