Support Samba 4; reported and patch provided by Torsten Kurbad, patch slightly adapted to keep minimal version restriction in place (USE flags will differentiate between both), fixes bug #452048.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

4 files changed, 22 insertions, 7 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 6a1ca2342be7..4d55fb1be0e4 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.862 2013/10/26 07:39:02 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.863 2013/10/26 08:08:27 tomwij Exp $
+
+  26 Oct 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.9999.ebuild,
+  vlc-2.1.9999.ebuild, vlc-9999.ebuild:
+  Support Samba 4; reported and patch provided by Torsten Kurbad, patch slightly
+  adapted to keep minimal version restriction in place (USE flags will
+  differentiate between both), fixes bug #452048.
 
   26 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
   +files/vlc-2.0.8-support-uclibc.patch, vlc-2.0.9999.ebuild,
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index 36020f8dcc01..8a6c0f8e26a5 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.28 2013/10/26 07:39:02 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.29 2013/10/26 08:08:27 tomwij Exp $
 
 EAPI="5"
 
@@ -119,7 +119,7 @@ RDEPEND="
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-		samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
+		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
 		sdl? ( >=media-libs/libsdl-1.2.8:0
 			sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
@@ -240,6 +240,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index d4aa864d3c91..81f872873b6e 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.2 2013/10/26 06:24:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.3 2013/10/26 08:08:27 tomwij Exp $
 
 EAPI="5"
 
@@ -120,7 +120,7 @@ RDEPEND="
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
 		qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 )
-		samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
+		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
 		sdl? ( >=media-libs/libsdl-1.2.8:0
 			sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
@@ -242,6 +242,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index c05b2ebb066c..48ef5fc26009 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.195 2013/10/26 06:24:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.196 2013/10/26 08:08:27 tomwij Exp $
 
 EAPI="5"
 
@@ -120,7 +120,7 @@ RDEPEND="
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
 		qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 )
 		rdp? ( net-misc/freerdp:0 )
-		samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
+		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
 		sdl? ( >=media-libs/libsdl-1.2.8:0
 			sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
@@ -247,6 +247,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"