subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-libs\/gdbm\/, sys\-libs\/gdbm\/files\/"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

2021-12-31 Thread David Seifert

commit: 91122008001945cd9853c1d2e36e2e66426d86c0
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec 31 23:02:03 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec 31 23:02:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91122008

sys-libs/gdbm: drop 1.20, 1.21

Signed-off-by: David Seifert  gentoo.org>

 sys-libs/gdbm/Manifest   |  3 --
 sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch| 12 --
 sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch | 17 
 sys-libs/gdbm/gdbm-1.20.ebuild   | 53 
 sys-libs/gdbm/gdbm-1.21.ebuild   | 49 --
 5 files changed, 134 deletions(-)

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index d966b222643a..32567a6b6fb8 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,4 +1 @@
-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
 DIST gdbm-1.22.tar.gz 1090100 BLAKE2B 
f27c65e8cc7c71fc4f4a119b92e1d1b2068c1ec87456d5a555879dc23654ad4e7cf8172049aa9f4f9c432cc7140ff61fc36ddf6d5e45c321add67a105754a59c
 SHA512 
67461fc4f41e825d0134175ff99c913ccb4aa7ea3d0f64f32bdedbc7677b3ecabd2c525ac6b2ee47a9561e002e4224e492b72088d57bb4862a1f8c089521ec51

diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch 
b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
deleted file mode 100644
index 2f0c0c450733..
--- a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.0 +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/files/gdbm-1.20-uclibc-types.patch 
b/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch
deleted file mode 100644
index 448ce9fbbddc..
--- a/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/808480
-
-From: Sergey Poznyakoff 
-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 
-+# include 
- 
- /* 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
deleted file mode 100644
index 1658e3a497be..
--- a/sys-libs/gdbm/gdbm-1.20.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="https://www.gnu.org/software/gdbm/;
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+berkdb nls +readline static-libs"
-
-DEPEND="
-   readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.18.1-gettext.patch # bug #696838
-   "${FILESDIR}"/${PN}-1.20-uclibc-types.patch # bug #808480
-)
-
-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
-
-   local myeconfargs=(
-   --includedir="${EPREFIX}"/usr/include/gdbm
-   $(use_enable berkdb libgdbm-compat)
-   $(use_enable nls)
-   $(use_enable static-libs static)
-   $(use_with

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

2021-06-06 Thread David Seifert

commit: 7ba9d678f443ba11c840254750b06b003e8904f1
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jun  6 15:41:35 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jun  6 15:41:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba9d678

sys-libs/gdbm: drop 1.18.1-r1

Signed-off-by: David Seifert  gentoo.org>

 sys-libs/gdbm/Manifest   |  1 -
 sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch | 40 -
 sys-libs/gdbm/gdbm-1.18.1-r1.ebuild  | 53 
 3 files changed, 94 deletions(-)

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 18e52567aea..17eea7760c5 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,2 +1 @@
-DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B 
b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7
 SHA512 
adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
 DIST gdbm-1.19.tar.gz 967861 BLAKE2B 
92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b
 SHA512 
118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495

diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch 
b/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch
deleted file mode 100644
index 9b3e3d736c1..000
--- a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ab05ea727942b5c1469e2e86548581264c6e2de4 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich 
-Date: Sat, 2 May 2020 12:39:39 +0100
-Subject: [PATCH] gdbm: fix link failure against gcc-10
-
-Before the change on gcc-10 link failed as:
-```
-  CCLD gdbmtool
-ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of 
`parseopt_program_args';
-  gdbmtool.o:(.data.rel.local+0x260): first defined here
-ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of 
`parseopt_program_doc';
-  gdbmtool.o:(.data.rel.local+0x268): first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The fix is to avoid multiple definition and rely on
-declarations only.
-
-Bug: https://bugs.gentoo.org/705898
-Signed-off-by: Sergei Trofimovich 

- src/parseopt.c | 2 --
- 1 file changed, 2 deletions(-)
-
 a/src/parseopt.c
-+++ b/src/parseopt.c
-@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, 
size_t rmargin)
- }
- 
- char *parseopt_program_name;
--char *parseopt_program_doc;
--char *parseopt_program_args;
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
- void (*parseopt_help_hook) (FILE *stream);
- 
--- 
-2.26.2
-

diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild 
b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
deleted file mode 100644
index 87ad4ca3a37..000
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="https://www.gnu.org/software/gdbm/;
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+berkdb nls +readline static-libs"
-
-DEPEND="
-   readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.18.1-gcc-10.patch
-   "${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838
-)
-
-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
-
-   local myeconfargs=(
-   --includedir="${EPREFIX}"/usr/include/gdbm
-   $(use_enable berkdb libgdbm-compat)
-   $(use_enable nls)
-   $(use_enable static-libs static)
-   $(use_with readline)
-   )
-   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-   einstalldocs
-
-   if ! use static-libs ; then
-   find "${ED}" -name '*.la' -delete || die
-   fi
-   mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
-}

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

2020-05-02 Thread Sergei Trofimovich

commit: 1265f8991883546f19b9d3a58e6cedf1c0ce4465
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat May  2 11:45:49 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat May  2 11:46:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1265f899

sys-libs/gdbm: tweak for gcc-10, bug #705898

Closes: https://bugs.gentoo.org/705898
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch | 40 
 sys-libs/gdbm/gdbm-1.18.1.ebuild |  2 ++
 2 files changed, 42 insertions(+)

diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch 
b/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch
new file mode 100644
index 000..9b3e3d736c1
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch
@@ -0,0 +1,40 @@
+From ab05ea727942b5c1469e2e86548581264c6e2de4 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Sat, 2 May 2020 12:39:39 +0100
+Subject: [PATCH] gdbm: fix link failure against gcc-10
+
+Before the change on gcc-10 link failed as:
+```
+  CCLD gdbmtool
+ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of 
`parseopt_program_args';
+  gdbmtool.o:(.data.rel.local+0x260): first defined here
+ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of 
`parseopt_program_doc';
+  gdbmtool.o:(.data.rel.local+0x268): first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The fix is to avoid multiple definition and rely on
+declarations only.
+
+Bug: https://bugs.gentoo.org/705898
+Signed-off-by: Sergei Trofimovich 
+---
+ src/parseopt.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/src/parseopt.c
 b/src/parseopt.c
+@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, 
size_t rmargin)
+ }
+ 
+ char *parseopt_program_name;
+-char *parseopt_program_doc;
+-char *parseopt_program_args;
+ const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
+ void (*parseopt_help_hook) (FILE *stream);
+ 
+-- 
+2.26.2
+

diff --git a/sys-libs/gdbm/gdbm-1.18.1.ebuild b/sys-libs/gdbm/gdbm-1.18.1.ebuild
index 5ed06c51213..5b38687c43c 100644
--- a/sys-libs/gdbm/gdbm-1.18.1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1.ebuild
@@ -19,6 +19,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=("${FILESDIR}"/${PN}-1.18.1-gcc-10.patch)
+
 src_prepare() {
default
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

2018-08-06 Thread Guilherme Amadio

commit: 69c474500c921c4097c38479674ef6deb83ccfd7
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Mon Aug  6 07:46:38 2018 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Mon Aug  6 09:34:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c47450

sys-libs/gdbm: fix compilation with clang, bug #662840

Closes: https://bugs.gentoo.org/662840
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch | 11 +++
 sys-libs/gdbm/gdbm-1.17.ebuild   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch 
b/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch
new file mode 100644
index 000..434aed59952
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch
@@ -0,0 +1,11 @@
+--- /src/gdbmsync.c.orig   2018-08-05 14:37:18.000116786 +0200
 /src/gdbmsync.c2018-08-05 14:37:39.666117321 +0200
+@@ -28,7 +28,7 @@
+ gdbm_sync (GDBM_FILE dbf)
+ {
+   /* Return immediately if the database needs recovery */ 
+-  GDBM_ASSERT_CONSISTENCY (dbf, );
++  GDBM_ASSERT_CONSISTENCY (dbf, GDBM_NEED_RECOVERY);
+ 
+   /* Initialize the gdbm_errno variable. */
+   gdbm_set_errno (dbf, GDBM_NO_ERROR, FALSE);}

