4 files changed, 28 insertions, 11 deletions
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index dfe8dc68e960..ffab61934f1f 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,8 +1,10 @@
 AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e318717c27692639196884405b0b6ed8e32e056afeda2040f651d26ff1607e69e7f482d023c2b98b7c080b67f3392b2 SHA512 fd033d7de3a1bc53c10115fd27d7001ce1b376126c11f934adf8a25c9df195754835fd707f40c540539553c091fa196115e02bb56cc41702a12a1d4fb1724a52
+AUX gdbm-1.20-uclibc-types.patch 397 BLAKE2B 35357a83086cb3028dad05622d66d0500e94796441de167260475c9159d4a67c1730d7e2db1a4686c3cc757d678c5a0eb7061d61bb43403319cb074f3a0d74bb SHA512 10e2bd4c6d4055df067e63c9d3e2fc6837bfd58f44d4e6ffa827272cbe95fe33b59db7791c44510a26f0131f8b58e19e514402f687418eb30d810c45deffe505
 DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495
 DIST gdbm-1.20.tar.gz 987628 BLAKE2B b0e01e63714b0485f9ac28f4a2260bf9309d2b3a87f6ccf6c9901619d383b6527d068b8614220eb6a6dec909fbf3fab5162a6c67bb928cfedaef36f1df26d0df SHA512 5f2fbd4318259e5b879ea2bff09e22defbb4e566ebbe11c44ac5b5369fd00745d7ed9f72ec1206153027eba245c4ee4a515a8ec6d67f84ec477483e72753590b
+DIST gdbm-1.21-gettext-ac.patch.gz 7142 BLAKE2B 1cb4eed1dbea047e115b13831ab2c6af9b639c48324c83b60ee926e7731a4b59fb779aaea8508d12fd5e5d64328464768a153135a555c1783086e4d1e981d86f SHA512 714dc008b5d5a5882f13c8bfc889e04a0b2c142a06ffe479f3ba3b21e8d6f08f579d1b111237ad9e1987d9aae27f67b4689aa3cd664c2adadb1bb856497ed3f8
 DIST gdbm-1.21.tar.gz 1005982 BLAKE2B 1f9b04507601b9660a9a81edc29e9b7c0d9adececf21e372670bcf1acf3d0551d858af3e7cf9202b460691cc851ca6dfcc5014ae28161b06f31c9442d3a9fe96 SHA512 b2a31802d1af9f97b24d3dd01cb048bab4a8e748297f1b70851c0342400dde4281242b7f80bd92a36035e22398d240d131b550ab444ee838a077522a6921fa43
 EBUILD gdbm-1.19.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69
-EBUILD gdbm-1.20.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69
-EBUILD gdbm-1.21.ebuild 1324 BLAKE2B 77e8e86bf88a87d704be53ce285af647b99d890270e5c52a30aa068f32ac35b65e77ffad715568b8285415d3eb78d2b22f8bbdb78310d080dc77c5293e73a4dc SHA512 2a8b8ea03dfa2ea968ae315076906db407c0b7edd955f8909bf07771a2238d9abc175db380c585cc171c9f034bdc65827de0e774affb4ed4f25e6e32b48114a9
+EBUILD gdbm-1.20.ebuild 1381 BLAKE2B 230dad65e7f400ba7afcaf99c641eb2129410fd7c520665515e0732c61485ad4cc30990ad1cefafaab1817c50ebd29c167487ecbe04e71311dd86d0c9d677907 SHA512 ddb05fa235a592c9e358920cd2822d5773b81e9219af10c8d336aad86b76e07e0deb858760922c82288a791d853de1d4adedde982f6670d2183e169e416cffcd
+EBUILD gdbm-1.21.ebuild 1358 BLAKE2B 9a315c2ea0cdb2bcc47b6d84c01b4a777e285ba9a05bc9c9f0bc45b54af8284ed1b105cc9f9c2d2e3cef7a0c1709d8f5da99abf429c094fdcc74542e52209341 SHA512 67c5bea17da109a18928146ef3e4dfdde2669b9429c9c6c729c17fa312547c02afc492083ddaf94b6a553303db965d572607a8a63d2204f81695f32e02496258
 MISC metadata.xml 359 BLAKE2B f58b008f8cd663d499052f6d3ea0f658b3816d28c044a4fb8a341a8ce7382104962f58b5ba881bb1dcfc8835cbfc22782471eb48088c547706caa63c35e21e97 SHA512 12da6a0492c269ebff68bf1b1d5ea44b9e011a9197c353157da04283fe865ffff01d6f6c28ecc73b5985ec39959c1c7911b2aa5c3e905929f41521b7cae0b169
diff --git a/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch b/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch
new file mode 100644
index 000000000000..448ce9fbbddc
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/808480
+
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Wed, 7 Jul 2021 09:36:22 +0300
+Subject: Fix https://puszcza.gnu.org.ua/bugs/?515
+
+* src/gdbm.h.in: Include sys/types.h
+--- a/src/gdbm.h.in
++++ b/src/gdbm.h.in
+@@ -30,6 +30,7 @@
+ # define _GDBM_H_
+ 
+ # include <stdio.h>
++# include <sys/types.h>
+ 
+ /* GDBM C++ support */
+ # if defined(__cplusplus) || defined(c_plusplus)
diff --git a/sys-libs/gdbm/gdbm-1.20.ebuild b/sys-libs/gdbm/gdbm-1.20.ebuild
index a6fc57b2a1d8..1658e3a497be 100644
--- a/sys-libs/gdbm/gdbm-1.20.ebuild
+++ b/sys-libs/gdbm/gdbm-1.20.ebuild
@@ -20,7 +20,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838
+	"${FILESDIR}"/${PN}-1.18.1-gettext.patch # bug #696838
+	"${FILESDIR}"/${PN}-1.20-uclibc-types.patch # bug #808480
 )
 
 src_prepare() {
diff --git a/sys-libs/gdbm/gdbm-1.21.ebuild b/sys-libs/gdbm/gdbm-1.21.ebuild
index 36ea91f14e6d..6f0257fa15b7 100644
--- a/sys-libs/gdbm/gdbm-1.21.ebuild
+++ b/sys-libs/gdbm/gdbm-1.21.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Standard GNU database libraries"
 HOMEPAGE="https://www.gnu.org/software/gdbm/"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
+SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
+	https://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.21-gettext-ac.patch.gz
+"
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
@@ -20,14 +22,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838
+	"${WORKDIR}"/${PN}-1.21-gettext-ac.patch #696838 #811303
 )
 
-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