gentoo resync : 25.09.2019

26 files changed, 877 insertions, 123 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 362867035437..4944be4062cb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
index b9c3dc40f62d..8415ab9aaa08 100644
--- a/media-video/aravis/Manifest
+++ b/media-video/aravis/Manifest
@@ -1,4 +1,4 @@
 DIST aravis-0.6.4.tar.gz 2972111 BLAKE2B b7f1c4da08bb4e7d11faffcd4ef90b7215b803e5e74ba1730388e04304685b761024ffea49b082c94e3fddc9dc65201545167a277b1088ad7273d41d50fae5b0 SHA512 6090fd730ad9fe8e1641e48c52189e8961bf03a88cefb57135a2de985c2ca607c21b05d472a60586976aa1e05ba2121246b06b75179dd3241e1f703aad8dd7be
-EBUILD aravis-0.6.4.ebuild 2334 BLAKE2B a94fadb74204da7d244cab54aadf9ab3528682e08fc9319327e461ce056099bc3aa08e6c1a70b11b9ad8634af651779979e0c5612bb5823aa7ba02a874f3b0cf SHA512 5cc140f9e395f1a44b2e5e9577793dfd524766d5a27599c8e83e453d0f9a36f3bef035ef255332b8a4470bd757b79b771adead6f9e72d7feadf01a8e2a03ef4a
-EBUILD aravis-9999.ebuild 2334 BLAKE2B a94fadb74204da7d244cab54aadf9ab3528682e08fc9319327e461ce056099bc3aa08e6c1a70b11b9ad8634af651779979e0c5612bb5823aa7ba02a874f3b0cf SHA512 5cc140f9e395f1a44b2e5e9577793dfd524766d5a27599c8e83e453d0f9a36f3bef035ef255332b8a4470bd757b79b771adead6f9e72d7feadf01a8e2a03ef4a
-MISC metadata.xml 1033 BLAKE2B b1f6f5e7f9a1c8f81dbb5717bbef6c6828bb922537f7408dadd4b03f6a5329ae1e451a1371fe411a78c9212f78497ba4f57fb433a7d31fd6aaccf2c196794e11 SHA512 f13cf2a72f4194f01d4f744611d525c95bc77d3e1faf0a5e01671696bd7ed1cf13b35a87bddfff8626f4bc206e5c9eeef175c15889affa726309c3b07bd48841
+EBUILD aravis-0.6.4.ebuild 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff
+EBUILD aravis-9999.ebuild 2397 BLAKE2B b26d7df8c73d19176ca75647b0fe86df3d75d65d2212a4b27c913cd38cb5acf4b9d98ddabbe952a64dcc5b44066b8b47fae067430c30d5bd060fd2d13ccf08d8 SHA512 c37c9fa700a320cc87b38cb3b019cd13870f7dc6206b07dfbdaefd6396dcda0e6f441888c2ce319549586cc319de4657f761846bc00cecf844edbe39cdc7acff
+MISC metadata.xml 1034 BLAKE2B 61fbcc77a880be8ad08247941fd60fb7efcd04dda5b95928b15121d3e0343b570c95d617845afffd8cab943a0bdca8d598e2145686d7a6528c95b5336b2c4e7a SHA512 4c86b8bfc2c0c4f8da3be0f08cccf0d18c5897edd41c40939ea0a6f79881353991629d02a8e28d1b3cdb2da2d77d7275fd77bb23f7a394a82f4a2cfabe177004
diff --git a/media-video/aravis/aravis-0.6.4.ebuild b/media-video/aravis/aravis-0.6.4.ebuild
index 0f78ce56983b..5ffb500be0c2 100644
--- a/media-video/aravis/aravis-0.6.4.ebuild
+++ b/media-video/aravis/aravis-0.6.4.ebuild
@@ -16,30 +16,33 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 # FIXME: As of right now tests are always built, once that changes a USE flag
 # should be added. c.f. https://github.com/AravisProject/aravis/issues/286
-IUSE="doc fast-heartbeat gstreamer introspection packet-socket usb X"
+IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer"
 
 GST_DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 "
 BDEPEND="
-	>=dev-util/meson-0.47.0
+	dev-util/glib-utils
 	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="
-	>=dev-libs/glib-2.34
-	dev-libs/libxml2:=
-	sys-libs/zlib:=
+	>=dev-libs/glib-2.34:2
+	dev-libs/libxml2:2
+	sys-libs/zlib
 	gstreamer? ( ${GST_DEPEND} )
 	packet-socket? ( sys-process/audit )
 	usb? ( virtual/libusb:1 )
-	X? (
+	viewer? (
 		${GST_DEPEND}
 		>=x11-libs/gtk+-3.12:3
 		x11-libs/libnotify
@@ -53,13 +56,13 @@ fi
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use doc documentation)
+		$(meson_use gtk-doc documentation)
 		$(meson_use fast-heartbeat)
 		$(meson_use gstreamer gst-plugin)
 		$(meson_use introspection)
 		$(meson_use packet-socket)
 		$(meson_use usb)
-		$(meson_use X viewer)
+		$(meson_use viewer)
 	)
 	meson_src_configure
 }
@@ -74,12 +77,12 @@ src_install() {
 	local install_p="${PN}-${install_pv}"
 
 	# Properly place icons
-	if use X; then
+	if use viewer; then
 		cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons"
 	fi
 
 	# Symlink versioned binaries to non-versioned
 	dosym "arv-tool-${install_pv}" "usr/bin/arv-tool"
 	dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera"
-	use X && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer"
+	use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer"
 }
diff --git a/media-video/aravis/aravis-9999.ebuild b/media-video/aravis/aravis-9999.ebuild
index 0f78ce56983b..5ffb500be0c2 100644
--- a/media-video/aravis/aravis-9999.ebuild
+++ b/media-video/aravis/aravis-9999.ebuild
@@ -16,30 +16,33 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 # FIXME: As of right now tests are always built, once that changes a USE flag
 # should be added. c.f. https://github.com/AravisProject/aravis/issues/286
