From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-841743-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 DDA3713888F
	for <garchives@archives.gentoo.org>; Thu, 22 Oct 2015 08:32:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2FC8321C01E;
	Thu, 22 Oct 2015 08:32:04 +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 2EF3921C00D
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2015 08:32:03 +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 227ED34094F
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2015 08:32:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 6831215D8
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2015 08:32:00 +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: <1445502712.0c30e019f37c1039c111ad5f28c0480fc2356e38.jlec@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyfits/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/pyfits/pyfits-3.3.ebuild
X-VCS-Directories: dev-python/pyfits/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: 0c30e019f37c1039c111ad5f28c0480fc2356e38
X-VCS-Branch: master
Date: Thu, 22 Oct 2015 08:32:00 +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: 65df26e6-b25a-40c6-907a-8e9d10f772c6
X-Archives-Hash: 133d7b3c832ac90834822df73a1d9696

commit:     0c30e019f37c1039c111ad5f28c0480fc2356e38
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 06:50:53 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 08:31:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c30e019

dev-python/pyfits: Correctly block astropy

Add missing die

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=537250

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/pyfits/pyfits-3.3.ebuild | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dev-python/pyfits/pyfits-3.3.ebuild b/dev-python/pyfits/pyfits-3.3.ebuild
index 5d014f3..a7e69f4 100644
--- a/dev-python/pyfits/pyfits-3.3.ebuild
+++ b/dev-python/pyfits/pyfits-3.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 inherit distutils-r1 eutils multilib
 
 DESCRIPTION="Provides an interface to FITS formatted files under python"
@@ -18,7 +18,7 @@ IUSE="doc test"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	!<dev-python/astropy-0.3
+	!dev-python/astropy
 	sci-libs/cfitsio:0="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7 'python{3_3,3_4}')
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
 		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
 		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
 		 )
@@ -40,7 +40,9 @@ python_prepare_all() {
 		"${S}"/setup.cfg || die
 
 	# https://github.com/spacetelescope/PyFITS/issues/95
-	sed -e "s/except UserWarning, w/except UserWarning as w/" -i lib/pyfits/scripts/fitscheck.py
+	sed \
+		-e "s/except UserWarning, w/except UserWarning as w/" \
+		-i lib/pyfits/scripts/fitscheck.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -51,17 +53,16 @@ python_compile_all() {
 
 python_test() {
 	cd "${BUILD_DIR}"/lib* || die
-	nosetests || die
+	nosetests --verbose || die
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	DOCS=( FAQ.txt CHANGES.txt )
 	distutils-r1_python_install_all
-	dodoc FAQ.txt CHANGES.txt
 	rename_binary() {
 		local binary
-		for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*
-		do
+		for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
 			mv ${binary}{,-${PN}} || die "failed renaming"
 		done
 	}