gentoo resync : 24.02.2018

1 files changed, 69 insertions, 79 deletions

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 92b9f7445a32..21bc19b30620 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -29,142 +29,135 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
-	debug directx dts +dvbpsi dvd elibc_glibc +encode faad fdk +ffmpeg flac fluidsynth
-	fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav
-	libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
+IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast 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 +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
 	macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv
-	opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
+	optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
 	samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor
-	truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X
-	x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X
+	x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
-	aalib? ( X )
 	bidi? ( truetype )
 	directx? ( ffmpeg )
 	fontconfig? ( truetype )
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
+	postproc? ( ffmpeg )
 	skins? ( qt5 truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
-	vlm? ( encode )
-	xv? ( xcb )
 "
 RDEPEND="
 	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 )
+	virtual/opengl
+	a52? ( media-libs/a52dec:0 )
+	alsa? ( media-libs/alsa-lib:0 )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	bidi? ( dev-libs/fribidi:0 )
-	bluray? ( >=media-libs/libbluray-0.6.2:0= )
-	cddb? ( >=media-libs/libcddb-1.2:0 )
-	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	bluray? ( media-libs/libbluray:0= )
+	cddb? ( media-libs/libcddb:0 )
+	chromaprint? ( media-libs/chromaprint:0= )
 	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
-	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dbus? ( sys-apps/dbus:0 )
 	dc1394? (
-		>=media-libs/libdc1394-2.1:2
-		>=sys-libs/libraw1394-2.0.1:0
+		media-libs/libdc1394:2
+		sys-libs/libraw1394:0
 	)
-	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dts? ( media-libs/libdca:0 )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
 	dvd? (
 		>=media-libs/libdvdnav-4.9:0
 		>=media-libs/libdvdread-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 )
+	faad? ( media-libs/faad2:0 )
+	fdk? ( media-libs/fdk-aac:0= )
 	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?] )
-		libav? ( >=media-video/libav-11.8:0=[vaapi?] )
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
 	)
 	flac? (
-		>=media-libs/flac-1.1.2:0
-		>=media-libs/libogg-1:0
+		media-libs/flac:0
+		media-libs/libogg:0
 	)
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fluidsynth? ( media-sound/fluidsynth:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
-		>=dev-libs/libgcrypt-1.6.0:0=
+		dev-libs/libgcrypt:0=
 		dev-libs/libgpg-error:0
 	)
 	gme? ( media-libs/game-music-emu:0 )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
 	ieee1394? (
-		>=sys-libs/libavc1394-0.5.3:0
-		>=sys-libs/libraw1394-2.0.1:0
+		sys-libs/libavc1394:0
+		sys-libs/libraw1394:0
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( >=media-libs/libkate-0.3:0 )
+	kate? ( media-libs/libkate:0 )
 	libass? (
 		media-libs/fontconfig:1.0
-		>=media-libs/libass-0.9.8:0=
+		media-libs/libass:0=
 	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libcaca? ( media-libs/libcaca:0 )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
+		x11-libs/gtk+:3
 		x11-libs/libnotify:0
 	)
 	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 )
+	libtar? ( dev-libs/libtar:0 )
+	libtiger? ( media-libs/libtiger:0 )
+	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc:0 )
-	live? ( >=media-plugins/live-2011.12.23:0 )
+	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
 	matroska? (
-		>=dev-libs/libebml-1:0=
-		>=media-libs/libmatroska-1:0=
+		dev-libs/libebml:0=
+		media-libs/libmatroska:0=
 	)
 	modplug? ( media-libs/libmodplug:0 )
 	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 )
+	mpeg? ( media-libs/libmpeg2:0 )
+	mtp? ( media-libs/libmtp:0= )
+	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( >=media-libs/libogg-1:0 )
-	opencv? ( >media-libs/opencv-2:0= )
-	opengl? (
-		virtual/opengl:0
-		>=x11-libs/libX11-1.3.99.901:0
-	)
+	ogg? ( media-libs/libogg:0 )
+	opencv? ( media-libs/opencv:0= )
 	opus? ( >=media-libs/opus-1.0.3:0 )
 	png? ( media-libs/libpng:0= )
-	postproc? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0= )
-		libav? ( media-libs/libpostproc:0= )
-	)
+	postproc? ( libav? ( media-libs/libpostproc:0= ) )
 	projectm? (
 		media-fonts/dejavu:0
 		media-libs/libprojectm:0
 	)
-	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
-		X? ( dev-qt/qtx11extras:5 )
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
 	)
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0: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 )
+	sdl-image? ( media-libs/sdl-image:0 )
 	sftp? ( net-libs/libssh2:0 )
-	shout? ( >=media-libs/libshout-2.1:0 )
+	shout? ( media-libs/libshout:0 )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
 		x11-libs/libXext:0
@@ -177,8 +170,8 @@ RDEPEND="
 	)
 	ssl? ( net-libs/gnutls:0 )
 	svg? (
-		>=gnome-base/librsvg-2.9:2
-		>=x11-libs/cairo-1.13.1:0
+		gnome-base/librsvg:2
+		x11-libs/cairo:0
 	)
 	taglib? ( >=media-libs/taglib-1.9:0 )
 	theora? ( media-libs/libtheora:0 )
@@ -195,32 +188,32 @@ RDEPEND="
 	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
 	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
-	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
 	wayland? (
 		dev-libs/wayland
 		dev-libs/wayland-protocols
 	)
-	X? ( x11-libs/libX11:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
 	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 )
+	zeroconf? ( net-dns/avahi:0[dbus] )
+	zvbi? ( media-libs/zvbi )
 "
 DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
 	>=sys-devel/gettext-0.19.8:*
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
-	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-proto/xproto:0 )
+	x86? ( dev-lang/yasm:* )
+	X? ( x11-proto/xproto )
 "
 
 PATCHES=(
@@ -267,15 +260,13 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--enable-vlc
-		--docdir=/usr/share/doc/${PF}
 		--disable-dependency-tracking
 		--disable-optimizations
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vlc
 		$(use_enable a52)
-		$(use_enable aalib aa)
 		$(use_enable alsa)
 		$(use_enable altivec)
 		$(use_enable aom)
@@ -299,6 +290,7 @@ src_configure() {
 		$(use_enable dvd dvdnav)
 		$(use_enable dvd dvdread)
 		$(use_enable encode sout)
+		$(use_enable encode vlm)
 		$(use_enable faad)
 		$(use_enable fdk fdkaac)
 		$(use_enable ffmpeg avcodec)
@@ -336,7 +328,6 @@ src_configure() {
 		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
 		$(use_enable opencv)
 		$(use_enable optimisememory optimize-memory)
 		$(use_enable opus)
@@ -370,18 +361,17 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vcd)
 		$(use_enable vdpau)
-		$(use_enable vlm)
 		$(use_enable vnc)
 		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_enable wma-fixed)
 		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
 		$(use_enable x264)
 		$(use_enable x265)
-		$(use_enable xcb)
 		$(use_enable xml libxml2)
-		$(use_enable xv xvideo)
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)