diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-11-13 17:24:05 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-11-13 17:24:05 +0000 |
| commit | 7bdc7f97a70126c3a4a31ee854a4f9652d2f4563 (patch) | |
| tree | 574e6be71db40c9c880cffe4a2d9a1ab47e07bd1 | |
| parent | fix doc DEPEND (diff) | |
| download | gentoo-2-7bdc7f97a70126c3a4a31ee854a4f9652d2f4563.tar.gz gentoo-2-7bdc7f97a70126c3a4a31ee854a4f9652d2f4563.tar.bz2 gentoo-2-7bdc7f97a70126c3a4a31ee854a4f9652d2f4563.zip | |
Fix samba dependency to support samba4, thanks to Lars Wendler <polynomial-c@gentoo.org> in bug #442950.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
| -rw-r--r-- | kde-base/kdebase-kioslaves/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.3.ebuild | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog index 6f7058b168e2..9cafd1b5a526 100644 --- a/kde-base/kdebase-kioslaves/ChangeLog +++ b/kde-base/kdebase-kioslaves/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase-kioslaves # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.276 2012/11/08 23:26:28 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.277 2012/11/13 17:24:05 kensington Exp $ + + 13 Nov 2012; Michael Palimaka <kensington@gentoo.org> + kdebase-kioslaves-4.9.3.ebuild: + Fix samba dependency to support samba4, thanks to Lars Wendler + <polynomial-c@gentoo.org> in bug #442950. *kdebase-kioslaves-4.9.3 (08 Nov 2012) @@ -1283,4 +1288,3 @@ +kdebase-kioslaves-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.3.ebuild index caa0784a903f..160f479eeca2 100644 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.3.ebuild +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.3.ebuild,v 1.1 2012/11/08 23:26:28 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.3.ebuild,v 1.2 2012/11/13 17:24:05 kensington Exp $ EAPI=4 @@ -21,7 +21,7 @@ DEPEND=" bzip2? ( app-arch/bzip2 ) exif? ( media-gfx/exiv2 ) openexr? ( media-libs/openexr ) - samba? ( net-fs/samba[smbclient] ) + samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.4.0[sftp] ) " RDEPEND="${DEPEND} |