Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-python/astlib/files/, dev-python/astlib/
Date: Mon, 29 Apr 2013 16:33:01
Message-Id: 1367251739.83822c69f38af72c1f9a296557e357bd86770891.bicatali@gentoo
1 commit: 83822c69f38af72c1f9a296557e357bd86770891
2 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 29 16:08:59 2013 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 29 16:08:59 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=83822c69
7
8 dev-python/astlib: Version bump
9
10 Package-Manager: portage-2.2.01.21890-prefix
11 RepoMan-Options: --force
12
13 ---
14 dev-python/astlib/ChangeLog | 8 ++-
15 .../{astlib-0.17.1.ebuild => astlib-0.7.0.ebuild} | 31 +++-----
16 .../astlib/files/astlib-0.17.1-wcstools.patch | 75 --------------------
17 dev-python/astlib/metadata.xml | 3 +-
18 4 files changed, 21 insertions(+), 96 deletions(-)
19
20 diff --git a/dev-python/astlib/ChangeLog b/dev-python/astlib/ChangeLog
21 index 7d86e57..9924530 100644
22 --- a/dev-python/astlib/ChangeLog
23 +++ b/dev-python/astlib/ChangeLog
24 @@ -1,7 +1,13 @@
25 # ChangeLog for dev-python/astlib
26 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 # $Header: $
29
30 +*astlib-0.7.0 (29 Apr 2013)
31 +
32 + 29 Apr 2013; Sébastien Fabbro <bicatali@g.o> +astlib-0.7.0.ebuild,
33 + -astlib-0.17.1.ebuild, -files/astlib-0.17.1-wcstools.patch, metadata.xml:
34 + dev-python/astlib: Version bump
35 +
36 *astlib-0.17.1 (06 Sep 2012)
37
38 06 Sep 2012; Sébastien Fabbro <bicatali@g.o> +astlib-0.17.1.ebuild,
39
40 diff --git a/dev-python/astlib/astlib-0.17.1.ebuild b/dev-python/astlib/astlib-0.7.0.ebuild
41 similarity index 50%
42 rename from dev-python/astlib/astlib-0.17.1.ebuild
43 rename to dev-python/astlib/astlib-0.7.0.ebuild
44 index 8d5beb6..7052b65 100644
45 --- a/dev-python/astlib/astlib-0.17.1.ebuild
46 +++ b/dev-python/astlib/astlib-0.7.0.ebuild
47 @@ -1,42 +1,35 @@
48 -# Copyright 1999-2012 Gentoo Foundation
49 +# Copyright 1999-2013 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: $
52
53 -EAPI=4
54 +EAPI=5
55
56 -SUPPORT_PYTHON_ABIS="1"
57 -RESTRICT_PYTHON_ABIS="3.*"
58 +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
59
60 -inherit distutils eutils
61 +inherit distutils-r1
62
63 MYPN=astLib
64 MYP=${MYPN}-${PV}
65
66 -DESCRIPTION="Python astronomy modules for coordinate conversion and manipulating FITS images"
67 +DESCRIPTION="Python astronomy modules for image and coordinate manipulation"
68 HOMEPAGE="http://astlib.sourceforge.net/"
69 SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
70
71 -IUSE="doc examples"
72 SLOT="0"
73 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
74 LICENSE="BSD"
75
76 -DEPEND="sci-astronomy/wcstools"
77 +IUSE="doc examples"
78 +
79 +DEPEND=""
80 RDEPEND="${DEPEND}
81 - dev-python/matplotlib
82 - dev-python/imaging
83 - dev-python/pyfits
84 - sci-libs/scipy"
85 + dev-python/matplotlib[${PYTHON_USEDEP}]
86 + sci-libs/scipy[${PYTHON_USEDEP}]
87 + virtual/pyfits[${PYTHON_USEDEP}]"
88
89 S="${WORKDIR}/${MYP}"
90
91 -src_prepare() {
92 - epatch "${FILESDIR}"/${PN}-0.17.1-wcstools.patch
93 - distutils_src_prepare
94 -}
95 -
96 -src_install() {
97 - distutils_src_install
98 +python_install_all() {
99 use doc && dohtml docs/${MYPN}/*
100 if use examples; then
101 insinto /usr/share/doc/${PF}
102
103 diff --git a/dev-python/astlib/files/astlib-0.17.1-wcstools.patch b/dev-python/astlib/files/astlib-0.17.1-wcstools.patch
104 deleted file mode 100644
105 index dac0a6a..0000000
106 --- a/dev-python/astlib/files/astlib-0.17.1-wcstools.patch
107 +++ /dev/null
108 @@ -1,75 +0,0 @@
109 ---- setup.py.orig 2012-09-06 09:40:12.270646957 -0700
110 -+++ setup.py 2012-09-06 09:45:04.370193374 -0700
111 -@@ -13,23 +13,23 @@
112 - exampleScripts=glob.glob("scripts"+os.path.sep+"*.py")
113 -
114 - class build_PyWCSTools_ext(build_ext):
115 --
116 -+
117 - def build_extensions(self):
118 --
119 -+
120 - os.chdir(sourceDir)
121 --
122 -+
123 - cc=distutils.ccompiler.new_compiler()
124 --
125 -- WCSToolsCFiles=["actread.c", "binread.c", "ctgread.c", "catutil.c", "cel.c", "daoread.c", "dateutil.c", "distort.c", "dsspos.c",
126 -+
127 -+ WCSToolsCFiles=["actread.c", "binread.c", "ctgread.c", "catutil.c", "cel.c", "daoread.c", "dateutil.c", "distort.c", "dsspos.c",
128 - "fileutil.c", "imutil.c", "findstar.c", "fitsfile.c", "fitswcs.c", "gscread.c", "gsc2read.c", "hget.c", "hput.c", "iget.c",
129 - "imgetwcs.c", "imhfile.c", "imio.c", "imsetwcs.c", "imrotate.c", "lin.c", "matchstar.c", "platefit.c", "platepos.c",
130 - "polfit.c", "proj.c", "sdssread.c", "sortstar.c", "sph.c", "tabread.c", "tmcread.c", "tnxpos.c", "ty2read.c", "uacread.c",
131 - "ubcread.c", "ucacread.c", "ujcread.c", "wcs.c", "wcsinit.c", "wcscon.c", "wcslib.c", "wcstrig.c", "webread.c", "worldpos.c"]
132 - cc.compile(WCSToolsCFiles)
133 --
134 -+
135 - os.chdir(topDir)
136 --
137 -- build_ext.build_extensions(self)
138 -+
139 -+ build_ext.build_extensions(self)
140 -
141 - setup(name='astLib',
142 - version='0.17.1',
143 -@@ -51,35 +51,11 @@
144 - with World Coordinate System (WCS) information through PyWCSTools - a simple wrapping of WCSTools by Doug Mink.
145 - PyWCSTools is distributed (and developed) as part of astLib.""",
146 - packages=['astLib', 'PyWCSTools'],
147 -- cmdclass={"build_ext": build_PyWCSTools_ext},
148 - scripts=exampleScripts,
149 - ext_modules=[
150 -- Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
151 -- extra_objects=[sourceDir+"actread.o", sourceDir+"binread.o", sourceDir+"ctgread.o", sourceDir+"catutil.o",
152 -- sourceDir+"cel.o", sourceDir+"daoread.o", sourceDir+"dateutil.o", sourceDir+"distort.o",
153 -- sourceDir+"dsspos.o", sourceDir+"fileutil.o", sourceDir+"imutil.o", sourceDir+"findstar.o",
154 -- sourceDir+"fitsfile.o", sourceDir+"fitswcs.o", sourceDir+"gscread.o", sourceDir+"gsc2read.o",
155 -- sourceDir+"hget.o", sourceDir+"hput.o", sourceDir+"iget.o", sourceDir+"imgetwcs.o",
156 -- sourceDir+"imhfile.o", sourceDir+"imio.o", sourceDir+"imsetwcs.o", sourceDir+"imrotate.o",
157 -- sourceDir+"lin.o", sourceDir+"matchstar.o", sourceDir+"platefit.o",
158 -- sourceDir+"platepos.o", sourceDir+"polfit.o", sourceDir+"proj.o", sourceDir+"sdssread.o",
159 -- sourceDir+"sortstar.o", sourceDir+"sph.o", sourceDir+"tabread.o", sourceDir+"tmcread.o",
160 -- sourceDir+"tnxpos.o", sourceDir+"ty2read.o", sourceDir+"uacread.o", sourceDir+"ubcread.o",
161 -- sourceDir+"ucacread.o", sourceDir+"ujcread.o", sourceDir+"wcs.o", sourceDir+"wcsinit.o",
162 -- sourceDir+"wcscon.o", sourceDir+"wcslib.o", sourceDir+"wcstrig.o", sourceDir+"webread.o",
163 -- sourceDir+"worldpos.o"]),
164 -- Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
165 -- extra_objects=[sourceDir+"actread.o", sourceDir+"binread.o", sourceDir+"ctgread.o", sourceDir+"catutil.o",
166 -- sourceDir+"cel.o", sourceDir+"daoread.o", sourceDir+"dateutil.o", sourceDir+"distort.o",
167 -- sourceDir+"dsspos.o", sourceDir+"fileutil.o", sourceDir+"imutil.o", sourceDir+"findstar.o",
168 -- sourceDir+"fitsfile.o", sourceDir+"fitswcs.o", sourceDir+"gscread.o", sourceDir+"gsc2read.o",
169 -- sourceDir+"hget.o", sourceDir+"hput.o", sourceDir+"iget.o", sourceDir+"imgetwcs.o",
170 -- sourceDir+"imhfile.o", sourceDir+"imio.o", sourceDir+"imsetwcs.o", sourceDir+"imrotate.o",
171 -- sourceDir+"lin.o", sourceDir+"matchstar.o", sourceDir+"platefit.o",
172 -- sourceDir+"platepos.o", sourceDir+"polfit.o", sourceDir+"proj.o", sourceDir+"sdssread.o",
173 -- sourceDir+"sortstar.o", sourceDir+"sph.o", sourceDir+"tabread.o", sourceDir+"tmcread.o",
174 -- sourceDir+"tnxpos.o", sourceDir+"ty2read.o", sourceDir+"uacread.o", sourceDir+"ubcread.o",
175 -- sourceDir+"ucacread.o", sourceDir+"ujcread.o", sourceDir+"wcs.o", sourceDir+"wcsinit.o",
176 -- sourceDir+"wcscon.o", sourceDir+"wcslib.o", sourceDir+"wcstrig.o", sourceDir+"webread.o",
177 -- sourceDir+"worldpos.o"])]
178 -+ Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
179 -+ libraries=['wcstools']),
180 -+ Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
181 -+ libraries=['wcstools'])]
182 -+
183 - )
184
185 diff --git a/dev-python/astlib/metadata.xml b/dev-python/astlib/metadata.xml
186 index 7f08aae..306677c 100644
187 --- a/dev-python/astlib/metadata.xml
188 +++ b/dev-python/astlib/metadata.xml
189 @@ -9,6 +9,7 @@
190 images with World Coordinate System (WCS) information through
191 PyWCSTools - a simple wrapping of WCSTools by Doug Mink. PyWCSTools
192 is distributed (and developed) as part of astLib.
193 - In Gentoo, PyWCSTools is using the stock library instead of the bundled one.
194 + In Gentoo, PyWCSTools is using the stock library instead of the
195 + bundled one.
196 </longdescription>
197 </pkgmetadata>