gentoo resync : 25.08.2020

3 files changed, 20 insertions, 2 deletions

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index ee36b2e2c817..a6bdd52c3981 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,5 +1,6 @@
 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
+AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-EBUILD enblend-4.2.0_p20161007-r1.ebuild 1757 BLAKE2B ba4703076454bc019231877a83feae0971bf755f2d54c4c893731d3bbc0fac47f391cb096a2b0e76c3b8d267c6a36c5977d47160b181c4842cd7e4f8a8b9f99b SHA512 344602f430cfeef0f6cc4998dea06282764dc52eda552bc612dd46dce4b4ae137b0e166c017f9acc8afaececdde53e6d279cba62d19b1ce27d3bf326f0959dba
+EBUILD enblend-4.2.0_p20161007-r1.ebuild 1790 BLAKE2B f003df21942649e91d7a19ae8378d11e63810e72ca99f85d7cc4e7c1ce1935a61ca4b650dde5bfc5ee15325ddefe0c735ea2c14c489de44799c9b01b4ba6e6c3 SHA512 afce2232c64ffc1d15eb076baae2938504561f4c09c1e5c74da4a9805b3e29f107dff91a473d707556dc5307e30885e3524b09b0d17ba97bb30542f6f72790e9
 MISC metadata.xml 437 BLAKE2B 38a5768a400aafc32f2dd5412d889578950c3b2443487ad3c82388624c343f42d19034f7476d22f0b036d8b801610ec7b80aaf9d68367146c25ab8af60154a8b SHA512 937c99056596c0c809eaae348f68a42b8e666a5566f10fd639be559ea0b5f9678369efd191aeec42cd1ff26cce72aef8b56e3ea05fb2ca9df10b3a1f8fb04b4c
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index 9049ae5c5e7b..b72cb407f8d9 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch
 	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch
new file mode 100644
index 000000000000..7203d6b667b1
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch
@@ -0,0 +1,16 @@
+Fix build with GCC-10.
+
+Thanks-to: Walter Hüttenmeyer
+Bug: https://bugs.gentoo.org/724988
+
+--- a/src/minimizer.cc	2016-09-24 11:29:40.000000000 +0200
++++ b/src/minimizer.cc	2020-05-24 13:09:58.199170984 +0200
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <gsl/gsl_errno.h>
+-
++#include <limits>
+ #include "minimizer.h"
+ 
+