Add sys-libs/gdbm-1.13-r2

4 files changed, 157 insertions, 0 deletions

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 5f979249..5d6b706c 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,4 +1,6 @@
 AUX gdbm-1.11-variable_unset.patch 424 SHA256 fc1d76a1efbf233ca31f60b20a88a13b9b59338293f13e2c8f848403af43013c SHA512 b4eadb40ed028b5ec3e7e09c05220c6e1e945602b4385231dae063f1447c0353b514cd99177513f9f22e494ff40de2839147ac38f2a819191fe71232f038e627 WHIRLPOOL d4464bc561acf851ac062595088f2102ce381fa4866b5f910c28bb4f878f7b500a7e0d5e8aa3a71bed59f126bda92a725dc1207773f96bc28705fc5edcc4cecc
+AUX gdbm-1.13-fix-a-typo-in-gdbm.h.patch 657 SHA256 0a8c4e7dc38132160acb9a165dd419e7895807ae74c707982649603405dc599d SHA512 bb31f6043184f02f9b0735d8827d09de77367bac489296805a963c01963a70c60dea8efb4a4a00c254019bf438f0c54159b3097c276185367f0064fe119544a1 WHIRLPOOL 2be881d59154a217017c20cbf88e851f05c947dcc8928602bfb5e05568dd1155d79e96cda20511ba9b0299a9d3209b9d568f5f1360ad0fbdd713fde4bd58f9f0
+AUX gdbm-1.13-fix-build-with-enable-gdbm-export.patch 1568 SHA256 f86938b75daa4fd180728c24ce4d2d2395271d13d0c98bd548ff95d73df83f1f SHA512 8bd5308a95abb7df3dd8edc63eba5c8830a6f4aa47066ac644cf5ec19767bcd97618834c598fbc1603093a8e1516b4ef325afe2a68b001d5353d2e4247d562a2 WHIRLPOOL e271713341e067ab54b49845e0b4b793cc41896075ed2e57012446fa09b69ca1fb922567371028442d801f7b723985d225cd351654c4d765fe81c15b508c9ea6
 AUX gdbm-1.8.3-build.patch 691 SHA256 be5b2a90e85bdfd1c2e24937510f303ed06def19ba074be502a9edc9c3eff4ca SHA512 36966cc1bf703ef891a24185846b3514d8a767555f1577906566d96cea18b7f007fdd960b027db09e1eafbad14c3a763fd695a71e07af6fa2a51f99ceea0b685 WHIRLPOOL a2d768c16bcd276665bf4a252eaf48c3fe5061038d0471b107edbe2799dc04613e4eaf54edd8b9c35fbd59693bb70b179bd87ea7fa00563384e6970f9b4fc6a7
 AUX gdbm-1.8.3-compat-linking.patch 611 SHA256 832cfffff5d1cb26cf3f2618014e8e1ff4d30153f34abda8db074788abef7dac SHA512 b8a6d2afa27c273710d5d1a7273d8f78f4068e3e89f3c24e304cc4e677a7f91c01a37f7db67cb0859266a4ddad1042cbab6c25f431efa130f348428a8bdbf193 WHIRLPOOL fcdfc61d44ea4bec721b86847c304dce83a708503bf12561f4b6afd1475d277963d6df3f70ea2a9e403bc6f78d7d7cbc41f7d0b4efd7394966320e63f77ee28f
 AUX gdbm-1.8.3-fix-install-ownership.patch 1567 SHA256 e08df8b252176475c47615fbe87e554fc7391b29192131aba03e91f687a8076c SHA512 4a96fd90775aa12a88d3d0c426389f61196c6d9b8191d8985eb71b69ce52778ebb4f0b163f67d0daedd6d19cd27be7faa19e330cf6714d08a530454f2a4427dc WHIRLPOOL d5bcbe3e012869b5c7f471f3f00c57d6e39333b1fd7382e1dbb652f8291946133bda764f3cf444a0e22f096a679c1fcce21042c9ed77928122a7aaf4387a04bb