-IUSE="doc fast-heartbeat gstreamer introspection packet-socket usb X"
+IUSE="gtk-doc fast-heartbeat gstreamer introspection packet-socket usb viewer"
 
 GST_DEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 "
 BDEPEND="
-	>=dev-util/meson-0.47.0
+	dev-util/glib-utils
 	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="
-	>=dev-libs/glib-2.34
-	dev-libs/libxml2:=
-	sys-libs/zlib:=
+	>=dev-libs/glib-2.34:2
+	dev-libs/libxml2:2
+	sys-libs/zlib
 	gstreamer? ( ${GST_DEPEND} )
 	packet-socket? ( sys-process/audit )
 	usb? ( virtual/libusb:1 )
-	X? (
+	viewer? (
 		${GST_DEPEND}
 		>=x11-libs/gtk+-3.12:3
 		x11-libs/libnotify
@@ -53,13 +56,13 @@ fi
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use doc documentation)
+		$(meson_use gtk-doc documentation)
 		$(meson_use fast-heartbeat)
 		$(meson_use gstreamer gst-plugin)
 		$(meson_use introspection)
 		$(meson_use packet-socket)
 		$(meson_use usb)
-		$(meson_use X viewer)
+		$(meson_use viewer)
 	)
 	meson_src_configure
 }
@@ -74,12 +77,12 @@ src_install() {
 	local install_p="${PN}-${install_pv}"
 
 	# Properly place icons
-	if use X; then
+	if use viewer; then
 		cp -r "${ED}/usr/share/${install_p}/icons" "${ED}/usr/share" || die "Failed to copy icons"
 	fi
 
 	# Symlink versioned binaries to non-versioned
 	dosym "arv-tool-${install_pv}" "usr/bin/arv-tool"
 	dosym "arv-fake-gv-camera-${install_pv}" "usr/bin/arv-fake-gv-camera"
-	use X && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer"
+	use viewer && dosym "arv-viewer-${install_pv}" "usr/bin/arv-viewer"
 }
diff --git a/media-video/aravis/metadata.xml b/media-video/aravis/metadata.xml
index 0ea071b7518a..7ee4d3d51ac3 100644
--- a/media-video/aravis/metadata.xml
+++ b/media-video/aravis/metadata.xml
@@ -19,9 +19,9 @@
 		simulator and a simple video viewer.
 	</longdescription>
 	<use>
-		<flag name="X"> Build the GTK+-based video viewer.</flag>
-		<flag name="fast-heartbeat"> Enable faster heartbeat rate. </flag>
-		<flag name="gstreamer"> Build the GStreamer plugin.</flag>
-		<flag name="packet-socket"> Enable packet socket support.</flag>
+		<flag name="fast-heartbeat">Enable faster heartbeat rate. </flag>
+		<flag name="gstreamer">Build the GStreamer plugin.</flag>
+		<flag name="packet-socket">Enable packet socket support.</flag>
+		<flag name="viewer">Build the GTK+-based video viewer.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b24f5fa48a1a..44e9c55d824d 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,10 +4,12 @@ AUX ffmpeg-3.4.6-fix-building-against-fdk-aac-2.patch 2820 BLAKE2B 05c0dc79d8e34
 DIST ffmpeg-3.4.6.tar.bz2 10190001 BLAKE2B 4c7842900171cf871f8524f08f435797b1a168faa11877100fe74c3ecd4a2c2e004a5110dc23bda818f69b0a484f63d8f34c7904c4827c88894d877cdd70c6fe SHA512 0228751b288096e368f9049854936930b7c1fd89aac31a5382f5de78d3282b4e86a6f562c79833d1635222f0ad56b2e5401a150574714e1b7e0ab4f5d8939812
 DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
 DIST ffmpeg-4.1.4.tar.bz2 10691784 BLAKE2B 5f1f0b3c78cdd913e44bef448ff4d26fc5ea01e1a002baf98461fe0d8870bc2b0f29a1770377df8ff4f0c45febd532d6436c6627f5d1fb97125e92d9929f9284 SHA512 0c2d5bf4873b2bf12aff8c8b576d58dc3c5984ca727f48e1247293cbebda382e9070e8b7fac99870ec2ae0cef3be0a187d5ec5d58ee3e861cd673cae961b5947
+DIST ffmpeg-4.2.1.tar.bz2 10953293 BLAKE2B efc60a7e4a185d48a9ae7a5737fa930dea35ca19f1e2505fc4355815a8216f365134a018fb7a5eb7be8709989d27c2c0a56f7783e3f27eb12795e005fd6dc28d SHA512 5bd556546716ccb5292289c3092c11f216e573d0b09a015fdb568dee7544878d057d922a63758867f0343a09262d7b51023e862b70cefc529875f2319e716de4
 DIST ffmpeg-4.2.tar.bz2 10954171 BLAKE2B 1c2dfeb000a0cc85ca23d255163336db132b5f16cb184a0f3363f68108f5bde0220050b351f9c50273ef6642f86f1a43832f4b831928d95dd991a908c7c25e2e SHA512 74d06a420af61e05d9e076f4f433e8316590c3b850ada96e74c1df39431db1595f74315bdef624153edb160b8bef8683a4e9f35d69714cde4b5ec72aeb1d28e1
 EBUILD ffmpeg-3.4.6-r1.ebuild 15659 BLAKE2B d2dcdc4da728c0466d9cdd8c1e3f92253dbb4381d8f179a48761e631d79f727a95e6b4bff104189054e5a391786c1060ccdd257bf19b60df63df973c34883a77 SHA512 75460743011065d4f2e29e56029991c42f499bffdd66c3aa2ada3792c4449f193ac2a8a5dfcee234b170a9d4e5f9e889c24ec86fbf6713b853357e00d05e27e9
 EBUILD ffmpeg-4.1.3.ebuild 17095 BLAKE2B 396677e143c34c31554d759fbf62f93f67321cfca6e8dc75c1b4f8f0553952c71f2594354591023b704132219eb3af4366497a4c4394228d305e9258b3f31f99 SHA512 19afd60f0d0ebf64d0d9bc4a3760c52d825ca3ecba98f3fba5604e393514244acfb71049662bbf233cb3b2567fa7365f8c0a10ecfdfe0782900447baa1dfb495
 EBUILD ffmpeg-4.1.4.ebuild 17099 BLAKE2B e58b016483c1c96996e020a1cf242df7fbeaa2d539e56eb519d454f337c1c7ca352d84f5b63bbd9b6c46d4d39d9e47d7082b78d1c3fdc9a774e930856926759f SHA512 f5686aa2e4c6302b29ff713bf7fab5542d94a15dcb646778d103c5282568a7cf1d3d871163f05ea68ea8bc22058fceb992308f969e6478386b2f67f75264b467
