gentoo resync : 10.12.2017

7 files changed, 543 insertions, 42 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0a79d236ad61..8a8284b10370 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,11 +9,15 @@ AUX vlc-2.2.4-ffmpeg3.patch 6377 BLAKE2B 2cd08b9058914fd899f515f434e0f93d06ae671
 AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
 AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5d5466e614e892e7e617b5a972ab9e204bcb4096822412c68a7ad43133ed230f6dcdecc9bf0a1737126ada8b54ccaf7 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa
 AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3
+AUX vlc-2.2.8-libupnp-compat.patch 815 BLAKE2B 059a1f572e39d09dc206a6af36bc5e50b800f089929456560663a631baf6b30d21b1d0234999d9f90de12a520e377c4578472b00b81f80a5f8a6c6b52c26b3e5 SHA512 befe64c5595bebbfd033db6c586e4cdf2092c3e691acc034b9aa499e462a5542fa3de21afd0953c74858bdce99db4339dd41414b96aeac1ccb60d7edcb24a964
+AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
 DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
+DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 EBUILD vlc-2.2.6-r2.ebuild 14784 BLAKE2B 8212c8d850ed6e18bce445a822430162e54ed627d0096c2220bac6d7acf25b57fd72259dafa7d195e8de6d91772c95a294dd71af9099cfa6e0cd77d48cb61506 SHA512 a8477ed01d2873c678a273f7d3422623fdea76757a92d5d5f352f6e5a7a48181b5ccfda2d5acafbba5abb4125a3004a07486c8134e55860579eff2a8d047ceeb
 EBUILD vlc-2.2.6.ebuild 15519 BLAKE2B cbc55f76288176d91b8e53b188778aa1f50b42942a60aafe9c9fc0278a6da13a04b8acaa0d7dcd76b0f1b54ad23b7048c76f07cca0ccd478659fb94492a6257a SHA512 ba381af8546d8d55b4394dd0db2859146f3fc0c015ac50767f945a38c3abb3034d1ff98b5a0793d4a201e694477ac8d1fd3d092b8274e09170a200a49ff13e94
-EBUILD vlc-2.2.9999.ebuild 14996 BLAKE2B 1c1ad7d5a425cc9a2ca3a863a29753e681e961c3882fd78ad23fae24be810f066a6e9b0e9d2298fe08b84a7cb4b6ebdfd2bb453a428e66d8f487dcd49c39b12e SHA512 f52b224bf2b1a8e7e6e72195bbdf0c60b77f3a7859402f695ee5e67b301e21278c89a0ed8f3064001fd4a7e1bcc6a0fb2a1871c5e0a1037fa7f38e549f586d39
-EBUILD vlc-3.0.9999.ebuild 13205 BLAKE2B 8551cc524e8931b47744f4727a251006c43c159748bcf668fdf78b966b49bc8e355c4c2d16a418558495742cb16f167aab445b92c573623945d016d62614d251 SHA512 c298e87670eb6dfdf2e94d24a695fd2edefb5229a3d90355333e7be9c43f56c9ed653df29e5960c092033c373c27225ce597a6ae8a500ba0be69073d185aa793
-EBUILD vlc-9999.ebuild 13205 BLAKE2B 8551cc524e8931b47744f4727a251006c43c159748bcf668fdf78b966b49bc8e355c4c2d16a418558495742cb16f167aab445b92c573623945d016d62614d251 SHA512 c298e87670eb6dfdf2e94d24a695fd2edefb5229a3d90355333e7be9c43f56c9ed653df29e5960c092033c373c27225ce597a6ae8a500ba0be69073d185aa793
+EBUILD vlc-2.2.8.ebuild 14352 BLAKE2B a1bc94e0c65cb87716a84163d06dd6f498954c131b312eff183b251292636bb0cf97b6b59263f36852c62eec9315a21d0060918bf103e896188852a137b93a90 SHA512 5883867833eda6e1a5c5c424c94120861f27f87959303d381bc125106007bb67d5ad835d34ca744d61de94f0b2330bd33edb4dfa564e25a778327581f6cc4db8
+EBUILD vlc-2.2.9999.ebuild 14359 BLAKE2B 5c345a996df8637de04388ed69979c20851ded661216b62615fa8e95b43e43d8c8693233d0f65f9ac0d79c9deb5f3ce7d4a745273e17668fd489b63ec5e8617a SHA512 f66d44da93f8026eebecb64351021c366fb8a5e279e806722896be8119699a35812daf186372841c835c61fdef8f0f3d2f2d754caf55a146e9fe619a21cfe7a7
+EBUILD vlc-3.0.9999.ebuild 13315 BLAKE2B 270a5bffdd953c471d87c8cab04b8b4298a3707e1eeac0c9776d8d3ee118bea5783d44e60bcbda7997caeeda6c045dc5a09857da1e38bf08c762ea21a884f545 SHA512 0d9a2337529c07000cb1d400eb46215ab742ed6d5e6ddc9f4b14fa013799940c1e9ed533952361d93ceeeb07fa765ea71239f8a01b7e810e6908c3f7b6d33687
+EBUILD vlc-9999.ebuild 13315 BLAKE2B 270a5bffdd953c471d87c8cab04b8b4298a3707e1eeac0c9776d8d3ee118bea5783d44e60bcbda7997caeeda6c045dc5a09857da1e38bf08c762ea21a884f545 SHA512 0d9a2337529c07000cb1d400eb46215ab742ed6d5e6ddc9f4b14fa013799940c1e9ed533952361d93ceeeb07fa765ea71239f8a01b7e810e6908c3f7b6d33687
 MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
