lmdb and lmdbxx, bump version (#5811)

dev-db/lmdb/lmdb-0.9.28.recipe

@@ -2,11 +2,11 @@ SUMMARY="A database engine"
 DESCRIPTION="LMDB is compact, fast, powerful, and robust and implements \
 a simplified variant of the BerkeleyDB (BDB) API."
 HOMEPAGE="http://symas.com/mdb/"
-COPYRIGHT="2011-2016 Howard Chu, Symas Corp."
+COPYRIGHT="2011-2021 Howard Chu, Symas Corp."
 LICENSE="OpenLDAP Public License"
 REVISION="1"
 SOURCE_URI="https://github.com/LMDB/lmdb/archive/LMDB_$portVersion.tar.gz"
-CHECKSUM_SHA256="44602436c52c29d4f301f55f6fd8115f945469b868348e3cddaf91ab2473ea26"
+CHECKSUM_SHA256="47457d3d3ae2c489b52078a07e9f55ec6e094b48c2204029c7754e2972fe1882"
 SOURCE_DIR="lmdb-LMDB_$portVersion"
 PATCHES="lmdb-$portVersion.patchset"
 
@@ -15,8 +15,10 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
 commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
+	commandBinDir=$prefix/bin
 fi
 
 PROVIDES="
@@ -60,7 +62,7 @@ INSTALL()
 
 	make install \
 		prefix="$prefix" \
-		bindir="$binDir" \
+		bindir="$commandBinDir" \
 		libdir="$libDir" \
 		includedir="$includeDir" \
 		datarootdir="$dataDir" \
@@ -72,5 +74,6 @@ INSTALL()
 
 TEST()
 {
+	cd libraries/liblmdb
 	make test
 }

dev-db/lmdb/patches/lmdb-0.9.28.patchset

@@ -1,4 +1,4 @@
-From 8fa9879adb3d79a76aa0351380c88db9425d97b7 Mon Sep 17 00:00:00 2001
+From 350ad938a0a6b9e9f72386bd5bd1f230380485fe Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sat, 20 May 2017 15:33:40 +0200
 Subject: LMDB: Haiku build fix
@@ -45,18 +45,18 @@ index f254511..0075f9d 100644
  xmdb.o: mdb.c lmdb.h midl.h
  	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@
 diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
-index 23c1f00..46ef302 100644
+index 621cbcf..19e2174 100644
 --- a/libraries/liblmdb/mdb.c
 +++ b/libraries/liblmdb/mdb.c
-@@ -120,7 +120,7 @@ typedef SSIZE_T	ssize_t;
- #include <resolv.h>	/* defines BYTE_ORDER on HPUX and Solaris */
- #endif
- 
--#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__)
-+#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__) || defined(__HAIKU__)
+@@ -127,7 +127,7 @@ typedef SSIZE_T	ssize_t;
+ #if defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1100110
+ # define MDB_USE_POSIX_MUTEX	1
+ # define MDB_USE_ROBUST	1
+-#elif defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__)
++#elif defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__) || defined(__HAIKU__)
  # define MDB_USE_POSIX_SEM	1
  # define MDB_FDATASYNC		fsync
  #elif defined(ANDROID)
 -- 
-2.12.2
+2.30.2
 

dev-db/lmdbxx/lmdbxx-0.9.14.0.recipe

@@ -1,20 +0,0 @@
-SUMMARY="A C++ wrapper for the LMDB database engine"
-DESCRIPTION="LMDBXX is C++ wrapper for the compact, fast, powerful, and robust LMDB"
-HOMEPAGE="https://github.com/drycpp/lmdbxx/releases/download/$portVersion/lmdbxx-$portVersion.tar.gz"
-COPYRIGHT="2015-2016 Arto Bendiken"
-LICENSE="Unlicense"
-REVISION="2"
-SOURCE_URI="https://github.com/drycpp/lmdbxx/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="99ae16599829c7c9dfb396382bb8e774031ca7e839c38e0c5fef124f409f19a2"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	lmdbxx = $portVersion
-	"
-
-INSTALL()
-{
-	mkdir -p $includeDir
-	cp lmdb++.h $includeDir/
-}

dev-db/lmdbxx/lmdbxx-1.0.0.recipe

@@ -6,7 +6,7 @@ COPYRIGHT="2015-2016 Arto Bendiken
 LICENSE="Unlicense"
 REVISION="1"
 SOURCE_URI="https://github.com/hoytech/lmdbxx/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="0ab138ed4ba04ccbc4849088f4fd46cdbde28635e3bda0cd5ff3a39296258e94"
+CHECKSUM_SHA256="5e12eb3aefe9050068af7df2c663edabc977ef34c9e7ba7b9d2c43e0ad47d8df"
 
 ARCHITECTURES="any"