--- /usr/portage/net-dns/bind/bind-9.7.2_p3-r3.ebuild	2011-01-08 00:37:37.000000000 +0100
+++ bind-9.8.0_beta1.ebuild	2011-02-02 07:07:36.000000000 +0100
@@ -6,10 +6,10 @@
 
 inherit eutils autotools toolchain-funcs flag-o-matic
 
-MY_PV="${PV/_p/-P}"
+MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"
 
-SDB_LDAP_VER="1.1.0"
+SDB_LDAP_VER="1.1.0-fc14"
 
 GEOIP_PV=1.3
 #GEOIP_PV_AGAINST="${MY_PV}"
@@ -24,26 +24,26 @@
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
-			 ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )"
-#	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
+			 ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
+	sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads
-	resolvconf urandom xml geoip gssapi" # sdb-ldap
+	resolvconf urandom xml geoip gssapi sdb-ldap"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	mysql? ( >=virtual/mysql-4.0 )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
+	sdb-ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
 	postgres? ( dev-db/postgresql-base )
 	threads? ( >=sys-libs/libcap-2.1.0 )
 	xml? ( dev-libs/libxml2 )
 	geoip? ( >=dev-libs/geoip-1.4.6 )
 	gssapi? ( virtual/krb5 )"
-#	sdb-ldap? ( net-nds/openldap )
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
@@ -89,13 +89,21 @@
 
 	# sdb-ldap patch as per  bug #160567
 	# Upstream URL: http://bind9-ldap.bayour.com/
-	# FIXME: bug 302735
-#	use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+	if use sdb-ldap; then
+		# epatch "${FILESDIR}"/bind-9.8.0b1-sdb-ldap-1.patch
+		epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+		cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named
+		cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools
+		cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools
+	fi
 
 	if use geoip; then
 		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-		sed -i -e 's/-RELEASEVER=2/-RELEASEVER=3/' \
-			-e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=3-geoip-1.3/' \
+		sed -i -e 's/ MINORVER=7/ MINORVER=8/' \
+			-e 's/ PATCHVER=2/ PATCHVER=0/' \
+			-e 's/ RELEASETYPE=-P/ RELEASETYPE=b/' \
+			-e 's/-RELEASEVER=2/-RELEASEVER=1/' \
+			-e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=1-geoip-1.3/' \
 			${GEOIP_PATCH_A} || die
 		epatch ${GEOIP_PATCH_A}
 	fi
@@ -169,6 +177,10 @@
 	echo '#undef SO_BSDCOMPAT' >> config.h
 }
 
+src_compile() {
+	emake -j1 || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die