From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57767138334 for ; Wed, 27 Nov 2019 00:13:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBF3EE09C7; Wed, 27 Nov 2019 00:13:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D701DE09C7 for ; Wed, 27 Nov 2019 00:13:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 489CE34D456 for ; Wed, 27 Nov 2019 00:13:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BECF78C3 for ; Wed, 27 Nov 2019 00:13:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1574813566.b4dbda1d072c07a6578e297ae3feb442ccbd3ba9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vigra/files/vigra-1.11.1-boost-python.patch media-libs/vigra/vigra-1.11.1-r2.ebuild X-VCS-Directories: media-libs/vigra/files/ media-libs/vigra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b4dbda1d072c07a6578e297ae3feb442ccbd3ba9 X-VCS-Branch: master Date: Wed, 27 Nov 2019 00:13:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e05d76b-ada5-4660-9ba0-6ae482e726b5 X-Archives-Hash: c04c60c26df91b115b5e61e4cf7cf3e6 commit: b4dbda1d072c07a6578e297ae3feb442ccbd3ba9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 26 22:07:41 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 27 00:12:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4dbda1d media-libs/vigra: Fix finding boost-python Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> .../vigra/files/vigra-1.11.1-boost-python.patch | 22 ++++++++++++++++++++++ media-libs/vigra/vigra-1.11.1-r2.ebuild | 3 +++ 2 files changed, 25 insertions(+) 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 00000000000..ffa3334f873 --- /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 +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 9306ea02732..387419da085 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" )