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 A8FC61395E1 for ; Sun, 30 Oct 2016 15:47:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD78521C0F9; Sun, 30 Oct 2016 15:47:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6C5521C0F9 for ; Sun, 30 Oct 2016 15:47:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4736341142 for ; Sun, 30 Oct 2016 15:47:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27A6124AA for ; Sun, 30 Oct 2016 15:47:07 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1477841458.9fccc5598e579132bff44d6796e5ad2584c7c242.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/nipype/nipype-0.12.0.ebuild sci-libs/nipype/nipype-0.12.1.ebuild sci-libs/nipype/nipype-9999.ebuild X-VCS-Directories: sci-libs/nipype/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 9fccc5598e579132bff44d6796e5ad2584c7c242 X-VCS-Branch: master Date: Sun, 30 Oct 2016 15:47: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-Archives-Salt: 4a76fa36-40e8-4b0c-9160-9bb2a2f76f2c X-Archives-Hash: 1f8cace8666fcaa7cce2bfada6df0a90 commit: 9fccc5598e579132bff44d6796e5ad2584c7c242 Author: Horea Christian yandex com> AuthorDate: Sun Oct 30 15:30:58 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Oct 30 15:30:58 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9fccc559 sci-libs/nipype: setup_requires patch for python3 and configparser (#697) * sci-libs/nipype: setup_requires patch for python3 and configparser Package-Manager: portage-2.3.2 * sci-libs/nipype: fixed indentation Package-Manager: portage-2.3.2 sci-libs/nipype/nipype-0.12.0.ebuild | 2 +- sci-libs/nipype/nipype-0.12.1.ebuild | 2 +- sci-libs/nipype/nipype-9999.ebuild | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild b/sci-libs/nipype/nipype-0.12.0.ebuild index c9a783d..09912f6 100644 --- a/sci-libs/nipype/nipype-0.12.0.ebuild +++ b/sci-libs/nipype/nipype-0.12.0.ebuild @@ -24,7 +24,7 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/nibabel[${PYTHON_USEDEP}] test? ( dev-python/mock[${PYTHON_USEDEP}] ) - " + " RDEPEND=" dev-python/networkx[${PYTHON_USEDEP}] dev-python/pydotplus[${PYTHON_USEDEP}] diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild b/sci-libs/nipype/nipype-0.12.1.ebuild index c9a783d..09912f6 100644 --- a/sci-libs/nipype/nipype-0.12.1.ebuild +++ b/sci-libs/nipype/nipype-0.12.1.ebuild @@ -24,7 +24,7 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/nibabel[${PYTHON_USEDEP}] test? ( dev-python/mock[${PYTHON_USEDEP}] ) - " + " RDEPEND=" dev-python/networkx[${PYTHON_USEDEP}] dev-python/pydotplus[${PYTHON_USEDEP}] diff --git a/sci-libs/nipype/nipype-9999.ebuild b/sci-libs/nipype/nipype-9999.ebuild index e9fed21..8a0480b 100644 --- a/sci-libs/nipype/nipype-9999.ebuild +++ b/sci-libs/nipype/nipype-9999.ebuild @@ -26,6 +26,7 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] sci-libs/nibabel[${PYTHON_USEDEP}] test? ( dev-python/mock[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7) " RDEPEND=" dev-python/networkx[${PYTHON_USEDEP}] @@ -36,6 +37,16 @@ RDEPEND=" dev-python/simplejson[${PYTHON_USEDEP}] " +python_prepare_all() { + distutils-r1_python_prepare_all + EXISTING_REQUIRE="setup_requires=['future', 'configparser']" + CORRECTED_REQUIRE="setup_requires=['future']" + sed \ + -e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \ + -i setup.py \ + || die "sed setup.py" +} + python_test() { nosetests -v || die }