From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-844456-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 824A71384B4
for <garchives@archives.gentoo.org>; Fri, 6 Nov 2015 16:22:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BBF9521C014;
Fri, 6 Nov 2015 16:22:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4B8DF21C014
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Nov 2015 16:22:12 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BA8E5340666
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Nov 2015 16:22:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A5322226
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Nov 2015 16:22:07 +0000 (UTC)
From: "Justin Lecher" <jlec@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, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1446826917.a31d5f1e40b29d56f1761f95c42d4c9c993687a4.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-libs/scikits_image/metadata.xml sci-libs/scikits_image/scikits_image-9999.ebuild
X-VCS-Directories: sci-libs/scikits_image/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: a31d5f1e40b29d56f1761f95c42d4c9c993687a4
X-VCS-Branch: master
Date: Fri, 6 Nov 2015 16:22:07 +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-Archives-Salt: eb20bb73-0471-42aa-a6df-d7d24fece411
X-Archives-Hash: 0a6b8b18ad500032365299b37d12a11d
commit: a31d5f1e40b29d56f1761f95c42d4c9c993687a4
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 16:21:57 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 16:21:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a31d5f1e
sci-libs/scikits_image: Adopt to latest HEAD
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/scikits_image/metadata.xml | 4 ++-
sci-libs/scikits_image/scikits_image-9999.ebuild | 46 +++++++++++++-----------
2 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 4e57c7f..b9bd049 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -9,7 +9,9 @@
algorithms and applications.
</longdescription>
<use>
- <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
+ <flag name="freeimage">Enable support for image i/o via
+ <pkg>media-libs/freeimage</pkg></flag>
+ <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
</use>
<upstream>
<remote-id type="pypi">scikit-image</remote-id>
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 5d7fa65..4b52572 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-# pyamg missing py3 support
-#PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 eutils git-r3 virtualx
DESCRIPTION="Image processing routines for SciPy"
HOMEPAGE="http://scikit-image.org/"
@@ -17,31 +15,39 @@ EGIT_REPO_URI="https://github.com/scikit-image/scikit-image.git"
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="doc freeimage gtk qt4 test"
+IUSE="doc freeimage gtk pyamg qt4 test"
RDEPEND="
- sci-libs/scipy[sparse,${PYTHON_USEDEP}]
+ >=dev-python/matplotlib-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pillow-1.7.8[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3[${PYTHON_USEDEP}]
+ >=sci-libs/scipy-0.9[sparse,${PYTHON_USEDEP}]
freeimage? ( media-libs/freeimage )
gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] )
+ pyamg? ( dev-python/pyamg[$(python_gen_usedep 'python2*')] )
qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
-DEPEND="
- >=dev-python/cython-0.17[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}
+ >=dev-python/cython-0.21[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pyamg[${PYTHON_USEDEP}]
- sci-libs/scipy[sparse,${PYTHON_USEDEP}] )"
+ )"
DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt README.md DEPENDS.txt RELEASE.txt TASKS.txt )
python_test() {
- # distutils_install_for_testing not working here
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile
- cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
- echo "backend: Agg" > matplotlibrc || die
- MPLCONFIGDIR=. nosetests -v skimage || die
+ distutils_install_for_testing
+ mkdir for_test && cd for_test || die
+ echo "backend : Agg" > matplotlibrc || die
+ echo "backend.qt4 : PyQt4" >> matplotlibrc || die
+ VIRTUALX_COMMAND=nosetests
+ MPLCONFIGDIR=. virtualmake --exe -v skimage || die
+}
+
+pkg_postinst() {
+ optfeature "FITS io capability" dev-python/astropy
+ #optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
+ #optfeature "io plugin providing most standard formats" dev-python/imread
}