gentoo resync : 02.06.2019

18 files changed, 116 insertions, 235 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 049fdb357261..6752fa225cec 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 8419b5a2315f..3fc42174237e 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -5,5 +5,5 @@ DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedf
 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
+EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2094 BLAKE2B 710753e7fe91937f6b4fd1e44fa65f73121333294a899104061eba718f804cd2dc8e7f8b7a5ec5ebee51f2fca539247f589fdf44cd1153070dcb12b1b61cc815 SHA512 94b34c9801acc52c9952ceccab4aea3feafe265c28f88a58760c9183a70a45d1d6c39ae9414945fc7d2f81ad40d4cdf1e6013a3874e7db825fcdb31af78c42fe
 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
index edceb82c0e40..f9cdfff4684f 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}
 LICENSE="GPL-2
 	texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a49326cb224c..1aa089345c77 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -22,6 +22,6 @@ EBUILD ffmpeg-3.4.5.ebuild 15590 BLAKE2B a620d58295d2386f68410999760c9da26c054eb
 EBUILD ffmpeg-3.4.6.ebuild 15588 BLAKE2B d49f5b8411ee48a41af83136a8f0ec673f4feb3a13e194d72716c5d220b929688ff1bb20555091ee113546669ba385df7d1cd880fb724556f90420bffcdb00c7 SHA512 8497f50238398bb270e20bf3a896c95fac17ffae62482d3475aa28df27f7ac23c5d230a0a68de089a9f3230826345cbf9b12cd38a2f6fdbdf76b533fa50b1d84
 EBUILD ffmpeg-4.1.1.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
 EBUILD ffmpeg-4.1.2.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
-EBUILD ffmpeg-4.1.3.ebuild 17071 BLAKE2B 26da8429814998dbfa0a37744264e218c835f6284f18e0b9cb6a395fc30d94e325329f7c19251f9810fa37e796953439e9525bfe48246bf628b8c3bf6e11dd67 SHA512 bdee2a23a5eaa224dbf24697d129be94b8967edc4e906f4ec5d10b3b5f3def0067e497ceeec10d29a48103fae392072fdcca695b48780979dd158b29babb62ed
+EBUILD ffmpeg-4.1.3.ebuild 17070 BLAKE2B c04bc55b090d81d9a587a18a19f0518306d65c17255999c8e63c5aa2c9e10b10088b88ad9a549c0576ea33750b5654efecee70ec75017eb2ff8ce542937504e5 SHA512 6d818dafb8835ded68e62fb810e591e41668a21d0a0bd6f0b8d1789df78c9eaf9c47ebc31545ea9ae46c25ced1c93a7164743ff172284e8c8b10fce091970d90
 EBUILD ffmpeg-9999.ebuild 17208 BLAKE2B 0c9c9bbbdf2238d995008d6ac8f6a357993abd976958738747edca1e966caabf6dd5816a70c9da34072157fe08b3fad6b04bf2cc65cfe5a548144d968a116938 SHA512 b6e99a8d554b18afc5719468f80d46b5d6a1f3e71ec1c68beb17797f3c7ef301418afdbf9f365db554617564b290d3596e1ad0e355b4b08da47f76c747ad9aec
 MISC metadata.xml 5992 BLAKE2B 640b4b6e9904cc8653cd5c7788cbd5b0b48579e7a87fdd58b98e5ad88d3e34f05aa181a89830aabca4f9262c1ce9e07ed1b1c323352d40b1da6800b5e0e41fe7 SHA512 542bf49855f46b3391a9061b3c5e8c025ea5fb67af6046f0aa2bd6fb5cdf17bff92d5c2fea181f7e2f7dffb84452f8876ed8ef744b41b7828d0188ce57b184ae
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index 683d91455e3b..907398cc03c3 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 ~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/motion/Manifest b/media-video/motion/Manifest
index f08b5bce890b..acacc37c9421 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -9,6 +9,6 @@ DIST motion-release-4.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc9
 DIST release-4.0.1.tar.gz 444779 BLAKE2B e74b193f421e4fe165f36fe251eafe44203bbf8825b0062254bd7e0c9a57b286314c1bbb287c1c768db62649d82b83f4876ef236e446a1f21f7baf90d5ce5b4d SHA512 6ccde3890e6af56f28208321987dd1b9d62a55bbe7cbc3ab5600263602e6e8f47589392c2f3a3a6cb54f927ee76aea94d0e83f26ce8e4047890c891b6c2f8976
 EBUILD motion-4.0.1-r1.ebuild 1979 BLAKE2B 943b6b40dad276dc221c61d7d3de0af85992090437bab65fdf4b58ae4ffa22ac53e5e01498e5cf2fa371c751801ecc64d248a655c7c50550520feddad7c2341d SHA512 336da1d0dc347fa610bd810c309dedf82e66137723decba9edaeb44ae68ad0f490483f722fce267f1de8a70406698f6f5701711ec00b11d25cdba1a2a6cb5d95
 EBUILD motion-4.0.1-r2.ebuild 2011 BLAKE2B 29f89ea29bc4dc39aaa4b5beb5dbd96b9094226892eda76b025c7ddf874894cfb70f6ba50bf3dff6cfbe7088f04f9b0d8239280270e9a8d2eefd9cde5d1c5093 SHA512 6429e44d029443192c347ae8d0f309244cc63cc67ccf46b9f78c678c7621c808d085fca85d0120da71964d323e10d817c835513ef0a1fb5857be4b4aea36a305
