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

diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 8e73802f175a3a9e42216e2f755595c82e7879eb..a4c25f83804f44c687910a4cf256442274f1b92c 100644 (file)
--- 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 43aa8cf68caf8f79aec20ee1a56789b0abfb05c4..c6a3782de93e47f2df9d52e7705a6e6ac741d37b 100644 (file)
--- 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 da16f6c2999808035f4e4b80e648912bd40d889b..fe3177a640b6642831db10627fc15fd5a92461da 100644 (file)
--- 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 0e60e1c496554f82e81f799cb3c79e65d7a29a34..719a2d3d53d4963af999cc0ebac09df709849320 100644 (file)
--- 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 e9be021649aec7b032713995f038e674d33974b3..573039409604cdec13fdbfcd5c81b32b4708fa3a 100644 (file)
--- 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 ) )