Revert "dev-db/lmdb: remove old"

Dropped needed lmdb-fix-cursor-delete.patch.

This reverts commit cadb31d625fd6c5a8b6dbd37f04fd2897b934c2b.

Signed-off-by: Sam James <sam@gentoo.org>

6 files changed, 348 insertions, 0 deletions

diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index ccab97d2dad3..526775f840ff 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,2 +1,6 @@
+DIST LMDB_0.9.23.tar.gz 143813 BLAKE2B 252acad974a7ed528fe0e52b8332845bc0b6076599bbc79ef2c3f41459acb6ccbe5f6030c6a258fe30633c4c0568fa05fa6d46dc05bab3f93ee3aab16e6faa89 SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120
+DIST LMDB_0.9.24.tar.gz 143916 BLAKE2B f075ec5f4dfb77685188229e20f12c4febe8295c7d35ed15c3db492b68af68cc7f76741078e9bb524d2c38587839f542e964af1e5d6d984bb28bd602caabbb8d SHA512 c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1
+DIST openldap-LMDB_0.9.26.tar.gz 144029 BLAKE2B 07fe81cdaed7a402aaf485a2aa41d12c2c8cc8813d39d5304d8a1f5c8920f4695021eb586b4366a5f55010284227c7ac16487a8799c60f251ea97cd745b1261a SHA512 d7826f6d1a3144feb71eef65f843e8bcddf6cec384014bab3fc1d32a7f1b9316bcbb5b3a915b166cbdae2ffbd15f14b4eb783acd7eddbd2e321607f750efe94d
+DIST openldap-LMDB_0.9.27.tar.gz 144104 BLAKE2B 76b7b66ca455f61f71b7c010de0b5437d02a245a5129184cf45bf5684a745888c88012fb73a219076b6c47adfda0804e6c7f603e4631c98034c01efda99ad3a9 SHA512 a27c0d26c801b172f3c207666940f86ecaae9d223843b72823d064f0ea0629a855150d049cb143981783710d3ca791c7f0f65df9d91732b2709e6107af403854
 DIST openldap-LMDB_0.9.28.tar.gz 144520 BLAKE2B 3466da1ffde7350056fb3b16fc0068d78139c578fdf79cd6456ca0d98e2d7b3d899849ae42a7224335a4680e52b5f0feb2c4233eaf00ee3d9ee648ae10c3114a SHA512 0cdf9a2ce35617a3135cde96491fbbb73be9362de2b94d23eda44b65ce48362ff9dbdfe921c3255ed486aceb385fcb62b81f560b1037476f4741291b29ba0dce
 DIST openldap-LMDB_0.9.29.tar.gz 144545 BLAKE2B b7e55e4fa03e878a95b8f7c583684727a81d51a3acf2ec064d8fe26475bf9ffe4dddf16c2bccbda901b94b7c8d57f41fa63f7c09bcab46401bd000958a5b87b3 SHA512 b41ba5b139375d23617a79f4d322399df55745c5a4a63159ddbe0f1ded4707f0eb7f71acf3d1a4928f8fcab30a7b5db17e3e165441a61ec1dbd29f8d9efa65d1
