* [gentoo-commits] repo/gentoo:master commit in: dev-python/vo/, dev-python/pywcs/, dev-python/pywcs/files/, dev-python/vo/files/
@ 2015-10-22 8:32 Justin Lecher
0 siblings, 0 replies; only message in thread
From: Justin Lecher @ 2015-10-22 8:32 UTC (permalink / raw
To: gentoo-commits
commit: ee07f0f1f268b4ce05f04f4a986a0030d72ecbde
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 08:02:54 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 08:31:52 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee07f0f1
Drop obsolete packages in favour of astropy
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/pywcs/Manifest | 1 -
dev-python/pywcs/files/pywcs-1.11-wcslib.patch | 126 -------------------------
dev-python/pywcs/metadata.xml | 10 --
dev-python/pywcs/pywcs-1.11-r1.ebuild | 40 --------
dev-python/vo/Manifest | 2 -
dev-python/vo/files/vo-0.6-expat.patch | 19 ----
dev-python/vo/metadata.xml | 12 ---
dev-python/vo/vo-0.8-r1.ebuild | 45 ---------
8 files changed, 255 deletions(-)
diff --git a/dev-python/pywcs/Manifest b/dev-python/pywcs/Manifest
deleted file mode 100644
index 2608654..0000000
--- a/dev-python/pywcs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pywcs-1.11-4.8.2.tar.gz 2187116 SHA256 61b2d9abf90f4dce2071dfeed1628b487aa32e27b0c01e9983410557db96ac34 SHA512 595cdb910005ef8348eb84d1e0e3db7e5c925d8f44c8f84d8158729d2a9352811a1e1bee49049a91a033503bc9cc8b39c60b1acd526b2fccdd1a8764ec8a7c1e WHIRLPOOL d0c3cd2a428ab1d25594024f3db4f5b586cd1d3d82074828260942e74742602b8c4010cdcb4f73d32d20e71133dae9c7cb5af49e53aab880d404a9ebaf22cb08
diff --git a/dev-python/pywcs/files/pywcs-1.11-wcslib.patch b/dev-python/pywcs/files/pywcs-1.11-wcslib.patch
deleted file mode 100644
index 14cd4e3..0000000
--- a/dev-python/pywcs/files/pywcs-1.11-wcslib.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- defsetup.py
-+++ defsetup.py
-@@ -78,73 +78,27 @@
-
- ######################################################################
- # WCSLIB
--WCSVERSION = "4.8.2"
--WCSLIB = "wcslib" # Path to wcslib
--WCSLIB_PATCHED = "wcslib"
--WCSLIBC = join(WCSLIB_PATCHED, "C") # Path to wcslib source files
--WCSFILES = [ # List of wcslib files to compile
-- 'flexed/wcsbth.c',
-- 'flexed/wcspih.c',
-- 'flexed/wcsulex.c',
-- 'flexed/wcsutrn.c',
-- 'cel.c',
-- 'lin.c',
-- 'log.c',
-- 'prj.c',
-- 'spc.c',
-- 'sph.c',
-- 'spx.c',
-- 'tab.c',
-- 'wcs.c',
-- 'wcserr.c',
-- 'wcsfix.c',
-- 'wcshdr.c',
-- 'wcsprintf.c',
-- 'wcsunits.c',
-- 'wcsutil.c']
--WCSFILES = [join(WCSLIBC, x) for x in WCSFILES]
-+from subprocess import Popen, PIPE
-+from re import match
-
--######################################################################
--# WCSLIB CONFIGURATION
--
--# The only configuration parameter needed at compile-time is how to
--# specify a 64-bit signed integer. Python's ctypes module can get us
--# that information, but it is only available in Python 2.5 or later.
--# If we can't be absolutely certain, we default to "long long int",
--# which is correct on most platforms (x86, x86_64). If we find
--# platforms where this heuristic doesn't work, we may need to hardcode
--# for them.
--def determine_64_bit_int():
-- try:
-- try:
-- import ctypes
-- except ImportError:
-- raise ValueError()
--
-- if ctypes.sizeof(ctypes.c_longlong) == 8:
-- return "long long int"
-- elif ctypes.sizeof(ctypes.c_long) == 8:
-- return "long int"
-- elif ctypes.sizeof(ctypes.c_int) == 8:
-- return "int"
-- else:
-- raise ValueError()
--
-- except ValueError:
-- return "long long int"
-+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
-
--h_file = StringIO()
--h_file.write("""
--/* WCSLIB library version number. */
--#define WCSLIB_VERSION %s
--
--/* 64-bit integer data type. */
--#define WCSLIB_INT64 %s
--""" % (WCSVERSION, determine_64_bit_int()))
--write_if_different(join(srcroot, 'src', 'wcsconfig.h'), h_file.getvalue())
-+WCSLIB = pkgconfig('wcslib')
-+WCSVERSION = Popen(["pkg-config --modversion"],stdout=PIPE, shell=True).communicate()[0].split()
-
- ######################################################################
- # GENERATE DOCSTRINGS IN C
-+
-+######################################################################
- docstrings = {}
- with open(join(srcroot, 'doc', 'docstrings.py'), 'rb') as fd:
- docstrings_content = fd.read()
-@@ -233,7 +186,8 @@
-
- ######################################################################
- # DISTUTILS SETUP
--libraries = []
-+libraries = WCSLIB['libraries']
-+include_dirs = [numpy_include, join(srcroot, "src")] + WCSLIB['include_dirs']
- define_macros = [('ECHO', None),
- ('WCSTRIG_MACRO', None),
- ('PYWCS_BUILD', None),
-@@ -282,13 +236,8 @@
-
- PYWCS_EXTENSIONS = [
- Extension('pywcs._pywcs',
-- WCSFILES + PYWCS_SOURCES,
-- include_dirs =
-- [numpy_include,
-- join(srcroot, WCSLIBC),
-- WCSLIBC,
-- join(srcroot, "src")
-- ],
-+ PYWCS_SOURCES,
-+ include_dirs=include_dirs,
- define_macros=define_macros,
- undef_macros=undef_macros,
- extra_compile_args=extra_compile_args,
-@@ -309,7 +258,6 @@
- 'ext_modules' : PYWCS_EXTENSIONS,
- 'data_files' : [
- ( 'pywcs/include', ['src/*.h']),
-- ( 'pywcs/include/wcslib', [ WCSLIBC + '/*.h'] ),
- ( 'pywcs/tests/maps', ['lib/pywcs/tests/maps/*.hdr']),
- ( 'pywcs/tests/spectra', ['lib/pywcs/tests/spectra/*.hdr']),
- ( 'pywcs/tests/data', ['lib/pywcs/tests/data/*.hdr'])
diff --git a/dev-python/pywcs/metadata.xml b/dev-python/pywcs/metadata.xml
deleted file mode 100644
index 69c0378..0000000
--- a/dev-python/pywcs/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci-astronomy</herd>
- <longdescription lang="en">
- pywcs is a set of routines for handling the FITS World Coordinate
- System (WCS) standard. It is a thin wrapper around the high- and
- mid-level interfaces for wcslib.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/pywcs/pywcs-1.11-r1.ebuild b/dev-python/pywcs/pywcs-1.11-r1.ebuild
deleted file mode 100644
index e9509bb..0000000
--- a/dev-python/pywcs/pywcs-1.11-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-WCS_V=4.8.2
-MYP=${P}-${WCS_V}
-
-DESCRIPTION="Python routines for handling the FITS World Coordinate System"
-HOMEPAGE="https://trac6.assembla.com/astrolib/wiki"
-SRC_URI="http://stsdas.stsci.edu/astrolib/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
- >=sci-astronomy/wcslib-${WCS_V}
- virtual/pkgconfig"
-RDEPEND="
- >=sci-astronomy/wcslib-${WCS_V}
- virtual/pyfits
- !dev-python/astropy"
-
-# missing data to run tests
-RESTRICT=test
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${P}-wcslib.patch )
-
-python_test() {
- nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vo/Manifest b/dev-python/vo/Manifest
deleted file mode 100644
index e5799ad..0000000
--- a/dev-python/vo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST vo-0.8.tar.gz 1245366 SHA256 440a22bd1c805d5e0bbd0a75b26a4247d41200d9e4dc4a72621304ccaa488837 SHA512 1bfd3293ee58af1084b4a752181f6c9c3a2352ec48892cab6b679f739d95e89a6dab7e08400f6a67d179d9663fcde3ef3d9b63f7858dcc2517c5b494e3f58515 WHIRLPOOL cd53ba3acab6f29fc2fcddee824e509664d79134584b9d5722d38ef22ee90f193c59d6e3ac0d04800ac393c8fd3c1eb6dd1ba1ac753fc8b3f88c39d9d2b2763e
-DIST wfpc2_all.xml.gz 4010839 SHA256 e3315762626281adcf28913831528e40bcb09abb8c7a41e456cc44c7ce6109b7 SHA512 76ddfe7c0604a7c806f0e97ef7702b00f942e248549b3b57ad92845f5b55eb14bd13e511543c88af6bbca24a2343acc76de3557cf94d2d2bf1b7845403f12bd6 WHIRLPOOL 5663cc144e6726ca4cad9024390b675c63eac49487d4d96298fdb2baefd6d7d508c0e95c381ab5169f805626b691bffaaea54249dc14cd258f8b7a3cf8c3cb41
diff --git a/dev-python/vo/files/vo-0.6-expat.patch b/dev-python/vo/files/vo-0.6-expat.patch
deleted file mode 100644
index 24157f3..0000000
--- a/dev-python/vo/files/vo-0.6-expat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- defsetup.py.orig 2010-07-21 17:35:59.000000000 +0100
-+++ defsetup.py 2010-07-21 17:37:06.000000000 +0100
-@@ -17,14 +17,9 @@
-
- iterparse_ext = Extension(
- "vo.iterparser",
-- ["src/iterparse.c",
-- "src/expat/xmlparse.c",
-- "src/expat/xmlrole.c",
-- "src/expat/xmltok.c",
-- "src/expat/xmltok_impl.c"
-- ],
-+ ["src/iterparse.c"],
- define_macros=defines,
-- include_dirs=["src", "src/expat"])
-+ libraries=["expat"])
-
- pkg = ['vo', 'vo.tests']
- # Python < 2.6 doesn't have the json module
diff --git a/dev-python/vo/metadata.xml b/dev-python/vo/metadata.xml
deleted file mode 100644
index fc6a461..0000000
--- a/dev-python/vo/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci-astronomy</herd>
- <longdescription lang="en">
- vo.table is a Python package to read and write astronomical VOTable
- files into Numpy record arrays.
- vo.table supports the VOTable Format Definition Version 1.1. Some
- flexibility is provided to support the 1.0 draft version and other
- non-standard usage in the wild.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/vo/vo-0.8-r1.ebuild b/dev-python/vo/vo-0.8-r1.ebuild
deleted file mode 100644
index bc97f1d..0000000
--- a/dev-python/vo/vo-0.8-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to read VO tables into a numpy array"
-HOMEPAGE="https://trac6.assembla.com/astrolib/wiki"
-SRC_URI="
- http://stsdas.stsci.edu/astrolib/${P}.tar.gz
- test? ( http://svn6.assembla.com/svn/astrolib/trunk/vo/test/wfpc2_all.xml.gz )"
-
-IUSE="examples test"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-
-RDEPEND="
- dev-libs/expat
- !dev-python/astropy"
-DEPEND="${RDEPEND}"
-
-# slow and buggy tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6-expat.patch )
-
-python_prepare_all() {
- use test && cp "${WORKDIR}"/wfpc2_all.xml test
-}
-
-python_test() {
- cd test || die
- ln -s "${S}"/lib/data "${BUILD_DIR}/lib/vo/data" || die
- "${EPYTHON}" benchmarks.py || die
-}
-
-python_install_all() {
- use examples && EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-22 8:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-22 8:32 [gentoo-commits] repo/gentoo:master commit in: dev-python/vo/, dev-python/pywcs/, dev-python/pywcs/files/, dev-python/vo/files/ Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox