Merge branch 'FireBurn:ldb-lmdb'

Closes: https://bugs.gentoo.org/657828
Closes: https://github.com/gentoo/gentoo/pull/8802

3 files changed, 30 insertions, 20 deletions

diff --git a/dev-db/lmdb/lmdb-0.9.21.ebuild b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild
index c8ac76bcd7cd..4a0589b13fe3 100644
--- a/dev-db/lmdb/lmdb-0.9.21.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic multilib-minimal
 
 DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
 HOMEPAGE="http://symas.com/mdb/"
@@ -20,21 +20,23 @@ RDEPEND="!=net-nds/openldap-2.4.40"
 S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
 
 src_prepare() {
-	local soname="-Wl,-soname,liblmdb$(get_libname 0)"
-	[[ ${CHOST} == *-darwin* ]] && \
-		soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
-	sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
-		-e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
-		-e "s!^AR.*!AR = $(tc-getAR)!" \
-		-e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
-		-e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
-		-e "/^libdir/s!lib\$!$(get_libdir)!" \
-		-e "s!shared!shared ${soname}!" \
-		"${S}/Makefile" || die
 	eapply_user
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
+    local soname="-Wl,-soname,liblmdb$(get_libname 0)"
+    [[ ${CHOST} == *-darwin* ]] && \
+        soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
+    sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
+        -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
+        -e "s!^AR.*!AR = $(tc-getAR)!" \
+        -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
+        -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
+        -e "/^libdir/s!lib\$!$(get_libdir)!" \
+        -e "s!shared!shared ${soname}!" \
+        "Makefile" || die
+
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# ensure sigwait has a second sig argument
 		append-cppflags -D_POSIX_PTHREAD_SEMANTICS
@@ -43,11 +45,11 @@ src_configure() {
 	fi
 }
 
-src_compile() {
+multilib_src_compile() {
 	emake LDLIBS+=" -pthread"
 }
 
-src_install() {
+multilib_src_install() {
 	emake DESTDIR="${D}" install
 
 	mv "${ED}"usr/$(get_libdir)/liblmdb$(get_libname) \
diff --git a/sys-libs/ldb/ldb-1.4.0.ebuild b/sys-libs/ldb/ldb-1.4.0-r1.ebuild
index 2d0e99ba9c81..a42012a74531 100644
--- a/sys-libs/ldb/ldb-1.4.0.ebuild
+++ b/sys-libs/ldb/ldb-1.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://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 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +ldap +python"
+IUSE="doc +ldap +lmdb +python"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
@@ -24,6 +24,7 @@ RDEPEND="
 	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
 	>=sys-libs/tevent-0.9.36[python(+)?,${MULTILIB_USEDEP}]
 	ldap? ( net-nds/openldap )
+	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 "
 
@@ -57,6 +58,7 @@ src_prepare() {
 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
diff --git a/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml
index 62c9222b8dd3..db4a710716a7 100644
--- a/sys-libs/ldb/metadata.xml
+++ b/sys-libs/ldb/metadata.xml
@@ -1,8 +1,14 @@
 <?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>
+	<maintainer type="project">
+		<email>samba@gentoo.org</email>
+		<name>Samba</name>
+	</maintainer>
+	<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>