Fixing samba deps

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 18 insertions, 24 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 77d36b8f17b2..7fa6ad3bada2 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.559 2010/03/10 11:36:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.560 2010/04/07 16:04:46 patrick Exp $
+
+  07 Apr 2010; Patrick Lauer <patrick@gentoo.org> vlc-1.0.4.ebuild,
+  vlc-1.0.5.ebuild, vlc-1.0.9999.ebuild, vlc-9999.ebuild:
+  Fixing samba deps
 
   10 Mar 2010; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   Fix 9999 patchset, bug #308539
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 2b5d92e80be7..1d5ab871b335 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST vlc-1.0.4.tar.bz2 21622966 RMD160 d4d9dae5dfe7d081d17197e5b94a43e54b213368 SHA1 59d99dd005f70b3442c1c44472640e10fdc15aa5 SHA256 dbff0ba0cd60a4323f85fd8b918f2a4477a11c5a8f628d1b868fb5947e8e9896
 DIST vlc-1.0.5.tar.bz2 21887131 RMD160 de50206ddce59d1487ea7d4efa8bbd37f55b928e SHA1 a2c415923850720dc4499de0b6f6dbe40e98f90f SHA256 f7f1994c936fbb8c392481a13abfd6a6b76c5aac4406fa7a78d4786dfc206dcd
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-79.tar.bz2 6483 RMD160 f4bb903049b35c411ead3d812c865ac97d42c905 SHA1 b650ae71e4a59397be5a74cb7de5101d030ee04a SHA256 c2956b049de208408d64175792c936f8fcd325bd51c21d76158ba38107dda800
 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3
 DIST vlc-patches-84.tar.bz2 5236 RMD160 7669ac221f499e771d84da9640644ba64f76effd SHA1 5e63389330c8ee264393bd9b205d68028cd86f9b SHA256 ca4b25328314ee18b6b5a80bb33552b445315bd03ebed26a09d3837ff97f27d9
-EBUILD vlc-1.0.4.ebuild 11944 RMD160 6b11b400fbd13fb09dab6720d4e6dd85b377f5b9 SHA1 38c2db38a27aa6ae03d6aff685d80b0289e68e04 SHA256 1bb7ec981c0c2518e6b46711f71336c340c0f8be58789ad4eddee6a3200b17c2
-EBUILD vlc-1.0.5.ebuild 12064 RMD160 cd4b0efc8871ae051d540271590181a78bbbefd0 SHA1 fc91424ebaea8438ff2716799c69956462ca4804 SHA256 bf50d19c6eb96a235ce42bfd04b645ac9c4212fd5577dd6ceb261add9495e755
-EBUILD vlc-1.0.9999.ebuild 12016 RMD160 e33004803ad2459cc8e0205572b355b97dbe5e82 SHA1 50a8d12feb671972054d80e964b654c89de1aa9d SHA256 7c8eedd4ad29f5de0d7620e341aaa1f2b92f57e8c747332a152930953d93cc8c
-EBUILD vlc-9999.ebuild 11679 RMD160 0b333b4bee26deaa65e0b1b5e0255d8d3d4da6d1 SHA1 67ce3c42050b83642d9bece22d0fa78ea1800c52 SHA256 f63e62b9de65cb307fd460211743245e00513c38984f71edc6eeba6f008c262b
-MISC ChangeLog 87006 RMD160 b50e45bbb5caa29eae3da80921d24c4b3b2a5ac6 SHA1 b2bd36573204b9df9d576e564c1212e4a0258f0c SHA256 1407072052dad0f7baa63ec6bdd9c94ff7c18b4dfad35379bae7c19fe9c3be1e
+EBUILD vlc-1.0.4.ebuild 11941 RMD160 9401debb4d071980307ac583f7b8e8ea52ad8a50 SHA1 94bf1ecc7203cc3315ace8d02805018e794c9caa SHA256 d0ac3016fcef6e5fa1b943101e9e0d83d731d06da6a8d82d572d1d8e9006a3ea
+EBUILD vlc-1.0.5.ebuild 12060 RMD160 0b66d5e97b4763e7eadbfa1e6d1db0b035fd428c SHA1 df1c9175be9305953eef00cffc4cb05169e85d38 SHA256 97f8fd44beacacc4024d28c91d0ab64f6a0cf4a5d693eb85f50d2b983e54f817
+EBUILD vlc-1.0.9999.ebuild 12012 RMD160 01cd0e2f13cfc817768251dbfbcee8cbc3c93a15 SHA1 89d53b3a60fa8e335ae341e9cef11a22aed24886 SHA256 b3265530a61a3e4083d86cacf47cb2ab8313c9032672e378d4397bbab29fc691
+EBUILD vlc-9999.ebuild 11675 RMD160 4faa5d25409176ac9fcd321f095d0f21161e6dca SHA1 ca4e04f1cbca5ba6b2ceb8ef528913a1c0850108 SHA256 713323f27036b232d8913690548868396a84a2aab3dc26771ce5e974e91110ca
+MISC ChangeLog 87152 RMD160 73a5a243b60a6110a32fd9637b29ac5947086d83 SHA1 14905636ada3c904a06769c31d2ad032bf81a4d6 SHA256 293ca19827fe8055e88eb70a81cefc5e003d4d279155f129fb9440ea2f9a4a23
 MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuXhFIACgkQvFcC4BYPU0o92ACeL9VPpseyaHqH4ICXxyvfzLp8
