gentoo resync : 25.08.2020

3 files changed, 56 insertions, 8 deletions

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 8c57be194f43..0044b9f8d126 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,10 +1,11 @@
 AUX vigra-1.11.1-boost-python.patch 930 BLAKE2B dc791871c9a51bd98a7666c64733d7929147f54433ff140cc255e0b4a6c2ff0be9905e82a628a91d6ff9c2674d76422d0d97a2a149be22ae7a95c943fb10d76a SHA512 246596b5ea323d2e69489646afa3574fc385dc88e0a0e936b1fc508b58943d25c41e466e182aec8d8ca5793d88af7471bfcbf1ac9eb55ac034b6906c7b82d62a
 AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62da0e0cb5cde74923871a377ca06a0f639be3a63d6b1769258d09da474e4110ad499a5402660912d8bb07ac0d5bbe199bc36c SHA512 9ab597ea7413d276b22d3cc46ac4179748b98bbaaa44234f71145d69e987b5162d38f87c3317d9bb863cabbcef7c1f3d77f727d19576df7892b2df7272055ce4
 AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33
+AUX vigra-1.11.1-gcc-10.patch 1506 BLAKE2B d61312f7cc082b81dc72003a1425a0c4b73670da4069c7ffd5426f83666a163ecb20d71250ea30aac200ab129458ae090cd844c50e66741c72cc8b74d2c7c52a SHA512 166b0eceb0509dff80c9ca172601926398ffc3b0f780058b8f5dede4a914aeecfe259b3c31469ce01b317af675c62e33bbe5bbe56b922b74ffdd4e0b5655845e
 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r3.ebuild 3552 BLAKE2B 6cecccf5e100dc69847f312815f084813d7feb57c88daba2a45e49c0e3224e2216b0971d006e1643e1a85fc34734656e70ad7a3ad216129e699890766dce6f60 SHA512 d9f070361ebb08de2b9b50d7bb80469d66dd96724b1012965e8c999fa8af88c260b1fde18d32128b87c6ebee24e707402ab5d957e311379f284acf99ed6da25c
+EBUILD vigra-1.11.1-r3.ebuild 3556 BLAKE2B 223936590be67ab4e1f65849b32ae8088f96a826545e1e6335cf8ee32f8151bea532aa7c4bc04e3f4c1ba0158ad146fea881a1054e899bcec9c5cd27ed3f3091 SHA512 534f2bf41aa9882d03382bbfd4d41d821dc194d218f20872cace7fecc3a47fb412743fbf04617f3633006855eb41331fd2fc4206d0620b38a4508e85ce5fea82
 EBUILD vigra-9999.ebuild 3907 BLAKE2B a428dac82f37a2d526cbe757da1363dd9a968c2e970bf91fecd3f8d3ed1204f5344df2f3b29ce7a370e8801f9d5fa6480b75adb113bc0dd41c65f7fc49869ac4 SHA512 f539813b694eda28dd26b4fca29e6f1b0c3daf3b04eac13ac1c71406632ee0b9f1f066ce26f7a067b74cbb624a9396ba3c71196f6802c422dabe45dee25ca0c2
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
new file mode 100644
index 000000000000..2433ba41712a
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
@@ -0,0 +1,46 @@
+From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Tue, 16 Oct 2018 19:26:17 +0200
+Subject: [PATCH] fixed noexcept declaration
+
+---
+ include/vigra/separableconvolution.hxx | 6 +++---
+ include/vigra/stdconvolution.hxx       | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx
+index 7ee33c09d..8fd120602 100644
+--- a/include/vigra/separableconvolution.hxx
++++ b/include/vigra/separableconvolution.hxx
+@@ -1409,10 +1409,10 @@ class Kernel1D
+         {}
+ 
+         ~InitProxy()
+-#ifndef _MSC_VER
+-            throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+             noexcept(false)
++#else
++            throw(PreconditionViolation)
+ #endif
+         {
+             vigra_precondition(count_ == 1 || count_ == sum_,
+diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx
+index 76d61a53f..657247259 100644
+--- a/include/vigra/stdconvolution.hxx
++++ b/include/vigra/stdconvolution.hxx
+@@ -792,10 +792,10 @@ public:
+         {}
+ 
+         ~InitProxy()
+-#ifndef _MSC_VER
+-            throw(PreconditionViolation)
+-#elif _MSC_VER >= 1900
++#if _MSC_VER >= 1900 || __cplusplus >= 201103L
+             noexcept(false)
++#else
++            throw(PreconditionViolation)
+ #endif
+         {
+             vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index 93a26b7b05e2..c9dfc49eed8e 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+),xml"
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
 HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
 	"${FILESDIR}/${P}-boost-python.patch"
 	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
 	# TODO: upstream
 	"${FILESDIR}/${P}-lib_suffix.patch"
 	"${FILESDIR}/${P}-cmake-module-dir.patch"
@@ -80,7 +81,7 @@ src_prepare() {
 		fi
 	}
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	vigra_disable fftw fftw3
 	vigra_disable fftw fftw3f
@@ -110,7 +111,7 @@ src_configure() {
 			-DWITH_VALGRIND=$(usex valgrind)
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	if use python; then
@@ -123,7 +124,7 @@ src_configure() {
 src_compile() {
 	local VIGRA_BUILD_DIR
 	vigra_compile() {
-		cmake-utils_src_compile
+		cmake_src_compile
 		VIGRA_BUILD_DIR="${BUILD_DIR}"
 	}
 	if use python; then
@@ -135,17 +136,17 @@ src_compile() {
 
 src_install() {
 	if use python; then
-		python_foreach_impl cmake-utils_src_install
+		python_foreach_impl cmake_src_install
 		python_optimize
 	else
-		cmake-utils_src_install
+		cmake_src_install
 	fi
 }
 
 src_test() {
 	# perhaps disable tests (see #390447)
 	vigra_test() {
-		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
 	}
 	if use python; then
 		python_foreach_impl vigra_test