diff options
author | Sébastien Fabbro <bicatali@gentoo.org> | 2016-06-07 22:04:39 +0000 |
---|---|---|
committer | Sébastien Fabbro <bicatali@gentoo.org> | 2016-06-07 22:04:39 +0000 |
commit | 930f8d5f0be912fda0ca8ba3d4ea9451daa5dff8 (patch) | |
tree | b3d2816ddaf5fee8bb0434be11599e5ed34cc013 /sci-astronomy | |
parent | sci-mathematics/scilab: fix freehep dependency (diff) | |
download | sci-930f8d5f0be912fda0ca8ba3d4ea9451daa5dff8.tar.gz sci-930f8d5f0be912fda0ca8ba3d4ea9451daa5dff8.tar.bz2 sci-930f8d5f0be912fda0ca8ba3d4ea9451daa5dff8.zip |
montage and wrapper now in main tree
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/montage/Manifest | 2 | ||||
-rw-r--r-- | sci-astronomy/montage/files/montage-3.3-gcc48.patch | 97 | ||||
-rw-r--r-- | sci-astronomy/montage/metadata.xml | 12 | ||||
-rw-r--r-- | sci-astronomy/montage/montage-3.3.ebuild | 55 |
4 files changed, 0 insertions, 166 deletions
diff --git a/sci-astronomy/montage/Manifest b/sci-astronomy/montage/Manifest deleted file mode 100644 index 97d0cb64b..000000000 --- a/sci-astronomy/montage/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST Montage_v3.3.tar.gz 6967237 SHA256 a4776d3f050ac9aed966de47986ee44f613f04b29fca55f72062754cfc258067 SHA512 3a1e5a63095d5ea5a27878712b79f370e92d9495e8eac1e43ddc4262194de7c4deb5c8fef1f14c3f579aa3343ba9ff3be0b3f3364f86b464057ed34973e734a8 WHIRLPOOL a7f52d325ad633c4a616355dbad1a90ed2b34f6d83399077d08aa2b430055bfb04e8010c58d93ec4fda1cc863717774bbc2e768cbad7f8daa07eaecd7667d3fb -DIST montage-docs.tar.gz 91461226 SHA256 0037b49551001d4cc75ac7c084d65ff0ecb84026934853a9051b02976ef676b9 SHA512 5df4bf5e06486b43eb0ab3bd1cb9f8b99b3be375e319cb4ff95e850d4c89fc48abe3840832cabac54e378f12833ab3c5924610771a5dd22e5a2a19a3a5f32f38 WHIRLPOOL b18f2753316060693c2d0a93ed9e86f91fff8c6ceeb60ec5e6dd597b974e0f926418013c5c9dbe8e291d574ff26b52fdf1a0d1ff54bbe25f04fca3f4b8d4b0e1 diff --git a/sci-astronomy/montage/files/montage-3.3-gcc48.patch b/sci-astronomy/montage/files/montage-3.3-gcc48.patch deleted file mode 100644 index 4846b4c95..000000000 --- a/sci-astronomy/montage/files/montage-3.3-gcc48.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Nur Montage_v3.3.orig/grid/Pegasus/mPresentation.c Montage_v3.3/grid/Pegasus/mPresentation.c ---- Montage_v3.3.orig/grid/Pegasus/mPresentation.c 2009-12-10 19:54:51.000000000 -0800 -+++ Montage_v3.3/grid/Pegasus/mPresentation.c 2014-04-17 14:36:28.735594113 -0700 -@@ -14,6 +14,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <strings.h> -+#include <string.h> - - #define MAXLEN 20000 - -diff -Nur Montage_v3.3.orig/lib/src/coord/ccalc.c Montage_v3.3/lib/src/coord/ccalc.c ---- Montage_v3.3.orig/lib/src/coord/ccalc.c 2009-12-10 19:54:51.000000000 -0800 -+++ Montage_v3.3/lib/src/coord/ccalc.c 2014-04-17 14:11:51.041349620 -0700 -@@ -25,7 +25,7 @@ - static int ConvertfromDD(char *fmt, char *clongprec, char *clatprec, - char *clon, char *clat, double *lon, double *lat); - static char *downcase(char *s); --char *strdup(const char *s1); -+ - int ParseUnits(char *cunit, int *chflag, CoordUnit *unit); - int ParsePrec(CoordUnit units, char *cprec, int longflag); - -diff -Nur Montage_v3.3.orig/lib/src/two_plane_v1.1/initdistdata.c Montage_v3.3/lib/src/two_plane_v1.1/initdistdata.c ---- Montage_v3.3.orig/lib/src/two_plane_v1.1/initdistdata.c 2009-12-10 19:54:51.000000000 -0800 -+++ Montage_v3.3/lib/src/two_plane_v1.1/initdistdata.c 2014-04-17 14:35:14.559081232 -0700 -@@ -1,8 +1,13 @@ - #include <stdio.h> -+#include <string.h> - #include <strings.h> - #include "fitsio.h" - #include "distort.h" - -+int parse_double(char *fitsheader, double *value, const char *key); -+int parse_int(char *fitsheader, int *value, const char *key); -+int parse_str(char *fitsheader, char *value, const char *key); -+ - fitsfile *ffp_FITS_In; - - int openfitsfile(char *fitsfilename) -@@ -21,16 +26,16 @@ - return 0; - } - --closefitsfile() -+int closefitsfile() - { - int I_fits_return_status=0; - fits_close_file(ffp_FITS_In, &I_fits_return_status); - if (I_fits_return_status != 0) - { - fprintf(stderr, "Error closing file\n"); -- return; -+ return -1; - } -- return; -+ return 0; - } - - int initdata_byheader(char *fitsheader, DistCoeff *coeff) -diff -Nur Montage_v3.3.orig/lib/src/two_plane_v1.1/two_plane.c Montage_v3.3/lib/src/two_plane_v1.1/two_plane.c ---- Montage_v3.3.orig/lib/src/two_plane_v1.1/two_plane.c 2010-02-04 11:53:56.000000000 -0800 -+++ Montage_v3.3/lib/src/two_plane_v1.1/two_plane.c 2014-04-17 14:43:20.094377873 -0700 -@@ -21,6 +21,11 @@ - #include "two_plane.h" - #include "distort.h" - -+int undistort(double u, double v, DistCoeff coeff, double *x, double *y); -+int distort(double x, double y, DistCoeff coeff, double *u, double *v); -+int initdata_byheader(char *fitsheader, DistCoeff *coeff); -+ -+ - int plane1_to_plane2_transform(double x_1, double y_1, double *x_2, double *y_2, - struct TwoPlane *two_plane){ - -diff -Nur Montage_v3.3.orig/lib/src/wcstools-3.8.1/libwcs/imhfile.c Montage_v3.3/lib/src/wcstools-3.8.1/libwcs/imhfile.c ---- Montage_v3.3.orig/lib/src/wcstools-3.8.1/libwcs/imhfile.c 2007-01-08 09:24:29.000000000 -0800 -+++ Montage_v3.3/lib/src/wcstools-3.8.1/libwcs/imhfile.c 2014-04-17 14:40:06.993064103 -0700 -@@ -1019,7 +1019,6 @@ - nbw = write (fd, image, nbimage); - close (fd); - -- free (pixname); - return (nbw); - } - -diff -Nur Montage_v3.3.orig/util/TblExec/mTblExec.c Montage_v3.3/util/TblExec/mTblExec.c ---- Montage_v3.3.orig/util/TblExec/mTblExec.c 2009-12-10 19:54:51.000000000 -0800 -+++ Montage_v3.3/util/TblExec/mTblExec.c 2014-04-17 14:49:34.896939154 -0700 -@@ -4,6 +4,7 @@ - #include <ctype.h> - #include <sys/types.h> - #include <time.h> -+#include <unistd.h> - - #include <mtbl.h> - #include <svc.h> diff --git a/sci-astronomy/montage/metadata.xml b/sci-astronomy/montage/metadata.xml deleted file mode 100644 index 5fda38153..000000000 --- a/sci-astronomy/montage/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>sci-astronomy@gentoo.org</email> - <name>Gentoo Astronomy Project</name> -</maintainer> -<longdescription lang="en"> - Montage is a toolkit for assembling Flexible Image Transport System - (FITS) images into custom mosaics -</longdescription> -</pkgmetadata> diff --git a/sci-astronomy/montage/montage-3.3.ebuild b/sci-astronomy/montage/montage-3.3.ebuild deleted file mode 100644 index 260796d6b..000000000 --- a/sci-astronomy/montage/montage-3.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs - -MYP=Montage_v${PV} - -DESCRIPTION="Astronomical image mosaic engine" -HOMEPAGE="http://montage.ipac.caltech.edu/" -SRC_URI="http://montage.ipac.caltech.edu/download/${MYP}.tar.gz - doc? ( http://montage.ipac.caltech.edu/docs/docs.tar.gz -> ${PN}-docs.tar.gz )" - -LICENSE="Montage" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -SLOT="0" - -IUSE="doc mpi" - -# unfortunate upstream patching, cfitsio, wcstools, jpeg -# see docs/ExternalLibraries - -RDEPEND="" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc48.patch - use doc && mv "${WORKDIR}"/docs/* docs/ - tc-export CC AR - - find . -name Makefile\* | xargs sed -i \ - -e "/^CC.*=/s:\(gcc\|cc\):$(tc-getCC):g" \ - -e "/^CFLAGS.*=/s:-g:${CFLAGS}:g" \ - -e "s:ar q:$(tc-getAR) q:g" || die - - if use mpi; then - sed -i \ - -e 's:# MPICC:MPICC:' \ - -e 's:# BINS:BINS:' \ - Montage/Makefile || die - fi -} - -src_install () { - dobin bin/* - dodoc README ChangeHistory - if use doc; then - insinto /usr/share/doc/${PF} - doins -r docs/* - fi -} |