new file mode 100644
index 000000000000..57b66685ede0
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
@@ -0,0 +1,28 @@
+From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth@videolan.org>
+Date: Wed, 29 Nov 2017 10:45:04 -0500
+Subject: [PATCH] upnp: don't clash with libupnp's own compat code
+
+Fixes build for upnp >= 1.6.23 and less than 1.8.
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/services_discovery/upnp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
+index bdd3c55ee5..82d43632f4 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -38,7 +38,7 @@
+ #include <set>
+ #include <string>
+ 
+-#if UPNP_VERSION < 10800
++#if UPNP_VERSION < 10623
+ /*
+  * Compat functions and typedefs for libupnp prior to 1.8
+  */
+-- 
+2.11.0
+
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
new file mode 100644
index 000000000000..ab501e4e67a5
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
@@ -0,0 +1,24 @@
+--- a/modules/services_discovery/upnp.hpp	2015-05-19 15:32:38.000000000 +0200
++++ b/modules/services_discovery/upnp.hpp	2017-12-09 14:07:08.551654458 +0100
+@@ -28,8 +28,8 @@
+ #include <vector>
+ #include <string>
+ 
+-#include <upnp/upnp.h>
+-#include <upnp/upnptools.h>
++#include <upnp-1.8/upnp.h>
++#include <upnp-1.8/upnptools.h>
+ 
+ #include <vlc_common.h>
+ 
+--- a/configure.ac	2017-12-09 14:09:12.956370304 +0100
++++ b/configure.ac	2017-12-09 14:13:25.236710362 +0100
+@@ -4046,7 +4046,7 @@
+ dnl
+ dnl UPnP Plugin (Intel SDK)
+ dnl
+-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto])
+ 
+ EXTEND_HELP_STRING([Misc options:])
+ 
diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild
new file mode 100644
index 000000000000..4ce203a79994
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.8.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	SCM="git-r3"
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	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"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
+	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
+	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
+	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
+	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
+	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
+	omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
+	+qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
+	sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
+	twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
+	x264 x265 +xcb xml xv zeroconf zvbi
+"
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt5? ( X )
+	sdl? ( X )
+	skins? ( qt5 truetype X xml )
+	vaapi? ( avcodec X )
+	vdpau? ( X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+RDEPEND="
+	dev-libs/libgpg-error:0
+	net-dns/libidn:0
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+	aalib? ( media-libs/aalib:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	avcodec? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	avformat? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	bidi? ( dev-libs/fribidi:0 )
+	bluray? ( >=media-libs/libbluray-0.3:0= )
+	cddb? ( >=media-libs/libcddb-1.2:0 )
+	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+	directfb? ( dev-libs/DirectFB:0 )
+	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
+	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+	faad? ( >=media-libs/faad2-2.6.1:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
+	gme? ( media-libs/game-music-emu:0 )
+	gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+	gnutls? ( >=net-libs/gnutls-3.0.20:0 )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( >=media-libs/libkate-0.3:0 )
+	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
+	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	lirc? ( app-misc/lirc:0 )
+	live? ( >=media-plugins/live-2011.12.23:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+	mtp? ( >=media-libs/libmtp-1:0 )
+	musepack? ( >=media-sound/musepack-tools-444:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	ogg? ( >=media-libs/libogg-1:0 )
+	opencv? ( >media-libs/opencv-2:0= )
+	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= )
+	postproc? (
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+		libav? ( media-libs/libpostproc:0= )
+	)
+	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+	rdp? ( =net-misc/freerdp-1*:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl? ( >=media-libs/libsdl-1.2.10:0
+		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( >=media-libs/libshout-2.1:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+	speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
+	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+	swscale? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 )
+	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 ) )
+	twolame? ( media-sound/twolame:0 )
+	udev? ( >=virtual/udev-142:0 )
+	upnp? ( net-libs/libupnp:= )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? (
+		x11-libs/libva:0[X,drm]
+		!libav? ( media-video/ffmpeg:0=[vaapi] )
+		libav? ( media-video/libav:0=[vaapi] )
+	)
+	vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+	vdpau? (
+		x11-libs/libvdpau:0
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( >=media-video/libav-10:0= )
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	X? ( x11-libs/libX11:0 )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+	zvbi? ( media-libs/zvbi:0 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils:0
+	>=sys-devel/gettext-0.18.3:*
+	virtual/pkgconfig:*
+	amd64? ( dev-lang/yasm:* )
+	x86?   ( dev-lang/yasm:* )
+	xcb? ( x11-proto/xproto:0 )
+"
+
+PATCHES=(
+	# Fix build system mistake.
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+	# Bug #541678
+	"${FILESDIR}"/qt4-select.patch
+
+	# Allow QT5.5 since Gentoo has a patched QTwidgets
+	"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
+
+	# Bug #575072
+	"${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
+	"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
+
+	# Bug #589396
+	"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
+
+	# Bug #594126, #629294
+	"${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
+	"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
+
+	# Bug #593460
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+
+	"${FILESDIR}"/${P}-libupnp-compat.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
+	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
+	if use qt5; then
+		export QT_SELECT=qt5
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-monospace-font-family=Monospace"
+	fi
+
+	if use qt5 ; then
+		myconf+=" --enable-qt=5"
+	else
+		myconf+=" --disable-qt"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-vlc \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-optimizations \
+		--disable-update-check \
+		--enable-fast-install \
+		--enable-screen \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable atmo) \
+		$(use_enable audioqueue) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
+		$(use_enable dbus) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable encode sout) \
+		$(use_enable faad) \
+		$(use_enable fdk fdkaac) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable growl) \
+		$(use_enable gstreamer gst-decode) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv1394) \
+		$(use_enable jack) \
+		$(use_enable jpeg) \
+		$(use_enable kate) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable matroska mkv) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable neon) \
+		$(use_enable ogg) $(use_enable ogg mux_ogg) \
+		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
+		$(use_enable opencv) \
+		$(use_enable opengl glspectrum) \
+		$(use_enable opus) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable png) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rdp freerdp) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smbclient) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable sid) \
+		$(use_enable sftp) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable svg) \
+		$(use_enable svg svgdec) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable tremor) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l v4l2) \
+		$(use_enable vaapi libva) \
+		$(use_enable vcdx) \
+		$(use_enable vdpau) \
+		$(use_enable vlm) \
+		$(use_enable vnc) \
+		$(use_enable vorbis) \
+		$(use_enable vpx) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable x265) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xv xvideo) \
+		$(use_enable zeroconf bonjour) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
+		--disable-crystalhd \
+		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
+		--disable-goom \
+		--disable-kai \
+		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
+		--disable-opensles \
+		--disable-oss \
+		--disable-quicktime \
+		--disable-rpi-omxil \
+		--disable-shine \
+		--disable-sndio \
+		--disable-vda \
+		--disable-vsxu \
+		--disable-wasapi
+
+		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 10af743665ee..443d35b4c454 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdd
 	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
 	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
 	omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
