Renamed conflicting binaries to *-pyfits, removed old, thanks Joseph Booker, bug # 500460

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

5 files changed, 24 insertions, 101 deletions

diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog
index dd246ad418e5..423ec26261c0 100644
--- a/dev-python/pyfits/ChangeLog
+++ b/dev-python/pyfits/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyfits
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.42 2014/02/05 23:15:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.43 2014/02/06 19:47:28 bicatali Exp $
+
+  06 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/pyfits-3.0.8-debundle_zlib.patch, -pyfits-3.1.2.ebuild,
+  pyfits-2.4.0.ebuild, pyfits-3.2.ebuild:
+  Renamed conflicting binaries to *-pyfits, removed old, thanks Joseph Booker,
+  bug # 500460
 
 *pyfits-3.2 (05 Feb 2014)
 
diff --git a/dev-python/pyfits/files/pyfits-3.0.8-debundle_zlib.patch b/dev-python/pyfits/files/pyfits-3.0.8-debundle_zlib.patch
deleted file mode 100644
index d1754e614bf2..000000000000
--- a/dev-python/pyfits/files/pyfits-3.0.8-debundle_zlib.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Debundle zlib
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -43,10 +43,7 @@
- 	src/compressionmodule.c
- 	src/quantize.c
- 	src/ricecomp.c
--	src/zlib.c
--	src/inffast.c
--	src/inftrees.c
--	src/trees.c
-+libraries = z
- include_dirs = numpy
- extra_compile_args = 
- 	-Wno-unused-function
---- a/src/compress.c
-+++ b/src/compress.c
-@@ -106,7 +106,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "zlib.h"  
-+#include <zlib.h>
- 
- int _pyfits_uncompress2mem_from_mem(
-              char *inmemptr,     
-@@ -182,7 +182,7 @@
-         d_stream.next_out = uncompr;
-         d_stream.avail_out = uncomprLen;
- 
--        err = _pyfits_inflate(&d_stream, Z_NO_FLUSH);
-+        err = inflate(&d_stream, Z_NO_FLUSH);
- 
-         if (err != Z_OK && err != Z_STREAM_END)
-         {
-@@ -217,7 +217,7 @@
-     *filesize = d_stream.total_out;
- 
-     /* End the decompression */
--    err = _pyfits_inflateEnd(&d_stream);
-+    err = inflateEnd(&d_stream);
- 
-     /* free temporary output data buffer */
-     free(uncompr);
-@@ -285,7 +285,7 @@
-         c_stream.next_out = compr;
-         c_stream.avail_out = comprLen;
- 
--        err = _pyfits_deflate(&c_stream, Z_FINISH);
-+        err = deflate(&c_stream, Z_FINISH);
- 
-         if (err != Z_OK && err != Z_STREAM_END)
-         {
-@@ -320,7 +320,7 @@
-     *filesize = c_stream.total_out;
- 
-     /* End the compression */
--    err = _pyfits_deflateEnd(&c_stream);
-+    err = deflateEnd(&c_stream);
- 
-     /* free temporary output data buffer */
-     free(compr);
diff --git a/dev-python/pyfits/pyfits-2.4.0.ebuild b/dev-python/pyfits/pyfits-2.4.0.ebuild
index 2396afab1b56..e4583e3b6b26 100644
--- a/dev-python/pyfits/pyfits-2.4.0.ebuild
+++ b/dev-python/pyfits/pyfits-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.4.0.ebuild,v 1.5 2012/08/08 19:11:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.4.0.ebuild,v 1.6 2014/02/06 19:47:28 bicatali Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86 ~x86-fbsd"
 LICENSE="BSD"
 
 RDEPEND="dev-python/numpy
-	!dev-python/astropy"
+	!<dev-python/astropy-0.3"
 DEPEND="${RDEPEND}"
 
 # current tests need data which are not in tar ball
@@ -33,3 +33,11 @@ src_test() {
 	}
 	python_execute_function testing
 }
+
+src_install() {
+	distutils_src_install
+	local binary
+	for binary in "${ED}"/usr/bin/*; do
+		mv ${binary}{,-pyfits} || die
+	done
+}
diff --git a/dev-python/pyfits/pyfits-3.1.2.ebuild b/dev-python/pyfits/pyfits-3.1.2.ebuild
deleted file mode 100644
index f84469a0e2ac..000000000000
--- a/dev-python/pyfits/pyfits-3.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.2.ebuild,v 1.2 2013/09/05 18:46:59 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-inherit distutils-r1 eutils
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/astropy"
-DEPEND="${RDEPEND}
-	dev-python/stsci-distutils[${PYTHON_USEDEP}]
-	dev-python/d2to1[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.8-debundle_zlib.patch )
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	nosetests || die
-}
diff --git a/dev-python/pyfits/pyfits-3.2.ebuild b/dev-python/pyfits/pyfits-3.2.ebuild
index a2562cf0dafc..8fc3e6a729e3 100644
--- a/dev-python/pyfits/pyfits-3.2.ebuild
+++ b/dev-python/pyfits/pyfits-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.2.ebuild,v 1.1 2014/02/05 23:15:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.2.ebuild,v 1.2 2014/02/06 19:47:28 bicatali Exp $
 
 EAPI=5
 
@@ -47,4 +47,9 @@ python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html )
 	distutils-r1_python_install_all
 	dodoc FAQ.txt CHANGES.txt
+	local binary
+	for binary in "${ED}"/usr/bin/* "${ED}"/usr/$(get_libdir)/python-exec/*/*
+	do
+		mv ${binary}{,-${PN}} || die "failed renaming"
+	done
 }