* [gentoo-commits] proj/sci:master commit in: dev-python/astlib/files/, dev-python/astlib/
@ 2012-01-17 19:47 Kacper Kowalik
0 siblings, 0 replies; 3+ messages in thread
From: Kacper Kowalik @ 2012-01-17 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 2497b68914a697b8248db4a67136c3c3e6ca60b2
Author: Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 19:47:01 2012 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 19:47:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2497b689
[dev-python/astlib] Version bump, drop old
---
dev-python/astlib/astlib-0.4.0.ebuild | 48 -----------------
.../{astlib-0.5.0.ebuild => 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/astlib-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=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
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: $
-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 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=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/l
in.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 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=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'])
+ ]
+ )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/astlib/files/, dev-python/astlib/
@ 2012-09-06 17:02 Sebastien Fabbro
0 siblings, 0 replies; 3+ messages in thread
From: Sebastien Fabbro @ 2012-09-06 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 10286eee69337b883375373670697a1d5f17bdf7
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 6 17:01:50 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Sep 6 17:01:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=10286eee
dev-python/astlib: Version bump
(Portage version: 2.2.01.20894-prefix/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
dev-python/astlib/ChangeLog | 8 ++-
.../{astlib-0.6.1.ebuild => astlib-0.17.1.ebuild} | 5 +-
.../astlib/files/astlib-0.17.1-wcstools.patch | 75 ++++++++++++++++++++
.../astlib/files/astlib-0.6.0-wcstools.patch | 56 ---------------
4 files changed, 84 insertions(+), 60 deletions(-)
diff --git a/dev-python/astlib/ChangeLog b/dev-python/astlib/ChangeLog
index 46252be..7d86e57 100644
--- a/dev-python/astlib/ChangeLog
+++ b/dev-python/astlib/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*astlib-0.17.1 (06 Sep 2012)
+
+ 06 Sep 2012; Sébastien Fabbro <bicatali@gentoo.org> +astlib-0.17.1.ebuild,
+ +files/astlib-0.17.1-wcstools.patch, -astlib-0.6.1.ebuild,
+ -files/astlib-0.6.0-wcstools.patch:
+ dev-python/astlib: Version bump
+
*astlib-0.6.1 (20 Apr 2012)
20 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> -astlib-0.6.0.ebuild,
@@ -21,4 +28,3 @@
15 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> +astlib-0.4.0.ebuild,
+files/astlib-0.4.0-wcstools.patch, +metadata.xml:
Initial import
-
diff --git a/dev-python/astlib/astlib-0.6.1.ebuild b/dev-python/astlib/astlib-0.17.1.ebuild
similarity index 89%
rename from dev-python/astlib/astlib-0.6.1.ebuild
rename to dev-python/astlib/astlib-0.17.1.ebuild
index 28a6d47..8d5beb6 100644
--- a/dev-python/astlib/astlib-0.6.1.ebuild
+++ b/dev-python/astlib/astlib-0.17.1.ebuild
@@ -4,7 +4,6 @@
EAPI=4
-PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
@@ -19,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
IUSE="doc examples"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="BSD"
DEPEND="sci-astronomy/wcstools"
@@ -32,7 +31,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MYP}"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.6.0-wcstools.patch
+ epatch "${FILESDIR}"/${PN}-0.17.1-wcstools.patch
distutils_src_prepare
}
diff --git a/dev-python/astlib/files/astlib-0.17.1-wcstools.patch b/dev-python/astlib/files/astlib-0.17.1-wcstools.patch
new file mode 100644
index 0000000..dac0a6a
--- /dev/null
+++ b/dev-python/astlib/files/astlib-0.17.1-wcstools.patch
@@ -0,0 +1,75 @@
+--- setup.py.orig 2012-09-06 09:40:12.270646957 -0700
++++ setup.py 2012-09-06 09:45:04.370193374 -0700
+@@ -13,23 +13,23 @@
+ 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()
+-
+- WCSToolsCFiles=["actread.c", "binread.c", "ctgread.c", "catutil.c", "cel.c", "daoread.c", "dateutil.c", "distort.c", "dsspos.c",
++
++ WCSToolsCFiles=["actread.c", "binread.c", "ctgread.c", "catutil.c", "cel.c", "daoread.c", "dateutil.c", "distort.c", "dsspos.c",
+ "fileutil.c", "imutil.c", "findstar.c", "fitsfile.c", "fitswcs.c", "gscread.c", "gsc2read.c", "hget.c", "hput.c", "iget.c",
+ "imgetwcs.c", "imhfile.c", "imio.c", "imsetwcs.c", "imrotate.c", "lin.c", "matchstar.c", "platefit.c", "platepos.c",
+ "polfit.c", "proj.c", "sdssread.c", "sortstar.c", "sph.c", "tabread.c", "tmcread.c", "tnxpos.c", "ty2read.c", "uacread.c",
+ "ubcread.c", "ucacread.c", "ujcread.c", "wcs.c", "wcsinit.c", "wcscon.c", "wcslib.c", "wcstrig.c", "webread.c", "worldpos.c"]
+ cc.compile(WCSToolsCFiles)
+-
++
+ os.chdir(topDir)
+-
+- build_ext.build_extensions(self)
++
++ build_ext.build_extensions(self)
+
+ setup(name='astLib',
+ version='0.17.1',
+@@ -51,35 +51,11 @@
+ with World Coordinate System (WCS) information through PyWCSTools - a simple wrapping of WCSTools by Doug Mink.
+ PyWCSTools is distributed (and developed) as part of astLib.""",
+ packages=['astLib', 'PyWCSTools'],
+- cmdclass={"build_ext": build_PyWCSTools_ext},
+ scripts=exampleScripts,
+ ext_modules=[
+- Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
+- extra_objects=[sourceDir+"actread.o", sourceDir+"binread.o", sourceDir+"ctgread.o", sourceDir+"catutil.o",
+- sourceDir+"cel.o", sourceDir+"daoread.o", sourceDir+"dateutil.o", sourceDir+"distort.o",
+- sourceDir+"dsspos.o", sourceDir+"fileutil.o", sourceDir+"imutil.o", sourceDir+"findstar.o",
+- sourceDir+"fitsfile.o", sourceDir+"fitswcs.o", sourceDir+"gscread.o", sourceDir+"gsc2read.o",
+- sourceDir+"hget.o", sourceDir+"hput.o", sourceDir+"iget.o", sourceDir+"imgetwcs.o",
+- sourceDir+"imhfile.o", sourceDir+"imio.o", sourceDir+"imsetwcs.o", sourceDir+"imrotate.o",
+- sourceDir+"lin.o", sourceDir+"matchstar.o", sourceDir+"platefit.o",
+- sourceDir+"platepos.o", sourceDir+"polfit.o", sourceDir+"proj.o", sourceDir+"sdssread.o",
+- sourceDir+"sortstar.o", sourceDir+"sph.o", sourceDir+"tabread.o", sourceDir+"tmcread.o",
+- sourceDir+"tnxpos.o", sourceDir+"ty2read.o", sourceDir+"uacread.o", sourceDir+"ubcread.o",
+- sourceDir+"ucacread.o", sourceDir+"ujcread.o", sourceDir+"wcs.o", sourceDir+"wcsinit.o",
+- sourceDir+"wcscon.o", sourceDir+"wcslib.o", sourceDir+"wcstrig.o", sourceDir+"webread.o",
+- sourceDir+"worldpos.o"]),
+- Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
+- extra_objects=[sourceDir+"actread.o", sourceDir+"binread.o", sourceDir+"ctgread.o", sourceDir+"catutil.o",
+- sourceDir+"cel.o", sourceDir+"daoread.o", sourceDir+"dateutil.o", sourceDir+"distort.o",
+- sourceDir+"dsspos.o", sourceDir+"fileutil.o", sourceDir+"imutil.o", sourceDir+"findstar.o",
+- sourceDir+"fitsfile.o", sourceDir+"fitswcs.o", sourceDir+"gscread.o", sourceDir+"gsc2read.o",
+- sourceDir+"hget.o", sourceDir+"hput.o", sourceDir+"iget.o", sourceDir+"imgetwcs.o",
+- sourceDir+"imhfile.o", sourceDir+"imio.o", sourceDir+"imsetwcs.o", sourceDir+"imrotate.o",
+- sourceDir+"lin.o", sourceDir+"matchstar.o", sourceDir+"platefit.o",
+- sourceDir+"platepos.o", sourceDir+"polfit.o", sourceDir+"proj.o", sourceDir+"sdssread.o",
+- sourceDir+"sortstar.o", sourceDir+"sph.o", sourceDir+"tabread.o", sourceDir+"tmcread.o",
+- sourceDir+"tnxpos.o", sourceDir+"ty2read.o", sourceDir+"uacread.o", sourceDir+"ubcread.o",
+- sourceDir+"ucacread.o", sourceDir+"ujcread.o", sourceDir+"wcs.o", sourceDir+"wcsinit.o",
+- sourceDir+"wcscon.o", sourceDir+"wcslib.o", sourceDir+"wcstrig.o", sourceDir+"webread.o",
+- sourceDir+"worldpos.o"])]
++ Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
++ libraries=['wcstools']),
++ Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
++ 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
deleted file mode 100644
index adf468d..0000000
--- a/dev-python/astlib/files/astlib-0.6.0-wcstools.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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'])
- ]
- )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/astlib/files/, dev-python/astlib/
@ 2013-04-29 16:32 Sebastien Fabbro
0 siblings, 0 replies; 3+ messages in thread
From: Sebastien Fabbro @ 2013-04-29 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 83822c69f38af72c1f9a296557e357bd86770891
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 16:08:59 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 16:08:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=83822c69
dev-python/astlib: Version bump
Package-Manager: portage-2.2.01.21890-prefix
RepoMan-Options: --force
---
dev-python/astlib/ChangeLog | 8 ++-
.../{astlib-0.17.1.ebuild => astlib-0.7.0.ebuild} | 31 +++-----
.../astlib/files/astlib-0.17.1-wcstools.patch | 75 --------------------
dev-python/astlib/metadata.xml | 3 +-
4 files changed, 21 insertions(+), 96 deletions(-)
diff --git a/dev-python/astlib/ChangeLog b/dev-python/astlib/ChangeLog
index 7d86e57..9924530 100644
--- a/dev-python/astlib/ChangeLog
+++ b/dev-python/astlib/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-python/astlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*astlib-0.7.0 (29 Apr 2013)
+
+ 29 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +astlib-0.7.0.ebuild,
+ -astlib-0.17.1.ebuild, -files/astlib-0.17.1-wcstools.patch, metadata.xml:
+ dev-python/astlib: Version bump
+
*astlib-0.17.1 (06 Sep 2012)
06 Sep 2012; Sébastien Fabbro <bicatali@gentoo.org> +astlib-0.17.1.ebuild,
diff --git a/dev-python/astlib/astlib-0.17.1.ebuild b/dev-python/astlib/astlib-0.7.0.ebuild
similarity index 50%
rename from dev-python/astlib/astlib-0.17.1.ebuild
rename to dev-python/astlib/astlib-0.7.0.ebuild
index 8d5beb6..7052b65 100644
--- a/dev-python/astlib/astlib-0.17.1.ebuild
+++ b/dev-python/astlib/astlib-0.7.0.ebuild
@@ -1,42 +1,35 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-inherit distutils eutils
+inherit distutils-r1
MYPN=astLib
MYP=${MYPN}-${PV}
-DESCRIPTION="Python astronomy modules for coordinate conversion and manipulating FITS images"
+DESCRIPTION="Python astronomy modules for image and coordinate manipulation"
HOMEPAGE="http://astlib.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-IUSE="doc examples"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="BSD"
-DEPEND="sci-astronomy/wcstools"
+IUSE="doc examples"
+
+DEPEND=""
RDEPEND="${DEPEND}
- dev-python/matplotlib
- dev-python/imaging
- dev-python/pyfits
- sci-libs/scipy"
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ virtual/pyfits[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MYP}"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.17.1-wcstools.patch
- distutils_src_prepare
-}
-
-src_install() {
- distutils_src_install
+python_install_all() {
use doc && dohtml docs/${MYPN}/*
if use examples; then
insinto /usr/share/doc/${PF}
diff --git a/dev-python/astlib/files/astlib-0.17.1-wcstools.patch b/dev-python/astlib/files/astlib-0.17.1-wcstools.patch
deleted file mode 100644
index dac0a6a..0000000
--- a/dev-python/astlib/files/astlib-0.17.1-wcstools.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- setup.py.orig 2012-09-06 09:40:12.270646957 -0700
-+++ setup.py 2012-09-06 09:45:04.370193374 -0700
-@@ -13,23 +13,23 @@
- 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()
--
-- WCSToolsCFiles=["actread.c", "binread.c", "ctgread.c", "catutil.c", "cel.c", "daoread.c", "dateutil.c", "distort.c", "dsspos.c",
-+
-+ WCSToolsCFiles=["actread.c", "binread.c", "ctgread.c", "catutil.c", "cel.c", "daoread.c", "dateutil.c", "distort.c", "dsspos.c",
- "fileutil.c", "imutil.c", "findstar.c", "fitsfile.c", "fitswcs.c", "gscread.c", "gsc2read.c", "hget.c", "hput.c", "iget.c",
- "imgetwcs.c", "imhfile.c", "imio.c", "imsetwcs.c", "imrotate.c", "lin.c", "matchstar.c", "platefit.c", "platepos.c",
- "polfit.c", "proj.c", "sdssread.c", "sortstar.c", "sph.c", "tabread.c", "tmcread.c", "tnxpos.c", "ty2read.c", "uacread.c",
- "ubcread.c", "ucacread.c", "ujcread.c", "wcs.c", "wcsinit.c", "wcscon.c", "wcslib.c", "wcstrig.c", "webread.c", "worldpos.c"]
- cc.compile(WCSToolsCFiles)
--
-+
- os.chdir(topDir)
--
-- build_ext.build_extensions(self)
-+
-+ build_ext.build_extensions(self)
-
- setup(name='astLib',
- version='0.17.1',
-@@ -51,35 +51,11 @@
- with World Coordinate System (WCS) information through PyWCSTools - a simple wrapping of WCSTools by Doug Mink.
- PyWCSTools is distributed (and developed) as part of astLib.""",
- packages=['astLib', 'PyWCSTools'],
-- cmdclass={"build_ext": build_PyWCSTools_ext},
- scripts=exampleScripts,
- ext_modules=[
-- Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
-- extra_objects=[sourceDir+"actread.o", sourceDir+"binread.o", sourceDir+"ctgread.o", sourceDir+"catutil.o",
-- sourceDir+"cel.o", sourceDir+"daoread.o", sourceDir+"dateutil.o", sourceDir+"distort.o",
-- sourceDir+"dsspos.o", sourceDir+"fileutil.o", sourceDir+"imutil.o", sourceDir+"findstar.o",
-- sourceDir+"fitsfile.o", sourceDir+"fitswcs.o", sourceDir+"gscread.o", sourceDir+"gsc2read.o",
-- sourceDir+"hget.o", sourceDir+"hput.o", sourceDir+"iget.o", sourceDir+"imgetwcs.o",
-- sourceDir+"imhfile.o", sourceDir+"imio.o", sourceDir+"imsetwcs.o", sourceDir+"imrotate.o",
-- sourceDir+"lin.o", sourceDir+"matchstar.o", sourceDir+"platefit.o",
-- sourceDir+"platepos.o", sourceDir+"polfit.o", sourceDir+"proj.o", sourceDir+"sdssread.o",
-- sourceDir+"sortstar.o", sourceDir+"sph.o", sourceDir+"tabread.o", sourceDir+"tmcread.o",
-- sourceDir+"tnxpos.o", sourceDir+"ty2read.o", sourceDir+"uacread.o", sourceDir+"ubcread.o",
-- sourceDir+"ucacread.o", sourceDir+"ujcread.o", sourceDir+"wcs.o", sourceDir+"wcsinit.o",
-- sourceDir+"wcscon.o", sourceDir+"wcslib.o", sourceDir+"wcstrig.o", sourceDir+"webread.o",
-- sourceDir+"worldpos.o"]),
-- Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
-- extra_objects=[sourceDir+"actread.o", sourceDir+"binread.o", sourceDir+"ctgread.o", sourceDir+"catutil.o",
-- sourceDir+"cel.o", sourceDir+"daoread.o", sourceDir+"dateutil.o", sourceDir+"distort.o",
-- sourceDir+"dsspos.o", sourceDir+"fileutil.o", sourceDir+"imutil.o", sourceDir+"findstar.o",
-- sourceDir+"fitsfile.o", sourceDir+"fitswcs.o", sourceDir+"gscread.o", sourceDir+"gsc2read.o",
-- sourceDir+"hget.o", sourceDir+"hput.o", sourceDir+"iget.o", sourceDir+"imgetwcs.o",
-- sourceDir+"imhfile.o", sourceDir+"imio.o", sourceDir+"imsetwcs.o", sourceDir+"imrotate.o",
-- sourceDir+"lin.o", sourceDir+"matchstar.o", sourceDir+"platefit.o",
-- sourceDir+"platepos.o", sourceDir+"polfit.o", sourceDir+"proj.o", sourceDir+"sdssread.o",
-- sourceDir+"sortstar.o", sourceDir+"sph.o", sourceDir+"tabread.o", sourceDir+"tmcread.o",
-- sourceDir+"tnxpos.o", sourceDir+"ty2read.o", sourceDir+"uacread.o", sourceDir+"ubcread.o",
-- sourceDir+"ucacread.o", sourceDir+"ujcread.o", sourceDir+"wcs.o", sourceDir+"wcsinit.o",
-- sourceDir+"wcscon.o", sourceDir+"wcslib.o", sourceDir+"wcstrig.o", sourceDir+"webread.o",
-- sourceDir+"worldpos.o"])]
-+ Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
-+ libraries=['wcstools']),
-+ Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
-+ libraries=['wcstools'])]
-+
- )
diff --git a/dev-python/astlib/metadata.xml b/dev-python/astlib/metadata.xml
index 7f08aae..306677c 100644
--- a/dev-python/astlib/metadata.xml
+++ b/dev-python/astlib/metadata.xml
@@ -9,6 +9,7 @@
images with World Coordinate System (WCS) information through
PyWCSTools - a simple wrapping of WCSTools by Doug Mink. PyWCSTools
is distributed (and developed) as part of astLib.
- In Gentoo, PyWCSTools is using the stock library instead of the bundled one.
+ In Gentoo, PyWCSTools is using the stock library instead of the
+ bundled one.
</longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-29 16:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-29 16:32 [gentoo-commits] proj/sci:master commit in: dev-python/astlib/files/, dev-python/astlib/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2012-09-06 17:02 Sebastien Fabbro
2012-01-17 19:47 Kacper Kowalik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox