From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RnF01-0007ho-Cl for garchives@archives.gentoo.org; Tue, 17 Jan 2012 19:47:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23BAEE0662; Tue, 17 Jan 2012 19:47:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D3966E0662 for ; Tue, 17 Jan 2012 19:47:09 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CCE11B4018 for ; Tue, 17 Jan 2012 19:47:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8F1F280042 for ; Tue, 17 Jan 2012 19:47:08 +0000 (UTC) From: "Kacper Kowalik" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kacper Kowalik" Message-ID: <2497b68914a697b8248db4a67136c3c3e6ca60b2.xarthisius@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-python/astlib/files/, dev-python/astlib/ X-VCS-Repository: proj/sci X-VCS-Files: dev-python/astlib/astlib-0.4.0.ebuild dev-python/astlib/astlib-0.5.0.ebuild dev-python/astlib/astlib-0.6.0.ebuild dev-python/astlib/files/astlib-0.4.0-wcstools.patch dev-python/astlib/files/astlib-0.6.0-wcstools.patch X-VCS-Directories: dev-python/astlib/files/ dev-python/astlib/ X-VCS-Committer: xarthisius X-VCS-Committer-Name: Kacper Kowalik X-VCS-Revision: 2497b68914a697b8248db4a67136c3c3e6ca60b2 Date: Tue, 17 Jan 2012 19:47:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 76c0b402-3372-4e6d-8c3a-34992db10a00 X-Archives-Hash: 0f7211564bcd2cc1e6e0e39dc1ff1935 commit: 2497b68914a697b8248db4a67136c3c3e6ca60b2 Author: Kacper Kowalik (Xarthisius) gentoo org= > AuthorDate: Tue Jan 17 19:47:01 2012 +0000 Commit: Kacper Kowalik gentoo org> CommitDate: Tue Jan 17 19:47:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D2497b689 [dev-python/astlib] Version bump, drop old --- dev-python/astlib/astlib-0.4.0.ebuild | 48 --------------= --- .../{astlib-0.5.0.ebuild =3D> astlib-0.6.0.ebuild} | 14 +++--- .../astlib/files/astlib-0.4.0-wcstools.patch | 54 --------------= ----- .../astlib/files/astlib-0.6.0-wcstools.patch | 56 ++++++++++++++= ++++++ 4 files changed, 63 insertions(+), 109 deletions(-) diff --git a/dev-python/astlib/astlib-0.4.0.ebuild b/dev-python/astlib/as= tlib-0.4.0.ebuild deleted file mode 100644 index fe0482f..0000000 --- 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=3D3 - -PYTHON_DEPEND=3D"2" -SUPPORT_PYTHON_ABIS=3D"1" - -inherit distutils eutils - -MYPN=3DastLib -MYP=3D"${MYPN}-${PV}" - -DESCRIPTION=3D"Python astronomy modules for coordinate conversion and ma= nipulating FITS images" -HOMEPAGE=3D"http://astlib.sourceforge.net/" -SRC_URI=3D"mirror://sourceforge/${PN}/${MYP}.tar.gz" - -IUSE=3D"doc examples" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -LICENSE=3D"BSD" - -DEPEND=3D"sci-astronomy/wcstools" -RDEPEND=3D"${DEPEND} - dev-python/matplotlib - dev-python/imaging - dev-python/pyfits - sci-libs/scipy" - -RESTRICT_PYTHON_ABIS=3D"3.*" - -S=3D"${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/as= tlib-0.6.0.ebuild similarity index 85% rename from dev-python/astlib/astlib-0.5.0.ebuild rename to dev-python/astlib/astlib-0.6.0.ebuild index 0c8e516..2043982 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: $ =20 -EAPI=3D3 +EAPI=3D4 =20 PYTHON_DEPEND=3D"2" SUPPORT_PYTHON_ABIS=3D"1" +RESTRICT_PYTHON_ABIS=3D"3.*" =20 inherit distutils eutils =20 MYPN=3DastLib -MYP=3D"${MYPN}-${PV}" +MYP=3D${MYPN}-${PV} =20 DESCRIPTION=3D"Python astronomy modules for coordinate conversion and ma= nipulating FITS images" HOMEPAGE=3D"http://astlib.sourceforge.net/" @@ -28,21 +29,20 @@ RDEPEND=3D"${DEPEND} dev-python/pyfits sci-libs/scipy" =20 -RESTRICT_PYTHON_ABIS=3D"3.*" - S=3D${WORKDIR}/${MYP} =20 src_prepare() { - epatch "${FILESDIR}"/${PN}-0.4.0-wcstools.patch + epatch "${FILESDIR}"/${P}-wcstools.patch + distutils_src_prepare } =20 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-py= thon/astlib/files/astlib-0.4.0-wcstools.patch deleted file mode 100644 index dc3b655..0000000 --- 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=3Dos.getcwd() - sourceDir=3D"PyWCSTools"+os.path.sep+"libwcs"+os.path.sep -=20 --#oFiles=3Dglob.glob(sourceDir+"*.o") --#print oFiles --oFiles=3D['PyWCSTools/libwcs/ujcread.o', 'PyWCSTools/libwcs/skybotread.= o', 'PyWCSTools/libwcs/wcslib.o', 'PyWCSTools/libwcs/fitsfile.o', 'PyWCST= ools/libwcs/catutil.o', 'PyWCSTools/libwcs/platefit.o', 'PyWCSTools/libwc= s/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/im= setwcs.o', 'PyWCSTools/libwcs/iget.o', 'PyWCSTools/libwcs/fileutil.o', 'P= yWCSTools/libwcs/tnxpos.o', 'PyWCSTools/libwcs/ty2read.o', 'PyWCSTools/li= bwcs/wcsinit.o', 'PyWCSTools/libwcs/proj.o', 'PyWCSTools/libwcs/gsc2read.= o', 'PyWCSTools/libwcs/tmcread.o', 'PyWCSTools/libwcs/webread.o', 'PyWCST= ools/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', 'PyWCSToo= ls/libwcs/findstar.o', 'PyWCSTools/libwcs/l in.o', 'PyWCSTools/libwcs/tabread.o', 'PyWCSTools/libwcs/hget.o', 'PyWCS= Tools/libwcs/wcscon.o', 'PyWCSTools/libwcs/cel.o', 'PyWCSTools/libwcs/imr= otate.o', 'PyWCSTools/libwcs/binread.o', 'PyWCSTools/libwcs/dateutil.o', = 'PyWCSTools/libwcs/dsspos.o', 'PyWCSTools/libwcs/sph.o', 'PyWCSTools/libw= cs/imgetwcs.o', 'PyWCSTools/libwcs/sortstar.o', 'PyWCSTools/libwcs/wcs.o'= , 'PyWCSTools/libwcs/actread.o', 'PyWCSTools/libwcs/fitswcs.o', 'PyWCSToo= ls/libwcs/worldpos.o', 'PyWCSTools/libwcs/wcstrig.o', 'PyWCSTools/libwcs/= uacread.o'] -- - exampleScripts=3Dglob.glob("scripts"+os.path.sep+"*.py") -=20 --class build_PyWCSTools_ext(build_ext): --=09 -- def build_extensions(self): -- =20 -- os.chdir(sourceDir) -- =20 -- cc=3Ddistutils.ccompiler.new_compiler(distutils.ccompiler.get_d= efault_compiler()) -- distutils.command.config.customize_compiler(cc) -- =20 -- # Suppress warnings from compiling WCSTools libwcs -- if "-Wstrict-prototypes" in cc.compiler_so: -- cc.compiler_so.pop(cc.compiler_so.index("-Wstrict-prototype= s")) -- if "-Wall" in cc.compiler_so: -- cc.compiler_so.pop(cc.compiler_so.index("-Wall")) -- -- WCSToolsCFiles=3Dglob.glob("*.c") -- WCSToolsCFiles.pop(WCSToolsCFiles.index("wcs_wrap.c")) -- WCSToolsCFiles.pop(WCSToolsCFiles.index("wcscon_wrap.c")) -- cc.compile(WCSToolsCFiles) -- =20 -- os.chdir(topDir) -- =20 -- build_ext.build_extensions(self) =09 -- - setup(name=3D'astLib', - version=3D'0.4.0', - url=3D'http://astlib.sourceforge.net', -@@ -63,12 +35,11 @@ - PyWCSTools is distributed (and developed) as part of astLib.""", - packages=3D['astLib', 'PyWCSTools'], - package_data=3D{'astLib': ['data/*']}, -- cmdclass=3D{"build_ext": build_PyWCSTools_ext}, - scripts=3DexampleScripts, - ext_modules=3D[ - Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],=20 -- extra_objects=3DoFiles), -+ libraries=3D['wcstools']), - Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],=20 -- extra_objects=3DoFiles) -+ libraries=3D['wcstools']) - ] - ) diff --git a/dev-python/astlib/files/astlib-0.6.0-wcstools.patch b/dev-py= thon/astlib/files/astlib-0.6.0-wcstools.patch new file mode 100644 index 0000000..adf468d --- /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=3Dos.getcwd() + sourceDir=3D"PyWCSTools"+os.path.sep+"wcssubs-3.8.4"+os.path.sep +=20 +-#oFiles=3Dglob.glob(sourceDir+"*.o") +-#print oFiles +-oFiles=3D['PyWCSTools/wcssubs-3.8.4/cel.o', 'PyWCSTools/wcssubs-3.8.4/w= cs.o', 'PyWCSTools/wcssubs-3.8.4/proj.o', 'PyWCSTools/wcssubs-3.8.4/disto= rt.o', 'PyWCSTools/wcssubs-3.8.4/wcsinit.o', 'PyWCSTools/wcssubs-3.8.4/wc= slib.o', 'PyWCSTools/wcssubs-3.8.4/poly.o', 'PyWCSTools/wcssubs-3.8.4/pla= tepos.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/dss= pos.o', 'PyWCSTools/wcssubs-3.8.4/tnxpos.o', 'PyWCSTools/wcssubs-3.8.4/wc= scon.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/wcssub= s-3.8.4/sph.o', 'PyWCSTools/wcssubs-3.8.4/worldpos.o', 'PyWCSTools/wcssub= s-3.8.4/hget.o', 'PyWCSTools/wcssubs-3.8.4/hput.o'] +- + exampleScripts=3Dglob.glob("scripts"+os.path.sep+"*.py") +=20 +-class build_PyWCSTools_ext(build_ext): +-=09 +- def build_extensions(self): +- =20 +- os.chdir(sourceDir) +- =20 +- cc=3Ddistutils.ccompiler.new_compiler(distutils.ccompiler.get_d= efault_compiler()) +- distutils.command.config.customize_compiler(cc) +- =20 +- # 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-prototype= s")) +- if "-Wall" in cc.compiler_so: +- cc.compiler_so.pop(cc.compiler_so.index("-Wall")) +- +- WCSToolsCFiles=3Dglob.glob("*.c") +- WCSToolsCFiles.pop(WCSToolsCFiles.index("wcs_wrap.c")) +- WCSToolsCFiles.pop(WCSToolsCFiles.index("wcscon_wrap.c")) +- cc.compile(WCSToolsCFiles) +- =20 +- os.chdir(topDir) +- =20 +- build_ext.build_extensions(self) =09 +- + setup(name=3D'astLib', + version=3D'0.6.0', + url=3D'http://astlib.sourceforge.net', +@@ -65,12 +37,11 @@ + PyWCSTools is distributed (and developed) as part of astLib.""", + packages=3D['astLib', 'PyWCSTools'], + package_data=3D{'astLib': ['data/*']}, +- cmdclass=3D{"build_ext": build_PyWCSTools_ext}, + scripts=3DexampleScripts, + ext_modules=3D[ + Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],=20 +- extra_objects=3DoFiles), ++ libraries=3D['wcstools']), + Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],=20 +- extra_objects=3DoFiles) ++ libraries=3D['wcstools']) + ] + )