+EBUILD ffmpeg-4.2.1.ebuild 17688 BLAKE2B df6b71d84b40f3455d1f4ab67387c371a8f6b02d6cd912c810662728750737ee6bd02d549feb9ea40beff1bd4fb68c6ca283454a8f7a0d7fb6d1d6c07928dd02 SHA512 1902f5fed8d047f3e0b50fbbc0d8b6173b72f408a1ba4dd8e2652c493ea5c9dc29e1d3513000c93563c141167d0901fcc3c9b5008c9472481b3e28cf118b3c19
 EBUILD ffmpeg-4.2.ebuild 17688 BLAKE2B df6b71d84b40f3455d1f4ab67387c371a8f6b02d6cd912c810662728750737ee6bd02d549feb9ea40beff1bd4fb68c6ca283454a8f7a0d7fb6d1d6c07928dd02 SHA512 1902f5fed8d047f3e0b50fbbc0d8b6173b72f408a1ba4dd8e2652c493ea5c9dc29e1d3513000c93563c141167d0901fcc3c9b5008c9472481b3e28cf118b3c19
 EBUILD ffmpeg-9999.ebuild 17694 BLAKE2B d366faed1d9876c2f8d5d9df89528eff562748846a790c4ce2eb96b997e298457f431321e87fe2440b174d5bbd34369e4757a4cd7590fdd0faca9f63bdc8de35 SHA512 949d149b82827a5eb4c484dd5f139d1edad1c572d281db35cd36cb70c59d223feff80dc865c6580f0332b4efcfbdf5f26ca772fc6901789c623599948901c212
 MISC metadata.xml 5728 BLAKE2B c5e24e8b81b147d84f7204c9dd1cca5eb45a0bf9b46c25c39670b1c59432e8c6e65bb472bbf3c4b57451d8dff4f8663cfa0abd9fda9c13f57e3eed82945da0cf SHA512 2822c0df5018e1003b7be90b8579747024e05732a1fa698a1f85f4e8362a3e76b4add6c6bb39036eeb5b0483241b55a7300c65350f7b774fcc7dff33cd0061a4