diff --git a/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch b/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch
new file mode 100644
index 000000000000..fd76be1bb796
--- /dev/null
+++ b/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch
@@ -0,0 +1,48 @@
+From 40585b483976d9062e6c971df285f911512ecd5e Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Tue, 9 Feb 2021 23:38:06 +0000
+Subject: [PATCH] ITS#9461 refix ITS#9376
+
+Was setting C_DEL flag gratuitously
+---
+ libraries/liblmdb/mdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
+index 621cbcfa..e6cae8ed 100644
+--- a/mdb.c
++++ b/mdb.c
+@@ -8527,10 +8527,10 @@ mdb_cursor_del0(MDB_cursor *mc)
+ 					}
+ 					m3->mc_xcursor->mx_cursor.mc_flags |= C_DEL;
+ 				}
+-				m3->mc_flags |= C_DEL;
+ 			}
+ 		}
+ 	}
++	m3->mc_flags |= C_DEL;
+ 
+ fail:
+ 	if (rc)
+From f9c5b46651c4ecd699643c4d90bb3ab7725a6167 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Thu, 11 Feb 2021 11:34:57 +0000
+Subject: [PATCH] ITS#9461 fix typo
+
+---
+ libraries/liblmdb/mdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
+index e6cae8ed..4062664b 100644
+--- a/mdb.c
++++ b/mdb.c
+@@ -8530,7 +8530,7 @@ mdb_cursor_del0(MDB_cursor *mc)
+ 			}
+ 		}
+ 	}
+-	m3->mc_flags |= C_DEL;
++	mc->mc_flags |= C_DEL;
+ 
+ fail:
+ 	if (rc)
diff --git a/dev-db/lmdb/lmdb-0.9.23.ebuild b/dev-db/lmdb/lmdb-0.9.23.ebuild
new file mode 100644
index 000000000000..a3f04ec4d48c
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.23.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="https://symas.com/lmdb/technical/"
+SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
+
+src_prepare() {
+	eapply_user
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
+		# posix_memalign isn't available before 10.6, but on OSX
+		# malloc is always aligned for any addressable type
+		sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
+	fi
+	multilib_copy_sources
+}
+
+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
+		# fdatasync lives in -lrt on Solaris 10
+		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
+	fi
+}
+
+multilib_src_compile() {
+	emake LDLIBS+=" -pthread"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
+		"${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
+	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}/lmdb.pc"
+	sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
+		-e "s!@prefix@!${EPREFIX}/usr!g" \
+		-e "s!@libdir@!$(get_libdir)!" \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
+	fi
+}
diff --git a/dev-db/lmdb/lmdb-0.9.24.ebuild b/dev-db/lmdb/lmdb-0.9.24.ebuild
new file mode 100644
index 000000000000..47e317b2c8a7
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.24.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+MY_P="${PN^^}_${PV}"
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="https://symas.com/lmdb/technical/"
+SRC_URI="https://github.com/LMDB/lmdb/archive/${MY_P}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_P}/libraries/liblmdb"
+
+src_prepare() {
+	default
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
+		# posix_memalign isn't available before 10.6, but on OSX
+		# malloc is always aligned for any addressable type
+		sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
+	fi
+	multilib_copy_sources
+}
+
+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
+		# fdatasync lives in -lrt on Solaris 10
+		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
+	fi
+}
+
+multilib_src_compile() {
+	emake LDLIBS+=" -pthread"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
+		"${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
+	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}/lmdb.pc"
+	sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
+		-e "s!@prefix@!${EPREFIX}/usr!g" \
+		-e "s!@libdir@!$(get_libdir)!" \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
+	fi
+}
diff --git a/dev-db/lmdb/lmdb-0.9.26.ebuild b/dev-db/lmdb/lmdb-0.9.26.ebuild
new file mode 100644
index 000000000000..610df78af69d
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.26.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+MY_P="${PN^^}_${PV}"
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="https://symas.com/lmdb/technical/"
+SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-${MY_P}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/openldap-${MY_P}/libraries/liblmdb"
+
+src_prepare() {
+	default
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
+		# posix_memalign isn't available before 10.6, but on OSX
+		# malloc is always aligned for any addressable type
+		sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local soname="-Wl,-soname,liblmdb$(get_libname 0)"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
+		replace-flags -O[123456789] -O1
+	fi
+	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
+		# fdatasync lives in -lrt on Solaris 10
+		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
+	fi
+}
+
+multilib_src_compile() {
+	emake LDLIBS+=" -pthread"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
+		"${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
+	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}/lmdb.pc"
+	sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
+		-e "s!@prefix@!${EPREFIX}/usr!g" \
+		-e "s!@libdir@!$(get_libdir)!" \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
+	fi
+}
diff --git a/dev-db/lmdb/lmdb-0.9.27.ebuild b/dev-db/lmdb/lmdb-0.9.27.ebuild
new file mode 100644
index 000000000000..610df78af69d
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.27.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+MY_P="${PN^^}_${PV}"
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="https://symas.com/lmdb/technical/"
+SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-${MY_P}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/openldap-${MY_P}/libraries/liblmdb"
+
+src_prepare() {
+	default
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
+		# posix_memalign isn't available before 10.6, but on OSX
+		# malloc is always aligned for any addressable type
+		sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local soname="-Wl,-soname,liblmdb$(get_libname 0)"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
+		replace-flags -O[123456789] -O1
+	fi
+	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
+		# fdatasync lives in -lrt on Solaris 10
+		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
+	fi
+}
+
+multilib_src_compile() {
+	emake LDLIBS+=" -pthread"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
+		"${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
+	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}/lmdb.pc"
+	sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
+		-e "s!@prefix@!${EPREFIX}/usr!g" \
+		-e "s!@libdir@!$(get_libdir)!" \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc || die
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
+	fi
+}