diff options
author | Kacper Kowalik <xarthisius@gentoo.org> | 2012-04-20 14:38:57 +0000 |
---|---|---|
committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-04-20 14:38:57 +0000 |
commit | 351c031a2560ec4f1d5b85ff45b0bcc5fc7781ac (patch) | |
tree | 2f76a6194d44d40786999f04cad6add6b8199048 /sci-astronomy | |
parent | Marked stable on AMD64 based on arch testing by Maurizio "k01" Camisaschi & E... (diff) | |
download | historical-351c031a2560ec4f1d5b85ff45b0bcc5fc7781ac.tar.gz historical-351c031a2560ec4f1d5b85ff45b0bcc5fc7781ac.tar.bz2 historical-351c031a2560ec4f1d5b85ff45b0bcc5fc7781ac.zip |
Version bump, debundle wcslib
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/kapteyn/ChangeLog | 8 | ||||
-rw-r--r-- | sci-astronomy/kapteyn/Manifest | 25 | ||||
-rw-r--r-- | sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch | 101 | ||||
-rw-r--r-- | sci-astronomy/kapteyn/kapteyn-2.2.ebuild | 38 |
4 files changed, 170 insertions, 2 deletions
diff --git a/sci-astronomy/kapteyn/ChangeLog b/sci-astronomy/kapteyn/ChangeLog index 8efc97dfe675..ebdd1e80cc13 100644 --- a/sci-astronomy/kapteyn/ChangeLog +++ b/sci-astronomy/kapteyn/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-astronomy/kapteyn # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/ChangeLog,v 1.8 2012/02/28 00:44:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/ChangeLog,v 1.9 2012/04/20 14:38:57 xarthisius Exp $ + +*kapteyn-2.2 (20 Apr 2012) + + 20 Apr 2012; Kacper Kowalik <xarthisius@gentoo.org> + +files/kapteyn-2.2-debundle_wcs.patch, +kapteyn-2.2.ebuild: + Version bump, debundle wcslib 28 Feb 2012; Patrick Lauer <patrick@gentoo.org> kapteyn-2.1.ebuild: Restricting pypy and jython diff --git a/sci-astronomy/kapteyn/Manifest b/sci-astronomy/kapteyn/Manifest index c0e484297bfa..497d421b8486 100644 --- a/sci-astronomy/kapteyn/Manifest +++ b/sci-astronomy/kapteyn/Manifest @@ -1,4 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX kapteyn-2.2-debundle_wcs.patch 2378 RMD160 49131fc4ab443813cf6a91147d41b3b77e7911b9 SHA1 59b612e3f8e9894a3403e979b630b916a575f40e SHA256 60ed3ff0b4195d83753a2e9027993180061ee774527f4092ed312bbabd74e239 DIST kapteyn-2.1.tar.gz 10265902 RMD160 7f058385439d52e484fbfab18ddbc31b22c45f12 SHA1 c041f6858a1e712abd31480eb62100513007639c SHA256 277ac944a56f8e01dcc8133e08895ecf98289e79a6f955284cbc541de7e57dd5 +DIST kapteyn-2.2.tar.gz 11818056 RMD160 b5b6340f24d60953ddc5f22d9ea743171282707f SHA1 56caaa6ab47cea9405617debe51c4bf2b33e8f72 SHA256 7826a8eeab42e0167f3c9d8ad3444a213b24a34095ff1dd68f0f3254d9fce0ac EBUILD kapteyn-2.1.ebuild 713 RMD160 c4a8994a3c8c5217a549ae9b4f47217c7bc50a7b SHA1 c2e07b03e5b3dea63dc66ecebf6a965486b13550 SHA256 534453705452dd5f39b3c8d7ea77cafc5a6e08281cf3ea9fe8e7b85a85d313ed -MISC ChangeLog 1179 RMD160 8feed4de7f0bde10456f6da9121adf3f9da28715 SHA1 f8035ed6a5abdb1599c86bfe9fa8a2d1c8578417 SHA256 223e6bd32777b218481778483afddf8c0244dfa444f0401f78f6f4ba9dd1a684 +EBUILD kapteyn-2.2.ebuild 913 RMD160 06dcbd7638f065385a763441e1acfad07e3cc463 SHA1 ae27a9d55d6374d0a9a1e28015ea8e7a42170ac4 SHA256 bd3835f70a72f5c1c4061e863f4fa41e55892310aaed1753580e8049424ea13b +MISC ChangeLog 1359 RMD160 9d1f8102636033949a635fbd4d2a0f7818443f0e SHA1 a76c1cbd500bf5fca946499a7613a9d834de5e23 SHA256 566f2f77294d5f90d2dabc1a5c9f8b5f44752d13c25e30e74b1edc377840dbca MISC metadata.xml 511 RMD160 dd82416504ad85efdd65ec9a9ee0694995398b7d SHA1 e13d8e650282eec7862ec2c75d0fee265e34f984 SHA256 ff0f605ad17e795b93349c49dcd6fa7f69e6bd668b1175492f921a14eb5a36f2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJPkXUKAAoJEF0huFKJUZL50WkQAIysZfqb+5h9WdM3JOf3cKN3 +KfwT2wQCjRYpKlQ72H8H0itFrGlwmcpq5Da5A3hy1o2MQlkFnkvatPefIJZ0MEjb +tIgCjmNYQ1vxTLRNKSUZR1lI65mr70jMDHjGF/m9iL/o8Ssra4dnSBVNfTpbsTNb +HvcYA5N4hn90jWK0c2kT+d/2qSNNmWAyz8Kwi4snEjcYcJyVPKl872hPvM2VDCZn +wQUDbFMpfRaVCA8kaqd/ib5z+3r8k/koAM9UsoZVECHNpb1aEyaXbttu6WLAZ0Vo +iAPa1eiqtnb9W7GzV0ViLFZrI8EWQej1PndOdNGw6CVDfAAymYApkgUzoChTavP+ +/QZbUZ85lh+m4zeWPI/zKeXRqteCgB1QQKbGWEIdkMbzMxTO8xi5NwHWfQqlJyJs +fwVG+61313alrKA8ndfJtvFiuOf9xYJzZWPc/yKSn/Iw7sr2HSTJ/hjfwRmyrplp +7PmZsfaHDX+eLGKPjr9SqhwRjtt3ICoHQFTpTdYkNWG2ExiVIVMOedwwMcryPWVV +Es8ifOKjqrUaBSCR5UX/6DuqtiUVyHCGdASHPeL8lqCtw+z1GIqWI5Vpo7mu1KS/ +9Fk3SLZDTP/Gy8fD1beMvWDXAowJWejVT4EvFzPlv/LTz8tgNqXCnkYlDNe6GPJ4 +NfVLn05zYJ5NbzVrlcE/ +=mlrg +-----END PGP SIGNATURE----- diff --git a/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch b/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch new file mode 100644 index 000000000000..d657c27bcc53 --- /dev/null +++ b/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch @@ -0,0 +1,101 @@ +Use system wcslib + +Patch written by Kacper Kowalik <xarthisius@gentoo.org> + +--- a/setup.py ++++ b/setup.py +@@ -3,7 +3,8 @@ + from kapteyn import __version__ as version + from glob import glob + import sys, os +- ++from subprocess import Popen, PIPE ++from re import match + try: + import numpy + except: +@@ -14,21 +15,27 @@ + ''' + sys.exit(1) + +-try: +- wcslib_dir = glob('src/wcslib*/C/')[0] +-except: +- print ''' +--- Error. +-Unable to find WCSLIB source distribution. +-''' +- sys.exit(1) ++def pkgconfig(*packages, **kw): ++ flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} ++ arg = "--libs --cflags --modversion %s" % ' '.join(packages) ++ for tok in Popen(["pkg-config "+ arg],stdout=PIPE, shell=True).communicate()[0].split(): ++ token = tok.decode("utf-8") ++ if(match("[0-9]",token)): ++ kw.setdefault("version",[]).append(token) ++ else: ++ kw.setdefault(flag_map.get(token[:2]), []).append(token[2:]) ++ return kw + + include_dirs = [] + numdir = os.path.dirname(numpy.__file__) + ipath = os.path.join(numdir, numpy.get_include()) + include_dirs.append(ipath) + include_dirs.append('src') +-include_dirs.append(wcslib_dir) ++ ++WCSLIB = pkgconfig('wcslib') ++WCSVERSION = WCSLIB['version'][0] ++ ++include_dirs += WCSLIB['include_dirs'] + + short_descr = "Kapteyn Package: Python modules for astronomical applications" + +@@ -94,27 +101,6 @@ + "xyz.c" + ] + +-wcslib_src = [ +- "cel.c", +- "lin.c", +- "log.c", +- "prj.c", +- "spc.c", +- "sph.c", +- "spx.c", +- "tab.c", +- "wcs.c", +- "wcsfix.c", +- "wcshdr.c", +- "wcsprintf.c", +- "wcstrig.c", +- "wcsunits.c", +- "wcsutil.c", +- "wcserr.c", +- "flexed/wcsulex.c", +- "flexed/wcsutrn.c" +-] +- + ndimg_src = [ + "nd_image.c", + "ni_filters.c", +@@ -125,8 +111,7 @@ + "ni_support.c", + ] + +-wcs_src = ( ['src/' + source for source in wcsmod_src] +- + [wcslib_dir + source for source in wcslib_src] ) ++wcs_src = ( ['src/' + source for source in wcsmod_src] ) + + _nd_image_src = ['src/ndimg/' + source for source in ndimg_src] + +@@ -168,7 +153,8 @@ + Extension( + "wcs", wcs_src, + include_dirs=include_dirs, +- define_macros=define_macros ++ define_macros=define_macros, ++ libraries=WCSLIB['libraries'] + ), + Extension( + "ascarray", diff --git a/sci-astronomy/kapteyn/kapteyn-2.2.ebuild b/sci-astronomy/kapteyn/kapteyn-2.2.ebuild new file mode 100644 index 000000000000..78b3bb0515d3 --- /dev/null +++ b/sci-astronomy/kapteyn/kapteyn-2.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/kapteyn-2.2.ebuild,v 1.1 2012/04/20 14:38:56 xarthisius Exp $ + +EAPI="3" + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" + +inherit eutils distutils + +DESCRIPTION="Collection of python tools for astronomy" +HOMEPAGE="http://www.astro.rug.nl/software/kapteyn" +SRC_URI="http://www.astro.rug.nl/software/kapteyn/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=sci-astronomy/wcslib-4.13.4 + dev-python/numpy" +RDEPEND="${DEPEND}" + +PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") +DOCS="CHANGES.txt README.txt" + +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}"/${P}-debundle_wcs.patch + rm -rf src/wcslib-4.* +} + +src_install() { + distutils_src_install + dodoc doc/${PN}.pdf || die +} |