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.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 365BF158094 for ; Sun, 31 Jul 2022 02:42:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E078FE0D00; Sun, 31 Jul 2022 02:42:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 4AF4EE0D00 for ; Sun, 31 Jul 2022 02:42:10 +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 11938340E3F for ; Sun, 31 Jul 2022 02:42:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 328EE545 for ; Sun, 31 Jul 2022 02:42:07 +0000 (UTC) From: "Sam James" 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" Message-ID: <1659235302.d133f35f892233784f38a3913c6b61c7490a47ad.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.0.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: d133f35f892233784f38a3913c6b61c7490a47ad X-VCS-Branch: master Date: Sun, 31 Jul 2022 02:42: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: 1376b47d-e5d0-4490-99c1-a87459863061 X-Archives-Hash: 96c7f8c6856edfaf88aaa0bb5be9d4ab commit: d133f35f892233784f38a3913c6b61c7490a47ad Author: Sam James gentoo org> AuthorDate: Sun Jul 31 02:41:36 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 31 02:41:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d133f35f dev-python/scipy: drop useless IUSE=sparse, fix USE=doc Seems to have gone a while ago upstream. Signed-off-by: Sam James gentoo.org> dev-python/scipy/scipy-1.9.0.ebuild | 18 ++++++++++++++---- dev-python/scipy/scipy-1.9.9999.ebuild | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dev-python/scipy/scipy-1.9.0.ebuild b/dev-python/scipy/scipy-1.9.0.ebuild index ccb8c752ed10..61d7f61e799e 100644 --- a/dev-python/scipy/scipy-1.9.0.ebuild +++ b/dev-python/scipy/scipy-1.9.0.ebuild @@ -44,16 +44,18 @@ fi LICENSE="BSD LGPL-2" SLOT="0" -IUSE="doc +sparse" +IUSE="doc" DEPEND=" >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 - sparse? ( sci-libs/umfpack:0= )" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}]" +" +RDEPEND=" + ${DEPEND} + dev-python/pillow[${PYTHON_USEDEP}] +" # TODO: restore pythran optionality? BDEPEND=" dev-lang/swig @@ -82,3 +84,11 @@ python_test() { epytest -n "$(makeopts_jobs)" --pyargs scipy } + +python_install_all() { + use doc && \ + local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \ + local HTML_DOCS=( "${WORKDIR}"/html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild index ccb8c752ed10..61d7f61e799e 100644 --- a/dev-python/scipy/scipy-1.9.9999.ebuild +++ b/dev-python/scipy/scipy-1.9.9999.ebuild @@ -44,16 +44,18 @@ fi LICENSE="BSD LGPL-2" SLOT="0" -IUSE="doc +sparse" +IUSE="doc" DEPEND=" >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 - sparse? ( sci-libs/umfpack:0= )" -RDEPEND="${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}]" +" +RDEPEND=" + ${DEPEND} + dev-python/pillow[${PYTHON_USEDEP}] +" # TODO: restore pythran optionality? BDEPEND=" dev-lang/swig @@ -82,3 +84,11 @@ python_test() { epytest -n "$(makeopts_jobs)" --pyargs scipy } + +python_install_all() { + use doc && \ + local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \ + local HTML_DOCS=( "${WORKDIR}"/html/. ) + + distutils-r1_python_install_all +}