diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-02-01 08:59:02 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-02-01 08:59:02 +0000 |
| commit | b2544b054a0cf9d9f1871f08d736b96b9b05d529 (patch) | |
| tree | 1e588b20e8c468eb4b75ef0668efc087766ea7d8 /gnome-base/gnome-control-center | |
| parent | respect LDFLAGS, bug 441680, credits Diego; warn against FO_REUSEPORT mismatc... (diff) | |
| download | gentoo-2-b2544b054a0cf9d9f1871f08d736b96b9b05d529.tar.gz gentoo-2-b2544b054a0cf9d9f1871f08d736b96b9b05d529.tar.bz2 gentoo-2-b2544b054a0cf9d9f1871f08d736b96b9b05d529.zip | |
Fix dependency on samba client for samba-4 (#499788 by Torsten Kurbad)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base/gnome-control-center')
3 files changed, 11 insertions, 7 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/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 ) |