From 0aebd269b4308bb6efa5ead3b1c0d8e8212a7430 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sat, 18 Aug 2007 19:10:59 +0000
Subject: [PATCH] update mozldap

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@169 6952d904-891a-0410-993b-d76249ca496b
---
 dev-libs/mozldap/ChangeLog            |  7 +++++++
 dev-libs/mozldap/Manifest             | 12 ++++++++----
 dev-libs/mozldap/mozldap-6.0.4.ebuild |  9 +++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 dev-libs/mozldap/ChangeLog

diff --git a/dev-libs/mozldap/ChangeLog b/dev-libs/mozldap/ChangeLog
new file mode 100644
index 00000000..e372cacb
--- /dev/null
+++ b/dev-libs/mozldap/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for dev-libs/mozldap
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  18 Aug 2007; Mario Fetka <mario-fetka@gmx.at> mozldap-6.0.4.ebuild:
+  Correct wrong usage of with sasl
+
diff --git a/dev-libs/mozldap/Manifest b/dev-libs/mozldap/Manifest
index 8d0595ff..d7c9359d 100644
--- a/dev-libs/mozldap/Manifest
+++ b/dev-libs/mozldap/Manifest
@@ -3,10 +3,14 @@ MD5 ac5146836b8b1d824aed7514312c9872 files/mozldap-6.0.4-pkgconfig.patch 714
 RMD160 e0380bc0d6af49924c9e599f3ce8e1512ae8105f files/mozldap-6.0.4-pkgconfig.patch 714
 SHA256 d93fc59fa49f825484d8456288d6d98aaaccf4ee729ca27f0887a9ba6d812a10 files/mozldap-6.0.4-pkgconfig.patch 714
 DIST mozldap-6.0.4.tar.gz 706636 RMD160 55c0dc58c0fd199aef3c986478237e96d0f1c389 SHA1 516d00f052aa9315de6506a51e12400d1707c6db SHA256 0f3710e5c69160f411b7e3622cef420378f51c2aec38e87a4f0ff47028b060db
-EBUILD mozldap-6.0.4.ebuild 3289 RMD160 1898ded1b9da9bb3f7b3caae6d42b16654d3635b SHA1 58dee80dae7e7c88a5fb56624ef2c3be765f6b1a SHA256 05bbbadfe4efbd3be656ab345fccf0082c3837196d4341e45d017d0aea8d96a1
-MD5 64b031bfa78a2260f7d981c662a95c2d mozldap-6.0.4.ebuild 3289
-RMD160 1898ded1b9da9bb3f7b3caae6d42b16654d3635b mozldap-6.0.4.ebuild 3289
-SHA256 05bbbadfe4efbd3be656ab345fccf0082c3837196d4341e45d017d0aea8d96a1 mozldap-6.0.4.ebuild 3289
+EBUILD mozldap-6.0.4.ebuild 3360 RMD160 982c3f9fb04f9111bf2277746d20f583dbf0d7bb SHA1 e88ed011d01913f639ff597961d93654183ccb67 SHA256 ed701ac90fd42a410d1541cd9c3706f7023e0225f88a62ef33b3cd11b93e1e1f
+MD5 afd11c7c54bea7ef34400f5e127be7b4 mozldap-6.0.4.ebuild 3360
+RMD160 982c3f9fb04f9111bf2277746d20f583dbf0d7bb mozldap-6.0.4.ebuild 3360
+SHA256 ed701ac90fd42a410d1541cd9c3706f7023e0225f88a62ef33b3cd11b93e1e1f mozldap-6.0.4.ebuild 3360
+MISC ChangeLog 223 RMD160 88d1c785244ea5d2dc6d5ef704be6369d89fc566 SHA1 f80c9ff4440322c6dcdab68b7a6b4dadb5cd3914 SHA256 31afbcf39868fc0ec2b78eb226315edd37ae7be35e8b0e48012e36afed4d6255
+MD5 82c15c1cc69ab2f6aed0e4de0829b9dd ChangeLog 223
+RMD160 88d1c785244ea5d2dc6d5ef704be6369d89fc566 ChangeLog 223
+SHA256 31afbcf39868fc0ec2b78eb226315edd37ae7be35e8b0e48012e36afed4d6255 ChangeLog 223
 MD5 359083adcc58b99c3b2d18ce1a46ecdc files/digest-mozldap-6.0.4 241
 RMD160 7aa1c47c47f8dcf606222a1a0eb57667d5c4f1b7 files/digest-mozldap-6.0.4 241
 SHA256 50d3334d916996d5b499a13698e332de230b28bbe4366bf216a88abadbfbe841 files/digest-mozldap-6.0.4 241
diff --git a/dev-libs/mozldap/mozldap-6.0.4.ebuild b/dev-libs/mozldap/mozldap-6.0.4.ebuild
index 6a150ac3..70aee4e4 100644
--- a/dev-libs/mozldap/mozldap-6.0.4.ebuild
+++ b/dev-libs/mozldap/mozldap-6.0.4.ebuild
@@ -15,7 +15,8 @@ IUSE="ipv6 debug sasl"
 
 DEPEND=">=dev-libs/nss-3.11.4
 	>=dev-libs/nspr-4.0.1
-	>=dev-libs/svrcore-4.0.0"
+	>=dev-libs/svrcore-4.0.0
+	sasl? ( dev-libs/cyrus-sasl )"
 
 RDEPEND="${DEPEND}"
 
@@ -38,9 +39,13 @@ src_compile() {
 		myconf="${myconf} --enable-ipv6"
 	fi
 
+	if use sals; then
+		myconf="${myconf} --with-sasl"
+	fi
+
 	myconf="${myconf} --libdir=/usr/$(get_libdir)/mozldap"
 
-	econf $(use_enable debug) $(use_with sasl) \
+	econf $(use_enable debug) \
 		--with-svrcore-inc=/usr/include/svrcore \
 		--with-svrcore-lib=/usr/$(get_libdir)/svrcore \
 		--enable-clu \