--- /usr/portage/dev-libs/apr-util/apr-util-1.2.12.ebuild	2008-06-01 14:06:34.000000000 +0200
+++ apr-util-1.3.0-r100.ebuild	2008-01-19 19:41:41.000000000 +0100
@@ -12,24 +12,37 @@
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
+IUSE="berkdb doc gdbm ldap mozldap mysql postgres sqlite sqlite3"
 RESTRICT="test"
 
-RDEPEND="dev-libs/expat
+DEPEND="dev-libs/expat
 	>=dev-libs/apr-${PV}
 	berkdb? ( =sys-libs/db-4* )
+	doc? ( app-doc/doxygen )
 	gdbm? ( sys-libs/gdbm )
 	ldap? ( =net-nds/openldap-2* )
+	mozldap? ( =dev-libs/mozldap-6*
+		   =dev-libs/nspr-4*
+		   =dev-libs/nss-3* )
 	mysql? ( =virtual/mysql-5* )
-	postgres? ( virtual/postgresql-base )
+	postgres? ( dev-db/libpq )
 	sqlite? ( =dev-db/sqlite-2* )
 	sqlite3? ( =dev-db/sqlite-3* )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+        if use ldap && use mozldap ; then
+                eerror "you cant activate ldap & mozldap at the same time "
+                eerror "plz deactivate \"dev-libs/apr-util -ldap mozldap\" one in"
+                eerror "\"etc/portage/package.use\" ;p"
+                die "ldap and mozldap USE conflict"
+        fi
+}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	
+	epatch "${FILESDIR}"/"${PN}"-1.2.10-mozldap60-2.patch
 
 	./buildconf --with-apr=../apr-${PV} || die "buildconf failed"
 	elibtoolize || die "elibtoolize failed"
@@ -40,6 +53,12 @@
 
 	use ldap && myconf="${myconf} --with-ldap"
 
+	use mozldap && myconf="${myconf} --with-ldap \
+					 --with-ldap-include=/usr/include/mozldap/ \
+					 --with-ldap-lib=/usr/$(get_libdir)/mozldap/ \
+					 --with-nss-lib=/usr/$(get_libdir)/nss/ \
+					 --with-nspr-lib=/usr/$(get_libdir)/nspr"
+
 	if use berkdb; then
 		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
 		dbver="$(db_ver_to_slot "$dbver")"