gentoo resync : 15.09.2019

15 files changed, 92 insertions, 266 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 207ee02eb815..362867035437 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 3c5ce739f3b1..b24f5fa48a1a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,8 +6,8 @@ DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1fea
 DIST ffmpeg-4.1.4.tar.bz2 10691784 BLAKE2B 5f1f0b3c78cdd913e44bef448ff4d26fc5ea01e1a002baf98461fe0d8870bc2b0f29a1770377df8ff4f0c45febd532d6436c6627f5d1fb97125e92d9929f9284 SHA512 0c2d5bf4873b2bf12aff8c8b576d58dc3c5984ca727f48e1247293cbebda382e9070e8b7fac99870ec2ae0cef3be0a187d5ec5d58ee3e861cd673cae961b5947
 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 17089 BLAKE2B e22a868b41cb850c62dc6d17086b3926f643c729143cb73a337751429327eba78e790f4ef83347ec29a722edacae2623f62457d413a6c50bebd8be7470f085b3 SHA512 f5f10320019873ef08deb6cf9f3ffe4a3c75722657bbcd3f3a644a99a23fe257e9bf4b211f2f3648ef8a489e0b81e83dd44dc34f988bc9768b7e8647c55b2af4
-EBUILD ffmpeg-4.1.4.ebuild 17092 BLAKE2B 550aa1315c42bc58dd3b218134b0f0bc486ba3657a7aeea214b65e413be6fda5ecd22fb3dd9e50125710ee8eca550311aa7ebd5aaf28b852a5ac493d0d521a8c SHA512 8d401aff8819f6d66dfa01ae89aef2714b689a28ada474dc5bfe7932b9b67c8b71ac9799d8377ecc5c01f412ea292754543e52c88bcc17716d164b2be4cb2136
-EBUILD ffmpeg-4.2.ebuild 17681 BLAKE2B 7d65744b165d8c28df786b200a52e790a1d987a11fe1982d511c327da2a54b2e97dd88123aa8f1fae5c1e04ade1151711fcfeef8e156046dd639635b11628e53 SHA512 4fd8082ca3ae8a1053a7ff36780b8b61c694136ab40e1953ab353788b32b0a397772c4e9debf00990c7d7c0bde5e1a162b92cf726a2db0296a87d7f8eb01c0f8
-EBUILD ffmpeg-9999.ebuild 17687 BLAKE2B 321594d28d4c9c3bbc0b68688b65092ac7727fd29719462e1dd1b022ffe5019ac8b21fdf7cd4fec1b7d98489ddc1774b01e7ffe840cbbfe6496428f5f47ccca5 SHA512 e541901bceee8100e67056450212bc64555d380bb7ffa9a2f78ca6cc1e07e1be6b98fe540fefe5303ce23cac4f41332fe6831061c9140b299a2988ac253fe03e
+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.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.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index f291a15cbd53..3af4888bde3f 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	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"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
index 6052be327bcd..15f3beb31803 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	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"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.ebuild
index 1cc9bd89f36a..e614ce5a2060 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	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.
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index b29918ea4ec4..b95ad2762089 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index f2f3891079eb..f15cbc8e2a01 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,12 +1,4 @@
-DIST libva-utils-2.0.0.tar.gz 1033292 BLAKE2B 5f9e36d2a69a6a65f3d47b0e29aa1807201da8bd69eb00da5dc232b2629fdd01279c38af77335244f673b4f2e849ea3cc89a572b7ce26fd614f44461603c0c19 SHA512 5c435b558fdeec6dc597c531b1e72e1a6e8b4f59f5f97af30d01b39a20430446cce7af5553b924144fbc54a64f0e39ab232c76e4e8a266329cc9868d60be0c4b
-DIST libva-utils-2.1.0.tar.gz 1034951 BLAKE2B 88fb075bd1946bbba79c460640c3242a6ad85fcb6396a77b549ce3d2193fb4ab6df35b70a0981d56cbc40822a9b2146074255f573783547b23ee0e7d8670fce3 SHA512 2dbf1e1849136804be8970b1f02957e6e3eb593a72e34289e8e2c087b3a358596e5eed7d17d3c56701045116a0658450c37b26600a352dcb37ed0d58d5e14ba6
-DIST libva-utils-2.2.0.tar.gz 1037165 BLAKE2B 7d86ab23972be8abd7703fcf38025ddf3dfce1fab00d7b5ac083004cb33fef1cc4d8aab7ebba6e20b33377f0e4b3b9b0ff9b3e47a2ddc0c2bfcd7b256cd2ade9 SHA512 c4394755f500c0839d8ab40baa40deae26dbdd7b4782993b9a46e011712e943a1a55afe1b0b05dc8af80eccb327c8bc388576e4843447715248133e2a5c706ec
-DIST libva-utils-2.3.0.tar.gz 1086331 BLAKE2B d983831605cc28c361ef0609699560c655186ecf4d4ee045b377d5928e7b0a127126aa92cf986b17f6eae3de9dde311321fdc58caada9545d1afd047f380c1b6 SHA512 ae36afb19f3414f4a3b857bbaeedd088e91e8a11cc785c4b945af0c7bf0e7bca7821ea5731b0868a26f273e323c0b155b12d87b4740fe8b2893ef024b8a979d8
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
-EBUILD libva-utils-2.0.0-r1.ebuild 1352 BLAKE2B 24cd83a890efeb1edc3794e58140590676b901c5e6df3374362bcfa3032515d9b2fbf19f55adc4dcb2fe10bc57aeb405a768b84c30f688c37de2b5d60b1f5f05 SHA512 7687c4c1a7093b6a645e2c08ff4ff14890d84e08c380c30033952792ab063e0d19ae79f360cb7306b0ccb3e6082558296a148e076939173e6b63f25ffcb0281f
-EBUILD libva-utils-2.1.0.ebuild 1352 BLAKE2B a53ee0ce8a047e995eb7ea3f1f79efc5f44eb33965f1a13db7302a3cf89bcfd38bb6966ad14ba57acbf2d50f703c3b795e0368c11be9bb43e00b2af810a47e82 SHA512 9020017ce01eb0d3abe946e1de006287c03cc110338c4fd9b18aa64fc6ddd996f3c7758bf88e02fbb556e5a65717caaff193b47d79f9afa28c343b5b47462d1e
-EBUILD libva-utils-2.2.0.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96
-EBUILD libva-utils-2.3.0.ebuild 1295 BLAKE2B 593c4fd0478068527e1e4d1b4e353d4bc7814d68b897bbf13491087ef91414e3c627fc1082c720025c533206d77e0b9159648c01c1f18f9b1e9b9d7c1d28017b SHA512 caf1cd6c81bf5dbdee999bee5aeeba4ec6cabf67144376a43ac0e9397903b6c1bed4de3f7bbde3057b2cca7d631e5dfeaa797f1d1ccf499bb89d2f2119a29f6d
 EBUILD libva-utils-2.4.0.ebuild 1240 BLAKE2B a970d0c1e48ef7fc91b535f1cef599458f07fdd5f15353a4091035db0b4face8a57400936c20baa84b861582c6743b310b8de799fc7afcd875cb959be7be610e SHA512 bd4ea74f9e5d47467cded5da5c206ec3371747d9c7fd87d1e79fb62aa848653ceab9c362051fec284473ffd3d804a3dff00f9d47014d14de7059ea97f1a930b5
 EBUILD libva-utils-9999.ebuild 1243 BLAKE2B 61e8d03195a05298aab400f82ad970e2da8324638f0eab1de330518be906ca847b46727493f1c82555ccd5e31548e8ad05c61d194ede83ad53895147d8ac5c49 SHA512 7375fcf7be6c59d86bde4cff1b9578dc66a859043f4e09508e05465fa095910b6f87e142cf21f400984e3d152af4ce4d06be1b79af6732d79e4f5f7e2a018a90
 MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
