diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2010-01-12 01:27:46 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2010-01-12 01:27:46 +0000 |
| commit | 0a91ccac6cccc0a11c401656ae5d8ce64d72afa4 (patch) | |
| tree | 2e2620fec7acb48b287dd447a4e7332450d9cd01 | |
| parent | Version bump (diff) | |
| download | gentoo-2-0a91ccac6cccc0a11c401656ae5d8ce64d72afa4.tar.gz gentoo-2-0a91ccac6cccc0a11c401656ae5d8ce64d72afa4.tar.bz2 gentoo-2-0a91ccac6cccc0a11c401656ae5d8ce64d72afa4.zip | |
Fixing samba deps for new split samba, fixes #300130
(Portage version: 2.2_rc61/cvs/Linux x86_64)
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.4.2.ebuild | 7 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.4.3.ebuild | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 7441df25fa57..63b05561490d 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gvfs -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.89 2009/12/27 05:14:18 nirbheek Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.90 2010/01/12 01:27:46 patrick Exp $ + + 12 Jan 2010; Patrick Lauer <patrick@gentoo.org> gvfs-1.4.2.ebuild, + gvfs-1.4.3.ebuild: + Fixing samba deps for new split samba, fixes #300130 27 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org> gvfs-1.4.3.ebuild: Add note about having to restart the session; causes crashing sometimes; diff --git a/gnome-base/gvfs/gvfs-1.4.2.ebuild b/gnome-base/gvfs/gvfs-1.4.2.ebuild index 47eef0625bd2..d1450febb930 100644 --- a/gnome-base/gvfs/gvfs-1.4.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.4.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.2.ebuild,v 1.1 2009/12/13 10:37:27 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.2.ebuild,v 1.2 2010/01/12 01:27:46 patrick Exp $ EAPI="2" GCONF_DEBUG="no" @@ -38,7 +38,8 @@ RDEPEND=">=dev-libs/glib-2.21.2 hal? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) >=sys-apps/hal-0.5.10 ) - samba? ( >=net-fs/samba-3 )" + samba? ( || ( net-fs/samba-libs[smbclient] + <=net-fs/samba-3.3 ) )" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 diff --git a/gnome-base/gvfs/gvfs-1.4.3.ebuild b/gnome-base/gvfs/gvfs-1.4.3.ebuild index bd46d244af34..6555ea945c9d 100644 --- a/gnome-base/gvfs/gvfs-1.4.3.ebuild +++ b/gnome-base/gvfs/gvfs-1.4.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.3.ebuild,v 1.2 2009/12/27 05:14:18 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.3.ebuild,v 1.3 2010/01/12 01:27:46 patrick Exp $ EAPI="2" GCONF_DEBUG="no" @@ -38,7 +38,8 @@ RDEPEND=">=dev-libs/glib-2.21.2 hal? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) >=sys-apps/hal-0.5.10 ) - samba? ( >=net-fs/samba-3 )" + samba? ( || ( net-fs/samba-libs[smbclient] + <=net-fs/samba-3.3 ) )" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 |