@@ -9,4 +11,5 @@ DIST gdbm-1.13.tar.gz 891987 SHA256 9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d
 DIST gdbm-1.8.3.tar.gz 228695 SHA256 cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9 SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7 WHIRLPOOL 9d2e402b2ec00cadfc64e40d87da095f293f157386abbe9a64ebe8b7a2af9b965546805826ffe3d5c88212dec0628ab2ae3ebef91de2da7fc69d0937d03d7075
 EBUILD gdbm-1.11.ebuild 1988 SHA256 3a524c5605600db36d378db0c7ce24b5d34f255dcbe90943ac350ae507885681 SHA512 f9c8a6fafb20dcec354906d4fea2dbfaba479f43b1ee7714ebad351bd1260b1f25dc9dd664a430ccf97d445f95ea785e477961796ac920196e24859e47e4dbb6 WHIRLPOOL 10235287a884b36994e21ebbffbd811497d6612b97befb98de3c2d437a9a83ff616d082fa7a43727e61f800c5651b4b259e13b32ceaaaf28a926d1d6e64b0259
 EBUILD gdbm-1.12.ebuild 2005 SHA256 24256e25c701b9a6475585746f710eef19fb03baf5f883631e7434ba85077943 SHA512 9e4edcbde214fc567e4f38641a1923c3d3afa48122e31a86bde8edcfb30fc27d69bee7db0aede1da04d50e772cb502eeedde1175c723ce994153973198b1cf31 WHIRLPOOL 1d87febc30e2cb1d707186e5b4a81311c18dab3a045d891d197a63707c7f7b7c773510b20e94519c0fbd92800749c0e8a94d4d1fc808d3046e92e03cd74e78c7
+EBUILD gdbm-1.13-r2.ebuild 2073 SHA256 88a1a548231f9fab858b069f1dfbd5fe83d1fddd6bd4451f05ad9cdc21c60923 SHA512 a42fb36c6bfad92a04ae06b2805a56ff8d132fd1d9a88407e4d90442581890f8cc1fa00cadb1da4097f2b195c396dbd379245172f592798d5e5f1aad255f12a1 WHIRLPOOL 63721037d5e45833acbce604967847f28ff643c7067eff5e61a0dc035735bf3e2b90d4e8e2be2cce64a2dff2bd8036de70ea342e0a905efe121e54aa6d4dacaf
 EBUILD gdbm-1.13.ebuild 2058 SHA256 54b1b9f2a26fcee12c4d850fd1a1f0b1f2395b541727332ab61f34e04f684bdb SHA512 43489f9ff4b0b66d141f2115dfd7047dc89fd1cfc730acd52f43d86f075aa8361ca5acb537d45aa6ccebb3e274bfccf7f3a10d1710d48374962029a6e459432e WHIRLPOOL bc94b4e2176c6f1ab1d743f13971ae69db15303e5af88d3035bb9718e0f47c9d70799476a796362316bb20c1715fa8ec1f88ad9bf0454cd75c117f0a04f489a4
