From ee50bff520eb7591605312e481ec2e6bb20dcc1f Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 2 Sep 2021 09:58:02 +0200
Subject: [PATCH 1/7] sys-libs/talloc: Add new package from gentoo

We need it for the updated sys-libs/ldb, but it depends on python we
haven't yet packaged.
---
 .../coreos-overlay/sys-libs/talloc/Manifest   |   2 +
 .../sys-libs/talloc/metadata.xml              |  11 ++
 .../sys-libs/talloc/talloc-2.3.2.ebuild       | 118 ++++++++++++++++++
 .../sys-libs/talloc/talloc-2.3.3.ebuild       | 118 ++++++++++++++++++
 4 files changed, 249 insertions(+)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/metadata.xml
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest
new file mode 100644
index 0000000000..ae0afae278
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest
@@ -0,0 +1,2 @@
+DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1
+DIST talloc-2.3.3.tar.gz 650493 BLAKE2B 4312d8bbd54da2cb8917946e46bb77dae1c6fdfeb72bd85d86ef8d5900f2132a36c5f0075608116a9bf036a2f02671472d389eed704f8e2923f8320d29aa12bd SHA512 1e4b90769b9be72421d76bf9149fd0736f43d034b1573ab2dfb5cd613b4fb3fdf67d575f81789851787e1cbbc7353cdfc114cefbccb15fc0f39e222f40aff65f
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/metadata.xml
new file mode 100644
index 0000000000..72b988ab3e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>samba@gentoo.org</email>
+    <name>Samba</name>
+  </maintainer>
+  <use>
+    <flag name="compat">Enable extra compatibility stuff</flag>
+  </use>
+</pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild
new file mode 100644
index 0000000000..851fdbb724
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils python-single-r1 multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	!elibc_FreeBSD? (
+		!elibc_SunOS? (
+			!elibc_Darwin? (
+				dev-libs/libbsd[${MULTILIB_USEDEP}]
+			)
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	!!<sys-libs/talloc-2.0.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Drop irritating ABI names (e.g. cpython-37m)
+		# We're only installing one implementation anyway
+		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
+		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
+	fi
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
+	)
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die
+
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+		fi
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild
new file mode 100644
index 0000000000..2b8eb265c0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils python-single-r1 multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	!elibc_FreeBSD? (
+		!elibc_SunOS? (
+			!elibc_Darwin? (
+				dev-libs/libbsd[${MULTILIB_USEDEP}]
+			)
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	!!<sys-libs/talloc-2.0.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Drop irritating ABI names (e.g. cpython-37m)
+		# We're only installing one implementation anyway
+		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
+		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
+	fi
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
+	)
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die
+
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+		fi
+	fi
+}

From 0c1e06d7a01699a334671637779558831ca696df Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 2 Sep 2021 09:59:53 +0200
Subject: [PATCH 2/7] sys-libs/talloc: Drop unnecessary files

---
 .../coreos-overlay/sys-libs/talloc/Manifest   |   1 -
 .../sys-libs/talloc/talloc-2.3.3.ebuild       | 118 ------------------
 2 files changed, 119 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest
index ae0afae278..f3b62899b6 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/Manifest
@@ -1,2 +1 @@
 DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1
-DIST talloc-2.3.3.tar.gz 650493 BLAKE2B 4312d8bbd54da2cb8917946e46bb77dae1c6fdfeb72bd85d86ef8d5900f2132a36c5f0075608116a9bf036a2f02671472d389eed704f8e2923f8320d29aa12bd SHA512 1e4b90769b9be72421d76bf9149fd0736f43d034b1573ab2dfb5cd613b4fb3fdf67d575f81789851787e1cbbc7353cdfc114cefbccb15fc0f39e222f40aff65f
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild
deleted file mode 100644
index 2b8eb265c0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-inherit waf-utils python-single-r1 multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="https://talloc.samba.org/"
-SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="
-	!elibc_FreeBSD? (
-		!elibc_SunOS? (
-			!elibc_Darwin? (
-				dev-libs/libbsd[${MULTILIB_USEDEP}]
-			)
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	!!<sys-libs/talloc-2.0.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# python goes only for native
-	/usr/include/pytalloc.h
-)
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Drop irritating ABI names (e.g. cpython-37m)
-		# We're only installing one implementation anyway
-		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
-		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
-	fi
-
-	# what would you expect of waf? i won't even waste time trying.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=(
-		$(usex compat --enable-talloc-compat1 '')
-		$(multilib_native_usex python '' --disable-python)
-		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
-	)
-	waf-utils_src_configure "${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# waf is stupid, and no, we can't fix the build-system, since it's provided
-	# as a brilliant binary blob thats decompressed on the fly
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die
-
-		if use python ; then
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
-
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
-
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
-				"${D}"$(python_get_sitedir)/talloc*.bundle || die
-			install_name_tool \
-				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
-				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${D}"$(python_get_sitedir)/talloc*.bundle || die
-		fi
-	fi
-}

