gentoo resync : 02.06.2019

4 files changed, 10 insertions, 10 deletions

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