From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 23 Oct 2015 08:33:47 +0000 (+0200)
Subject: dev-python/pyfits: Fix app renamin and
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=24ca06f2fd2768beb72ecc48bde5d8668c2faee7;p=gentoo.git

dev-python/pyfits: Fix app renamin and

Release Blocker against astropy

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

diff --git a/dev-python/pyfits/pyfits-3.3.ebuild b/dev-python/pyfits/pyfits-3.3-r1.ebuild
similarity index 87%
rename from dev-python/pyfits/pyfits-3.3.ebuild
rename to dev-python/pyfits/pyfits-3.3-r1.ebuild
index 867904038788..d30a981ce764 100644
--- a/dev-python/pyfits/pyfits-3.3.ebuild
+++ b/dev-python/pyfits/pyfits-3.3-r1.ebuild
@@ -19,7 +19,6 @@ IUSE="doc test"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	!dev-python/astropy
 	sci-libs/cfitsio:0="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -57,15 +56,17 @@ python_test() {
 	nosetests --verbose || die
 }
 
+python_install() {
+	distutils-r1_python_install
+	local binary
+	for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
+		einfo "Renaming ${binary} to ${binary}-${PN}"
+		mv ${binary}{,-${PN}} || die "failed renaming"
+	done
+}
+
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	DOCS=( FAQ.txt CHANGES.txt )
 	distutils-r1_python_install_all
-	rename_binary() {
-		local binary
-		for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
-			mv ${binary}{,-${PN}} || die "failed renaming"
-		done
-	}
-	python_foreach_impl rename_binary
 }