From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1453363-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0E180158020
for <garchives@archives.gentoo.org>; Fri, 4 Nov 2022 00:23:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 19803E088C;
Fri, 4 Nov 2022 00:23:34 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id F2F79E088C
for <gentoo-commits@lists.gentoo.org>; Fri, 4 Nov 2022 00:23:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 37ACF34131F
for <gentoo-commits@lists.gentoo.org>; Fri, 4 Nov 2022 00:23:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 941DA5F7
for <gentoo-commits@lists.gentoo.org>; Fri, 4 Nov 2022 00:23:31 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1667521405.c6e1c019205cf536a6522e9d99acbaa05873d8a7.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/scipy/scipy-1.9.3.ebuild dev-python/scipy/scipy-1.9.9999.ebuild
X-VCS-Directories: dev-python/scipy/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c6e1c019205cf536a6522e9d99acbaa05873d8a7
X-VCS-Branch: master
Date: Fri, 4 Nov 2022 00:23:31 +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: 492cb4f3-0ad4-473d-8e38-333115d05bbb
X-Archives-Hash: 8eeefe9803e4cc485aabb2eb0e3c051f
commit: c6e1c019205cf536a6522e9d99acbaa05873d8a7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 00:22:56 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 00:23:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e1c019
dev-python/scipy: fix pkg_setup optionality for fortran, rename USE=pythran
This still doesn't fix USE=-fortran builds, but reported that upstream now.
Bug: https://bugs.gentoo.org/878361
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/scipy/scipy-1.9.3.ebuild | 7 ++++---
dev-python/scipy/scipy-1.9.9999.ebuild | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dev-python/scipy/scipy-1.9.3.ebuild b/dev-python/scipy/scipy-1.9.3.ebuild
index 3b6adf392e6b..0f38a0cb37a1 100644
--- a/dev-python/scipy/scipy-1.9.3.ebuild
+++ b/dev-python/scipy/scipy-1.9.3.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+FORTRAN_NEEDED=fortran
DISTUTILS_USE_PEP517=meson-python
PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+)"
@@ -44,7 +45,7 @@ fi
LICENSE="BSD LGPL-2"
SLOT="0"
-IUSE="doc +pythran"
+IUSE="doc +fortran"
# umfpack is technically optional but it's preferred to have it available.
DEPEND="
@@ -66,7 +67,7 @@ BDEPEND="
dev-util/patchelf
virtual/pkgconfig
doc? ( app-arch/unzip )
- pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
+ fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
PATCHES=(
@@ -89,7 +90,7 @@ src_unpack() {
}
python_configure_all() {
- export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+ export SCIPY_USE_PYTHRAN=$(usex fortran 1 0)
}
python_test() {
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
index 3b6adf392e6b..0f38a0cb37a1 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+FORTRAN_NEEDED=fortran
DISTUTILS_USE_PEP517=meson-python
PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+)"
@@ -44,7 +45,7 @@ fi
LICENSE="BSD LGPL-2"
SLOT="0"
-IUSE="doc +pythran"
+IUSE="doc +fortran"
# umfpack is technically optional but it's preferred to have it available.
DEPEND="
@@ -66,7 +67,7 @@ BDEPEND="
dev-util/patchelf
virtual/pkgconfig
doc? ( app-arch/unzip )
- pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
+ fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
PATCHES=(
@@ -89,7 +90,7 @@ src_unpack() {
}
python_configure_all() {
- export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+ export SCIPY_USE_PYTHRAN=$(usex fortran 1 0)
}
python_test() {