From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 26 Nov 2019 22:07:41 +0000 (+0100)
Subject: media-libs/vigra: Fix finding boost-python
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b4dbda1d072c07a6578e297ae3feb442ccbd3ba9;p=gentoo.git

media-libs/vigra: Fix finding boost-python

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
new file mode 100644
index 000000000000..ffa3334f873a
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
@@ -0,0 +1,22 @@
+From 32ce9bc334580de7df3a97b106189145744e3726 Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Tue, 16 Oct 2018 19:10:56 +0200
+Subject: [PATCH] cmake: add boost_python${MAJOR}${MINOR} (fixes #445)
+
+---
+ config/FindVIGRANUMPY_DEPENDENCIES.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+index f6f9d563b..47cf4237c 100644
+--- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
++++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
+@@ -115,6 +115,8 @@ IF(PYTHONINTERP_FOUND)
+                 boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
+                 # Mac with Python 3
+                 boost_python${PYTHON_VERSION_MAJOR}
++                # conda-forge
++                boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
+                 # default
+                 boost_python)
+ 
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild
index 9306ea027329..387419da0854 100644
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild
@@ -64,7 +64,10 @@ RDEPEND="${DEPEND}"
 RESTRICT="test"
 
 PATCHES=(
+	# git master
 	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
+	"${FILESDIR}/${P}-boost-python.patch"
+	# TODO: upstream
 	"${FILESDIR}/${P}-lib_suffix.patch"
 )