diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sci-astronomy/kapteyn | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'sci-astronomy/kapteyn')
-rw-r--r-- | sci-astronomy/kapteyn/Manifest | 4 | ||||
-rw-r--r-- | sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch | 101 | ||||
-rw-r--r-- | sci-astronomy/kapteyn/kapteyn-2.3.ebuild | 33 | ||||
-rw-r--r-- | sci-astronomy/kapteyn/metadata.xml | 15 |
4 files changed, 0 insertions, 153 deletions
diff --git a/sci-astronomy/kapteyn/Manifest b/sci-astronomy/kapteyn/Manifest deleted file mode 100644 index 596561d6c5fe..000000000000 --- a/sci-astronomy/kapteyn/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX kapteyn-2.2-debundle_wcs.patch 2441 BLAKE2B 19eecd59cc28680a495b6ab35ff8e163556e822cc090459d0156bed204f491fa2ee3f0f4a904fd3bb2a155ffaa623752c05d1dfe3f6284b78c1bbcf5eaeb825d SHA512 530d50ba8179939110eac6d4cb5b3611c67208994765f1ab1e50fc9a8cd30d56fe8f1aebc2b44e39f6ae3af534ca7ccb6bc58a4f1df555b49277d358d706e25f -DIST kapteyn-2.3.tar.gz 14496700 BLAKE2B afadff0024c8edcea8a0a24362266285e86861623aac614edaf98c5bfde1eb49baaab9311256ff5eb1ec0d223cbe406da55679a319b68d7a5bf760f422cab51e SHA512 7095d9f1faed1937817af48416027391e19bf416187b8cc7f0cc5fb1227efe715c0c6ff945e0e021d1a5e82353e9c3ad2c3a1236d3453b4904d6ca2f2a47747b -EBUILD kapteyn-2.3.ebuild 778 BLAKE2B d30aaa9ef4545468d9043afdd06c974520057e289cb7340e5d7a4b39ce4de07febee0a4936b2780013a06992f174a96fb2666aabd02d6c62e51b5006400fd60b SHA512 8c083c693f819ef0dac313a28c6eede13e9f57b37a3501be6dcfac833cc6ee6ce61af519232b837c7df4e8d44236fab77aa87b21ae153a1e56937d991ec2c43b -MISC metadata.xml 618 BLAKE2B bd640e951ce7182ac495f1685764367fc4809cc6ebe8b08fb9f5e9730d93380cb885601736d06f95848dec50b74742a05621c9e7bbc2bf188c866fbe5e3545cd SHA512 f0c7ebe71e55db31e91ebc2f3abbb700a2869cb305e5ea06cabc229dce6b73e8418c1943b3926a3a8fec9e8cc2ea117ffa675dcc80b46ec381a4094daf646fb1 diff --git a/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch b/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch deleted file mode 100644 index 035979b80bc7..000000000000 --- a/sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch +++ /dev/null @@ -1,101 +0,0 @@ -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 = Popen(["pkg-config --modversion"],stdout=PIPE, shell=True).communicate()[0].split() -+ -+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.3.ebuild b/sci-astronomy/kapteyn/kapteyn-2.3.ebuild deleted file mode 100644 index 91ca272bf852..000000000000 --- a/sci-astronomy/kapteyn/kapteyn-2.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Collection of python tools for astronomy" -HOMEPAGE="https://www.astro.rug.nl/software/kapteyn/" -SRC_URI="https://www.astro.rug.nl/software/kapteyn/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND=" - sci-astronomy/wcslib - dev-python/numpy[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - dev-python/astropy[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}]" - -DOCS=( CHANGES.txt README.txt doc/${PN}.pdf ) - -PATCHES=( "${FILESDIR}"/${PN}-2.2-debundle_wcs.patch ) - -python_prepare_all() { - rm -r src/wcslib-4.* || die - distutils-r1_python_prepare_all -} diff --git a/sci-astronomy/kapteyn/metadata.xml b/sci-astronomy/kapteyn/metadata.xml deleted file mode 100644 index 57bfac11edbd..000000000000 --- a/sci-astronomy/kapteyn/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-astronomy@gentoo.org</email> - <name>Gentoo Astronomy Project</name> - </maintainer> - <longdescription lang="en"> - The Kapteyn Package is a collection of Python modules and applications - made by the computer group of the Kapteyn Astronomical Institute, - University of Groningen, The Netherlands. The purpose of the package - is to provide tools for the development of astronomical applications - with Python. -</longdescription> -</pkgmetadata> |