-EBUILD motion-4.1.1-r1.ebuild 2206 BLAKE2B 40d1332ae002f75b2aa83edce1070f66159ded78c2d5b5ecfe280947b59fc837bcd5d00b976411c8c884ea1d6b457545ee7519eeed47e2cb73eb5c02d0167d97 SHA512 822db0bc6a312ee8c38605cb66eab4ebfd38ab0eda97ea8e15a1eeb8b4ef12a048280c2c28c31e8aab43393cc97a8cd81c3671d2a18a9ba2a6a5d16b5a60695f
+EBUILD motion-4.1.1-r1.ebuild 2205 BLAKE2B f1389721a58c5e943220019dfb7be3aed33a44296359ff663361c969f3901f7d32c54fe5a6d6a733cecad40dad94ec931bb471f64790b29c5623d77c21b7dc03 SHA512 d2e06a1a45328a3f1a76a40d52da49819ed512f5c7a7fb1d3347a29418aadc1c20ddf3a0a15f40deba5c329fdb24beb9efec140a7e19717cdbebb1f9bc6fb9f9
 EBUILD motion-4.1.1.ebuild 2132 BLAKE2B 55a3e637fd7da85402f71a744d05c73cf0a4eb1a1d3a0df6a4bd7d94e6a14e64334e567c912a1d117e8ed3c0cf8fa43ea8040d9911d677b6b99065966a4bd51b SHA512 3882e33512a29332ce013c8a61749dbf986e546ac5c0e4662cabe77a1655ef281ecfa7649504446c52c4edb301524ae5bcd198ab7bf7eb6f781c36fc06aad84d
 MISC metadata.xml 688 BLAKE2B 62d5d1fc2c9581ee8d66557903d17060627060d4cc76d745bee2bbb17980bc81337574986a7bb1b2d6f669041ba09b355fce68655f9961d388f3ae40a65d3fb2 SHA512 f69d8539a16d80a49c147a60f8e831a245814c4853383f9991f4c2762aa2d1b7f22b8993eb7184a49c6c783b75d23ef91a10b6293563aa7e29f561f40fad56d1