-	qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
+	+qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
 	sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
 	twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
 	x264 x265 +xcb xml xv zeroconf zvbi
@@ -55,10 +55,9 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	qt4? ( X )
 	qt5? ( X )
 	sdl? ( X )
-	skins? ( truetype X xml || ( qt4 qt5 ) )
+	skins? ( qt5 truetype X xml )
 	vaapi? ( avcodec X )
 	vdpau? ( X )
 	vlm? ( encode )
@@ -86,7 +85,7 @@ RDEPEND="
 	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
 	dbus? ( >=sys-apps/dbus-1.6:0 )
 	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-	directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+	directfb? ( dev-libs/DirectFB:0 )
 	dts? ( >=media-libs/libdca-0.0.5:0 )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
 	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
@@ -126,20 +125,19 @@ RDEPEND="
 	opencv? ( >media-libs/opencv-2:0= )
 	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
 	opus? ( >=media-libs/opus-1.0.3:0 )
-	png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+	png? ( media-libs/libpng:0= )
 	postproc? (
 		!libav? ( >=media-video/ffmpeg-2.2:0= )
 		libav? ( media-libs/libpostproc:0= )
 	)
 	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
-	!qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
 	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
 	rdp? ( =net-misc/freerdp-1*:0=[client] )
-	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
 	sdl? ( >=media-libs/libsdl-1.2.10:0
-		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
 	sftp? ( net-libs/libssh2:0 )
 	shout? ( >=media-libs/libshout-2.1:0 )
 	sid? ( media-libs/libsidplay:2 )
@@ -150,14 +148,14 @@ RDEPEND="
 		!libav? ( media-video/ffmpeg:0= )
 		libav? ( media-video/libav:0= )
 	)
