Fix dependency on samba client for samba-4 (#499788 by Torsten Kurbad)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 17 insertions, 17 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 3330f46578da..fdfc78b88e9d 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.142 2014/01/05 07:39:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.143 2014/02/01 08:59:02 pacho Exp $
+
+  01 Feb 2014; Pacho Ramos <pacho@gentoo.org>
+  gnome-control-center-3.10.2.ebuild, gnome-control-center-3.8.6.ebuild:
+  Fix dependency on samba client for samba-4 (#499788 by Torsten Kurbad)
 
   05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-control-center-2.32.1-r1.ebuild,
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index d23974ef4d29..0b85e9fb4293 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -18,18 +18,14 @@ DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76
 DIST gnome-control-center-3.10.2.tar.xz 6832928 SHA256 f67a9e88cda62c25e1aa1fbbb36d4fa632e8da11e98ac030e0e40437f12483a9 SHA512 3095af95a9d9cbb3b636f2e3c845f8c5df1cd943b60afca2e89506e3f80719ae4277068576e59d9bed602bc5b75380627b689ce71f84fbb4a2f6590ed5affe69 WHIRLPOOL 8d90153af8fdf921322d016413b8f95e130a1ec4e0a203dc9ed99a06239b51e08a9f5e51d1a325583974780039a9541850d54b7483f3fba202c54f8e8b315a3c
 DIST gnome-control-center-3.8.6.tar.xz 6723440 SHA256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a SHA512 7c917d9527b178352148eb746a4e99aa154d3c2aa13973e0e638cd4a6d977b1f4448ee010897617d4d06faa568c6cda43bcd334c014352b3d8f68df75cdb880a WHIRLPOOL bc8de5b336862640f66c883e0da8e02c8bb4f16b6557ce351e27c9e10d93dcfd449bf33d0c1d6ce09c4cd6f19b50c9b8478bc1143ccce61418bb1ec2c2ff7e24
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2823 SHA256 2dfa1f6402c7ab7f4539183e15448a234cb6f80e38310c50f222536291d4d4c1 SHA512 562dcadbf348f7e0a25796fa03b5a32786549537fa2213c6ac279b942269a0e8c62a7a977da54c6939d82e87460ee77422032b337dd1959e26403312d82cf081 WHIRLPOOL 099ea3c37bba16bbc94308961365123ccdc80e8b0ec291e3d50a2607ea59fb6b2ce2deba45d1e66be0c3cb99f86b9c0ad55d087c20f90ae7fd93fe8983c8a722
-EBUILD gnome-control-center-3.10.2.ebuild 5461 SHA256 ea88381cbe2e85bc4624fbd22f5f7a2a674e1b205ecf2e941d1365e707b5a0f3 SHA512 7ad83421123ae6c6cfd9097a47d12398ae82264988d6921e4d48045acb0ba0e6c39454a097088c3b5e9271dc9f7d54ecccf4f0767693572b7c26882ed24048af WHIRLPOOL 3eabeaef016a3957b8f6db68499ae4c9f1c1d22e6ade1bcf5a60254753508da48d0a32ee7f6a7baecb88a2853afa828e9c4cc0fa0bbd82e8bfa8ed9a2b66a71d
-EBUILD gnome-control-center-3.8.6.ebuild 5512 SHA256 4a39d96ff68e81ea9cae0542b190a3f945ef1b5084378a739add91461b4cb970 SHA512 8283282c2593bee4f7f920a985114ce7450a42529f43c6d10f8b26c664339e27f5c3d5342fb9fa4c684947542d16ced0444e934838b2f75aeef6d9b045f3f85f WHIRLPOOL 02bc7eff6b2d9a3c9a820aee1f6c5891a710a05aa0822a82b1cfb8c71a2be1fe7e88473ab124a988d823672f1611463d90b98d38ea10efa4f1439fc8005e4519
-MISC ChangeLog 67229 SHA256 cf7a17469765db8a1c693acabc28f9e304742eab09e489f87d12396446a34284 SHA512 a2869c9f69fcbfb63cf3f1e0348d8f1b28d9dfb57a9f2796e6ef8411383c4a0b8ccd6baf3833e8f63cde977835f90f2ed5e44c0aaa05d34c945209e5538c12c4 WHIRLPOOL dcf86e0f282f227bc5733799c7fa442e0b42902b4bca41d3b2cf0005d5a6381ff9daa5c6a5a330f41b2bf892261c613f547d65ca75f1db0f49d15e79db4ecdb1
+EBUILD gnome-control-center-3.10.2.ebuild 5497 SHA256 c1732e6ce8096238b8da7e321a9471ecca16144448d760dc40412dcbcc747d6f SHA512 3cf431bb99951293293749e8dfef91598dd57b20b3448ebc65cfdbf1f600023d3210454f6a4b14d9c7d499fef675fc1a62e17ab4eb42a3187c11aa02ffc879a7 WHIRLPOOL 0a5517840786ac734a608b6e46d6574a690c158ae9adcf424f20ddde83b8c25f71bbb31473ba3398276bce64dde2fbc050129004140917a35a5d84d98d273ce8
+EBUILD gnome-control-center-3.8.6.ebuild 5548 SHA256 d4d3d652650687e18682b6112be8cfddbdbd6bfeaee3256f1e6cc5f8600a3e60 SHA512 eb8fdeba599132fc98f1a36bc7d42e22ffc901198c41a8575b8d647731819316792204fa3fb1c1feabccb1b06784d292884b6df267fa127a1a7ba2a22e9007ce WHIRLPOOL 60ef9322ae6c65202a4dd996a7c3edfb72afeeb63264fcf26e72a7e9b3fd137161c270edcb1a0a1da390ded467aab65f0049c32c42a919bc3707b0ff3c81e543
+MISC ChangeLog 67418 SHA256 3bbd0ca9cfb0d6b896f46f75cc9a39c56c867cb071c3ca0edb1d2221d87320c5 SHA512 dba8def15811273d588ab1da238bf341c9bd0014852d092efe7ddf8b47a5a1d579d2d1441369c6530492dfad1992d37613ebf9db15929dffbf525269dcd37135 WHIRLPOOL 9ecbd90a7017e83f2f7b716ea315d4a668a0c47954e35da9789c007bd9022a9b2b44ad6ce604155ea9fd78fd45efa28246171be00c2504aad2baf69e98994c55
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSyQxMAAoJEJ0WA1zPCt1huAcIAI/c5c7KqYRsD7U6Ybbrs4sa
-tNZdnq6aydiG1xI65yviK20SevltH0pTpggNeVIWkuidbGv211a1C10pK2bAHTuz
-klACaTIsSpWLn/kNO5vKyrDaMB5tUgQdanQiC3XDOtLhQhTzT5d5gEUk8v7OfTKA
-upSIMvHEv/qJ8S2cN44SuVlIJRvbxszxm/CYgCo9mJ+pk6u9QoYjrS3b7Hj/6rGe
-fRVjN2wkgBo7fBYzGAylYUcnq6BWKLoYgrdQUg+5sY6hmlE9gWrFVy2tmFvZtcFL
-cge8jeSTO6I4pEiLFBgCK4WkD1KqV0xiYLI6jTuIh6oI6UxhU/2ROzRKjqiN7+c=
-=9HUz
+iEYEAREIAAYFAlLst1cACgkQCaWpQKGI+9QqOQCeOMMHKFufFqVBSKl3EoczJ55i
+1T4AniDsz0FP/vJHo5mDyVVpEUj/q/zx
+=ct/b
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
index a7a4e18a38de..afcf11cb2cd0 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild,v 1.1 2013/12/24 17:55:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild,v 1.2 2014/02/01 08:59:02 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -67,7 +67,7 @@ COMMON_DEPEND="
 		>=x11-misc/colord-0.1.34 )
 	cups? (
 		>=net-print/cups-1.4[dbus]
-		>=net-fs/samba-3.6.14-r1[smbclient] )
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
 	i18n? ( >=app-i18n/ibus-1.5.2 )
 	kerberos? ( app-crypt/mit-krb5 )
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild
index a0792cea201e..8266c95d8dae 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild,v 1.4 2013/12/08 18:26:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild,v 1.5 2014/02/01 08:59:02 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -61,7 +61,7 @@ COMMON_DEPEND="
 	colord? ( >=x11-misc/colord-0.1.29 )
 	cups? (
 		>=net-print/cups-1.4[dbus]
-		>=net-fs/samba-3.6.14-r1[smbclient] )
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8.1 )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
 	kerberos? ( app-crypt/mit-krb5 )