diff --git a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
new file mode 100644
index 000000000000..e614ce5a2060
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
@@ -0,0 +1,545 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="https://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	libaribb24? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~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.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
+		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype vidstab:libvidstab
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar libaom
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-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}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	)
+"
+
+DEPEND="${RDEPEND}
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+	doc? ( sys-apps/texinfo )
+	test? ( net-misc/wget sys-devel/bc )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	rubberband? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	cuda? ( video_cards_nvidia )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+)
+
+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}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use libaribb24 && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# Incompatible features: openssl or libressl and gnutls
+	if use libressl ; then
+		myconf+=( --disable-gnutls --disable-openssl )
+	elif use openssl ; then
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--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[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--disable-opencl
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			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
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			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
+
+				# When not built separately, libffmpeg has no code of
+				# its own so this QA check raises a false positive.
+				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
+			fi
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d85c84aceb67..8725c3994b33 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,4 +1,6 @@
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
+DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
 EBUILD mkvtoolnix-35.0.0.ebuild 2673 BLAKE2B 2e0f0339434a91911d6b09541c1e1ea0a33deb365e82c13cd97a976c0ffff08a340d2402bd5a6949d24a9565e2406c5403a684f582068eb505494938fda9a89e SHA512 55744b23a1f061e14601d157309615bed32a282a0d6c3b84aa2dd1212cdcaf264d6e6b28f345bfbef16759c01e3f88e20457ccb0de40ee2d9f86569dadbb5f06
-EBUILD mkvtoolnix-9999.ebuild 2700 BLAKE2B 5022fb5fe50f1ad679460b31422358a7e225221faaf0c5a7a222b92cdb78f6e2f875b84b7ac538d7304e30c2d59c29f9d2c854d7532f8dad62cc1a5dc8a5bd3a SHA512 7ea4aa4ad28297f92910e7997faa97923c02e704d8f066fdb3fc8f5bbb47e91bbd94fa504fca0df6d1de57b06406910e2b1dfc5e9a6762122fc21884d795fb7d
+EBUILD mkvtoolnix-37.0.0.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563
+EBUILD mkvtoolnix-9999.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
new file mode 100644
index 000000000000..5fa946801729
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/libebml-1.3.7:=
+	>=dev-libs/libfmt-5.3.0:=
+	dev-libs/pugixml:=
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.5.0:=
+	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:0=
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/utfcpp
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-ruby/rake
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+"
+
+src_prepare() {
+	xdg_src_prepare
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+	# bug 692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+	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
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/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
+	dodoc NEWS.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index c91b87e7c617..5fa946801729 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing qmake-utils xdg
+EAPI=7
 
-if [[ ${PV} == "9999" ]] ; then
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	inherit git-r3
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
@@ -22,14 +24,14 @@ 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
 RDEPEND="
-	>=dev-libs/libfmt-5.3.0:=
-	>=dev-libs/boost-1.49.0:=
+	dev-libs/boost:=
 	>=dev-libs/libebml-1.3.7:=
-	dev-libs/pugixml
-	media-libs/flac
+	>=dev-libs/libfmt-5.3.0:=
+	dev-libs/pugixml:=
+	media-libs/flac:=
 	>=media-libs/libmatroska-1.5.0:=
-	media-libs/libogg
-	media-libs/libvorbis
+	media-libs/libogg:=
+	media-libs/libvorbis:=
 	sys-apps/file
 	sys-libs/zlib
 	qt5? (
@@ -46,35 +48,33 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-cpp/nlohmann_json
 	dev-libs/utfcpp
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
 	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() {
 	xdg_src_prepare
-	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
 }
 
 src_configure() {
+	# bug 692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
 	local myeconfargs=(
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
@@ -83,9 +83,8 @@ src_configure() {
 		$(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)
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
 	)
 
 	if use qt5 ; then
@@ -114,5 +113,6 @@ src_install() {
 	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
 
 	einstalldocs
+	dodoc NEWS.md
 	doman doc/man/*.1
 }
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 6ef4e4c6ef4a..c59cc4894caa 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,4 +11,4 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de68
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
 EBUILD mplayer-1.3.0-r5.ebuild 16978 BLAKE2B c5ce5f7355598be4c87cb8a59176ca51654236a68cb851a115eb3d3736b62b7f4c8718fc07d69cb606fcd42cd2beb4e4fe33bbd816115f3e30509121c7b797ee SHA512 076d0291f12002467066068e5722436c8bcbc29dbe88974e7495f819184b1abc0cf7bae538a6c6333f6d31cd74f899135096146d2303f5261efc5c62fd125496
 EBUILD mplayer-9999.ebuild 16678 BLAKE2B 01753aa6746ee12944db1e880b07ed95a96f0331e9d071bb6fa96499d4ae86049cc71cfed21e7155379a0cd834f172917e402731827b5ee15cfe9f280fd0ef79 SHA512 8771cdee24aafe1f65dedc6cfd0dfdba7dbd2b4d7a6087c175a30dbdcf6f52899506dde3dcd498361815acbbfff543f9f8659c5f8a029bad6a4298b60086ff17
-MISC metadata.xml 2457 BLAKE2B c0d722886466f46e09a28b2384a6b8ccf15bb080b69b513500633a03a1fc784fe85a167824879c9dde6417bde4852c4ec1f30a444e4d520b7d47315cfa4cc91e SHA512 578de48a26eddf8d8eb522141df02d9c948d97e1334c94897cad5a4a9a386e8207c90e6d931e1d2defe20d34504c0d4f993746f1cc0907cea1ed2740d02b49d5
+MISC metadata.xml 2536 BLAKE2B 1a8ff751e68c46c921cd09a9364e8046372cf0a77aaf062c26ed1356eebfaa8b90eb36cac6e101fe22f9f7ddcec611806271683e76d53c642dfc1fc87ba0baa5 SHA512 01fadd14038f9bda1fb3b521f65ab92e2cfed58628352b02f26dfef710d4d5a6fd964ef00e3a123a76046557b15ae29bc7c221c5a8a692cb06763e478b3b58c7
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index d4d955ac2501..5f4a3dfe1b75 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -9,6 +9,7 @@
     <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
     <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
     <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
+    <flag name="cdparanoia">Enable cdparanoia (audio CD ripper) support</flag>
     <flag name="cpudetection">Enables runtime CPU detection (useful for binpkgs, compatibility on other CPUs)</flag>
     <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
     <flag name="enca">Enables support for charset discovery and conversion</flag>
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 0b7ec969c9ba..7767dd616c92 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -11,4 +11,4 @@ DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae0
 EBUILD mpv-0.27.2.ebuild 10639 BLAKE2B d5b64552973347ec3ac9423029dfec5448cb2c36e7cdfd293c2a61fa4d4fe9fb59837719eae234c5f46eb4396ef3f409669a2b1a5da62f59fc90712e912ecd72 SHA512 ebd5a47f15408583f1dfe1a9fefe40a2b0fcf968f6a71b5c603d5bd85187f51cee926f6f1cb6746050715b2aea64bddc4771ebccf307f1ec1d3f466e31e3658b
 EBUILD mpv-0.29.1-r1.ebuild 10289 BLAKE2B 7b83aa8a45ae5d2f6a92cff0574b42f5d591c2463e46546e53725f76baab2a4c78a19729fb6a9776052602b657757fcc67c3f1f65e51202066eb8291ff74b6fd SHA512 cb5cdd92402e1c445b4eb40986569fd061e197005c23cfff3ef7db9a0aea812116e3771c8738664c93d5d4d7bfb6611e2f8a825ff4f6be2bffd15b77015e43c5
 EBUILD mpv-9999.ebuild 10323 BLAKE2B fceb344df0fe5a8f600db00cabe4c64985de7db4b15c3eea31c492f9f41ede8cbf91d072e19bc5b323f0e71e13d1bcc633dbb59d8c689df8d39744eb0ea8ea9a SHA512 14ae91c3b6e08361fab33987998471d0dc9b6c9a3ddd5cc2fac0e66b6f55db78fe0ac0170b5b3544853194edb0dd2612505637c7b1682136e1129f175d54e10f
-MISC metadata.xml 2434 BLAKE2B 49d49e82a085bc55ca6ace16fe6d90d66988cc5e63837a4c1cc479b14fe0c83aae87478a9dc0a209f28f03a7f17363e42f64753d9d1496b671669a7add3dab2c SHA512 3a14c0d283f6369fcc3ea160d53dbdf44b41fa5ddcc2c5e724040c2d462542f6638b763984e7b47e1d69eab25a4347d5f821b5ebe5bc4bc5471f0f8b7e615af1
+MISC metadata.xml 2207 BLAKE2B 41d54819efc59037d5d086dec0f47f85d19d784c59db5dd54b30fe4334d2e58225a6a97dc5b71f257f95b36557268d2896a537f1ca7ac02c84fab52b90df502f SHA512 c64d32e92d343682154ad564a094bd045c22822272a32694aa37aed52b230fcf141013940e69fc8604b3f8a7a54b73d8b4c9b227365fa84cfb68a1680ba96767
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 7db45d069b95..e34fb5f41655 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>itumaykin+gentoo@gmail.com</email>
-		<name>Coacher</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 		<name>Gentoo Video project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
 		<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest
index 17c34bd72649..9487a978c505 100644
--- a/media-video/peek/Manifest
+++ b/media-video/peek/Manifest
@@ -1,3 +1,6 @@
+AUX peek-1.4.0-meson.patch 1921 BLAKE2B a96de5120e454290215049023a857b71f32082060aebc007b41c3d310eef46462282b4ee1340e827861080e66cf1c0c6ea17af6b44c63c59c18405f3b7bbf146 SHA512 914d4166345b6e180733a01578564f9351da83aa82d958c4243d08edff4d682a6aec92b6ebb7256224cb17cc23e3146f97e144935a629b937a651805dac53241
 DIST peek-1.3.1.tar.gz 2654939 BLAKE2B f5d2b6c9ca1194891ff6a61c73bcfc63a6e0bbf8a282c4309bbedbd40e29e42ad78d9c37c8a3621ceb6cb2ad85bbf2364702f1db028f6282dd4f93e15d22b34c SHA512 cdf4190c555b0a40051862038c04dc7c164bf8bccf47202d0fcb74f527a8a7d5605bc2e112847e262e51a5a95c3d2b3497e4ec56834880564e8e4127869ad9df
+DIST peek-1.4.0.tar.gz 2647446 BLAKE2B 688acb01e127c31fd9d8c6713757bf01e6b4ed1211a32787f5729b6a26308599a61c4ab057a2a008d3cc388f9492a41e70c34c92e90ded0058bbb325e9f828c8 SHA512 ef1723f72d1c575493b2e9192cee6038807d37d875a797781169e5f4640635deda947362dcf2e1a9149fcfe88de532b8ea05c665b14b1befaa9aa8c982d9aa31
 EBUILD peek-1.3.1-r2.ebuild 1040 BLAKE2B d83b8352923dbb129a49077c056ac1070162ae5fb71e32ef72df6cd691871e29ff1b93c353fc9ea0e062fc17399671c1e3354128e2953132ebb2fb3205b3883b SHA512 99856cfd07363a599c7e4dcefd0e66653d9749ae5aeb70a21e08fa43a74d81a60e7f7326aacd5151a8b629a6c0efe785ba5206b6a94c6c1b1bfb3c7629cca9ca
+EBUILD peek-1.4.0.ebuild 907 BLAKE2B 465cccc3804d3804cc28d3ce7fec881b74b485638fb77e1a274607632b1e5eee5aacf352cf9a0f84e3fcbbd3719c5f5a68520b8deae22d44d5cd4ce42a14cc41 SHA512 07c7c1c98f422ad55dcf24f9183b758d488be2350e697bb53a4acab75ec569d3a25d810b47d4b333101795668492528b90bb181b37ad24e53a7efe5eecf9ad8a
 MISC metadata.xml 442 BLAKE2B 0737081df17bd9a248ff54ed5f788f5488c5506cb23de18dd57ade4e87f328a96fc249371cf2e78b8399528b3a3759440ceade1f16d0d1bd11a62263e12b4854 SHA512 c94b68c460e7d302d1761ba0d7adb23530c862e1a64b48f0688b68678a353cc7ae54433e6517c564e457c5ee5dac3ca6325ef967d11c66ae998da2348854296a
diff --git a/media-video/peek/files/peek-1.4.0-meson.patch b/media-video/peek/files/peek-1.4.0-meson.patch
new file mode 100644
index 000000000000..9e66b7180a4b
--- /dev/null
+++ b/media-video/peek/files/peek-1.4.0-meson.patch
@@ -0,0 +1,61 @@
+diff --git a/BUILD_NOTES.md b/BUILD_NOTES.md
+index c146cbc..2d8c8b2 100644
+--- a/BUILD_NOTES.md
++++ b/BUILD_NOTES.md
+@@ -34,7 +34,7 @@ From inside the Peek source folder run:
+ ### Debian package
+ 
+ #### Build requirements
+- - meson (>= 0.37.0)
++ - meson (>= 0.47.0)
+  - valac (>= 0.22)
+  - libgtk-3-dev (>= 3.20)
+  - libkeybinder-3.0-dev
+diff --git a/README.md b/README.md
+index 71574b1..6faeb85 100644
+--- a/README.md
++++ b/README.md
+@@ -79,7 +79,7 @@ Support for more Wayland desktops might be added in the future (see FAQs below).
+ ### Development
+ 
+ - Vala compiler >= 0.22
+-- Meson >= 0.37.0
++- Meson >= 0.47.0
+ - Gettext (>= 0.19 for localized .desktop entry)
+ - txt2man (optional for building man page)
+ 
+diff --git a/meson.build b/meson.build
+index b0d57d7..5db2a39 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('peek', ['c', 'vala'],
+   version: '1.4.0',
+-  meson_version: '>= 0.37.0',
++  meson_version: '>= 0.47.0',
+ )
+ 
+ add_project_arguments([
+diff --git a/meson_options.txt b/meson_options.txt
+index f88ceaa..526ccc9 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,4 +1,5 @@
+ option('build-tests',              type : 'boolean', value : true)
++option('enable-keybinder',         type : 'feature', value : 'auto')
+ option('enable-filechoosernative', type : 'boolean', value : false)
+ option('enable-gnome-shell',       type : 'boolean', value : true)
+ option('enable-open-file-manager', type : 'boolean', value : true)
+diff --git a/src/meson.build b/src/meson.build
+index cf2c45a..5282148 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -48,7 +48,7 @@ enable_open_file_manager = get_option('enable-open-file-manager')
+ 
+ # Dependencies
+ gtk = dependency('gtk+-3.0', version: '>= 3.20')
+-keybinder = dependency('keybinder-3.0', required: false)
++keybinder = dependency('keybinder-3.0', required: get_option('enable-keybinder'))
+ 
+ peek_deps = [
+   dependency('cairo'),
diff --git a/media-video/peek/peek-1.4.0.ebuild b/media-video/peek/peek-1.4.0.ebuild
new file mode 100644
index 000000000000..7cab4b5a3799
--- /dev/null
+++ b/media-video/peek/peek-1.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome2 meson vala
+
+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,vpx,xcb]
+	virtual/imagemagick-tools
+	>=x11-libs/gtk+-3.20:3
+	keybinder? ( dev-libs/keybinder:3 )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/txt2man
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-meson.patch )
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature keybinder enable-keybinder)
+		$(meson_use test build-tests)
+	)
+
+	meson_src_configure
+}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index a3d4f66f23e7..10168b9da057 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,5 +3,5 @@ AUX pipewire-0.2.6-fix-probing-without-starting.patch 2119 BLAKE2B f7180ad95f0f2
 AUX pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch 5684 BLAKE2B 9ce85e2f15b18ef458d21a44b10c875b0cb456972a61dd1ff127ad62510604d35ea6dd70daa0191181a34d2fea613ac254ffd6fa4f0fa3bb6114191e3a62996e SHA512 ba194a678b1130a29b17f1831c1a94c24db6cb05ae1d2a0e825fd1099aa2a300200d7cbfd5e5b592c54aea33893c68e554edd4bdfd1ca6cc84739b12e33058f6
 AUX pipewire-0.2.6-revert-combine-all-perms.patch 1039 BLAKE2B 5fd1d82c92680b6097ac70367eb5f7fc8190d0589d4bb228dc93c6f673763a65a7c18a5fd3b242686ba86773d90078cc50a5d7c2277dc90edcdb341d5ecb9f23 SHA512 c9bab5e79b4a88f240d34702dfe5de2df4ab7c5158d5b95228647018cb5bb69ec124fb47405074aef91480d25d388df7cdbb7fa94396d228b6f573697b2f8333
 DIST pipewire-0.2.6.tar.gz 421137 BLAKE2B 155667d14fe5380e21f0b70accea72dc4478085916a9126185136f6d33bd7729d91b790c171dcf7b6aea2c52894462d16516f8821229ca0bf9f6cde15df524d9 SHA512 3d1db41f5beb42a0ee15ae7bc8afb89b54a37c3a6a414e88b5e33ceaf98ec6dda0d9a2d03ac47a8dfce48e9637e647291919e6670bb70589b0d1951fbcbd3ff8
-EBUILD pipewire-0.2.6.ebuild 1848 BLAKE2B 7430add6b35d8e9b6fae1ae225f7b57d7dfeab124a0a48d807a62efeac9572c21193fb02d35da4217124f0d55b8a3d2c6f8a4548ca1e102dcf3d866c7f16f2b1 SHA512 4fd94b66cbc0453bb1f939d9bfc6c16b14cb589418763339aabc67d2e263af5190763fcb31cf066c5fe4b3fc0ca8f3c9162608cc6e0e1ef11acb74887d74b710
+EBUILD pipewire-0.2.6.ebuild 1860 BLAKE2B b9017a577f438bc060ffc67be21afa5a2deb86fa6f1a994f7d6d9b4b37a65aca3780dd19aa59324f4ea33929ec04bd36fb3c653460fc97353603f4af8de8f067 SHA512 c335d7b5a2c331804d722ceaec6fbefe9104f2ba1c89c8f7eda08409f29c66b0d50a669bfd353a520fb22efc53d7209a7041ab6a7fc8bb66c6ca1a8358436216
 MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
diff --git a/media-video/pipewire/pipewire-0.2.6.ebuild b/media-video/pipewire/pipewire-0.2.6.ebuild
index a2ab2c7b1516..dfd692811b8d 100644
--- a/media-video/pipewire/pipewire-0.2.6.ebuild
+++ b/media-video/pipewire/pipewire-0.2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index a7b19501ffec..2a03ae14dcd9 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -4,4 +4,4 @@ DIST subliminal-2.0.5-r2.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd
 EBUILD subliminal-2.0.5-r2.ebuild 2387 BLAKE2B 3166277c1cd80023b54103b8ba9cbf2075e16874f8834c973395403b0da0dd42b3ca015dfd192bfcc14822b3eae7244f50688203e3d97c20b757aba51ae0443f SHA512 66e0facc888f2c58351accd0ca1a792278027dc71327307989ba00afca932270b938477acc133ff7c323a928f051b6bd9010661af99f44ce21ecfd9f4b1c08ef
 EBUILD subliminal-2.0.5-r3.ebuild 2475 BLAKE2B d708951ee24309e97054423de7e2b7061b22f4e33f8ffc9838f2615c64e506221dca712c6d7b5ef25314e2397a357d4fd2e4e5767482dce36299e15742601426 SHA512 fc99a04ea7c6d697e6bc8e77f7f2bf42cd7e5ac8a71dcb984b4ce4496959bef2d6b52f67ba74f54b756d16f69cbcf2ae6a363ecdb7f915670f1f7342bb60f105
 EBUILD subliminal-9999.ebuild 2238 BLAKE2B 5375536b8ea031dba6e0c54edf737f8ba25a8a8caa3fc3b7958181cb36aec20e636b93171f01430528eaf661d25b83e36850646caa211c81b217a27c575d1fc4 SHA512 0279f0d36bbc32f4aaf650f5debb39a03c6044a88eaa494e5e6357d67c01634b4876c90182d1bce6459bac767393060f7ddda2446bb589dffc4f1a5abd267fba
-MISC metadata.xml 549 BLAKE2B 296a55c59aad7c1d33e65258eaa0481ed167e1c78fa4fa8273acf83366c7b9365f30136ed7d0ad1b71bbde76aa4d0c5e3da98f375be9ad20b76ee77c835d6947 SHA512 cccd163878caccdee339a2e19f9cd5b0954477e767284c4183f9e589c0b5fe59353dfec14982e6dea83d91fc2f2d66904f8f40a1e69c7abab4a6d6baabfdc0c4
+MISC metadata.xml 350 BLAKE2B 64054ae243f37db216c26428801347c2ef0b61b4f557b01e1e84213ca4d405e0ef44d2a121c97a507cb155c053e190c7b875e7e9e325ecd1d4ee6006fdf8f975 SHA512 573c536a3e3d2859085a60fdeb224475bc457b07c6b3d0ff4554bb7e8f49a7839d1f44489fd10261b404c33e2f6729a25ac8ea09701287c13f968ef2cff0aaad
diff --git a/media-video/subliminal/metadata.xml b/media-video/subliminal/metadata.xml
index dbddc2e56ab1..6a10db13e561 100644
--- a/media-video/subliminal/metadata.xml
+++ b/media-video/subliminal/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>itumaykin+gentoo@gmail.com</email>
-		<name>Coacher</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Diaoul/subliminal</remote-id>
 		<remote-id type="pypi">subliminal</remote-id>
diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
index 8b2b966ceac9..8614a517619a 100644
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -3,4 +3,4 @@ DIST syncplay-1.5.1.tar.gz 1603524 BLAKE2B 0d7edb0c2129f67ce457cffb57f5600d0c0d6
 EBUILD syncplay-1.5.0.ebuild 1265 BLAKE2B 723adcca54a3874984f3e2c692eaa89fa53655cfe4f0d91c042b24e5c50cd972a750726f231afa584da18e05929ade6a1c073ff441502f9c733e3ffda0099d36 SHA512 fc05cb6ceacb6ebed2d0a484519158f6330d589fb7ac7850d1652f5a247d6be7ec05642fcb2d4a8fd842098b497330707d72fb5ca782a869a3a42196b2d4a5b3
 EBUILD syncplay-1.5.1.ebuild 1305 BLAKE2B 3c18e0111d733b6bdb09a2409b874d433b65721f52027841c22316fd127bb7dedc325fe90cb627d28c97cfa0d66e331b570a55ba80999d18b7ae8f97a886c26d SHA512 3c979ed9c651e9ad9001529431b0dff7189e040a5741a81741afa0868009ff82a23a757b58c5efa12dbc436ac394fecf30dcdbf9bbd408de07b6de5f9a28ca35
 EBUILD syncplay-9999.ebuild 1217 BLAKE2B 5a09f5c3616be994e3b1d3a2a785be441ea9d62657e34f0ce101b5bed0d5a8a9ca4662f9fee9e494ad3c6ac55818a086b415ae53ed3ff6742fc93cd8121e5d0e SHA512 55bc42bea194c8e9f25791bd42e439f89c1d442a6689c4e5c059f05cad05b684964da4000b967201f19360721a99c8848856e89445ff4609ac9cbdecc70d81a9
-MISC metadata.xml 634 BLAKE2B 8c059c46e6bdac47fede221ce0b4f67478a68aaaea8649e312a77950afb49af528bd54cc82c216fad4930e4b7e57f146d20e2a885d456eb5da8f426caa1e11db SHA512 1a29904f3b1676702df5230cb59b0822a64826d4f2e3accdfee6981f53c5f8f22465451e27990d44a0e7302e8f4a1870aab25b08fad81b3cd3fb4e1c2989b12a
+MISC metadata.xml 418 BLAKE2B c0f750a484c73516067fcb3f901fcf67cd7be620026b9069506a9d3d3ee2bd44f3aaa26c2ca8cc35e8af9796642815346ee55ef0265b905d61c6d9e88d9d11cc SHA512 5cb0bf2283d2e801542d3dd21e6b4b7bc3e1d8b8b904009a31cf90baa09de965a5c3003265e0b0d1384106ac79580c23c3fb73a0f028e7d75829051d68e30dc6
diff --git a/media-video/syncplay/metadata.xml b/media-video/syncplay/metadata.xml
index 9fa7c960908c..7c4c9284a32e 100644
--- a/media-video/syncplay/metadata.xml
+++ b/media-video/syncplay/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Syncplay/syncplay</remote-id>
 	</upstream>
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index d9a156927094..10cd290e7860 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -4,6 +4,6 @@ AUX 3.30.0-vala-errormsg.patch 820 BLAKE2B 6b896371078f59b5e46efb28ccca56ef710cb
 AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742
 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
-EBUILD totem-3.30.0.ebuild 3714 BLAKE2B 2bdd3294e8d1749afac2a268231f809070ce926705e8b8053b91f280200b8e5c24277081ccf5c0db8c260a20af9095b781822f9259e1ea273f9779eb5da02d3e SHA512 335e3719f373d739331eea050ffab25d15231763885f97651bcee1c4970339f5720d1eba7c4284abc9ed6f2db545f6f3aaf838b44f1f561a8eaa2a473382ab7b
-EBUILD totem-3.32.1.ebuild 3431 BLAKE2B ac935a22e936aff899dcd33cd0d69566559b1993d1d84dc2ae53d72d624d9738d94c2afdf9aea99d3bc4eedb127379aeefb53885cf0549cb8b6ae7d0ad293c9c SHA512 646b70a0283531d4599f7d6c6c052e4ab9593bf552476b6d766e94745abb535954038539d4afe319094e83a8d4ec6fe7fc4127d6903a95d9ac5fb52f640edc2f
+EBUILD totem-3.30.0.ebuild 3742 BLAKE2B 8e2f992b6a3e9baede4c4d36063aee266753fa3badd3bdb85d13db9daaa92bf9cff737411d2232cebf53907cfc3b96e394822211e0ca9e417a34c0f39cd867ea SHA512 3ebb6f56195aa9e03883886e4972e0028c51f1f8fc9c26892651d3ddae29f496de635390cd83e163a5e6f6b32f9a4fb3ae11c67eb41761e8eadc33dea5a10968
+EBUILD totem-3.32.1-r1.ebuild 3110 BLAKE2B eb249c13d246dc798bc218df09b48ed8490c1c4960a6e1899b0b1a1f20ad44751503db3dc2df7365efe333b34f31d36658073b7df6565c577c8ed54d1fb9a732 SHA512 3fff1db6c78ff7eb38816e2b61cb130e64c2f1a887d34c607e1bed7dceab612ec4f221ca3fca13b3f83d0e9cc2757a2e4050a18c8263317674f4b94ee5c76eb4
 MISC metadata.xml 1323 BLAKE2B 50a31cc1ea80714ce43b7434888c275acfea44b2231c500b20422ead6f248b3ccb0765909df4dd2c74c05aee333e294c599982037f91364efe77b1dad639c63e SHA512 95686fb2c0a601026587bc759548bc7b3798f7ed1347d34d2deb42a35ed5f424da7412ccb4b6d6fb50ca078855c32f1eb0485ffa4eec919baad7e19b899058be
diff --git a/media-video/totem/totem-3.30.0.ebuild b/media-video/totem/totem-3.30.0.ebuild
index 06cfd5eb1388..291623b00836 100644
--- a/media-video/totem/totem-3.30.0.ebuild
+++ b/media-video/totem/totem-3.30.0.ebuild
@@ -64,6 +64,7 @@ DEPEND="${COMMON_DEPEND}
 	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
 	dev-util/glib-utils
 	dev-util/itstool
+	>=dev-util/intltool-0.50.1
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	x11-base/xorg-proto
diff --git a/media-video/totem/totem-3.32.1.ebuild b/media-video/totem/totem-3.32.1-r1.ebuild
index 1046a2c110e9..b06daab34a8b 100644
--- a/media-video/totem/totem-3.32.1.ebuild
+++ b/media-video/totem/totem-3.32.1-r1.ebuild
@@ -1,32 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python{3_5,3_6} )
 PYTHON_REQ_USE="threads"
 
-inherit gnome.org gnome2-utils meson xdg python-single-r1
+inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
 
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="cdr gtk-doc +introspection lirc nautilus +python test"
+IUSE="cdr gtk-doc +introspection lirc +python test"
 # see bug #359379
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
 "
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.19.4:3[X,introspection?]
+	>=x11-libs/gtk+-3.19.4:3[introspection?]
 	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[X,pango]
+	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
 	>=media-libs/gst-plugins-good-1.6.0:1.0
 	>=media-libs/grilo-0.3.0:0.3[playlist]
 	>=dev-libs/libpeas-1.1.0[gtk]
@@ -36,19 +37,17 @@ COMMON_DEPEND="
 	>=media-libs/clutter-gtk-1.8.1:1.0
 	gnome-base/gnome-desktop:3=
 	gnome-base/gsettings-desktop-schemas
-	x11-libs/libX11
 	>=x11-libs/cairo-1.14
 	x11-libs/gdk-pixbuf:2
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 
 	cdr? ( >=dev-libs/libxml2-2.6:2 )
 	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	media-plugins/grilo-plugins:0.3
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-taglib:1.0
@@ -57,10 +56,10 @@ RDEPEND="${COMMON_DEPEND}
 		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}] )
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-lang/perl
-	app-text/docbook-xml-dtd:4.5
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.5 )
 	dev-util/glib-utils
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
@@ -68,7 +67,6 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 # perl for pod2man
-# docbook-xml-dtd is needed for user doc
 # Prevent dev-python/pylint dep, bug #482538
 
 PATCHES=(
@@ -80,21 +78,14 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	xdg_src_prepare
-}
-
 src_configure() {
-	# Disabled: sample-python, zeitgeist-dp
-	# brasero-disc-recorder and gromit require gtk+[X], but totem itself does
-	# for now still too, so no point in optionality based on that yet.
+	# Disabled: samplepython
 	local plugins="apple-trailers,autoload-subtitles"
-	plugins+=",im-status,media-player-keys"
-	plugins+=",properties,recent,screensaver,screenshot"
-	plugins+=",skipto,variable-rate,vimeo,rotation"
+	plugins+=",im-status,media-player-keys,properties"
+	plugins+=",recent,rotation,save-file,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo"
 	use cdr && plugins+=",brasero-disc-recorder"
 	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
 
 	local emesonargs=(
@@ -103,6 +94,7 @@ src_configure() {
 		-Dwith-plugins=${plugins}
 		$(meson_use gtk-doc enable-gtk-doc)
 		-Denable-introspection=$(usex introspection yes no)
+		-Dgst-inspect=false
 	)
 	meson_src_configure
 }
@@ -110,18 +102,20 @@ src_configure() {
 src_install() {
 	meson_src_install
 	if use python ; then
-		python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/
+		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
 	fi
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
 	xdg_pkg_postrm
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
+
+src_test() {
+	virtx meson_src_test
+}