[gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6bf94b61ed79c56b38ce68f579ac93d75421bd65
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 22:02:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 00:12:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf94b61

media-libs/vigra: Add python3_7, drop python2_7

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

 media-libs/vigra/vigra-9999.ebuild | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index e384297bbb8..363de89451a 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 MY_P="${P}-src"
 MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+),xml"
 inherit cmake-utils python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
@@ -39,26 +39,27 @@ BDEPEND="
 		valgrind? ( dev-util/valgrind )
 	)
 "
-# runtime dependency on python:2.7 is required by the vigra-config script
+# runtime dependency on python is required by the vigra-config script
 DEPEND="
-	dev-lang/python:2.7
 	fftw? ( sci-libs/fftw:3.0 )
 	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
 	openexr? (
-		media-libs/openexr:=
 		media-libs/ilmbase:=
+		media-libs/openexr:=
 	)
 	png? ( media-libs/libpng:0= )
 	python? (
+		${PYTHON_DEPS}
 		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
 	)
 	tiff? ( media-libs/tiff:0= )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${PYTHON_DEPS}
+	${DEPEND}
+"
 
 # Severely broken, also disabled in Fedora, bugs #390447, #653442
 RESTRICT="test"
@@ -91,6 +92,9 @@ src_prepare() {
 	vigra_disable png
 	vigra_disable tiff
 	vigra_disable zlib
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
 }
 
 src_configure() {