gentoo resync : 02.04.2018

3 files changed, 13 insertions, 14 deletions

diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index a42b492856c3..1c1774504f3f 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,12 +1,12 @@
 AUX giflib-4.1.6-gif2rle.patch 764 BLAKE2B af377785f83dcd5c2c4382eb2d490ccc01000aa2a1ef8f306c7e0284857de02765a714fea73870ac6226331a88e422bd8afd3b0ec90b7f3e225bcabf079dc32e SHA512 6714906d49a0c285c1fb642a81c092378042ec06be6c4d7c586459e80bb010423fe4b9801124b71c945fd118d99432869bc180bfa32a6c3c29bcfb6b4c5a027f
 AUX giflib-4.1.6-giffix-null-Extension-fix.patch 693 BLAKE2B b0faee004c9cbb95839cb047de902500b1c46f6d3185fc061fb99b0759a57512cb030ca965bb927c68c642ecd72a714260c288b19d24404a6b4cb022ba41094b SHA512 9006c85529735a84afaddddbb06b25cb2b7eff64574edea693d75171c6b2bb7a666e498920a9abca2b28290e4c601b6eb6eecc6ea1b0e6b8602fd4a55863338f
-AUX giflib-5.1.4-reallocarray-export.patch 5770 BLAKE2B 6e4b4015a7e1d1a1f35644ecde4a3638243de562f8ffda755ccc56b878aa503771725e7cab348638b5a00b10de96e551ee6b7a0a0b50ee6269b3165b676f3c4d SHA512 4cde35f05b18229da3835742ca555dc73dc489e534913486b4752a1c4a02e3c0c31b221283f433cf55083c31b14ed67f54a47b8481d25f8855742f9251baf717
+AUX giflib-5.1.4-reallocarray-export.patch 5668 BLAKE2B c2dc8b1f9ffa5ba5e3f50bd71ecb098331a97737e20f71ae88fa2b3a0aa27c9d3a83d72654692ad71edb7eb03aac00f7af21088eded85c3a0126e6893a4f583c SHA512 3635efc2b10adc01bb0ac70a99e8ac7dbe3dc1b2f03060ea449777078da2a1eb731f17299a9e239afb55e25777cae54de6ca12d9d069e513b03a9eb6402a6658
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 EBUILD giflib-4.1.6-r2.ebuild 1381 BLAKE2B 53da805ac9c0e6641536fb57b772c9921c4e41441fddfd0e53a6b2d00e76eac38e0f6a53fbfa3a8b13058c5ae8885b5212d62b8a7eec5afef6c13b2c40048803 SHA512 51e54c7163c24477b664add2201347df4e41dc819f8e2b444810dc7c0b5cc6766f3e0176bd073188fc5ec953fd09b55b5066082ca307ac7552df164905dcecdd
 EBUILD giflib-4.1.6-r3.ebuild 1609 BLAKE2B fa19054072551719fc111d0ba1c8df029d5f47649500fd9859c328915a5335e36c098075c2d2c9954bd3f2a1c9435d0dee7308fc36499963d09d255170b40e54 SHA512 e138e276d2504904e3bed4e478cf492fdf663805a50fd4ae510b90c6160a6d3a591214eb738cc7ec545818fb88b7f36f7699ee0b6c5464af199e3a699b805fed
 EBUILD giflib-5.0.6.ebuild 1219 BLAKE2B b4fd9c6b45c9cba3b5ffbcacc4a378ce73dbb6d5bc15d7de8c43248ec997463bb8ee9637edc48f98ac541c9e7b152f40bfecbdeaded007f80c5acf1d88972546 SHA512 b46fd57c3ec565cb8f39c885d0f0eb7e4a3fd6a64779f1abea9be3dc8f56feb554b3546c5564081169d91ce8a1e18ef4ad644837df90085629d149866f1870b1