diff --git a/media-video/motion/motion-4.1.1-r1.ebuild b/media-video/motion/motion-4.1.1-r1.ebuild
index f4f49ccb2b55..3113cd0a5fcf 100644
--- a/media-video/motion/motion-4.1.1-r1.ebuild
+++ b/media-video/motion/motion-4.1.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ffmpeg libav mmal mysql postgres sqlite v4l webp"
 
 RDEPEND="
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 63f09b6ce55c..35f4aab7a5fa 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,5 +1,3 @@
-DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72
 DIST parole-1.0.2.tar.bz2 915511 BLAKE2B e6fa116cae5c015a90b4a1d04df70f006ad59dfdb5d849b8ae8c3fdc0665e48790739c82bdb7c35c70f34548b9bee3dcac62f29e28562663d46b10a3a080f13d SHA512 d7e989af7f9dab14080e62bd656a2858d8536a056ba82b5d5ac7d26a7d898f478b74c1ba4371779624691b7f42b695580ad53cfb15da0a4dc209d7570c12a66d
-EBUILD parole-1.0.1.ebuild 1442 BLAKE2B 7c6e7f4209136a9b2215bae72574652e0c54047b7a65aff05708f41466799499a3b82a514b54e0ea929a2c0501c6e4afb6ef01259cc1b6e1856e46868cd1d880 SHA512 eebb71d36da7b352c74a3ab7c18159e13de9aef93775cff90b43ace73ab8d7bdbe2aad5621cb7f8fa935c5de7d00216496e13f619f5f21e2f53e3fdd13c69434
 EBUILD parole-1.0.2.ebuild 1442 BLAKE2B db6d0f6f8ad020030448874f38d2e2d270fb2f7b5446e24f85792d1de574c368f0c6ce352bef0a0834d331089ac42052b8f5662599ed874d836e2b273dc68634 SHA512 985e7c0dcd1f792ee707e47fd34dd52dc4698fa474103a0565905212e55ef7c576bc99cf315664782dec3a4693ee928eb33c58efcaba10a47827c93c8175dde0
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild
deleted file mode 100644
index 04d5007a5f7e..000000000000
--- a/media-video/parole/parole-1.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A simple Xfce4 media player using GStreamer"
-HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="libnotify taglib"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.32:2=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	sys-apps/dbus:0=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:0=
-	>=xfce-base/xfconf-4.10:0=
-	libnotify? ( >=x11-libs/libnotify-0.7:0= )
-	taglib? ( >=media-libs/taglib-1.6:0= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		# clutter backend does not work with new GTK+3 versions
-		--disable-clutter
-		$(use_enable taglib)
-		$(use_enable libnotify notify-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 447930229dc2..b3793f3ca804 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,11 +3,10 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
 AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6
 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
-DIST smplayer-18.10.0.tar.bz2 5167524 BLAKE2B e6c1993057f9249cb0677643816744c3a7e44bdd70865b21bc5d69d6f087c03be53fa01057ac75c42d74a00a6d5b5f6e8be4e6955ffe022196c45bba218becc2 SHA512 7726294c16761900b384db42155a26891f9becae38ef39b35dd9c6a62c2050b5720a8b641a893b33c7bc08a5c98e12a4651196a67311444d6cbed2dbd5895f5c
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
 DIST smplayer-19.1.0.tar.bz2 5169546 BLAKE2B fc15fd33522f137371442696b20ed695dbc4cfeb759ae504cdc688dc30de14fd35da81f6788b3dc2886119012416218f1d39ba64a7d747194dd777544a08d1e0 SHA512 aee009f0ff6dcfe8e5b0b80c99d44c41a02c34d7974c1a15b21235e3daaf3142f5c936adb043327804412309b88e0ff8f0ef440c1835541adb6bf703d486ff79
-EBUILD smplayer-18.10.0.ebuild 3210 BLAKE2B 7d56ba88f1a342374e510b5b1c0359c62658ab65086ac04b7698c960bab229315d53b78193e0f18d183aba0ba6e33cb8af351b46d40c2f651b702e0f9c1031b3 SHA512 1f96d728aaf2e64634ed3740653ecb9eb6af52b65cc1b009fcdfb1ed10b3b8f53c3435d96ac00b4ed5a14184e4a55be53159b1557043640e77f61496e6e5abc5
+DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1
 EBUILD smplayer-18.6.0.ebuild 3208 BLAKE2B 7c809a0375fc293b2af598e3f2c672a8a4f4bca451e155ad7dbad944adaa80d1e2a489b60ad9a1b133afca472ac59e15b5ec7057652353765f9ed19f4e6a8585 SHA512 21a14fccf5d307cb0b2d2cee864d5ca8bb29d462aa8b821a7654da42e193d6480520d2c71e1c0cc84df0f782aa0494cbaf88b6b977d3bfe056002318a69c4577
 EBUILD smplayer-19.1.0-r1.ebuild 3164 BLAKE2B 0b6fc77b7f22e590325ffb1304868cdf4551eb8c10fe5239b7b1bef43e66a8784c0a325a4c4fcd83350ae3635b82e94cf2c9d553788a3336d5555a35f698a592 SHA512 d78f0e68b457b267195a6124bec53d89c001f7c6007db62c3afb4946a8bf47b6697a1c4fe333bec8cc4d2034c6e22aef53003ce23e7bf24c023f824dbf8ed21d
-EBUILD smplayer-19.1.0.ebuild 3210 BLAKE2B 7d56ba88f1a342374e510b5b1c0359c62658ab65086ac04b7698c960bab229315d53b78193e0f18d183aba0ba6e33cb8af351b46d40c2f651b702e0f9c1031b3 SHA512 1f96d728aaf2e64634ed3740653ecb9eb6af52b65cc1b009fcdfb1ed10b3b8f53c3435d96ac00b4ed5a14184e4a55be53159b1557043640e77f61496e6e5abc5
+EBUILD smplayer-19.5.0.ebuild 3164 BLAKE2B 0b6fc77b7f22e590325ffb1304868cdf4551eb8c10fe5239b7b1bef43e66a8784c0a325a4c4fcd83350ae3635b82e94cf2c9d553788a3336d5555a35f698a592 SHA512 d78f0e68b457b267195a6124bec53d89c001f7c6007db62c3afb4946a8bf47b6697a1c4fe333bec8cc4d2034c6e22aef53003ce23e7bf24c023f824dbf8ed21d
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-19.1.0.ebuild b/media-video/smplayer/smplayer-19.1.0.ebuild
deleted file mode 100644
index 23bf31eaf0a1..000000000000
--- a/media-video/smplayer/smplayer-19.1.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit gnome2-utils l10n qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.15.0[libass,X]
-			>=net-misc/youtube-dl-2014.11.26
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
-
-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/smplayer/smplayer-18.10.0.ebuild b/media-video/smplayer/smplayer-19.5.0.ebuild
index 23bf31eaf0a1..a7d7dc8f6ecf 100644
--- a/media-video/smplayer/smplayer-18.10.0.ebuild
+++ b/media-video/smplayer/smplayer-19.5.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2007-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
 he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
 sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
 PLOCALE_BACKUP="en_US"
 
-inherit gnome2-utils l10n qmake-utils toolchain-funcs xdg-utils
+inherit l10n qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
 HOMEPAGE="https://www.smplayer.eu/"
@@ -19,7 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
-COMMON_DEPEND="
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5=
 	dev-qt/qtnetwork:5[ssl]
@@ -31,16 +32,10 @@ COMMON_DEPEND="
 	autoshutdown? ( dev-qt/qtdbus:5 )
 	mpris? ( dev-qt/qtdbus:5 )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	|| (
+		media-video/mpv[libass,X]
 		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.15.0[libass,X]
-			>=net-misc/youtube-dl-2014.11.26
-		)
 	)
 "
 
@@ -123,12 +118,17 @@ src_install() {
 	default
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
+
+	elog "If you want URL support with media-video/mpv, please install"
+	elog "net-misc/youtube-dl."
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 21d0b1b0051c..4dd06b9fdbea 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,7 +3,9 @@ AUX mongod-wrapper 101 BLAKE2B cc52f011b065322fb7ebec982c5d0b188f4c72859770dec98
 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.1.deb 162379830 BLAKE2B 8183cf0ea37507059b87f5f51a377a12cb2f5fab31675eac720cffa2f9c60e46e6a8eb68279992703722ba40c3fbe7a9a723596ee20e31ccec0959841851325d SHA512 3ac83e3ff7beb8c765c8908b80c7747807da73e3a9e077a9f5a22aaf3e307c369258c7ea6651e18ca74b570d359fa65b6cbfce0017cb73cb916a2bc8614b374d
+DIST unifi-video.Ubuntu16.04_amd64.v3.10.4.deb 161279504 BLAKE2B a9bac456218a1908e67bcebeadd06672ce6de4a24e62cd99dedc6de4e36774047531e8b00429e0dc8eb536e6ad77de236d89da83edfbaef8d7a7feb04df6c482 SHA512 d45f97905078ee6f9911bbea239d72432dda849c5fa16a11c2576e1dac78a0b612e420ae59f11ff7bdfec3c7eca9396a72d249d4fc90f93f9e92c57571f19093
 DIST unifi-video.Ubuntu16.04_amd64.v3.9.12.deb 117448948 BLAKE2B 83769ec07fccbcd955115493510bcd58b88433b7d7204be29d6329674cf4d6dea7fe4b6aedd0e89f852d89ae9a298a9284386aeb4480f43a91dbe6ea958ab10b SHA512 0e2eaefdee74b6b6c5ae54870673591ce4e2d2e4c07e068987f609597c43a12308aebdce705e316555378e04eeb13aaa0c00b496097123960215773cbfa69348
 EBUILD unifi-video-3.10.1.ebuild 1905 BLAKE2B 616c32a1b7dba5b882a1cf4d6dc573a55e050a88e73d4b8da653b00be06ce700f7458d8a3417ce5fe24eefae1407d704784cba627de9ad386f04870b0da07534 SHA512 a1bfb97ea0f0a9244e6d654e352998cf602dce124c30b7669b971cd34a990d650f2ed2fcdfbaba2af8233bb521155bbbe9b06cdabc5bc2e826f5bb6fc137a73e
+EBUILD unifi-video-3.10.4.ebuild 1897 BLAKE2B e182a17a1b8d00350eb48c384a926f56b705493cee74950a92ccac416540e4d5faf9efb2046f33bde5cd8b4ed2435e19f111c59824c5a2818a68e675415ab691 SHA512 7058a3267310542459a9675d9e0ce0793e6f46d2075f9ce4f860c1387d249d4a2736411afdd7062f4af677e49717a8a78be04731ca0e4b672227eddbf94748e9
 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.4.ebuild b/media-video/unifi-video/unifi-video-3.10.4.ebuild
new file mode 100644
index 000000000000..c975418c3dcd
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 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="~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/
+
+	#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}
+	dosym ../../../bin/mongod ${static_dir}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 46489cb2a9dc..e911fd28e76c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,7 +7,7 @@ AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa52
 AUX vlc-3.0.6-sftp.patch 979 BLAKE2B b6fd797112363e5fb0f0721eeeb92ee7b5c9a9e1a9450e51a99346dd824f75089775ae09c0dbc48dce7adaa889f3b03570d2d995b2aade6e73ffcd8e8765cf51 SHA512 3f510d9b007ce353211db878b671c43b17abffafd22a03c883e509808ce8b46bf64fa48e64d077c1e8f6ba2cd1f3e08a24e5db48fcda9cba02bdf266ca1a4378
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
-EBUILD vlc-3.0.6-r1.ebuild 13301 BLAKE2B 95b183dc8fcc8c0cacd16f9bb6bba7f16663d3a7ffd9dd359d5c8ea3fcc955d550bed2fb7417b5bd688f14c538b5342ff2886f49fb3a241e431d31b53faeb653 SHA512 f96776595823e4b78fed4199db5105855ae501957c555e9521f6d32c2a3bcf9a30019c7b6c9d985a2471ca201522d6ea0b65f5688a7840c7dde93dd0737a58e4
-EBUILD vlc-3.0.9999.ebuild 13114 BLAKE2B 69b985686f741088f062fe91fdf020006ff19a7972313cba56ff2bcce9d248fd82050dbbd00fa8b67167e587d72e415840c077986e49288ca57cd9550021870b SHA512 3c3ec68976cf4c2a5365f6a88d614b4ffbdd4621f076e9d6caf569315d70a7f848bd5b48edf0dc53be204e60e9c1f64a40ba56143ef48b338e67f0f131fac1bc
-EBUILD vlc-9999.ebuild 12982 BLAKE2B 03b9cf07362f3ec5b144164f870b79f7f20f35dbb396b4d2de738c8a2f9622d3c278b85efc79d13baf0dd6777be8e68430bf6b82314419fbe2b12d2542e8bd5b SHA512 ad5b89f132626ef54c0ee0bd78aeeb0625d3249ea6ebe065ddd5561c187fd812002f969a9c86bf64b995cd66ff42dbcde5dc8984798c753c08ab442c6a431e00
+EBUILD vlc-3.0.6-r1.ebuild 13308 BLAKE2B 69eb584b41942885678439a16b0b99ccba1e00f6c369233a23d190b739d9ce2906e5c7fe2d4a2bff38edd5f03bb047f016a40839c9ea788c60b5824068e64db9 SHA512 fa81f931ed9216997be00835584542224eec9c74086b2df48c6c00ad8d3b15b88e51769402997103ed303fc77e81a35ed087b46a59c2306a1f510260454c5075
+EBUILD vlc-3.0.9999.ebuild 13105 BLAKE2B cb8098cb3cac5c90c57b170bd7e8947ac17a0f12721c0783af940acbbdd41b05362e9160aa3e2d4ee45453f5e105f07fc84ad7dccc91231bc9e4f1e155b74ca8 SHA512 61a250dcc2e246269eab095e3ecc13173471c2f8ef79e20158b3d495f64b7367585d06cb7aea4c0235c928321858b9d303d21953a7ef93449114d51dbb09ad89
+EBUILD vlc-9999.ebuild 12990 BLAKE2B a55dc13a60632cbdb925007c8dd52ebc964125e8d4412557ff281cc206143c35ef9d41ba813b68d1976e5dd1224bc0c030b0bf0819ec7921b2d196da4e0b8820 SHA512 86e8e1e2d58d59d6c3ae5999fa27b025e4b1304c000a10c9935f013bb9c77379a2397b0a13d5447c7f04167a1de9938ded9ea60baf9e071d411ff8a117ffddb4
 MISC metadata.xml 5087 BLAKE2B 57254aa856882b33eb97358623d2600cb07e30d1554316de645d808f1bb6a7442cfb3b3fe6422f5de72dcadab06fbae28aa2c7b1d88d8fa588472de76d20fa23 SHA512 eb14beac4431445a8920190edac1a2a0b818565dc352b5df1e05dcddd4ff15a817e2624bce66a6aea431fa17b2203732bb9165396528e9a13c5dafacfce39274
diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index 42b4075acb27..0ecf3c646c68 100644
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -180,7 +180,7 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXpm
 	)
-	soxr? ( media-libs/soxr )
+	soxr? ( >=media-libs/soxr-0.1.2 )
 	speex? (
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 0409bef20e62..5b5892f8acc2 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -33,8 +33,8 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
 	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack
-	ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
 	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
 	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
 	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
@@ -181,7 +181,7 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXpm
 	)
-	soxr? ( media-libs/soxr )
+	soxr? ( >=media-libs/soxr-0.1.2 )
 	speex? (
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
@@ -339,7 +339,6 @@ src_configure() {
 		$(use_enable live live555)
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable macosx-qtkit)
 		$(use_enable mad)
 		$(use_enable matroska)
 		$(use_enable modplug mod)
@@ -407,6 +406,7 @@ src_configure() {
 		--disable-goom
 		--disable-kai
 		--disable-kva
+		--disable-macosx-qtkit
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg
 		--disable-mfx
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 092e9f812b31..dea92a28a05c 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -182,7 +182,7 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXpm
 	)
-	soxr? ( media-libs/soxr )
+	soxr? ( >=media-libs/soxr-0.1.2 )
 	speex? (
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp