diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-06-07 20:33:44 +0200 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-06-07 20:33:44 +0200 |
| commit | 508d33449e86d3721dfe71a599bfd42d59f75fa8 (patch) | |
| tree | e7f9a71de41ce6d3cba89698c6a39b82f5a91d99 | |
| parent | sci-mathematics/ufc: Add bitbucket to remote-id in metadata.xml (diff) | |
| parent | Merge pull request #431 from TheChymera/nipype (diff) | |
| download | sci-508d33449e86d3721dfe71a599bfd42d59f75fa8.tar.gz sci-508d33449e86d3721dfe71a599bfd42d59f75fa8.tar.bz2 sci-508d33449e86d3721dfe71a599bfd42d59f75fa8.zip | |
Merge remote-tracking branch 'github/master'
* github/master:
no longer depending on outdated version
Revert "new ebuild"
new ebuild
| -rw-r--r-- | sci-libs/nipype/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/nipype/nipype-9999.ebuild | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog index e4f160f49..09e140793 100644 --- a/sci-libs/nipype/ChangeLog +++ b/sci-libs/nipype/ChangeLog @@ -1,8 +1,10 @@ # ChangeLog for sci-libs/nipype -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jun 2015; Horea Christian <h.chr@mail.ru> nipype-9999.ebuild: + no longer depending on outdated version + 06 Jan 2014; Justin Lecher <jlec@gentoo.org> nipype-9999.ebuild, metadata.xml: Switch from git-2 to git-r3 - diff --git a/sci-libs/nipype/nipype-9999.ebuild b/sci-libs/nipype/nipype-9999.ebuild index 0b833f8f2..018340f60 100644 --- a/sci-libs/nipype/nipype-9999.ebuild +++ b/sci-libs/nipype/nipype-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -23,7 +23,7 @@ IUSE="" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] - >=sci-libs/nibabel-1.2[${PYTHON_USEDEP}]" + sci-libs/nibabel[${PYTHON_USEDEP}]" RDEPEND=" sci-libs/scipy[${PYTHON_USEDEP}] dev-python/traits[${PYTHON_USEDEP}] |