[gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/

["Justin Lecher" <jlec@gentoo.org>]

commit:     8e9360c068b61c4747fc4bd25a80f618fb1d354a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 09:45:53 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 09:46:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8e9360c0

sci-libs/scikits_image: Merge tree changes

Package-Manager: portage-2.2.6

---
 sci-libs/scikits_image/ChangeLog                 | 3 +++
 sci-libs/scikits_image/scikits_image-9999.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 9e459b7..116468d 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 198557b..ebedf7b 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
 }