[gentoo-commits] dev/bicatali:master commit in: sci-astronomy/wcstools/files/, dev-python/astropy/files/, profiles/, ...

[Sebastien Fabbro]

commit:     28ccee4f33c2381fa1139cb7107739a38dfc12a3
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 23:18:22 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 23:18:22 2016 +0000
URL:        https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=28ccee4f

bunch of packages move to main tree

 dev-python/astropy-helpers/Manifest                |   1 -
 .../astropy-helpers/astropy-helpers-1.1.1.ebuild   |  23 -
 dev-python/astropy-helpers/metadata.xml            |  16 -
 dev-python/astropy/Manifest                        |   1 -
 dev-python/astropy/astropy-1.1.1.ebuild            |  88 ---
 .../files/astropy-1.0.4-system-configobj.patch     |  14 -
 .../astropy/files/astropy-1.0.4-system-six.patch   |  12 -
 .../astropy/files/astropy-1.1.1-fix-wcs.patch      |  15 -
 .../files/astropy-1.1.1-mark-kown-failures.patch   |  99 ----
 dev-python/astropy/files/astropy-ply.py            |  58 --
 dev-python/astropy/metadata.xml                    |  16 -
 profiles/categories                                |   2 -
 profiles/use.local.desc                            |   3 -
 sci-astronomy/wcslib/Manifest                      |   1 -
 sci-astronomy/wcslib/metadata.xml                  |  23 -
 sci-astronomy/wcslib/wcslib-5.14.ebuild            |  72 ---
 sci-astronomy/wcstools/Manifest                    |   1 -
 sci-astronomy/wcstools/files/Makefile.am           |  73 ---
 sci-astronomy/wcstools/files/Makefile.libwcs.am    |  17 -
 sci-astronomy/wcstools/files/configure.ac          |   9 -
 .../files/wcstools-3.9.2-RASortStars.patch         |  14 -
 .../files/wcstools-3.9.2-compiler_warnings.patch   |  13 -
 .../wcstools/files/wcstools-3.9.2-manpages.patch   | 658 ---------------------
 .../wcstools/files/wcstools-3.9.2-mayhem.patch     |  69 ---
 .../wcstools/files/wcstools-3.9.2-spelling.patch   |  69 ---
 .../wcstools/files/wcstools-3.9.2-sprintf.patch    |  36 --
 .../wcstools/files/wcstools-3.9.2-use_abort.patch  |  14 -
 .../files/wcstools-3.9.2-wcsinit_crash.patch       |  20 -
 sci-astronomy/wcstools/files/wcstools.pc.in        |  13 -
 sci-astronomy/wcstools/metadata.xml                |  20 -
 sci-astronomy/wcstools/wcstools-3.9.2.ebuild       |  74 ---
 sci-libs/cfitsio/Manifest                          |   1 -
 sci-libs/cfitsio/cfitsio-3.37.ebuild               |  60 --
 sci-libs/cfitsio/metadata.xml                      |  18 -
 sci-libs/netcdf-fortran/Manifest                   |   1 -
 sci-libs/netcdf-fortran/metadata.xml               |  14 -
 .../netcdf-fortran/netcdf-fortran-4.4.2.ebuild     |  53 --
 sci-libs/netcdf/Manifest                           |   1 -
 sci-libs/netcdf/metadata.xml                       |  18 -
 sci-libs/netcdf/netcdf-4.3.3.1.ebuild              |  56 --
 40 files changed, 1766 deletions(-)

diff --git a/dev-python/astropy-helpers/Manifest b/dev-python/astropy-helpers/Manifest
deleted file mode 100644
index 6cfc4c9..0000000
--- a/dev-python/astropy-helpers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST astropy-helpers-1.1.1.tar.gz 132083 SHA256 2da74e8e6b08f3c378fc5f863460bc5c45f4f08e47ed2887cff0a26692aadd4b SHA512 432580de37583b6195b6827dae46516553ceba71bfc038bb609bd59f158f3eb082925dc03f7d9b8ef10d9da68e0d40ee0fa0dc915d72ee0391d58d851a7114bf WHIRLPOOL a64b950acb452307e2f43206c2ff6d102856c0c60a7d4058a59ab8c82338692fee4e432d7dea78b865dea2401536a101713615079c3a1eafbfb4b8c034f57047

diff --git a/dev-python/astropy-helpers/astropy-helpers-1.1.1.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.1.1.ebuild
deleted file mode 100644
index fd68055..0000000
--- a/dev-python/astropy-helpers/astropy-helpers-1.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers for Astropy and Affiliated packages"
-HOMEPAGE="https://github.com/astropy/astropy-helpers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-python_prepare_all() {
-	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
-	distutils-r1_python_prepare_all
-}

diff --git a/dev-python/astropy-helpers/metadata.xml b/dev-python/astropy-helpers/metadata.xml
deleted file mode 100644
index 845f41e..0000000
--- a/dev-python/astropy-helpers/metadata.xml
+++ /dev/null
@@ -1,16 +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@g.o</email>
-		<name>Gentoo Astronomy Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		astropy-helpers is a collection of build tools used by astropy
-		that may be used by other projects.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">astropy-helpers</remote-id>
-		<remote-id type="github">astropy/astropy-helpers</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
deleted file mode 100644
index 591f179..0000000
--- a/dev-python/astropy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST astropy-1.1.1.tar.gz 8157305 SHA256 4d2e7a8bd5191a66d7e1a52beefb4a0b6f496a1e9e8212422613219cb514769f SHA512 bc3c370da32d5f0098dbfc2808dba9d4d4424d3dcfba4d7ffd84b39569387b79ad93086e10678c259237f9cfe1229725501d0dc4eba51c9d01a4cd8a72024fb4 WHIRLPOOL 5b40955f56e6f080ad93b224eabd345565ef9f5e7f5ccb00e2737bd714117bc9b35922a044fe4ccaddb9d30fa72e13dd560577392120bfbd0a9d10c8aaa5aa01