diff --git a/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch b/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch
new file mode 100644
index 00000000..f3b96e9b
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch
@@ -0,0 +1,21 @@
+From 1e0b3f4556f88013a2268bb2ef0c8d4bfaa40f90 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org.ua>
+Date: Fri, 14 Apr 2017 07:48:35 +0000
+Subject: Fix a typo
+
+---
+diff --git a/src/gdbm.h.in b/src/gdbm.h.in
+index e9b7b1b..de0d2b9 100644
+--- a/src/gdbm.h.in
++++ b/src/gdbm.h.in
+@@ -224,7 +224,7 @@ extern int gdbm_copy_meta (GDBM_FILE dst, GDBM_FILE src);
+ # define _GDBM_MAX_ERRNO	GDBM_DIR_OVERFLOW
+ 
+ /* This one was never used and will be removed in the future */
+-# define GDBM_UNKNOWN_UPDATE GDBM_ERR_UNKNOWN_ERROR
++# define GDBM_UNKNOWN_UPDATE GDBM_UNKNOWN_ERROR
+   
+ typedef int gdbm_error;
+ extern gdbm_error gdbm_errno;
+--
+cgit v0.9.0.3
diff --git a/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch b/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch
new file mode 100644
index 00000000..eb229f72
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch
@@ -0,0 +1,57 @@
+From 272713d611c55effeaf1d2b45fbb2c69d70e4c74 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Sat, 23 Dec 2017 21:27:20 +0000
+Subject: Fix build with --enable-gdbm-export
+
+* THANKS: Add Jakub Bogusz
+* export/export.c: Define GDBM_EXPORT_18 prior to
+including gdbmexp.c
+* src/gdbmexp.c [GDBM_EXPORT_18]: Define GDBM_SET_ERRNO and
+GDBM_ASSERT_CONSISTENCY.
+---
+diff --git a/THANKS b/THANKS
+index 70cb40f..feb1f87 100644
+--- a/THANKS
++++ b/THANKS
+@@ -5,6 +5,7 @@ suggesting various improvements or submitting actual code. Here is a list
+ of these people. Help us keep it complete and exempt of errors.
+ 
+ Bill Jones              <rj7252@att.com>
++Jakub Bogusz            <qboosh@pld-linux.org>
+ Matthew Burgess		<matthew@linuxfromscratch.org>
+ Tanaka Akira 		<akr@fsij.org>
+-Thomas Klausner		<tk@giga.or.at>
+\ No newline at end of file
++Thomas Klausner		<tk@giga.or.at>
+diff --git a/export/export.c b/export/export.c
+index 39e05d1..ede4858 100644
+--- a/export/export.c
++++ b/export/export.c
+@@ -24,6 +24,7 @@
+ #include <gdbm.h>
+ 
+ /* Pull in gdbm_export() */
++#define GDBM_EXPORT_18
+ #include "gdbmexp.c"
+ 
+ void
+diff --git a/src/gdbmexp.c b/src/gdbmexp.c
+index 457f638..dc46c50 100644
+--- a/src/gdbmexp.c
++++ b/src/gdbmexp.c
+@@ -21,8 +21,13 @@
+ # include "autoconf.h"
+ # include <arpa/inet.h>
+ 
++#ifdef GDBM_EXPORT_18
++# define GDBM_SET_ERRNO(dbf, ec, fatal) gdbm_errno = ec
++# define GDBM_ASSERT_CONSISTENCY(dbf, val)
++#else
+ # include "gdbmdefs.h"
+ # include "gdbm.h"
++#endif
+ 
+ int
+ gdbm_export_to_file (GDBM_FILE dbf, FILE *fp)
+--
+cgit v0.9.0.3
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
new file mode 100644
index 00000000..28e8bb24
--- /dev/null
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib multilib-minimal
+
+EX_P="${PN}-1.8.3"
+DESCRIPTION="Standard GNU database libraries"
+HOMEPAGE="https://www.gnu.org/software/gdbm/"
+SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
+	exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0/1.13"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+berkdb exporter nls +readline static-libs"
+
+DEPEND="
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-1.11-variable_unset.patch
+	"${FILESDIR}"/"${P}"-fix-a-typo-in-gdbm.h.patch
+	"${FILESDIR}"/"${P}"-fix-build-with-enable-gdbm-export.patch
+)
+
+EX_S="${WORKDIR}/${EX_P}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# gdbm doesn't appear to use either of these libraries
+	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
+
+	if multilib_is_native_abi && use exporter ; then
+		pushd "${EX_S}" >/dev/null
+		append-lfs-flags
+		econf --disable-shared
+		popd >/dev/null
+	fi
+
+	local myeconfargs=(
+		--includedir="${EPREFIX}"/usr/include/gdbm
+		--with-gdbm183-libdir="${EX_S}/.libs"
+		--with-gdbm183-includedir="${EX_S}"
+		$(use_enable berkdb libgdbm-compat)
+		$(multilib_native_use_enable exporter gdbm-export)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with readline)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	use exporter && emake -C "${EX_S}" libgdbm.la
+	emake
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+	mv "${ED%/}"/usr/include/gdbm/gdbm.h "${ED%/}"/usr/include/ || die
+}