Merge remote-tracking branch 'github/pr/525'.

5 files changed, 59 insertions, 9 deletions

diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index d61d2e782716..512b2426a60c 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,3 +1,4 @@
 DIST LMDB_0.9.15.tar.gz 130113 SHA256 a72b13db91e7c445e47194178915556b4ebcd6f9f64d48f60b1f830b0cfbd75a SHA512 c6c73661aea42679c83738afbecf9542a04ceed229f72c008b4ef406e7d9284defc652c5b070897155917c5bb2c96a4c35bde3e6423ab0f1802fb711ef1cf16a WHIRLPOOL c00fbb166467a2e7157b4ffbf10525ea8fd2987d172083b07ba52990ab7c39005be3436fe948a29f2c722bf8e4cf76009be55ff5148b0d139126c9a4703c0b28
 DIST LMDB_0.9.16.tar.gz 130343 SHA256 49d7b40949f2ced9bc8b23ea6a89e75471a1c9126537a8b268c318a00b84322b SHA512 ef879df615b5ca1a5c28194ff2cad49559d336c470b3ae904428d219452a0d721cae7d64defe44119d19f7c731fe4e0e293ff09118eb057fe322feb3a5aebcc9 WHIRLPOOL 9bf349df3909874b7554175eb66f904132a39b9fc343e019793d68f8227a45a706f725adb87dd2a951acb22c4acd375ce56acc293762157b8a878d6a3f241f1a
+DIST LMDB_0.9.17.tar.gz 135816 SHA256 80a08218e40f76a0485ec18c42de6f1e020b1ed0268f7cb34c69746e8d98c72c SHA512 2f6108364973e01f6379613c02b9fa11933d6c91eadc5ae0cad55818bc0205041d0663a5dd936d89ec651eb1de0257390d48d549d1bc24ef29d7ee57c9fcb941 WHIRLPOOL 9ed1ed2857cc1282e30fa5a6ecab710bbb00f88f973a90228004194f7f52fe21053e27692e9ec9d0dedd33c6e204bd9f66702fd63e60c8a8a23f655acfbda474
 DIST lmdb-0.9.14.tar.gz 128170 SHA256 3b14dfe2134521cfebd98168b925f7327b9bd07c715640b79f3526e54f0ccb1f SHA512 d5bde616fb22631fe1689e2c77babfbf5098833cf313bce59a5daab1e450d2998a65f087929879e73e0a897b934ff40b8e340c79ec7b2b1c1fe7e1eea7da6267 WHIRLPOOL 0ebda52fd50d9d73bc079e6a613b2e2cdaa1032665d91e499dea9dcf1698095bfe84b03a931118baae8048c616e9bae7153972446502d368e7dc9ee33105e777
diff --git a/dev-db/lmdb/lmdb-0.9.14.ebuild b/dev-db/lmdb/lmdb-0.9.14.ebuild
index 63868c2578b1..5493891693df 100644
--- a/dev-db/lmdb/lmdb-0.9.14.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.14.ebuild
@@ -37,15 +37,15 @@ src_configure() {
 }
 
 src_compile() {
-	emake LDLIBS+=" -pthread"
+	emake LDLIBS+=" -pthread" || die
 }
 
 src_install() {
-	mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+	mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1} || die
 	default
 
 	mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
 	dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
 
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+	use static-libs || rm "${D}"/usr/$(get_libdir)/liblmdb.a || die
 }
diff --git a/dev-db/lmdb/lmdb-0.9.15.ebuild b/dev-db/lmdb/lmdb-0.9.15.ebuild
index aebd820f7912..212d1840c0fe 100644
--- a/dev-db/lmdb/lmdb-0.9.15.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.15.ebuild
@@ -36,15 +36,15 @@ src_configure() {
 }
 
 src_compile() {
-	emake LDLIBS+=" -pthread"
+	emake LDLIBS+=" -pthread" || die
 }
 
 src_install() {
-	mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+	mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1} || die
 	default
 
 	mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
 	dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
 
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+	use static-libs || rm "${D}"/usr/$(get_libdir)/liblmdb.a || die
 }
diff --git a/dev-db/lmdb/lmdb-0.9.16.ebuild b/dev-db/lmdb/lmdb-0.9.16.ebuild
index aebd820f7912..212d1840c0fe 100644
--- a/dev-db/lmdb/lmdb-0.9.16.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.16.ebuild
@@ -36,15 +36,15 @@ src_configure() {
 }
 
 src_compile() {
-	emake LDLIBS+=" -pthread"
+	emake LDLIBS+=" -pthread" || die
 }
 
 src_install() {
-	mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+	mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1} || die
 	default
 
 	mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
 	dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
 
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+	use static-libs || rm "${D}"/usr/$(get_libdir)/liblmdb.a || die
 }
diff --git a/dev-db/lmdb/lmdb-0.9.17.ebuild b/dev-db/lmdb/lmdb-0.9.17.ebuild
new file mode 100644
index 000000000000..13bcb4a8443f
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.17.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="http://symas.com/mdb/"
+SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+# =net-nds/openldap-2.4.40 installs lmdb files.
+RDEPEND="!=net-nds/openldap-2.4.40"
+
+S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
+
+src_prepare() {
+	sed -i -e "s/^CC.*/CC = $(tc-getCC)/" \
+		-e "s/^CFLAGS.*/CFLAGS = ${CFLAGS}/" \
+		-e "s/^AR.*/AR = $(tc-getAR)/" \
+		-e "/mkdir/s:lib:$(get_libdir):" \
+		-e "/for f/s:lib:$(get_libdir):" \
+		-e "s:prefix)/man:mandir):" \
+		-e "s:shared:shared -Wl,-soname,liblmdb.so.0:" \
+		"${S}/Makefile" || die
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	emake LDLIBS+=" -pthread" || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" prefix="${EROOT}usr" mandir="${EROOT}usr/share/man" install || die
+
+	mv "${ED}"usr/$(get_libdir)/liblmdb.so{,.0} || die
+	dosym liblmdb.so.0 "${EROOT}"usr/$(get_libdir)/liblmdb.so
+
+	use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die
+}