commit: ab4e2d7bbcd2621bf86330ffb992ac840088ee83 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Thu Dec 17 12:14:52 2020 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Thu Dec 17 12:15:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab4e2d7b
sys-libs/gdbm: Allow gettext 0.18 *or later* Closes: https://bugs.gentoo.org/696838 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch | 12 ++++++++++++ sys-libs/gdbm/gdbm-1.18.1-r1.ebuild | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch new file mode 100644 index 00000000000..2f0c0c45073 --- /dev/null +++ b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch @@ -0,0 +1,12 @@ +diff -ruN gdbm-1.18.1.orig/configure.ac gdbm-1.18.1/configure.ac +--- gdbm-1.18.1.orig/configure.ac 2018-10-27 08:46:09.000000000 +0300 ++++ gdbm-1.18.1/configure.ac 2020-12-17 14:12:14.249678303 +0200 +@@ -94,7 +94,7 @@ + + dnl Internationalization macros. + AM_GNU_GETTEXT([external], [need-ngettext]) +-AM_GNU_GETTEXT_VERSION(0.18) ++AM_GNU_GETTEXT_REQUIRE_VERSION(0.18) + + AC_CHECK_HEADERS([sys/file.h sys/termios.h string.h locale.h getopt.h]) + diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild index a4583e1df77..b7c4e924cac 100644 --- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild +++ b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild @@ -19,7 +19,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=("${FILESDIR}"/${PN}-1.18.1-gcc-10.patch) +PATCHES=( + "${FILESDIR}"/${PN}-1.18.1-gcc-10.patch + "${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838 +) src_prepare() { default