-EBUILD giflib-5.1.4-r1.ebuild 1609 BLAKE2B da2fe5ae5983d27cd42fb1ded6b2ded6715f78d9ee42c1502aaa0380078c1d40abf372c720c40b3c72b1395282ec6016722616838edccf6f7c59be2c0dc64948 SHA512 beded9c6943664b953fc05e934024b72d530c75f53097636a2be1d1ab2d0d8e1e62d32be98b4ea12a6e7c1671a44f1d2ba56795b7f98b42af123f85224975a4f
+EBUILD giflib-5.1.4-r2.ebuild 1609 BLAKE2B da2fe5ae5983d27cd42fb1ded6b2ded6715f78d9ee42c1502aaa0380078c1d40abf372c720c40b3c72b1395282ec6016722616838edccf6f7c59be2c0dc64948 SHA512 beded9c6943664b953fc05e934024b72d530c75f53097636a2be1d1ab2d0d8e1e62d32be98b4ea12a6e7c1671a44f1d2ba56795b7f98b42af123f85224975a4f
 EBUILD giflib-5.1.4.ebuild 1540 BLAKE2B deed4fe240a56b1cda63361947e3d1bead633d5ff7738e2fc5140e72d14cf86cd6c6fee119f221524779b2f7d771e8c8ac564c5cf4d6a27db9d2282188f2843f SHA512 84cde254f5de12d2d3b64d7f450490e32391d6f8c3d233c09ca14da8155ab606d28b4a1cdf6e2f98345d148ec500a16cc25bad0d47d4e02cf32182075a9f3d77
 MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
index 08d4f3d3d4ed..1c2a433c29c2 100644
--- a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
+++ b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
@@ -1,4 +1,4 @@
-From 9805c76d4f76c77aad9f285e81f4090cdf661fac Mon Sep 17 00:00:00 2001
+From dfba2b34d35ddfd47233293f2f28978e8acfc87c Mon Sep 17 00:00:00 2001
 From: Sebastian Pipping <sebastian@pipping.org>
 Date: Wed, 14 Mar 2018 21:18:14 +0100
 Subject: [PATCH] Address clash of export reallocarray with glibc
@@ -6,8 +6,8 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-.. by not exporting that internal symbol any more,
-and renaming the function in code and where it's used
+.. by renaming the exported symbol and the related
+function in code and where it's used.
 
 Bug: https://bugs.gentoo.org/637438
 
@@ -21,10 +21,10 @@ Compile error was:
  extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)
 ---
  lib/dgif_lib.c             |  4 ++--
- lib/gif_lib.h              |  3 ---
+ lib/gif_lib.h              |  2 +-
  lib/gifalloc.c             | 10 +++++-----
  lib/openbsd-reallocarray.c |  2 +-
- 4 files changed, 8 insertions(+), 11 deletions(-)
+ 4 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
 index 66a1d6a..f0e0385 100644
@@ -49,19 +49,18 @@ index 66a1d6a..f0e0385 100644
  
                if (sp->RasterBits == NULL) {
 diff --git a/lib/gif_lib.h b/lib/gif_lib.h
-index 078930c..7914a69 100644
+index 078930c..cefc3bb 100644
 --- a/lib/gif_lib.h
 +++ b/lib/gif_lib.h
-@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
-                                      GifPixelType ColorTransIn2[]);
+@@ -245,7 +245,7 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
  extern int GifBitSize(int n);
  
--extern void *
+ extern void *
 -reallocarray(void *optr, size_t nmemb, size_t size);
--
++openbsd_reallocarray(void *optr, size_t nmemb, size_t size);
+ 
  /******************************************************************************
   Support for the in-core structures allocation (slurp mode).              
- ******************************************************************************/
 diff --git a/lib/gifalloc.c b/lib/gifalloc.c
 index 3b51868..1394cfa 100644
 --- a/lib/gifalloc.c
@@ -125,5 +124,5 @@ index aa70686..b922b01 100644
  	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
  	    nmemb > 0 && SIZE_MAX / nmemb < size) {
 -- 
-2.16.2
+2.17.0.rc2
 
diff --git a/media-libs/giflib/giflib-5.1.4-r1.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild
index a5fce8fa5fee..a5fce8fa5fee 100644
--- a/media-libs/giflib/giflib-5.1.4-r1.ebuild
+++ b/media-libs/giflib/giflib-5.1.4-r2.ebuild