[dev-python/astlib] Version bump, drop old

5 files changed, 64 insertions, 111 deletions

diff --git a/dev-python/astlib/Manifest b/dev-python/astlib/Manifest
index adb0ad3d0..d89f64e3c 100644
--- a/dev-python/astlib/Manifest
+++ b/dev-python/astlib/Manifest
@@ -1,2 +1 @@
-DIST astLib-0.4.0.tar.gz 1002727 RMD160 9902f6a0704a495070ecc176998fe431ce8b7d13 SHA1 6d856c39a31f999ee88cd7baec1cc0cb23b85001 SHA256 c8d9f4b42716bbbd398040c9e8eaadca437cc2dd9dca020b36ac45144ac699db
-DIST astLib-0.5.0.tar.gz 1009306 RMD160 50fa2c383d79e5bc6ea5225de3876c80e25f5ae6 SHA1 0ce13f7b0cb04ad284cb0f39cba332001c5064b1 SHA256 e4488fc6632fef30e6b2834320d9bb9628fec843cf799e824379f9a74857aba3
+DIST astLib-0.6.0.tar.gz 695729 SHA256 9f6a2ebe90ab858911b74305824b05e044d40713db39af01682f3f6ba248995c SHA512 d379d88f4876a93b420a66a6b66e68ea511eb59499ac301ab93657d63c84cb5708e8053c5f4b3c6587c07cda054651299cc6bf19eff38256170a41bdbcce5dbd WHIRLPOOL 376f18f7b204911da8970e315cf3d1b62deead7b11183ff14caf16250954ca354676386185119c1801ac9b92bd1dfb352b36d922593ab222ec06847abe933ea9
diff --git a/dev-python/astlib/astlib-0.4.0.ebuild b/dev-python/astlib/astlib-0.4.0.ebuild
deleted file mode 100644
index fe0482fba..000000000
--- a/dev-python/astlib/astlib-0.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-MYPN=astLib
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python astronomy modules for coordinate conversion and manipulating FITS images"
-HOMEPAGE="http://astlib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-
-IUSE="doc examples"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-DEPEND="sci-astronomy/wcstools"
-RDEPEND="${DEPEND}
-	dev-python/matplotlib
-	dev-python/imaging
-	dev-python/pyfits
-	sci-libs/scipy"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wcstools.patch
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml docs/${MYPN}/* || die
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
diff --git a/dev-python/astlib/astlib-0.5.0.ebuild b/dev-python/astlib/astlib-0.6.0.ebuild
index 0c8e5168b..204398290 100644
--- a/dev-python/astlib/astlib-0.5.0.ebuild
+++ b/dev-python/astlib/astlib-0.6.0.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils eutils
 
 MYPN=astLib
-MYP="${MYPN}-${PV}"
+MYP=${MYPN}-${PV}
 
 DESCRIPTION="Python astronomy modules for coordinate conversion and manipulating FITS images"
 HOMEPAGE="http://astlib.sourceforge.net/"
@@ -28,21 +29,20 @@ RDEPEND="${DEPEND}
 	dev-python/pyfits
 	sci-libs/scipy"
 
-RESTRICT_PYTHON_ABIS="3.*"
-
 S=${WORKDIR}/${MYP}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.0-wcstools.patch
+	epatch "${FILESDIR}"/${P}-wcstools.patch
+	distutils_src_prepare
 }
 
 src_install() {
 	distutils_src_install
 	if use doc; then
-		dohtml docs/${MYPN}/* || die
+		dohtml docs/${MYPN}/*
 	fi
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die
+		doins -r examples
 	fi
 }
diff --git a/dev-python/astlib/files/astlib-0.4.0-wcstools.patch b/dev-python/astlib/files/astlib-0.4.0-wcstools.patch
deleted file mode 100644
index dc3b6550e..000000000
--- a/dev-python/astlib/files/astlib-0.4.0-wcstools.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- setup.py.orig	2010-05-04 16:43:52.000000000 +0100
-+++ setup.py	2010-07-15 18:46:00.000000000 +0100
-@@ -12,36 +12,8 @@
- topDir=os.getcwd()
- sourceDir="PyWCSTools"+os.path.sep+"libwcs"+os.path.sep
- 
--#oFiles=glob.glob(sourceDir+"*.o")
--#print oFiles
--oFiles=['PyWCSTools/libwcs/ujcread.o', 'PyWCSTools/libwcs/skybotread.o', 'PyWCSTools/libwcs/wcslib.o', 'PyWCSTools/libwcs/fitsfile.o', 'PyWCSTools/libwcs/catutil.o', 'PyWCSTools/libwcs/platefit.o', 'PyWCSTools/libwcs/imio.o', 'PyWCSTools/libwcs/hput.o', 'PyWCSTools/libwcs/matchstar.o', 'PyWCSTools/libwcs/distort.o', 'PyWCSTools/libwcs/sdssread.o', 'PyWCSTools/libwcs/ucacread.o', 'PyWCSTools/libwcs/fortwcs.o', 'PyWCSTools/libwcs/imsetwcs.o', 'PyWCSTools/libwcs/iget.o', 'PyWCSTools/libwcs/fileutil.o', 'PyWCSTools/libwcs/tnxpos.o', 'PyWCSTools/libwcs/ty2read.o', 'PyWCSTools/libwcs/wcsinit.o', 'PyWCSTools/libwcs/proj.o', 'PyWCSTools/libwcs/gsc2read.o', 'PyWCSTools/libwcs/tmcread.o', 'PyWCSTools/libwcs/webread.o', 'PyWCSTools/libwcs/imhfile.o', 'PyWCSTools/libwcs/ctgread.o', 'PyWCSTools/libwcs/imutil.o', 'PyWCSTools/libwcs/platepos.o', 'PyWCSTools/libwcs/ubcread.o', 'PyWCSTools/libwcs/daoread.o', 'PyWCSTools/libwcs/gscread.o', 'PyWCSTools/libwcs/findstar.o', 'PyWCSTools/libwcs/lin.o', 'PyWCSTools/libwcs/tabread.o', 'PyWCSTools/libwcs/hget.o', 'PyWCSTools/libwcs/wcscon.o', 'PyWCSTools/libwcs/cel.o', 'PyWCSTools/libwcs/imrotate.o', 'PyWCSTools/libwcs/binread.o', 'PyWCSTools/libwcs/dateutil.o', 'PyWCSTools/libwcs/dsspos.o', 'PyWCSTools/libwcs/sph.o', 'PyWCSTools/libwcs/imgetwcs.o', 'PyWCSTools/libwcs/sortstar.o', 'PyWCSTools/libwcs/wcs.o', 'PyWCSTools/libwcs/actread.o', 'PyWCSTools/libwcs/fitswcs.o', 'PyWCSTools/libwcs/worldpos.o', 'PyWCSTools/libwcs/wcstrig.o', 'PyWCSTools/libwcs/uacread.o']
--
- exampleScripts=glob.glob("scripts"+os.path.sep+"*.py")
- 
--class build_PyWCSTools_ext(build_ext):
--	
--    def build_extensions(self):
--        
--        os.chdir(sourceDir)
--        
--        cc=distutils.ccompiler.new_compiler(distutils.ccompiler.get_default_compiler())
--        distutils.command.config.customize_compiler(cc)
--        
--        # Suppress warnings from compiling WCSTools libwcs
--        if "-Wstrict-prototypes" in cc.compiler_so:
--            cc.compiler_so.pop(cc.compiler_so.index("-Wstrict-prototypes"))
--        if "-Wall" in cc.compiler_so:
--            cc.compiler_so.pop(cc.compiler_so.index("-Wall"))
--
--        WCSToolsCFiles=glob.glob("*.c")
--        WCSToolsCFiles.pop(WCSToolsCFiles.index("wcs_wrap.c"))
--        WCSToolsCFiles.pop(WCSToolsCFiles.index("wcscon_wrap.c"))
--        cc.compile(WCSToolsCFiles)
--        
--        os.chdir(topDir)
--        
--        build_ext.build_extensions(self)		
--
- setup(name='astLib',
-     version='0.4.0',
-     url='http://astlib.sourceforge.net',
-@@ -63,12 +35,11 @@
-     PyWCSTools is distributed (and developed) as part of astLib.""",
-     packages=['astLib', 'PyWCSTools'],
-     package_data={'astLib': ['data/*']},
--    cmdclass={"build_ext": build_PyWCSTools_ext},
-     scripts=exampleScripts,
-     ext_modules=[
-         Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"], 
--        extra_objects=oFiles),
-+        libraries=['wcstools']),
-         Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"], 
--        extra_objects=oFiles)
-+        libraries=['wcstools'])
-     ]
- 	)
diff --git a/dev-python/astlib/files/astlib-0.6.0-wcstools.patch b/dev-python/astlib/files/astlib-0.6.0-wcstools.patch
new file mode 100644
index 000000000..adf468db4
--- /dev/null
+++ b/dev-python/astlib/files/astlib-0.6.0-wcstools.patch
@@ -0,0 +1,56 @@
+Debundle wcstools
+
+--- a/setup.py
++++ b/setup.py
+@@ -13,36 +13,8 @@
+ topDir=os.getcwd()
+ sourceDir="PyWCSTools"+os.path.sep+"wcssubs-3.8.4"+os.path.sep
+ 
+-#oFiles=glob.glob(sourceDir+"*.o")
+-#print oFiles
+-oFiles=['PyWCSTools/wcssubs-3.8.4/cel.o', 'PyWCSTools/wcssubs-3.8.4/wcs.o', 'PyWCSTools/wcssubs-3.8.4/proj.o', 'PyWCSTools/wcssubs-3.8.4/distort.o', 'PyWCSTools/wcssubs-3.8.4/wcsinit.o', 'PyWCSTools/wcssubs-3.8.4/wcslib.o', 'PyWCSTools/wcssubs-3.8.4/poly.o', 'PyWCSTools/wcssubs-3.8.4/platepos.o', 'PyWCSTools/wcssubs-3.8.4/zpxpos.o', 'PyWCSTools/wcssubs-3.8.4/iget.o', 'PyWCSTools/wcssubs-3.8.4/imio.o', 'PyWCSTools/wcssubs-3.8.4/dsspos.o', 'PyWCSTools/wcssubs-3.8.4/tnxpos.o', 'PyWCSTools/wcssubs-3.8.4/wcscon.o', 'PyWCSTools/wcssubs-3.8.4/fitsfile.o', 'PyWCSTools/wcssubs-3.8.4/dateutil.o', 'PyWCSTools/wcssubs-3.8.4/imhfile.o', 'PyWCSTools/wcssubs-3.8.4/lin.o', 'PyWCSTools/wcssubs-3.8.4/fileutil.o', 'PyWCSTools/wcssubs-3.8.4/wcstrig.o', 'PyWCSTools/wcssubs-3.8.4/slasubs.o', 'PyWCSTools/wcssubs-3.8.4/sph.o', 'PyWCSTools/wcssubs-3.8.4/worldpos.o', 'PyWCSTools/wcssubs-3.8.4/hget.o', 'PyWCSTools/wcssubs-3.8.4/hput.o']
+-
+ exampleScripts=glob.glob("scripts"+os.path.sep+"*.py")
+ 
+-class build_PyWCSTools_ext(build_ext):
+-	
+-    def build_extensions(self):
+-        
+-        os.chdir(sourceDir)
+-        
+-        cc=distutils.ccompiler.new_compiler(distutils.ccompiler.get_default_compiler())
+-        distutils.command.config.customize_compiler(cc)
+-        
+-        # Suppress warnings from compiling WCSTools wcssubs-3.8.4
+-        if "-Wstrict-prototypes" in cc.compiler_so:
+-            cc.compiler_so.pop(cc.compiler_so.index("-Wstrict-prototypes"))
+-        if "-Wall" in cc.compiler_so:
+-            cc.compiler_so.pop(cc.compiler_so.index("-Wall"))
+-
+-        WCSToolsCFiles=glob.glob("*.c")
+-        WCSToolsCFiles.pop(WCSToolsCFiles.index("wcs_wrap.c"))
+-        WCSToolsCFiles.pop(WCSToolsCFiles.index("wcscon_wrap.c"))
+-        cc.compile(WCSToolsCFiles)
+-        
+-        os.chdir(topDir)
+-        
+-        build_ext.build_extensions(self)		
+-
+ setup(name='astLib',
+     version='0.6.0',
+     url='http://astlib.sourceforge.net',
+@@ -65,12 +37,11 @@
+     PyWCSTools is distributed (and developed) as part of astLib.""",
+     packages=['astLib', 'PyWCSTools'],
+     package_data={'astLib': ['data/*']},
+-    cmdclass={"build_ext": build_PyWCSTools_ext},
+     scripts=exampleScripts,
+     ext_modules=[
+         Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"], 
+-        extra_objects=oFiles),
++        libraries=['wcstools']),
+         Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"], 
+-        extra_objects=oFiles)
++        libraries=['wcstools'])
+     ]
+ 	)