[gentoo-commits] repo/gentoo:master commit in: dev-db/lmdb/

[Maxim Koltsov]

commit:     4b77702ccc87959b43990a8b50253b80b1a2ea53
Author:     Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Mon Jun 11 16:06:08 2018 +0000
Commit:     Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 13:17:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b77702c

dev-db/lmdb: Make ebuild multilib

 .../{lmdb-0.9.21.ebuild => lmdb-0.9.21-r1.ebuild}  | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/dev-db/lmdb/lmdb-0.9.21.ebuild b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild
similarity index 64%
rename from dev-db/lmdb/lmdb-0.9.21.ebuild
rename to dev-db/lmdb/lmdb-0.9.21-r1.ebuild
index c8ac76bcd7c..4a0589b13fe 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) \