From fd5bfc4907f869e163d1cb63bdb5a0625a092ee6 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 2 Sep 2021 10:04:57 +0200
Subject: [PATCH 3/7] sys-libs/talloc: Apply Flatcar modifications

---
 .../src/third_party/coreos-overlay/sys-libs/talloc/README.md   | 3 +++
 .../coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/README.md

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/README.md b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/README.md
new file mode 100644
index 0000000000..d2201b2966
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/README.md
@@ -0,0 +1,3 @@
+The sole reason for having this package in coreos-overlay is to lower
+the version of the python3 dependency. When we update python3 to
+something recent, we can move it back to portage-stable.
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild
index 851fdbb724..25ef353598 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/talloc/talloc-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 inherit waf-utils python-single-r1 multilib-minimal
 

From 8a32322830b7b697f513e78bf3d6b5fbd58e9599 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 26 Aug 2021 19:14:56 +0200
Subject: [PATCH 4/7] sys-libs/ldb: Drop old

This package contained no Flatcar modifications, so in theory it could
be moved to portage-stable. But we also will want to update it to some
recent version that does not depend on python2. But the recent
versions in gentoo use python3.{7,9}, so we will need to change it for
now, since we still use python3.6.
---
 .../coreos-overlay/sys-libs/ldb/ChangeLog     | 263 ----------------
 .../sys-libs/ldb/ChangeLog-2015               | 282 ------------------
 .../coreos-overlay/sys-libs/ldb/Manifest      |   1 -
 ...ix_PKGCONFIGDIR-when-python-disabled.patch |  17 --
 .../files/ldb-1.1.31-optional_packages.patch  |  57 ----
 .../sys-libs/ldb/ldb-1.3.6.ebuild             | 103 -------
 .../coreos-overlay/sys-libs/ldb/metadata.xml  |   8 -
 7 files changed, 731 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog-2015
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.3.6.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog
deleted file mode 100644
index 1d7320d59a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog
+++ /dev/null
@@ -1,263 +0,0 @@
-# ChangeLog for sys-libs/ldb
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
-# (auto-generated from git log)
-
-*ldb-1.1.21 (09 Aug 2015)
-*ldb-1.1.20 (09 Aug 2015)
-*ldb-1.1.17-r1 (09 Aug 2015)
-*ldb-1.1.15 (09 Aug 2015)
-*ldb-1.1.12 (09 Aug 2015)
-
-  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +ldb-1.1.12.ebuild,
-  +ldb-1.1.15.ebuild, +ldb-1.1.17-r1.ebuild, +ldb-1.1.20.ebuild,
-  +ldb-1.1.21.ebuild, +metadata.xml:
-  proj/gentoo: Initial commit
-
-  This commit represents a new era for Gentoo:
-  Storing the gentoo-x86 tree in Git, as converted from CVS.
-
-  This commit is the start of the NEW history.
-  Any historical data is intended to be grafted onto this point.
-
-  Creation process:
-  1. Take final CVS checkout snapshot
-  2. Remove ALL ChangeLog* files
-  3. Transform all Manifests to thin
-  4. Remove empty Manifests
-  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
-  5.1. Do not touch files with -kb/-ko keyword flags.
-
-  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
-  tests
-  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
-  project
-  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
-  developer, wrote Git features for the migration
-  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
-  cvs2svn
-  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
-  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
-  work in migration
-  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
-  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
-  the bikeshed
-
-  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Use https by default
-
-  Convert all URLs for sites supporting encrypted connections from http to
-  https
-
-  Signed-off-by: Justin Lecher <jlec@gentoo.org>
-
-  24 Aug 2015; Justin Lecher <jlec@gentoo.org> ldb-1.1.12.ebuild,
-  ldb-1.1.15.ebuild, ldb-1.1.17-r1.ebuild, ldb-1.1.20.ebuild,
-  ldb-1.1.21.ebuild:
-  Use https by default
-
-  Convert all URLs for sites supporting encrypted connections from http to
-  https
-
-  Signed-off-by: Justin Lecher <jlec@gentoo.org>
-
-  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
-  Revert DOCTYPE SYSTEM https changes in metadata.xml
-
-  repoman does not yet accept the https version.
-  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
-
-  Bug: https://bugs.gentoo.org/552720
-
-*ldb-1.1.23 (23 Nov 2015)
-
-  23 Nov 2015; Lars Wendler <polynomial-c@gentoo.org> +ldb-1.1.23.ebuild:
-  Bump to version 1.1.23
-
-  Package-Manager: portage-2.2.25
-  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
-  23 Nov 2015; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.20.ebuild:
-  Removed old.
-
-  Package-Manager: portage-2.2.25
-  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
-*ldb-1.1.24 (16 Dec 2015)
-
-  16 Dec 2015; Lars Wendler <polynomial-c@gentoo.org> +ldb-1.1.24.ebuild:
-  Security bump to version 1.1.24 (bug #568432).
-
-  Package-Manager: portage-2.2.26
-  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
-  16 Dec 2015; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.21.ebuild,
-  -ldb-1.1.23.ebuild:
-  Removed old.
-
-  Package-Manager: portage-2.2.26
-  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
-  29 Dec 2015; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.24.ebuild:
-  amd64 stable wrt bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="amd64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  29 Dec 2015; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.24.ebuild:
-  x86 stable wrt bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="x86"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  07 Jan 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.24.ebuild:
-  ppc stable wrt bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ppc"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  07 Jan 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.24.ebuild:
-  ppc64 stable wrt bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ppc64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  07 Jan 2016; Markus Meier <maekke@gentoo.org> ldb-1.1.24.ebuild:
-  arm stable, bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="arm"
-
-  08 Jan 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.24.ebuild:
-  ia64 stable wrt bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ia64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  08 Jan 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.24.ebuild:
-  alpha stable wrt bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="alpha"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  09 Jan 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.24.ebuild:
-  sparc stable wrt bug #568432
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="sparc"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-*ldb-1.1.24-r1 (11 Jan 2016)
-
-  11 Jan 2016; Ian Stakenvicius <axs@gentoo.org>
-  +files/ldb-1.1.24-optional-python.patch, +ldb-1.1.24-r1.ebuild:
-  convert to multilib
-
-  multilib is needed to support samba-4
-
-  Package-Manager: portage-2.2.26
-
-  11 Jan 2016; Ian Stakenvicius <axs@gentoo.org> ldb-1.1.24-r1.ebuild:
-  remove --blddir configure option as it causes builds to break
-
-  Thanks to iamben for catching this.
-
-  Package-Manager: portage-2.2.26
-
-  12 Jan 2016; Jeroen Roovers <jer@gentoo.org> ldb-1.1.24.ebuild:
-  Stable for HPPA (bug #568432).
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --ignore-arches
-
-*ldb-1.1.24-r2 (12 Jan 2016)
-
-  12 Jan 2016; Ian Stakenvicius <axs@gentoo.org> -ldb-1.1.24-r1.ebuild,
-  +ldb-1.1.24-r2.ebuild:
-  resolve automagic header usage on libbsd by RDEPENDing on it
-
-  The lib/replace code configures and depends on bsd/* headers depending
-  solely on its
-  existence; as libbsd is a non-optional dep for samba-4.2 and newer anyways,
-  ensure
-  it is installed now with matching MULTILIB_USDEP on non-fbsd to avoid the
-  potential
-  headers mis-matches between bsd/*.h and other unistd.h or types.h on the
-  system.
-
-  This should address bug 571622.
-
-  Package-Manager: portage-2.2.26
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Replace all herds with appropriate projects (GLEP 67)
-
-  Replace all uses of herd with appropriate project maintainers, or no
-  maintainers in case of herds requested to be disbanded.
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Set appropriate maintainer types in metadata.xml (GLEP 67)
-
-*ldb-1.1.25 (09 Feb 2016)
-
-  09 Feb 2016; Ian Stakenvicius <axs@gentoo.org> +ldb-1.1.25.ebuild:
-  add v1.1.25 to suport samba-4.4
-
-  Package-Manager: portage-2.2.26
-
-*ldb-1.1.26 (24 Feb 2016)
-
-  24 Feb 2016; Lars Wendler <polynomial-c@gentoo.org> +ldb-1.1.26.ebuild:
-  Bump to version 1.1.26
-
-  Package-Manager: portage-2.2.27
-  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
-  24 Feb 2016; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.12.ebuild,
-  -ldb-1.1.15.ebuild, -ldb-1.1.17-r1.ebuild, -ldb-1.1.24-r2.ebuild:
-  Removed old.
-
-  Package-Manager: portage-2.2.27
-  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
-  29 Mar 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.26.ebuild:
-  amd64 stable wrt bug #578498
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="amd64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  29 Mar 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.26.ebuild:
-  x86 stable wrt bug #578498
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="x86"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  30 Mar 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.26.ebuild:
-  ppc stable wrt bug #578498
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ppc"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  30 Mar 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.26.ebuild:
-  ppc64 stable wrt bug #578498
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ppc64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
-  31 Mar 2016; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.26.ebuild:
-  ia64 stable wrt bug #578498
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --include-arches="ia64"
-  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
-
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog-2015 b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog-2015
deleted file mode 100644
index 6f9e590357..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ChangeLog-2015
+++ /dev/null
@@ -1,282 +0,0 @@
-# ChangeLog for sys-libs/ldb
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.75 2015/08/07 07:38:08 polynomial-c Exp $
-
-*ldb-1.1.21 (07 Aug 2015)
-
-  07 Aug 2015; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.19.ebuild,
-  +ldb-1.1.21.ebuild:
-  Version bump. Removed old.
-
-  08 Apr 2015; Michał Górny <mgorny@gentoo.org> ldb-1.1.17-r1.ebuild,
-  ldb-1.1.19.ebuild:
-  Drop old Python implementations
-
-  03 Mar 2015; Yixun Lan <dlan@gentoo.org> ldb-1.1.20.ebuild:
-  add arm64 support, tested on A53 board
-
-  28 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> +ldb-1.1.17-r1.ebuild:
-  Re-added latest stable version which was accidently removed with my previous
-  commit.
-
-*ldb-1.1.20 (27 Jan 2015)
-
-  27 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.17-r1.ebuild,
-  -ldb-1.1.18.ebuild, +ldb-1.1.20.ebuild:
-  Version bump. Removed old.
-
-  03 Jan 2015; Michał Górny <mgorny@gentoo.org> ldb-1.1.12.ebuild,
-  ldb-1.1.15.ebuild, ldb-1.1.17-r1.ebuild, ldb-1.1.18.ebuild, ldb-1.1.19.ebuild:
-  Add PYTHON_REQ_USE as necessary for waf.
-
-*ldb-1.1.19 (22 Dec 2014)
-
-  22 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> +ldb-1.1.19.ebuild:
-  Version bump.
-
-*ldb-1.1.18 (02 Dec 2014)
-
-  02 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.16.ebuild,
-  -ldb-1.1.17.ebuild, +ldb-1.1.18.ebuild:
-  Version bump. Removed old.
-
-  06 Oct 2014; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.17-r1.ebuild:
-  Stable for x86, wrt bug #511670
-
-  06 Oct 2014; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.17-r1.ebuild:
-  Stable for amd64, wrt bug #511670
-
-  26 May 2014; Michał Górny <mgorny@gentoo.org> ldb-1.1.12.ebuild,
-  ldb-1.1.15.ebuild, ldb-1.1.16.ebuild, ldb-1.1.17-r1.ebuild, ldb-1.1.17.ebuild:
-  Require tevent[python] for the flag has been added along with multilib
-  support.
-
-*ldb-1.1.17-r1 (26 May 2014)
-
-  26 May 2014; Lars Wendler <polynomial-c@gentoo.org> +ldb-1.1.17-r1.ebuild:
-  Added subslot support (bug #511528).
-
-  26 May 2014; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
-  Drop inactive maintainers
-
-  17 May 2014; Lars Wendler <polynomial-c@gentoo.org> ldb-1.1.17.ebuild:
-  Fixed dependencies as reported by Jaakko Perttilä in bug #510080.
-
-*ldb-1.1.17 (07 May 2014)
-
-  07 May 2014; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.15-r1.ebuild,
-  +ldb-1.1.17.ebuild:
-  Version bump. Removed old.
-
-  02 Nov 2013; Markos Chandras <hwoarang@gentoo.org> ldb-1.1.16.ebuild:
-  Add ~mips per #444688
-
-  06 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.15.ebuild:
-  Stable for sparc, wrt bug #478260
-
-  05 Sep 2013; Mike Frysinger <vapier@gentoo.org> ldb-1.1.16.ebuild:
-  Add s390/sh keywords #377809.
-
-  03 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.15.ebuild:
-  Stable for ia64, wrt bug #478260
-
-  01 Sep 2013; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.15.ebuild:
-  Stable for alpha, wrt bug #478260
-
-  26 Aug 2013; Markus Meier <maekke@gentoo.org> ldb-1.1.15.ebuild:
-  arm stable, bug #478260
-
-  07 Aug 2013; Lars Wendler <polynomial-c@gentoo.org> ldb-1.1.16.ebuild:
-  Converted ebuild to use python-single-r1 eclass.
-
-  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> ldb-1.1.16.ebuild:
-  Fixed dependency on sys-libs/tdb. Thanks to Andreas Sturmlechner for
-  reporting this in bug #476228.
-
-*ldb-1.1.16 (08 Jul 2013)
-
-  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> +ldb-1.1.16.ebuild:
-  Version bump. Removed old.
-
-  19 Jun 2013; Tobias Klausmann <klausman@gentoo.org> ldb-1.1.12.ebuild:
-  Keyworded on alpha, bug #424649
-
-*ldb-1.1.15-r1 (07 Jun 2013)
-
-  07 Jun 2013; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.13.ebuild,
-  -ldb-1.1.14.ebuild, +ldb-1.1.15-r1.ebuild:
-  Non-maintainer commit: Attempt to fix bug #465956. Removed old versions.
-
-  28 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.15.ebuild:
-  Stable for x86, wrt bug #466284
-
-  28 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.15.ebuild:
-  Stable for amd64, wrt bug #466284
-
-*ldb-1.1.15 (02 Feb 2013)
-
-  02 Feb 2013; Patrick Lauer <patrick@gentoo.org> +ldb-1.1.15.ebuild:
-  Bump
-
-  02 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> ldb-1.1.14.ebuild:
-  Non-maintainer commit: Fixed dependencies (bug #449710).
-
-  19 Dec 2012; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.14.ebuild:
-  Add ~ia64, wrt bug #377809
-
-*ldb-1.1.14 (12 Dec 2012)
-
-  12 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.4.ebuild,
-  -ldb-1.1.9.ebuild, -ldb-1.1.10.ebuild, +ldb-1.1.14.ebuild:
-  non-maintainer commit: Version bump. Removed old.
-
-  02 Dec 2012; Markus Meier <maekke@gentoo.org> ldb-1.1.13.ebuild:
-  add ~arm, bug #444688
-
-  29 Nov 2012; Jeroen Roovers <jer@gentoo.org> ldb-1.1.12.ebuild:
-  Stable for HPPA (bug #432754).
-
-  25 Nov 2012; Anthony G. Basile <blueness@gentoo.org> ldb-1.1.12.ebuild:
-  stable ppc ppc64, bug #444686
-
-  25 Nov 2012; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.12.ebuild:
-  Stable for x86, wrt bug #444686
-
-  25 Nov 2012; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.12.ebuild:
-  Stable for amd64, wrt bug #444686
-
-*ldb-1.1.13 (24 Oct 2012)
-
-  24 Oct 2012; Maxim Koltsov <maksbotan@gentoo.org> +ldb-1.1.13.ebuild:
-  Bump to 1.1.13, thanks to slepnoga
-
-  02 Oct 2012; Mike Gilbert <floppym@gentoo.org> ldb-1.1.10.ebuild,
-  ldb-1.1.12.ebuild:
-  Fix PYTHON_DEPEND. Patch by Arfrever.
-
-  23 Sep 2012; Víctor Ostorga <vostorga@gentoo.org> ldb-1.1.10.ebuild,
-  ldb-1.1.12.ebuild:
-  Fixin up tevent version
-
-*ldb-1.1.12 (23 Sep 2012)
-
-  23 Sep 2012; Víctor Ostorga <vostorga@gentoo.org> ldb-1.1.10.ebuild,
-  +ldb-1.1.12.ebuild:
-  Version bump to 1.1.12 bug 435630
-
-  23 Sep 2012; Víctor Ostorga <vostorga@gentoo.org> ldb-1.1.10.ebuild:
-  Fixing up python and tdb DEPEND versions
-
-  13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> -ldb-1.1.6-r1.ebuild,
-  -ldb-1.1.8.ebuild, ldb-1.1.10.ebuild, ldb-1.1.9.ebuild:
-  Cleanup a bit.
-
-*ldb-1.1.10 (21 Aug 2012)
-
-  21 Aug 2012; Alexander Vershilov <qnikst@gentoo.org> +ldb-1.1.10.ebuild:
-  bump ldb-1.1.10, thanks to slepnoga
-
-*ldb-1.1.6-r1 (21 Aug 2012)
-
-  21 Aug 2012; Alexander Vershilov <qnikst@gentoo.org> +ldb-1.1.6-r1.ebuild,
-  -ldb-1.1.6.ebuild:
-  drop ~alpha keyword due 424649
-
-*ldb-1.1.9 (06 Aug 2012)
-
-  06 Aug 2012; Maxim Koltsov <maksbotan@gentoo.org> +ldb-1.1.9.ebuild:
-  Bump to 1.1.9, thanks to slepnoga
-
-*ldb-1.1.8 (01 Aug 2012)
-
-  01 Aug 2012; Maxim Koltsov <maksbotan@gentoo.org> +ldb-1.1.8.ebuild:
-  Bump to 1.1.8, bug #425488. Drop ~alpha. Thanks to slepnoga
-
-  06 Jul 2012; Jeff Horelick <jdhore@gentoo.org> ldb-1.1.4.ebuild:
-  marked x86 per bug 417111
-
-  03 Jul 2012; Maxim Koltsov <maksbotan@gentoo.org> ldb-1.1.4.ebuild:
-  Add more specific tevent depends to 1.1.4, bug 424635
-
-  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
-
-  02 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org> -ldb-1.1.0.ebuild:
-  Remove old 1.1.0
-
-  30 May 2012; Alexis Ballier <aballier@gentoo.org> ldb-1.1.6.ebuild:
-  keyword ~amd64-fbsd
-
-*ldb-1.1.6 (23 May 2012)
-
-  23 May 2012; Maxim Koltsov <maksbotan@gentoo.org> +ldb-1.1.6.ebuild:
-  Bump to 1.1.6, bug #414113. Thanks to slepnoga
-
-  04 May 2012; Jeff Horelick <jdhore@gentoo.org> ldb-1.1.3.ebuild,
-  ldb-1.1.4.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  25 Feb 2012; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.3.ebuild:
-  Stable for amd64, wrt bug #405617
-
-  25 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> ldb-1.1.0.ebuild,
-  ldb-1.1.3.ebuild, ldb-1.1.4.ebuild:
-  Add sssd warning to postinst phases, bug #404281
-
-  18 Feb 2012; Tobias Klausmann <klausman@gentoo.org> ldb-1.1.4.ebuild:
-  Keyworded on alpha, bug #377809
-
-*ldb-1.1.4 (01 Feb 2012)
-
-  01 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> +ldb-1.1.4.ebuild,
-  metadata.xml:
-  Bump to 1.1.4, fix metadata. Bug 401635
-
-  31 Jan 2012; Jeroen Roovers <jer@gentoo.org> metadata.xml:
-  Remove defunct maintainer (bug #401635 comment #1).
-
-  03 Nov 2011; Jeroen Roovers <jer@gentoo.org> ldb-1.1.3.ebuild:
-  Marked ~hppa (bug #377809).
-
-  03 Nov 2011; Naohiro Aota <naota@gentoo.org> ldb-1.1.3.ebuild:
-  Add ~x86-fbsd
-
-  01 Nov 2011; Víctor Ostorga <vostorga@gentoo.org> ldb-1.1.3.ebuild:
-  Adding dev-util/pkgconfig to DEPEND
-
-*ldb-1.1.3 (23 Oct 2011)
-
-  23 Oct 2011; Maxim Koltsov <maksbotan@gentoo.org> +ldb-1.1.3.ebuild:
-  Bump to 1.1.3, bug 387443
-
-  04 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> ldb-1.1.0.ebuild:
-  Fix samba blocker, bug 377809 comment 2
-
-  14 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> ldb-1.1.0.ebuild:
-  Fix typo, fix LD_PATH for test wrt #379139, marked ~ppc/~ppc64 wrt #377809
-
-  10 Aug 2011; Víctor Ostorga <vostorga@gentoo.org> ldb-1.1.0.ebuild:
-  Fixing sys-libs/talloc sys-libs/tevent sys-libs/tdb DEPENDs 
-  Using waf-utils_src_configure
-
-  10 Aug 2011; Jeroen Roovers <jer@gentoo.org> ldb-1.1.0.ebuild:
-  Revert. It does not work as intended.
-
-  10 Aug 2011; Jeroen Roovers <jer@gentoo.org> ldb-1.1.0.ebuild:
-  Run waf-utils_src_configure, not econf.
-
-  09 Aug 2011; <maks@gentoo.org> ldb-1.1.0.ebuild:
-  Add blocker for samba[ldb] until bug 377809 is done.
-
-  07 Aug 2011; <maks@gentoo.org> ldb-1.1.0.ebuild:
-  Fix missing dependency and test problems, thanks slepnoga. Bug 377881
-
-*ldb-1.1.0 (04 Aug 2011)
-
-  04 Aug 2011; Maxim Koltsov (maksbotan) <maksbotan@gentoo.org>
-  +ldb-1.1.0.ebuild, +metadata.xml:
-  Added ebuild for sys-libs/ldb-1.1.0, thanks to spamslepnoga@inbox.ru. bug
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
deleted file mode 100644
index 1db9b4f077..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ldb-1.3.6.tar.gz 1374574 BLAKE2B 654f35eb25aeb373540ead7cb10da66c92970ea6b100631cb14bacf937fec64e09b19ed3e09a976406e3f8d6347c4e17144c0a0bff8795316559be45353edbf7 SHA512 8fcd72598e948c55adaa832d6ebcbc03b979281032cb900af4304c1c68ce9cc94a1e1d4729d0c2a0b83a618cab716749d851160005a0093cf8a178e6dbea298d
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
deleted file mode 100644
index c45b13feba..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/wscript	2017-07-05 15:35:52.178964698 -0400
-+++ b/wscript	2017-07-05 15:49:20.137977649 -0400
-@@ -208,6 +208,14 @@
-         ldb_headers = ('include/ldb.h include/ldb_errors.h '
-                        'include/ldb_module.h include/ldb_handlers.h')
- 
-+        # we're not currently linking against the ldap libs, but ldb.pc.in
-+        # has @LDAP_LIBS@
-+        bld.env.LDAP_LIBS = ''
-+
-+        if not 'PACKAGE_VERSION' in bld.env:
-+            bld.env.PACKAGE_VERSION = VERSION
-+            bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+
-         bld.SAMBA_LIBRARY('ldb',
-                           COMMON_SRC + ' ' + LDB_MAP_SRC,
-                           deps='tevent LIBLDB_MAIN replace',
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch
deleted file mode 100644
index 1e9b517735..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- ldb-1.1.27/wscript
-+++ ldb-1.1.27/wscript
-@@ -5,6 +5,7 @@
- 
- blddir = 'bin'
- 
-+import Logs
- import sys, os
- 
- # find the buildtools directory
-@@ -13,7 +14,7 @@
-     srcdir = srcdir + '/..'
- sys.path.insert(0, srcdir + '/buildtools/wafsamba')
- 
--import wafsamba, samba_dist, Utils
-+import wafsamba, samba_dist, Utils, Options
- 
- samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
-                         lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
-@@ -28,8 +29,21 @@
-     opt.RECURSE('lib/tevent')
-     opt.RECURSE('lib/replace')
-     opt.tool_options('python') # options for disabling pyc or pyo compilation
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-python',
-+        help=("disable the pyldb modules"),
-+        action="store_true", dest='disable_python', default=False)
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-ldap',
-+        help=("disable ldap support"),
-+        action="store_true", dest='disable_ldap', default=False)
- 
- def configure(conf):
-+    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+    conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
-+
-     conf.RECURSE('lib/tdb')
-     conf.RECURSE('lib/tevent')
- 
-@@ -67,9 +81,12 @@
-     if conf.env.standalone_ldb:
-         conf.CHECK_XSLTPROC_MANPAGES()
- 
--        # we need this for the ldap backend
--        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
--            conf.env.ENABLE_LDAP_BACKEND = True
-+        if not conf.env.disable_ldap:
-+    	    # we need this for the ldap backend
-+    	    if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
-+        	conf.env.ENABLE_LDAP_BACKEND = True
-+        else:
-+    	    conf.env.ENABLE_LDAP_BACKEND = False
- 
-         # we don't want any libraries or modules to rely on runtime
-         # resolution of symbols
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.3.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.3.6.ebuild
deleted file mode 100644
index 3403d2939f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.3.6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="doc +ldap python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.11[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile(){
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		doman  apidocs/man/man3/*.3
-		docinto html
-		dodoc -r apidocs/html/*
-	fi
-}
-
-pkg_postinst() {
-	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 https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml
deleted file mode 100644
index 62c9222b8d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>samba@gentoo.org</email>
-	<name>Samba</name>
-</maintainer>
-</pkgmetadata>

From c99f0113cd074b2eb5076d7126c9d4d18fff83d8 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 26 Aug 2021 19:28:53 +0200
Subject: [PATCH 5/7] sys-libs/ldb: Copy from gentoo

Still contains extra stuff we are going to drop.
---
 .../coreos-overlay/sys-libs/ldb/Manifest      |   3 +
 ...ix_PKGCONFIGDIR-when-python-disabled.patch |  17 +++
 .../files/ldb-1.5.2-optional_packages.patch   |  40 ++++++
 .../sys-libs/ldb/ldb-2.2.1-r1.ebuild          | 118 ++++++++++++++++++
 .../sys-libs/ldb/ldb-2.3.0-r1.ebuild          | 118 ++++++++++++++++++
 .../sys-libs/ldb/ldb-2.4.0-r1.ebuild          | 118 ++++++++++++++++++
 .../coreos-overlay/sys-libs/ldb/metadata.xml  |  17 +++
 7 files changed, 431 insertions(+)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
new file mode 100644
index 0000000000..cf1e2cac4f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
@@ -0,0 +1,3 @@
+DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f472f517d5182a2559698a5489e703c8360baf2d0b1bff080c943a403a666d0ef7a9a180ae90052055966f40 SHA512 a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344
+DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348
+DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
new file mode 100644
index 0000000000..c45b13feba
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
@@ -0,0 +1,17 @@
+--- a/wscript	2017-07-05 15:35:52.178964698 -0400
++++ b/wscript	2017-07-05 15:49:20.137977649 -0400
+@@ -208,6 +208,14 @@
+         ldb_headers = ('include/ldb.h include/ldb_errors.h '
+                        'include/ldb_module.h include/ldb_handlers.h')
+ 
++        # we're not currently linking against the ldap libs, but ldb.pc.in
++        # has @LDAP_LIBS@
++        bld.env.LDAP_LIBS = ''
++
++        if not 'PACKAGE_VERSION' in bld.env:
++            bld.env.PACKAGE_VERSION = VERSION
++            bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
++
+         bld.SAMBA_LIBRARY('ldb',
+                           COMMON_SRC + ' ' + LDB_MAP_SRC,
+                           deps='tevent LIBLDB_MAIN replace',
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
new file mode 100644
index 0000000000..bdceeb3c43
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
@@ -0,0 +1,40 @@
+--- ldb-1.5.2/wscript
++++ ldb-1.5.2/wscript
+@@ -33,6 +33,10 @@
+     opt.RECURSE('lib/tevent')
+     opt.RECURSE('lib/replace')
+     opt.load('python') # options for disabling pyc or pyo compilation
++    if opt.IN_LAUNCH_DIR():
++        opt.add_option('--disable-ldap',
++        help=("disable ldap support"),
++        action="store_true", dest='disable_ldap', default=False)
+ 
+     opt.add_option('--without-ldb-lmdb',
+                    help='disable new LMDB backend for LDB',
+@@ -40,6 +44,10 @@
+ 
+ 
+ def configure(conf):
++    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
++
++    conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
++
+     conf.RECURSE('lib/tdb')
+     conf.RECURSE('lib/tevent')
+ 
+@@ -157,9 +165,12 @@
+     if conf.env.standalone_ldb:
+         conf.CHECK_XSLTPROC_MANPAGES()
+ 
+-        # we need this for the ldap backend
+-        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
+-            conf.env.ENABLE_LDAP_BACKEND = True
++        if not conf.env.disable_ldap:
++    	    # we need this for the ldap backend
++            if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
++                conf.env.ENABLE_LDAP_BACKEND = True
++        else:
++            conf.env.ENABLE_LDAP_BACKEND = False
+ 
+         # we don't want any libraries or modules to rely on runtime
+         # resolution of symbols
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild
new file mode 100644
index 0000000000..197d720205
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( python )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap )
+	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	use python && python_optimize #726454
+}
+
+pkg_postinst() {
+	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 https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild
new file mode 100644
index 0000000000..3cc503e81b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( python )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap )
+	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	use python && python_optimize #726454
+}
+
+pkg_postinst() {
+	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 https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild
new file mode 100644
index 0000000000..e270208989
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( python )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap )
+	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	use python && python_optimize #726454
+}
+
+pkg_postinst() {
+	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 https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml
new file mode 100644
index 0000000000..5970784771
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>samba@gentoo.org</email>
+		<name>Samba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:samba:samba</remote-id>
+	</upstream>
+	<use>
+		<flag name="doc">Builds documentation</flag>
+		<flag name="ldap">Enable LDAP support</flag>
+		<flag name="lmdb">Enable LMDB backend</flag>
+		<flag name="python">Enable Python support</flag>
+	</use>
+</pkgmetadata>

From d0aaf23418a5be7e617a421445402c5e6cfe4401 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 26 Aug 2021 19:34:06 +0200
Subject: [PATCH 6/7] sys-libs/ldb: Drop extra stuff

---
 .../coreos-overlay/sys-libs/ldb/Manifest      |   2 -
 .../sys-libs/ldb/ldb-2.2.1-r1.ebuild          | 118 ------------------
 .../sys-libs/ldb/ldb-2.4.0-r1.ebuild          | 118 ------------------
 3 files changed, 238 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
index cf1e2cac4f..274e22e2df 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/Manifest
@@ -1,3 +1 @@
-DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f472f517d5182a2559698a5489e703c8360baf2d0b1bff080c943a403a666d0ef7a9a180ae90052055966f40 SHA512 a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344
 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348
-DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild
deleted file mode 100644
index 197d720205..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="doc ldap +lmdb python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	# waf requires a python interpreter
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		doman  apidocs/man/man3/*.3
-		docinto html
-		dodoc -r apidocs/html/.
-	fi
-
-	use python && python_optimize #726454
-}
-
-pkg_postinst() {
-	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 https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild
deleted file mode 100644
index e270208989..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc ldap +lmdb python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	# waf requires a python interpreter
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		doman  apidocs/man/man3/*.3
-		docinto html
-		dodoc -r apidocs/html/.
-	fi
-
-	use python && python_optimize #726454
-}
-
-pkg_postinst() {
-	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 https://bugs.gentoo.org/404281"
-	fi
-}

From 8cc524b15bdbd12a1cf669f96a0ed6903469e598 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 26 Aug 2021 19:40:23 +0200
Subject: [PATCH 7/7] sys-libs/ldb: Apply Flatcar modifications

Support python3 that we have packaged.
---
 .../profiles/coreos/base/package.use          |  3 +++
 .../coreos-overlay/sys-libs/ldb/README.md     | 19 +++++++++++++++++++
 .../sys-libs/ldb/ldb-2.3.0-r1.ebuild          |  8 +-------
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/README.md

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
index cc4fa1f843..fd2b167307 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
@@ -121,3 +121,6 @@ app-portage/portage-utils -qmanifest -qtegrity
 
 # Disable unnecessary regedit in samba to minimize the package size.
 net-fs/samba -regedit
+
+# Drop extra dependencies
+sys-libs/ldb -lmdb -python
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/README.md b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/README.md
new file mode 100644
index 0000000000..3af4511797
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/README.md
@@ -0,0 +1,19 @@
+There are two reasons for keeping this package in coreos-overlay:
+
+- Lower the version of the python3 dependency to 3.6.
+
+- Drop a part of dependencies in RDEPEND that were hidden behind the
+  python use flag. This normally would not be necessary, because we
+  masked the use flag in our profile, but for some reason portage
+  bails out when parsing RDEPEND variable with the error pasted
+  below. I suppose that the solution to the problem would be updating
+  either python eclasses or portage (or both).
+
+
+The error from portage:
+
+```
+!!! All ebuilds that could satisfy "sys-libs/ldb" for /build/amd64-usr/ have been masked.
+!!! One of the following masked packages is required to complete your request:
+- sys-libs/ldb-2.3.0-r1::coreos (masked by: invalid: DEPEND: Invalid atom (Invalid use dep: ''), token 25, invalid: RDEPEND: Invalid atom (Invalid use dep: ''), token 25)
+```
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild
index 3cc503e81b..9ae9cfd1c7 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -30,12 +30,6 @@ RDEPEND="
 	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
 	ldap? ( net-nds/openldap )
 	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}