gentoo resync : 03.01.2018

4 files changed, 64 insertions, 5 deletions

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index d4df681e5dea..e430b2387fdf 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,9 +1,10 @@
 AUX gdbm-1.13-fix-a-typo-in-gdbm.h.patch 657 BLAKE2B af19808507b00d941a51756bbc2a48686aad60c0a19626d4b3f549b948254629857eb7ce9a692d790fdf42877de2d6072455b1825347cf9d557e45239088c989 SHA512 bb31f6043184f02f9b0735d8827d09de77367bac489296805a963c01963a70c60dea8efb4a4a00c254019bf438f0c54159b3097c276185367f0064fe119544a1
+AUX gdbm-1.13-fix-build-with-enable-gdbm-export.patch 1568 BLAKE2B 65a841191f362ca94d0b7d1b9df042b5f6b75aaf560aceaa702c8a11e9fa9430deb106aac6a50b211b07c66f9457732ca164352a62fc244fd4e3f2862c69265c SHA512 8bd5308a95abb7df3dd8edc63eba5c8830a6f4aa47066ac644cf5ec19767bcd97618834c598fbc1603093a8e1516b4ef325afe2a68b001d5353d2e4247d562a2
 DIST gdbm-1.11.tar.gz 811662 BLAKE2B 5936aaac753da4aa5e9a103cfb8a50d33d8ff124846c9224f09aead496b9e76c269b17aaca0b96d3c51b0444910f29e4f9f246f858e5ab849917662711732f4b SHA512 272fb65ab9ca0a21e9f0dcfb2c638457e87cbb938c65ee850123474d11f2858496f84d3fa9edca27cd91c7220160cfdb59f90bd46ddc45395514addc9fd4151c
 DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee288364af66fbe1c1cd8662e53f7cb82a208e795a6d27adc048018153671d964ecad518407eb888283e17c5 SHA512 fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad
 DIST gdbm-1.14.tar.gz 893270 BLAKE2B 413b0e866579c697baa8b6ee2412690d3a25aecae1a1bed7b213560a452bf6a41343cabcc5e1c4c3269f796148e7c94782b479790227780e0bd1e8e965eecb87 SHA512 8378920c446f4d343f43af9982acc93be28faf0d6ac709abead03fdd8d47e9ef0226e86179d1e9cdc239c096a11f8d9ccd524747f6114ed9985e1120b8b60c2b
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
 EBUILD gdbm-1.11.ebuild 1887 BLAKE2B 1f6680d070bc540e8e476e0f8abcd46c09b98f4334465b544b4c9ee1e92da3855e792cbc78ddb7f54d1cc2e1c7bf0d619289252647a895b9bb6f7c7d017aa30d SHA512 fb5768d73a8a25cad8e6defeba0dd4ba788a2f339e697054da879b0aa600cfafa18ec5793a255bc5cc3066019c189bdcb43842710588590c2bab1c28c172d5d5
-EBUILD gdbm-1.13-r1.ebuild 1835 BLAKE2B 29c065fd646456fd5a34c6a97fcb0970037944293abfd0490eb7780788bceafa6d8ac83aef406dfec4f4901e946d240fad96485f79c6ce278bdf45c42d7ceef5 SHA512 a9f3a564ebbc6e5b2b539138bc2f4ab018e3a9f773005d3a98a177daca764e1f442c8c6901b2e72439d3d3e11d96087fd698a4e6095d4dcc5a74978e0c07fdde
-EBUILD gdbm-1.14.ebuild 1791 BLAKE2B 21cb2319c43ba0e0fbfde666aaf3d364a706cc85d86d0d2c5e1a725a9ce190aa91616be649e66faf47c1a54af94dc61f6e488aa9692f11280d2383eb9555e360 SHA512 41f9aaf1a9a77d6e512f01f3dbbce94997586137a11546e9c6d0e846c8091c8af0bb1bee11f56c7cb8351ddd561b23681b2ab4a54babea313025b76eeb74ae18
+EBUILD gdbm-1.13-r2.ebuild 1905 BLAKE2B d8e6d998941300c67738f9160a7331bcb0e8cf519577aba7e9e13c31ecab16556d6981eed22d83b96a89e74acfb9f0918d91d79b6a4e0e13f03d4d2a405bb3fd SHA512 060571e75601895c54ffc6742cf26cd8dc2393446d7b931e0ad7c3acf644bdbba5a18eba4bfb1c646f35f4f7f84872d47dfcc08f290162cab5e0cc1b87897638
+EBUILD gdbm-1.14-r1.ebuild 1828 BLAKE2B 35ba1f71d9e4403627dd850abbb2e0de3536efee0c249c95d614a614723643b3f97efcdab6ba29cd1b6504bba464d730783e288a2bcc35b387637673d1dbfc75 SHA512 d3e6c4e2257f1e9f5c952770be8e2ba549086efb11f95330a59c8bdcfc1ef9d9e64e23dc8e850fd1764ca9a4e559901d7d79b3b83844b3cc205768d368376b47
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
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 000000000000..eb229f7261cb
--- /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-r1.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index 022e74618c7a..84c0aeb6a4c2 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}"
diff --git a/sys-libs/gdbm/gdbm-1.14.ebuild b/sys-libs/gdbm/gdbm-1.14-r1.ebuild
index c617c54ab178..486a3ca83971 100644
--- a/sys-libs/gdbm/gdbm-1.14.ebuild
+++ b/sys-libs/gdbm/gdbm-1.14-r1.ebuild
@@ -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.14" # new subslot (see bug #643188)
 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"