From 0e5de7a2615336aa5f2479795e505dec2f8874a3 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Tue, 5 Apr 2016 18:27:51 -0700
Subject: [PATCH] sys-libs/ldb: Use bundled tdb rather than failing build

ldb is bad at finding the shipped tdb, so build it against the bundled copy.
---
 .../ldb/{ldb-1.1.26.ebuild => ldb-1.1.26-r1.ebuild}      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/{ldb-1.1.26.ebuild => ldb-1.1.26-r1.ebuild} (90%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26-r1.ebuild
similarity index 90%
rename from sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26-r1.ebuild
index f1cd4a9326..f80da528a2 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26-r1.ebuild
@@ -3,8 +3,10 @@
 # $Id$
 
 EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
 
-inherit waf-utils multilib-minimal eutils
+inherit python-single-r1 waf-utils multilib-minimal eutils
 
 DESCRIPTION="An LDAP-like embedded database"
 HOMEPAGE="http://ldb.samba.org"
@@ -46,9 +48,8 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf=(
 		--disable-rpath \
-		--disable-rpath-install --bundled-libraries=NONE \
+		--disable-rpath-install \
 		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \
-		--builtin-libraries=NONE \
 		--disable-python
 	)
 	waf-utils_src_configure "${myconf[@]}"
@@ -76,6 +77,8 @@ multilib_src_install() {
 		docinto html
 		dodoc -r apidocs/html/*
 	fi
+	rm ${D}/usr/bin/tdb*
+	rm ${D}/usr/lib/debug/usr/bin/tdb*
 }
 
 pkg_postinst() {