-JBEAn248G+u8Uo58RtX7iJNg6U3NUE7u
-=/CsM
------END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.4.ebuild b/media-video/vlc/vlc-1.0.4.ebuild
index c4217b19021b..9aea12b9883b 100644
--- a/media-video/vlc/vlc-1.0.4.ebuild
+++ b/media-video/vlc/vlc-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.4.ebuild,v 1.10 2010/01/31 17:40:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.4.ebuild,v 1.11 2010/04/07 16:04:46 patrick Exp $
 
 EAPI="2"
 
@@ -119,7 +119,7 @@ RDEPEND="
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( || ( >=net-fs/samba-libs-3.4[smbclient]
+		samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
 			 <net-fs/samba-3.4 ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
 		sdl? ( >=media-libs/libsdl-1.2.8
diff --git a/media-video/vlc/vlc-1.0.5.ebuild b/media-video/vlc/vlc-1.0.5.ebuild
index 8ab60efcda01..ab59006239b9 100644
--- a/media-video/vlc/vlc-1.0.5.ebuild
+++ b/media-video/vlc/vlc-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.3 2010/02/24 13:13:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.4 2010/04/07 16:04:46 patrick Exp $
 
 EAPI="2"
 
@@ -120,7 +120,7 @@ RDEPEND="
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( || ( >=net-fs/samba-libs-3.4[smbclient]
+		samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
 			 <net-fs/samba-3.4 ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
 		sdl? ( >=media-libs/libsdl-1.2.8
diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index 068004ee9dba..3a26106fc7b4 100644
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.38 2010/02/24 13:13:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.39 2010/04/07 16:04:46 patrick Exp $
 
 EAPI="2"
 
@@ -120,7 +120,7 @@ RDEPEND="
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( || ( >=net-fs/samba-libs-3.4[smbclient]
+		samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
 			 <net-fs/samba-3.4 ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
 		sdl? ( >=media-libs/libsdl-1.2.8
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index c7eafeb9f4fe..90a3f622cabe 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.62 2010/03/10 11:36:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.63 2010/04/07 16:04:46 patrick Exp $
 
 EAPI="2"
 
@@ -114,7 +114,7 @@ RDEPEND="
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( || ( >=net-fs/samba-libs-3.4[smbclient]
+		samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
 			<net-fs/samba-3.4 ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
 		sdl? ( >=media-libs/libsdl-1.2.8