fix openldap dependency

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 514d62cf7bbcfcf75fe8ad3921106ae3ba18462c..71c83ef98610fde923d95911956bac69392fe8d2 100644 (file)
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.15 2002/10/24 22:26:41 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.16 2002/10/26 00:11:05 woodchip Exp $
+
+  25 Oct 2002; Donny Davies <woodchip@gentoo.org> : Fix openldap dependency
+  from #9249.
 
 *samba-2.2.6 (Oct 24 2002)
 

diff --git a/net-fs/samba/samba-2.2.6.ebuild b/net-fs/samba/samba-2.2.6.ebuild
index 7e3d382b73dc57c1425223b66d1da36302261a28..52f99aa8b59aae018d99cb1974cbce5f438129ad 100644 (file)
--- a/net-fs/samba/samba-2.2.6.ebuild
+++ b/net-fs/samba/samba-2.2.6.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.6.ebuild,v 1.1 2002/10/24 22:26:41 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.6.ebuild,v 1.2 2002/10/26 00:11:05 woodchip Exp $
 
 IUSE="tcpd ldap cups ssl acl vscan"
 
 inherit perl-module
 
 # please test/report your experiences with these new VFS plugins.
-# you should add vscan to USE to do this...
-# 
 VSCAN_VER=0.2.5e
 VSCAN_MODS="fprot mks openantivirus" #kaspersky sophos symantec trend
 #need libs/headers/extra support for these ones^^
@@ -23,7 +21,7 @@ SRC_URI="vscan? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.
 DEPEND=">=sys-libs/pam-0.72
        acl? ( sys-apps/acl )
        cups? ( net-print/cups )
-       ldap? ( =net-nds/openldap-2* )
+       ldap? ( >=net-nds/openldap-2.1.6 )
        ssl? ( >=dev-libs/openssl-0.9.6 )
        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
        vscan? ( >=dev-libs/popt-1.6.3 )"
@@ -36,6 +34,7 @@ src_unpack() {
        unpack ${A} || die
        cd ${S} || die
 
+       patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die
        patch -p0 < ${FILESDIR}/samba-2.2.2-smbmount.diff || die
        patch -p1 < ${FILESDIR}/samba-2.2.5-gp-reloc-fix.patch || die
        cd source/client; patch -p0 < ${FILESDIR}/samba-2.2.6-smbumount_lazy.patch || die