summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-astronomy
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-astronomy')
-rw-r--r--sci-astronomy/aatm/Manifest2
-rw-r--r--sci-astronomy/aatm/aatm-0.4.3.1.ebuild23
-rw-r--r--sci-astronomy/aatm/metadata.xml15
-rw-r--r--sci-astronomy/casa-data/casa-data-10013.ebuild29
-rw-r--r--sci-astronomy/casa-data/casa-data-99999.ebuild29
-rw-r--r--sci-astronomy/casa-data/metadata.xml9
-rw-r--r--sci-astronomy/casacore/Manifest1
-rw-r--r--sci-astronomy/casacore/casacore-1.5.0-r1.ebuild72
-rw-r--r--sci-astronomy/casacore/files/1.3.0-implicits.patch166
-rw-r--r--sci-astronomy/casacore/files/1.3.0-libdir.patch196
-rw-r--r--sci-astronomy/casacore/files/1.5.0-gcc47.patch22
-rw-r--r--sci-astronomy/casacore/files/1.5.0-gcc48.patch11
-rw-r--r--sci-astronomy/casacore/files/1.5.0-sysdep.patch17
-rw-r--r--sci-astronomy/casacore/metadata.xml16
-rw-r--r--sci-astronomy/cdsclient/Manifest1
-rw-r--r--sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild41
-rw-r--r--sci-astronomy/cdsclient/files/cdsclient-makefile.patch102
-rw-r--r--sci-astronomy/cdsclient/metadata.xml11
-rw-r--r--sci-astronomy/celestia/Manifest1
-rw-r--r--sci-astronomy/celestia/celestia-1.6.1-r1.ebuild121
-rw-r--r--sci-astronomy/celestia/files/celestia-1.5.0-desktop.patch55
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch11
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch14
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch22
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch14
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch25
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.1-linking.patch65
-rw-r--r--sci-astronomy/celestia/metadata.xml18
-rw-r--r--sci-astronomy/cpl/Manifest4
-rw-r--r--sci-astronomy/cpl/cpl-6.3.1.ebuild74
-rw-r--r--sci-astronomy/cpl/cpl-6.4.1.ebuild74
-rw-r--r--sci-astronomy/cpl/cpl-6.4.2.ebuild74
-rw-r--r--sci-astronomy/cpl/cpl-6.4.ebuild74
-rw-r--r--sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch35
-rw-r--r--sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch46
-rw-r--r--sci-astronomy/cpl/metadata.xml22
-rw-r--r--sci-astronomy/ds9-bin/Manifest5
-rw-r--r--sci-astronomy/ds9-bin/ds9-bin-7.1.ebuild42
-rw-r--r--sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild42
-rw-r--r--sci-astronomy/ds9-bin/metadata.xml19
-rw-r--r--sci-astronomy/erfa/Manifest2
-rw-r--r--sci-astronomy/erfa/erfa-1.0.1.ebuild16
-rw-r--r--sci-astronomy/erfa/erfa-1.1.0.ebuild16
-rw-r--r--sci-astronomy/erfa/metadata.xml14
-rw-r--r--sci-astronomy/esorex/Manifest2
-rw-r--r--sci-astronomy/esorex/esorex-3.10-r2.ebuild41
-rw-r--r--sci-astronomy/esorex/esorex-3.10.2.ebuild39
-rw-r--r--sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch13
-rw-r--r--sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch12
-rw-r--r--sci-astronomy/esorex/files/esorex-3.10-fix_format_strings.patch24
-rw-r--r--sci-astronomy/esorex/files/esorex-3.10-generate-manpage.patch123
-rw-r--r--sci-astronomy/esorex/files/esorex-3.10-remove-empty-configdir.patch13
-rw-r--r--sci-astronomy/esorex/files/esorex-3.10-remove-private-ltdl.patch39
-rw-r--r--sci-astronomy/esorex/files/esorex-3.10-set-default-plugin-path.patch28
-rw-r--r--sci-astronomy/esorex/files/esorex-3.9.6-use-shared-libs.patch20
-rw-r--r--sci-astronomy/esorex/metadata.xml18
-rw-r--r--sci-astronomy/funtools/Manifest1
-rw-r--r--sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch292
-rw-r--r--sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch121
-rw-r--r--sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch99
-rw-r--r--sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch68
-rw-r--r--sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch602
-rw-r--r--sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch341
-rw-r--r--sci-astronomy/funtools/funtools-1.4.4-r4.ebuild62
-rw-r--r--sci-astronomy/funtools/metadata.xml12
-rw-r--r--sci-astronomy/galaxy/Manifest1
-rw-r--r--sci-astronomy/galaxy/galaxy-2.2.ebuild44
-rw-r--r--sci-astronomy/galaxy/metadata.xml10
-rw-r--r--sci-astronomy/gasgano/Manifest3
-rw-r--r--sci-astronomy/gasgano/gasgano-2.4.3-r2.ebuild41
-rw-r--r--sci-astronomy/gasgano/gasgano-2.4.5.ebuild41
-rw-r--r--sci-astronomy/gasgano/metadata.xml14
-rw-r--r--sci-astronomy/idlastro/Manifest2
-rw-r--r--sci-astronomy/idlastro/idlastro-20130501.ebuild24
-rw-r--r--sci-astronomy/idlastro/idlastro-20140125.ebuild24
-rw-r--r--sci-astronomy/idlastro/metadata.xml14
-rw-r--r--sci-astronomy/kapteyn/Manifest1
-rw-r--r--sci-astronomy/kapteyn/files/kapteyn-2.2-debundle_wcs.patch101
-rw-r--r--sci-astronomy/kapteyn/kapteyn-2.2-r1.ebuild33
-rw-r--r--sci-astronomy/kapteyn/metadata.xml12
-rw-r--r--sci-astronomy/metadata.xml39
-rw-r--r--sci-astronomy/predict/Manifest2
-rw-r--r--sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch27
-rw-r--r--sci-astronomy/predict/files/predict-update92
-rw-r--r--sci-astronomy/predict/metadata.xml17
-rw-r--r--sci-astronomy/predict/predict-2.2.3-r1.ebuild200
-rw-r--r--sci-astronomy/pyephem/Manifest3
-rw-r--r--sci-astronomy/pyephem/metadata.xml19
-rw-r--r--sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild55
-rw-r--r--sci-astronomy/pyephem/pyephem-3.7.5.2.ebuild55
-rw-r--r--sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild55
-rw-r--r--sci-astronomy/skycat/Manifest1
-rw-r--r--sci-astronomy/skycat/files/skycat-3.0.2-systemlibs.patch107
-rw-r--r--sci-astronomy/skycat/files/skycat-3.0.2-tk8.5.patch21
-rw-r--r--sci-astronomy/skycat/files/skycat-3.1.2-m4.patch150
-rw-r--r--sci-astronomy/skycat/files/skycat-3.1.2-makefile-qa.patch132
-rw-r--r--sci-astronomy/skycat/metadata.xml10
-rw-r--r--sci-astronomy/skycat/skycat-3.1.2-r1.ebuild60
-rw-r--r--sci-astronomy/skychart/Manifest14
-rw-r--r--sci-astronomy/skychart/files/skychart-3.10.2854-QA.patch99
-rw-r--r--sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch107
-rw-r--r--sci-astronomy/skychart/metadata.xml10
-rw-r--r--sci-astronomy/skychart/skychart-3.10.2854.ebuild120
-rw-r--r--sci-astronomy/skychart/skychart-3.8.2450.ebuild117
-rw-r--r--sci-astronomy/sofa_c/Manifest1
-rw-r--r--sci-astronomy/sofa_c/files/sofa_c-makefile.patch113
-rw-r--r--sci-astronomy/sofa_c/metadata.xml23
-rw-r--r--sci-astronomy/sofa_c/sofa_c-20120301a.ebuild38
-rw-r--r--sci-astronomy/stellarium/Manifest7
-rw-r--r--sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch23
-rw-r--r--sci-astronomy/stellarium/metadata.xml21
-rw-r--r--sci-astronomy/stellarium/stellarium-0.12.4.ebuild107
-rw-r--r--sci-astronomy/stellarium/stellarium-0.13.3.ebuild100
-rw-r--r--sci-astronomy/stiff/Manifest1
-rw-r--r--sci-astronomy/stiff/files/stiff-configure.patch63
-rw-r--r--sci-astronomy/stiff/metadata.xml10
-rw-r--r--sci-astronomy/stiff/stiff-2.1.3.ebuild28
-rw-r--r--sci-astronomy/swarp/Manifest1
-rw-r--r--sci-astronomy/swarp/files/swarp-nodoc.patch11
-rw-r--r--sci-astronomy/swarp/metadata.xml9
-rw-r--r--sci-astronomy/swarp/swarp-2.19.1.ebuild31
-rw-r--r--sci-astronomy/wcslib/Manifest3
-rw-r--r--sci-astronomy/wcslib/metadata.xml20
-rw-r--r--sci-astronomy/wcslib/wcslib-4.21.ebuild74
-rw-r--r--sci-astronomy/wcslib/wcslib-4.22.ebuild74
-rw-r--r--sci-astronomy/wcslib/wcslib-4.23.ebuild74
-rw-r--r--sci-astronomy/wcstools/Manifest1
-rw-r--r--sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch142
-rw-r--r--sci-astronomy/wcstools/files/wcstools-3.8.4-implicits.patch21
-rw-r--r--sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch11
-rw-r--r--sci-astronomy/wcstools/metadata.xml17
-rw-r--r--sci-astronomy/wcstools/wcstools-3.8.7.ebuild62
-rw-r--r--sci-astronomy/xephem/Manifest2
-rw-r--r--sci-astronomy/xephem/files/xephem-3.7.4-libs-flags.patch160
-rw-r--r--sci-astronomy/xephem/files/xephem-3.7.4-overflows.patch15
-rw-r--r--sci-astronomy/xephem/files/xephem-3.7.5-respect-flags.patch57
-rw-r--r--sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch12
-rw-r--r--sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch129
-rw-r--r--sci-astronomy/xephem/metadata.xml13
-rw-r--r--sci-astronomy/xephem/xephem-3.7.5.ebuild68
-rw-r--r--sci-astronomy/xephem/xephem-3.7.6.ebuild54
-rw-r--r--sci-astronomy/xfitsview/Manifest1
-rw-r--r--sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch54
-rw-r--r--sci-astronomy/xfitsview/metadata.xml10
-rw-r--r--sci-astronomy/xfitsview/xfitsview-2.2-r1.ebuild33
145 files changed, 7209 insertions, 0 deletions
diff --git a/sci-astronomy/aatm/Manifest b/sci-astronomy/aatm/Manifest
new file mode 100644
index 00000000000..50c9077216f
--- /dev/null
+++ b/sci-astronomy/aatm/Manifest
@@ -0,0 +1,2 @@
+DIST aatm-0.4.3.1-ac-boost.patch.gz 4519 SHA256 7bf274010fb6df06faf06d287c2faf2b3b8ef4aa5f5b8f2624393cdc0cb13746 SHA512 b27e4859e475ea5411a8c1a17f20d19baacc456a436977589f65b9897c56e946bfc09e5532bbfd5bf7d63bbbcdddeccb4e5ea2800959e9cd39d791feb668e579 WHIRLPOOL a35450c8dba7b801352f4c81c8e52149167e5cb5a2a3d7b627949a9af98f15795409278ee59776a6ca9db96e838c093988f60cd0731aad08c2695cfb29bdf883
+DIST aatm-0.4.3.1.tar.gz 611919 SHA256 b41c5b524bc66559357a20ef032b407385aa919e07fd5742afffd33847fa42c9 SHA512 dce1b52ea2396d40f3f413b9ea40987b5eaa0d9902e4713d8a242d2c04e7fb93078f94f08a30af42195083919289d3fc8a449dd891ce1c8cb40d7358203d43ff WHIRLPOOL 9c76381c0b937f9bdea82df274dc85aa4136a1993247899b351754d88765340a2c597d6eed04ad766ec023977b8850ba4c464bad4bf33fe8d1c54e1e6654e038
diff --git a/sci-astronomy/aatm/aatm-0.4.3.1.ebuild b/sci-astronomy/aatm/aatm-0.4.3.1.ebuild
new file mode 100644
index 00000000000..e969e9a8798
--- /dev/null
+++ b/sci-astronomy/aatm/aatm-0.4.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="Atmospheric Modelling for ALMA Observatory"
+HOMEPAGE="http://www.mrao.cam.ac.uk/~bn204/alma/atmomodel.html"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+ http://dev.gentoo.org/~bicatali/distfiles/${P}-ac-boost.patch.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/boost"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${WORKDIR}"/${P}-ac-boost.patch )
diff --git a/sci-astronomy/aatm/metadata.xml b/sci-astronomy/aatm/metadata.xml
new file mode 100644
index 00000000000..19c9bd43290
--- /dev/null
+++ b/sci-astronomy/aatm/metadata.xml
@@ -0,0 +1,15 @@
+<?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">
+ ATmospheric Modeling for ALMA is a library of routines for modelling
+ transmission of cm/mm/sub-mm wavelength radiation through the Earths
+ atmosphere. It is designed to simulate both the absorption/emission
+ of radiation and the dispersion (i.e., the frequency dependent
+ refractive index of the atmosphere).
+</longdescription>
+ <upstream>
+ <remote-id type="launchpad">aatm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-astronomy/casa-data/casa-data-10013.ebuild b/sci-astronomy/casa-data/casa-data-10013.ebuild
new file mode 100644
index 00000000000..91997d65176
--- /dev/null
+++ b/sci-astronomy/casa-data/casa-data-10013.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit subversion
+
+ESVN_REPO_URI="https://svn.cv.nrao.edu/svn/casa-data/distro@${PV}"
+ESVN_OPTIONS="--non-interactive --trust-server-cert "
+
+DESCRIPTION="Data and tables for the CASA software"
+HOMEPAGE="https://safe.nrao.edu/wiki/bin/view/Software/ObtainingCasaDataRepository"
+SRC_URI=""
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/distro"
+
+src_install(){
+ insinto /usr/share/casa/data
+ doins -r *
+}
diff --git a/sci-astronomy/casa-data/casa-data-99999.ebuild b/sci-astronomy/casa-data/casa-data-99999.ebuild
new file mode 100644
index 00000000000..33c413f0960
--- /dev/null
+++ b/sci-astronomy/casa-data/casa-data-99999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit subversion
+
+ESVN_REPO_URI="https://svn.cv.nrao.edu/svn/casa-data/distro"
+ESVN_OPTIONS="--non-interactive --trust-server-cert "
+
+DESCRIPTION="Data and tables for the CASA software"
+HOMEPAGE="https://safe.nrao.edu/wiki/bin/view/Software/ObtainingCasaDataRepository"
+SRC_URI=""
+
+KEYWORDS=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/distro"
+
+src_install(){
+ insinto /usr/share/casa/data
+ doins -r *
+}
diff --git a/sci-astronomy/casa-data/metadata.xml b/sci-astronomy/casa-data/metadata.xml
new file mode 100644
index 00000000000..32643d6165b
--- /dev/null
+++ b/sci-astronomy/casa-data/metadata.xml
@@ -0,0 +1,9 @@
+<?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">
+ Observatory tables, ephemerides and other software data related to
+ the Common Astronomy Software Applications (CASA) suite.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest
new file mode 100644
index 00000000000..204609ba9a0
--- /dev/null
+++ b/sci-astronomy/casacore/Manifest
@@ -0,0 +1 @@
+DIST casacore-1.5.0.tar.bz2 6327906 SHA256 95ec894b5721ee2391c0d79fc45528c431edb2c6b335ad67fe0b6afabf0c70cb SHA512 a3e108f525775ec5022005ce73810a6bc8eb0a6abcbcaed96f2af3ba7911a3675872708ea53afbfb8a143312709a336aabca21cf1fea0396cc4adc56ba08f3f1 WHIRLPOOL c0aa888a9123ec5b7a5e0eedc8c5fe88241c6e7a9f9d138361e68b0f2da17a8a6275250a07eaa7ac55d2a7c17145478ca1668ae8ce11fb17def61e86afb534b8
diff --git a/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild b/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild
new file mode 100644
index 00000000000..1ff76f8621d
--- /dev/null
+++ b/sci-astronomy/casacore/casacore-1.5.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils eutils toolchain-funcs fortran-2
+
+DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
+HOMEPAGE="http://code.google.com/p/casacore/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# de-keyworded until casa-data catches up
+KEYWORDS=""
+SLOT="0"
+IUSE="+data doc fftw hdf5 openmp threads test"
+
+RDEPEND="
+ sci-libs/cfitsio:0=
+ sci-astronomy/wcslib:0=
+ sys-libs/readline:0=
+ virtual/blas
+ virtual/lapack
+ data? ( sci-astronomy/casa-data )
+ fftw? ( sci-libs/fftw:3.0= )
+ hdf5? ( sci-libs/hdf5:0= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( sci-astronomy/casa-data )"
+
+PATCHES=(
+ "${FILESDIR}"/1.3.0-implicits.patch
+ "${FILESDIR}"/1.3.0-libdir.patch
+ "${FILESDIR}"/1.5.0-sysdep.patch
+ "${FILESDIR}"/1.5.0-gcc47.patch
+ "${FILESDIR}"/1.5.0-gcc48.patch
+)
+
+pkg_setup() {
+ if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using gcc but without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ fi
+ fortran-2_pkg_setup
+}
+
+src_configure() {
+ has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+ local mycmakeargs=(
+ -DENABLE_SHARED=ON
+ -DDATA_DIR="${EPREFIX}/usr/share/casa/data"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_use fftw FFTW3)
+ $(cmake-utils_use_use hdf5 HDF5)
+ $(cmake-utils_use_use threads THREADS)
+ $(cmake-utils_use_use openmp OPENMP)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && doxygen doxygen.cfg
+}
+
+src_install(){
+ cmake-utils_src_install
+ use doc && dohtml -r doc/html/*
+}
diff --git a/sci-astronomy/casacore/files/1.3.0-implicits.patch b/sci-astronomy/casacore/files/1.3.0-implicits.patch
new file mode 100644
index 00000000000..0ff631a90b6
--- /dev/null
+++ b/sci-astronomy/casacore/files/1.3.0-implicits.patch
@@ -0,0 +1,166 @@
+diff -Nur casacore-1.3.0.orig/casa/HDF5/HDF5DataSet.cc casacore-1.3.0/casa/HDF5/HDF5DataSet.cc
+--- casacore-1.3.0.orig/casa/HDF5/HDF5DataSet.cc 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/casa/HDF5/HDF5DataSet.cc 2011-05-16 17:29:12.000000000 +0100
+@@ -174,7 +174,7 @@
+ H5Pset_chunk(itsPLid, rank, cs.storage());
+ // Create the data set.
+ setHid (H5Dcreate(parentHid, name.chars(), itsDataType.getHidFile(),
+- itsDSid, NULL, itsPLid, NULL));
++ itsDSid, 0, itsPLid, 0));
+ if (! isValid()) {
+ throw HDF5Error("Data set array " + name + " could not be created");
+ }
+@@ -185,7 +185,7 @@
+ itsParent = &parentHid;
+ setName (name);
+ // Open the dataset.
+- setHid (H5Dopen(parentHid, name.chars(), NULL));
++ setHid (H5Dopen(parentHid, name.chars(), 0));
+ if (! isValid()) {
+ throw HDF5Error("Data set array " + name + " does not exist");
+ }
+@@ -271,7 +271,7 @@
+
+ DataType HDF5DataSet::getDataType (hid_t parentHid, const String& name)
+ {
+- hid_t id = H5Dopen(parentHid, name.chars(), NULL);
++ hid_t id = H5Dopen(parentHid, name.chars(), 0);
+ if (id < 0) {
+ throw HDF5Error("Data set array " + name + " does not exist");
+ }
+diff -Nur casacore-1.3.0.orig/casa/HDF5/test/tHDF5.cc casacore-1.3.0/casa/HDF5/test/tHDF5.cc
+--- casacore-1.3.0.orig/casa/HDF5/test/tHDF5.cc 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/casa/HDF5/test/tHDF5.cc 2011-05-16 17:29:12.000000000 +0100
+@@ -126,7 +126,7 @@
+ H5Pset_chunk (plId, rank, chunkShp);
+ // Create the data set.
+ setId = H5Dcreate (fileId, "dataset", typeIdFile,
+- dsId, NULL, plId, NULL);
++ dsId, 0, plId, 0);
+ check (setId, "Failed to create dataset");
+ }
+
+@@ -136,7 +136,7 @@
+ typeIdFile = H5Tcopy (H5T_NATIVE_FLOAT);
+ typeIdMem = H5Tcopy (typeIdFile);
+ // Open the dataset.
+- setId = H5Dopen (fileId, "dataset", NULL);
++ setId = H5Dopen (fileId, "dataset", 0);
+ check (setId, "Failed to open dataset");
+ // Get the data space (for the shape).
+ dsId = H5Dget_space(setId);
+diff -Nur casacore-1.3.0.orig/mirlib/bug.c casacore-1.3.0/mirlib/bug.c
+--- casacore-1.3.0.orig/mirlib/bug.c 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/bug.c 2011-05-16 17:29:12.000000000 +0100
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++void habort_c();
+
+ static char *errmsg_c();
+ void bug_c();
+diff -Nur casacore-1.3.0.orig/mirlib/dio.c casacore-1.3.0/mirlib/dio.c
+--- casacore-1.3.0.orig/mirlib/dio.c 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/dio.c 2011-05-16 17:29:12.000000000 +0100
+@@ -45,6 +45,7 @@
+ extern int errno;
+ #endif
+ #include <errno.h>
++void bug_c();
+
+ #define MAXPATH 128
+
+diff -Nur casacore-1.3.0.orig/mirlib/hio.c casacore-1.3.0/mirlib/hio.c
+--- casacore-1.3.0.orig/mirlib/hio.c 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/hio.c 2011-05-16 17:29:12.000000000 +0100
+@@ -36,7 +36,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-
++#include "sysdep.h"
+ #include "hio.h"
+
+ #define private static
+diff -Nur casacore-1.3.0.orig/mirlib/maskio.c casacore-1.3.0/mirlib/maskio.c
+--- casacore-1.3.0.orig/mirlib/maskio.c 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/maskio.c 2011-05-16 17:29:12.000000000 +0100
+@@ -25,7 +25,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-
++void bug_c();
++void bugno_c();
+
+ private void mkfill();
+ void mkflush_c();
+diff -Nur casacore-1.3.0.orig/mirlib/scrio.c casacore-1.3.0/mirlib/scrio.c
+--- casacore-1.3.0.orig/mirlib/scrio.c 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/scrio.c 2011-05-16 17:29:12.000000000 +0100
+@@ -9,6 +9,8 @@
+ /************************************************************************/
+
+ #include "io.h"
++void bug_c();
++void bugno_c();
+
+ /* char *sprintf(); */
+ #include <stdio.h>
+@@ -100,7 +102,7 @@
+ /************************************************************************/
+ void scrwrite_c(handle,buffer,offset,length)
+ int handle,offset,length;
+-float *buffer;
++Const float *buffer;
+ /**scrwrite -- Write real data to the scratch file. */
+ /*:scratch-i/o */
+ /*+ FORTRAN call sequence:
+diff -Nur casacore-1.3.0.orig/mirlib/sysdep.h casacore-1.3.0/mirlib/sysdep.h
+--- casacore-1.3.0.orig/mirlib/sysdep.h 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/sysdep.h 2011-05-16 17:41:07.000000000 +0100
+@@ -131,5 +131,13 @@
+ # define unpackd_c(a,b,c) memcpy((char *)(b),(a),sizeof(double)*(c))
+ # define pack32_c(a,b,c) memcpy((b),(char *)(a),sizeof(int)*(c))
+ # define unpack32_c(a,b,c) memcpy((char *)(b),(a),sizeof(int)*(c))
++#else
++void pack32_c(int* in, char* out, int n);
++void unpack32_c(char* in, int* out,int n);
++void packr_c(float* in, char* out, int n);
++void unpackr_c(char* in, float* out, int n);
++void packd_c(double* in, char* out, int n);
++void unpackd_c(char* in, double* out, int n);
+ #endif
++
+ #endif
+diff -Nur casacore-1.3.0.orig/mirlib/xyio.c casacore-1.3.0/mirlib/xyio.c
+--- casacore-1.3.0.orig/mirlib/xyio.c 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/xyio.c 2011-05-16 17:29:12.000000000 +0100
+@@ -37,7 +37,7 @@
+ #define Strcpy (void)strcpy
+ void bug_c(),bugno_c();
+ void rdhdi_c(),wrhdi_c();
+-void mkclose_c(),mkwrite_c();
++void mkclose_c(),mkwrite_c(),mkflush_c();
+ char *mkopen_c();
+ int mkread_c();
+ static void xymkopen_c();
+diff -Nur casacore-1.3.0.orig/mirlib/xyzio.c casacore-1.3.0/mirlib/xyzio.c
+--- casacore-1.3.0.orig/mirlib/xyzio.c 2011-05-16 02:24:06.000000000 +0100
++++ casacore-1.3.0/mirlib/xyzio.c 2011-05-16 17:29:12.000000000 +0100
+@@ -55,6 +55,14 @@
+ #include <string.h>
+ #include <stdlib.h>
+ void bug_c();
++void bugno_c();
++char *mkopen_c(int tno, char* name, char* status);
++void mkclose_c(char *handle);
++int mkread_c(char* handle, int mode, int* flags, int offset, int n, int nsize);
++void mkwrite_c(char* handle, int mode, int* flags, int offset, int n, int nsize);
++void mkflush_c(char* handle);
++int limprint(char *string, int lower[], int upper[]);
++int ferr(char* string, char arg );
+ #define check(x) if(x)bugno_c('f',x)
+
+
diff --git a/sci-astronomy/casacore/files/1.3.0-libdir.patch b/sci-astronomy/casacore/files/1.3.0-libdir.patch
new file mode 100644
index 00000000000..e0243985aa2
--- /dev/null
+++ b/sci-astronomy/casacore/files/1.3.0-libdir.patch
@@ -0,0 +1,196 @@
+diff -Nur casacore-1.3.0.orig/casa/CMakeLists.txt casacore-1.3.0/casa/CMakeLists.txt
+--- casacore-1.3.0.orig/casa/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/casa/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -209,8 +209,8 @@
+
+ install (
+ TARGETS casa_casa
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/components/CMakeLists.txt casacore-1.3.0/components/CMakeLists.txt
+--- casacore-1.3.0.orig/components/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/components/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -30,8 +30,8 @@
+ install (
+ TARGETS casa_components
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/coordinates/CMakeLists.txt casacore-1.3.0/coordinates/CMakeLists.txt
+--- casacore-1.3.0.orig/coordinates/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
++++ casacore-1.3.0/coordinates/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -25,8 +25,8 @@
+
+ install (TARGETS casa_coordinates
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/derivedmscal/CMakeLists.txt casacore-1.3.0/derivedmscal/CMakeLists.txt
+--- casacore-1.3.0.orig/derivedmscal/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
++++ casacore-1.3.0/derivedmscal/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -14,8 +14,8 @@
+
+ install (TARGETS casa_derivedmscal
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/fits/CMakeLists.txt casacore-1.3.0/fits/CMakeLists.txt
+--- casacore-1.3.0.orig/fits/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
++++ casacore-1.3.0/fits/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -34,8 +34,8 @@
+
+ install (TARGETS casa_fits
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/images/CMakeLists.txt casacore-1.3.0/images/CMakeLists.txt
+--- casacore-1.3.0.orig/images/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/images/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -71,8 +71,8 @@
+ install (
+ TARGETS casa_images
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/lattices/CMakeLists.txt casacore-1.3.0/lattices/CMakeLists.txt
+--- casacore-1.3.0.orig/lattices/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/lattices/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -67,8 +67,8 @@
+
+ install (TARGETS casa_lattices
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/measures/CMakeLists.txt casacore-1.3.0/measures/CMakeLists.txt
+--- casacore-1.3.0.orig/measures/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/measures/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -69,8 +69,8 @@
+ install (
+ TARGETS casa_measures
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/mirlib/CMakeLists.txt casacore-1.3.0/mirlib/CMakeLists.txt
+--- casacore-1.3.0.orig/mirlib/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/mirlib/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -22,8 +22,8 @@
+ install (
+ TARGETS casa_mirlib
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/ms/CMakeLists.txt casacore-1.3.0/ms/CMakeLists.txt
+--- casacore-1.3.0.orig/ms/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/ms/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -148,8 +148,8 @@
+
+ install (TARGETS casa_ms
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/msfits/CMakeLists.txt casacore-1.3.0/msfits/CMakeLists.txt
+--- casacore-1.3.0.orig/msfits/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/msfits/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -29,8 +29,8 @@
+
+ install (
+ TARGETS casa_msfits
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/scimath/CMakeLists.txt casacore-1.3.0/scimath/CMakeLists.txt
+--- casacore-1.3.0.orig/scimath/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/scimath/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -38,8 +38,8 @@
+
+ install (TARGETS casa_scimath
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/scimath_f/CMakeLists.txt casacore-1.3.0/scimath_f/CMakeLists.txt
+--- casacore-1.3.0.orig/scimath_f/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/scimath_f/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -34,8 +34,8 @@
+
+ install (
+ TARGETS casa_scimath_f
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
+diff -Nur casacore-1.3.0.orig/tables/CMakeLists.txt casacore-1.3.0/tables/CMakeLists.txt
+--- casacore-1.3.0.orig/tables/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
++++ casacore-1.3.0/tables/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
+@@ -181,8 +181,8 @@
+
+ install (TARGETS casa_tables
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+
diff --git a/sci-astronomy/casacore/files/1.5.0-gcc47.patch b/sci-astronomy/casacore/files/1.5.0-gcc47.patch
new file mode 100644
index 00000000000..30295d8d070
--- /dev/null
+++ b/sci-astronomy/casacore/files/1.5.0-gcc47.patch
@@ -0,0 +1,22 @@
+diff -Nur casacore-1.5.0.orig/casa/Arrays/IPosition.h casacore-1.5.0/casa/Arrays/IPosition.h
+--- casacore-1.5.0.orig/casa/Arrays/IPosition.h 2012-03-14 14:30:48.000000000 +0000
++++ casacore-1.5.0/casa/Arrays/IPosition.h 2012-06-05 22:07:39.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <casa/BasicSL/String.h>
+ #include <vector>
+ #include <cstddef> // for ptrdiff_t
++#include <unistd.h> // for ssize_t
+
+ namespace casa { //# NAMESPACE CASA - BEGIN
+
+diff -Nur casacore-1.5.0.orig/casa/System/Casarc.cc casacore-1.5.0/casa/System/Casarc.cc
+--- casacore-1.5.0.orig/casa/System/Casarc.cc 2011-10-18 08:39:05.000000000 +0100
++++ casacore-1.5.0/casa/System/Casarc.cc 2012-06-05 22:11:31.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ #include <cstdio>
++#include <unistd.h>
+
+ #define USE_FLOCK 0
+ #define CASARC_DEBUG 0
diff --git a/sci-astronomy/casacore/files/1.5.0-gcc48.patch b/sci-astronomy/casacore/files/1.5.0-gcc48.patch
new file mode 100644
index 00000000000..dfbe074e873
--- /dev/null
+++ b/sci-astronomy/casacore/files/1.5.0-gcc48.patch
@@ -0,0 +1,11 @@
+--- casa/aipsdef.h.orig 2014-03-06 22:05:25.000000000 +0000
++++ casa/aipsdef.h 2014-03-06 22:06:09.000000000 +0000
+@@ -91,7 +91,7 @@
+ #else
+ #define WHATEVER_SUN_TYPEDEF(X)
+ #define WHATEVER_TYPENAME typename
+-#if defined(AIPS_CRAY_PGI)
++#if defined(AIPS_CRAY_PGI) || defined(AIPS_GCC4)
+ #define WHATEVER_SUN_EXCEPTSPEC(X) throw(X)
+ #else
+ #define WHATEVER_SUN_EXCEPTSPEC(X)
diff --git a/sci-astronomy/casacore/files/1.5.0-sysdep.patch b/sci-astronomy/casacore/files/1.5.0-sysdep.patch
new file mode 100644
index 00000000000..35eef56daf0
--- /dev/null
+++ b/sci-astronomy/casacore/files/1.5.0-sysdep.patch
@@ -0,0 +1,17 @@
+--- casacore-1.5.0/mirlib/sysdep.h.orig 2012-06-05 05:35:29.000000000 +0100
++++ casacore-1.5.0/mirlib/sysdep.h 2012-06-05 05:37:07.000000000 +0100
+@@ -28,7 +28,8 @@
+ * removed 'trace' clutter from the old multiflow
+ * pjt 24jun01 PPC/powerpc is a BIGENDIAN (linux) machine
+ */
+-
++#ifndef MIRIAD_SYSDEP_H
++#define MIRIAD_SYSDEP_H
+ #ifndef Null
+ #define Null '\0'
+ #endif
+@@ -133,3 +134,4 @@
+ # define unpack32_c(a,b,c) memcpy((char *)(b),(a),sizeof(int)*(c))
+ #endif
+ #endif
++#endif /* MIRIAD_SYSDEP_H */
diff --git a/sci-astronomy/casacore/metadata.xml b/sci-astronomy/casacore/metadata.xml
new file mode 100644
index 00000000000..3f17c823320
--- /dev/null
+++ b/sci-astronomy/casacore/metadata.xml
@@ -0,0 +1,16 @@
+<?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">
+ A set of libraries for the the Common Astronomy Software
+ Applications for radioastronomy. This project contains C++ libraries
+ which were the code of the discontinued AIPS++ package.
+</longdescription>
+<upstream>
+ <remote-id type="google-code">casacore</remote-id>
+</upstream>
+<use>
+ <flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-astronomy/cdsclient/Manifest b/sci-astronomy/cdsclient/Manifest
new file mode 100644
index 00000000000..5eff80fecc7
--- /dev/null
+++ b/sci-astronomy/cdsclient/Manifest
@@ -0,0 +1 @@
+DIST cdsclient-3.72.tar.gz 99642 SHA256 517bb13a52c528858faac63f4b3a8180998f71d9fc33e0de9d2480aadd935045 SHA512 88d4b35c05b3565e74ad1bb7e593231486580c58901f90d4a7cc5295d11578b30a4e61579aa1125a4879c940104ed3087d9f97fc8170c01342f09f2b720bd32e WHIRLPOOL ee00668a77fc589dd7d4a3f31ddebdab42d6d2e48e25df2bf42f7ceb9a32543f6af2c643ba96db5ed27f25aea2b209551a54b17720476276de9d84c0a270c2e9
diff --git a/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild b/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild
new file mode 100644
index 00000000000..9b085f9a2f3
--- /dev/null
+++ b/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator
+
+# upstream versioning wrong: 3.71 is really 3.7.1
+MYP="${PN}-$(delete_version_separator 2)"
+
+DESCRIPTION="Collection of scripts to access the CDS databases"
+HOMEPAGE="http://cdsweb.u-strasbg.fr/doc/cdsclient.html"
+SRC_URI="ftp://cdsarc.u-strasbg.fr/pub/sw/${MYP}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT="mirror bindist"
+DEPEND=""
+RDEPEND="app-shells/tcsh"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-makefile.patch
+ # remove non standard "mantex" page
+ sed -i -e 's/aclient.tex//' configure || die
+}
+
+src_install() {
+ local bindir="${EPREFIX}/usr/bin/${PN}"
+ emake DESTDIR="${D}" SHSDIR="${D}${bindir}" install
+ cat <<-EOF > 99${PN}
+ PATH=${bindir}
+ ROOTPATH=${bindir}
+ EOF
+ doenvd 99${PN}
+}
diff --git a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch
new file mode 100644
index 00000000000..3f5e5fe58e9
--- /dev/null
+++ b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch
@@ -0,0 +1,102 @@
+--- Makefile.in.orig 2013-07-08 09:45:42.667070273 -0700
++++ Makefile.in 2013-07-08 09:46:43.928417641 -0700
+@@ -29,17 +29,17 @@
+ #################################################################
+ #PREFIX = /usr/local
+ #PREFIX = $(HOME)
+-PREFIX = @prefix@
++PREFIX = $(DESTDIR)@prefix@
+ PACKAGE = cdsclient
+ VERSION = @version@
+ DISTRIB = $(PACKAGE)-$(VERSION)
+ #################################################################
+
+ INCDIR = $(PREFIX)/include
+-LIBDIR = $(PREFIX)/lib
++LIBDIR = $(DESTDIR)/@libdir@
+ BINDIR = $(PREFIX)/bin
+ SHSDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/man
++MANDIR = $(PREFIX)/share/man
+ ###########
+ # NOTE: The definition below is required only on SOLARIS
+ # Comment the following line if required
+@@ -60,7 +60,7 @@
+ DEBUG =
+ C_OPT = -O
+ SYS =
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I.
++
+
+ # FILES --------------------------------
+ VERFILE = $(PREFIX)/versions
+@@ -98,7 +98,7 @@
+ # RULES --------------------------------
+ .SUFFIXES: .o .c
+ .c.o:
+- $(CC) $(CFLAGS) -c $<
++ $(CC) $(CFLAGS) -I. -c $<
+
+ # DEPENDENCIES --------------------------------
+
+@@ -117,41 +117,41 @@
+ # rm -f $$f; ln finducac2 $$f; done
+
+ aclient: aclient.o $(OBJ)
+- $(CC) $@.o $(OBJ) $(LIBSYS) -o $@
+- $(STRIP) $@
++ $(CC) $(LDFLAGS) $@.o $(OBJ) $(LIBSYS) -o $@
++
+
+ wwwget: wwwget.c
+- $(CC) wwwget.c $(LIBSYS) -o $@
+- $(STRIP) $@
++ $(CC) $(CFLAGS) $(LDFLAGS) wwwget.c $(LIBSYS) -o $@
++
+
+ doc: sk.tex man.tex aclient.tex
+ latex man.tex
+
+-install: $(EXPORT_INSTALL) install_shs install_info
++install: $(EXPORT_INSTALL) install_shs
+ rm -rf *.cache
+
+ export_install: install_bin install_man
+
+ install_man: $(MAN)
+ if [ -d $(MANDIR) ]; then echo $(MANDIR) exists; \
+- else mkdir $(MANDIR); fi
++ else mkdir -p $(MANDIR); fi
+ for f in $(MAN); do \
+ e=`echo $$f | cut -d. -f2`; \
+ if [ -d $(MANDIR)/man$$e ] ; then echo $(MANDIR)/man$$e exists ; \
+- else mkdir $(MANDIR)/man$$e ; fi ; \
++ else mkdir -p $(MANDIR)/man$$e ; fi ; \
+ $(COPY) $$f $(MANDIR)/man$$e ; \
+ done
+
+ install_h: $(INC)
+- test -d $(INCDIR) || mkdir $(INCDIR)
++ test -d $(INCDIR) || mkdir -p $(INCDIR)
+ $(COPY) $(INC) $(INCDIR)
+
+ install_bin: $(BIN)
+- test -d $(BINDIR) || mkdir $(BINDIR)
++ test -d $(BINDIR) || mkdir -p $(BINDIR)
+ $(COPY) $(BIN) $(BINDIR)
+
+ install_shs: Makefile
+- test -d $(SHSDIR) || mkdir $(SHSDIR)
++ test -d $(SHSDIR) || mkdir -p $(SHSDIR)
+ ractools=""; test -r $(RACatCDS) && ractools=$(RACatCDS)/*; \
+ test -z "$$ractools" || ls -l $$ractools; \
+ cdsutil="$(SHSatCDS)"; test -z "$(atCDS)" && cdsutil=""; \
+@@ -189,7 +189,7 @@
+ $(MAKE) clean
+ -test -d /tmp/$(DISTRIB) && rm -rf /tmp/$(DISTRIB)
+ autoconf
+- mkdir /tmp/$(DISTRIB)
++ mkdir -p /tmp/$(DISTRIB)
+ cp -p $(SHS) Makefile.in configure /tmp/$(DISTRIB)
+ test -z "$(atCDS)" || cp -p $(SHSatCDS) /tmp/$(DISTRIB)
+
diff --git a/sci-astronomy/cdsclient/metadata.xml b/sci-astronomy/cdsclient/metadata.xml
new file mode 100644
index 00000000000..a084fd41b97
--- /dev/null
+++ b/sci-astronomy/cdsclient/metadata.xml
@@ -0,0 +1,11 @@
+<?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">
+ The cdsclient package is a set of C and csh routines which can be
+ built on Unix stations or PCs running Linux, which once compiled allow
+ to query some databases located at Centre de Donnees astronomiques
+ de Strasbourg (CDS) or on mirrors over the network.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
new file mode 100644
index 00000000000..cd2abbcb386
--- /dev/null
+++ b/sci-astronomy/celestia/Manifest
@@ -0,0 +1 @@
+DIST celestia-1.6.1.tar.gz 52600436 SHA256 d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f WHIRLPOOL b3a242261ca7e2006b3e08d4c11808669c939bae9237bd366012c3ca90756c5486ed544f2b18024d722ea78af257076b291fff7c3ab7eef1c9b9e2133435cc0c
diff --git a/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild b/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild
new file mode 100644
index 00000000000..05d3bf9d2df
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOMAKE="1.11"
+
+inherit eutils flag-o-matic gnome2 autotools
+
+DESCRIPTION="OpenGL 3D space simulator"
+HOMEPAGE="http://www.shatters.net/celestia/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="cairo gnome gtk nls pch theora threads"
+
+RDEPEND="
+ virtual/opengl
+ virtual/jpeg
+ media-libs/libpng:0=
+ <dev-lang/lua-5.2
+ gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) )
+ gnome? (
+ x11-libs/gtk+:2
+ >=x11-libs/gtkglext-1.0
+ >=gnome-base/libgnomeui-2.0
+ )
+ !gtk? ( !gnome? ( media-libs/freeglut ) )
+ cairo? ( x11-libs/cairo )
+ theora? ( media-libs/libtheora )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_setup() {
+ # Check for one for the following use flags to be set.
+ if use gnome; then
+ einfo "USE=\"gnome\" detected."
+ USE_DESTDIR="1"
+ CELESTIA_GUI="gnome"
+ elif use gtk; then
+ einfo "USE=\"gtk\" detected."
+ CELESTIA_GUI="gtk"
+ else
+ ewarn "If you want to use the full gui, set USE=\"{gnome|gtk}\""
+ ewarn "Defaulting to glut support (no GUI)."
+ CELESTIA_GUI="glut"
+ fi
+}
+
+src_prepare() {
+ # make better desktop files
+ epatch "${FILESDIR}"/${PN}-1.5.0-desktop.patch
+ # add a ~/.celestia for extra directories
+ epatch "${FILESDIR}"/${PN}-1.6.0-cfg.patch
+ # fix missing includes for gcc-4.6
+ epatch "${FILESDIR}"/${P}-gcc46.patch
+ # missing zlib.h include with libpng15
+ epatch "${FILESDIR}"/${P}-libpng15.patch \
+ "${FILESDIR}"/${P}-linking.patch
+
+ # gcc-47, #414015
+ epatch "${FILESDIR}"/${P}-gcc47.patch
+
+ # libpng16 #464764
+ epatch "${FILESDIR}"/${P}-libpng16.patch
+
+ # remove flags to let the user decide
+ local
+ for cf in -O2 -ffast-math \
+ -fexpensive-optimizations \
+ -fomit-frame-pointer; do
+ sed -i \
+ -e "s/${cf}//g" \
+ configure.in admin/* || die "sed failed"
+ done
+ # remove an unused gconf macro killing autoconf when no gnome
+ # (not needed without eautoreconf)
+ if ! use gnome; then
+ sed -i \
+ -e '/AM_GCONF_SOURCE_2/d' \
+ configure.in || die "sed failed"
+ fi
+ eautoreconf
+ filter-flags "-funroll-loops -frerun-loop-opt"
+
+ ### This version of Celestia has a bug in the font rendering and
+ ### requires -fsigned-char. We should be able to force this flag
+ ### on all architectures. See bug #316573.
+ append-flags "-fsigned-char"
+}
+
+src_configure() {
+ # force lua in 1.6.1. seems to be inevitable
+ econf \
+ --disable-rpath \
+ --with-${CELESTIA_GUI} \
+ --with-lua \
+ $(use_enable cairo) \
+ $(use_enable threads threading) \
+ $(use_enable nls) \
+ $(use_enable pch) \
+ $(use_enable theora)
+}
+
+src_install() {
+ if [[ ${CELESTIA_GUI} == gnome ]]; then
+ gnome2_src_install
+ else
+ emake DESTDIR="${D}" install
+ local size
+ for size in 16 22 32 48 ; do
+ insinto /usr/share/icons/hicolor/${size}x${size}/apps
+ newins "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
+ done
+ fi
+ [[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop
+ dodoc AUTHORS README TRANSLATORS *.txt
+}
diff --git a/sci-astronomy/celestia/files/celestia-1.5.0-desktop.patch b/sci-astronomy/celestia/files/celestia-1.5.0-desktop.patch
new file mode 100644
index 00000000000..3e87692cc76
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.5.0-desktop.patch
@@ -0,0 +1,55 @@
+--- src/celestia/kde/data/celestia.desktop.orig 2008-02-27 15:19:41.000000000 +0000
++++ src/celestia/kde/data/celestia.desktop 2008-02-27 15:43:20.000000000 +0000
+@@ -1,8 +1,12 @@
+ [Desktop Entry]
++Encoding=UTF-8
++Version=1.0
+ Name=Celestia
+-Comment=Celestia
++Comment=3D space simulator to explore the universe
+ Exec=celestia %f
+ Terminal=false
+ Icon=celestia.png
+ MimeType=application/x-celestia-script
+ Type=Application
++Categories=Education;Science;Astronomy;Qt
++GenericName=Space Simulator
+--- src/celestia/gtk/data/celestia.desktop.orig 2008-02-27 15:19:58.000000000 +0000
++++ src/celestia/gtk/data/celestia.desktop 2008-02-27 15:44:26.000000000 +0000
+@@ -1,12 +1,12 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Version=1.4.0
+-Type=Application
+-Exec=celestia
+-Icon=celestia
+-X-GNOME-DocPath=
+-Terminal=false
++Version=1.0
+ Name=Celestia
+-Comment=Space Simulator
+-StartupNotify=true
+-Categories=Astronomy;Science;Application;
++Comment=3D space simulator to explore the universe
++Exec=celestia %f
++Terminal=false
++Icon=celestia.png
++MimeType=application/x-celestia-script
++Type=Application
++Categories=Education;Science;Astronomy;GTK
++GenericName=Space Simulator
+--- celestia.desktop 1970-01-01 01:00:00.000000000 +0100
++++ celestia.desktop 2008-02-27 15:22:31.000000000 +0000
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++Encoding=UTF-8
++Version=1.0
++Name=Celestia
++GenericName=Space Simulator
++Comment=Explore the Universe in this detailed space simulation
++Type=Application
++Categories=Education;Science;Astronomy
++Exec=celestia %f
++Terminal=false
++Icon=celestia.png
++MimeType=application/x-celestia-script
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch b/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch
new file mode 100644
index 00000000000..8a4c18143a9
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch
@@ -0,0 +1,11 @@
+--- celestia.cfg.orig 2009-07-20 12:52:17.000000000 +0200
++++ celestia.cfg 2009-07-20 12:52:43.000000000 +0200
+@@ -195,7 +195,7 @@
+ # or
+ # ExtrasDirectories [ "D:\\celestia-extras" ]
+ #------------------------------------------------------------------------
+- ExtrasDirectories [ "extras-standard" "extras" ]
++ ExtrasDirectories [ "extras-standard" "extras" "~/.celestia" ]
+
+
+ #------------------------------------------------------------------------
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch b/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch
new file mode 100644
index 00000000000..96967e36f9d
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+http://celestia.svn.sourceforge.net/viewvc/celestia?view=revision&revision=5178
+
+Patch written by Nils Larsson <ni1s@nerdshack.com>
+--- src/celengine/frametree.h
++++ src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+
+ #include <vector>
++#include <cstddef>
+
+ class Star;
+ class Body;
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch b/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch
new file mode 100644
index 00000000000..385f39a2051
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch
@@ -0,0 +1,22 @@
+diff -up celestia-1.6.1/src/celengine/frametree.h.gcc47 celestia-1.6.1/src/celengine/frametree.h
+--- celestia-1.6.1/src/celengine/frametree.h.gcc47 2012-03-22 12:56:56.096087430 -0400
++++ celestia-1.6.1/src/celengine/frametree.h 2012-03-22 12:57:04.333022427 -0400
+@@ -13,6 +13,7 @@
+ #ifndef _CELENGINE_FRAMETREE_H_
+ #define _CELENGINE_FRAMETREE_H_
+
++#include <unistd.h>
+ #include <vector>
+
+ class Star;
+diff -up celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 celestia-1.6.1/src/celengine/planetgrid.cpp
+--- celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 2012-03-22 12:53:01.496950513 -0400
++++ celestia-1.6.1/src/celengine/planetgrid.cpp 2012-03-22 12:53:08.812891865 -0400
+@@ -12,6 +12,7 @@
+
+ #include <cstdio>
+ #include <cmath>
++#include <celmath/mathlib.h>
+ #include <celmath/intersect.h>
+ #include "planetgrid.h"
+ #include "body.h"
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch b/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch
new file mode 100644
index 00000000000..5dffbab246e
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+
++// Z_BEST_COMPRESSION
++#include <zlib.h>
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch b/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch
new file mode 100644
index 00000000000..78911cb5575
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch
@@ -0,0 +1,25 @@
+image.cpp:530:61: error: ‘memcpy’ was not declared in this scope
+
+https://bugs.gentoo.org/show_bug.cgi?id=464764
+
+Patch written by Lars Wendler <polynomial-c@gentoo.org>
+--- a/celestia/src/celengine/image.cpp
++++ b/celestia/src/celengine/image.cpp
+@@ -42,6 +42,7 @@ extern "C" {
+ #include "jpeglib.h"
+ #else
+ #include <cstdio>
++#include <string.h>
+ #include <jpeglib.h>
+ #endif
+ }
+--- a/celestia/src/celengine/texture.cpp
++++ b/celestia/src/celengine/texture.cpp
+@@ -28,6 +28,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <cassert>
++#include <string.h>
+
+ #ifndef _WIN32
+ #ifndef TARGET_OS_MAC
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch b/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch
new file mode 100644
index 00000000000..dd5f93e609a
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch
@@ -0,0 +1,65 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+ * theora with glut (bug #399237)
+
+--- a/src/celestia/Makefile.am
++++ b/src/celestia/Makefile.am
+@@ -7,14 +7,15 @@
+
+ if ENABLE_KDE
+ SUBDIRS += kde
+-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+- $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a
+ celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+ endif
+
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+
+ COMMONSOURCES = \
+@@ -62,6 +63,7 @@
+
+ if ENABLE_GLUT
+ GLUTSOURCES = glutmain.cpp
++GLUTLIBS = -lGL
+ endif
+
+ if ENABLE_THEORA
+@@ -80,15 +82,16 @@
+ celestia_LDADD = \
+ $(celestiaKDELIBS) \
+ $(celestiaGTKLIBS) \
+- $(DL_LIBS) \
+- $(LUA_LIBS) \
+- $(THEORA_LIBS) \
+ ../celengine/libcelengine.a \
+ ../celtxf/libceltxf.a \
+ ../cel3ds/libcel3ds.a \
+ ../celmath/libcelmath.a \
+ ../celutil/libcelutil.a \
+- $(SPICE_LIBS)
++ $(LUA_LIBS) \
++ $(THEORA_LIBS) \
++ $(GLUTLIBS) \
++ $(SPICE_LIBS) \
++ $(DL_LIBS)
+
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
+--- a/configure.in
++++ b/configure.in
+@@ -252,6 +252,7 @@
+ dnl Check for GLUT.
+ AC_CHECK_LIB(glut, glutKeyboardUpFunc, ,
+ [AC_MSG_ERROR([GLUT library version >= 3.7 not found])])
++ check_theora="yes"
+ fi
+ AM_CONDITIONAL(ENABLE_GLUT, test "$ui_glut" = "yes")
+
diff --git a/sci-astronomy/celestia/metadata.xml b/sci-astronomy/celestia/metadata.xml
new file mode 100644
index 00000000000..af1f62b7529
--- /dev/null
+++ b/sci-astronomy/celestia/metadata.xml
@@ -0,0 +1,18 @@
+<?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">
+ Celestia is a real-time space simulation that lets you experience
+ our universe in three dimensions. You can travel throughout the solar
+ system, to any of over 100,000 stars, or beyond the galaxy. All
+ travel in Celestia is seamless; the exponential zoom feature lets you
+ explore space across a range of scales, from galaxy clusters down
+ to spacecraft a few meters across. A 'point-and-goto' interface
+ is used to navigate through the universe to the object you
+ want to visit.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">celestia</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
new file mode 100644
index 00000000000..c81650d6baf
--- /dev/null
+++ b/sci-astronomy/cpl/Manifest
@@ -0,0 +1,4 @@
+DIST cpl-6.3.1.tar.gz 2981414 SHA256 457d54d01cf356e9898fb2f226f057099a481e183a2eaabd34a7b4c865e10089 SHA512 b597968978ca87048b25ee7fd8ff6ebb483e1fd4c6c4fb515720bf468fe67e7b8a25cc9bf7141c18520ba37dcde9654bd5b46d9adcacba8b51780ff671bcdf76 WHIRLPOOL 1f5c224daaa79c689196cfdf2825574881f060d0e5c2ea6c48937a33c5feaec404f30c5f0abf48d352f0240255accdec1223a9c7b11b93b410f1d5e38a8c7e96
+DIST cpl-6.4.1.tar.gz 3013536 SHA256 03ded24eb87a57023b20e51a7a46d0f807c6dd9ea9c3286fe45f94e26cab4193 SHA512 5925f2bc5bf3828e6cfca78636bb2bb3d08f1b75ca8a16b8279b40bf5f57096d4ba7444aa28c0c354ae0755e2524ef0e56a23d2c87a23b7a9f52560667ce8bab WHIRLPOOL 7eb3be12692d2f72ba5211d001da4bc5d830daa1fd6059d15591c3987131fc54081120adb1519677b46274d71a91c7b1507174bab62be29589f9af0a0d122b19
+DIST cpl-6.4.2.tar.gz 3165143 SHA256 848dbbc581670b32eeb3d87a7c3c10c9d3969f0fcbe7daf8ba18ef0081cbc793 SHA512 636ce549f23862a111fd88e97878eff8b86c88e8e2e800533b2f34f219f6b6ea3f03bd9de6ce9606c3787d0a61fb66a6bd92087d24c57c47e5a26e31eb362a11 WHIRLPOOL 7368e323c4f00af8fc684ba1448eec20f229df310b9cd66f0fe046dd6900a195c04fbc1c78dd31600651c8e7911f49517a37ddb4ba89df235fadb5c0e1a0cb81
+DIST cpl-6.4.tar.gz 3012686 SHA256 af3024bccf70632df613a6aff475d3614983cdac31211614fb0412217af0b79f SHA512 26170c144cd72c7b597286458fdbb5c91ebdfff4362d095b47035a8569f930ff5956ffd6b7f86ea066d8dbd6b78ae0569eba5ce6a5c6a20381478e188161ead8 WHIRLPOOL be59b8c9347a701573da97a6e142d725332a6c9f3de291eb6982706cae33d14c0f1edb23a3467a656e1378558e3292c8deba19f2a17a901fe6217f974a229c54
diff --git a/sci-astronomy/cpl/cpl-6.3.1.ebuild b/sci-astronomy/cpl/cpl-6.3.1.ebuild
new file mode 100644
index 00000000000..199b8dbea2d
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-6.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_OPT_USE=gasgano
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils java-pkg-opt-2 autotools-utils
+
+DESCRIPTION="ESO common pipeline library for astronomical data reduction"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gasgano static-libs threads"
+
+RDEPEND="
+ >=sci-astronomy/wcslib-4.8.4
+ >=sci-libs/cfitsio-3.310
+ >=sci-libs/fftw-3.1.2
+ gasgano? ( sci-astronomy/gasgano )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
+ "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
+)
+
+src_prepare() {
+ # bug 422455 and remove cpu chcking
+ sed -i \
+ -e '/AM_C_PROTOTYPES/d' \
+ -e '/CPL_CHECK_CPU/d' \
+ configure.ac libcext/configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ --disable-ltdl-install
+ --without-included-ltdl
+ --with-cfitsio="${EPREFIX}/usr"
+ --with-wcs="${EPREFIX}/usr"
+ --with-fftw="${EPREFIX}/usr"
+ $(use_enable doc maintainer-mode)
+ $(use_enable threads)
+ )
+ if use gasgano; then
+ myeconfargs+=(
+ --enable-gasgano
+ --with-gasgano="${EPREFIX}/usr"
+ --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
+ --with-java="$(java-config -O)"
+ )
+ else
+ myeconfargs+=( --disable-gasgano )
+ fi
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile all $(use doc && echo html)
+}
+
+src_install() {
+ autotools-utils_src_install all $(use doc && echo install-html)
+}
diff --git a/sci-astronomy/cpl/cpl-6.4.1.ebuild b/sci-astronomy/cpl/cpl-6.4.1.ebuild
new file mode 100644
index 00000000000..36da138b840
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-6.4.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_OPT_USE=gasgano
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils java-pkg-opt-2 autotools-utils
+
+DESCRIPTION="ESO common pipeline library for astronomical data reduction"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gasgano static-libs threads"
+
+RDEPEND="
+ sci-astronomy/wcslib:0=
+ >=sci-libs/cfitsio-3.310:0=
+ sci-libs/fftw:3.0=
+ gasgano? ( sci-astronomy/gasgano )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
+ "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
+)
+
+src_prepare() {
+ # bug 422455 and remove cpu chcking
+ sed -i \
+ -e '/AM_C_PROTOTYPES/d' \
+ -e '/CPL_CHECK_CPU/d' \
+ configure.ac libcext/configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ --disable-ltdl-install
+ --without-included-ltdl
+ --with-cfitsio="${EPREFIX}/usr"
+ --with-wcs="${EPREFIX}/usr"
+ --with-fftw="${EPREFIX}/usr"
+ $(use_enable doc maintainer-mode)
+ $(use_enable threads)
+ )
+ if use gasgano; then
+ myeconfargs+=(
+ --enable-gasgano
+ --with-gasgano="${EPREFIX}/usr"
+ --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
+ --with-java="$(java-config -O)"
+ )
+ else
+ myeconfargs+=( --disable-gasgano )
+ fi
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile all $(use doc && echo html)
+}
+
+src_install() {
+ autotools-utils_src_install all $(use doc && echo install-html)
+}
diff --git a/sci-astronomy/cpl/cpl-6.4.2.ebuild b/sci-astronomy/cpl/cpl-6.4.2.ebuild
new file mode 100644
index 00000000000..36da138b840
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-6.4.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_OPT_USE=gasgano
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils java-pkg-opt-2 autotools-utils
+
+DESCRIPTION="ESO common pipeline library for astronomical data reduction"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gasgano static-libs threads"
+
+RDEPEND="
+ sci-astronomy/wcslib:0=
+ >=sci-libs/cfitsio-3.310:0=
+ sci-libs/fftw:3.0=
+ gasgano? ( sci-astronomy/gasgano )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
+ "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
+)
+
+src_prepare() {
+ # bug 422455 and remove cpu chcking
+ sed -i \
+ -e '/AM_C_PROTOTYPES/d' \
+ -e '/CPL_CHECK_CPU/d' \
+ configure.ac libcext/configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ --disable-ltdl-install
+ --without-included-ltdl
+ --with-cfitsio="${EPREFIX}/usr"
+ --with-wcs="${EPREFIX}/usr"
+ --with-fftw="${EPREFIX}/usr"
+ $(use_enable doc maintainer-mode)
+ $(use_enable threads)
+ )
+ if use gasgano; then
+ myeconfargs+=(
+ --enable-gasgano
+ --with-gasgano="${EPREFIX}/usr"
+ --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
+ --with-java="$(java-config -O)"
+ )
+ else
+ myeconfargs+=( --disable-gasgano )
+ fi
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile all $(use doc && echo html)
+}
+
+src_install() {
+ autotools-utils_src_install all $(use doc && echo install-html)
+}
diff --git a/sci-astronomy/cpl/cpl-6.4.ebuild b/sci-astronomy/cpl/cpl-6.4.ebuild
new file mode 100644
index 00000000000..d714c53386e
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-6.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_OPT_USE=gasgano
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils java-pkg-opt-2 autotools-utils
+
+DESCRIPTION="ESO common pipeline library for astronomical data reduction"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/20"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gasgano static-libs threads"
+
+RDEPEND="
+ >=sci-astronomy/wcslib-4.8.4
+ >=sci-libs/cfitsio-3.310
+ >=sci-libs/fftw-3.1.2
+ gasgano? ( sci-astronomy/gasgano )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
+ "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
+)
+
+src_prepare() {
+ # bug 422455 and remove cpu chcking
+ sed -i \
+ -e '/AM_C_PROTOTYPES/d' \
+ -e '/CPL_CHECK_CPU/d' \
+ configure.ac libcext/configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ --disable-ltdl-install
+ --without-included-ltdl
+ --with-cfitsio="${EPREFIX}/usr"
+ --with-wcs="${EPREFIX}/usr"
+ --with-fftw="${EPREFIX}/usr"
+ $(use_enable doc maintainer-mode)
+ $(use_enable threads)
+ )
+ if use gasgano; then
+ myeconfargs+=(
+ --enable-gasgano
+ --with-gasgano="${EPREFIX}/usr"
+ --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
+ --with-java="$(java-config -O)"
+ )
+ else
+ myeconfargs+=( --disable-gasgano )
+ fi
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile all $(use doc && echo html)
+}
+
+src_install() {
+ autotools-utils_src_install all $(use doc && echo install-html)
+}
diff --git a/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch b/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch
new file mode 100644
index 00000000000..658f2eaefb9
--- /dev/null
+++ b/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch
@@ -0,0 +1,35 @@
+Check shared library instead of static ones.
+bicatali@gentoo.org
+
+diff -Nur cpl-6.1.1.orig/m4/cpl.m4 cpl-6.1.1/m4/cpl.m4
+--- cpl-6.1.1.orig/m4/cpl.m4 2012-06-04 18:38:01.000000000 +0100
++++ cpl-6.1.1/m4/cpl.m4 2012-06-04 18:46:37.000000000 +0100
+@@ -8,7 +8,7 @@
+
+ cpl_cfitsio_check_version="$1"
+ cpl_cfitsio_check_header="fitsio.h"
+- cpl_cfitsio_check_lib="libcfitsio.a"
++ cpl_cfitsio_check_lib="libcfitsio.so"
+
+ cpl_cfitsio_incdirs=""
+ cpl_cfitsio_libdirs=""
+@@ -668,7 +668,7 @@
+
+ cpl_wcs_check_version="$1"
+ cpl_wcs_check_header="wcslib/wcslib.h"
+- cpl_wcs_check_lib="libwcs.a"
++ cpl_wcs_check_lib="libwcs.so"
+
+ cpl_wcs_includes=""
+ cpl_wcs_libraries=""
+@@ -900,8 +900,8 @@
+
+ cpl_fftw_check_version="$1"
+ cpl_fftw_check_header="fftw3.h"
+- cpl_fftw_check_lib="libfftw3.a"
+- cpl_fftwf_check_lib="libfftw3f.a"
++ cpl_fftw_check_lib="libfftw3.so"
++ cpl_fftwf_check_lib="libfftw3f.so"
+
+ cpl_fftw_includes=""
+ cpl_fftw_libraries=""
diff --git a/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch b/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch
new file mode 100644
index 00000000000..a0c23a75d38
--- /dev/null
+++ b/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch
@@ -0,0 +1,46 @@
+use system libtdl from libtool instead of bundled one
+see http://www.flameeyes.eu/autotools-mythbuster/libtool/plugins.html
+bicatali@gentoo.org
+
+diff -Nur cpl-6.1.1.orig/configure.ac cpl-6.1.1/configure.ac
+--- cpl-6.1.1.orig/configure.ac 2012-06-04 18:38:01.000000000 +0100
++++ cpl-6.1.1/configure.ac 2012-06-04 22:14:23.000000000 +0100
+@@ -60,8 +60,12 @@
+ AC_ENABLE_STATIC(yes)
+ AC_ENABLE_SHARED(yes)
+
+-AC_LIBLTDL_CONVENIENCE
+-AC_PROG_LIBTOOL
++LT_INIT([dlopen])
++AC_CHECK_HEADER([ltdl.h],
++ [AC_CHECK_LIB([ltdl], [lt_dladvise_init],
++ [LIBLTDL=-lltdl], [LIBLTDL=])],
++ [LIBLTDL=])
++
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+ AC_SUBST(LIBTOOL_DEPS)
+@@ -131,7 +135,6 @@
+ CPL_CONFIG_FUNC
+
+ # Configure subpackages
+-AC_CONFIG_SUBDIRS(libltdl)
+
+ if test ! x$"cpl_cv_with_system_cext" = xyes; then
+ AC_CONFIG_SUBDIRS([libcext])
+diff -Nur cpl-6.1.1.orig/Makefile.am cpl-6.1.1/Makefile.am
+--- cpl-6.1.1.orig/Makefile.am 2012-06-04 18:38:01.000000000 +0100
++++ cpl-6.1.1/Makefile.am 2012-06-04 19:07:41.000000000 +0100
+@@ -25,11 +25,10 @@
+ DISTCLEANFILES = *~
+
+ if GASGANO_SUPPORT
+-libltdl = libltdl
+ cpljava = cpljava
+ endif
+
+-SUBDIRS = $(libltdl) $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
++SUBDIRS = $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
+
+ HTML_SUBDIRS =
+
diff --git a/sci-astronomy/cpl/metadata.xml b/sci-astronomy/cpl/metadata.xml
new file mode 100644
index 00000000000..87845cb0008
--- /dev/null
+++ b/sci-astronomy/cpl/metadata.xml
@@ -0,0 +1,22 @@
+<?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">
+ The Common Pipeline Library (CPL) comprises a set of ISO-C libraries
+ that provide a comprehensive, efficient and robust software
+ toolkit. It forms a basis for the creation of automated astronomical
+ data-reduction tasks (known as "pipelines"). CPL Title Graphic The CPL
+ was developed to standardise the way VLT instrument pipelines are
+ built, to shorten their development cycle and to ease their
+ maintenance. However, it may be more generally applied to any similar
+ application, and the details of the CPL code have been engineered in a
+ way to make the library portable and flexible, as well as minimising
+ external dependencies.
+</longdescription>
+<use>
+ <flag name='gasgano'>
+ Enable support for <pkg>sci-astronomy/gasgano</pkg> file organizer
+ </flag>
+</use>
+</pkgmetadata>
diff --git a/sci-astronomy/ds9-bin/Manifest b/sci-astronomy/ds9-bin/Manifest
new file mode 100644
index 00000000000..92356f55d03
--- /dev/null
+++ b/sci-astronomy/ds9-bin/Manifest
@@ -0,0 +1,5 @@
+DIST ds9.linux.7.1.tar.gz 11894986 SHA256 0f5db29ef4978e20452f89e11445a83990f3fb5a4739efda16b182d801925d0d SHA512 3061e4d9ae706a514fe3e9b72bf94113fee9ae3ad4a98355d4b03d0c6fb47b355c14f214875e133f83674cd6ecefd22549251a4480bce4f25fd617c6770b1cc5 WHIRLPOOL 999d0fb66e5215058f5af169c500ca8b36476ded870c3d5b998d39152f22b41bd3a0c73cfbd1aeb61fcb4204c974eb7a04ce96e99befbc16ba431fc6de672016
+DIST ds9.linux.7.2.tar.gz 11947450 SHA256 a8adbc5cca40700210ed86b53d8aa9eae2fbb29f7a8bd2a2a04b086a091724d8 SHA512 e85029625d981b2a3152dc61fab0ac11ac1bafd64705efc9788a4c3cffb14ddfe1e24635e6e38d0ba26643aa8e5e2f0290f2ecef8949f9eb4065e53af802de85 WHIRLPOOL 0d34d3d8fc17ce9310cbe18830f21cb99ea9a2d8c11fc7b9f94c4fc83e7cd7ada638794e8f632f831498242fe3917981450f653e236ca3c3c7fe8b9186ec05f9
+DIST ds9.linux64.7.1.tar.gz 12450619 SHA256 6c53df6231b1f28ce68e5dbe91c58f8d600466981d9daa8435d5eed1dc460b76 SHA512 992cce4c9f15216a6410674d93fd9f8a2d450b1d8dc66c45fcc6db14941c50619d42c4980e164495043c95f95358feed05c645a9e2fab4d35b21bf3afee1934e WHIRLPOOL 2ae5df35e12197632eaa8118c2e3b4240312e570eb9464bd6d5d02ad5b0a8584fd67f121a9d4157599cca83deaa302ecc6f36850e47c79596dadb31729083ac6
+DIST ds9.linux64.7.2.tar.gz 12683459 SHA256 34b01e1b25673d15e8ec01c05ce629cc2699fe4b9ec071c7ef95e82f5f5594e4 SHA512 af9368d05e94ab43dff9dcc0c791333ccd7865e7666238c46cb216176caeb12188363b45380c97af0cef0d1802ea26acdda7f1562dc168536dd9ddac6d7ebb97 WHIRLPOOL 42a58b7a764946b35e4133bf2b83e091fe20bb13a968efb0d18ef5d3b09f0c39a6fd80266e3f9623317536309736fcd9857edfd43b0f2509486963ea47b9262a
+DIST ds9.png.tar 10240 SHA256 a1a7c64b3de0374e04e06e7d7154d110bb518a6f5f95fd46e0a5a85ed5e1aa71 SHA512 c7d52733c63adcac00de652ac4be7a19e7a6497cf24cc6f7f78f0a9583cc94ce9c81e567af3c34f9124e15ee089abbd735c49b6cf8f2dcf6ea3cce6ed2c7302f WHIRLPOOL 055f4acf36c9e7994d7d17e3b151d65da1790a53a5d12d20714a942c7718a02e0aff138040c3566581a82023a4fd51870744ff82edf4eeeaefdc062927a099f6
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.1.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.1.ebuild
new file mode 100644
index 00000000000..a1edd1861bd
--- /dev/null
+++ b/sci-astronomy/ds9-bin/ds9-bin-7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Data visualization application for astronomical FITS images"
+HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/ds9.png.tar
+ amd64? ( http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.${PV}.tar.gz )
+ x86? ( http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libxml2
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/xpa"
+
+DEPEND=""
+S="${WORKDIR}"
+
+QA_PRESTRIPPED="usr/bin/ds9"
+QA_PREBUILT="usr/bin/ds9"
+
+src_install () {
+ dobin ds9
+ doicon ds9.png
+ make_desktop_entry ds9 "SAOImage DS9" ds9
+}
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild
new file mode 100644
index 00000000000..ce7f7f649b4
--- /dev/null
+++ b/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Data visualization application for astronomical FITS images"
+HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/ds9.png.tar
+ amd64? ( http://hea-www.harvard.edu/RD/ds9/download/linux64/ds9.linux64.${PV}.tar.gz )
+ x86? ( http://hea-www.harvard.edu/RD/ds9/download/linux/ds9.linux.${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libxml2
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/xpa"
+
+DEPEND=""
+S="${WORKDIR}"
+
+QA_PRESTRIPPED="usr/bin/ds9"
+QA_PREBUILT="usr/bin/ds9"
+
+src_install () {
+ dobin ds9
+ doicon ds9.png
+ make_desktop_entry ds9 "SAOImage DS9" ds9
+}
diff --git a/sci-astronomy/ds9-bin/metadata.xml b/sci-astronomy/ds9-bin/metadata.xml
new file mode 100644
index 00000000000..53c6d9dbf79
--- /dev/null
+++ b/sci-astronomy/ds9-bin/metadata.xml
@@ -0,0 +1,19 @@
+<?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">
+ The Smithsonian Astrophysical Observatory Image Deep Space 9 is an
+ astronomical imaging and data visualization application. It is the
+ new generation of the SAOImage software. DS9 supports FITS images
+ and binary tables, multiple frame buffers, region manipulation, many
+ scale algorithms and colormaps. It provides communication with
+ external analysis tasks and is configurable and extensible. DS9
+ supports multiple frame buffers, mosaic images, tiling, blinking,
+ geometric markers, colormap manipulation, scaling, arbitrary zoom,
+ rotation, pan, and a variety of coordinate systems. DS9 also
+ supports FTP and HTTP data access.
+ This is the binary version (source version has a lot of source
+ bundling issues).
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/erfa/Manifest b/sci-astronomy/erfa/Manifest
new file mode 100644
index 00000000000..ccbbdfc533f
--- /dev/null
+++ b/sci-astronomy/erfa/Manifest
@@ -0,0 +1,2 @@
+DIST erfa-1.0.1.tar.gz 579757 SHA256 c60b763fefe7158e7cf55f4290d78c93566a6a536f8296e7d54f4c7ad7fc96da SHA512 0c34610b459de33e1bcec36f109bf60377f39821c15171bf73991b320306cf4651c6a0dd6048054369c272b6c87af1d580caf02a84f215ecac5a9dcdc7cf6756 WHIRLPOOL 3fc3ac65e205623304ceac16f29eef0f7b239946007cec01327b376f8cbf2536911d796d85f8751512e009973dc4dea2eea52c4b89c23efe9a650514fdd901ae
+DIST erfa-1.1.0.tar.gz 608220 SHA256 7196d26e89d00d2eb0848ed4816fd634e2efd8cfac31ccaa4519c95466ac6669 SHA512 06501682f2b2b66bc0f535fe35719c37aa9c36411089a3f4114e8d4574c3418078c4278a88735a7d49039d5b0bc997e81a1e860d0bf5a1bc813904810a2d2ab1 WHIRLPOOL 73946c9955c4bcfe991668cc44ca5a435449a08587d6fcb75e901521dbc4a6d9a328417d46df05eef95d931731cb6b9e4297c7bebc03edf7bcc40c4a53bd75d9
diff --git a/sci-astronomy/erfa/erfa-1.0.1.ebuild b/sci-astronomy/erfa/erfa-1.0.1.ebuild
new file mode 100644
index 00000000000..e54998efb12
--- /dev/null
+++ b/sci-astronomy/erfa/erfa-1.0.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Essential Routines for Fundamental Astronomy"
+HOMEPAGE="https://github.com/liberfa/erfa"
+SRC_URI="https://github.com/liberfa/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
diff --git a/sci-astronomy/erfa/erfa-1.1.0.ebuild b/sci-astronomy/erfa/erfa-1.1.0.ebuild
new file mode 100644
index 00000000000..89527038c93
--- /dev/null
+++ b/sci-astronomy/erfa/erfa-1.1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Essential Routines for Fundamental Astronomy"
+HOMEPAGE="https://github.com/liberfa/erfa"
+SRC_URI="https://github.com/liberfa/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
diff --git a/sci-astronomy/erfa/metadata.xml b/sci-astronomy/erfa/metadata.xml
new file mode 100644
index 00000000000..b8cb30425bd
--- /dev/null
+++ b/sci-astronomy/erfa/metadata.xml
@@ -0,0 +1,14 @@
+<?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">
+ Essential Routines for Fundamental Astronomy is a C
+ library containing key algorithms for astronomy, and is based on
+ the SOFA library published by the International Astronomical Union
+ (IAU).
+</longdescription>
+ <upstream>
+ <remote-id type="github">liberfa/erfa</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
new file mode 100644
index 00000000000..35d10e63173
--- /dev/null
+++ b/sci-astronomy/esorex/Manifest
@@ -0,0 +1,2 @@
+DIST esorex-3.10.2.tar.gz 817875 SHA256 9a295754452b3e84fe2bc3674aaaf2e93354d2ad16781cb3f4c3f37ca0214e1e SHA512 6f6f663bd74d61f3612a13fb39e17c984f8ed88d9dd175951b385d9797433b19a6e276841b23b61881cec8702eb8d74061549a922acf939a9a5e98c8016d1ecb WHIRLPOOL cb900ecad2067498c9865cfbd3db4d80f0f2907ea18e8eb3ab5d07aaea2a184520a480ad62cf591a30abbe51023f8f8384139ca67fdd05d3a35cde837f730967
+DIST esorex-3.10.tar.gz 817307 SHA256 72ff1d26a45d7e926b1f4f74f1f286c8feb142dba7b0b5bb717c6286644f9494 SHA512 985a906418488fec46fc939bf64b40330ae829771860a36a40240b703f6f6f89f3da6701ee4ceb8c6d2c0b478004596dce4dbc11389937e75ef02d9ecb4c3d16 WHIRLPOOL ef368d35f5145b5626c88d6d4af7249889cce1ef901c67318d1f06f9baa7a0411c87917969261c0a268a06e5fd0dafd30701f49394cb82671f8c9ce282bc4768
diff --git a/sci-astronomy/esorex/esorex-3.10-r2.ebuild b/sci-astronomy/esorex/esorex-3.10-r2.ebuild
new file mode 100644
index 00000000000..4a159be9b90
--- /dev/null
+++ b/sci-astronomy/esorex/esorex-3.10-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AT_NO_RECURSIVE=1
+
+inherit autotools-utils
+
+DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=sci-astronomy/cpl-6.3:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
+ "${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
+ "${FILESDIR}"/${PN}-3.10-fix-autotools.patch
+ "${FILESDIR}"/${PN}-3.10-generate-manpage.patch
+ "${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
+ "${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
+ "${FILESDIR}"/${PN}-3.10-cpl60_compat.patch
+)
+
+export CPLDIR="${EPREFIX}/usr"
+
+src_install() {
+ autotools-utils_src_install
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-astronomy/esorex/esorex-3.10.2.ebuild b/sci-astronomy/esorex/esorex-3.10.2.ebuild
new file mode 100644
index 00000000000..d3930ca992b
--- /dev/null
+++ b/sci-astronomy/esorex/esorex-3.10.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AT_NO_RECURSIVE=1
+
+inherit autotools-utils
+
+DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
+HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=sci-astronomy/cpl-6.3:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
+ "${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
+ "${FILESDIR}"/${PN}-3.10-generate-manpage.patch
+ "${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
+ "${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
+)
+
+export CPLDIR="${EPREFIX}/usr"
+
+src_install() {
+ autotools-utils_src_install
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch b/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch
new file mode 100644
index 00000000000..1203f7812fa
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Subject: Remove function that is only in cpl >= 6.3 to establish compability
+ with older (stable) versions and allow backporting.
+--- a/src/er_main.c
++++ b/src/er_main.c
+@@ -641,7 +641,6 @@
+
+ cpl_msg_set_domain (PACKAGE);
+ cpl_msg_set_time_off ();
+-cpl_msg_set_threadid_off ();
+ cpl_msg_set_domain_on ();
+ cpl_msg_set_component_off ();
+
diff --git a/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch b/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch
new file mode 100644
index 00000000000..68fbcb971f4
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch
@@ -0,0 +1,12 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Subject: Fix autotools files to allow the current version.
+--- esorex-3.10/configure.ac.orig
++++ esorex-2.10/configure.ac
+@@ -5,6 +5,7 @@
+
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_AUX_DIR([admin])
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS([config.h])
+
+ AC_CANONICAL_HOST
diff --git a/sci-astronomy/esorex/files/esorex-3.10-fix_format_strings.patch b/sci-astronomy/esorex/files/esorex-3.10-fix_format_strings.patch
new file mode 100644
index 00000000000..fe4d37b3009
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-fix_format_strings.patch
@@ -0,0 +1,24 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix -Werror=format-security errors
+--- a/src/er_paramutils.c
++++ b/src/er_paramutils.c
+@@ -731,7 +731,7 @@
+ (void) strcat (tmp, " to ");
+ (void) strcat (tmp, er_strutils_dblstr (cpl_parameter_get_range_max_double (p)));
+ (void) strcat (tmp, ".\n");
+- cpl_msg_error (er_func, tmp);
++ cpl_msg_error (er_func, "%s", tmp);
+
+ cpl_free(tmp);
+ return -1;
+--- a/src/er_plugin.c
++++ b/src/er_plugin.c
+@@ -367,7 +367,7 @@
+ if (wer != 0)
+ {
+ (void) snprintf(estr,(size_t)238,"Expansion of %s failed...",xpath);
+- cpl_msg_error (er_func, estr);
++ cpl_msg_error (er_func, "%s", estr);
+ goto dealloc;
+ }
+ }
diff --git a/sci-astronomy/esorex/files/esorex-3.10-generate-manpage.patch b/sci-astronomy/esorex/files/esorex-3.10-generate-manpage.patch
new file mode 100644
index 00000000000..017eb2c8f77
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-generate-manpage.patch
@@ -0,0 +1,123 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Subject: Generate a manpage for esorex.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -62,3 +62,7 @@
+ include $(top_builddir)/Makefile.purify
+ endif
+
++esorex.man: esorex
++ sh esorex_create_man.sh
++
++man1_MANS = esorex.man
+--- /dev/null
++++ b/src/esorex_create_man.sh
+@@ -0,0 +1,108 @@
++#!/bin/sh
++
++help2man -N -i $0 ./esorex | sed s/^:\ // | fgrep -v "***" > esorex.man
++<< instrument.
++
++[NAME]
++esorex \- ESO Recipe Execution Tool
++
++[DESCRIPTION]
++EsoRex is the ESO Recipe Execution Tool. It can list, configure and execute
++CPL-based recipes from the command line.
++
++One of the features provided by the CPL is the ability to create
++data-reduction algorithms that run as plugins (dynamic libraries). These are
++called recipes and are one of the main aspects of the CPL data-reduction
++development environment.
++
++As these recipes are dynamic libraries, it is not possible to run them
++directly from the command line. However, ESO provides several tools to do
++this, thus saving recipe developers the need to write such an application
++themselves. One of these is GASGANO (a GUI-based tool) and the other is
++ EsoRex (which runs from the command line) and is described here.
++
++[ENVIRONMENT]
++All options can be set as environment parameters as well. See the previous
++paragraph for details.
++
++[HINTS]
++.TP
++.SH File permissions
++When a recipe is used with the \fB\-\-suppress\-prefix\fR option, and the
++\fB\-\-output\-dir\fR is set to the current working directory, then the first
++execution of a recipe will work correctly, but subsequent executions may
++fail. This is due to output products being given \`read-only\' permission
++(to avoid the potential inadvertant loss of products). The recipe itself
++is unable to modify the permissions, and thus it fails when attempting to
++create the file. The solution (other than using a different output directory
++or prefixes) is to change the permission of these output files or delete
++them prior to any subsequent execution of that recipe.
++
++This problem is less likely to occur in EsoRex v2+, due to the replacement of
++the \fB\-\-output\-overwrite\fR option with the \fB\-\-output\-readonly\fR
++(which is disabled by default). However, a determined user can still reach
++this situation, in which case the non-readable products must have their
++permissions changed, as described above.
++
++.TP
++.SH Configuration files
++When creating configuration files, if the the recipe is provided on the
++command line, then EsoRex will generate the configuration file for this
++recipe. If no recipe name is given, then EsoRex will generate a configuration
++file for EsoRex itself. All configuration files are written in the
++$HOME/.esorex/ directory.
++
++.TP
++.SH Memory checking
++It is possible to get EsoRex to check for memory leaks in the recipe
++that it is running, by enabling the \fB\-\-mem\-check\fR option. Then, at the
++conclusion of the recipe execution, and after memory deallocation, a list of
++all remaining allocated memory will be printed to screen. If there are no
++memory leaks, then no addition output is displayed.
++
++[FILES]
++.TP
++.SH /etc/esorex.rc $HOME/.esorex/esorex.rc
++Default configuration files
++
++The configuration file contains the EsoRex options, less the \`\-\-\'
++switch, but prefixed with \`esorex.caller.\'. Blank lines are ignored and
++lines beginning with \`#\' are treated as comments.
++
++Here is an example configuration file.
++
++ # Example EsoRex configuration file
++ #
++ esorex.caller.recipe-dir=/home/username/EsoRex/Plugins
++ esorex.caller.log-dir=.
++ esorex.caller.log-file=esorex.log
++ esorex.caller.log-file=esorex.log
++ esorex.caller.output-dir=.
++ esorex.caller.output-prefix=out_
++
++.TP
++.SH filename.sof
++A sof file contains a list of the input data. This data is specified in an sof
++file (which is just a text file), where each input file is specified with its
++associated classification and category. The format of each line in the sof
++file is as follows:
++
++ full-path-to-file classification
++
++Optionally, a third column may be provided. Permitted values are either RAW or
++CALIB. This is for when a recipe does not identify the type of input file, but
++as all ESO recipes are required to do so, this column is typically not needed.
++
++An example sof file, for the mythological "ZIMOS" instrument, might look like this:
++
++ /data/mos/ZIMOS.03-12-26T01:05:06.fits MOS_SCIENCE
++ /data/mos/ZIMOS.03-12-26T01:26:00.fits MOS_SCIENCE
++ /data/mos/ZIMOS.03-12-26T01:47:04.fits MOS_SCIENCE
++ /data/cal/master_bias4.fits MASTER_BIAS
++ /data/cal/grs_LR_red.3.tfits GRISM_TABLE
++ /data/gasgano/extract_table2.fits EXTRACT_TABLE
++ /data/cal/badpixel.3.tfits CCD_TABLE
++
++For an concrete example for a specific instrument, check the documentation for that
++instrument.
++
diff --git a/sci-astronomy/esorex/files/esorex-3.10-remove-empty-configdir.patch b/sci-astronomy/esorex/files/esorex-3.10-remove-empty-configdir.patch
new file mode 100644
index 00000000000..d492173da8e
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-remove-empty-configdir.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Avoid creation of an empty directory "/usr/share/esorex/config"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,8 +51,6 @@
+
+ bin_PROGRAMS = esorex
+
+-config_DATA =
+-
+ esorex_LDFLAGS = $(CPL_LDFLAGS) $(LIBLTDL)
+ esorex_LDADD = @GETOPT@ $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
+ esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
diff --git a/sci-astronomy/esorex/files/esorex-3.10-remove-private-ltdl.patch b/sci-astronomy/esorex/files/esorex-3.10-remove-private-ltdl.patch
new file mode 100644
index 00000000000..e675cdbb8f7
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-remove-private-ltdl.patch
@@ -0,0 +1,39 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Subject: Remove private library libltdl and use the installed one.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -37,10 +37,7 @@
+ if MAINTAINER_MODE
+
+ MAINTAINERCLEANFILES = $(top_srcdir)/Makefile.in $(top_srcdir)/aclocal.m4 \
+- $(top_srcdir)/config.h.in $(top_srcdir)/configure config.status config.log \
+- $(top_srcdir)/libltdl/Makefile.in $(top_srcdir)/libltdl/aclocal.m4 \
+- $(top_srcdir)/libltdl/config-h.in $(top_srcdir)/libltdl/configure \
+- libltdl/config.status libltdl/config.log
++ $(top_srcdir)/config.h.in $(top_srcdir)/configure config.status config.log
+
+ clean-local: clean-doxygen
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,9 @@
+
+ ESO_CHECK_DOCTOOLS
+
+-AC_LIBLTDL_CONVENIENCE
++LT_INIT
++LT_CONFIG_LTDL_DIR([libltdl])
++AC_LIB_LTDL
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+
+@@ -76,9 +78,6 @@
+ # Determine the shared library suffix on this platform
+ AC_LTDL_SHLIBEXT
+
+-
+-AC_CONFIG_SUBDIRS(libltdl)
+-
+ AC_CONFIG_FILES(Makefile
+ Makefile.purify
+ doxygen/Doxyfile
diff --git a/sci-astronomy/esorex/files/esorex-3.10-set-default-plugin-path.patch b/sci-astronomy/esorex/files/esorex-3.10-set-default-plugin-path.patch
new file mode 100644
index 00000000000..1289bed5ab0
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-set-default-plugin-path.patch
@@ -0,0 +1,28 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Set the default plugin path to the one where recipes are
+ installed in Debian.
+--- a/etc/esorex.rc.in
++++ b/etc/esorex.rc.in
+@@ -130,7 +130,7 @@
+ # as well. Multiple directory heads may be specified, by separating the
+ # starting paths with colons (:). This option may also be set using the
+ # environment variable ESOREX_PLUGIN_DIR.
+-esorex.caller.recipe-dir=@recipedir@/esopipes-plugins
++esorex.caller.recipe-dir=@recipedir@
+
+ # --suppress-link
+ # When TRUE, no symbolic link is created to the output product. However, if
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -35,7 +35,10 @@
+ AC_SUBST(configdir)
+
+ if test -z "$recipedir"; then
+- recipedir="`eval echo $libdir`"
++ recipedir="`eval echo $libdir`/cpl/plugins"
++ if test $libdir != "/usr/lib"; then
++ recipedir="$recipedir:/usr/lib/cpl/plugins"
++ fi
+ fi
+ AC_SUBST(recipedir)
+
diff --git a/sci-astronomy/esorex/files/esorex-3.9.6-use-shared-libs.patch b/sci-astronomy/esorex/files/esorex-3.9.6-use-shared-libs.patch
new file mode 100644
index 00000000000..0cd348eaa44
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.9.6-use-shared-libs.patch
@@ -0,0 +1,20 @@
+--- esorex-3.9.6/m4/cpl.m4.orig 2012-06-04 23:47:50.000000000 +0100
++++ esorex-3.9.6/m4/cpl.m4 2012-06-04 23:48:45.000000000 +0100
+@@ -455,7 +455,7 @@
+ AC_MSG_CHECKING([for libcext])
+
+ cpl_cext_check_header="cxtypes.h"
+- cpl_cext_check_lib="libcext.a"
++ cpl_cext_check_lib="libcext.so"
+
+ cpl_cext_incdirs=""
+ cpl_cext_libdirs=""
+@@ -1314,7 +1314,7 @@
+ AC_MSG_CHECKING([for CPL])
+
+ cpl_check_cpl_header="cpl.h"
+- cpl_check_cpl_lib="libcplcore.a"
++ cpl_check_cpl_lib="libcplcore.so"
+
+ cpl_incdirs=""
+ cpl_libdirs=""
diff --git a/sci-astronomy/esorex/metadata.xml b/sci-astronomy/esorex/metadata.xml
new file mode 100644
index 00000000000..4a01f01fa03
--- /dev/null
+++ b/sci-astronomy/esorex/metadata.xml
@@ -0,0 +1,18 @@
+<?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">
+ EsoRex is the ESO Recipe Execution Tool. It can list, configure and
+ execute CPL-based recipes from the command line. One of the features
+ provided by the CPL is the ability to create data-reduction algorithms
+ that run as plugins (dynamic libraries). These are called recipes and
+ are one of the main aspects of the CPL data-reduction development
+ environment. As these recipes are dynamic libraries, it is not
+ possible to run them directly from the command line. However, ESO
+ provides several tools to do this, thus saving recipe developers the
+ need to write such an application themselves. One of these is GASGANO
+ (a GUI-based tool) and the other is EsoRex (which runs from the
+ command line.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/funtools/Manifest b/sci-astronomy/funtools/Manifest
new file mode 100644
index 00000000000..3e5326a94fd
--- /dev/null
+++ b/sci-astronomy/funtools/Manifest
@@ -0,0 +1 @@
+DIST funtools-1.4.4.tar.gz 3475367 SHA256 f47a00e774b557931a7ff00ddd0852e32ae5d2a2f0d3a227f8ba81d3db1e863b SHA512 3a58ad008bc33836109327add15eabaf95e9dc3f9e70a678fe9a8176dae87ccf0faf439e775b6efcb50e536afb022b9e4c226cbb98e56997960380e06012b5c2 WHIRLPOOL 5b89cb7280a4e1087c13103a813e9220432419215d8bc7e6463f5f08f2a5ba3731e7693f16d79ff4ec705665809cc33e81dbd36cd07a00d786aac35bbb975f71
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch
new file mode 100644
index 00000000000..6a089159d4d
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch
@@ -0,0 +1,292 @@
+Origin: http://hea-www.harvard.edu/saord/download/ds9/source/ds9.7.0.tar.gz
+Description: Fixes that were applied to the package included in the saods9
+ source. Only the patches that affect the Debian distribution are included here.
+ These patches are not specific for DS9, however.
+ .
+ From the changelog:
+ * Fixed -J funcone, which was not properly outputting all rows.
+ * Fixed bug in funim.c which broke vcol functionality.
+ .
+--- a/filter/filter.c
++++ b/filter/filter.c
+@@ -326,24 +326,31 @@ Filter FilterOpen(header, string, mode)
+ }
+
+ /* determine which type of process execution we do */
+- filter->ptype = DEFAULT_FILTER_PTYPE;
+- *tbuf = '\0';
+- if( (s=(char *)getenv("FILTER_PTYPE")) ){
+- strcpy(tbuf, s);
+- }
+- if( !*tbuf && (s=xstrdup(filter->mode)) ){
+- keyword(s, "ptype", tbuf, SZ_LINE);
+- if( s ) xfree(s);
+- }
+- if( *tbuf ){
+- if( *tbuf == 'p' )
+- filter->ptype = PTYPE_PROCESS;
+- else if( *tbuf == 'c' )
+- filter->ptype = PTYPE_CONTAINED;
++ switch(filter->method){
++ case METHOD_C:
++ filter->ptype = DEFAULT_FILTER_PTYPE;
++ *tbuf = '\0';
++ if( (s=(char *)getenv("FILTER_PTYPE")) ){
++ strcpy(tbuf, s);
++ }
++ if( !*tbuf && (s=xstrdup(filter->mode)) ){
++ keyword(s, "ptype", tbuf, SZ_LINE);
++ if( s ) xfree(s);
++ }
++ if( *tbuf ){
++ if( *tbuf == 'p' )
++ filter->ptype = PTYPE_PROCESS;
++ else if( *tbuf == 'c' )
++ filter->ptype = PTYPE_CONTAINED;
+ #ifdef USE_DL
+- else if( *tbuf == 'd' )
+- filter->ptype = PTYPE_DYNAMIC;
++ else if( *tbuf == 'd' )
++ filter->ptype = PTYPE_DYNAMIC;
+ #endif
++ }
++ break;
++ default:
++ filter->ptype = PTYPE_PROCESS;
++ break;
+ }
+
+ /* determine region paint mode */
+@@ -470,7 +477,10 @@ Filter FilterOpen(header, string, mode)
+ if( !FilterProgCompile(filter) )
+ goto error;
+
+- if( filter->debug < 2 ){
++ if( filter->debug >= 2 ) goto done;
++
++ switch(filter->method){
++ case METHOD_C:
+ switch(filter->ptype){
+ case PTYPE_PROCESS:
+ case PTYPE_CONTAINED:
+@@ -478,7 +488,7 @@ Filter FilterOpen(header, string, mode)
+ case PIPE_WIN32:
+ #if HAVE_CYGWIN
+ if( !WinProcessOpen(filter->prog,
+- &(filter->ihandle), &(filter->ohandle), &(filter->process)) )
++ &(filter->ihandle), &(filter->ohandle), &(filter->process)) )
+ goto error;
+ #else
+ gerror(stderr, "internal error: no WinProcess without Windows");
+@@ -487,20 +497,23 @@ Filter FilterOpen(header, string, mode)
+ break;
+ default:
+ if( !ProcessOpen(filter->prog,
+- &(filter->ichan), &(filter->ochan), &(filter->pid)) )
++ &(filter->ichan), &(filter->ochan), &(filter->pid)) )
+ goto error;
+ break;
+ }
+ break;
+ #ifdef USE_DL
+ case PTYPE_DYNAMIC:
+- if( !(filter->dl=DLOpen(filter->prog)) )
+- goto error;
+- break;
++ if( !(filter->dl=DLOpen(filter->prog)) )
++ goto error;
++ break;
+ #endif
+ default:
+- goto error;
++ goto error;
+ }
++ break;
++ default:
++ goto error;
+ }
+
+ /* return the good news */
+--- a/filter/filt.l
++++ b/filter/filt.l
+@@ -871,6 +871,26 @@ compass { BEGIN COMM; }
+ *
+ */
+
++
++#ifdef YY_USE_PROTOS
++static void floatprefix(void)
++#else
++static void floatprefix()
++#endif
++{
++ if( filt->method == METHOD_C )
++ _FiltLexCat("(double)");
++}
++
++#ifdef YY_USE_PROTOS
++static void floatsuffix(void)
++#else
++static void floatsuffix()
++#endif
++{
++ return;
++}
++
+ #ifdef YY_USE_PROTOS
+ static void
+ bin2num(char *d, char *s, int maxlen)
+@@ -1414,7 +1434,14 @@ static void _FiltLexRegionStart(docols)
+ FilterSymbolDefaults(filt, 0);
+ /* initialize wcs for default image case */
+ _FiltLexWcsCols(filt->fhd, filt->xbin, filt->ybin);
+- _FiltLexCat(",(double)x,(double)y");
++ _FiltLexCat(",");
++ floatprefix();
++ _FiltLexCat("x");
++ floatsuffix();
++ _FiltLexCat(",");
++ floatprefix();
++ _FiltLexCat("y");
++ floatsuffix();
+ break;
+ case 1:
+ if( !initbindefs ){
+@@ -1427,16 +1454,24 @@ static void _FiltLexRegionStart(docols)
+ if( !filt->xbin || !filt->ybin ){
+ _filterror("two binning columns are required for regions");
+ }
+- _FiltLexCat(",(double)");
++ _FiltLexCat(",");
++ floatprefix();
+ _FiltLexCat(filt->xbin);
+- _FiltLexCat(",(double)");
++ floatsuffix();
++ _FiltLexCat(",");
++ floatprefix();
+ _FiltLexCat(filt->ybin);
++ floatsuffix();
+ break;
+ case 2:
+- _FiltLexCat(",(double)");
++ _FiltLexCat(",");
++ floatprefix();
+ _FiltLexCat(colnames[0]);
+- _FiltLexCat(",(double)");
++ floatsuffix();
++ _FiltLexCat(",");
++ floatprefix();
+ _FiltLexCat(colnames[1]);
++ floatsuffix();
+ break;
+ }
+ if( s ) xfree(s);
+--- a/filter/filtprog_c.c
++++ b/filter/filtprog_c.c
+@@ -198,7 +198,8 @@ static int FilterProgOpen_C(filter)
+ ccstr = "gcc";
+ }
+ /* make sure we have a compiler */
+- if( !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) &&
++ if( !(filter->cc = Access(ccstr, "x")) &&
++ !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) &&
+ !(filter->cc = Find("gcc", "x", NULL, FilterPath())) &&
+ !(filter->cc = Find("cc", "x", NULL, FilterPath())) &&
+ !(filter->cc = Find("cc", "x", NULL, ".")) &&
+@@ -212,6 +213,9 @@ static int FilterProgOpen_C(filter)
+ #if HAVE_CYGWIN
+ if( (s=strrchr(filter->cc, '/')) ){
+ s++;
++ }
++ else if( (s=strrchr(filter->cc, '\\')) ){
++ s++;
+ } else {
+ s = filter->cc;
+ }
+--- a/funcone.c
++++ b/funcone.c
+@@ -1036,6 +1036,9 @@ main(argc, argv)
+ strncpy(decstr, argv[optind+ioff++], SZ_LINE-1);
+ strncpy(radstr, argv[optind+ioff++], SZ_LINE-1);
+
++ /* dolimfilt does not work with doall */
++ if( doall ) dolimfilt = 0;
++
+ /* process list arguments */
+ if( dolist ){
+ if( !(list=OpenList(lname, rastr, decstr, radstr)) ){
+@@ -1085,6 +1088,8 @@ main(argc, argv)
+ if( !(adbuf=xcalloc(nrow+1, sizeof(char))) ){
+ gerror(stderr, "can't allocate all (-J|-X) buffer of size %d\n", nrow);
+ }
++ /* must read one event at a time, or else we can't tell the event num */
++ maxrow = 1;
+ }
+
+ /* activate columns specified by user, if necessary */
+@@ -1371,7 +1376,7 @@ done:
+ while( (ebuf = (Ev)FunTableRowGet(fun, NULL, maxrow, NULL, &got)) ){
+ /* if we have a filter, then we don't know the row number til after
+ we read the event, i.e. now */
+- if( doall & ALL_FILT ) FunInfoGet(fun, FUN_ROW, &irow, 0);
++ FunInfoGet(fun, FUN_ROW, &irow, 0);
+ /* process all rows */
+ for(i=0; i<got; i++){
+ /* skip rows that already were written out */
+--- a/funtab.c
++++ b/funtab.c
+@@ -1386,7 +1386,7 @@ int FunTableRowPut(fun, rows, nrow, idx, plist)
+ off_t
+ FunTableRowSeek(Fun fun, int nrow, char *plist)
+ #else
+-off_t FunTableRowPut(fun, nrow, plist)
++off_t FunTableRowSeek(fun, nrow, plist)
+ Fun fun;
+ int nrow;
+ char *plist;
+--- a/funim.c
++++ b/funim.c
+@@ -111,9 +111,9 @@ static void *_FunTableBin(fun, buf, plist)
+ /* optional value column for binning */
+ if( fun->vbin >= 0 ){
+ dovcol = 1;
+- voffset = fun->header->table->col[fun->bin[2]].offset;
+- vsize = fun->header->table->col[fun->bin[2]].size;
+- vtype = fun->header->table->col[fun->bin[2]].type;
++ voffset = fun->header->table->col[fun->vbin].offset;
++ vsize = fun->header->table->col[fun->vbin].size;
++ vtype = fun->header->table->col[fun->vbin].type;
+ }
+ else{
+ dovcol = 0;
+--- a/calc.l
++++ b/calc.l
+@@ -284,7 +284,7 @@ static char *_CalcCB(name, client_data)
+ {
+ CalcCols cur;
+ char tbuf[SZ_LINE];
+- char tbuf2[SZ_LINE];
++ char tbuf2[SZ_LINE*2];
+ char tbuf3[SZ_LINE];
+ int i, got, ip;
+
+--- a/util/gio.c
++++ b/util/gio.c
+@@ -2209,7 +2209,7 @@ void gerror(va_alist) va_dcl
+ vsnprintf(_gerrors, SZ_LINE-1, tbuf, args);
+ /* if the error flag is positive, we output immediately */
+ if( (fd != NULL) && _gerror ){
+- fprintf(fd, _gerrors);
++ fputs(_gerrors, fd);
+ fflush(fd);
+ }
+ /* if the error flag is set high, we exit */
+@@ -2281,7 +2281,7 @@ void gwarning(va_alist) va_dcl
+ vsnprintf(_gwarnings, SZ_LINE-1, tbuf, args);
+ /* if the warning flag is positive, we output immediately */
+ if( (fd != NULL) && _gwarning ){
+- fprintf(fd, _gwarnings);
++ fputs(_gwarnings, fd);
+ fflush(fd);
+ }
+ }
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch
new file mode 100644
index 00000000000..700408057ba
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch
@@ -0,0 +1,121 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix the AC_DEFINE lines so that autoheader (and therefore
+ dh_autoreconf) works
+--- a/configure.ac
++++ b/configure.ac
+@@ -193,7 +193,7 @@ AC_MSG_RESULT($fun_ok)
+
+ SC_PATH_TCLCONFIG
+ if test x"${no_tcl}" = x ; then
+- AC_DEFINE(HAVE_TCL)
++ AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.])
+ fi
+
+ AC_PROG_AWK
+@@ -218,7 +218,7 @@ POST="|\& cat"
+ case $host_os in
+ *cygwin*|*Cygwin* )
+ CFLAGS="$CFLAGS -enable-auto-import"
+- AC_DEFINE(HAVE_CYGWIN)
++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+ AC_MSG_RESULT(flagging Cygwin)
+ PRE="sh -c {"
+ POST="}"
+@@ -226,7 +226,7 @@ case $host_os in
+ *mingw32*|*Mingw32*)
+ CFLAGS="$CFLAGS -mconsole"
+ EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+- AC_DEFINE(HAVE_MINGW32)
++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+ AC_MSG_RESULT(flagging MinGW)
+ ;;
+ *osf*|*Osf*)
+--- a/filter/configure.ac
++++ b/filter/configure.ac
+@@ -150,7 +150,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+ *cygwin*|*Cygwin* )
+- AC_DEFINE(HAVE_CYGWIN)
++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+ AC_MSG_RESULT(flagging Cygwin)
+ PRE="sh -c {"
+ POST="}"
+@@ -158,7 +158,7 @@ case $host_os in
+ *mingw32*|*Mingw32*)
+ CFLAGS="$CFLAGS -mconsole"
+ EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+- AC_DEFINE(HAVE_MINGW32)
++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+ AC_MSG_RESULT(flagging MinGW)
+ ;;
+ *osf*|*Osf*)
+--- a/fitsy/configure.ac
++++ b/fitsy/configure.ac
+@@ -121,7 +121,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+ *cygwin*|*Cygwin* )
+- AC_DEFINE(HAVE_CYGWIN)
++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+ AC_MSG_RESULT(flagging Cygwin)
+ PRE="sh -c {"
+ POST="}"
+@@ -129,7 +129,7 @@ case $host_os in
+ *mingw32*|*Mingw32*)
+ CFLAGS="$CFLAGS -mconsole"
+ EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+- AC_DEFINE(HAVE_MINGW32)
++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+ AC_MSG_RESULT(flagging MinGW)
+ ;;
+ *darwin*|*Darwin*)
+--- a/util/configure.ac
++++ b/util/configure.ac
+@@ -133,7 +133,7 @@ fi
+
+ SC_PATH_TCLCONFIG
+ if test x"${no_tcl}" = x ; then
+- AC_DEFINE(HAVE_TCL)
++ AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.])
+ fi
+
+ AC_MSG_CHECKING(for external zlib)
+@@ -146,7 +146,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+ *cygwin*|*Cygwin* )
+- AC_DEFINE(HAVE_CYGWIN)
++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+ AC_MSG_RESULT(flagging Cygwin)
+ PRE="sh -c {"
+ POST="}"
+@@ -154,7 +154,7 @@ case $host_os in
+ *mingw32*|*Mingw32*)
+ CFLAGS="$CFLAGS -mconsole"
+ EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+- AC_DEFINE(HAVE_MINGW32)
++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+ AC_MSG_RESULT(flagging MinGW)
+ ;;
+ *osf*|*Osf*)
+--- a/wcs/configure.ac
++++ b/wcs/configure.ac
+@@ -125,7 +125,7 @@ PRE=""
+ POST="|\& cat"
+ case $host_os in
+ *cygwin*|*Cygwin* )
+- AC_DEFINE(HAVE_CYGWIN)
++ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.])
+ AC_MSG_RESULT(flagging Cygwin)
+ PRE="sh -c {"
+ POST="}"
+@@ -133,7 +133,7 @@ case $host_os in
+ *mingw32*|*Mingw32*)
+ CFLAGS="$CFLAGS -mconsole"
+ EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
+- AC_DEFINE(HAVE_MINGW32)
++ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.])
+ AC_MSG_RESULT(flagging MinGW)
+ ;;
+ *osf*|*Osf*)
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch
new file mode 100644
index 00000000000..75d69089ef1
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch
@@ -0,0 +1,99 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Check cmd line arguments for illegal input that caused crashes
+ found with the "Mayhem" tool.
+Bug: http://bugs.debian.org/715928
+Bug: http://bugs.debian.org/715929
+--- a/funjoin.c
++++ b/funjoin.c
+@@ -737,7 +737,7 @@ main(argc, argv)
+ case 'a':
+ if( argv[i][2] ){
+ j = atoi(&argv[i][2])-1;
+- if( (j >= 0) && (j < MAXIFILE) ){
++ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
+ files[j].actstr = argv[++i];
+ }
+ else{
+@@ -751,7 +751,7 @@ main(argc, argv)
+ case 'b':
+ if( argv[i][2] ){
+ j = atoi(&argv[i][2])-1;
+- if( (j >= 0) && (j < MAXIFILE) ){
++ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
+ files[j].bstr = argv[++i];
+ }
+ else{
+@@ -765,7 +765,7 @@ main(argc, argv)
+ case 'j':
+ if( argv[i][2] ){
+ j = atoi(&argv[i][2])-1;
+- if( (j >= 0) && (j < MAXIFILE) ){
++ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
+ files[j].jname = argv[++i];
+ }
+ else{
+@@ -773,25 +773,35 @@ main(argc, argv)
+ }
+ }
+ else{
+- defcol = argv[++i];
++ if (i < argc-1) {
++ defcol = argv[++i];
++ }
+ }
+ break;
+ case 'm':
+- minmatch = atoi(argv[++i])+1;
++ if (i < argc-1) {
++ minmatch = atoi(argv[++i])+1;
++ }
+ if( minmatch < 1 ) minmatch = 1;
+ break;
+ case 'M':
+- maxmatch = atoi(argv[++i])+1;
++ if (i < argc-1) {
++ maxmatch = atoi(argv[++i])+1;
++ }
+ if( maxmatch < 1 ) maxmatch = 1;
+ break;
+ case 's':
+ jfiles = JFILES_COL;
+ break;
+ case 'S':
+- jfiles = argv[++i];
++ if (i < argc-1) {
++ jfiles = argv[++i];
++ }
+ break;
+ case 't':
+- tol = atof(argv[++i]);
++ if (i < argc-1) {
++ tol = atof(argv[++i]);
++ }
+ if( tol <= 0 ){
+ gerror(stderr, "tolerance value must be positive\n");
+ }
+--- a/funimage.c
++++ b/funimage.c
+@@ -338,12 +338,16 @@ main(argc, argv)
+ t = strchr(s, ',');
+ strncat(newname, s, t-s);
+ strncat(newname, ",y:", SZ_LINE-strlen(newname));
+- s = ++t;
+- t = strchr(s, ',');
+- strncat(newname, s, t-s);
++ if (t != NULL) {
++ s = ++t;
++ t = strchr(s, ',');
++ strncat(newname, s, t-s);
++ }
+ strncat(newname, "),", SZ_LINE-strlen(newname));
+- s = ++t;
+- strncat(newname, s, SZ_LINE-strlen(newname));
++ if (t != NULL) {
++ s = ++t;
++ strncat(newname, s, SZ_LINE-strlen(newname));
++ }
+ iname = newname;
+ }
+
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch
new file mode 100644
index 00000000000..2f24268d74f
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch
@@ -0,0 +1,68 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix the format string for fprintf
+--- a/gnu/sort.c
++++ b/gnu/sort.c
+@@ -2775,7 +2775,7 @@
+ xfwrite (buf, 1, cc, ofp);
+ if (ferror (fp))
+ {
+- fprintf (stderr, files[i]);
++ fprintf (stderr, "%s", files[i]);
+ cleanup ();
+ exit (2);
+ }
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -137,7 +137,7 @@
+
+ CC = @CC@
+
+-CC_SWITCHES = -I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
+
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+
+--- a/filter/Makefile.in
++++ b/filter/Makefile.in
+@@ -114,7 +114,7 @@
+
+ CC = @CC@
+
+-CC_SWITCHES = -I. ${CFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \
++CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \
+ ${INCLUDES} ${AC_FLAGS}
+
+ DEPEND_SWITCHES = -I. ${CFLAGS} -I. ${INCLUDES} ${AC_FLAGS}
+--- a/gnu/Makefile.in
++++ b/gnu/Makefile.in
+@@ -87,7 +87,7 @@
+
+ CC = @CC@
+
+-CC_SWITCHES = ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES = ${CFLAGS} ${CPPFLAGS} ${INCLUDES} ${AC_FLAGS}
+
+ DEPEND_SWITCHES = ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -105,7 +105,7 @@
+
+ CC = @CC@
+
+-CC_SWITCHES = -I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
+
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+
+--- a/mklib
++++ b/mklib
+@@ -169,7 +169,7 @@
+ rm -f ${LIBNAME}.so
+
+ # make lib
+- ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
++ ${LINK} ${LDFLAGS} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
+ # make usual symlinks
+ ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
+ ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch
new file mode 100644
index 00000000000..4068ace7f81
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch
@@ -0,0 +1,602 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: The include files are going to be installed in
+ /usr/include/funtools. So, they should refer to each other by using ""
+ instead of <> which also searches in the current directory.
+--- a/filter/column.h
++++ b/filter/column.h
+@@ -12,14 +12,14 @@
+ #define __column_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
+
+-#include <prsetup.h>
++#include "prsetup.h"
+ _PRbeg
+
+ void ColumnLoad _PRx((char *ibuf, int size, int n, int convert, void *obuf));
+--- a/filter/dl.h
++++ b/filter/dl.h
+@@ -2,14 +2,14 @@
+ #define __dl_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #ifdef HAVE_DLFCN_H
+ #include <dlfcn.h>
+ #endif
+
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ _PRbeg
+
+--- a/filter/filter.h
++++ b/filter/filter.h
+@@ -12,7 +12,7 @@
+ #define __filter_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ /* avoid use of system -- its not secure */
+@@ -34,28 +34,28 @@
+ #include <string.h>
+ #endif
+ #include <sys/types.h>
+-#include <prsetup.h>
+-#include <gio.h>
+-#include <file.h>
+-#include <find.h>
+-#include <macro.h>
+-#include <word.h>
+-#include <xalloc.h>
+-#include <strtod.h>
++#include "prsetup.h"
++#include "gio.h"
++#include "file.h"
++#include "find.h"
++#include "macro.h"
++#include "word.h"
++#include "xalloc.h"
++#include "strtod.h"
+ #define USE_XFILEIO 1
+-#include <fitsy.h>
++#include "fitsy.h"
+ #undef USE_XFILEIO
+-#include <idx.h>
+-#include <wcs.h>
+-#include <column.h>
+-#include <tl.h>
+-#include <dl.h>
+-#include <mkrtemp.h>
+-#include <zprocess.h>
+-#include <winprocess.h>
+-#include <parse.h>
++#include "idx.h"
++#include "wcs.h"
++#include "column.h"
++#include "tl.h"
++#include "dl.h"
++#include "mkrtemp.h"
++#include "zprocess.h"
++#include "winprocess.h"
++#include "parse.h"
+ #ifdef USE_LAUNCH
+-#include <xlaunch.h>
++#include "xlaunch.h"
+ #endif
+
+ #ifndef OBJPATH
+--- a/filter/idx.h
++++ b/filter/idx.h
+@@ -11,9 +11,9 @@
+ #define __idx_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+-#include <prsetup.h>
++#include "prsetup.h"
+ #include <stdio.h>
+ #include <ctype.h>
+ #ifdef HAVE_UNISTD_H
+@@ -22,10 +22,10 @@
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
+-#include <fitsy.h>
+-#include <gio.h>
+-#include <xalloc.h>
+-#include <strtod.h>
++#include "fitsy.h"
++#include "gio.h"
++#include "xalloc.h"
++#include "strtod.h"
+
+ /* binary search edge */
+ #define IDX_EDGE_LEFT 1
+--- a/filter/tl.h
++++ b/filter/tl.h
+@@ -11,7 +11,7 @@
+ #ifndef __tl_h
+ #define __tl_h
+
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ _PRbeg
+
+--- a/fitsy/fitsy.h
++++ b/fitsy/fitsy.h
+@@ -5,13 +5,13 @@
+ #define FITSY_H
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #if USE_XFILEIO
+-#include <xfileio.h>
++#include "xfileio.h"
+ #else
+-#include <xfile.h>
++#include "xfile.h"
+ #endif
+
+ #ifdef __STDC__
+@@ -30,7 +30,7 @@
+
+ #include <ctype.h>
+
+-#include <longlong.h>
++#include "longlong.h"
+
+ #ifndef NULL
+ #define NULL 0
+--- a/funtools.h
++++ b/funtools.h
+@@ -27,11 +27,11 @@
+ #define FUN_VERSION "1.4.4"
+
+ #ifndef FUNTOOLS_PRIVATE
+-#include <prsetup.h>
++#include "prsetup.h"
+ #define USE_XFILEIO 1
+-#include <fitsy.h>
++#include "fitsy.h"
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include "wcs.h"
+ typedef void *Fun;
+ #endif
+
+--- a/funtoolsP.h
++++ b/funtoolsP.h
+@@ -12,7 +12,7 @@
+ #define __funtoolsP_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <stdio.h>
+@@ -32,20 +32,20 @@
+ #include <getopt.h>
+ #endif
+ #include <sys/types.h>
+-#include <prsetup.h>
++#include "prsetup.h"
+ #define USE_XFILEIO 1
+-#include <fitsy.h>
++#include "fitsy.h"
+ #undef USE_XFILEIO
+-#include <wcs.h>
+-#include <filter.h>
+-#include <file.h>
+-#include <swap.h>
+-#include <word.h>
+-#include <parse.h>
+-#include <xalloc.h>
+-#include <mkrtemp.h>
+-#include <NaN.h>
+-#include <xlaunch.h>
++#include "wcs.h"
++#include "filter.h"
++#include "file.h"
++#include "swap.h"
++#include "word.h"
++#include "parse.h"
++#include "xalloc.h"
++#include "mkrtemp.h"
++#include "NaN.h"
++#include "xlaunch.h"
+
+ #ifndef MAXINT
+ #define MAXINT 2147483647
+@@ -338,6 +338,6 @@ int FunView _PRx((Fun fun, char *view, char *vmode, char *fname, int fmax));
+
+ _PRend
+
+-#include <funtools.h>
++#include "funtools.h"
+
+ #endif /* __funtoolsP.h */
+--- a/ofuntools.h
++++ b/ofuntools.h
+@@ -27,11 +27,11 @@
+ #define FUN_VERSION "1.4.4"
+
+ #ifndef FUNTOOLS_PRIVATE
+-#include <prsetup.h>
++#include "prsetup.h"
+ #define USE_XFILEIO 1
+-#include <fitsy.h>
++#include "fitsy.h"
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include "wcs.h"
+ typedef void *Fun;
+ #endif
+
+--- a/util/NaN.h.in
++++ b/util/NaN.h.in
+@@ -20,7 +20,7 @@
+ #ifndef __nan_h
+ #define __nan_h
+
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ #define BIGENDIAN @BIGENDIAN@
+
+--- a/util/file.h
++++ b/util/file.h
+@@ -12,7 +12,7 @@
+ #define __file_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <stdio.h>
+@@ -28,9 +28,9 @@
+ #endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <prsetup.h>
+-#include <macro.h>
+-#include <xalloc.h>
++#include "prsetup.h"
++#include "macro.h"
++#include "xalloc.h"
+
+ _PRbeg
+ int FileExists _PRx((char *filename));
+--- a/util/find.h
++++ b/util/find.h
+@@ -12,7 +12,7 @@
+ #define __find_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <stdio.h>
+@@ -25,8 +25,8 @@
+ #endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <xalloc.h>
+-#include <prsetup.h>
++#include "xalloc.h"
++#include "prsetup.h"
+
+ _PRbeg
+
+--- a/util/gio.h
++++ b/util/gio.h
+@@ -11,10 +11,10 @@
+ #ifndef _gio_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+-#include <xport.h>
++#include "xport.h"
+
+ #include <stdio.h>
+ #ifdef HAVE_STRING_H
+@@ -46,8 +46,8 @@
+ #include <sys/stat.h>
+ #include <sys/time.h>
+
+-#include <prsetup.h>
+-#include <xalloc.h>
++#include "prsetup.h"
++#include "xalloc.h"
+
+ /* use ftello/fseeko (assuming its available) if we are using 64-bit offsets */
+ #if _FILE_OFFSET_BITS == 64
+--- a/util/macro.h
++++ b/util/macro.h
+@@ -12,7 +12,7 @@
+ #define __macro_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <stdio.h>
+@@ -26,7 +26,7 @@
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ typedef char *(*MacroCall)(
+ #ifdef ANSI_FUNC
+--- a/util/mainlib.h
++++ b/util/mainlib.h
+@@ -12,7 +12,7 @@
+ #define __mainlib_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+@@ -29,11 +29,11 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#include <prsetup.h>
+-#include <xalloc.h>
+-#include <word.h>
+-#include <find.h>
+-#include <gio.h>
++#include "prsetup.h"
++#include "xalloc.h"
++#include "word.h"
++#include "find.h"
++#include "gio.h"
+
+ /* types of mainlibs we recognize */
+ #define MAINLIB_ERROR 0
+--- a/util/mkrtemp.h
++++ b/util/mkrtemp.h
+@@ -12,7 +12,7 @@
+ #define __mkrtemp_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <sys/types.h>
+@@ -31,9 +31,9 @@
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
+-#include <prsetup.h>
+-#include <word.h>
+-#include <xalloc.h>
++#include "prsetup.h"
++#include "word.h"
++#include "xalloc.h"
+
+ #ifdef __APPLE__
+ #define lrand48 random
+--- a/util/parse.h
++++ b/util/parse.h
+@@ -12,7 +12,7 @@
+ #define __parse_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <stdio.h>
+@@ -33,12 +33,12 @@
+ #endif
+ #include <ctype.h>
+
+-#include <prsetup.h>
+-#include <strtod.h>
+-#include <xalloc.h>
+-#include <word.h>
+-#include <gio.h>
+-#include <longlong.h>
++#include "prsetup.h"
++#include "strtod.h"
++#include "xalloc.h"
++#include "word.h"
++#include "gio.h"
++#include "longlong.h"
+
+ #define PARSE_DEBUG 1
+ #if PARSE_DEBUG
+--- a/util/strtod.h
++++ b/util/strtod.h
+@@ -11,7 +11,7 @@
+ #ifndef __strtod_h
+ #define __strtod_h
+
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ extern int SAOdtype;
+
+--- a/util/swap.h
++++ b/util/swap.h
+@@ -11,7 +11,7 @@
+ #ifndef __swap_h
+ #define __swap_h
+
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ /* data types */
+ #define TY_CHAR 1
+--- a/util/tclmainlib.h
++++ b/util/tclmainlib.h
+@@ -1,4 +1,4 @@
+-#include <mainlib.h>
++#include "mainlib.h"
+
+ #if HAVE_TCL
+
+--- a/util/winprocess.h
++++ b/util/winprocess.h
+@@ -13,7 +13,7 @@
+ #define __winprocess_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+ #include <stdio.h>
+ #ifdef HAVE_UNISTD_H
+@@ -25,7 +25,7 @@
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ #if defined(HAVE_CYGWIN) || defined(WIN32)
+
+--- a/util/word.h
++++ b/util/word.h
+@@ -12,7 +12,7 @@
+ #define __word_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+@@ -23,8 +23,8 @@
+ #if HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
+-#include <prsetup.h>
+-#include <xalloc.h>
++#include "prsetup.h"
++#include "xalloc.h"
+
+ /* defines the types of callback procedure we use */
+ typedef char *(*MacroCB)(
+--- a/util/xalloc.h
++++ b/util/xalloc.h
+@@ -12,7 +12,7 @@
+ #define __xalloc_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <sys/types.h>
+@@ -33,7 +33,7 @@
+ #include <setjmp.h>
+ #endif
+
+-#include <prsetup.h>
++#include "prsetup.h"
+
+ _PRbeg
+
+--- a/util/xfileio.h
++++ b/util/xfileio.h
+@@ -7,7 +7,7 @@
+ #ifndef XFILEIO_H
+ #define XFILEIO_H
+
+-#include <gio.h>
++#include "gio.h"
+
+ /* define the basic IO routines */
+ typedef GIO File;
+--- a/util/xlaunch.h
++++ b/util/xlaunch.h
+@@ -12,7 +12,7 @@
+ #define __xlaunch_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #include <stdio.h>
+@@ -33,10 +33,10 @@
+ #if HAVE_POSIX_SPAWN
+ #include <spawn.h>
+ #endif
+-#include <xport.h>
+-#include <word.h>
+-#include <xalloc.h>
+-#include <prsetup.h>
++#include "xport.h"
++#include "word.h"
++#include "xalloc.h"
++#include "prsetup.h"
+
+ #define LAUNCH_ARGS 1024
+
+--- a/util/xport.h
++++ b/util/xport.h
+@@ -11,7 +11,7 @@
+ #define __xport_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+
+ #if HAVE_MINGW32
+--- a/util/zprocess.h
++++ b/util/zprocess.h
+@@ -14,7 +14,7 @@
+ #define __zprocess_h
+
+ #if HAVE_CONFIG_H
+-#include <conf.h>
++#include "conf.h"
+ #endif
+ #include <stdio.h>
+ #ifdef HAVE_UNISTD_H
+@@ -28,8 +28,8 @@
+ #endif
+ #include <sys/time.h>
+ #include <signal.h>
+-#include <xlaunch.h>
+-#include <find.h>
++#include "xlaunch.h"
++#include "find.h"
+
+ _PRbeg
+
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch b/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch
new file mode 100644
index 00000000000..d1045b64317
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch
@@ -0,0 +1,341 @@
+diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile.in
+--- funtools-1.4.4.orig/filter/Makefile.in 2014-03-04 08:35:59.665478514 -0800
++++ funtools-1.4.4/filter/Makefile.in 2014-03-04 08:36:38.196760766 -0800
+@@ -29,6 +29,9 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++includedir = @includedir@
++libdir = @libdir@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -38,13 +41,13 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a, .so, and .o files:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the programs:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include files:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/filter
+
+ # util files are in the util directory at same level
+ UTIL_INC = -I../util
+@@ -55,7 +58,7 @@
+ #FITSY_LIBS = -L../fitsy
+
+ # wcs files are in the wcs subdirectory
+-WCS_INC = -I../wcs
++#WCS_INC = -I../wcs
+ #WCS_LIBS = -L../wcs -lwcs
+
+ # extra includes for compiling
+@@ -161,7 +164,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+@@ -228,6 +231,10 @@
+
+ swap_c.h: swap.c inc.sed
+ $(RM) swap_c.h
++ ./inc.sed SWAP_C < swap.c > swap_c.h
++
++swap_c.h: swap.c inc.sed
++ $(RM) swap_c.h
+ ./inc.sed SWAP_C < swap.c > swap_c.h
+
+ events_c.h: evfilter.c inc.sed
+diff -Nur funtools-1.4.4.orig/fitsy/Makefile.in funtools-1.4.4/fitsy/Makefile.in
+--- funtools-1.4.4.orig/fitsy/Makefile.in 2014-03-04 08:35:59.638478312 -0800
++++ funtools-1.4.4/fitsy/Makefile.in 2014-03-04 08:36:38.197760773 -0800
+@@ -28,6 +28,11 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++includedir = @includedir@
++mandir = @mandir@
++datadir = @datadir@
++libdir = @libdir@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -37,13 +42,13 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a, .so, and .o files:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the programs:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include files:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/fitsy
+
+ # There are just too many different versions of "install" around;
+ # better to use the install-sh script that comes with the distribution,
+@@ -187,7 +192,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+diff -Nur funtools-1.4.4.orig/gnu/Makefile.in funtools-1.4.4/gnu/Makefile.in
+--- funtools-1.4.4.orig/gnu/Makefile.in 2014-03-04 08:35:59.642478341 -0800
++++ funtools-1.4.4/gnu/Makefile.in 2014-03-04 08:36:38.197760773 -0800
+@@ -21,6 +21,11 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++includedir = @includedir@
++mandir = @mandir@
++datadir = @datadir@
++libdir = @libdir@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -53,13 +58,13 @@
+ EXTRA_OBJS = @EXTRA_OBJS@
+
+ # Directory in which to install the .a, .so, and .o files:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the programs:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include files:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
+
+ # There are just too many different versions of "install" around;
+ # better to use the install-sh script that comes with the distribution,
+diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in
+--- funtools-1.4.4.orig/Makefile.in 2014-03-04 08:35:59.665478514 -0800
++++ funtools-1.4.4/Makefile.in 2014-03-04 08:37:40.214224788 -0800
+@@ -28,28 +28,33 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++includedir = @includedir@
++mandir = @mandir@
++datadir = @datadir@
++libdir = @libdir@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+ # to be different than those used for actually reference files at
+ # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT =
++INSTALL_ROOT = $(DESTDIR)
+
+ # Directory in which to install the .a or .so binary for the FUNTOOLS library:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the funtools.h include file:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools
+
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
+
+ # Top-level directory for share entries:
+-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools
++MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/funtools
+
+ # util files are in the util subdirectory
+ UTIL_INC = -I./util
+@@ -60,8 +65,8 @@
+ # FITSY_LIBS = -L./fitsy -lfitsy
+
+ # wcs files are in the wcs subdirectory
+-WCS_INC = -I./wcs
+-# WCS_LIBS = -L./wcs -lwcs
++#WCS_INC = -I../wcs
++#WCS_LIBS = -L./wcs -lwcs
+
+ # filter files are in the filter subdirectory
+ FILTER_INC = -I./filter
+@@ -160,7 +165,7 @@
+
+ # this is used in the link line
+ # LLIB = $(LIB)
+-LLIB = @LLIB@
++LLIB = -L. -lfuntools
+
+ # libraries containing main as subroutines
+ MAINLIB = lib$(PACKAGE)MainLib.a
+@@ -188,7 +193,7 @@
+
+ # Subdirectories to run make in for the primary targets.
+
+-SUBLIBS = util fitsy wcs filter
++SUBLIBS = util fitsy filter
+
+ SUBDIRS = $(SUBLIBS) gnu funtest faq
+
+@@ -225,10 +230,10 @@
+ echo $(PROGS) | ./mkfunmainlib > funmainlib.c;
+
+ shlib: sublib $(LIBOBJS)
+- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
++ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
+ (cd $(PACKAGE)tmp && ar x ../$(LIB)); \
+ CC='$(CC)' CXX=$(CXX) \
+- ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \
++ ./mklib $(PACKAGE)tmp/*.o $(LIBS) -o $(PACKAGE) ; \
+ rm -rf $(PACKAGE)tmp;)
+
+ mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o
+@@ -237,7 +242,7 @@
+ $(RANLIB) lib$(PACKAGE)MainLib.a)
+
+ shmainlib: mainlib
+- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
++ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
+ (cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \
+ CC='$(CC)' CXX='$(CXX)' \
+ ./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\
+@@ -248,7 +253,7 @@
+ $(RANLIB) libtclfun.a)
+
+ shtclfun: tclfun
+- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
++ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
+ (cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \
+ CC='$(CC)' CXX='$(CXX)' \
+ ./mklib -o tclfun $(PACKAGE)tmp/*.o; \
+@@ -386,7 +391,7 @@
+ @for dir in $(SUBDIRS); do \
+ echo " "; \
+ echo Installing in $$dir ...; \
+- (cd $$dir; $(MAKE) $@) ; \
++ (cd $$dir; $(MAKE) INSTALL_ROOT=$(INSTALL_ROOT) INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR) $@) ; \
+ done
+
+ install:: install-man
+@@ -422,7 +427,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+@@ -462,7 +467,7 @@
+ install-man:
+ @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
+ echo "Making directory $(MAN_INSTALL_DIR)"; \
+- mkdir $(MAN_INSTALL_DIR); \
++ mkdir -p $(MAN_INSTALL_DIR); \
+ chmod 755 $(MAN_INSTALL_DIR); \
+ else true; \
+ fi;
+@@ -473,7 +478,7 @@
+ M="$(MAN_INSTALL_DIR)/man$$E"; \
+ if [ ! -d $$M ] ; then \
+ echo "Making directory $$M"; \
+- mkdir $$M; \
++ mkdir -p $$M; \
+ chmod 755 $$M; \
+ else true; \
+ fi; \
+diff -Nur funtools-1.4.4.orig/util/Makefile.in funtools-1.4.4/util/Makefile.in
+--- funtools-1.4.4.orig/util/Makefile.in 2014-03-04 08:35:59.653478425 -0800
++++ funtools-1.4.4/util/Makefile.in 2014-03-04 08:36:38.197760773 -0800
+@@ -29,6 +29,11 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++includedir = @includedir@
++mandir = @mandir@
++datadir = @datadir@
++libdir = @libdir@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -38,13 +43,13 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a, .so, and .o files:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the programs:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include files:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/util
+
+ # extra includes for compiling
+ INCLUDES =
+@@ -200,12 +205,24 @@
+ tlaunch2: tlaunch2.o
+ $(CC) $(LDFLAGS) tlaunch2.o -o tlaunch2
+
++tlaunch.o: tlaunch.c
++
++tlaunch: tlaunch.o launch.o $(LIB)
++ $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch $(LIB) $(LIBS) \
++ $(EXTRA_LIBS)
++
++tlaunch2.o: tlaunch2.c
++
++tlaunch2: tlaunch2.o
++ $(CC) $(LDFLAGS) tlaunch2.o -o tlaunch2
++
++
+ install-binaries: $(LIB) $(PROGS)
+ @for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+@@ -272,4 +289,11 @@
+ purift $(CC) $(LDFLAGS) tlaunch.o xlaunch.o -o tlaunch \
+ $(LIB) $(LIBS) $(EXTRA_LIBS)
+
++pure: tlaunch.pure
++
++tlaunch.pure: tlaunch.o launch.o $(LIB)
++ purift $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch \
++ $(LIB) $(LIBS) $(EXTRA_LIBS)
++
++
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild b/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild
new file mode 100644
index 00000000000..dff3ed4d0d8
--- /dev/null
+++ b/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs multilib autotools
+
+DESCRIPTION="FITS library and utlities for astronomical images"
+HOMEPAGE="http://www.cfa.harvard.edu/~john/funtools/"
+SRC_URI="http://cfa-www.harvard.edu/~john/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+RDEPEND="
+ sys-libs/zlib
+ sci-astronomy/wcstools
+ sci-visualization/gnuplot"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-ds9-fixes.patch \
+ "${FILESDIR}"/${P}-fix-autoheader.patch \
+ "${FILESDIR}"/${P}-fix-includes.patch \
+ "${FILESDIR}"/${P}-fix-hardening.patch \
+ "${FILESDIR}"/${P}-fix-crashes.patch \
+ "${FILESDIR}"/${P}-makefiles.patch
+ sed -i -e "s:/usr:${EPREFIX}/usr:g" filter/Makefile.in || die
+ sed -i \
+ -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \
+ mklib || die "sed for ldflags failed"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-shared \
+ --enable-dl \
+ --enable-mainlib \
+ --with-wcslib="$($(tc-getPKG_CONFIG) --libs wcstools)" \
+ --with-zlib="$($(tc-getPKG_CONFIG) --libs zlib)" \
+ --with-tcl=-ltcl
+}
+
+src_compile() {
+ emake WCS_INC="$($(tc-getPKG_CONFIG) --cflags wcstools)"
+ emake shtclfun
+}
+
+src_install () {
+ default
+ dosym libtclfun.so.1 /usr/$(get_libdir)/libtclfun.so
+ # install missing includes
+ insinto /usr/include/funtools/fitsy
+ doins fitsy/*.h
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
+ use doc && cd doc && dodoc *.pdf && dohtml *html *c
+}
diff --git a/sci-astronomy/funtools/metadata.xml b/sci-astronomy/funtools/metadata.xml
new file mode 100644
index 00000000000..e5ca7e8ca45
--- /dev/null
+++ b/sci-astronomy/funtools/metadata.xml
@@ -0,0 +1,12 @@
+<?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">
+ Funtools, is a minimal buy-in FITS library and utility package from
+ the SAO/HEAD. The Funtools library provides simplified
+ access to FITS images and binary tables, as well as to raw array and binary
+ event lists. The Funtools utilities provide high-level support for
+ processing astronomical data.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/galaxy/Manifest b/sci-astronomy/galaxy/Manifest
new file mode 100644
index 00000000000..9629c281427
--- /dev/null
+++ b/sci-astronomy/galaxy/Manifest
@@ -0,0 +1 @@
+DIST galaxy-2.2.tar.gz 146675 SHA256 88d7bcfe7c25ad260f2f7b5abce2e3bb69c9e3e0661772a9016b2356160f1c00 SHA512 b3843f4ef7bdd60d761db019ded8af99b4c520ecc1c852a210bc6282751474254d9b9172e738015c7b01df57502655749051baac11448797fb9b71ecd4edd8d6 WHIRLPOOL 4d2bf2df59a89eb4cb459f2e90dbdc9992796c22d539fde9c0c918473eafdccb80ee4cad77c8da7c79b9d9c372431332cf0562ae5326ac718072d7c0f1128b53
diff --git a/sci-astronomy/galaxy/galaxy-2.2.ebuild b/sci-astronomy/galaxy/galaxy-2.2.ebuild
new file mode 100644
index 00000000000..aeb09714083
--- /dev/null
+++ b/sci-astronomy/galaxy/galaxy-2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit fdo-mime toolchain-funcs flag-o-matic
+
+# probably change every release
+PID="1/3/0/3/13035936"
+
+DESCRIPTION="Stellar simulation program"
+HOMEPAGE="http://www.kornelix.com/galaxy.html"
+SRC_URI="http://www.kornelix.com/uploads/${PID}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="x11-libs/gtk+:3"
+RDEPEND="${DEPEND}
+ x11-misc/xdg-utils"
+
+pkg_setup() {
+ tc-export CXX
+ append-cxxflags -pthread
+ append-ldflags -pthread
+ export PREFIX="${EPREFIX}/usr"
+}
+
+src_prepare() {
+ sed -e '/DOCDIR/ s/PROGRAM)/&-\$(VERSION)/g' \
+ -e '/xdg-desktop-menu/d' \
+ -i Makefile || die
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/sci-astronomy/galaxy/metadata.xml b/sci-astronomy/galaxy/metadata.xml
new file mode 100644
index 00000000000..94a0b621144
--- /dev/null
+++ b/sci-astronomy/galaxy/metadata.xml
@@ -0,0 +1,10 @@
+<?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">
+ Stellar simulation program. Watch a few stars move around each-other,
+ accelerated by their mutual attractions, or watch thousands of random
+ stars evolve into a spiral galaxy.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/gasgano/Manifest b/sci-astronomy/gasgano/Manifest
new file mode 100644
index 00000000000..25330f65aee
--- /dev/null
+++ b/sci-astronomy/gasgano/Manifest
@@ -0,0 +1,3 @@
+DIST VLT-PRO-ESO-19000-1932-V4.pdf 818369 SHA256 d370d6a57bed3cb7e47bb322e4cde5e314d37c6110e5370ea3099d241355ed68 SHA512 272da18caee1bb1b5228df76a7f09411120be39a4b421b79d48e0bfc09972f250322a718bf380d7a83c3a528151260139efdcd8d2482c6a36ad45d727d93cce1 WHIRLPOOL f13320ab0beaf5302eab56882ba7a8185543254e05cd1dada10a2fbc1652f45f74a20f326e703d9837d9abdee7499dbdfb7bdf1bd963f84937c6c24c3823b3f3
+DIST gasgano-2.4.3.tar.gz 4985401 SHA256 d7873fb7b5429a8711e10c080f0377b8aa10600c700ac8b6c3023c5f808e5fe5 SHA512 1376bbd75754fbb68353c67da73f25a22e6af6a83be1ac5f263743eacaf9339b853e2b17e52580c1a3434e8d60a9a4bcbf8136d492fd722e554f2d81a5199c2c WHIRLPOOL 249a322a39924c7dea1a41ffcd441eafd0cf159e630c4cce715d9dd868705994c07340d3c3603b80dc2d80a1e870560450e65d5366477f4f53cdf1bc4712990f
+DIST gasgano-2.4.5.tar.gz 8676773 SHA256 0ef5ca420b0e9e1f29df001d34a832746f58d77da7790f2da767457df12d816d SHA512 fab93f5240808129d432000ea47c3d3b9b0520c43baea2858459a4e9e6cbe75deb8df73199d716c62b71a11147844f09ea89a065b467ae1086d6f3fe41cdc53d WHIRLPOOL 69d76b68f5adf80a368bff13eb3bcbd8e76b54990695743bc62481ffd64513b1e9f169f4c3e167ae30e387fad578f00e5e9142b6c06d92a58d854d1ccad13ca8
diff --git a/sci-astronomy/gasgano/gasgano-2.4.3-r2.ebuild b/sci-astronomy/gasgano/gasgano-2.4.3-r2.ebuild
new file mode 100644
index 00000000000..489e2c3bc0a
--- /dev/null
+++ b/sci-astronomy/gasgano/gasgano-2.4.3-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils java-pkg-2
+
+PDOC=VLT-PRO-ESO-19000-1932-V4
+
+DESCRIPTION="ESO astronomical data file organizer"
+HOMEPAGE="http://www.eso.org/sci/software/gasgano/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz
+ doc? ( ${HOMEPAGE}/${PDOC}.pdf )"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND="
+ >=virtual/jre-1.6
+ dev-java/gnu-regexp
+ dev-java/junit
+ dev-java/jal"
+
+src_prepare() {
+ sed -i \
+ -e "s:^BASE=\`pwd\`:BASE=${EPREFIX}/usr/share/${PN}:" \
+ -e 's:$BASE/share/:$BASE/lib/:g' \
+ bin/gasgano || die
+}
+
+src_install() {
+ dobin bin/*
+ java-pkg_dojar share/*.jar
+ insinto /usr/share/${PN}
+ doins -r config
+ make_desktop_entry gasgano "Gasgano FITS Organizer"
+ use doc && newdoc "${DISTDIR}"/${PDOC}.pdf user-manual.pdf
+}
diff --git a/sci-astronomy/gasgano/gasgano-2.4.5.ebuild b/sci-astronomy/gasgano/gasgano-2.4.5.ebuild
new file mode 100644
index 00000000000..1aaaebe0a6a
--- /dev/null
+++ b/sci-astronomy/gasgano/gasgano-2.4.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils java-pkg-2
+
+PDOC=VLT-PRO-ESO-19000-1932-V4
+
+DESCRIPTION="ESO astronomical data file organizer"
+HOMEPAGE="http://www.eso.org/sci/software/gasgano/"
+SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz
+ doc? ( ${HOMEPAGE}/${PDOC}.pdf )"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND="
+ >=virtual/jre-1.6
+ dev-java/gnu-regexp
+ dev-java/junit
+ dev-java/jal"
+
+src_prepare() {
+ sed -i \
+ -e "s:^BASE=\`pwd\`:BASE=${EPREFIX}/usr/share/${PN}:" \
+ -e 's:$BASE/share/:$BASE/lib/:g' \
+ bin/gasgano || die
+}
+
+src_install() {
+ dobin bin/*
+ java-pkg_dojar share/*.jar
+ insinto /usr/share/${PN}
+ doins -r config
+ make_desktop_entry gasgano "Gasgano FITS Organizer"
+ use doc && newdoc "${DISTDIR}"/${PDOC}.pdf user-manual.pdf
+}
diff --git a/sci-astronomy/gasgano/metadata.xml b/sci-astronomy/gasgano/metadata.xml
new file mode 100644
index 00000000000..247aae21d92
--- /dev/null
+++ b/sci-astronomy/gasgano/metadata.xml
@@ -0,0 +1,14 @@
+<?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">
+ Gasgano is a Data File Organiser developed and maintained by ESO to
+ help its user community to manage and organise in a systematic way the
+ astronomical data observed and produced by all VLT compliant
+ telescopes, i.e. by telescopes which are being operated through
+ Observation Blocks. The tool also supports FITS files which are not
+ generated by those telescopes but with a limited number of
+ functionalities.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/idlastro/Manifest b/sci-astronomy/idlastro/Manifest
new file mode 100644
index 00000000000..295eb27cad9
--- /dev/null
+++ b/sci-astronomy/idlastro/Manifest
@@ -0,0 +1,2 @@
+DIST idlastro-20130501.tar.gz 1114612 SHA256 3e4cbec977cee457b470baa02d4cf911229f0d62cdfb8cf94f2abbbd68a282e3 SHA512 ca0cfe9f07554f788de4b4aa190fb651a3d854730905791828c6f9ebeef13ed4ee75713001ffe1ea8e24769086a9da4982362db2df8daa4a907c41373fadd37d WHIRLPOOL cf9643d896004284bfddc8896a70722ebb79a87f77d3e3da10905b399b9894f2bdc78620acb47f1b7e421831cc5324818478709d5a720d04695401e57afb03d4
+DIST idlastro-20140125.tar.gz 1129440 SHA256 b562e172e5426061ea4f3c3e2204c4563c17b516ab2628b15494fbda425a0f8a SHA512 dd2049d1c9b52d5728b995f8db388862a2e9ca8e9f8f4ba72320100ee6676495d012eb2d20296e6a84335cb1e0a6ea34fa73ac030cb1d0c32a5f918ecf84ab6d WHIRLPOOL d9320c935c330652d253df873ca3ddc8147d9b318ff4c925e3d9cdfe8d8b1ed2e0ce64538a3d56c6d74d1ec67aa5b536f420fc015ce1a959e236b845b1b4213c
diff --git a/sci-astronomy/idlastro/idlastro-20130501.ebuild b/sci-astronomy/idlastro/idlastro-20130501.ebuild
new file mode 100644
index 00000000000..55267ee2b52
--- /dev/null
+++ b/sci-astronomy/idlastro/idlastro-20130501.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Astronomical user routines for IDL"
+HOMEPAGE="http://idlastro.gsfc.nasa.gov/"
+SRC_URI="${HOMEPAGE}/ftp/astron.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-lang/gdl-0.9.2-r1"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/gnudatalanguage/${PN}
+ doins -r pro/*
+ dodoc *txt text/*
+}
diff --git a/sci-astronomy/idlastro/idlastro-20140125.ebuild b/sci-astronomy/idlastro/idlastro-20140125.ebuild
new file mode 100644
index 00000000000..55a8b00cc51
--- /dev/null
+++ b/sci-astronomy/idlastro/idlastro-20140125.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Astronomical user routines for IDL"
+HOMEPAGE="http://idlastro.gsfc.nasa.gov/"
+SRC_URI="${HOMEPAGE}/ftp/astron.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND=""
+RDEPEND="dev-lang/gdl"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/gnudatalanguage/${PN}
+ doins -r pro/*
+ dodoc *txt text/*
+}
diff --git a/sci-astronomy/idlastro/metadata.xml b/sci-astronomy/idlastro/metadata.xml
new file mode 100644
index 00000000000..999356b8385
--- /dev/null
+++ b/sci-astronomy/idlastro/metadata.xml
@@ -0,0 +1,14 @@
+<?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">
+ The IDL Astronomy Users Library is a central repository for
+ low-level astronomy software written in the commercial language
+ IDL or GNU version of it (GDL). The Library is not meant to be an
+ integrated package, but rather is a collection of procedures from
+ which users can pick and choose (and possibly modify) for their own
+ use. Submitted procedures are given a cursory testing, but are
+ basically stored in the Library as submitted.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/kapteyn/Manifest b/sci-astronomy/kapteyn/Manifest
new file mode 100644
index 00000000000..97e8168412f
--- /dev/null
+++ b/sci-astronomy/kapteyn/Manifest
@@ -0,0 +1 @@
+DIST kapteyn-2.2.tar.gz 11818056 SHA256 7826a8eeab42e0167f3c9d8ad3444a213b24a34095ff1dd68f0f3254d9fce0ac SHA512 e3f16f2308626c8aaf795460c4fa19464e05e50db7f4de71d73f24a0dba0210d81651b46d2291a30c106a913f0910d0b3ad6ff2935a60a48f8dc1f4cf0205599 WHIRLPOOL 1e64239ac11e5dd32da791387c7880e632e4bf643dd253b5228dafb2d3a1415f06d596bc70bded9e735a7dc2549deaffacecc32428ab912cf601250fad9adc6d
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 00000000000..035979b80bc
--- /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 = 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.2-r1.ebuild b/sci-astronomy/kapteyn/kapteyn-2.2-r1.ebuild
new file mode 100644
index 00000000000..55ad6b27187
--- /dev/null
+++ b/sci-astronomy/kapteyn/kapteyn-2.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+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 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+ sci-astronomy/wcslib
+ dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ virtual/pyfits[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES.txt README.txt doc/${PN}.pdf )
+
+python_prepare_all() {
+ epatch "${FILESDIR}"/${P}-debundle_wcs.patch
+ 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
new file mode 100644
index 00000000000..3a653d26644
--- /dev/null
+++ b/sci-astronomy/kapteyn/metadata.xml
@@ -0,0 +1,12 @@
+<?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">
+ 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>
diff --git a/sci-astronomy/metadata.xml b/sci-astronomy/metadata.xml
new file mode 100644
index 00000000000..49245f7d22e
--- /dev/null
+++ b/sci-astronomy/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The sci-astronomy category contains software that can be used
+ in astronomical and related scientific environments.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie sci-astronomy enthält Software, die in astronomischen
+ und verwandten wissenschaftlichen Umfeldern genutzt wird.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría sci-astronomy contiene programas que pueden ser utilizados
+ en entornos relacionados con la astronomía.
+ </longdescription>
+ <longdescription lang="ja">
+ sci-astronomyカテゴリーには天文学の科学的な分野に利用される
+ ソフトウェアが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De sci-astronomy categorie bevat software, die in astronomische
+ en gerelateerde wetenschappelijke omgevingen wordt gebruikt.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm sci-astronomy chứa các phần mềm dùng trong thiên văn
+ và liên quan đến khoa học.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria sci-astronomy contiene programmi per l'astronomia.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria sci-astronomy contém programas que podem ser usados
+ em ambientes relacionados a astronomia.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria sci-astronomy zawiera programy naukowe związane z astronomią.
+ </longdescription>
+</catmetadata>
+
diff --git a/sci-astronomy/predict/Manifest b/sci-astronomy/predict/Manifest
new file mode 100644
index 00000000000..bc92410b89e
--- /dev/null
+++ b/sci-astronomy/predict/Manifest
@@ -0,0 +1,2 @@
+DIST predict_2.2.3-3.1.diff.gz 78624 SHA256 60c00a542c399e69dba154cc0827ea15f33dae61547f3604b8c232e9d26d06df SHA512 9fe2e3ffd931be7ab85f10db4cd35a2091a459c3fd0c48e9ecf8a4482c20400c267b38d31f72d28270d50b7305bc49418fefe35ff013ac9be1627d853205bd5f WHIRLPOOL 9e2ed3fd43d556bb8c5ad92c9502574650cdf13116b222bdcbb7ee18d9e431cbfe8de6262f034dd9ab7abcebc940864c61911e4a0e26de2c6e14c24b9d17bc9d
+DIST predict_2.2.3.orig.tar.gz 1444530 SHA256 47b7c185f1cf4d318b6b31a22a533c03c4a3f57394839df036367c7cdf2dd7ff SHA512 260f7f4dbc72cca4b0b5f7bc9dcf612b8a7e3ef12ab6f34afa3c06b1ac24427435af1c4bae9d39e7cbcdff6cccad72e3235dd191605464642f014207651d8c11 WHIRLPOOL 69ee83befef0ce413c826e6034b6b7ea2ab12749b9dc7071badc865208fd89141451c1f887cbefae6c7f1ec5d8adbd0d112a62fb89e805ddbef984e42ab05a63
diff --git a/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch b/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch
new file mode 100644
index 00000000000..65f18bf9512
--- /dev/null
+++ b/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch
@@ -0,0 +1,27 @@
+diff -Nur a/clients/earthtrack/earthtrack.c b/clients/earthtrack/earthtrack.c
+--- a/clients/earthtrack/earthtrack.c 2013-06-08 20:03:55.629967192 +0200
++++ b/clients/earthtrack/earthtrack.c 2013-06-08 20:05:15.559966743 +0200
+@@ -495,11 +495,11 @@
+
+ fprintf(fd,"marker_file=%s\n",markerfile);
+ fprintf(fd,"arc_file=%s\n",greatarcfile);
+- fprintf(fd,"marker_font=/usr/local/share/xplanet/fonts/FreeMonoBold.ttf\n");
+- fprintf(fd,"\n## Your \"/usr/local/share/xplanet/config/default\" configuration file follows:\n\n");
++ fprintf(fd,"marker_font=/usr/share/xplanet/fonts/FreeMonoBold.ttf\n");
++ fprintf(fd,"\n## Your \"/usr/share/xplanet/config/default\" configuration file follows:\n\n");
+ fclose(fd);
+
+- x=AppendFile("/usr/local/share/xplanet/config/default",configfile);
++ x=AppendFile("/usr/share/xplanet/config/default",configfile);
+
+ if (x==1)
+ {
+@@ -509,7 +509,7 @@
+
+ if (x==2)
+ {
+- fprintf(stderr,"%c*** Error: Could not read \"/usr/local/share/xplanet/config/default\"\nIs xplanet installed?\n\n",7);
++ fprintf(stderr,"%c*** Error: Could not read \"/usr/share/xplanet/config/default\"\nIs xplanet installed?\n\n",7);
+ exit(-1);
+ }
+ }
diff --git a/sci-astronomy/predict/files/predict-update b/sci-astronomy/predict/files/predict-update
new file mode 100644
index 00000000000..b0634e148e4
--- /dev/null
+++ b/sci-astronomy/predict/files/predict-update
@@ -0,0 +1,92 @@
+#!/bin/sh
+oldpwd=$PWD
+
+if [ ! -f ~/.predict/predict.tle ]; then
+ mkdir -p ~/.predict
+ cd ~/.predict
+ cat > predict.tle << EOF
+OSCAR-10
+1 14129U 02217.21791401 .00000442 00000-0 00000-0 0 7
+2 14129 25.6686 197.8739 6086930 273.5039 23.0795 2.05866525116000
+OSCAR-11
+1 14781U 02217.20425383 .00001813 00000-0 00000-0 0 6
+2 14781 98.0880 185.1059 0010359 119.2373 240.9876 14.76997913987094
+OSCAR-14
+1 20437U 02217.20572416 .00000181 00000-0 00000-0 0 8
+2 20437 98.3009 264.9286 0011799 68.5863 291.6580 14.31121869654267
+PACSAT
+1 20439U 02217.25154490 .00000231 00000-0 00000-0 0 9
+2 20439 98.3472 275.4922 0012032 74.6777 285.5743 14.31332429654304
+LUSAT
+1 20442U 02216.75520291 .00000242 00000-0 00000-0 0 5
+2 20442 98.3779 280.4632 0012985 73.9191 286.3409 14.31575156654338
+OSCAR-20
+1 20480U 02217.54003808 -.00000027 00000-0 00000-0 0 7
+2 20480 99.0206 212.5786 0540948 90.2870 276.0202 12.83318863585245
+OSCAR-22
+1 21575U 02216.97001758 .00000422 00000-0 00000-0 0 9
+2 21575 98.1264 214.2386 0008207 17.4055 342.7413 14.38915947579867
+OSCAR-23
+1 22077U 02216.94266766 -.00000037 00000-0 00000-0 0 9
+2 22077 66.0844 179.5905 0009538 319.0308 40.9993 12.86398497468888
+OSCAR-25
+1 22828U 02217.51170770 .00000176 00000-0 00000-0 0 9
+2 22828 98.2949 253.2889 0010744 97.6953 262.5454 14.29395258429974
+ITAMSAT
+1 22826U 02216.71294910 .00000212 00000-0 00000-0 0 2
+2 22826 98.2981 252.2691 0009565 119.2021 241.0116 14.29035332461667
+OSCAR-27
+1 22825U 02217.14273416 .00000182 00000-0 00000-0 0 3
+2 22825 98.2952 251.6595 0009305 119.9116 240.3013 14.28824165461683
+OSCAR-29
+1 24278U 02216.92953700 -.00000035 00000-0 00000-0 0 1
+2 24278 98.5168 30.2010 0351470 9.0561 351.6706 13.52846361294584
+OSCAR-36
+1 25693U 02217.47022698 .00000460 00000-0 00000-0 0 8
+2 25693 64.5605 253.8004 0008708 253.5019 106.5150 14.74585281177168
+OSCAR-40
+1 26609U 02217.05030362 -.00000251 00000-0 00000-0 0 6
+2 26609 7.5635 101.4360 7924755 75.7827 352.4675 1.25596086 8104
+RS-12/13
+1 21089U 02216.81449027 .00000082 00000-0 00000-0 0 9
+2 21089 82.9235 328.1138 0030158 114.6154 245.8150 13.74373061576622
+RS-15
+1 23439U 02216.86493965 -.00000037 00000-0 00000-0 0 6
+2 23439 64.8185 1.1847 0152424 152.9684 207.9281 11.27546726313309
+NOAA-12
+1 21263U 02216.96410173 .00000410 00000-0 00000-0 0 4
+2 21263 98.6066 205.1774 0011736 236.4413 123.5645 14.24842312583078
+NOAA-14
+1 23455U 02216.94655308 .00000224 00000-0 00000-0 0 1
+2 23455 99.1906 225.2382 0010223 66.1025 294.1215 14.13170722391563
+NOAA-15
+1 25338U 02216.96832533 .00000312 00000-0 00000-0 0 0
+2 25338 98.5657 239.3255 0010503 167.6220 192.5219 14.24094451219673
+UARS
+1 21701U 02217.09598012 .00001106 00000-0 00000-0 0 8
+2 21701 56.9808 110.9304 0004474 115.3921 244.7510 15.02171395596038
+HUBBLE
+1 20580U 02217.09786941 .00002710 00000-0 00000-0 0 4
+2 20580 28.4663 239.6798 0003524 339.3283 57.0940 14.96472945473016
+ISS
+1 25544U 02217.52476852 .00025143 00000-0 00000-0 0 9
+2 25544 51.6355 165.2615 0018093 106.6267 56.5198 15.57209040211722
+PCSAT
+1 26931U 02217.22743486 .00000269 00000-0 00000-0 0 9
+2 26931 67.0531 43.5764 0007786 258.8522 101.1704 14.28921812 44150
+STARSHINE 3
+1 26929U 02216.67548843 .00042169 00000-0 00000-0 0 9
+2 26929 67.0426 246.5544 0011326 237.9129 122.0981 15.57367567 47636
+EOF
+fi
+
+mkdir /tmp/predict-$$ || exit 1
+cd /tmp/predict-$$
+
+wget -qc www.celestrak.com/NORAD/elements/amateur.txt -O ./amateur.txt
+wget -qc www.celestrak.com/NORAD/elements/visual.txt -O ./visual.txt
+wget -qc www.celestrak.com/NORAD/elements/weather.txt -O ./weather.txt
+predict -u ./amateur.txt ./visual.txt ./weather.txt
+
+cd ${oldpwd}
+rm -fr /tmp/predict-$$
diff --git a/sci-astronomy/predict/metadata.xml b/sci-astronomy/predict/metadata.xml
new file mode 100644
index 00000000000..90f9a653e34
--- /dev/null
+++ b/sci-astronomy/predict/metadata.xml
@@ -0,0 +1,17 @@
+<?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">
+ Predict is a satellite tracking program. It is probably mostly of interest
+ to users of amateur satellites, but includes support for optionally
+ announcing azimuth and elevation to help in manual antenna pointing,
+ or optical observation of satellites.
+</longdescription>
+<use>
+ <flag name='xforms'>Add a "map" client which uses the
+ <pkg>x11-libs/xforms</pkg> library for its GUI</flag>
+ <flag name='xplanet'>Project predict data onto world maps generated by
+ <pkg>x11-misc/xplanet</pkg> / <pkg>x11-misc/xearth</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/sci-astronomy/predict/predict-2.2.3-r1.ebuild b/sci-astronomy/predict/predict-2.2.3-r1.ebuild
new file mode 100644
index 00000000000..271c1e75b87
--- /dev/null
+++ b/sci-astronomy/predict/predict-2.2.3-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs eutils multilib autotools
+
+DEB_P=${PN}_${PV}
+DEB_PR=3.1
+
+DESCRIPTION="Satellite tracking and orbital prediction"
+HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.orig.tar.gz
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc gtk nls xforms xplanet"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-libs/ncurses
+ gtk? ( x11-libs/gtk+:2 )
+ xforms? ( x11-libs/xforms )
+ xplanet? ( x11-misc/xplanet[truetype] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/"${P}"-earthtrack.patch
+ epatch -p1 "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff
+ sed -i -e 's:predict\(.*\)/:predict-2.2.3\1/:g' \
+ debian/patches/140*.diff || die
+ sed -i -e 's:\(a\|b\)/:predict-2.2.3/:g' \
+ debian/patches/180*.diff || die
+ EPATCH_SOURCE=debian/patches epatch -p1 $(cat debian/patches/series)
+ # fix some further array out of bounds errors
+ sed -i -e "s/satname\[ 26/satname\[ 25/g" \
+ clients/gsat-1.1.0/src/db.c || die
+ sed -i -e "s/satname\[ 26/satname\[ 25/g" \
+ clients/gsat-1.1.0/src/comms.c || die
+ sed -i -e "s/output\[20\];/output[21];/" \
+ utils/moontracker/moontracker.c || die
+ # fix underlinking
+ sed -i -e '/AC_OUTPUT/i \
+AC_CHECK_LIB(m,cos) \
+AC_CHECK_LIB(dl,dlclose)' \
+ -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+ clients/gsat-1.1.0/configure.in || die
+ sed -i \
+ -e 's/gcc/$(CC) $(CFLAGS) $(LDFLAGS)/g' \
+ -e 's/-o/-lm -o/g' \
+ clients/gsat-1.1.0/plugins/Makefile || die
+
+ # fix the hardcoded /usr/lib
+ PRED_DIR=/usr/$(get_libdir)/${PN}
+ sed -i -e "s:/usr/lib/${PN}:${EROOT}${PRED_DIR}:g" \
+ predict.h vocalizer/vocalizer.c || die
+
+ sed -i -e "s:/usr/lib:${EROOT}usr/$(get_libdir):g" \
+ clients/gsat-1.1.0/src/globals.h || die
+
+ if use gtk; then
+ cd "${S}"/clients/gsat-* || die
+ rm config.sub missing || die
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ if use gtk; then
+ cd "${S}"/clients/gsat-* || die
+ econf $(use_enable nls)
+ fi
+}
+
+src_compile() {
+ # predict uses a ncurses based configure script
+ # this is what it does if it was bash based ;)
+
+ local COMPILER="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+ einfo "Compiling predict"
+ ${COMPILER} predict.c -lm -lncurses -lpthread \
+ -o predict || die "failed predict"
+ einfo "Compiling predict-g1yyh"
+ ${COMPILER} predict-g1yyh.c -lm -lncurses -lpthread -lmenu \
+ -o predict-g1yyh || die "failed predict-g1yyh"
+ einfo "Compiling vocalizer"
+ ${COMPILER} vocalizer/vocalizer.c \
+ -o vocalizer/vocalizer || die "failed vocalizer"
+ local c
+ for c in fodtrack geosat moontracker; do
+ einfo "Compiling ${c}"
+ cd "${S}"/utils/${c}* || die
+ ${COMPILER} ${c}.c -lm -o ${c} || die "failed ${c}"
+ done
+ einfo "Compiling kep_reload"
+ cd "${S}"/clients/kep_reload
+ ${COMPILER} kep_reload.c \
+ -o kep_reload || die "failed kep_reload"
+
+ if use xplanet; then
+ einfo "Compiling earthtrack"
+ cd "${S}"/clients/earthtrack || die
+ ${COMPILER} earthtrack.c \
+ -lm -o earthtrack || die "failed earthtrack"
+ fi
+
+ if use xforms; then
+ einfo "Compiling map"
+ cd "${S}"/clients/map || die
+ ${COMPILER} map.c map_cb.c map_main.c -lforms -lX11 -lm \
+ -o map || die "Failed compiling map"
+ fi
+
+ if use gtk; then
+ einfo "Compiling gsat"
+ cd "${S}"/clients/gsat-* || die
+ emake
+ emake -C plugins
+ fi
+}
+
+src_install() {
+ dobin predict predict-g1yyh "${FILESDIR}"/predict-update
+ dodoc CHANGES CREDITS HISTORY README NEWS debian/README.Debian
+ doman docs/man/predict.1
+ newman debian/predict-g1yyh.man predict-g1yyh.1
+ insinto ${PRED_DIR}/default
+ doins default/predict.*
+ use doc && dodoc docs/pdf/predict.pdf
+
+ cd "${S}"/vocalizer || die
+ dobin vocalizer
+ dosym ../../../bin/vocalizer ${PRED_DIR}/vocalizer/vocalizer
+ insinto ${PRED_DIR}/vocalizer
+ doins *.wav
+
+ cd "${S}"/clients/kep_reload || die
+ dobin kep_reload
+ newdoc README README.kep_reload
+ doman "${S}"/debian/kep_reload.1
+
+ cd "${S}"/utils/fodtrack-0.1 || die
+ insinto /etc
+ doins fodtrack.conf
+ doman fodtrack.conf.5 fodtrack.8
+ dobin fodtrack
+ newdoc README README.fodtrack
+
+ cd "${S}"/utils/geosat || die
+ dobin geosat
+ newdoc README README.geosa
+ newman "${S}"/debian/geosat.man geosat.1
+
+ cd "${S}"/utils/moontracker || die
+ dobin moontracker
+ newdoc README README.moontracker
+ doman "${S}"/debian/moontracker.1
+
+ if use xplanet; then
+ cd "${S}"/clients/earthtrack || die
+ ln -s earthtrack earthtrack2 || die
+ dobin earthtrack earthtrack2
+ newdoc README README.earthtrack
+ doman "${S}"/debian/earthtrack.1
+ fi
+
+ if use xforms; then
+ cd "${S}"/clients/map || die
+ newbin map predict-map
+ newdoc CHANGES CHANGES.map
+ newdoc README README.map
+ doman "${S}"/debian/predict-map.1
+ fi
+
+ if use gtk; then
+ cd "${S}"/clients/gsat-* || die
+ exeinto /usr/$(get_libdir)/gsat/plugins
+ doexe plugins/radio_{FT736,FT847,ICR10,print,test} plugins/rotor_{print,pictrack}
+ dobin src/gsat
+ doman "${S}"/debian/gsat.1
+ local i
+ for i in AUTHORS ChangeLog NEWS README Plugin_API; do
+ newdoc ${i} ${i}.gsat
+ done
+ fi
+}
+
+pkg_postinst() {
+ einfo "To use the clients the following line will"
+ einfo "have to be inserted into /etc/services"
+ einfo "predict 1210/udp"
+ einfo "The port can be changed to anything"
+ einfo "the name predict is what is needed to work"
+ einfo "after that is set run 'predict -s'"
+ einfo ""
+ einfo "To get list of satellites run 'predict-update'"
+ einfo "before running predict this script will also update"
+ einfo "the list of satellites so they are up to date."
+}
diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
new file mode 100644
index 00000000000..c9690cfad00
--- /dev/null
+++ b/sci-astronomy/pyephem/Manifest
@@ -0,0 +1,3 @@
+DIST pyephem-3.7.5.1.tar.gz 703441 SHA256 f24f8fc23c493fb842b44defc539762351a1d46b85f3d4f5043a002066afb50d SHA512 e26baec13c150350bbb84a28a1572c770642fe9a149a7036b2d6f0a4db8bdefaa7c762c1d24a7bb0607a7ed39684c081a1622ef395fd7590d22d80a3d3e68286 WHIRLPOOL 98cb525e6acc15e479e23bea83b753b1b2859f97338f666e1e2be5f7a0829868abbec8856c3417fd2361f30d488dc038e1e65883b1113e8c022b80e33fd1f75b
+DIST pyephem-3.7.5.2.tar.gz 705497 SHA256 3a0f33defbc1d48d196e62f71fc70e1e36095b7864eff3fb553e36dee3df20a1 SHA512 50ec88ee19072168672113c399e96f348feb5c6a5b4362bdcda7de5d079bb7e594c6858047cee53dd9cba9104e85dff9a44ff8981ab434f4ca162662d2a3bddd WHIRLPOOL f603ad3460d6d6348396d3dd946965b4e7a87594a879549d48ff5ead8431a4723e8ab61f216ad686cd539f09cbcc1b334359188f35f80879484cd19d509fbf82
+DIST pyephem-3.7.5.3.tar.gz 735112 SHA256 cb0d7950d108aa5cbb1eb6e558086e98230de03ee1ede017a71701257b67eceb SHA512 a61b6a19c35c10ee9d4eba72cb0e6b9446076a3943be58dfd5e084bc9ab09dc70f2ee335ba5f0ef9d9d4d34a461bf4b9ddd57dae50d2e8a8f565d411e47f2908 WHIRLPOOL be28698df6214e769d03e74a67b353679a753723420e6a289b347b42c466c11253df9764f9e4e0fdda0424f4b62363b54fa58b520f45d480aae3a5883a84deae
diff --git a/sci-astronomy/pyephem/metadata.xml b/sci-astronomy/pyephem/metadata.xml
new file mode 100644
index 00000000000..e09bb9cc975
--- /dev/null
+++ b/sci-astronomy/pyephem/metadata.xml
@@ -0,0 +1,19 @@
+<?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">
+ PyEphem provides astronomical computations for the Python programming
+ language. Given a date and location on the Earth's surface, it can
+ compute the positions of the Sun and Moon, of the planets and their
+ moons, and of any asteroids, comets, or earth satellites whose orbital
+ elements the user can provide. Additional functions are provided to
+ compute the angular separation between two objects in the sky, to
+ determine the constellation in which an object lies, and to find the
+ times at which an object rises, transits, and sets on a particular
+ day.
+</longdescription>
+<upstream>
+ <remote-id type="pypi">pyephem</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
new file mode 100644
index 00000000000..45b6ebbd634
--- /dev/null
+++ b/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Astronomical routines for the python programming language"
+HOMEPAGE="http://rhodesmill.org/pyephem/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+ doc? ( dev-python/sphinx )"
+RDEPEND=""
+
+src_prepare() {
+ # don't install rst files
+ sed -i -e "s:'doc/\*\.rst',::" setup.py || die
+ distutils-r1_src_prepare
+}
+
+src_compile() {
+ distutils-r1_src_compile
+ if use doc; then
+ PYTHONPATH=. emake -C src/ephem/doc html
+ fi
+}
+
+python_test() {
+ if [[ ${PYTHON_ABI} == "2.7" ]]; then
+ PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
+ ${EPYTHON} -m unittest discover -s src/ephem
+ else
+ PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
+ unit2 discover -s src/ephem
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+ use doc && dohtml -r src/ephem/doc/_build/html/*
+
+ delete_tests() {
+ rm -r "${D}$(python_get_sitedir)/ephem/tests" || die
+ }
+ python_foreach_impl delete_tests
+}
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.2.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.2.ebuild
new file mode 100644
index 00000000000..45b6ebbd634
--- /dev/null
+++ b/sci-astronomy/pyephem/pyephem-3.7.5.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Astronomical routines for the python programming language"
+HOMEPAGE="http://rhodesmill.org/pyephem/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+ doc? ( dev-python/sphinx )"
+RDEPEND=""
+
+src_prepare() {
+ # don't install rst files
+ sed -i -e "s:'doc/\*\.rst',::" setup.py || die
+ distutils-r1_src_prepare
+}
+
+src_compile() {
+ distutils-r1_src_compile
+ if use doc; then
+ PYTHONPATH=. emake -C src/ephem/doc html
+ fi
+}
+
+python_test() {
+ if [[ ${PYTHON_ABI} == "2.7" ]]; then
+ PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
+ ${EPYTHON} -m unittest discover -s src/ephem
+ else
+ PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
+ unit2 discover -s src/ephem
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+ use doc && dohtml -r src/ephem/doc/_build/html/*
+
+ delete_tests() {
+ rm -r "${D}$(python_get_sitedir)/ephem/tests" || die
+ }
+ python_foreach_impl delete_tests
+}
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
new file mode 100644
index 00000000000..212efab81f7
--- /dev/null
+++ b/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
@@ -0,0 +1,55 @@
+# 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="Astronomical routines for the python programming language"
+HOMEPAGE="http://rhodesmill.org/pyephem/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+ doc? ( dev-python/sphinx )"
+RDEPEND=""
+
+src_prepare() {
+ # don't install rst files
+ sed -i -e "s:'doc/\*\.rst',::" setup.py || die
+ distutils-r1_src_prepare
+}
+
+src_compile() {
+ distutils-r1_src_compile
+ if use doc; then
+ PYTHONPATH=. emake -C ephem/doc html
+ fi
+}
+
+python_test() {
+ if [[ ${PYTHON_ABI} == "2.7" ]]; then
+ PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
+ ${EPYTHON} -m unittest discover -s src/ephem
+ else
+ PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" \
+ unit2 discover -s src/ephem
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+ use doc && dohtml -r ephem/doc/_build/html/*
+
+ delete_tests() {
+ rm -r "${D}$(python_get_sitedir)/ephem/tests" || die
+ }
+ python_foreach_impl delete_tests
+}
diff --git a/sci-astronomy/skycat/Manifest b/sci-astronomy/skycat/Manifest
new file mode 100644
index 00000000000..cad6d957909
--- /dev/null
+++ b/sci-astronomy/skycat/Manifest
@@ -0,0 +1 @@
+DIST skycat-3.1.2.tar.gz 3091874 SHA256 559ae26f044601517f8787eadcb93ebda85ebea971f8f961cedefbafb3b9d0ac SHA512 70f7f366c13f0d9914db5be0ed75952a5e97ca2aef18ce5a4aa3e330aeceaaa1ab06c5ada69056659d038b2e558648e1f4033668d4935c6a6c50bce8b766f100 WHIRLPOOL 29408a52256be3cffe06c86d8bc5f1551585f58c27c1c9e77b3f7f0393fd797295028e52410ea4bee4afbd37d2f5a277f3ae56c1c9354ae390a48de508eacded
diff --git a/sci-astronomy/skycat/files/skycat-3.0.2-systemlibs.patch b/sci-astronomy/skycat/files/skycat-3.0.2-systemlibs.patch
new file mode 100644
index 00000000000..669d54a68ed
--- /dev/null
+++ b/sci-astronomy/skycat/files/skycat-3.0.2-systemlibs.patch
@@ -0,0 +1,107 @@
+diff -Naur skycat-3.0.2/astrotcl/configure.in skycat-3.0.2.new/astrotcl/configure.in
+--- skycat-3.0.2/astrotcl/configure.in 2006-01-25 17:21:38.000000000 -0500
++++ skycat-3.0.2.new/astrotcl/configure.in 2009-09-24 20:48:27.000000000 -0400
+@@ -83,10 +83,10 @@
+ #-----------------------------------------------------------------------
+
+ changequote(<<, >>)
+-csources=`cd $srcdir; echo {generic,press,libwcs,cfitsio}/*.[Cc]`
++csources=`cd $srcdir; echo {generic,press}/*.[Cc]`
+ changequote([, ])
+-cheaders=`cd $srcdir; echo {generic,press,libwcs,cfitsio}/*.h`
+-cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I$srcdir/libwcs -I$srcdir/cfitsio"
++cheaders=`cd $srcdir; echo {generic,press}/*.h`
++cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I/usr/include/wcs -I/usr/include/"
+ tclsources=`cd $srcdir; echo library/*.tcl`
+
+ TEA_ADD_SOURCES([${csources}])
+diff -Naur skycat-3.0.2/cat/aclocal.m4 skycat-3.0.2.new/cat/aclocal.m4
+--- skycat-3.0.2/cat/aclocal.m4 2006-01-23 12:24:46.000000000 -0500
++++ skycat-3.0.2.new/cat/aclocal.m4 2009-09-24 20:31:00.000000000 -0400
+@@ -47,11 +47,11 @@
+ changequote([, ])
+
+ cat_headers=`cd $srcdir; echo generic/*.h`
+-astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press,libwcs,cfitsio}/*.h`
++astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press}/*.h`
+ tclutil_headers=`cd $srcdir; echo ../tclutil/generic/*.h`
+
+ cat_includes="-I$srcdir/generic -I$srcdir/bitmaps"
+-astrotcl_includes="-I$srcdir/../astrotcl/generic -I$srcdir/../astrotcl/cfitsio -I$srcdir/../astrotcl/libwcs"
++astrotcl_includes="-I$srcdir/../astrotcl/generic -I/usr/include -I/usr/include/wcs"
+ tclutil_includes="-I$srcdir/../tclutil/generic"
+ cincludes="${cat_includes} ${astrotcl_includes} ${tclutil_includes}"
+
+diff -Naur skycat-3.0.2/cat/configure.in skycat-3.0.2.new/cat/configure.in
+--- skycat-3.0.2/cat/configure.in 2006-02-03 05:29:48.000000000 -0500
++++ skycat-3.0.2.new/cat/configure.in 2009-09-24 20:51:56.000000000 -0400
+@@ -181,6 +181,9 @@
+ # and TEA_LOAD_TCLCONFIG macros above.
+ #--------------------------------------------------------------------
+
++# we need wcstools and cfitsio
++PKG_LIBS="${PKG_LIBS} -lwcstools -lcfitsio"
++
+ TEA_MAKE_LIB
+
+ #--------------------------------------------------------------------
+diff -Naur skycat-3.0.2/rtd/aclocal.m4 skycat-3.0.2.new/rtd/aclocal.m4
+--- skycat-3.0.2/rtd/aclocal.m4 2006-02-01 17:10:36.000000000 -0500
++++ skycat-3.0.2.new/rtd/aclocal.m4 2009-09-24 20:27:46.000000000 -0400
+@@ -50,11 +50,11 @@
+ changequote([, ])
+
+ rtd_headers=`cd $srcdir; echo generic/*.h rtdevt/rtdImageEvent.h rtdevt/rtdSem.h`
+-astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press,libwcs,cfitsio}/*.h`
++astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press}/*.h`
+ tclutil_headers=`cd $srcdir; echo ../tclutil/generic/*.h`
+
+ rtd_includes="-I$srcdir/generic -I$srcdir/rtdevt -I$srcdir/bitmaps"
+-astrotcl_includes="-I$srcdir/../astrotcl/generic -I$srcdir/../astrotcl/cfitsio -I$srcdir/../astrotcl/libwcs"
++astrotcl_includes="-I$srcdir/../astrotcl/generic -I/usr/include -I/usr/include/wcs"
+ tclutil_includes="-I$srcdir/../tclutil/generic"
+ cincludes="${rtd_includes} ${astrotcl_includes} ${tclutil_includes}"
+
+diff -Naur skycat-3.0.2/rtd/configure.in skycat-3.0.2.new/rtd/configure.in
+--- skycat-3.0.2/rtd/configure.in 2006-02-01 17:10:36.000000000 -0500
++++ skycat-3.0.2.new/rtd/configure.in 2009-09-24 20:49:11.000000000 -0400
+@@ -192,7 +192,7 @@
+ #--------------------------------------------------------------------
+
+ # rtd needs -lXext
+-PKG_LIBS="${PKG_LIBS} -lXext"
++PKG_LIBS="${PKG_LIBS} -lXext -lwcstools -lcfitsio"
+
+ TEA_MAKE_LIB
+
+diff -Naur skycat-3.0.2/skycat/aclocal.m4 skycat-3.0.2.new/skycat/aclocal.m4
+--- skycat-3.0.2/skycat/aclocal.m4 2006-01-26 17:47:20.000000000 -0500
++++ skycat-3.0.2.new/skycat/aclocal.m4 2009-09-24 20:33:31.000000000 -0400
+@@ -79,13 +79,13 @@
+ skycat_headers=`cd $srcdir; echo generic/*.h`
+ cat_headers=`cd $srcdir; echo ../cat/generic/*.h`
+ rtd_headers=`cd $srcdir; echo ../rtd/generic/*.h ../rtd/rtdevt/rtdImageEvent.h ../rtd/rtdevt/rtdSem.h`
+-astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press,libwcs,cfitsio}/*.h`
++astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press}/*.h`
+ tclutil_headers=`cd $srcdir; echo ../tclutil/generic/*.h`
+
+ skycat_includes="-I$srcdir/generic -I$srcdir/bitmaps"
+ cat_includes="-I$srcdir/../cat/generic"
+ rtd_includes="-I$srcdir/../rtd/generic -I$srcdir/../rtd/rtdevt"
+-astrotcl_includes="-I$srcdir/../astrotcl/generic -I$srcdir/../astrotcl/cfitsio -I$srcdir/../astrotcl/libwcs"
++astrotcl_includes="-I$srcdir/../astrotcl/generic -I/usr/include -I/usr/include/wcs"
+ tclutil_includes="-I$srcdir/../tclutil/generic"
+ cincludes="${skycat_includes} ${cat_includes} ${rtd_includes} ${astrotcl_includes} ${tclutil_includes}"
+
+diff -Naur skycat-3.0.2/skycat/configure.in skycat-3.0.2.new/skycat/configure.in
+--- skycat-3.0.2/skycat/configure.in 2008-06-11 11:04:25.000000000 -0400
++++ skycat-3.0.2.new/skycat/configure.in 2009-09-24 20:52:26.000000000 -0400
+@@ -182,7 +182,7 @@
+ #--------------------------------------------------------------------
+
+ # skycat needs -lXext
+-PKG_LIBS="${PKG_LIBS} -lXext"
++PKG_LIBS="${PKG_LIBS} -lXext -lwcstools -lcfitsio"
+
+ TEA_MAKE_LIB
+
diff --git a/sci-astronomy/skycat/files/skycat-3.0.2-tk8.5.patch b/sci-astronomy/skycat/files/skycat-3.0.2-tk8.5.patch
new file mode 100644
index 00000000000..2cb325da853
--- /dev/null
+++ b/sci-astronomy/skycat/files/skycat-3.0.2-tk8.5.patch
@@ -0,0 +1,21 @@
+--- skycat-3.0.2.orig/rtd/generic/RtdImage.C 2006-02-02 18:36:47.000000000 +0100
++++ skycat-3.0.2/rtd/generic/RtdImage.C 2009-09-15 09:23:44.505239756 +0200
+@@ -913,6 +913,9 @@
+ updateIdleTasks();
+ }
+
++#ifndef MODULE_SCOPE
++#define MODULE_SCOPE extern
++#endif
+
+ // Fix for Tk clipping coordinates to short range: See CanvasWindowCoordsNoClip() below.
+ #ifdef HAVE_TKCANVAS_H
+--- skycat-3.0.2.orig/skycat/skycat.in 2006-02-04 14:27:30.000000000 +0100
++++ skycat-3.0.2/skycat/skycat.in 2009-09-15 09:20:45.910857133 +0200
+@@ -54,5 +54,5 @@
+
+ test -d $HOME/.skycat || mkdir $HOME/.skycat
+ echo "`date`: Starting skycat with: $0 ${1+"$@"}" > $HOME/.skycat/log
+-exec wish8.4 $SKYCAT_BASE/lib/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1
++exec wish8.5 $SKYCAT_BASE/lib/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1
+
diff --git a/sci-astronomy/skycat/files/skycat-3.1.2-m4.patch b/sci-astronomy/skycat/files/skycat-3.1.2-m4.patch
new file mode 100644
index 00000000000..ff61c99f05c
--- /dev/null
+++ b/sci-astronomy/skycat/files/skycat-3.1.2-m4.patch
@@ -0,0 +1,150 @@
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -731,6 +731,50 @@
+ ])
+
+ #--------------------------------------------------------------------
++# TEA_CONFIG_SYSTEM
++#
++# Determine what the system is (some things cannot be easily checked
++# on a feature-driven basis, alas). This can usually be done via the
++# "uname" command, but there are a few systems, like Next, where
++# this doesn't work.
++#
++# Arguments:
++# none
++#
++# Results:
++# Defines the following var:
++#
++# system - System/platform/version identification code.
++#
++#--------------------------------------------------------------------
++
++AC_DEFUN(TEA_CONFIG_SYSTEM, [
++ AC_MSG_CHECKING([system version])
++ AC_CACHE_VAL(tcl_cv_sys_version,[
++ if test -f /usr/lib/NextStep/software_version; then
++ tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
++ else
++ tcl_cv_sys_version=`uname -s`-`uname -r`
++ if test "$?" -ne 0 ; then
++ AC_MSG_WARN([can't find uname command])
++ tcl_cv_sys_version=unknown
++ else
++ # Special check for weird MP-RAS system (uname returns weird
++ # results, and the version is kept in special file).
++
++ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
++ tcl_cv_sys_version=MP-RAS-`awk '{print $3}' /etc/.relid`
++ fi
++ if test "`uname -s`" = "AIX" ; then
++ tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
++ fi
++ fi
++ fi])
++ AC_MSG_RESULT($tcl_cv_sys_version)
++ system=$tcl_cv_sys_version
++])
++
++#--------------------------------------------------------------------
+ # TEA_CONFIG_CFLAGS
+ #
+ # Try to determine the proper flags to pass to the compiler
+@@ -849,30 +893,7 @@
+ # for the system. This can usually be done via the "uname" command, but
+ # there are a few systems, like Next, where this doesn't work.
+
+- AC_MSG_CHECKING([system version (for dynamic loading)])
+- if test -f /usr/lib/NextStep/software_version; then
+- system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
+- else
+- system=`uname -s`-`uname -r`
+- if test "$?" -ne 0 ; then
+- AC_MSG_RESULT([unknown (can't find uname command)])
+- system=unknown
+- else
+- # Special check for weird MP-RAS system (uname returns weird
+- # results, and the version is kept in special file).
+-
+- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+- fi
+- if test "`uname -s`" = "AIX" ; then
+- system=AIX-`uname -v`.`uname -r`
+- fi
+- if test "${TEA_PLATFORM}" = "windows" ; then
+- system=windows
+- fi
+- AC_MSG_RESULT([$system])
+- fi
+- fi
++ TEA_CONFIG_SYSTEM
+
+ # Step 2: check for existence of -ldl library. This is needed because
+ # Linux can use either -ldl or -ldld for dynamic loading.
+@@ -2318,25 +2339,8 @@
+ AC_DEFUN(TEA_BLOCKING_STYLE, [
+ AC_CHECK_HEADERS(sys/ioctl.h)
+ AC_CHECK_HEADERS(sys/filio.h)
++ TEA_CONFIG_SYSTEM
+ AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O])
+- if test -f /usr/lib/NextStep/software_version; then
+- system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
+- else
+- system=`uname -s`-`uname -r`
+- if test "$?" -ne 0 ; then
+- system=unknown
+- else
+- # Special check for weird MP-RAS system (uname returns weird
+- # results, and the version is kept in special file).
+-
+- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+- fi
+- if test "`uname -s`" = "AIX" ; then
+- system=AIX-`uname -v`.`uname -r`
+- fi
+- fi
+- fi
+ case $system in
+ # There used to be code here to use FIONBIO under AIX. However, it
+ # was reported that FIONBIO doesn't work under AIX 3.2.5. Since
+@@ -3031,13 +3035,13 @@
+ fi
+ if test "${exec_prefix}" = "NONE" -a x"${prefix_default}" = x"yes" \
+ -o x"${exec_prefix_default}" = x"yes" ; then
+- #if test x"${TCL_EXEC_PREFIX}" != x; then
+- #AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}])
+- #exec_prefix=${TCL_EXEC_PREFIX}
+- #else
++ if test x"${TCL_EXEC_PREFIX}" != x; then
++ AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}])
++ exec_prefix=${TCL_EXEC_PREFIX}
++ else
+ AC_MSG_NOTICE([--exec-prefix defaulting to ${prefix}])
+ exec_prefix=$prefix
+- #fi
++ fi
+ fi
+ ])
+
+@@ -3169,7 +3173,7 @@
+ MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)"
+ else
+ MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
+- MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
++ MAKE_SHARED_LIB="\${SHLIB_LD} -Wl,-soname=\[$]@ -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
+ MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
+ fi
+
+@@ -3817,7 +3821,8 @@
+
+ # check in a few common install locations
+ if test x"${ac_cv_c_$1config}" = x ; then
+- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
++ for i in `ls -d ${libdir} 2>/dev/null` \
++ `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ `ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /usr/local/lib 2>/dev/null` \
+ `ls -d /usr/contrib/lib 2>/dev/null` \
diff --git a/sci-astronomy/skycat/files/skycat-3.1.2-makefile-qa.patch b/sci-astronomy/skycat/files/skycat-3.1.2-makefile-qa.patch
new file mode 100644
index 00000000000..e36e1ece665
--- /dev/null
+++ b/sci-astronomy/skycat/files/skycat-3.1.2-makefile-qa.patch
@@ -0,0 +1,132 @@
+--- a/astrotcl/Makefile.in
++++ b/astrotcl/Makefile.in
+@@ -114,7 +114,7 @@
+ RANLIB = @RANLIB@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+-SHLIB_LD = @SHLIB_LD@
++SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
+ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+ STLIB_LD = @STLIB_LD@
+ #TCL_DEFS = @TCL_DEFS@
+--- a/rtd/Makefile.in
++++ b/rtd/Makefile.in
+@@ -123,7 +123,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
+-MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
++MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) $(SHLIB_LD_LIBS)
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+ MAKE_STUB_LIB = @MAKE_STUB_LIB@
+@@ -131,7 +131,7 @@
+ RANLIB = @RANLIB@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+-SHLIB_LD = @SHLIB_LD@
++SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
+ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+ STLIB_LD = @STLIB_LD@
+ #TCL_DEFS = @TCL_DEFS@
+@@ -442,14 +442,14 @@
+ $(AR) r $@ $(RTDEVT_OBJ)
+ $(RANLIB) $@
+
+-$(RTD_SERVER): $(RTD_SERVER_OBJS)
+- $(CXXCOMPILE) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@
++$(RTD_SERVER): $(RTD_SERVER_OBJS) $(RTDEVT_LIB)
++ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@
+
+-rtdClient: rtdClient.o
+- $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@
++rtdClient: rtdClient.o $(RTDEVT_LIB)
++ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $? $(RTDEVT_LIB) @LIBS@
+
+-rtdCubeDisplay: rtdCubeDisplay.o
+- $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@
++rtdCubeDisplay: rtdCubeDisplay.o $(RTDEVT_LIB)
++ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $? $(RTDEVT_LIB) @LIBS@
+
+ #========================================================================
+ # RTD Remote access C library
+@@ -464,14 +464,14 @@
+ #========================================================================
+ test: binaries libraries $(TEST_APPS)
+
+-tImageEvent: tImageEvent.o
+- $(CXXCOMPILE) -o $@ $@.o $(RTDEVT_LIB) @LIBS@
++tImageEvent: tImageEvent.o $(RTDEVT_LIB)
++ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o $(RTDEVT_LIB) @LIBS@
+
+ trtdRemote: trtdRemote.o
+- $(COMPILE) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@
++ $(COMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@
+
+-tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o
+- $(CXXCOMPILE) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \
++tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o $(PKG_LIB_FILE)
++ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \
+ @rtd_BUILD_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ ${LIBS}
+
+ #========================================================================
+--- a/tclutil/Makefile.in
++++ b/tclutil/Makefile.in
+@@ -116,7 +116,7 @@
+ RANLIB = @RANLIB@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+-SHLIB_LD = @SHLIB_LD@
++SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
+ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+ STLIB_LD = @STLIB_LD@
+ #TCL_DEFS = @TCL_DEFS@
+--- a/skycat/Makefile.in
++++ b/skycat/Makefile.in
+@@ -112,7 +112,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
+-MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
++MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) $(SHLIB_LD_LIBS)
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+ MAKE_STUB_LIB = @MAKE_STUB_LIB@
+@@ -120,7 +120,7 @@
+ RANLIB = @RANLIB@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+-SHLIB_LD = @SHLIB_LD@
++SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
+ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+ STLIB_LD = @STLIB_LD@
+ #TCL_DEFS = @TCL_DEFS@
+--- a/cat/Makefile.in
++++ b/cat/Makefile.in
+@@ -116,7 +116,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result *.tmp *.o tests/*.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
+-MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
++MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) $(SHLIB_LD_LIBS)
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+ MAKE_STUB_LIB = @MAKE_STUB_LIB@
+@@ -124,7 +124,7 @@
+ RANLIB = @RANLIB@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+-SHLIB_LD = @SHLIB_LD@
++SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
+ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+ STLIB_LD = @STLIB_LD@
+ #TCL_DEFS = @TCL_DEFS@
+@@ -436,7 +436,7 @@
+ cxxtests: $(CXX_TEST_APPS)
+
+ $(CXX_TEST_APPS): FORCE
+- $(CXXCOMPILE) -o $@ $(srcdir)/tests/$@.C $(TEST_LIBS) $(LIBS)
++ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $(srcdir)/tests/$@.C $(TEST_LIBS) $(LIBS)
+ cp $(srcdir)/tests/test.table .
+ -@@LD_LIBRARY_PATH_VAR@=@exec_prefix@/lib; export @LD_LIBRARY_PATH_VAR@ ;\
+ $@ > $@.result 2>&1 ;\
diff --git a/sci-astronomy/skycat/metadata.xml b/sci-astronomy/skycat/metadata.xml
new file mode 100644
index 00000000000..3dc3286a764
--- /dev/null
+++ b/sci-astronomy/skycat/metadata.xml
@@ -0,0 +1,10 @@
+<?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">
+ SkyCat is a tool that combines visualization of images and access
+ to catalogs and archive data for astronomy. It was developed at
+ the European Southern Observatory.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/skycat/skycat-3.1.2-r1.ebuild b/sci-astronomy/skycat/skycat-3.1.2-r1.ebuild
new file mode 100644
index 00000000000..8f971f9f488
--- /dev/null
+++ b/sci-astronomy/skycat/skycat-3.1.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="ESO astronomical image visualizer with catalog access"
+HOMEPAGE="http://archive.eso.org/skycat"
+SRC_URI="http://archive.eso.org/cms/tools-documentation/skycat-download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="threads"
+
+DEPEND="x11-libs/libXext
+ >=dev-tcltk/tclx-2.4
+ >=dev-tcltk/blt-2.4
+ >=dev-tcltk/itcl-3.3
+ >=dev-tcltk/iwidgets-4.0.1
+ >=dev-tcltk/tkimg-1.3
+ sci-libs/cfitsio
+ sci-astronomy/wcstools"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # fix buggy tcl.m4 for bash3 and add soname
+ epatch "${FILESDIR}"/${P}-m4.patch
+ # need fix for tk-8.5
+ if has_version ">=dev-lang/tk-8.5" ; then
+ epatch "${FILESDIR}"/${PN}-3.0.2-tk8.5.patch
+ fi
+ epatch "${FILESDIR}"/${P}-makefile-qa.patch
+ # use system libs
+ epatch "${FILESDIR}"/${PN}-3.0.2-systemlibs.patch
+ rm -fr astrotcl/{cfitsio,libwcs} \
+ || die "Failed to remove included libs"
+ # prefix it
+ sed -i \
+ -e "s:/usr:${EPREFIX}/usr:g" \
+ */configure.in */aclocal.m4 || die
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -DUSE_INTERP_RESULT # 514604
+ econf $(use_enable threads) --enable-merge
+}
+
+src_install() {
+ default
+ local d
+ for d in tclutil astrotcl rtd cat skycat; do
+ for f in README CHANGES VERSION; do
+ newdoc ${f} ${f}.${d}
+ done
+ done
+}
diff --git a/sci-astronomy/skychart/Manifest b/sci-astronomy/skychart/Manifest
new file mode 100644
index 00000000000..cd4889e40bf
--- /dev/null
+++ b/sci-astronomy/skychart/Manifest
@@ -0,0 +1,14 @@
+DIST catalog_gcm.tgz 4088 SHA256 6a71a6d424b4718eaa700009e5ea904117b93807a0d50d0e495ca11373948af7 SHA512 957e87b81a23b64b5e40a6f3a55908637e86b01bba0fc36c9dd293966a9870faf7de22d548b324bf9a6c15641cd09d10f76a7200b52eab48fa4c7836115518ce WHIRLPOOL 51c66ce8c027892cdc317fd74ec99178086ae430aca657fe38bda4403866c11b39cbf2fff90bba44494e34944178c015b1c337d7d376b5290ed2486286175ff5
+DIST catalog_gcvs.tgz 1152229 SHA256 3d7319422a051e6bc1a87b524191a0f36f8ae344a2a3e01e35db3345733b7dd2 SHA512 3ef3b2ee296e967c0465731b80784a06c955820d64055fd3bd499afb8b0baf01f3a7e5eb0a2c33ec8c9c7fdb81bf4d260166f92c9c4478a781cc9c5376523915 WHIRLPOOL 4fbe29a0e3cd3cb46fe82191627c990935ac22b0d3abf0f8614ce6033828ff97c0fc427dd6a458c473371d67ec55212a23ed99822542cd4fdccc299bec6b89c4
+DIST catalog_gpn.tgz 32123 SHA256 e9f7ec688ba2213d381361d3459694933db21801e54463bc0cdb42a5d51ca0d9 SHA512 71a38e07d01f250e8fc208220e858704eaa065b8638b99ba3932e23d2e17763b0a8c06cd930b466de5909497a56d9e0dbabae59d5ac2a177c60fcb4a8efcfa03 WHIRLPOOL e86cc4470132b5dc405ec27a82d01f878b39dc6ca47f496fb024f0bd865cdbb6dd878f6375bf377296f063deb14a7280191c11610b7bf0f009ac2215c0a85a57
+DIST catalog_idx.tgz 19005851 SHA256 fcf3475da1469e060d6126f14adad230d77c8829730477569f50ce0ddc7b96cc SHA512 3b144993de14b73edaffd43a35b8404adb166c5b4edc223dd78e8db361ca9a61da2e9c3d29a0af97960c1cdcb94b307ce0824f1fda3b74b518f611666d1e362e WHIRLPOOL d9f24c9ca85ba4e0412518391928b17ab3c69221de62a4a619d53b2c101d2c0b1c14126ce1837d5783eab44c96d4d4e58a94ad0244d4f109346d0571b50d8add
+DIST catalog_lbn.tgz 21272 SHA256 4f3c944dd18a814a48720d064362eb4065153acef3a90c3750e365b89cec7e75 SHA512 bddc2cf48c2e575440ed114bb447187e2f30c87312a552ff63d40e88a08e05c31da1d45cb96a5bb0216093a07e4d16336a0a664a66d6e586221217ae45d803da WHIRLPOOL f39f2759d1b47f3dd6ffd3949504ff17ad962d1d3abecefa92b72dd0332369cec7e5068cb287fd22e87e26a015cfa8dfe4522a899433681dc45e64297b43cf5b
+DIST catalog_ngc.tgz 264663 SHA256 ec6fb47415b1a43ea3b75f0dbf837efeb2fc105ea1415dc39f91b1b670bb35ca SHA512 444a3bb6ed9ed7c510ab4e593601d0b9a4b1a35b70fb43738db16e536f92f8b9a64bb238f29f685665f60b857f74c0745c4777c2f7b0be9bca0e9746e7275610 WHIRLPOOL affe66f02252af0c39c37cf7268bbc0eb83437d2b233870d5bffe70d1db7d4c75353e6eaf14bc98a647062ecc3e3975e8e72d6539759c9f50e286e72b391b8e5
+DIST catalog_ocl.tgz 24031 SHA256 1123be350a193a7b3209625ef1cb56868884af4f594e89150819743ddc9610f7 SHA512 7d94a7b9981fef9f02609f10195f181c27ca7b8d6af0b12749b13e0e86cf09e4a2ff3d915e5618940e9d8b2ab4a4198b59cd05302322a5862f53535449f343e7 WHIRLPOOL ca43db7dc73d983cb4fdcf27230d5a752c6cd3e354c1c94883d1079b2857a098d2d6361bf1b9fabc10050cc97d1fcd689febbc33fdd79ab784dbfc44b5a58a66
+DIST catalog_pgc.tgz 77747054 SHA256 9336f8f45fc2a5b038d7b6f7427e1d6ed745abce08983904027180be078bb96b SHA512 10afdf72e6503c82b4b2376a5fdf7993b3074fc731d006d8515cfe84b1a2eb69f12dc9b5f6b43e0b92654fb4a62c3d80d820f3d2e545df97c54fd250b7005b95 WHIRLPOOL 7c93a581b71262e0e024fffa9ebb04c7a7c200410d42839d1d7a5f5be68cfa27a56e81e4d34c3ac7fc046d09d543a9614f033ce34e187e653c02fe707485b401
+DIST catalog_tycho2.tgz 43237839 SHA256 1591660c87eeec7ea3f34c24727c9a2958aa1493cb877d4c89c6101f60c0550e SHA512 722b542f09752353eab621fdd6559a9e28a9558500f550e63ed10111c29b578a49356bd6d548c4b9b4355e3b3bd5d46f311de71946689fcb949e85c3948d7b67 WHIRLPOOL 72fb06d745fed884be00bc4f0873611fb416424e474efd7424131133400442731a7ff3abba9c29e9b5d3d1463b6ff3a05b62767ef3a23b8ab42f1811f83d1582
+DIST catalog_wds.tgz 3659028 SHA256 b8d57f5ca4dd778c8396ea31919c2978f28aa3e42826139e50058747b4735531 SHA512 3021f2e528ede7dc43744710b9b6c1188120cd2d5e8731641dcc2aed68f83ee4b8f0c8ece743befd3e35a2e771e3931ceead1da34dadae4dc3948f59a6e96f7f WHIRLPOOL 6ffcebffdb1042965ef5f86b89ce17d3ec03229ca803243c14ebfaa664e94c9e466243afd5601bbb225adb298a7ee1b87aeafe65b684c38416fb4a8b2ba1fd71
+DIST data_jpleph.tgz 4576073 SHA256 cf375015f32cff79243699df023d9838e2599c59f477322dedf0c4da25831eb1 SHA512 06cd3c740c29cdb62b874de4afbbcb481ef757016dc828244f601382500400eac0af7b2f14086de327e12ec03b284b42c6bc5a2d98d8e678cd6b81f624bcb4bd WHIRLPOOL cb7d4363171d742812bc16ed3433d85bc3a235b78f00882a977882817089996255be2d8c69392c6cfa209eca96c3cef672b50ad576d1e05aa7450d8666db0aa2
+DIST pictures_sac.tgz 38540724 SHA256 0257083278cad3e7fd28651f329af136149a65e3c655dcd0923ec691c470de44 SHA512 c477f8458505675be94a890caae0799223f667fb9cef9d27e7b03761659cb2951006c9514884e39d6af307886264c03fd0aac11951c38a72ef7dac2ed3388af6 WHIRLPOOL 707826c8c8ed8fef55441946b326543f1ff581b17bfaefce418a60fa4ad0a9ee5f3c600fccb1f1ca179c436d544821d156831baf5839173a9de3b4fe38c588df
+DIST skychart-3.10-2854-src.tar.xz 41878300 SHA256 0554e2b875531db6df96c3dc9c7d5dc9fa8b1937df002cd3e8a9bb20f795976b SHA512 898a32c86a6f8ebf8d28e9cd0eb68c9f7f32d717bc54a4e91e3e5468291544ee2c9b1355c19ec13d89e09a83543ebd159d4b5ec4db732c4105eab3bb1c218116 WHIRLPOOL b30efa210fd65290c30547cd0d7badcd45ef3b07fb2f1bacf570eaf01a910739b2bf32d033a1d6ceaad9593884e20bb7a7547eea7705f3b7975e869186c544f6
+DIST skychart-3.8-2450-src.tar.bz2 57002014 SHA256 61efa6f65cf81ea5ebdc35cb84e2be4b559202b0f3ff8b6a266eb0f2022527e5 SHA512 7d3275b8af6a3bcf4bec53dec5faa33fe4866eac8b55c63c68a8883764840ad373d23a2f86b68ec12d0c7e540d7e07dce0072fa713b6519b3fe3ed9dfb431461 WHIRLPOOL bdaa978e62781d3a4170559d07ff663c9f9c3f4eebe83d57bc5df98f3e554a0dd1b071f58ad21a3d64c188ea0808ac28b79a13f21a0bf27766fb3ac2c8467aa0
diff --git a/sci-astronomy/skychart/files/skychart-3.10.2854-QA.patch b/sci-astronomy/skychart/files/skychart-3.10.2854-QA.patch
new file mode 100644
index 00000000000..085f04eaaa1
--- /dev/null
+++ b/sci-astronomy/skychart/files/skychart-3.10.2854-QA.patch
@@ -0,0 +1,99 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Apr 21 16:14:18 UTC 2013
+Subject:
+
+--- skychart-3.8-2450-src/skychart/library/getdss/Makefile
++++ skychart-3.8-2450-src/skychart/library/getdss/Makefile
+@@ -1,24 +1,24 @@
+ CPPFLAGS=-I. -O3 -fPIC $(arch_flags)
+ #### For Suns and similar wrong-endian computers, add -DWRONG_WAY_BYTE_ORDER.
+-CC = gcc
++CC ?= gcc
+ OSTYPE = $(shell uname)
+ ifneq ($(findstring Darwin,$(OSTYPE)),)
+ SO_Name = libgetdss.dylib
+-LDFLAGS= -Wl,-single_module -dynamiclib -lc -lm -lstdc++
++LDFLAGS += -Wl,-single_module -dynamiclib -lc -lm -lstdc++
+ else
+ SO_Name = libgetdss.so
+-LDFLAGS= -shared -Wl,-soname,$(SO_Name) $(arch_flags)
++LDFLAGS += -shared -Wl,-soname,$(SO_Name) $(arch_flags)
+ endif
+
+ OBJS = getdss_lib.o dss.o extr_fit.o getpiece.o \
+ hdcmprss.o bitinput.o decode.o dodecode.o hinv.o \
+ platelst.o qtreedec.o
+-LIBS = -lm -lstdc++
++LIBS += -lm -lstdc++
+
+ all: $(SO_Name)
+
+ $(SO_Name): $(OBJS)
+- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+ clean:
+ rm -f $(OBJS) $(SO_Name)
+--- skychart-3.8-2450-src/skychart/library/plan404/Makefile
++++ skychart-3.8-2450-src/skychart/library/plan404/Makefile
+@@ -1,7 +1,7 @@
+ # Common flags
+-CC = gcc
++CC ?= gcc
+ #CFLAGS = -O3 -ffast-math (fast-math removed for better compatibility )
+-CFLAGS = -O3 -fPIC $(arch_flags)
++CFLAGS += -fPIC $(arch_flags)
+ OSTYPE = $(shell uname)
+ ifneq ($(findstring Darwin,$(OSTYPE)),)
+ SO_Name = libplan404.dylib
+@@ -35,7 +35,7 @@
+ $(CC) $(CFLAGS) -c $< -o $@
+
+ $(SO_Name): $(OBJ)
+- $(CC) $(CFLAGS) $(LIBFLAGS) -o $@ $(OBJ)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -o $@ $(OBJ)
+
+ clean:
+ rm -f $(OBJ) $(SO_Name)
+--- skychart-3.8-2450-src/skychart/library/wcs/Makefile
++++ skychart-3.8-2450-src/skychart/library/wcs/Makefile
+@@ -1,5 +1,5 @@
+-CFLAGS= -w -fPIC $(arch_flags)
+-CC= gcc
++CFLAGS += -w -fPIC $(arch_flags)
++CC ?= gcc
+
+ OSTYPE = $(shell uname)
+ ifneq ($(findstring Darwin,$(OSTYPE)),)
+@@ -29,7 +29,7 @@
+ all: $(SO_Name)
+
+ $(SO_Name): $(OBJS)
+- $(CC) $(CFLAGS) $(LIBFLAGS) -o $@ $(OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -o $@ $(OBJS)
+
+ cdcwcs.o: fitsfile.h wcs.h
+ actread.o: fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h
+--- skychart-3.8-2450-src/skychart/library/Makefile.in
++++ skychart-3.8-2450-src/skychart/library/Makefile.in
+@@ -24,14 +24,14 @@
+ $(MAKE) -C wcs -f Makefile.win64 all
+ else
+ ifeq ($(CPU_TARGET),i386)
+- $(MAKE) -C getdss all arch_flags=-m32
+- $(MAKE) -C plan404 all arch_flags=-m32
+- $(MAKE) -C wcs all arch_flags=-m32
++ $(MAKE) -C getdss all
++ $(MAKE) -C plan404 all
++ $(MAKE) -C wcs all
+ else
+ ifeq ($(CPU_TARGET),x86_64)
+- $(MAKE) -C getdss all arch_flags=-m64
+- $(MAKE) -C plan404 all arch_flags=-m64
+- $(MAKE) -C wcs all arch_flags=-m64
++ $(MAKE) -C getdss all
++ $(MAKE) -C plan404 all
++ $(MAKE) -C wcs all
+ else
+ $(MAKE) -C getdss all
+ $(MAKE) -C plan404 all
diff --git a/sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch b/sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch
new file mode 100644
index 00000000000..10d116a7f00
--- /dev/null
+++ b/sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch
@@ -0,0 +1,107 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Apr 21 16:14:18 UTC 2013
+Subject: build system
+
+respect CFLAGS, LDFLAGS and don't do other silly stuff
+
+--- skychart-3.8-2450-src/skychart/library/getdss/Makefile
++++ skychart-3.8-2450-src/skychart/library/getdss/Makefile
+@@ -1,21 +1,21 @@
+ CPPFLAGS=-I. -DUNIX -D_CONSOLE -fPIC $(arch_flags)
+ #### For Suns and similar wrong-endian computers, add -DWRONG_WAY_BYTE_ORDER.
+-CC = gcc
++CC ?= gcc
+ OSTYPE = $(shell uname)
+ ifneq ($(findstring Darwin,$(OSTYPE)),)
+ SO_Name = libgetdss.dylib
+-LDFLAGS= -Wl,-single_module -dynamiclib -lc -lm -lstdc++
++LDFLAGS += -Wl,-single_module -dynamiclib -lc -lm -lstdc++
+ else
+ SO_Name = libgetdss.so
+-LDFLAGS= -shared -Wl,-soname,$(SO_Name) $(arch_flags)
++LDFLAGS += -shared -Wl,-soname,$(SO_Name) $(arch_flags)
+ endif
+ ifneq ($(findstring W32,$(OSTYPE)),)
+ SO_Name = libgetdss.dll
+-LDFLAGS= -shared -Wl,-soname,$(SO_Name)
++LDFLAGS += -shared -Wl,-soname,$(SO_Name)
+ endif
+ ifneq ($(findstring MINGW,$(OSTYPE)),)
+ SO_Name = libgetdss.dll
+-LDFLAGS= -shared -Wl,-soname,$(SO_Name)
++LDFLAGS += -shared -Wl,-soname,$(SO_Name)
+ endif
+ OBJS = getdss_lib.o dss.o extr_fit.o getpiece.o \
+ hdcmprss.o bitinput.o decode.o dodecode.o hinv.o \
+@@ -25,7 +25,7 @@
+ all: $(SO_Name)
+
+ $(SO_Name): $(OBJS)
+- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+ clean:
+ rm -f $(OBJS) $(SO_Name)
+--- skychart-3.8-2450-src/skychart/library/plan404/Makefile
++++ skychart-3.8-2450-src/skychart/library/plan404/Makefile
+@@ -1,7 +1,7 @@
+ # Common flags
+-CC = gcc
++CC ?= gcc
+ #CFLAGS = -O3 -ffast-math (fast-math removed for better compatibility )
+-CFLAGS = -O3 -fPIC $(arch_flags)
++CFLAGS += -fPIC $(arch_flags)
+ OSTYPE = $(shell uname)
+ ifneq ($(findstring Darwin,$(OSTYPE)),)
+ SO_Name = libplan404.dylib
+@@ -35,7 +35,7 @@
+ $(CC) $(CFLAGS) -c $< -o $@
+
+ $(SO_Name): $(OBJ)
+- $(CC) $(CFLAGS) $(LIBFLAGS) -o $@ $(OBJ)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -o $@ $(OBJ)
+
+ clean:
+ rm -f $(OBJ) $(SO_Name)
+--- skychart-3.8-2450-src/skychart/library/wcs/Makefile
++++ skychart-3.8-2450-src/skychart/library/wcs/Makefile
+@@ -1,5 +1,5 @@
+-CFLAGS= -g -w -fPIC $(arch_flags)
+-CC= gcc
++CFLAGS += -w -fPIC $(arch_flags)
++CC ?= gcc
+
+ OSTYPE = $(shell uname)
+ ifneq ($(findstring Darwin,$(OSTYPE)),)
+@@ -29,7 +29,7 @@
+ all: $(SO_Name)
+
+ $(SO_Name): $(OBJS)
+- $(CC) $(CFLAGS) $(LIBFLAGS) -o $@ $(OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -o $@ $(OBJS)
+
+ cdcwcs.o: fitsfile.h wcs.h
+ actread.o: fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h
+--- skychart-3.8-2450-src/skychart/library/Makefile.in
++++ skychart-3.8-2450-src/skychart/library/Makefile.in
+@@ -23,14 +23,14 @@
+ $(MAKE) -C wcs -f Makefile.win64 all
+ else
+ ifeq ($(CPU_TARGET),i386)
+- $(MAKE) -C getdss all arch_flags=-m32
+- $(MAKE) -C plan404 all arch_flags=-m32
+- $(MAKE) -C wcs all arch_flags=-m32
++ $(MAKE) -C getdss all
++ $(MAKE) -C plan404 all
++ $(MAKE) -C wcs all
+ else
+ ifeq ($(CPU_TARGET),x86_64)
+- $(MAKE) -C getdss all arch_flags=-m64
+- $(MAKE) -C plan404 all arch_flags=-m64
+- $(MAKE) -C wcs all arch_flags=-m64
++ $(MAKE) -C getdss all
++ $(MAKE) -C plan404 all
++ $(MAKE) -C wcs all
+ else
+ $(MAKE) -C getdss all
+ $(MAKE) -C plan404 all
diff --git a/sci-astronomy/skychart/metadata.xml b/sci-astronomy/skychart/metadata.xml
new file mode 100644
index 00000000000..19d4dc64196
--- /dev/null
+++ b/sci-astronomy/skychart/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">skychart</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-astronomy/skychart/skychart-3.10.2854.ebuild b/sci-astronomy/skychart/skychart-3.10.2854.ebuild
new file mode 100644
index 00000000000..c1a6369eacd
--- /dev/null
+++ b/sci-astronomy/skychart/skychart-3.10.2854.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs gnome2-utils eutils
+
+DESCRIPTION="Planetarium for amauter astronomers"
+HOMEPAGE="http://www.ap-i.net/skychart/"
+
+MY_PV=${PV:0:4}-${PV:5:4}
+DATA_PKG="data_jpleph.tgz
+ catalog_gcvs.tgz
+ catalog_idx.tgz
+ catalog_tycho2.tgz
+ catalog_wds.tgz
+ catalog_gcm.tgz
+ catalog_gpn.tgz
+ catalog_lbn.tgz
+ catalog_ngc.tgz
+ catalog_ocl.tgz
+ catalog_pgc.tgz
+ pictures_sac.tgz"
+SRC_URI="${DATA_SRC_URI}
+ mirror://sourceforge/skychart/1-software/version_${PV:0:4}/skychart-${MY_PV}-src.tar.xz"
+for i in ${DATA_PKG} ; do
+ SRC_URI="${SRC_URI} mirror://sourceforge/skychart/4-source_data/${i}"
+done
+unset i
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# pascal
+QA_FLAGS_IGNORED="usr/bin/cdcicon
+ usr/bin/skychart
+ usr/bin/varobs
+ usr/bin/varobs_lpv_bulletin"
+
+CDEPEND="x11-libs/gtk+:2
+ x11-libs/libX11"
+RDEPEND="${CDEPEND}
+ x11-misc/xplanet"
+DEPEND="${CDEPEND}
+ >=dev-lang/lazarus-1.0.4
+ >=dev-lang/fpc-2.6.0"
+
+S=${WORKDIR}/${PN}-${MY_PV}-src
+
+src_unpack() {
+ unpack skychart-${MY_PV}-src.tar.xz
+
+ local i
+ for i in ${DATA_PKG} ; do
+ mkdir ${i} || die
+ cd ${i} || die
+ unpack ${i}
+ cd ..
+ done
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-QA.patch
+}
+
+src_configure() {
+ tc-export CC CXX
+
+ ./configure \
+ fpcbin="/usr/bin" \
+ fpc="/usr/lib/fpc/$(fpc -iV)/source" \
+ lazarus="/usr/share/lazarus" \
+ prefix="/usr"
+}
+
+src_compile() {
+ # this is ugly, but the build system sux, so don't bother me
+ UNITDIR="/usr/share/lazarus/components/printers:/usr/share/lazarus/components/printers/unix" \
+ INCDIR="/usr/share/lazarus/components/printers/unix:/usr/share/lazarus/components/printers" \
+ emake -j1
+}
+
+src_install() {
+ # use build system install rules on version bump
+ # to check for new files
+ dobin varobs/{varobs,varobs_lpv_bulletin}
+ dobin skychart/cdcicon
+ newbin skychart/cdc skychart
+
+ dolib.so skychart/library/plan404/libplan404.so
+ dolib.so skychart/library/getdss/libgetdss.so
+ dolib.so skychart/library/wcs/libcdcwcs.so
+
+ insinto /usr/share
+ doins -r system_integration/Linux/share/{applications,appdata,icons,pixmaps}
+
+ dodoc system_integration/Linux/share/doc/skychart/changelog
+
+ insinto /usr/share/skychart
+ doins -r tools/{cat,data}
+ for i in ${DATA_PKG} ; do
+ cd "${WORKDIR}/${i}" || die
+ doins -r .
+ done
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-astronomy/skychart/skychart-3.8.2450.ebuild b/sci-astronomy/skychart/skychart-3.8.2450.ebuild
new file mode 100644
index 00000000000..5414f8c5166
--- /dev/null
+++ b/sci-astronomy/skychart/skychart-3.8.2450.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs gnome2-utils eutils
+
+DESCRIPTION="Planetarium for amauter astronomers"
+HOMEPAGE="http://www.ap-i.net/skychart/"
+
+MY_PV=${PV:0:3}-${PV:4:4}
+DATA_PKG="data_jpleph.tgz
+ catalog_gcvs.tgz
+ catalog_idx.tgz
+ catalog_tycho2.tgz
+ catalog_wds.tgz
+ catalog_gcm.tgz
+ catalog_gpn.tgz
+ catalog_lbn.tgz
+ catalog_ngc.tgz
+ catalog_ocl.tgz
+ catalog_pgc.tgz
+ pictures_sac.tgz"
+SRC_URI="${DATA_SRC_URI}
+ mirror://sourceforge/skychart/1-%20cdc-skychart/version_${PV:0:3}/skychart-${MY_PV}-src.tar.bz2"
+for i in ${DATA_PKG} ; do
+ SRC_URI="${SRC_URI} mirror://sourceforge/skychart/4-source_data/${i}"
+done
+unset i
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+# pascal
+QA_FLAGS_IGNORED="usr/bin/cdcicon
+ usr/bin/skychart
+ usr/bin/varobs
+ usr/bin/varobs_lpv_bulletin"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ >=dev-lang/lazarus-1.0.4
+ >=dev-lang/fpc-2.6.0"
+
+S=${WORKDIR}/${PN}-${MY_PV}-src
+
+src_unpack() {
+ unpack skychart-${MY_PV}-src.tar.bz2
+
+ local i
+ for i in ${DATA_PKG} ; do
+ mkdir ${i} || die
+ cd ${i} || die
+ unpack ${i}
+ cd ..
+ done
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-QA.patch
+}
+
+src_configure() {
+ tc-export CC CXX
+
+ ./configure \
+ fpcbin="/usr/bin" \
+ fpc="/usr/lib/fpc/$(fpc -iV)/source" \
+ lazarus="/usr/share/lazarus" \
+ prefix="/usr"
+}
+
+src_compile() {
+ # this is ugly, but the build system sux, so don't bother me
+ UNITDIR="/usr/share/lazarus/components/printers:/usr/share/lazarus/components/printers/unix" \
+ INCDIR="/usr/share/lazarus/components/printers/unix:/usr/share/lazarus/components/printers" \
+ emake -j1
+}
+
+src_install() {
+ # use build system install rules on version bump
+ # to check for new files
+ dobin varobs/{varobs,varobs_lpv_bulletin}
+ dobin skychart/cdcicon
+ newbin skychart/cdc skychart
+
+ dolib.so skychart/library/plan404/libplan404.so
+ dolib.so skychart/library/getdss/libgetdss.so
+ dolib.so skychart/library/wcs/libcdcwcs.so
+
+ insinto /usr/share
+ doins -r system_integration/Linux/share/{applications,icons,pixmaps}
+
+ dodoc system_integration/Linux/share/doc/skychart/*
+
+ insinto /usr/share/skychart
+ doins -r tools/{cat,data}
+ for i in ${DATA_PKG} ; do
+ cd "${WORKDIR}/${i}" || die
+ doins -r .
+ done
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest
new file mode 100644
index 00000000000..cead38fc4fe
--- /dev/null
+++ b/sci-astronomy/sofa_c/Manifest
@@ -0,0 +1 @@
+DIST sofa_c-20120301_a.tar.gz 1267551 SHA256 3534538b4abda067ef07f1aaef869f3b72ddc7f246447558b708d2968e63e66f SHA512 00da8e834e790922200c25b55cba3b48e49770cbada2271e4b7720f5170a422c9a47e6ebd1c51787256e88aaa656c347f21add14fbc353a9346d395ea3eda2c2 WHIRLPOOL d4f13d08b6ff1f67c808ba09858cd0f77664031ea466b71fc65f48f09bd216cd384db7660b574385d1c65ddcbdd5f894a2631335be557ffb29f1b8703d517a46
diff --git a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch
new file mode 100644
index 00000000000..b992d401d3f
--- /dev/null
+++ b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch
@@ -0,0 +1,113 @@
+--- makefile.orig 2013-05-22 20:51:58.398491342 +0000
++++ makefile 2013-05-22 21:05:52.055466710 +0000
+@@ -49,7 +49,7 @@
+
+ # Specify the installation home directory.
+
+-INSTALL_DIR = $(HOME)
++INSTALL_DIR = $(DESTDIR)/usr
+
+ # Specify the installation directory for the library.
+
+@@ -63,9 +63,10 @@
+ # of your preferred C compiler (CCOMPC) and compilation flags (CFLAGF
+ # for functions, CFLAGX for executables) here.
+
+-CCOMPC = gcc
+-CFLAGF = -c -pedantic -Wall -W -O
+-CFLAGX = -pedantic -Wall -W -O
++CCOMPC = $(CC)
++CFLAGF = -c -pedantic -Wall -W -fPIC $(CFLAGS)
++CFLAGX = -pedantic -Wall -W $(CFLAGS)
++
+
+ #----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
+
+@@ -80,6 +81,12 @@
+ SOFA_LIB_NAME = libsofa_c.a
+ SOFA_LIB = $(SOFA_LIB_DIR)$(SOFA_LIB_NAME)
+
++
++# Name the SOFA/C library in its source and target locations.
++
++SOFA_SHLIB_NAME = libsofa_c.so
++SOFA_SHLIB = $(SOFA_LIB_DIR)$(SOFA_SHLIB_NAME)
++
+ # Name the SOFA/C testbed in its source and target locations.
+
+ SOFA_TEST_NAME = t_sofa_c.c
+@@ -88,7 +95,7 @@
+ # Name the SOFA/C includes in their source and target locations.
+
+ SOFA_INC_NAMES = sofa.h sofam.h
+-SOFA_INC = $(SOFA_INC_DIR)sofa.h $(SOFA_INC_DIR)sofam.h
++SOFA_INC = $(SOFA_INC_NAMES:%=$(SOFA_INC_DIR)%)
+
+ # The list of SOFA/C library object files.
+ SOFA_OBS = iauA2af.o \
+@@ -285,29 +292,32 @@
+ #-----------------------------------------------------------------------
+
+ # Build (but do not install) the library.
+-all : $(SOFA_LIB_NAME)
++all : $(SOFA_SHLIB_NAME)
+ -@ echo ""
+ -@ echo "*** Now type 'make test'" \
+ " to install the library and run tests ***"
+ -@ echo ""
+
+ # Install the library and header files.
+-install $(SOFA_LIB) : $(INSTALL_DIRS) $(SOFA_LIB_NAME) $(SOFA_INC)
+- cp $(SOFA_LIB_NAME) $(SOFA_LIB_DIR)
++install: $(INSTALL_DIRS) $(SOFA_SHLIB_NAME) $(SOFA_INC)
++ cp $(SOFA_SHLIB_NAME).0.0 $(SOFA_LIB_DIR)
++ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB).0
++ ln -s $(SOFA_SHLIB_NAME).0 $(SOFA_SHLIB)
+
+ # Deinstall the library and header files.
+ deinstall:
+- rm -f $(SOFA_LIB) $(SOFA_INC)
++ rm -f $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC)
+
+ # Test the build.
+ check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME)
+- $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_LIB_NAME) \
++ $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \
+ -lm -o $(SOFA_TEST)
+- ./$(SOFA_TEST)
+- rm -f $(SOFA_TEST)
++ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB_NAME).0
++ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." ./$(SOFA_TEST)
++ rm -f $(SOFA_TEST) $(SOFA_SHLIB_NAME).0
+
+ # Test the installed library.
+-installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
++installcheck: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
+ $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \
+ -L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST)
+ ./$(SOFA_TEST)
+@@ -315,11 +325,11 @@
+
+ # Local clean up.
+ clean realclean:
+- rm -f $(SOFA_OBS) $(SOFA_LIB_NAME)
++ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)
+
+ # Clean up and deinstall.
+ distclean:
+- rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB)
++ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB) $(SOFA_SHLIB_NAME)
+
+ # Create the installation directories if not already present.
+ $(INSTALL_DIRS):
+@@ -329,6 +339,10 @@
+ $(SOFA_LIB_NAME): $(SOFA_OBS)
+ ar ru $(SOFA_LIB_NAME) $?
+
++$(SOFA_SHLIB_NAME): $(SOFA_OBS)
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 -lm -o $(SOFA_SHLIB_NAME).0.0 $?
++
++
+ # Install the header files.
+ $(SOFA_INC) : $(INSTALL_DIRS) $(SOFA_INC_NAMES)
+ cp $(SOFA_INC_NAMES) $(SOFA_INC_DIR)
diff --git a/sci-astronomy/sofa_c/metadata.xml b/sci-astronomy/sofa_c/metadata.xml
new file mode 100644
index 00000000000..17260472bb9
--- /dev/null
+++ b/sci-astronomy/sofa_c/metadata.xml
@@ -0,0 +1,23 @@
+<?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">
+ This is a suite of vector/matrix routines and various utilities that
+ underpin the astronomy algorithms, which include routines for the
+ following:
+ * Calendars
+ * Time Scales
+ * Earth rotation and sidereal time
+ * Ephemerides (medium precision)
+ * Geocentric/geodetic transformations
+ * Precession, nutation, polar motion
+ * Star space motion
+ * Star catalogue conversion
+ This is the ANSI C version of the library.
+ The International Astronomical Union's SOFA service has the task of
+ establishing and maintaining an accessible and authoritative set of
+ algorithms and procedures that implement standard models used in
+ fundamental astronomy.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild b/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild
new file mode 100644
index 00000000000..55d0acfd522
--- /dev/null
+++ b/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+YYYY=${PV:0:4}
+MMDD=${PV:4:4}
+MYPV=${YYYY}${MMDD}_${PV:8:1}
+
+DESCRIPTION="Library for algorithms for models in fundamental astronomy"
+HOMEPAGE=" http://www.iausofa.org/current_C.html"
+SRC_URI="http://www.iausofa.org/${YYYY}_${MMDD}_C/${PN}-${MYPV}.tar.gz"
+
+LICENSE="SOFA"
+SLOT=0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/sofa/${MYPV}/c/src"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-makefile.patch
+ sed -i -e "s:/lib:/$(get_libdir):" makefile || die
+ replace-flags -O? -O1
+}
+
+src_install() {
+ emake DESTDIR="${ED}" -j1 install
+ cd ..
+ dodoc 00READ.ME
+ use doc && dodoc doc/*.lis doc/*.pdf
+}
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
new file mode 100644
index 00000000000..b652c10ac59
--- /dev/null
+++ b/sci-astronomy/stellarium/Manifest
@@ -0,0 +1,7 @@
+DIST stars_4_1v0_0.cat 17275482 SHA256 e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7 SHA512 442fb8fa0d9a82401056a313ae2e229bb68057f3f0fd5557e966d645de1ac438c357e2b68f3deeb17ffdea78fb61ce004ab264204f42ebb19c2a00af900db217 WHIRLPOOL d19564d27fb9ac1c5c9e27eb61775c1dddb9382b1d8ea4d863aece2b88eb16fffb7863859cf589c5501fa0d1434b0b95dd41fb68f747b05f21cadf2a49927868
+DIST stars_5_2v0_0.cat 46096018 SHA256 d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931 SHA512 f1eb3f6ecee9da050177ad35d98104ba265d74c5d7017c7db35e25517a31fdc29c54355a1f93126a27e7210c24552c86cd95b599c9d1600c5aca7bb468005d94 WHIRLPOOL 0499b37739e22c1a0b34d99d1fcb8bed4695ff988bbf4af95b64f8fcb0473e8e2988d891def2d1842a0a8d37c588900f4fb4a011e7d0d0980a91bac1687e4fa0
+DIST stars_6_2v0_0.cat 160019110 SHA256 40a8674dead3178d9f36178f62e128047bb53784fa3ff408e473a5969a4ee379 SHA512 d693b7058bc1cce049a468e7082337d438958afc3465378df90fbfe473a6bb64fa1cadbf5e09fdb986ced3bcada7edb4a8d79ffeca1cb2b1dd4349c56313e4bb WHIRLPOOL 5f17613bdb1db1f9c4859ef39916a18c82782e4a3e15be73c2423a9d1445776d2a181b1a877df59d3776a50a54f6df4d66fc3621f74139786a3fed00c999ae06
+DIST stars_7_2v0_0.cat 348268348 SHA256 730ca2d9182af5ebd4efcc5f87461ad9156caf79cadf1a79708fa970acb809fe SHA512 d6f974e5bf17616d016e6dc74bd5627c93ea53ff4844d86aebbdafac6256ac85c777769f9e3d774f5c75cfe9fbca200dca4778e604dafbbb54af93d8d74e2247 WHIRLPOOL 3c8c52c5eda6f4749df0c1ddbee062037297a496705ec4a4a8325e1b9c925bb296822de3fec6857a5cac7fc45dc64ca6e0091526efec46200750ed152733ec59
+DIST stars_8_2v0_0.cat 706781416 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9 SHA512 f94360e8cca9a3261017adbddf1cb74878771d16d1d6062cead8e9343ad28d26bcfa2b23cdd0a182bc1d5fa0a000ac96f722510118b0ad38886f548f4595f03b WHIRLPOOL cf1c37274bc9ebc99d5021fccdfba92ee17509e60b708eaa47ee5cdef2ada9424bda1543c454670207e29e6cadbc178460adbfc45480bee1caebfeee95a7e211
+DIST stellarium-0.12.4.tar.gz 79343617 SHA256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684 SHA512 324a8c930281e26e91d45356cf3aab89cf708c7e64636b7e89de95af3f6d2569830caf05fb44ebef88f65dda55cb6dd18dcf4ee54d46da3910c456dc2daac478 WHIRLPOOL 8bce980d157904c4032368da335263a9afd2136386b0fd19d27e10f1c8b33712780130ed6845f26b3bac43f00d2de4aee80c47a0648a6cf6b4741bf69301f110
+DIST stellarium-0.13.3.tar.gz 135870690 SHA256 3202b7657906caf0e1079ee5c3f82b21acc01deaa4fcf654307d13d5baf886d6 SHA512 9d8b8d4e045dd3e8052a7f6af4dd21205c2e66c2e4db254fbb6e897f3df1f049a6e2080f6598210da162917e1f6a3535972c8826e5e696f4ab954a5b26d0d083 WHIRLPOOL 735365c9c13257487f785d9407c1725ec7bd345bace43f809105d270ea6a83764dd2c55c1c5010bbe72263ef99dc16913f9e8df706d82f40d3b02187cab1c028
diff --git a/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch b/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch
new file mode 100644
index 00000000000..b4f7d5a4442
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch
@@ -0,0 +1,23 @@
+diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/CLIProcessor.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/CLIProcessor.hpp
+--- src/CLIProcessor.hpp 2015-03-08 12:41:55.000000000 +0100
++++ src/CLIProcessor.hpp 2015-07-12 13:29:36.059179087 +0200
+@@ -21,6 +21,7 @@
+ #define CLIPROCESSOR_HPP
+
+ #include <QStringList>
++#include <QVariant>
+
+ class QSettings;
+
+diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp
+--- src/core/StelSkyCultureMgr.hpp 2015-03-08 12:41:55.000000000 +0100
++++ src/core/StelSkyCultureMgr.hpp 2015-07-12 13:28:32.589064791 +0200
+@@ -23,6 +23,7 @@
+ #include <QMap>
+ #include <QString>
+ #include <QStringList>
++#include <QObject>
+
+ //! @class StelSkyCulture
+ //! Store basic info about a sky culture for stellarium.
+
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
new file mode 100644
index 00000000000..fb81ca02228
--- /dev/null
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-astronomy</herd>
+ <maintainer>
+ <email>mr_bones_@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ Stellarium is a free open source planetarium for your computer. It
+ shows a realistic sky in 3D, just like what you see with the naked
+ eye, binoculars or a telescope. It is being used in planetarium
+ projectors.
+</longdescription>
+ <use>
+ <flag name="stars">Install extra star catalogs</flag>
+ <flag name="sound">Enable sound support</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">stellarium</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-astronomy/stellarium/stellarium-0.12.4.ebuild b/sci-astronomy/stellarium/stellarium-0.12.4.ebuild
new file mode 100644
index 00000000000..97a357b2ecb
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.12.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="http://www.stellarium.org/"
+SRC_URI="
+ mirror://sourceforge/stellarium/${P}.tar.gz
+ stars? (
+ mirror://sourceforge/stellarium/stars_4_1v0_0.cat
+ mirror://sourceforge/stellarium/stars_5_2v0_0.cat
+ mirror://sourceforge/stellarium/stars_6_2v0_0.cat
+ mirror://sourceforge/stellarium/stars_7_2v0_0.cat
+ mirror://sourceforge/stellarium/stars_8_2v0_0.cat
+ )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug nls sound stars"
+
+RESTRICT="test"
+
+RDEPEND="
+ media-fonts/dejavu
+ media-libs/freetype:2
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtscript:4
+ dev-qt/qtsvg:4
+ dev-qt/qttest:4
+ virtual/opengl
+ sound? ( dev-qt/qtphonon:4 )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ x11-libs/libXt
+ nls? ( sys-devel/gettext )"
+DOCS=( AUTHORS ChangeLog README )
+
+LANGS=(
+ af ak am ar as ast az be bg bn bo br bs ca cs
+ cy da de el en en_CA en_GB en_US eo es et eu fa fi fil fr
+ ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
+ la lb lo lt lv mk ml mn mr ms mt nan nb nl nn oc pa pl pt pt_BR ro
+ ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi zh
+ zh_CN zh_HK zh_TW zu
+ )
+
+for X in "${LANGS[@]}" ; do
+ IUSE="${IUSE} linguas_${X}"
+done
+
+S=${WORKDIR}/${PN}-${PV/a/}
+
+src_prepare() {
+ if [[ -n ${LINGUAS} ]] ; then
+ sed \
+ -e '/aa ab ae/d' \
+ -e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
+ -i po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
+ fi
+ sed \
+ -e '/USE_PLUGIN_SIMPLEDRAWLINE/s: 0 : 1 :g' \
+ -e '/USE_PLUGIN_RENDERERSTATISTICS/s: 0 : 1 :g' \
+ -i CMakeLists.txt || die
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable nls NLS)
+ $(cmake-utils_use_enable sound SOUND)
+ )
+ CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_[45678]_[12]v0_0*.cat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild
new file mode 100644
index 00000000000..32df8f169d5
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="http://www.stellarium.org/"
+SRC_URI="
+ mirror://sourceforge/stellarium/${P}.tar.gz
+ stars? (
+ mirror://sourceforge/stellarium/stars_4_1v0_0.cat
+ mirror://sourceforge/stellarium/stars_5_2v0_0.cat
+ mirror://sourceforge/stellarium/stars_6_2v0_0.cat
+ mirror://sourceforge/stellarium/stars_7_2v0_0.cat
+ mirror://sourceforge/stellarium/stars_8_2v0_0.cat
+ )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug nls sound stars"
+
+RESTRICT="test"
+
+RDEPEND="
+ media-fonts/dejavu
+ dev-qt/qtcore:5
+ dev-qt/qtquick1:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtscript:5
+ virtual/opengl
+ sound? ( dev-qt/qtmultimedia:5[widgets] )"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+ dev-qt/qtconcurrent:5
+ nls? ( dev-qt/linguist-tools:5 )"
+DOCS=( AUTHORS ChangeLog README )
+
+LANGS=(
+ af ak am ar as ast az be bg bn bo br bs ca cs
+ cy da de el en en_CA en_GB en_US eo es et eu fa fi fil fr
+ ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
+ la lb lo lt lv mk ml mn mr ms mt nan nb nl nn oc pa pl pt pt_BR ro
+ ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi zh
+ zh_CN zh_HK zh_TW zu
+ )
+
+for X in "${LANGS[@]}" ; do
+ IUSE="${IUSE} linguas_${X}"
+done
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-qt55.patch
+ if [[ -n ${LINGUAS} ]] ; then
+ sed -i \
+ -e '/aa ab ae/d' \
+ -e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
+ po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
+ fi
+ sed -i -e '/SimpleDrawLine/s: 0 : 1 :g' CMakeLists.txt || die
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable nls NLS)
+ $(cmake-utils_use_enable sound SOUND)
+ )
+ CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_[45678]_[12]v0_0*.cat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-astronomy/stiff/Manifest b/sci-astronomy/stiff/Manifest
new file mode 100644
index 00000000000..22390963173
--- /dev/null
+++ b/sci-astronomy/stiff/Manifest
@@ -0,0 +1 @@
+DIST stiff-2.1.3.tar.gz 1043999 SHA256 64ad8aa64cb82c4d96cfa54335016260a6f264d9b7cdaf175a247476233e8aad SHA512 f5b9d4c1fb3db68d8422b357f0005e188259d021977dfa777ec999356e0f73d083cc9e04ffd16655582883d2b7dd38f7888006f086d12412ce13a9c5084a7359 WHIRLPOOL 97436148dadb5237a91d817b9040c5eb67857eea63a3f7728fa24588354861418c150a16b27385db973166e8bb86cf39fd273116c043b2b1a9c57bc78b5162a1
diff --git a/sci-astronomy/stiff/files/stiff-configure.patch b/sci-astronomy/stiff/files/stiff-configure.patch
new file mode 100644
index 00000000000..15b8d9aa301
--- /dev/null
+++ b/sci-astronomy/stiff/files/stiff-configure.patch
@@ -0,0 +1,63 @@
+--- configure.ac.orig 2009-03-10 12:34:36.000000000 +0000
++++ configure.ac 2009-07-28 17:26:22.000000000 +0100
+@@ -21,40 +21,14 @@
+
+ # Include macros
+ #sinclude(acx_pthread.m4)
+-sinclude(acx_prog_cc_optim.m4)
+
+ # Display pakage and version number
+ AC_MSG_RESULT([*********** Configuring: $PACKAGE $VERSION ($date) **********])
+
+-# Initialize the list of compilers to consider
+-cclist="cc gcc"
+-
+-# Backup and reset the input CFLAGS and LDFLAGS
+-mycflags="$CFLAGS"
+-CFLAGS=""
+-myldflags="$LDFLAGS"
+-LDFLAGS=""
+-
+-# Provide special option for the Linux Intel C compiler
+-AC_MSG_CHECKING([for Linux Intel C compiler mode])
+-AC_ARG_ENABLE(icc,
+- [AC_HELP_STRING([--enable-icc],
+- [Enable special mode for compilation with the Intel compiler \
+-(off by default)])],
+- use_icc="yes"
+- cclist="icc $cclist"
+- AC_MSG_RESULT([yes]),
+- use_icc="no"
+- AC_MSG_RESULT([no]))
+-
+-# Checks for programs.
+-# GCC is chosen last because it is likely to yield less optimized code
+-AC_PROG_CC([$cclist])
+ # C Compiler: Check that it is ANSI C
+ AM_PROG_CC_STDC
+ # C Compiler: Check that it is POSIX-compliant
+ AC_ISC_POSIX
+-ACX_PROG_CC_OPTIM
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+@@ -107,19 +81,9 @@
+
+ # Link with gprof option
+ if test "$use_gprof" = "yes"; then
+- if test "$use_icc" = "yes"; then
+- CFLAGS="$CFLAGS -pq"
+- else
+- CFLAGS="$CFLAGS -pg"
+- fi
+ use_static="no"
+ fi
+
+-# Static linking option
+-if test "$use_static" = "yes"; then
+- LDFLAGS="-static -shared-libgcc $LDFLAGS"
+-fi
+-
+ # Override automatic CFLAGS and LDFLAGS with those of user
+ #if test -n "$mycflags"; then
+ #CFLAGS="$mycflags"
diff --git a/sci-astronomy/stiff/metadata.xml b/sci-astronomy/stiff/metadata.xml
new file mode 100644
index 00000000000..320c9fec8ac
--- /dev/null
+++ b/sci-astronomy/stiff/metadata.xml
@@ -0,0 +1,10 @@
+<?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">
+ STIFF is a program that convert scientific FITS images to the
+ more popular TIFF, in 8 (grayscale) or 24 (true colour: 3 times 8) bits per
+ pixel.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/stiff/stiff-2.1.3.ebuild b/sci-astronomy/stiff/stiff-2.1.3.ebuild
new file mode 100644
index 00000000000..4aecbf3fa5e
--- /dev/null
+++ b/sci-astronomy/stiff/stiff-2.1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Converts astronomical FITS images to the TIFF format"
+HOMEPAGE="http://www.astromatic.net/software/stiff"
+SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc threads"
+
+RDEPEND="media-libs/tiff
+ virtual/jpeg
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf $(use_enable threads)
+}
+
+src_install () {
+ default
+ use doc && dodoc doc/*
+}
diff --git a/sci-astronomy/swarp/Manifest b/sci-astronomy/swarp/Manifest
new file mode 100644
index 00000000000..b1f210564cb
--- /dev/null
+++ b/sci-astronomy/swarp/Manifest
@@ -0,0 +1 @@
+DIST swarp-2.19.1.tar.gz 1962393 RMD160 bca92fcca950e94b558cbc457c87fe85ab07424e SHA1 b16ccc8f831fb7d7ae657770e32f920f75f8b056 SHA256 26e72defa0526e5be59e854bd54f54dc13b28f9ccede40571729c426b030d8cb
diff --git a/sci-astronomy/swarp/files/swarp-nodoc.patch b/sci-astronomy/swarp/files/swarp-nodoc.patch
new file mode 100644
index 00000000000..dd8471ef2f9
--- /dev/null
+++ b/sci-astronomy/swarp/files/swarp-nodoc.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig 2010-06-08 21:48:23.000000000 +0100
++++ Makefile.am 2010-06-08 21:48:34.000000000 +0100
+@@ -2,7 +2,7 @@
+ # Copyright (C) 2003-2009 Emmanuel Bertin.
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ SUBDIRS = man src
+-dist_pkgdata_DATA = doc xsl/swarp.xsl
++dist_pkgdata_DATA = xsl/swarp.xsl
+ EXTRA_DIST = AUTHORS BUGS ChangeLog COPYRIGHT HISTORY INSTALL \
+ README THANKS TODO \
+ acx_pthread.m4 acx_prog_cc_optim.m4 \
diff --git a/sci-astronomy/swarp/metadata.xml b/sci-astronomy/swarp/metadata.xml
new file mode 100644
index 00000000000..754cc2e41ac
--- /dev/null
+++ b/sci-astronomy/swarp/metadata.xml
@@ -0,0 +1,9 @@
+<?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">
+ SWarp takes astronomical FITS images with a WCS-like projection,
+ resample and stack them all.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/swarp/swarp-2.19.1.ebuild b/sci-astronomy/swarp/swarp-2.19.1.ebuild
new file mode 100644
index 00000000000..9884a43beb0
--- /dev/null
+++ b/sci-astronomy/swarp/swarp-2.19.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils autotools
+
+DESCRIPTION="Resample and coadd astronomical FITS images"
+HOMEPAGE="http://astromatic.iap.fr/software/swarp"
+SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc threads"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-nodoc.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable threads)
+}
+
+src_install() {
+ default
+ use doc && dodoc doc/*
+}
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
new file mode 100644
index 00000000000..41f86ff1c31
--- /dev/null
+++ b/sci-astronomy/wcslib/Manifest
@@ -0,0 +1,3 @@
+DIST wcslib-4.21.tar.bz2 1865628 SHA256 530eb67e432ce0d881f91e9b08734a346a98cee06233433da79ad0c7d5f144ae SHA512 0fdd7b6cb234565e2dc3b619ec219918103c7a14916294004c12c709be803b10f064fa01c9647a46d2588d4f880ed7db6e65758b510d1a556b3b46f7bc836cdd WHIRLPOOL daaa3ba60cab0aac0619d317ea338f8d734a6d924c49d806a509560e6cd89a896f4594d48e760997d1289d2639c6a81b8802f65a2d95a3cd82efa533476a354a
+DIST wcslib-4.22.tar.bz2 1866676 SHA256 afafdf772cb0fe97ae886cbf512fb114d842ca358cce7df9fa93449d1b556950 SHA512 9288314d842a9b54536b5f512900933e2ac307ef81003172fa511c8334f430161f28084309cde7ad2d94d39020eacec33cf8944d30d78abb51f3e7ff01be2bc4 WHIRLPOOL 629bbca2672d0d9ac03696deadfcea155c912c14ef115defac48966c41714ae692fe5cd60587a733ce691612bea9f48d212587dd0a2327739839328b90eae399
+DIST wcslib-4.23.tar.bz2 1876150 SHA256 baf0fc85fb290e8a575eab4b7046517818a12754a0f01da74db9483467dde5a2 SHA512 cc82818b1aa88d325b72c5a7967b688060c9d0bfd6ba4fef39c0e9dab00bab547282b1c301dafb1331156c69e6266ef80c39f0dc44b894a977d2b2b3cafb9c87 WHIRLPOOL 90ca6e91511371c4e791b7e31b395a6cfda29d1f613176282960896170651b7d5ca7b215254befab1021b18e03e283a88820a248c9c4e6e07edef1bed3adca03
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
new file mode 100644
index 00000000000..8d2a6dc47df
--- /dev/null
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -0,0 +1,20 @@
+<?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">
+ 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-4.21.ebuild b/sci-astronomy/wcslib/wcslib-4.21.ebuild
new file mode 100644
index 00000000000..f8d333a25e1
--- /dev/null
+++ b/sci-astronomy/wcslib/wcslib-4.21.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib
+
+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/4"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran fits pgplot static-libs"
+
+RDEPEND="
+ fits? ( sci-libs/cfitsio:0= )
+ pgplot? ( sci-libs/pgplot:0= )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i -e 's/COPYING\*//' GNUmakefile || die
+}
+
+src_configure() {
+ local myconf=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable static-libs static)
+ $(use_enable fortran)
+ )
+ # 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[@]}
+}
+
+src_compile() {
+ # nasty makefile, debugging means full rewrite
+ emake -j1
+}
+
+src_test() {
+ emake -j1 check
+}
+
+src_install () {
+ default
+ # static libs are same as shared (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/wcslib/wcslib-4.22.ebuild b/sci-astronomy/wcslib/wcslib-4.22.ebuild
new file mode 100644
index 00000000000..3b29c1c5ba8
--- /dev/null
+++ b/sci-astronomy/wcslib/wcslib-4.22.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib
+
+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/4"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran fits pgplot static-libs"
+
+RDEPEND="
+ fits? ( sci-libs/cfitsio:0= )
+ pgplot? ( sci-libs/pgplot:0= )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i -e 's/COPYING\*//' GNUmakefile || die
+}
+
+src_configure() {
+ local myconf=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable static-libs static)
+ $(use_enable fortran)
+ )
+ # 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[@]}
+}
+
+src_compile() {
+ # nasty makefile, debugging means probably full rewrite
+ emake -j1
+}
+
+src_test() {
+ emake -j1 check
+}
+
+src_install () {
+ default
+ # static libs are same as shared (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/wcslib/wcslib-4.23.ebuild b/sci-astronomy/wcslib/wcslib-4.23.ebuild
new file mode 100644
index 00000000000..3b29c1c5ba8
--- /dev/null
+++ b/sci-astronomy/wcslib/wcslib-4.23.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib
+
+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/4"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran fits pgplot static-libs"
+
+RDEPEND="
+ fits? ( sci-libs/cfitsio:0= )
+ pgplot? ( sci-libs/pgplot:0= )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i -e 's/COPYING\*//' GNUmakefile || die
+}
+
+src_configure() {
+ local myconf=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable static-libs static)
+ $(use_enable fortran)
+ )
+ # 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[@]}
+}
+
+src_compile() {
+ # nasty makefile, debugging means probably full rewrite
+ emake -j1
+}
+
+src_test() {
+ emake -j1 check
+}
+
+src_install () {
+ default
+ # static libs are same as shared (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
new file mode 100644
index 00000000000..f2f342485a1
--- /dev/null
+++ b/sci-astronomy/wcstools/Manifest
@@ -0,0 +1 @@
+DIST wcstools-3.8.7.tar.gz 961222 SHA256 8e4140fc6d691a0555d5aaa41dbe0253c2edc5775f4a8eebc9667933091b1c28 SHA512 f076c31dd64dad0bda77ec5ae2483035617b69378cfdcf286084c83677c7cb35788769de62f17459e65198107ce534fdee3e38403dd6a44f9881a7631f107187 WHIRLPOOL ca73eeba30c378a3a25621a9371d24683dd3933821cbaf4d5a445e72c63d3ac60af93ca69933f9ec9747b404d67658fdfdcf99f0713357acaa223ffd29c03204
diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch
new file mode 100644
index 00000000000..8293174f466
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.8.3-autotools.patch
@@ -0,0 +1,142 @@
+--- configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ configure.ac 2011-04-10 15:54:07.000000000 +0100
+@@ -0,0 +1,11 @@
++AC_PREREQ([2.59])
++AC_INIT(wcstools, 3.8.x , [http://tdc-www.harvard.edu/wcstools/])
++AM_INIT_AUTOMAKE([foreign])
++AC_CONFIG_HEADERS([config.h])
++
++AC_PROG_CC
++AC_PROG_LIBTOOL
++AC_C_CONST
++AC_CHECK_LIB(m, sin)
++AC_CONFIG_FILES([libwcs/Makefile libned/Makefile Makefile wcstools.pc])
++AC_OUTPUT
+--- libned/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ libned/Makefile.am 2011-04-10 15:53:44.000000000 +0100
+@@ -0,0 +1,5 @@
++lib_LTLIBRARIES = libned.la
++noinst_HEADERS = nedc.h ned_client.h
++libned_la_SOURCES = \
++ ned_cli.c ned_cif.c ned_err.c ned_sk.c
++EXTRA_DIST = README
+--- libwcs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ libwcs/Makefile.am 2011-04-10 16:00:15.000000000 +0100
+@@ -0,0 +1,17 @@
++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
+--- Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am 2011-04-10 15:55:47.000000000 +0100
+@@ -0,0 +1,81 @@
++SUBDIRS = libwcs libned
++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 \
++ simpos nedpos bincat nedname
++
++# 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
++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
++
++nedname_SOURCES = nedname.c
++nedname_LDADD = \
++ $(top_builddir)/libned/libned.la \
++ $(top_builddir)/libwcs/libwcstools.la
++nedpos_SOURCES = nedpos.c
++nedpos_LDADD = \
++ $(top_builddir)/libned/libned.la \
++ $(top_builddir)/libwcs/libwcstools.la
+--- wcstools.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ wcstools.pc.in 2011-04-10 15:53:44.000000000 +0100
+@@ -0,0 +1,13 @@
++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/files/wcstools-3.8.4-implicits.patch b/sci-astronomy/wcstools/files/wcstools-3.8.4-implicits.patch
new file mode 100644
index 00000000000..a1329cfe355
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.8.4-implicits.patch
@@ -0,0 +1,21 @@
+--- a/libned/ned_sk.c
++++ b/libned/ned_sk.c
+@@ -57,6 +57,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netdb.h>
+
+ #include <sys/resource.h>
+--- a/gethead.c
++++ b/gethead.c
+@@ -32,6 +32,8 @@
+ #include "libwcs/fitsfile.h"
+ #include "libwcs/wcscat.h"
+
++void fk425();
++
+ #define MAXKWD 100
+ #define MAXFILES 2000
+ static int maxnkwd = MAXKWD;
diff --git a/sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch b/sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch
new file mode 100644
index 00000000000..c53fe782ca6
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.8.4-overflows.patch
@@ -0,0 +1,11 @@
+--- a/getdate.c
++++ b/getdate.c
+@@ -444,7 +444,7 @@
+ char *fitsdate, *newfdate, *stdate;
+ char temp[64];
+ char fyear[16];
+- char ts0[8];
++ char ts0[9];
+ char *tchar;
+ int its, its1;
+ time_t lts;
diff --git a/sci-astronomy/wcstools/metadata.xml b/sci-astronomy/wcstools/metadata.xml
new file mode 100644
index 00000000000..5b47de1054a
--- /dev/null
+++ b/sci-astronomy/wcstools/metadata.xml
@@ -0,0 +1,17 @@
+<?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">
+ 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.8.7.ebuild b/sci-astronomy/wcstools/wcstools-3.8.7.ebuild
new file mode 100644
index 00000000000..1ad8561fba4
--- /dev/null
+++ b/sci-astronomy/wcstools/wcstools-3.8.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils 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="static-libs"
+
+DOCS=( Readme Programs NEWS libned/NED_client )
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-3.8.3-autotools.patch \
+ "${FILESDIR}"/${PN}-3.8.4-implicits.patch
+
+ # 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
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+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() {
+ default
+ use static-libs || rm -rf "${ED}"/usr/$(get_libdir)/*.la
+ doman man/man1/*
+ newdoc libwcs/Readme Readme.libwcs
+ newdoc libwcs/NEWS NEWS.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-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
new file mode 100644
index 00000000000..5205d307a45
--- /dev/null
+++ b/sci-astronomy/xephem/Manifest
@@ -0,0 +1,2 @@
+DIST xephem-3.7.5.tar.gz 18908521 SHA256 edda7975bb690f74b1853d2729de2b0f4ada69fb37a08117ace7a22c23ee7d1a SHA512 58cd75e4cf8b541d818631e50453f14275cf81ca3349c442ac62eb7fa15509d3d2d57f88420f866312e41ecfd333c8aeeade7656a84e6e527811f98a26b8588d WHIRLPOOL 6d97bf755cc5e98909aa66c1a0ae942f32dd74541ef6e7c03d7c76214462a10929935a38a5a7c468e28ba315f019d9a0489e345f95ee547238d2250fdc9f8005
+DIST xephem-3.7.6.tar.gz 17975496 SHA256 2080b628d80d52d9ff7148787e3093eb56f21fef5fba404f123b6198b2d64d05 SHA512 96d77852045e3d3cb996de5884a9272b2f3157216816acf3ad05a0bc60f20673fccc0f1efd54443cf7c38d0aaa86da1cf3f11989c2e37e26feb0cbd78855c84f WHIRLPOOL 94bba9595863cc30f5a058ea72dc4d4824d62355ce0bfef05c63a741667c064febb26bc4da884d7cc15ee04b74cf402031efbdbae844c458acc1c8cb0ec2a91a
diff --git a/sci-astronomy/xephem/files/xephem-3.7.4-libs-flags.patch b/sci-astronomy/xephem/files/xephem-3.7.4-libs-flags.patch
new file mode 100644
index 00000000000..500ea12f223
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.4-libs-flags.patch
@@ -0,0 +1,160 @@
+diff -Nur xephem-3.7.4.orig/GUI/xephem/Makefile xephem-3.7.4/GUI/xephem/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/Makefile 2009-01-05 20:55:59.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/Makefile 2009-07-26 15:26:42.000000000 +0100
+@@ -10,8 +10,8 @@
+ # one executable, xephem.
+
+ # These -I and -L flags point to the supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+
+ # MOTIFI is the directory containing the Xm directory of include files.
+@@ -32,12 +32,9 @@
+
+ # for linux and Apple OS X
+ # some systems now use just /usr/X11 (not /usr/X11R6)
+-CC = gcc
+-CLDFLAGS = -g
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
+-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm
++XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
++CFLAGS := $(LIBINC) $(CFLAGS)
+
+ # for ppc Apple OS X to make universal (i386 and ppc binary), requires
+ # Xcode 2.2, /Developers/SDK/MacOSX10.4u.sdk and all libs, including libXm,
+@@ -187,12 +184,9 @@
+ nroff -man $? > $@
+
+ libs:
+- cd ../../libastro; make
+- cd ../../libip; make
+- cd ../../libjpegd; make
+- cd ../../liblilxml; make
+- cd ../../libpng; make
+- cd ../../libz; make
++ cd ../../libastro; $(MAKE)
++ cd ../../libip; $(MAKE)
++ cd ../../liblilxml; $(MAKE)
+
+ clean:
+ rm -fr *.o ../../lib*/*.[ao]
+diff -Nur xephem-3.7.4.orig/GUI/xephem/tools/lx200xed/Makefile xephem-3.7.4/GUI/xephem/tools/lx200xed/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/tools/lx200xed/Makefile 2005-03-20 11:04:51.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/tools/lx200xed/Makefile 2009-07-26 15:15:06.000000000 +0100
+@@ -1,10 +1,6 @@
+ LIBASTRO = ../../../../libastro
+-CLDFLAGS =
+-CFLAGS = -Wall -O2 $(CLDFLAGS) -I$(LIBASTRO)
+-LDFLAGS = $(CLDFLAGS) -L$(LIBASTRO)
+-CC = gcc
+-
+-LIBS = -lastro -lm
++CFLAGS := -I$(LIBASTRO) $(CFLAGS)
++LIBS = -L$(LIBASTRO) -lastro -lm
+
+ OBJS = \
+ liblx200.o \
+diff -Nur xephem-3.7.4.orig/GUI/xephem/tools/xedb/Makefile xephem-3.7.4/GUI/xephem/tools/xedb/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/tools/xedb/Makefile 2005-03-20 11:04:51.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/tools/xedb/Makefile 2009-07-26 15:13:30.000000000 +0100
+@@ -2,11 +2,8 @@
+ # assumes gcc, adjust to suit.
+
+ ASLIBDIR = ../../../../libastro
+-CLDFLAGS =
+-GCCFLAGS = -O2 -ffast-math -Wall
+-CFLAGS = $(CLDFLAGS) $(GCCFLAGS) -I$(ASLIBDIR)
+-LDFLAGS = $(CLDFLAGS) -L$(ASLIBDIR)
+-LIBS = -lastro -lm
++CFLAGS := -I$(ASLIBDIR) $(CFLAGS)
++LIBS = -L$(ASLIBDIR) -lastro -lm
+
+ OBJS = xedb.o \
+ print.o
+diff -Nur xephem-3.7.4.orig/GUI/xephem/tools/xephemdbd/Makefile xephem-3.7.4/GUI/xephem/tools/xephemdbd/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/tools/xephemdbd/Makefile 2005-03-20 11:04:51.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/tools/xephemdbd/Makefile 2009-07-26 15:16:13.000000000 +0100
+@@ -2,16 +2,12 @@
+ # run this after successfully making XEphem and its libs.
+ # Only tested on Linux.
+
+-CC = gcc
+-
+ XED = ../..
+ LAS = $(XED)/../../libastro
+ IPH = $(XED)/../../libip
+
+-CLDFLAGS =-g
+-CFLAGS = $(CLDFLAGS) -Wall -ffast-math -I$(XED) -I$(LAS) -I$(IPH)
+-LDFLAGS = $(CLDFLAGS) -L$(LAS)
+-LIBS = -lastro -lm
++CFLAGS := -I$(XED) -I$(LAS) -I$(IPH) $(CFLAGS)
++LIBS = -L$(LAS) -lastro -lm
+
+ OBJS = xephemdbd.o \
+ db.o \
+diff -Nur xephem-3.7.4.orig/libastro/Makefile xephem-3.7.4/libastro/Makefile
+--- xephem-3.7.4.orig/libastro/Makefile 2006-02-24 03:37:31.000000000 +0000
++++ xephem-3.7.4/libastro/Makefile 2009-07-26 15:22:43.000000000 +0100
+@@ -3,10 +3,6 @@
+
+ # compiler and flags
+
+-# gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+-
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+
+@@ -87,7 +83,7 @@
+ ranlib $@
+
+ libastro.so: $(HS) $(OBJS)
+- $(CC) -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libastro.a
+diff -Nur xephem-3.7.4.orig/libip/Makefile xephem-3.7.4/libip/Makefile
+--- xephem-3.7.4.orig/libip/Makefile 2009-01-05 20:53:46.000000000 +0000
++++ xephem-3.7.4/libip/Makefile 2009-07-26 15:20:43.000000000 +0100
+@@ -2,8 +2,7 @@
+ # (C) 2001 Elwood Charles Downey
+
+ # gcc
+-CC = gcc
+-CFLAGS= -I../libastro -O2 -Wall
++CFLAGS := -I../libastro $(CFLAGS)
+
+ # macosx universal binary
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
+@@ -40,7 +39,7 @@
+ ranlib $@
+
+ libip.so: $(OBJS)
+- gcc -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libip.a
+diff -Nur xephem-3.7.4.orig/liblilxml/Makefile xephem-3.7.4/liblilxml/Makefile
+--- xephem-3.7.4.orig/liblilxml/Makefile 2006-02-24 03:37:32.000000000 +0000
++++ xephem-3.7.4/liblilxml/Makefile 2009-07-26 15:22:04.000000000 +0100
+@@ -3,9 +3,6 @@
+
+ # compiler and flags
+
+-# gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
diff --git a/sci-astronomy/xephem/files/xephem-3.7.4-overflows.patch b/sci-astronomy/xephem/files/xephem-3.7.4-overflows.patch
new file mode 100644
index 00000000000..2dd5e55c369
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.4-overflows.patch
@@ -0,0 +1,15 @@
+Fix buffer overflow
+
+http://bugs.gentoo.org/show_bug.cgi?id=339901
+
+--- GUI/xephem/tools/lx200xed/liblx200.c
++++ GUI/xephem/tools/lx200xed/liblx200.c
+@@ -855,7 +855,7 @@
+ return(LX200_FALSE); /*Probably ought to verify all characters are acceptable*/
+ szCmd[1]='L' + iSite;
+ szCmd[2]='\0';
+- snprintf(szSite,6,"%3s",buf);
++ snprintf(szSite,4,"%3s",buf);
+ return(lx200_set_generic(fd,szCmd,szSite));
+ }
+
diff --git a/sci-astronomy/xephem/files/xephem-3.7.5-respect-flags.patch b/sci-astronomy/xephem/files/xephem-3.7.5-respect-flags.patch
new file mode 100644
index 00000000000..8a695652fac
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.5-respect-flags.patch
@@ -0,0 +1,57 @@
+Respect AR, RANLIB
+
+https://bugs.gentoo.org/show_bug.cgi?id=436646
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/libastro/Makefile
++++ b/libastro/Makefile
+@@ -79,8 +79,8 @@ OBJS = \
+ vsop87_data.o
+
+ libastro.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libastro.so: $(HS) $(OBJS)
+ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+--- a/libip/Makefile
++++ b/libip/Makefile
+@@ -35,8 +35,8 @@ OBJS = \
+ HS = ip.h fsmatch.h
+
+ libip.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libip.so: $(OBJS)
+ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+--- a/libjpegd/Makefile
++++ b/libjpegd/Makefile
+@@ -62,8 +62,8 @@ OBJS = \
+ jutils.o
+
+ libjpegd.a: $(HS) $(OBJS)
+- ar r $@ $(OBJS)
+- ranlib $@
++ $(AR) r $@ $(OBJS)
++ $(RANLIB) $@
+
+ clobber:
+ touch x.o x.a
+--- a/liblilxml/Makefile
++++ b/liblilxml/Makefile
+@@ -24,8 +24,8 @@ HS = lilxml.h
+ OBJS = lilxml.o base64.o
+
+ liblilxml.a: $(HS) $(OBJS)
+- ar r $@ $(OBJS)
+- ranlib $@
++ $(AR) r $@ $(OBJS)
++ $(RANLIB) $@
+
+ liltest: liltest.o liblilxml.a
+ $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch b/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch
new file mode 100644
index 00000000000..4c340711e0e
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch
@@ -0,0 +1,12 @@
+sunmenu.c:920:3: warning: implicit declaration of function ‘strptime’
+
+--- a/GUI/xephem/sunmenu.c
++++ b/GUI/xephem/sunmenu.c
+@@ -1,6 +1,7 @@
+ /* code to manage the sun display
+ */
+
++#define _XOPEN_SOURCE /* See feature_test_macros(7) */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch
new file mode 100644
index 00000000000..4fc48a763c5
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch
@@ -0,0 +1,129 @@
+diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile
+index b4c26f2..ab4f256 100644
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -10,9 +10,9 @@
+ # one executable, xephem.
+
+ # These -I and -L flags point to the supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -32,12 +32,9 @@ endif
+
+ # for linux and Apple OS X
+ # some systems now use just /usr/X11 (not /usr/X11R6)
+-CC = gcc
+-CLDFLAGS = -g
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
++CFLAGS := $(LIBINC) $(CFLAGS)
+ XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
+
+ # for ppc Apple OS X to make universal (i386 and ppc binary), requires
+ # Xcode 2.2, /Developers/SDK/MacOSX10.4u.sdk and all libs, including libXm,
+@@ -187,12 +184,9 @@ xephem.1: xephem.man
+ nroff -man $? > $@
+
+ libs:
+- cd ../../libastro; make
+- cd ../../libip; make
+- cd ../../libjpegd; make
+- cd ../../liblilxml; make
+- cd ../../libpng; make
+- cd ../../libz; make
++ $(MAKE) -C ../../libastro
++ $(MAKE) -C ../../libip
++ $(MAKE) -C ../../liblilxml
+
+ clean:
+ rm -fr *.o ../../lib*/*.[ao]
+diff --git a/libastro/Makefile b/libastro/Makefile
+index b1ab0bf..62c5412 100644
+--- a/libastro/Makefile
++++ b/libastro/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -83,11 +81,11 @@ OBJS = \
+ vsop87_data.o
+
+ libastro.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libastro.so: $(HS) $(OBJS)
+- $(CC) -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libastro.a
+diff --git a/libip/Makefile b/libip/Makefile
+index 35cb9c6..cba71e1 100644
+--- a/libip/Makefile
++++ b/libip/Makefile
+@@ -2,8 +2,7 @@
+ # (C) 2001 Elwood Charles Downey
+
+ # gcc
+-CC = gcc
+-CFLAGS= -I../libastro -O2 -Wall
++CFLAGS += -I../libastro
+
+ # macosx universal binary
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
+@@ -36,11 +35,11 @@ OBJS = \
+ HS = ip.h fsmatch.h
+
+ libip.a: $(HS) $(OBJS)
+- ar rv $@ $(OBJS)
+- ranlib $@
++ $(AR) rv $@ $(OBJS)
++ $(RANLIB) $@
+
+ libip.so: $(OBJS)
+- gcc -shared -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+ clobber:
+ rm -f *.o libip.a
+diff --git a/liblilxml/Makefile b/liblilxml/Makefile
+index 9ab98cb..85e7889 100644
+--- a/liblilxml/Makefile
++++ b/liblilxml/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -27,8 +25,8 @@ HS = lilxml.h
+ OBJS = lilxml.o base64.o
+
+ liblilxml.a: $(HS) $(OBJS)
+- ar r $@ $(OBJS)
+- ranlib $@
++ $(AR) r $@ $(OBJS)
++ $(RANLIB) $@
+
+ liltest: liltest.o liblilxml.a
+ $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/metadata.xml b/sci-astronomy/xephem/metadata.xml
new file mode 100644
index 00000000000..fef7b80eea0
--- /dev/null
+++ b/sci-astronomy/xephem/metadata.xml
@@ -0,0 +1,13 @@
+<?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">
+ Xephem is an interactive astronomical ephemeris program for X Windows
+ systems. It computes heliocentric, geocentric and topocentric
+ information for fixed celestial objects and objects in heliocentric
+ and geocentric orbits; has built-in support for all planet positions;
+ the moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central
+ meridian longitude; Saturn's rings; and Jupiter's Great Red Spot.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/xephem/xephem-3.7.5.ebuild b/sci-astronomy/xephem/xephem-3.7.5.ebuild
new file mode 100644
index 00000000000..0864135311d
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-3.7.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
+HOMEPAGE="http://www.clearskyinstitute.com/xephem"
+SRC_URI="http://97.74.56.125/free/${P}.tar.gz"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+SLOT=0
+LICENSE="XEphem"
+
+DEPEND=">=x11-libs/motif-2.3:0
+ virtual/jpeg
+ media-libs/libpng"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # make sure we use system libs and respect user flags
+ epatch \
+ "${FILESDIR}"/${PN}-3.7.4-libs-flags.patch \
+ "${FILESDIR}"/${PN}-3.7.4-overflows.patch \
+ "${FILESDIR}"/${P}-respect-flags.patch
+}
+
+src_compile() {
+ tc-export CC AR RANLIB
+ cd GUI/xephem || die
+ emake
+ local i
+ for i in tools/{lx200xed,xedb,xephemdbd}; do
+ emake -C ${i}
+ done
+}
+
+src_install() {
+ cd GUI/xephem
+ dobin xephem
+ doman xephem.1
+ newicon XEphem.png ${PN}.png
+ insinto /usr/share/${PN}
+ doins -r auxil catalogs fifos fits gallery lo
+ dohtml -r help/*
+ cd tools || die
+ dobin lx200xed/lx200xed xedb/xedb xephemdbd/xephemdbd
+ for file in {xedb,lx200xed}/README; do
+ newdoc ${file} README.$(dirname ${file})
+ done
+ cd xephemdbd || die
+ insinto /usr/share/doc/${PF}/xephemdbd
+ doins README cgi-lib.pl start-xephemdbd.pl xephemdbd.html xephemdbd.pl
+ cd "${S}"
+ echo > XEphem "XEphem.ShareDir: /usr/share/${PN}"
+ insinto /usr/share/X11/app-defaults
+ has_version '<x11-base/xorg-x11-7.0' && insinto /etc/X11/app-defaults
+ doins XEphem
+ echo > 99xephem "XEHELPURL=/usr/share/doc/${PF}/html/xephem.html"
+ doenvd 99xephem
+ dodoc Copyright README
+ make_desktop_entry xephem XEphem ${PN}
+}
+
+pkg_postinst() {
+ elog "See ${EROOT}/usr/share/doc/${PF}/xephemdbd/README to set up a web interface"
+}
diff --git a/sci-astronomy/xephem/xephem-3.7.6.ebuild b/sci-astronomy/xephem/xephem-3.7.6.ebuild
new file mode 100644
index 00000000000..a83c979b3ae
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-3.7.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
+HOMEPAGE="http://www.clearskyinstitute.com/xephem"
+SRC_URI="http://97.74.56.125/free/${P}.tar.gz"
+
+LICENSE="XEphem"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/motif-2.3:0
+ virtual/jpeg
+ media-libs/libpng:0="
+DEPEND="${RDEPEND}
+ sys-apps/groff"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-respect_env_vars.patch \
+ "${FILESDIR}"/${P}-implicits.patch
+ echo > "${T}"/XEphem "XEphem.ShareDir: /usr/share/${PN}"
+ echo > "${T}"/99xephem "XEHELPURL=/usr/share/doc/${PF}/html/xephem.html"
+}
+
+src_compile() {
+ tc-export CC AR RANLIB
+ emake -C GUI/xephem
+}
+
+src_install() {
+ dodoc README
+
+ insinto /usr/share/X11/app-defaults
+ has_version '<x11-base/xorg-x11-7.0' && insinto /etc/X11/app-defaults
+ doins "${T}"/XEphem
+
+ doenvd "${T}"/99xephem
+
+ cd GUI/xephem
+ dobin xephem
+ doman xephem.1
+ newicon XEphem.png ${PN}.png
+ insinto /usr/share/${PN}
+ doins -r auxil catalogs fifos fits gallery lo
+ dohtml -r help/*
+
+ make_desktop_entry xephem XEphem ${PN}
+}
diff --git a/sci-astronomy/xfitsview/Manifest b/sci-astronomy/xfitsview/Manifest
new file mode 100644
index 00000000000..137d2e2f231
--- /dev/null
+++ b/sci-astronomy/xfitsview/Manifest
@@ -0,0 +1 @@
+DIST xfitsview2.2.tgz 290959 SHA256 f47649ad0091fa555aae13a0c539cd378591df28613b8572195baf77eea74fbb SHA512 01e57f0dd9c7320b86683a2235e7a779828f19c34b9380d5127bad85941e8861fd86f17a276f7ec60038d9e3bc4c8df54cc6291b70f8c7ecce4ef17cfb92b1b9 WHIRLPOOL 2a933d5fd2dcc06b4af949060bcc7094735c8440b3eb24c7b1a8275e3673132e1b1c6733af3eadb944e7f3b4edb38126953246a08d7a2236ba8a5a5fb8220f4c
diff --git a/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch b/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch
new file mode 100644
index 00000000000..6b010a3ea72
--- /dev/null
+++ b/sci-astronomy/xfitsview/files/xfitsview-2.2-build_system.patch
@@ -0,0 +1,54 @@
+* Fix parallel build
+* Respect LDFLAGS
+* Fix build with gmake 3.82
+
+http://bugs.gentoo.org/show_bug.cgi?id=337479
+
+--- Makefile.in
++++ Makefile.in
+@@ -61,26 +61,26 @@
+ LIBDIR = lib/$(ARCH)/
+ CFLAGS = -Iinclude -Ifitssubs @MOTIF_CPPFLAGS@ @X_CFLAGS@ \
+ $(DEBUG) $(OSFLAGS) @CFLAGS@
+-LIBS = @MOTIF_LIBS@ -lfitsLib
+-LDFLAGS = @MOTIF_LDFLAGS@ @X_LIBS@ -L$(LIBDIR)
++LIBS = @MOTIF_LIBS@ @X_LIBS@ -L$(LIBDIR) -lfitsLib
++LDFLAGS = @LDFLAGS@ @MOTIF_LDFLAGS@
+
+ all: $(TARGETS)
+
+ # update source/object directory
+ srcupdate:
+- cd src; $(MAKE)
++ $(MAKE) -C src
+
+ # update fitssubs source/object directory
+ fitsupdate:
+- cd fitssubs; $(MAKE)
++ $(MAKE) -C fitssubs
+
+ # update fitssubs library directory
+-libupdate:
+- cd lib; $(MAKE) RANLIB="$(RANLIB)"
++libupdate: fitsupdate srcupdate
++ $(MAKE) RANLIB="$(RANLIB)" -C lib
+
+ # Link Obitview
+-XFITSview: lib/$(ARCH)/libfitsLib.a src/*.c XFITSview.c
+- $(CC) XFITSview.c -o XFITSview $(CFLAGS) src/*.o $(LDFLAGS) $(LIBS)
++XFITSview: XFITSview.c libupdate
++ $(CC) $(LDFLAGS) XFITSview.c -o XFITSview $(CFLAGS) src/*.o $(LIBS)
+
+ # make gzipped tar backup of directory
+ backup:
+--- fitssubs/Makefile.in
++++ fitssubs/Makefile.in
+@@ -69,7 +69,7 @@
+
+
+ # create library directory if needed
+-../lib/$(ARCH): ../lib
++$(LIBDIR): ../lib
+ mkdir ../lib/$(ARCH)
+
+ clean:
diff --git a/sci-astronomy/xfitsview/metadata.xml b/sci-astronomy/xfitsview/metadata.xml
new file mode 100644
index 00000000000..443e587c978
--- /dev/null
+++ b/sci-astronomy/xfitsview/metadata.xml
@@ -0,0 +1,10 @@
+<?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">
+ XFITSview is a Graphical User Interface based on the Motif library to
+ visualize astronomical images in the FITS format. It's a fairly simple
+ program useful for doing simple astrometry.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-astronomy/xfitsview/xfitsview-2.2-r1.ebuild b/sci-astronomy/xfitsview/xfitsview-2.2-r1.ebuild
new file mode 100644
index 00000000000..6747852f246
--- /dev/null
+++ b/sci-astronomy/xfitsview/xfitsview-2.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_PN=XFITSview
+MY_P=${MY_PN}${PV}
+
+DESCRIPTION="Viewer for astronomical images in FITS format"
+HOMEPAGE="http://www.nrao.edu/software/fitsview/"
+SRC_URI="ftp://ftp.cv.nrao.edu/fits/os-support/unix/xfitsview/${PN}${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=x11-libs/motif-2.3:0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+ find "${S}" -name "*old.c" -delete || die
+ epatch "${FILESDIR}"/${P}-build_system.patch
+}
+
+src_install() {
+ dobin XFITSview
+ dodoc README changes notes.text
+}