diff --git a/sys-libs/gdbm/gdbm-1.17.ebuild b/sys-libs/gdbm/gdbm-1.17.ebuild
index fa77f1fe956..db39c5da570 100644
--- a/sys-libs/gdbm/gdbm-1.17.ebuild
+++ b/sys-libs/gdbm/gdbm-1.17.ebuild
@@ -19,6 +19,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/gdbm-1.17-fix-gdbmsync.patch )
+
 src_prepare() {
default
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

2018-01-02 Thread Thomas Deutschmann

commit: 2a21f609aeffc23219b35a5546e543111b709ff7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jan  2 22:10:43 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jan  2 22:10:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a21f609

sys-libs/gdbm: Fix building with USE flag "exporter"

Ebuild changes:
===
- Patch: Add patch to fix build with --enable-gdbm-export. [Bug 625302] [Link 1]

- Already introduced a sub slot to help upgrading to 1.14 later. [Bug 643188]

Link 1: 
http://git.gnu.org.ua/cgit/gdbm.git/commit/?id=272713d611c55effeaf1d2b45fbb2c69d70e4c74
Closes: https://bugs.gentoo.org/625302
Bug: https://bugs.gentoo.org/643188
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...bm-1.13-fix-build-with-enable-gdbm-export.patch | 57 ++
 .../{gdbm-1.13-r1.ebuild => gdbm-1.13-r2.ebuild}   |  5 +-
 2 files changed, 60 insertions(+), 2 deletions(-)

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 000..eb229f7261c
--- /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 
+Date: Sat, 23 Dec 2017 21:27:20 +
+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  
++Jakub Bogusz
+ Matthew Burgess   
+ Tanaka Akira  
+-Thomas Klausner   
+\ No newline at end of file
++Thomas Klausner   
+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 
+ 
+ /* 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 
+ 
++#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-r1.ebuild 
b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
similarity index 93%
rename from sys-libs/gdbm/gdbm-1.13-r1.ebuild
rename to sys-libs/gdbm/gdbm-1.13-r2.ebuild
index 022e74618c7..84c0aeb6a4c 100644
--- a/sys-libs/gdbm/gdbm-1.13-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
 
 LICENSE="GPL-3"
-SLOT="0"
+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"
 
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}"/gdbm-1.13-fix-a-typo-in-gdbm.h.patch
+   "${FILESDIR}"/gdbm-1.13-fix-build-with-enable-gdbm-export.patch
 )
 
 EX_S="${WORKDIR}/${EX_P}"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

2017-10-13 Thread Thomas Deutschmann

commit: dafbc798a1d73b3f625a9119334f16774db1c601
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct 13 11:18:18 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 13 12:17:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dafbc798

sys-libs/gdbm: Fix a typo in gdbm.h

Closes: https://bugs.gentoo.org/612530
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 .../files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch | 21 +++
 sys-libs/gdbm/gdbm-1.13-r1.ebuild  | 70 ++
 2 files changed, 91 insertions(+)

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 000..f3b96e9be2c
--- /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 
+Date: Fri, 14 Apr 2017 07:48:35 +
+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/gdbm-1.13-r1.ebuild 
b/sys-libs/gdbm/gdbm-1.13-r1.ebuild
new file mode 100644
index 000..022e74618c7
--- /dev/null
+++ b/sys-libs/gdbm/gdbm-1.13-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 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"
+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}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/gdbm-1.13-fix-a-typo-in-gdbm.h.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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/

6 matches

Site Navigation

Mail list logo

Footer information