From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1125586-garchives=archives.gentoo.org@lists.gentoo.org>
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 EC8C1138334
for <garchives@archives.gentoo.org>; Wed, 27 Nov 2019 00:13:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B05DBE09BF;
Wed, 27 Nov 2019 00:13:11 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 97736E09BF
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Nov 2019 00:13:11 +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 1B3A834D453
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Nov 2019 00:13:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AB1FB8C1
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Nov 2019 00:13:07 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1574813566.6bf94b61ed79c56b38ce68f579ac93d75421bd65.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/vigra/vigra-9999.ebuild
X-VCS-Directories: media-libs/vigra/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 6bf94b61ed79c56b38ce68f579ac93d75421bd65
X-VCS-Branch: master
Date: Wed, 27 Nov 2019 00:13:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8b42d097-750a-4528-bc5c-4b24166972bf
X-Archives-Hash: 64644a72a83bc3367f9ef446785679c0
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() {