-	taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+	taglib? ( >=media-libs/taglib-1.9:0 )
 	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
 	tremor? ( media-libs/tremor:0 )
 	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
 		!fontconfig? ( media-fonts/dejavu:0 ) )
 	twolame? ( media-sound/twolame:0 )
 	udev? ( >=virtual/udev-142:0 )
-	upnp? ( net-libs/libupnp:0 )
+	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
 		x11-libs/libva:0[X,drm]
@@ -213,33 +211,18 @@ PATCHES=(
 
 	# Bug #593460
 	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+
+	"${FILESDIR}"/${P}-libupnp-compat.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	if [[ ${PV} = *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
 src_prepare() {
 	default
 
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# https://gcc.gnu.org/c99status.html
-	if tc-is-gcc ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
+	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
 	if [[ ${PV} = *9999 ]] ; then
@@ -266,8 +249,6 @@ src_prepare() {
 	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
 	if use qt5; then
 		export QT_SELECT=qt5
-	elif use qt4; then
-		export QT_SELECT=qt4
 	fi
 }
 
@@ -294,11 +275,7 @@ src_configure() {
 	if use qt5 ; then
 		myconf+=" --enable-qt=5"
 	else
-		if use qt4 ; then
-			myconf+=" --enable-qt=4"
-		else
-			myconf+=" --disable-qt"
-		fi
+		myconf+=" --disable-qt"
 	fi
 
 	econf \
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index a91223922ac3..69d4f900c985 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -166,7 +166,7 @@ RDEPEND="
 		X? ( dev-qt/qtx11extras:5 )
 	)
 	rdp? ( =net-misc/freerdp-1*:0=[client] )
-	samba? ( >=net-fs/samba-4.0.0:0[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
 	sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
 	sftp? ( net-libs/libssh2:0 )
@@ -199,7 +199,7 @@ RDEPEND="
 	)
 	twolame? ( media-sound/twolame:0 )
 	udev? ( virtual/udev:0 )
-	upnp? ( net-libs/libupnp:0 )
+	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
 		x11-libs/libva:0[X,drm]
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 
+	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
 	# Bootstrap when we are on a git checkout.
 	if [[ ${PV} = *9999 ]] ; then
 		./bootstrap
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a91223922ac3..69d4f900c985 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -166,7 +166,7 @@ RDEPEND="
 		X? ( dev-qt/qtx11extras:5 )
 	)
 	rdp? ( =net-misc/freerdp-1*:0=[client] )
-	samba? ( >=net-fs/samba-4.0.0:0[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
 	sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
 	sftp? ( net-libs/libssh2:0 )
@@ -199,7 +199,7 @@ RDEPEND="
 	)
 	twolame? ( media-sound/twolame:0 )
 	udev? ( virtual/udev:0 )
-	upnp? ( net-libs/libupnp:0 )
+	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
 		x11-libs/libva:0[X,drm]
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 
+	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
 	# Bootstrap when we are on a git checkout.
 	if [[ ${PV} = *9999 ]] ; then
 		./bootstrap