media-video/vlc: Added sub-slot dep for media-libs/libass.

Fixed samba dependencies now that samba-3 is gone.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

5 files changed, 15 insertions, 19 deletions

diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 8e73802f175a..a4c25f83804f 100644
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -93,7 +93,7 @@ RDEPEND="
 		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 )
+		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 )
@@ -124,8 +124,7 @@ RDEPEND="
 		!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.1:0=[client] <net-misc/freerdp-2 )
-		samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
-			>=net-fs/samba-4.0.0_alpha1:0[client] ) )
+		samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
 		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 ) )
diff --git a/media-video/vlc/vlc-2.2.4-r1.ebuild b/media-video/vlc/vlc-2.2.4-r1.ebuild
index 43aa8cf68caf..c6a3782de93e 100644
--- a/media-video/vlc/vlc-2.2.4-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -93,7 +93,7 @@ RDEPEND="
 	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 )
+	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 )
@@ -124,8 +124,7 @@ RDEPEND="
 	!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-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
-		>=net-fs/samba-4.0.0_alpha1:0[client] ) )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
 	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 ) )
diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild
index da16f6c29998..fe3177a640b6 100644
--- a/media-video/vlc/vlc-2.2.4.ebuild
+++ b/media-video/vlc/vlc-2.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -93,7 +93,7 @@ RDEPEND="
 	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 )
+	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 )
@@ -124,8 +124,7 @@ RDEPEND="
 	!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.1:0=[client] <net-misc/freerdp-2 )
-	samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
-		>=net-fs/samba-4.0.0_alpha1:0[client] ) )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
 	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 ) )
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 0e60e1c49655..719a2d3d53d4 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -93,7 +93,7 @@ RDEPEND="
 	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 )
+	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 )
@@ -124,8 +124,7 @@ RDEPEND="
 	!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-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
-		>=net-fs/samba-4.0.0_alpha1:0[client] ) )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
 	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 ) )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e9be021649ae..573039409604 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,3 +1,4 @@
+
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -93,7 +94,7 @@ RDEPEND="
 	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 )
+	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 )
@@ -124,8 +125,7 @@ RDEPEND="
 	!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-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
-		>=net-fs/samba-4.0.0_alpha1:0[client] ) )
+	samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
 	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 ) )