diff --git a/media-video/libva-utils/libva-utils-2.0.0-r1.ebuild b/media-video/libva-utils/libva-utils-2.0.0-r1.ebuild
deleted file mode 100644
index 98dff65e7b52..000000000000
--- a/media-video/libva-utils/libva-utils-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-2.1.0.ebuild b/media-video/libva-utils/libva-utils-2.1.0.ebuild
deleted file mode 100644
index cc5f1fc7c3e4..000000000000
--- a/media-video/libva-utils/libva-utils-2.1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-2.1.0:=[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-2.2.0.ebuild b/media-video/libva-utils/libva-utils-2.2.0.ebuild
deleted file mode 100644
index 6c7521ce0786..000000000000
--- a/media-video/libva-utils/libva-utils-2.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-2.3.0.ebuild b/media-video/libva-utils/libva-utils-2.3.0.ebuild
deleted file mode 100644
index 45318abddb59..000000000000
--- a/media-video/libva-utils/libva-utils-2.3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index dabfa3efb3dc..cdfcbbf2fd8b 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,3 +1,5 @@
 DIST mediainfo_19.07.tar.xz 1903620 BLAKE2B 68487713e0c540022d2a5ee8416cb8e1c87ed2a4479f8d7c247d75137a62d3ae2994d02cd8853080837a23d582ce4acab497646bf2307a0b2b4d398635738baa SHA512 ef543b2b3fa61347adaa510fc3b051ff148e24ef6461e25b9f1d158f3c4b57ce96826d0c0e8ae46996092e0eb84e99308ba87d95dd0392b99f05b704438c5983
+DIST mediainfo_19.09.tar.xz 1906920 BLAKE2B 926a13dd4b059eb613acf89b3b3e12918a86ad45c8551948be2d55478bbe94a93a3fdf7a49fbc087e44fd81232a9fa85cb6dfbd25efb11b9997b1f90b49090e4 SHA512 ddcfa92d822a28fa804d5bddc0d29bdb8cff3779b924c2caef0e59b0f79f857a4140dc94bd2ed9158954f6400778572975ac63f45ee2b87664e3e3b5ed9327a0
 EBUILD mediainfo-19.07.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
+EBUILD mediainfo-19.09.ebuild 1602 BLAKE2B ba4076c82d812b436c9c707c36043e1f2a5c493fa23c78ab2b545dc1e207f1d42e49cc3795fd5675820ef4e614f37c94128e9e4c5e3a82ccb79e416338950ae7 SHA512 30306ad04a63f72802532bcc3bfbf9bac6cba5306af8d6f693052a17b24f033ab089a7dc1f928cb6fe5c569c5f73d71206fb8d6d0d1f9b4d135cabf8bc109637
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-19.09.ebuild b/media-video/mediainfo/mediainfo-19.09.ebuild
new file mode 100644
index 000000000000..255a3010c595
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-19.09.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit gnome2-utils xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.37
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	if use wxwidgets; then
+		TARGETS+=" GUI"
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	default
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		sed -i -e "s:-O2::" configure.ac || die
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+		dodoc "${S}"/History_${target}.txt
+	done
+}
+
+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/pipewire/Manifest b/media-video/pipewire/Manifest
index 1e2244117582..a3d4f66f23e7 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 1841 BLAKE2B 53bf55660ea633db8908b6ef40adc99380ea66786f61e6facbfa18fdaa7488a747de287fb01e151a77041f3767ac8eeffb973c347f36604ed5c7549923e75598 SHA512 8f70774b235c56cba113b3c060b6412cc638c1e6bb1aaafe9d98ccccc939941daa181ca6de5b5db1e854bde845f09f3799d34b9be5b646700c9245ba9083fe12
+EBUILD pipewire-0.2.6.ebuild 1848 BLAKE2B 7430add6b35d8e9b6fae1ae225f7b57d7dfeab124a0a48d807a62efeac9572c21193fb02d35da4217124f0d55b8a3d2c6f8a4548ca1e102dcf3d866c7f16f2b1 SHA512 4fd94b66cbc0453bb1f939d9bfc6c16b14cb589418763339aabc67d2e263af5190763fcb31cf066c5fe4b3fc0ca8f3c9162608cc6e0e1ef11acb74887d74b710
 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 37e0fe081701..a2ab2c7b1516 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 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"