diff --git a/dev-python/astropy/astropy-1.1.1.ebuild b/dev-python/astropy/astropy-1.1.1.ebuild
deleted file mode 100644
index cbe1283..0000000
--- a/dev-python/astropy/astropy-1.1.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-libs/expat-2.1.0:0=
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-astronomy/erfa-1.2:0=
-	>=sci-astronomy/wcslib-5:0=
-	>=sci-libs/cfitsio-3.360:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	>=dev-python/astropy-helpers-1.1[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.4-system-six.patch"
-	"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
-	"${FILESDIR}/${PN}-1.1.1-fix-wcs.patch"
-	"${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
-)
-
-python_prepare_all() {
-	export mydistutilsargs="--offline"
-	export ASTROPY_USE_SYSTEM_PYTEST=True
-	rm -r ${PN}_helpers || die
-	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
-	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	cat >> setup.cfg <<-EOF
-
-	[build]
-	use_system_libraries=1
-	EOF
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_export_best
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch b/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
deleted file mode 100644
index 9578c0d..0000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur astropy-0.4.1/astropy/config/configuration.py astropy-0.4.1.configobj/astropy/config/configuration.py
---- astropy-0.4.1/astropy/config/configuration.py	2014-09-01 22:41:30.066853605 +0200
-+++ astropy-0.4.1.configobj/astropy/config/configuration.py	2014-09-01 22:40:50.793528942 +0200
-@@ -23,7 +23,8 @@
- import types
- from warnings import warn
- 
--from ..extern.configobj import configobj, validate
-+import configobj
-+import validate
- from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning
- from ..utils import find_current_module
- from ..utils.misc import InheritDocstrings
-

diff --git a/dev-python/astropy/files/astropy-1.0.4-system-six.patch b/dev-python/astropy/files/astropy-1.0.4-system-six.patch
deleted file mode 100644
index 8bfab98..0000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-six.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur astropy-0.4.1/astropy/extern/six.py astropy-0.4.1.six/astropy/extern/six.py
---- astropy-0.4.1/astropy/extern/six.py	2014-09-01 21:57:56.663393218 +0200
-+++ astropy-0.4.1.six/astropy/extern/six.py	2014-09-01 21:59:02.940933294 +0200
-@@ -13,7 +13,7 @@
- # Update this to prevent Astropy from using its bundled copy of six
- # (but only if some other version of at least _SIX_MIN_VERSION can
- # be provided)
--_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six']
-+_SIX_SEARCH_PATH = ['six', 'astropy.extern.bundled.six']
- 
- 
- def _find_module(name, path=None):

diff --git a/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch b/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch
deleted file mode 100644
index efb1273..0000000
--- a/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Kacper Kowalik <xarthisius.kk@×××××.com>
-Description: Copy keys to a list, since orignal map is modified
-Url: https://github.com/astropy/astropy/issues/4477
-Bug:  https://github.com/astropy/astropy/issues/4460
---- a/astropy/wcs/wcs.py
-+++ b/astropy/wcs/wcs.py
-@@ -988,7 +988,7 @@
-         """
-         # Never pass SIP coefficients to wcslib
-         # CTYPE must be passed with -SIP to wcslib
--        for key in (m.group() for m in map(SIP_KW.match, header.keys())
-+        for key in (m.group() for m in map(SIP_KW.match, list(header))
-                     if m is not None):
-             del header[key]
- 

diff --git a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch b/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
deleted file mode 100644
index 2e2c82a..0000000
--- a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Mark all known test failures as xfail.
- These failures have been discussed with upstream.
---- a/astropy/io/fits/tests/test_connect.py
-+++ b/astropy/io/fits/tests/test_connect.py
-@@ -136,6 +136,8 @@
-         # while reading is to check whether col.null is present. For float columns, col.null
-         # is not initialized
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     def test_read_from_fileobj(self, tmpdir):
-         filename = str(tmpdir.join('test_read_from_fileobj.fits'))
-         hdu = BinTableHDU(self.data)
-@@ -172,6 +174,8 @@
-     def setup_method(self, method):
-         warnings.filterwarnings('always')
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     def test_read(self, tmpdir):
-         filename = str(tmpdir.join('test_read.fits'))
-         self.hdus.writeto(filename)
-@@ -189,6 +193,8 @@
-             Table.read(filename, hdu=0)
-         assert exc.value.args[0] == 'No table found in hdu=0'
- 
-+# see https://github.com/astropy/astropy/issues/3415
-+    @pytest.mark.xfail()
-     @pytest.mark.parametrize('hdu', [1, 'first'])
-     def test_read_with_hdu_1(self, tmpdir, hdu):
-         filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
---- a/astropy/wcs/wcs.py
-+++ b/astropy/wcs/wcs.py
-@@ -84,6 +84,8 @@
- if six.PY3 or platform.system() == 'Windows':
-     __doctest_skip__ = ['WCS.all_world2pix']
- 
-+# see https://github.com/astropy/astropy/issues/3380
-+__doctest_skip__ = ['WCS.all_world2pix']
- 
- if _wcs is not None:
-     WCSBase = _wcs._Wcs
---- a/astropy/tests/tests/test_socketblocker.py
-+++ b/astropy/tests/tests/test_socketblocker.py
-@@ -66,8 +66,8 @@
- def _square(x):
-     return x ** 2
- 
--
--@×××××××××××.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
-+# see https://github.com/astropy/astropy/issues/4193
-+@×××××××××××.skipif(True, reason="Blocks on Debian CI test")
- def test_multiprocessing_forkserver():
-     """
-     Test that using multiprocessing with forkserver works.  Perhaps
---- a/astropy/coordinates/tests/test_api_ape5.py
-+++ b/astropy/coordinates/tests/test_api_ape5.py
-@@ -319,7 +319,8 @@
-     # coordinate object, and one that returns a cartesian matrix but does *not*
-     # require `newobj` or `fk5frame` - this allows optimization of the transform.
- 
--
-+# Temporary mark until scipy/numpy is fully on 3.5
-+@×××××××××××.xfail()
- def test_highlevel_api():
-     J2001 = time.Time('J2001', scale='utc')
- 
---- a/astropy/visualization/tests/test_histogram.py
-+++ b/astropy/visualization/tests/test_histogram.py
-@@ -50,6 +50,8 @@
-     assert patches2[0].axes is ax[1]
- 
- 
-+# see https://github.com/astropy/astropy/issues/4329
-+@×××××××××××.xfail()
- @pytest.mark.skipif('not HAS_PLT')
- def test_hist_autobin(rseed=0):
-     rng = np.random.RandomState(rseed)
---- a/astropy/table/tests/test_info.py
-+++ b/astropy/table/tests/test_info.py
-@@ -6,6 +6,7 @@
- import warnings
- import numpy as np
- 
-+from ...tests.helper import pytest
- from ...extern import six
- from ... import units as u
- from ... import time
-@@ -225,7 +226,8 @@
-         t.info(out=out)
-         assert out.getvalue().splitlines() == exp
- 
--
-+# see https://github.com/astropy/astropy/issues/4336
-+@×××××××××××.xfail()
- def test_ignore_warnings():
-     t = table.Table([[np.nan, np.nan]])
-     with warnings.catch_warnings(record=True) as warns:

diff --git a/dev-python/astropy/files/astropy-ply.py b/dev-python/astropy/files/astropy-ply.py
deleted file mode 100644
index 19eb104..0000000
--- a/dev-python/astropy/files/astropy-ply.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Licensed under a 3-clause BSD style license - see LICENSE.rst
-
-"""
-Handle loading ply package from system or from the bundled copy
-"""
-
-import imp
-from distutils.version import StrictVersion
-
-
-def _find_module(name, path=None):
-    """
-    Alternative to `imp.find_module` that can also search in subpackages.
-    """
-
-    parts = name.split('.')
-
-    for part in parts:
-        if path is not None:
-            path = [path]
-
-        fh, path, descr = imp.find_module(part, path)
-
-    return fh, path, descr
-
-_PLY_MIN_VERSION = StrictVersion('3.4')
-
-# Update this to prevent Astropy from using its bundled copy of ply
-# (but only if some other version of at least _PLY_MIN_VERSION can
-# be provided)
-_PLY_SEARCH_PATH = ['ply']
-
-
-for mod_name in _PLY_SEARCH_PATH:
-    try:
-        mod_info = _find_module(mod_name)
-        #mod_lex_info = _find_module(mod_name + '.lex')
-    except ImportError:
-        continue
-
-    mod = imp.load_module(__name__, *mod_info)
-    #mod_lex = imp.load_module(__name__ + '.lex', *mod_lex_info)
-
-    try:
-    #    if StrictVersion(mod_lex.__version__) >= _PLY_MIN_VERSION:
-    #        break
-        break
-    except (AttributeError, ValueError):
-        # Attribute error if the ply module isn't what it should be and doesn't
-        # have a .__version__; ValueError if the version string exists but is
-        # somehow bogus/unparseable
-        continue
-else:
-    raise ImportError(
-        "Astropy requires the 'ply' module of minimum version {0}; "
-        "normally this is bundled with the astropy package so if you get "
-        "this warning consult the packager of your Astropy "
-        "distribution.".format(_PLY_MIN_VERSION))

diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
deleted file mode 100644
index 85615ff..0000000
--- a/dev-python/astropy/metadata.xml
+++ /dev/null
@@ -1,16 +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@g.o</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Astropy is a community-driven package intended to contain much of
-  the core functionality and some common tools needed for performing
-  astronomy and astrophysics with Python.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">astropy</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/profiles/categories b/profiles/categories
index 8f766f0..ac988d3 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -1,4 +1,2 @@
-dev-python
 net-fs
-dev-libs  
 sci-libs

diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index bf12bd7..3ade6d7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2,9 +2,6 @@
 # your descriptions to your package's metadata.xml ONLY.
 # * generated automatically using egencache *
 
-dev-libs/starpu:cuda - Enable NVIDIA CUDA toolkit support
-dev-libs/starpu:gcc-plugin - Enable GCC extension plugin (experimental)
-dev-libs/starpu:opencl - Enable OpenCL support
 net-fs/cvmfs:aufs - Use AUFS instead of OverlayFS for the server
 net-fs/cvmfs:server - Install the CVMFS server (needs apache and OverlayFS)
 net-fs/cvmfs:test-programs - Install unit test programs

diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
deleted file mode 100644
index 4e8332d..0000000
--- a/sci-astronomy/wcslib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wcslib-5.14.tar.bz2 2221717 SHA256 4d3f12d2636bb75488eaaa3ed435d7664d2c26a73a67ac1f7d5f3e530f39e37f SHA512 431693cffcc7a9f2b29040a34f7dbac2f3360b094a42467f7378523c15260ffb3c0ad330e07077a40bf694956fae2371550d6583580f0bcc16ec47f9fbc5bc28 WHIRLPOOL 2acf5040b4960c001b7076189c1da4dd6b327257295dcdfa8a89d553a93f0980b0e62d66aec244a9cc8af70cc62b0497362839f26bb6cc6517e219ba55b73e93

diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
deleted file mode 100644
index a599762..0000000
--- a/sci-astronomy/wcslib/metadata.xml
+++ /dev/null
@@ -1,23 +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@g.o</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  WCSLIB is a C library, supplied with a full set of Fortran wrappers,
-  that implements the "World Coordinate System" (WCS) convention in FITS
-  (Flexible Image Transport System).  It also includes a PGPLOT-based routine,
-  PGSBOX, for drawing general curvilinear coordinate graticules and a number of
-  utility programs.
-</longdescription>
-  <use>
-    <flag name="fits">
-    Enable support for the FITS format through <pkg>sci-libs/cfitsio</pkg>
-  </flag>
-    <flag name="pgplot">
-    Builds PGBSOX routines, needs <pkg>sci-libs/pgplot</pkg> library
-  </flag>
-  </use>
-</pkgmetadata>

diff --git a/sci-astronomy/wcslib/wcslib-5.14.ebuild b/sci-astronomy/wcslib/wcslib-5.14.ebuild
deleted file mode 100644
index e05fe6f..0000000
--- a/sci-astronomy/wcslib/wcslib-5.14.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0/5"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran fits pgplot static-libs +tools"
-
-RDEPEND="
-	fits? ( sci-libs/cfitsio:0= )
-	pgplot? ( sci-libs/pgplot:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable fortran)
-		$(use_enable tools utils)
-	)
-	# hacks because cfitsio and pgplot directories are hard-coded
-	if use fits; then
-		myconf+=(
-			--with-cfitsioinc="${EPREFIX}/usr/include"
-			--with-cfitsiolib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-cfitsio )
-	fi
-	if use pgplot; then
-		myconf+=(
-			--with-pgplotinc="${EPREFIX}/usr/include"
-			--with-pgplotlib="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=( --without-pgplot )
-	fi
-	econf ${myconf[@]}
-	sed -i -e 's/COPYING\*//' GNUmakefile || die
-}
-
-src_compile() {
-	# nasty makefile, debugging means probably full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install () {
-	default
-	# static libs share the same symbols as shared (i.e. compiled with PIC)
-	# so they are not compiled twice
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	use doc || rm -r \
-		"${ED}"/usr/share/doc/${PF}/html \
-		"${ED}"/usr/share/doc/${PF}/*.pdf
-}

diff --git a/sci-astronomy/wcstools/Manifest b/sci-astronomy/wcstools/Manifest
deleted file mode 100644
index 7c408e4..0000000
--- a/sci-astronomy/wcstools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wcstools-3.9.2.tar.gz 8523655 SHA256 481fe357cf755426fb8e25f4f890e827cce5de657a4e5044d4e31ce27bef1c8b SHA512 b9030cdcaf3f87ab761362a2b8c4a76557694ec4e683371a05e8d58823179d320a2859e883c4ca2c3d65d5adb70ad1ac859587f4c210cd315ced26288fbe107a WHIRLPOOL 257e54e5c545a0584c9ff52f2e3298db73f7d1b4e8d71e0621db18aed8f138dbb0093773883351cbb56ea8a35998ec3b0a2b8e7fc5334dc8d2ebb1c3c4410af4

diff --git a/sci-astronomy/wcstools/files/Makefile.am b/sci-astronomy/wcstools/files/Makefile.am
deleted file mode 100644
index 46abf6d..0000000
--- a/sci-astronomy/wcstools/files/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-SUBDIRS = libwcs
-INCLUDES = -I$(top_srcdir)/libwcs
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = wcstools.pc
-
-bin_SCRIPTS = wcstools
-
-EXTRA_DIST = wcstools COPYING Readme NEWS Programs
-
-bin_PROGRAMS = \
-	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
-	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
-	keyhead skycoor subpix xy2sky wcshead conpix gettab newfits getfits \
-	imstack imextract sumpix wcsremap getcol wcsgetdate imfill imsmooth imresize \
-	fileroot filename filext char2sp sp2char wcscrlf isnum isrange isfits \
-	isfile simpos bincat
-
-# these ones don't need libwcs
-wcscrlf_SOURCES = crlf.c
-filename_SOURCES = filename.c
-filedir_SOURCES = filedir.c
-fileroot_SOURCES = fileroot.c
-filext_SOURCES = filext.c
-isrange_SOURCES = isrange.c
-
-LDADD = $(top_builddir)/libwcs/libwcstools.la
-
-bincat_SOURCES = bincat.c
-getcol_SOURCES = getcol.c
-wcsgetdate_SOURCES = getdate.c
-gethead_SOURCES = gethead.c
-getfits_SOURCES = getfits.c
-getpix_SOURCES = getpix.c
-gettab_SOURCES = gettab.c
-imcat_SOURCES = imcat.c
-imsize_SOURCES = imsize.c
-imstar_SOURCES = imstar.c
-imwcs_SOURCES = imwcs.c
-immatch_SOURCES = immatch.c
-scat_SOURCES = scat.c
-setpix_SOURCES = setpix.c
-skycoor_SOURCES = skycoor.c
-sumpix_SOURCES = sumpix.c
-xy2sky_SOURCES = xy2sky.c
-simpos_SOURCES = simpos.c
-
-addpix_SOURCES = addpix.c
-char2sp_SOURCES = char2sp.c
-conpix_SOURCES = conpix.c
-cphead_SOURCES = cphead.c
-delwcs_SOURCES = delwcs.c
-delhead_SOURCES = delhead.c
-edhead_SOURCES = edhead.c
-fixpix_SOURCES = fixpix.c
-i2f_SOURCES = i2f.c
-imfill_SOURCES = imfill.c
-imresize_SOURCES = imresize.c
-imsmooth_SOURCES = imsmooth.c
-imhead_SOURCES = imhead.c
-imrot_SOURCES = imrot.c
-imstack_SOURCES = imstack.c
-imextract_SOURCES = imextract.c
-isfile_SOURCES = isfile.c
-isnum_SOURCES = isnum.c
-keyhead_SOURCES = keyhead.c
-newfits_SOURCES = newfits.c
-wcsremap_SOURCES = remap.c
-sethead_SOURCES = sethead.c
-sky2xy_SOURCES = sky2xy.c
-sp2char_SOURCES = sp2char.c
-subpix_SOURCES = subpix.c
-wcshead_SOURCES = wcshead.c

diff --git a/sci-astronomy/wcstools/files/Makefile.libwcs.am b/sci-astronomy/wcstools/files/Makefile.libwcs.am
deleted file mode 100644
index 5905aa3..0000000
--- a/sci-astronomy/wcstools/files/Makefile.libwcs.am
+++ /dev/null
@@ -1,17 +0,0 @@
-lib_LTLIBRARIES = libwcstools.la
-libwcstools_la_SOURCES = \
-	imsetwcs.c imgetwcs.c matchstar.c findstar.c daoread.c wcscon.c \
-	fitswcs.c wcsinit.c wcs.c ty2read.c webread.c tmcread.c \
-	gscread.c gsc2read.c ujcread.c uacread.c ubcread.c ucacread.c \
-	sdssread.c tabread.c binread.c ctgread.c actread.c catutil.c \
-	skybotread.c imrotate.c fitsfile.c imhfile.c \
-	hget.c hput.c imio.c dateutil.c imutil.c \
-	worldpos.c tnxpos.c zpxpos.c dsspos.c platepos.c \
-	sortstar.c platefit.c iget.c fileutil.c \
-	wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c poly.c
-
-wcsdir = $(includedir)/wcs
-wcs_HEADERS = \
-	wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
-
-noinst_HEADERS = fitsfile1.h wcscat1.h

diff --git a/sci-astronomy/wcstools/files/configure.ac b/sci-astronomy/wcstools/files/configure.ac
deleted file mode 100644
index 3a46108..0000000
--- a/sci-astronomy/wcstools/files/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT([wcstools], [3.9.x] , [http://tdc-www.harvard.edu/wcstools/])
-AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_HEADERS([config.h])
-
-AC_PROG_CC
-LT_INIT([disable-static])
-AC_CHECK_LIB([m], [sin])
-AC_CONFIG_FILES([libwcs/Makefile Makefile wcstools.pc])
-AC_OUTPUT

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
deleted file mode 100644
index 27a912f..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@××××××.org>
-Description: Fix uninitialized value for haspm in RASortStars()
- This fixes a crash with 'imstar -s'.
---- a/libwcs/sortstar.c
-+++ b/libwcs/sortstar.c
-@@ -417,6 +417,8 @@
- 	hasnum = 1;
-     if (spra != NULL && spdec != NULL)
- 	haspm = 1;
-+    else
-+	haspm = 0;
-     if (sx != NULL && sy != NULL)
- 	hasxy = 1;
-     else

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
deleted file mode 100644
index 57bb8cb..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: Fix some compiler warnings.
---- a/imcat.c
-+++ b/imcat.c
-@@ -1778,7 +1778,7 @@
- 		if (refcat == UCAC2 || refcat == UCAC3 || refcat == UCAC4) {
- 		    nim = gc[i] / 1000;
- 		    nct = gc[i] % 1000;
--		    sprintf (temp, "  ni  nc", nim, nct);
-+		    sprintf (temp, "  ni%i  nc%i", nim, nct);
- 		    strcat (headline, temp);
- 		    }
- 		else if (gcset)

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-manpages.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-manpages.patch
deleted file mode 100644
index bd9d568..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-manpages.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: Fix the names and spelling of manpages to make lintian happy
---- a/man/man1/skycoor.1
-+++ b/man/man1/skycoor.1
-@@ -1,12 +1,12 @@
--.TH skycoor(1) WCSTools "9 November 2001"
-+.TH skycoor 1 WCSTools "9 November 2001"
- .SH Name
- skycoor \- Convert coordinates
- .SH Synopsis
--skycoor [-bdgjv] [-n ndec] ra1 dec1 sys1 ... ran decn sysn
-+skycoor [\-bdgjv] [\-n ndec] ra1 dec1 sys1 ... ran decn sysn
- .br
- or
- .br
--skycoor [-vbjg] [-n ndec] @listfile
-+skycoor [\-vbjg] [\-n ndec] @listfile
- .SH Description
- .I skycoor
- converts coordinates between the J2000, B1950, and galactic coordinate
---- a/man/man1/sethead.1
-+++ b/man/man1/sethead.1
-@@ -1,8 +1,8 @@
--.TH sethead(1) WCSTools "6 July 2001"
-+.TH sethead 1 WCSTools "6 July 2001"
- .SH Name
- sethead \- Set FITS or IRAF header keyword values
- .SH Synopsis
--sethead [-dknv][r letter] <FITS or IRAF file> kw1=val1 kw2=val2 ... kwn=valuen
-+sethead [\-dknv][r letter] <FITS or IRAF file> kw1=val1 kw2=val2 ... kwn=valuen
- .SH Description
- Set parameters in the header of a FITS or IRAF image.  If the keywords do
- not already exist, they are added at the end of the header.  Values are
---- a/man/man1/keyhead.1
-+++ b/man/man1/keyhead.1
-@@ -1,13 +1,13 @@
--.TH keyhead(1) WCSTools "6 July 2001"
-+.TH keyhead 1 WCSTools "6 July 2001"
- .SH Name
- keyhead \- Change FITS or IRAF header keyword names
- .SH Synopsis
--sethead [-hknv] <FITS or IRAF file> kw1=kw1a kw2=kwd2a ... kwn=kwdna
-+keyhead [\-hknv] <FITS or IRAF file> kw1=kw1a kw2=kwd2a ... kwn=kwdna
- .SH Description
- Change the names of keywords in FITS or IRAF image headers.  Each current
- image keyword whose entry is to be modified should be followed by an
- equal sign and a second keyword, with no intervening spaces.
--If the -r option is used, the value of the second keyword is transfered
-+If the \-r option is used, the value of the second keyword is transferred
- to that of the first. Otherwise, the name of the first keyword is changed
- to the second keyword.
- To change keywords in a list of files, substitute @<listfile> for the file
---- a/man/man1/sgsc.1
-+++ b/man/man1/sgsc.1
-@@ -1,15 +1,15 @@
--.TH sgsc(1) WCS "14 April 1998"
-+.TH sgsc 1 WCS "14 April 1998"
- .SH Name
- sgsc \- Find HST GSC stars in a square on the sky
- .SH Synopsis
--sgsc [options] [-b or -j] ra dec
-+sgsc [options] [\-b or \-j] ra dec
- .SH Description
- .I sgsc
- is a utility for finding all of the Hubble Space Telescope Guide Star
- Catalog objects in a specified region of the sky and listing them with their
- sky positions and magnitudes in order of brightness, with the brighter ones
- first.
--Output is to standard out, unless the -w flag is set, in
-+Output is to standard out, unless the \-w flag is set, in
- which case it goes to objectname.gsc or search.gsc. It is somewhat
- similar to RGSC, which can search from lists of coordinates but cannot
- sort the output.  It is a link to scat.
-@@ -25,7 +25,7 @@
- Sort by distance from center instead of flux
- .TP
- .B \-g <class>
--Object class (0=stars 3=galaxies -1=all)
-+Object class (0=stars 3=galaxies \-1=all)
- .TP
- .B \-h
- Print heading, else do not 
-@@ -34,7 +34,7 @@
- Output J2000 (FK5) coordinates around this center
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <num>
- Number of brightest stars to print 
---- a/man/man1/setpix.1
-+++ b/man/man1/setpix.1
-@@ -1,8 +1,8 @@
--.TH setpix(1) WCSTools "6 July 2001"
-+.TH setpix 1 WCSTools "6 July 2001"
- .SH Name
- setpix \- Set FITS or IRAF image values
- .SH Synopsis
--setpix [-vn] file.fts [x_range y_range value] [@valuefile]
-+setpix [\-vn] file.fts [x_range y_range value] [@valuefile]
- .SH Description
- Set a specified pixel or range of pixels in a FITS or IRAF image to a
- specified value. More than one range of pixels and values may be specified
---- a/man/man1/sky2xy.1
-+++ b/man/man1/sky2xy.1
-@@ -1,12 +1,12 @@
--.TH sky2xy(1) WCSTools "6 July 2001"
-+.TH sky2xy 1 WCSTools "6 July 2001"
- .SH Name
- sky2xy \- Compute X Y from RA Dec using WCS in FITS and IRAF image files
- .SH Synopsis
--sky2xy [-vbjg] file.fts ra1 dec1 ... ran decn
-+sky2xy [\-vbjg] file.fts ra1 dec1 ... ran decn
- .br
- or
- .br
--sky2xy [-vbjg] file.fts @listfile
-+sky2xy [\-vbjg] file.fts @listfile
- .SH Description
- .I sky2xy
- (pronounced sky-to-X-Y) is a utility for getting the image coordinates of
---- a/man/man1/getcol.1
-+++ b/man/man1/getcol.1
-@@ -1,8 +1,8 @@
--.TH getcol(1) WCSTools "8 November 2001"
-+.TH getcol 1 WCSTools "8 November 2001"
- .SH Name
- getcol \- Extract specified columns from an ASCII table file
- .SH Synopsis
--getcol [-amv][-n num][-r lines][-s num] filename [column number range]
-+getcol [\-amv][\-n num][\-r lines][\-s num] filename [column number range]
- .SH Description
- Extract specified columns from an ASCII table file
- 
-@@ -20,8 +20,8 @@
- .TP
- .B field range
- Print value of these columns for the number of lines of the table 
--specified by the -n argument after the skippiing the number of
--lines specified by the -s argument.  A value of 0 causes the
-+specified by the \-n argument after the skippiing the number of
-+lines specified by the \-s argument.  A value of 0 causes the
- entire input line to be printed.
- .TP
- .B \-a
-@@ -59,12 +59,12 @@
- .B \-m
- Compute the means of all numeric columns selected, printing the mean
- on the line following the result (or the line following the sum if
---a is used).  Columns with no mean are filled with ___.
-+\-a is used).  Columns with no mean are filled with ___.
- (Added in version 2.6.9)
- .TP
- .B \-n num
- Print selected columns for this many lines.  If not specified, all
--lines will be read after the number of lines specified by -s have
-+lines will be read after the number of lines specified by \-s have
- been skipped.
- .TP
- .B \-o
---- a/man/man1/imwcs.1
-+++ b/man/man1/imwcs.1
-@@ -1,4 +1,4 @@
--.TH imwcs(1) WCSTools "30 January 2003"
-+.TH imwcs 1 WCSTools "30 January 2003"
- .SH Name
- imwcs \- Set WCS in FITS and IRAF image files
- .SH Synopsis
-@@ -47,7 +47,7 @@
- Write FITS output no matter what input
- .TP
- .B \-g <class>
--Guide Star Catalog class (-1=all,0,3) (default -1)
-+Guide Star Catalog class (\-1=all,0,3) (default \-1)
- .TP
- .B \-h <number>
- Change the maximum number of reference stars to match from 25 to
-@@ -66,7 +66,7 @@
- Reflect left<->right before rotating and fitting
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <number>
- Number of parameters to fit (1-8, or digit string). The default is 2 (RA+Dec)
-@@ -99,7 +99,7 @@
- Offset tolerance in pixels (default 20)
- .TP
- .B \-u <file>
---u: File of X Y RA Dec assignments for initial WCS
-+File of X Y RA Dec assignments for initial WCS
- .TP
- .B \-v
- Verbose listing of processing intermediate results
---- a/man/man1/wcstools.1
-+++ b/man/man1/wcstools.1
-@@ -1,10 +1,10 @@
--.TH wcstools(1) WCSTools "6 July 2001"
-+.TH wcstools 1 WCSTools "6 July 2001"
- .SH Name
- wcstools \- Programs to access image world coordinate systems and catalogs
- .SH Setting an Image World Coordinate System
- .TP
- imwcs
--Automaticaly find stars in a FITS or IRAF image, match them to HST Guide
-+Automatically find stars in a FITS or IRAF image, match them to HST Guide
- USNO A or USNO UJ Stars, compute the relation between sky coordinates and
- image coordinates, and write in in the image header. [after U of Iowa SETWCS]
- .TP
---- a/man/man1/imua2.1
-+++ b/man/man1/imua2.1
-@@ -1,4 +1,4 @@
--.TH imua2(1) WCS "14 April 1998"
-+.TH imua2 1 WCS "14 April 1998"
- .SH Name
- imua2 \- Find USNO-A2.0 stars in FITS or IRAF image files
- .SH Synopsis
-@@ -19,7 +19,7 @@
- Output in J2000, optional new image center in J2000 (FK5) RA and Dec
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <num>
- Number of brightest stars to print 
-@@ -63,7 +63,7 @@
- Output J2000 (FK5) coordinates (optional center)
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <num>
- Number of brightest stars to print 
---- a/man/man1/delhead.1
-+++ b/man/man1/delhead.1
-@@ -1,8 +1,8 @@
--.TH delhead(1) WCSTools "15 July 1999"
-+.TH delhead 1 WCSTools "15 July 1999"
- .SH Name
- delhead \- Set FITS or IRAF header keyword values
- .SH Synopsis
--delhead [-nv] <FITS or IRAF file[s]> kw1 kw2 ... kwn
-+delhead [\-nv] <FITS or IRAF file[s]> kw1 kw2 ... kwn
- .SH Description
- Delete keyword entries from the header of FITS or IRAF image[s].  If
- a keyword does not already exist, ignore it.  To delete keywords in
---- a/man/man1/imusa2.1
-+++ b/man/man1/imusa2.1
-@@ -1,4 +1,4 @@
--.TH imusa2(1) WCS "14 April 1998"
-+.TH imusa2 1 WCS "14 April 1998"
- .SH Name
- imusa2 \- Find USNO-SA2.0 stars in FITS or IRAF image files
- .SH Synopsis
-@@ -19,7 +19,7 @@
- Output in J2000, optional new image center in J2000 (FK5) RA and Dec
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <num>
- Number of brightest stars to print 
---- a/man/man1/gethead.1
-+++ b/man/man1/gethead.1
-@@ -1,8 +1,8 @@
--.TH gethead(1) WCSTools "6 July 2001"
-+.TH gethead 1 WCSTools "6 July 2001"
- .SH Name
- gethead \- Print FITS or IRAF header keyword values
- .SH Synopsis
--gethead [-hptv] [-d pathname] [-n num] <FITS or IRAF file> kw1 kw2 ... kwn
-+gethead [\-hptv] [\-d pathname] [\-n num] <FITS or IRAF file> kw1 kw2 ... kwn
- .SH Description
- Print values of the specified keywords from the given image header.  By
- default they are all listed on one line, separated by spaces.  The
---- a/man/man1/imcat.1
-+++ b/man/man1/imcat.1
-@@ -1,4 +1,4 @@
--.TH imcat(1) WCSTools "30 January 2003"
-+.TH imcat 1 WCSTools "30 January 2003"
- .SH Name
- imcat \- List catalog stars in FITS and IRAF image files
- .SH Synopsis
-@@ -41,13 +41,13 @@
- Add this keyword to output from tab table search
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <num>
- Number of brightest stars to print 
- .TP
- .B \-o <type>
--Set HST Guide Star object class to print (0=stars, 3=nonstars, -1=all, -2=band)
-+Set HST Guide Star object class to print (0=stars, 3=nonstars, \-1=all, \-2=band)
- .TP
- .B \-p <scale>
- Initial plate scale in arcsec per pixel (default from file)
-@@ -55,9 +55,9 @@
- .B \-q <c|d|o|s|x|v|+>
- Write SAOimage region file with this shape, o=circle, s=square, d=diamond,
- +=cross, and x=X, with the radius scaled with magnitude unless specified
--with a -r command line entry. v will cause stellar Guide Stars to plot with
-+with a \-r command line entry. v will cause stellar Guide Stars to plot with
- a + and nonstellar Guide Stars to plot with an x. If character is is preceded
--by p, the size specified by the -r command is assumed to be in pixels, not
-+by p, the size specified by the \-r command is assumed to be in pixels, not
- arcseconds. A p alone specifies a circle in pixels. 
- .TP
- .B \-r <radius>
-@@ -65,7 +65,7 @@
- arcseconds. SAOimage can then read this file, with will have positions and
- radii in pixels and plot it over an image. If the radius is specified as
- zero, the output radii will scale between 5 and dim/100 over the range of
--magnitudes of sources found in the image area. If the -q option is specified
-+magnitudes of sources found in the image area. If the \-q option is specified
- with a 'p' in it, this number is assumed to be in pixels instead of arcseconds.
- .TP
- .B \-s d|m|n|p|r|x|y
---- a/man/man1/scat.1
-+++ b/man/man1/scat.1
-@@ -1,18 +1,18 @@
--.TH scat(1) WCSTools "30 January 2003"
-+.TH scat 1 WCSTools "30 January 2003"
- .SH Name
- scat \- Find catalog stars in a square or circle on the sky
- .SH Synopsis
--scat [options] [-b or -j] ra dec
-+scat [options] [\-b or \-j] ra dec
- .SH Description
- .I scat
- is a utility for finding all of the Hubble Space Telescope Guide Star
- Catalog (GSC), U.S. Naval Observatory A2.0 (UA2), B1.0 (UB1), SA2.0 (USA2),
- or UJ (UJC) Catalogs, or locally catalogued objects in a specified region
--of the sky and listing their sky coordinates to standard output. If the -w
-+of the sky and listing their sky coordinates to standard output. If the \-w
- flag is set, they are written to a file objectname.catalogname, where objectname
--is given by the argument to -o on the command line, defaulting to "search",
--and catalogname is given by the argument to -c on the command line. The
--catalog defaults to the GSC, if no -c argument is present. scat resembles
-+is given by the argument to \-o on the command line, defaulting to "search",
-+and catalogname is given by the argument to \-c on the command line. The
-+catalog defaults to the GSC, if no \-c argument is present. scat resembles
- rgsc(1) and star(1), which can search from lists of coordinates but
- cannot sort the output.  sgsc, suac, and susac are links to this program.1
- .SH Options
-@@ -37,7 +37,7 @@
- Output search center for other programs
- .TP
- .B \-g <class>
--HST Guide Star Catalog object class (0=stars 3=galaxies -1=all)
-+HST Guide Star Catalog object class (0=stars 3=galaxies \-1=all)
- .TP
- .B \-h
- Print search and column heading, else do not 
-@@ -55,7 +55,7 @@
- Print search center and closest star on one line
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <num>
- Number of brightest stars to print 
-@@ -67,7 +67,7 @@
- Equinox of output position in fractional years
- .TP
- .B \-r <radius>
--Halfwidth (-radius if negative) of search area in arcseconds (default 10)
-+Halfwidth (\-radius if negative) of search area in arcseconds (default 10)
- .TP
- .B \-s d|m|n|p|r
- Sort by (d)eclination, (m)agnitude, (n)o sort, (p)distance from center, or
-@@ -84,10 +84,10 @@
- Verbose listing of processing intermediate results
- .TP
- .B \-w
--Write output file objectname.catalog or search.catalog if -o is not used.
-+Write output file objectname.catalog or search.catalog if \-o is not used.
- .TP
- .B \-x <type>
--GSC object type (0=stars 3=galaxies -1=all -2=bands)
-+GSC object type (0=stars 3=galaxies \-1=all \-2=bands)
- .TP
- .B \-y <year>
- Epoch of output positions in fractional years (for proper motion only)
---- a/man/man1/imsize.1
-+++ b/man/man1/imsize.1
-@@ -1,8 +1,8 @@
--.TH imsize(1) WCSTools "6 July 2001"
-+.TH imsize 1 WCSTools "6 July 2001"
- .SH Name
- imsize \- Print size of image in WCS and pixels
- .SH Synopsis
--imsize [-vcd] [-p scale] [-b ra dec] [-j ra dec] FITS or IRAF file(s)
-+imsize [\-vcd] [\-p scale] [\-b ra dec] [\-j ra dec] FITS or IRAF file(s)
- .SH Description
- .I imsize
- is a utility for printing the region covered by an image using the world
---- a/man/man1/imrot.1
-+++ b/man/man1/imrot.1
-@@ -1,4 +1,4 @@
--.TH imrot(1) WCSTools "6 July 2001"
-+.TH imrot 1 WCSTools "6 July 2001"
- .SH Name
- imrot \- Rotate and/or Reflect FITS and IRAF image files
- .SH Synopsis
-@@ -26,8 +26,8 @@
- Verbose
- .B \-x <num>
- Output pixel size in bits (FITS code, default=input)
--Allowed values are 8, 16, 32 for integers, -16 for unsigned integers, and
---32 and -64 for 4- and 8-byte floating point numbers
-+Allowed values are 8, 16, 32 for integers, \-16 for unsigned integers, and
-+\-32 and \-64 for 4- and 8-byte floating point numbers
- 
- .SH Author
- Doug Mink, SAO (dmink@×××××××××××.edu)
---- a/man/man1/imhead.1
-+++ b/man/man1/imhead.1
-@@ -1,4 +1,4 @@
--.TH imhead(1) WCSTools "6 July 2001"
-+.TH imhead 1 WCSTools "6 July 2001"
- .SH Name
- imhead \- Print FITS or IRAF image header
- .SH Synopsis
---- a/man/man1/susa2.1
-+++ b/man/man1/susa2.1
-@@ -1,13 +1,13 @@
--.TH susa2(1) WCS "9 June 2000"
-+.TH susa2 1 WCS "9 June 2000"
- .SH Name
--Find USNO-SA2.0 Catalog stars in a square on the sky
-+susa2 \- Find USNO-SA2.0 Catalog stars in a square on the sky
- .SH Synopsis
--susac [options] [-b or -j] ra dec
-+susac [options] [\-b or \-j] ra dec
- .SH Description
- .I suac
- finds all of the U.S. Naval Observatory SA2.0 Catalog objects in a specified
- region of the sky and lists their sky positions and magnitudes in order of
--brightness. Output is to standard out, unless the -w flag is set, in which
-+brightness. Output is to standard out, unless the \-w flag is set, in which
- case it goes to objectname.uac or search.uac. It is a link to scat.
- .SH Options
- .B \-a
-@@ -21,7 +21,7 @@
- .B \-j <RA> <Dec>
- Output J2000 (FK5) coordinates around this center
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .B \-n <num>
- Number of brightest stars to print 
- .B \-o <name>
---- a/man/man1/wcshead.1
-+++ b/man/man1/wcshead.1
-@@ -1,8 +1,8 @@
--.TH wcshead(1) WCSTools "19 July 2004"
-+.TH wcshead 1 WCSTools "19 July 2004"
- .SH Name
- wcshead \- Print WCS part of FITS or IRAF image header
- .SH Synopsis
--wcshead [-hrtvsz] FITS or IRAF file(s)
-+wcshead [\-hrtvsz] FITS or IRAF file(s)
- .SH Description
- .I wcshead
- is a utility for printing the world coordinate system information in
---- a/man/man1/delwcs.1
-+++ b/man/man1/delwcs.1
-@@ -1,8 +1,8 @@
--.TH delwcs(1) WCSTools "6 July 2001"
-+.TH delwcs 1 WCSTools "6 July 2001"
- .SH Name
- delwcs \- Delete WCS in FITS and IRAF image files
- .SH Synopsis
--delwcs [-v] FITS or IRAF file(s)
-+delwcs [\-v] FITS or IRAF file(s)
- .SH Description
- Delete WCS keywords "CTYPE1", "CRVAL1", "CDELT1", "CRPIX1", "CROTA1", "CTYPE2",
- "CRVAL2", "CDELT2", "CRPIX2", "CROTA2", and "IMWCS" from a fits header.  If
---- a/man/man1/imstar.1
-+++ b/man/man1/imstar.1
-@@ -1,4 +1,4 @@
--.TH imstar(1) WCSTools "6 July 2001"
-+.TH imstar 1 WCSTools "6 July 2001"
- .SH Name
- imstar \- Find stars in FITS and IRAF image files
- .SH Synopsis
-@@ -7,7 +7,7 @@
- .SH Options
- .TP
- .B <hh:mm:ss> <dd:mm:ss> [J2000, B1950]
--Coordinates for center (or reference pixel if -x is used).
-+Coordinates for center (or reference pixel if \-x is used).
- .TP
- .B \-a <angle>
- Image rotation angle in degrees (default 0).  If multiple of 90, rotate
-@@ -34,7 +34,7 @@
- .B \-i <num>
- Minimum peak value for star in image (<0=-sigma)
- Setting this to reject all but 10-15 stars is a good way to speed up the
--star-finding process.  If num is less than zero, the minimum peak is -num
-+star-finding process.  If num is less than zero, the minimum peak is \-num
- image pixel standard deviations.  Setting this number rejects faint stars
- early in the selection process for a significant saving in computing time.
- .TP
-@@ -45,7 +45,7 @@
- Print each star as it is found for debugging 
- .TP
- .B \-l
--Reflect the image left <-> right before rotating (-a) and searching for stars.
-+Reflect the image left <\-> right before rotating (\-a) and searching for stars.
- .TP
- .B \-m <magnitude>
- Magnitude offset
-@@ -81,16 +81,16 @@
- .TP
- .B \-w
- Write output to a file in addition to standard out.
--If DAO format (-o), create the name by adding .dao to the image file name.
--If Starbase format (-t), create the name by adding .tab to the image file name.
--If ASCII format (-f), create the name by adding .stars to the image file name.
-+If DAO format (\-o), create the name by adding .dao to the image file name.
-+If Starbase format (\-t), create the name by adding .tab to the image file name.
-+If ASCII format (\-f), create the name by adding .stars to the image file name.
- .TP
- .B \-x <X> <Y>
- X and Y coordinates of reference pixel (if not in header or image center)
- .TP
- .B \-z
--Use AIPS classic projection code (for "-SIN", "-TAN", "-ARC", "-NCP",
--"-GLS", "-MER", "-AIT" and "-STG" only) instead of WCSLIB proposed
-+Use AIPS classic projection code (for "\-SIN", "\-TAN", "\-ARC", "\-NCP",
-+"\-GLS", "\-MER", "\-AIT" and "\-STG" only) instead of WCSLIB proposed
- standard projection code.
- 
- .SH Web Page
---- a/man/man1/xy2sky.1
-+++ b/man/man1/xy2sky.1
-@@ -1,12 +1,12 @@
--.TH xy2sky(1) WCSTools "6 July 2001"
-+.TH xy2sky 1 WCSTools "6 July 2001"
- .SH Name
- xy2sky \- Compute RA Dec from X Y using WCS in FITS and IRAF image files
- .SH Synopsis
--xy2sky [-vbjg] [-n ndec] file.fts x1 y1 ... xn yn
-+xy2sky [\-vbjg] [\-n ndec] file.fts x1 y1 ... xn yn
- .br
- or
- .br
--xy2sky [-bdjgv] [-n ndec] file.fts @listfile
-+xy2sky [\-bdjgv] [\-n ndec] file.fts @listfile
- .SH Description
- .I xy2sky
- (pronounced X-Y-to-sky) is a utility for getting the world coordinates of
-@@ -31,7 +31,7 @@
- RA and Dec output in degrees
- .TP
- .B \-e
--Ouput in ecliptic longitude and latitude in degrees.
-+Output in ecliptic longitude and latitude in degrees.
- .TP
- .B \-f <number>
- Set third dimension for 3-D projections such as CSC
-@@ -54,7 +54,7 @@
- Number of decimal places in output RA seconds
- .TP
- .B \-q <year>
--Output equinox if not 2000 (-j) or 1950 (-b)
-+Output equinox if not 2000 (\-j) or 1950 (\-b)
- .TP
- .B \-t
- Output as tab-separated table
---- a/man/man1/imgsc.1
-+++ b/man/man1/imgsc.1
-@@ -1,4 +1,4 @@
--.TH imgsc(1) WCS "14 April 1998"
-+.TH imgsc 1 WCS "14 April 1998"
- .SH Name
- imgsc \- Find HST GSC stars in FITS or IRAF image files
- .SH Synopsis
-@@ -16,7 +16,7 @@
- Reference catalog (gsc, ujc, or tab table file
- .TP
- .B \-g <class>
--Guide Star Catalog class (-1=all,0,3 (default -1)
-+Guide Star Catalog class (\-1=all,0,3 (default \-1)
- .TP
- .B \-h
- Print heading, else do not 
-@@ -25,7 +25,7 @@
- Output in J2000, optional new image center in J2000 (FK5) RA and Dec
- .TP
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .TP
- .B \-n <num>
- Number of brightest stars to print 
---- a/man/man1/i2f.1
-+++ b/man/man1/i2f.1
-@@ -1,4 +1,4 @@
--.TH i2f(1) WCSTools "6 July 2001"
-+.TH i2f 1 WCSTools "6 July 2001"
- .SH Name
- i2f \- Write FITS files from IRAF image files
- .SH Synopsis
---- a/man/man1/edhead.1
-+++ b/man/man1/edhead.1
-@@ -1,4 +1,4 @@
--.TH edhead(1) WCSTools "6 July 2001"
-+.TH edhead 1 WCSTools "6 July 2001"
- .SH Name
- edhead \- Edit header of FITS or IRAF image file
- .SH Synopsis
---- a/man/man1/sua2.1
-+++ b/man/man1/sua2.1
-@@ -1,13 +1,13 @@
--.TH sua2(1) WCS "19 November 1999"
-+.TH sua2 1 WCS "19 November 1999"
- .SH Name
--Find USNO-A2.0 Catalog stars in a square on the sky
-+sua2 \- Find USNO-A2.0 Catalog stars in a square on the sky
- .SH Synopsis
- sua2 [options] ra dec system
- .SH Description
- .I suac
- finds all of the U.S. Naval Observatory A2.0 Catalog objects in a specified
- region of the sky and lists their sky positions and magnitudes in order of
--brightness. Output is to standard out, unless the -w flag is set, in which
-+brightness. Output is to standard out, unless the \-w flag is set, in which
- case it goes to objectname.uac or search.uac. It is a link to scat.
- .SH Options
- .B \-a
-@@ -31,7 +31,7 @@
- .B \-l
- Print center and closest star on one line
- .B \-m [<bright magnitude>] <faint magnitude>
--Limiting catalog magnitude(s) (default none, bright -2 if only faint is given)
-+Limiting catalog magnitude(s) (default none, bright \-2 if only faint is given)
- .B \-n <num>
- Number of brightest stars to print 
- .B \-o <name>
---- a/man/man1/simpos.1
-+++ b/man/man1/simpos.1
-@@ -1,4 +1,4 @@
--.TH simpos(1) WCSTools "14 May 2015"
-+.TH simpos 1 WCSTools "14 May 2015"
- .SH Name
- simpos \- Find position of a named object in the sky
- .SH Synopsis

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
deleted file mode 100644
index 694c072..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: Fix several bugs that appear in during the mayhem tests.
-Bug: http://bugs.debian.org/715682
-Bug: http://bugs.debian.org/715755
-Bug: http://bugs.debian.org/715905
-Bug: http://bugs.debian.org/715956
-Bug: http://bugs.debian.org/715957
---- a/getfits.c
-+++ b/getfits.c
-@@ -108,6 +108,7 @@
- 		usage ("Right ascension given but no declination");
- 	    else {
- 		strcpy (rastr, *av);
-+		ac--;
- 		strcpy (decstr, *++av);
- 		ra0 = str2ra (rastr);
- 		dec0 = str2dec (decstr);
---- a/getpix.c
-+++ b/getpix.c
-@@ -83,6 +83,7 @@
-     char *crange;       /* Column range string */
-     char *rstr;
-     char *dstr = NULL;
-+    char rastr[32], decstr[32];
-     char *cstr;
-     int systemp;
-     int i;
---- a/bincat.c
-+++ b/bincat.c
-@@ -156,7 +156,7 @@
- 	    if (ac < 3)
- 		usage((char)0, "3 arguments needed for center coordinate");
- 	    else {
--		strcpy (rastr, *++av);
-+		strcpy (rastr, *av);
- 		ac--;
- 		strcpy (decstr, *++av);
- 		setcenter (rastr, decstr);
---- a/cphead.c
-+++ b/cphead.c
-@@ -137,7 +137,7 @@
- 		    break;
- 	
- 		case 'w': /* Copy entire WCS */
--		    nkwd1 = 87;
-+		    nkwd1 = 236;
- 		    if (nkwd + nkwd1 > maxnkwd) {
- 			maxnkwd = nkwd + nkwd1 + 32;
- 			kwdnew = (char **) calloc (maxnkwd, sizeof (void *));
-@@ -148,7 +148,7 @@
- 			free (kwd);
- 			kwd = kwdnew;
- 			}
--		    for (ikwd = nkwd; i < nkwd+nkwd1; i++) {
-+		    for (ikwd = nkwd; ikwd < nkwd+nkwd1+32; ikwd++) {
- 			kwd[ikwd] = (char *) calloc (32, 1);
- 			}
- 		    strcpy (kwd[nkwd], "RA");
---- a/filext.c
-+++ b/filext.c
-@@ -80,7 +80,7 @@
- 		    ext = ext + 1;
- 		}
- 	    }
--	printf ("%s\n", ext);
-+	printf ("%s\n", (ext)?ext:"");
- 	}
- 
-     return (0);

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
deleted file mode 100644
index 7c666c1..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: Spellfixes to make lintian happy
---- a/libwcs/fitsfile.c
-+++ b/libwcs/fitsfile.c
-@@ -1583,7 +1583,7 @@
- 	if (!access (filename, 0)) {
- 	    fd = open (filename, O_WRONLY);
- 	    if (fd < 3) {
--		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writeable\n", filename);
-+		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writable\n", filename);
- 		return (0);
- 		}
- 	    }
-@@ -1622,7 +1622,7 @@
- 	if (!access (filename, 0)) {
- 	    fd = open (filename, O_WRONLY);
- 	    if (fd < 3) {
--		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writeable\n",
-+		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writable\n",
- 			 filename);
- 		return (0);
- 		}
-@@ -1884,7 +1884,7 @@
-     if (!access (filename, 0)) {
- 	fdout = open (filename, O_WRONLY);
- 	if (fdout < 3) {
--	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writeable\n", filename);
-+	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writable\n", filename);
- 	    return (0);
- 	    }
- 	}
-@@ -1970,7 +1970,7 @@
-     if (!access (filename, 0)) {
- 	fd = open (filename, O_WRONLY);
- 	if (fd < 3) {
--	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writeable\n", filename);
-+	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writable\n", filename);
- 	    return (0);
- 	    }
- 	}
-@@ -2072,7 +2072,7 @@
-     if (ext != NULL)
- 	*ext = cext;
-     if (fd < 3) {
--	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writeable\n", filename);
-+	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writable\n", filename);
- 	return (-1);
- 	}
- 
---- a/libwcs/imhfile.c
-+++ b/libwcs/imhfile.c
-@@ -896,7 +896,7 @@
-     if (!access (hdrname, 0)) {
- 	fd = open (hdrname, O_WRONLY);
- 	if (fd < 3) {
--	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", hdrname);
-+	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", hdrname);
- 	    return (0);
- 	    }
- 	}
-@@ -993,7 +993,7 @@
-     if (!access (pixname, 0)) {
- 	fd = open (pixname, O_WRONLY);
- 	if (fd < 3) {
--	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", pixname);
-+	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", pixname);
- 	    return (0);
- 	    }
- 	}

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
deleted file mode 100644
index 4ec5993..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Ole Streicher <olebole@××××××.net>
-Description: Fix overlappong buffers in sprintf
- In sprintf, overlapping buffers lead to undefined behaviour.
- This causes different results on Debian and Ubuntu.
---- a/imstar.c
-+++ b/imstar.c
-@@ -818,7 +818,7 @@
- 	    sprintf (headline, "%7.2f %7.2f %6.2f  %d",
- 		    sx[i],sy[i],smag[i],sp[i]);
- 	    if (iswcs (wcs))
--		sprintf (headline, "%s %s %s", headline, rastr, decstr);
-+		sprintf (headline + strlen(headline), " %s %s", rastr, decstr);
- 	    if (wfile)
- 		fprintf (fd, "%s\n", headline);
- 	    else
-@@ -827,14 +827,14 @@
- 	else {
- 	    sprintf (headline, "%3d %s %s %6.2f", i+1,rastr,decstr,smag[i]);
- 	    if (wcs->nxpix < 100.0 && wcs->nypix > 100.0)
--		sprintf (headline, "%s  %5.2f %5.2f %d",
--		headline, sx[i],sy[i], sp[i]);
-+		sprintf (headline + strlen(headline), "  %5.2f %5.2f %d",
-+		sx[i],sy[i], sp[i]);
- 	    else if (wcs->nxpix < 1000.0 && wcs->nypix < 1000.0)
--		sprintf (headline, "%s  %6.2f %6.2f %d",
--		headline, sx[i],sy[i], sp[i]);
-+		sprintf (headline + strlen(headline), "  %6.2f %6.2f %d",
-+		sx[i],sy[i], sp[i]);
- 	    else
--		sprintf (headline, "%s  %7.2f %7.2f %d",
--		headline, sx[i],sy[i], sp[i]);
-+		sprintf (headline + strlen(headline), "  %7.2f %7.2f %d",
-+		sx[i],sy[i], sp[i]);
- 	    if (wfile)
- 		fprintf (fd, "%s\n", headline);
- 	    else

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
deleted file mode 100644
index 4ebc206..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian@×××××××××.cx>
-Description: If a unrecoverable error occurred, abort() instead of exit()
- to allow the user for tracing the problem.
---- a/libwcs/poly.c
-+++ b/libwcs/poly.c
-@@ -43,7 +43,7 @@
- void	qerror(char *msg1, char *msg2)
-   {
-   fprintf(stderr, "\n> %s%s\n\n",msg1,msg2);
--  exit(-1);
-+  abort();
-   }
- 
- 

diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
deleted file mode 100644
index f8de3da..0000000
--- a/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Ole Streicher <olebole@××××××.net>
-Description: Increase c*type and ptype field string lengths
- This is needed to allow C1TYPE='RA---TAN-SIP'
-Bug: https://bugs.launchpad.net/ubuntu/+source/saods9/+bug/1458333
---- a/libwcs/wcsinit.c
-+++ b/libwcs/wcsinit.c
-@@ -399,11 +399,11 @@
- 	}
- 
-     /* World coordinate system reference coordinate information */
--    if (hgetsc (hstring, "CTYPE1", &mchar, 16, ctype1)) {
-+    if (hgetsc (hstring, "CTYPE1", &mchar, 9, ctype1)) {
- 
- 	/* Read second coordinate type */
- 	strcpy (ctype2, ctype1);
--	if (!hgetsc (hstring, "CTYPE2", &mchar, 16, ctype2))
-+	if (!hgetsc (hstring, "CTYPE2", &mchar, 9, ctype2))
- 	    twod = 0;
- 	else
- 	    twod = 1;

diff --git a/sci-astronomy/wcstools/files/wcstools.pc.in b/sci-astronomy/wcstools/files/wcstools.pc.in
deleted file mode 100644
index c8eb8b0..0000000
--- a/sci-astronomy/wcstools/files/wcstools.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: @PACKAGE_NAME@
-Description: World Coordinate System Library and Tools
-Version: @PACKAGE_VERSION@
-URL: http://tdc-www.harvard.edu/wcstools/
-Libs: -L${libdir} -lwcstools
-Libs.private: -lm
-Cflags: -I${includedir}/wcs
-

diff --git a/sci-astronomy/wcstools/metadata.xml b/sci-astronomy/wcstools/metadata.xml
deleted file mode 100644
index 94f4f60..0000000
--- a/sci-astronomy/wcstools/metadata.xml
+++ /dev/null
@@ -1,20 +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@g.o</email>
-	<name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  Astronomers often need to relate positions on an image of the sky to
-  positions on the real sky to identify catalogued objects in images,
-  tell other people where to look to find an identified object, or to
-  compute motions of planets, satellites, asteroids, or comets. WCSTools
-  is a package of programs and a library of utility subroutines for
-  setting and using the world coordinate systems (WCS) in the headers of
-  the most common astronomical image formats, FITS and IRAF .imh, to
-  relate image pixels to sky coordinates.
-  The Gentoo package is using GNU autotools to produce portable shared
-  and static libraried.
-</longdescription>
-</pkgmetadata>

diff --git a/sci-astronomy/wcstools/wcstools-3.9.2.ebuild b/sci-astronomy/wcstools/wcstools-3.9.2.ebuild
deleted file mode 100644
index 38c7d89..0000000
--- a/sci-astronomy/wcstools/wcstools-3.9.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils multilib
-
-DESCRIPTION="World Coordinate System library for astronomical FITS images"
-HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DOCS=( Readme Programs NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/wcstools-3.9.2-compiler_warnings.patch
-	"${FILESDIR}"/wcstools-3.9.2-manpages.patch
-	"${FILESDIR}"/wcstools-3.9.2-mayhem.patch
-	"${FILESDIR}"/wcstools-3.9.2-RASortStars.patch
-	"${FILESDIR}"/wcstools-3.9.2-spelling.patch
-	"${FILESDIR}"/wcstools-3.9.2-sprintf.patch
-	"${FILESDIR}"/wcstools-3.9.2-use_abort.patch
-	"${FILESDIR}"/wcstools-3.9.2-wcsinit_crash.patch
-)
-
-src_prepare() {
-	einfo "Copying gentoo autotools files"
-	local f
-	for f in "${FILESDIR}"/{configure.ac,wcstools.pc.in,Makefile.am}; do
-		cp ${f} "${S}"/ || die
-	done
-	cp "${FILESDIR}"/Makefile.libwcs.am "${S}"/libwcs/Makefile.am || die
-	# avoid colliding with fixdos, getdate and remap from other packages
-	sed -i \
-		-e 's/getdate/wcsgetdate/' \
-		-e 's/crlf/wcscrlf/' \
-		-e 's/remap/wcsremap/' \
-		-e "s/3.... Programs/${PV} Programs/" \
-		wcstools || die
-	autotools-utils_src_prepare
-}
-
-src_test() {
-	einfo "Testing various wcstools programs"
-	./newfits -a 10 -j 248 41 -p 0.15 test.fits || die "test newfits failed"
-	./sethead test.fits A=1 B=1 ||  die "test sethead failed"
-	[[ "$(./gethead test.fits RA)" == "16:32:00.0000" ]] \
-		|| die "test gethead failed"
-	rm test.fits
-}
-
-src_install() {
-	autotools-utils_src_install
-	doman man/man1/*
-	newdoc libwcs/NEWS NEWS.libwcs
-	newdoc libwcs/Readme Readme.libwcs
-
-}
-
-pkg_postinst() {
-	elog "The following execs have been renamed to avoid colliding"
-	elog "with other packages:"
-	elog " getdate -> wcsgetdate"
-	elog " crlf    -> wcscrlf"
-	elog " remap   -> wcsremap"
-}

diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
deleted file mode 100644
index d92d091..0000000
--- a/sci-libs/cfitsio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cfitsio-3.37.tar.gz 4135218 SHA256 68058d5c805a3a63f3fe62dafcc8cc80afe2e2b34e10e16a9b1fb38376c0acbf SHA512 31ec98cc700dad0deabbb7349b1a018d2d4aa79ae3f70fa28397bb43b1420c7107697443bc2bd43c88b372477676d9f8c22a6731114d51379312faf6d0936752 WHIRLPOOL b18921d174248a35186b3457ede8858a48136568d03cfda37a29d968cc43c817dd956d95e9f18f4d214b1ce36a2c564e9369d2e4fed562e19c7eb48992735783

diff --git a/sci-libs/cfitsio/cfitsio-3.37.ebuild b/sci-libs/cfitsio/cfitsio-3.37.ebuild
deleted file mode 100644
index 17085d1..0000000
--- a/sci-libs/cfitsio/cfitsio-3.37.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools-multilib fortran-2
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="bzip2 doc examples fortran static-libs +tools threads"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	fortran? ( dev-lang/cfortran )"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		mv cfortran.h cfortran.h.disabled
-		ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-	fi
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fortran)
-		$(use_enable threads)
-		$(use_enable tools)
-		$(use_with bzip2)
-	)
-	autotools-multilib_src_configure
-}
-
-src_install () {
-	autotools-multilib_src_install
-	dodoc README README.md CHANGES.md docs/changes.txt docs/cfitsio.doc
-	use fortran && dodoc docs/fitsio.doc
-	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	use doc && use fortran && dodoc docs/fitsio.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
-	fi
-}

diff --git a/sci-libs/cfitsio/metadata.xml b/sci-libs/cfitsio/metadata.xml
deleted file mode 100644
index 3a1d7ee..0000000
--- a/sci-libs/cfitsio/metadata.xml
+++ /dev/null
@@ -1,18 +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">
-  CFITSIO is a library of C and Fortran subroutines for reading and
-  writing data files in FITS (Flexible Image Transport System) data
-  format. CFITSIO provides simple high-level routines for reading and
-  writing FITS files that insulate the programmer from the internal
-  complexities of the FITS format. CFITSIO also provides advanced
-  features for manipulating and filtering the information in FITS
-  files.
-</longdescription>
-  <use>
-    <flag name="tools">Build execs fpack, funpack, imcopy, fitscopy, listhead
-  </flag>
-  </use>
-</pkgmetadata>

diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
deleted file mode 100644
index 8883ae9..0000000
--- a/sci-libs/netcdf-fortran/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netcdf-fortran-4.4.2.tar.gz 1007725 SHA256 ad6249b6062df6f62f81d1cb2a072e3a4c595f27f11fe0c5a79726d1dad3143b SHA512 5479f369edd31b593a5dfa540edf4fe19890c26e8a6fcd23c3f8696eccc81de9f7ee8c85356f1da4891d71f1bf095fd0e0c74e4597b259bae0258e6ccf1b31d0 WHIRLPOOL 707c06a088fdde17d7b191e71ecedc67bab8646f1241c3220e7c7433e6cf04ee57a3974df9a6fee354080eb0c883e8c2fce6cd309b96a2a7f49cf22ebe4d1e11

diff --git a/sci-libs/netcdf-fortran/metadata.xml b/sci-libs/netcdf-fortran/metadata.xml
deleted file mode 100644
index 1c9a839..0000000
--- a/sci-libs/netcdf-fortran/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
-  NetCDF (network Common Data Form) is an interface for scientific
-  data access and a freely-distributed software library that provides an
-  implementation of the interface.  The netCDF library also defines a
-  machine-independent format for representing scientific data.
-  Together, the interface, library, and format support the creation,
-  access, and sharing of scientific data.
-  This is the FORTRAN 77 and 90 library on top of the C library.
-</longdescription>
-</pkgmetadata>

diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild
deleted file mode 100644
index fea4f21..0000000
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FORTRAN_STANDARD="77 90 2003"
-
-inherit autotools-utils fortran-2
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-RDEPEND="sci-libs/netcdf"
-DEPEND="${RDEPEND}
-	dev-lang/cfortran
-	doc? ( app-doc/doxygen[dot] )
-"
-
-src_prepare() {
-	# use system cfortran
-	rm libsrc/cfortran.h || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--disable-extra-example-tests
-		--enable-f03
-		$(use_enable doc dot)
-		$(use_enable doc doxygen)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
deleted file mode 100644
index b947104..0000000
--- a/sci-libs/netcdf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netcdf-4.3.3.1.tar.gz 4999463 SHA256 bdde3d8b0e48eed2948ead65f82c5cfb7590313bc32c4cf6c6546e4cea47ba19 SHA512 a14e126ec3dcb4c7c68e82b20cd149f391ff9f2f733f19a93b159c1529e04ee2a66128962a4534cfe1f37e1c8a100f92def4f79069f5359c95a819715f62acef WHIRLPOOL 17d5ea91954fa85d110675066c04695739b4a36bd42eeeb14c678d7927dc1f22aadd075d10f754b3e4655c1cebd242fc80b6999c50b3660ec7334f4180bce3ee

diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml
deleted file mode 100644
index d78394e..0000000
--- a/sci-libs/netcdf/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
-  NetCDF (network Common Data Form) is an interface for scientific
-  data access and a freely-distributed software library that provides an
-  implementation of the interface.  The netCDF library also defines a
-  machine-independent format for representing scientific data.
-  Together, the interface, library, and format support the creation,
-  access, and sharing of scientific data.
-</longdescription>
-  <use>
-    <flag name="dap">Support for remote data access with the built-in OPeNDAP client</flag>
-    <flag name="hdf">Add support for the Hierarchical Data Format v.4 <pkg>sci-libs/hdf</pkg></flag>
-    <flag name="tools">Build the utilities nccopy, ncgen and ncdump</flag>
-  </use>
-</pkgmetadata>

diff --git a/sci-libs/netcdf/netcdf-4.3.3.1.ebuild b/sci-libs/netcdf/netcdf-4.3.3.1.ebuild
deleted file mode 100644
index 347d2b3..0000000
--- a/sci-libs/netcdf/netcdf-4.3.3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dap doc examples hdf +hdf5 mpi static-libs szip test tools"
-
-RDEPEND="
-	dap? ( net-misc/curl:0= )
-	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
-	hdf5? ( sci-libs/hdf5:0=[mpi=,szip=,zlib] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-examples
-		--disable-dap-remote-tests
-		$(use_enable dap)
-		$(use_enable doc doxygen)
-		$(use_enable hdf hdf4)
-		$(use_enable hdf5 netcdf-4)
-		$(use_enable tools utilities)
-	)
-	if use mpi; then
-		export CC=mpicc
-		myeconfargs+=( --enable-parallel )
-		use test && myeconfargs+=( --enable-parallel-tests )
-	fi
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}