aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-09-20 11:45:53 +0200
committerJustin Lecher <jlec@gentoo.org>2013-09-20 11:46:51 +0200
commit6cb506f8ab8af731cac885a8cf0858781ad2cc76 (patch)
tree0f197b96eac92ef7ea5a9ac956038bea3a32207c
parentdev-perl/Bio-BigFile: Version BUmp, fix deps (diff)
downloadsci-6cb506f8ab8af731cac885a8cf0858781ad2cc76.tar.gz
sci-6cb506f8ab8af731cac885a8cf0858781ad2cc76.tar.bz2
sci-6cb506f8ab8af731cac885a8cf0858781ad2cc76.zip
sci-libs/scikits_image: Merge tree changes
Package-Manager: portage-2.2.6
-rw-r--r--sci-libs/scikits_image/ChangeLog3
-rw-r--r--sci-libs/scikits_image/scikits_image-9999.ebuild4
2 files changed, 5 insertions, 2 deletions
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 9e459b70d..116468d3f 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild:
+ Merge tree changes
+
18 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild,
metadata.xml:
Drop KEYWORDS from live ebuild
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 198557bee..ebedf7b5d 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -40,8 +40,8 @@ python_test() {
# distutils_install_for_testing not working here
esetup.py \
install --root="${T}/test-${EPYTHON}" \
- --no-compile || die "install test failed"
+ --no-compile
cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
- echo "backend: Agg" > matplotlibrc
+ echo "backend: Agg" > matplotlibrc || die
MPLCONFIGDIR=. nosetests -v skimage || die
}