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 C4341138351 for ; Tue, 28 Jan 2020 21:30:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDF08E0845; Tue, 28 Jan 2020 21:30:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 92FF9E0843 for ; Tue, 28 Jan 2020 21:30:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 51A3B34E455 for ; Tue, 28 Jan 2020 21:30:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7FCF109 for ; Tue, 28 Jan 2020 21:30:28 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1580247012.e8b975880f21cc0aa575bf1c3d377ce3a9a11d29.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild net-wireless/gnuradio/gnuradio-3.7.9999.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild X-VCS-Directories: net-wireless/gnuradio/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e8b975880f21cc0aa575bf1c3d377ce3a9a11d29 X-VCS-Branch: master Date: Tue, 28 Jan 2020 21:30:28 +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: d4ab8328-3b3c-4d31-b043-a3f5912eb628 X-Archives-Hash: a6ba6f6ca33492a4a6b6aa032feeeb3f commit: e8b975880f21cc0aa575bf1c3d377ce3a9a11d29 Author: Michał Górny gentoo org> AuthorDate: Tue Jan 28 20:55:12 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jan 28 21:30:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b97588 net-wireless/gnuradio: Permit scipy-python2 Signed-off-by: Michał Górny gentoo.org> .../{gnuradio-3.7.13.5-r1.ebuild => gnuradio-3.7.13.5-r2.ebuild} | 7 ++++++- net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 7 ++++++- net-wireless/gnuradio/gnuradio-9999.ebuild | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild similarity index 98% rename from net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild rename to net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild index 2adf66594e3..dec78f161e8 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild @@ -59,7 +59,12 @@ RDEPEND="${PYTHON_DEPS} media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) - filter? ( sci-libs/scipy ) + filter? ( + || ( + sci-libs/scipy-python2[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + ) + ) grc? ( dev-python/cheetah[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild index 44ed5fe566f..8c07aa105ae 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild @@ -56,7 +56,12 @@ RDEPEND="${PYTHON_DEPS} media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) - filter? ( sci-libs/scipy ) + filter? ( + || ( + sci-libs/scipy-python2[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + ) + ) grc? ( dev-python/cheetah[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index b91c70b209e..6687ca88195 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -60,7 +60,12 @@ RDEPEND="${PYTHON_DEPS} media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) - filter? ( sci-libs/scipy ) + filter? ( + || ( + sci-libs/scipy-python2[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + ) + ) grc? ( dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}]