4 files changed, 9 insertions, 81 deletions
diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog
index e130f3190d36..f2cdd8703156 100644
--- a/sys-libs/ldb/ChangeLog
+++ b/sys-libs/ldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ldb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.25 2012/06/11 09:23:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.26 2012/06/19 14:03:31 maksbotan Exp $
+
+  19 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org> -ldb-1.1.3.ebuild,
+  ldb-1.1.4.ebuild, ldb-1.1.6.ebuild:
+  Depend strictly on tdb version, bug 420713. Remove old 1.1.3
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.4.ebuild:
   Stable for amd64, wrt bug #419961
diff --git a/sys-libs/ldb/ldb-1.1.3.ebuild b/sys-libs/ldb/ldb-1.1.3.ebuild
deleted file mode 100644
index 0f30fd351f08..000000000000
--- a/sys-libs/ldb/ldb-1.1.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.3.ebuild,v 1.7 2012/05/04 07:33:11 jdhore Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit python waf-utils multilib
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.7[python]
-	>=sys-libs/tevent-0.9.14
-	>=sys-libs/tdb-1.2.9[python]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-WAF_BINARY="${S}/buildtools/bin/waf-svn"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	python_need_rebuild
-}
-
-src_configure() {
-	waf-utils_src_configure --disable-rpath \
-	--disable-rpath-install --bundled-libraries=NONE \
-	--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules \
-	--builtin-libraries=NONE
-}
-
-src_compile(){
-	waf-utils_src_compile
-	use doc && doxygen Doxyfile
-}
-
-src_test() {
-	WAF_MAKE=1 \
-	PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${S}"/bin/shared/private/:"${S}"/bin/shared waf test || die
-}
-
-src_install() {
-	waf-utils_src_install
-	rm "${D}/$(python_get_sitedir)/"_tevent.so
-
-	if use doc; then
-		dohtml -r apidocs/html/*
-		doman  apidocs/man/man3/*.3
-	fi
-}
-
-pkg_postinst() {
-	python_need_rebuild
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See http://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.4.ebuild b/sys-libs/ldb/ldb-1.1.4.ebuild
index 51687e6c5787..b80e59c1ce94 100644
--- a/sys-libs/ldb/ldb-1.1.4.ebuild
+++ b/sys-libs/ldb/ldb-1.1.4.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/sys-libs/ldb/ldb-1.1.4.ebuild,v 1.5 2012/06/11 09:23:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.4.ebuild,v 1.6 2012/06/19 14:03:31 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ IUSE="doc"
 RDEPEND="dev-libs/popt
 	>=sys-libs/talloc-2.0.7[python]
 	>=sys-libs/tevent-0.9.14
-	>=sys-libs/tdb-1.2.9[python]
+	~sys-libs/tdb-1.2.9[python]
 	net-nds/openldap
 	!!<net-fs/samba-3.6.0[ldb]
 	!!>=net-fs/samba-4.0.0[ldb]
diff --git a/sys-libs/ldb/ldb-1.1.6.ebuild b/sys-libs/ldb/ldb-1.1.6.ebuild
index ca0f7f76e8c2..22c2b3ed6ea5 100644
--- a/sys-libs/ldb/ldb-1.1.6.ebuild
+++ b/sys-libs/ldb/ldb-1.1.6.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/sys-libs/ldb/ldb-1.1.6.ebuild,v 1.2 2012/05/30 22:42:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.6.ebuild,v 1.3 2012/06/19 14:03:31 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ IUSE="doc"
 RDEPEND="dev-libs/popt
 	>=sys-libs/talloc-2.0.7[python]
 	>=sys-libs/tevent-0.9.14
-	>=sys-libs/tdb-1.2.9[python]
+	~sys-libs/tdb-1.2.10[python]
 	net-nds/openldap
 	!!<net-fs/samba-3.6.0[ldb]
 	!!>=net-fs/samba-4.0.0[ldb]