1 |
commit: f8c042ae7c7ae2e8bf7a96f1a0e1ae373b6436b8 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 2 04:23:57 2017 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 2 13:48:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c042ae |
7 |
|
8 |
sci-astronomy/montage: version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
sci-astronomy/montage/Manifest | 1 + |
13 |
.../files/montage-5.0-fix_freetype_incude.patch | 35 +++++++++++ |
14 |
sci-astronomy/montage/montage-5.0.ebuild | 67 ++++++++++++++++++++++ |
15 |
3 files changed, 103 insertions(+) |
16 |
|
17 |
diff --git a/sci-astronomy/montage/Manifest b/sci-astronomy/montage/Manifest |
18 |
index 06c81c3914c..49c8a0f4c24 100644 |
19 |
--- a/sci-astronomy/montage/Manifest |
20 |
+++ b/sci-astronomy/montage/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
+DIST Montage_v5.0.tar.gz 14663443 SHA256 72e034adb77c8a05ac40daf9d1923c66e94faa0b08d3d441256d9058fbc2aa34 SHA512 1396c7f846db4844d2e861622d152f2115ad4c684da02bb14116dfe3d01b559feaf29572663d0dfd234aa50843afaca3bb072d9127fbb2b539a14327c48499ae WHIRLPOOL f5fc9d93d88c95ff079932d9e5f0ed61a0f30bec6bd2df5e50abfce6b171cee1b2b3e6dbed2ad1e65a7c69531b4475d62840b14f299ceffa6e65788cd9812579 |
23 |
DIST montage-4.1.tar.gz 38542751 SHA256 12e463c30de190d6e8e215ef19ee787010194190e3df5ea579b6f3647804a5b4 SHA512 a4e6572c0ce04ca950cb425e2589d85609d037e57c575d4efa67b277cecf5e54a2e6d307914ee99997baaba7c5bdd43c72b1e1893111eacc065785689bfc17fb WHIRLPOOL bfd136b52a9c7b0bdceaaa0110b0476e8cb991c64ab4b646b60250e57f282fbe40c9795cef804b15caf29e0628dcb16157af11a1aa4f7e4f7c66c91f969f6484 |
24 |
|
25 |
diff --git a/sci-astronomy/montage/files/montage-5.0-fix_freetype_incude.patch b/sci-astronomy/montage/files/montage-5.0-fix_freetype_incude.patch |
26 |
new file mode 100644 |
27 |
index 00000000000..42fd94950b8 |
28 |
--- /dev/null |
29 |
+++ b/sci-astronomy/montage/files/montage-5.0-fix_freetype_incude.patch |
30 |
@@ -0,0 +1,35 @@ |
31 |
+From: Ole Streicher <olebole@××××××.org> |
32 |
+Date: Thu, 22 Dec 2016 14:24:44 +0100 |
33 |
+Subject: Fix freetype include path |
34 |
+ |
35 |
+--- |
36 |
+ MontageLib/Viewer/mViewer_graphics.c | 2 +- |
37 |
+ util/Viewer/graphics.c | 2 +- |
38 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
39 |
+ |
40 |
+diff --git a/MontageLib/Viewer/mViewer_graphics.c b/MontageLib/Viewer/mViewer_graphics.c |
41 |
+index 932ca5f..a50281d 100644 |
42 |
+--- a/MontageLib/Viewer/mViewer_graphics.c |
43 |
++++ b/MontageLib/Viewer/mViewer_graphics.c |
44 |
+@@ -1,7 +1,7 @@ |
45 |
+ #include <stdio.h> |
46 |
+ #include <math.h> |
47 |
+ #include <freetype2/ft2build.h> |
48 |
+-#include <freetype.h> |
49 |
++#include FT_FREETYPE_H |
50 |
+ |
51 |
+ void mViewer_labeledCurve (char *face_path, int fontsize, int showLine, |
52 |
+ double *xcurve, double *ycurve, int npt, |
53 |
+diff --git a/util/Viewer/graphics.c b/util/Viewer/graphics.c |
54 |
+index 6bb7d8d..f7a5215 100644 |
55 |
+--- a/util/Viewer/graphics.c |
56 |
++++ b/util/Viewer/graphics.c |
57 |
+@@ -1,7 +1,7 @@ |
58 |
+ #include <stdio.h> |
59 |
+ #include <math.h> |
60 |
+ #include <freetype2/ft2build.h> |
61 |
+-#include <freetype.h> |
62 |
++#include FT_FREETYPE_H |
63 |
+ |
64 |
+ void labeled_curve (char *face_path, int fontsize, int showLine, |
65 |
+ double *xcurve, double *ycurve, int npt, |
66 |
|
67 |
diff --git a/sci-astronomy/montage/montage-5.0.ebuild b/sci-astronomy/montage/montage-5.0.ebuild |
68 |
new file mode 100644 |
69 |
index 00000000000..91e67534e2f |
70 |
--- /dev/null |
71 |
+++ b/sci-astronomy/montage/montage-5.0.ebuild |
72 |
@@ -0,0 +1,67 @@ |
73 |
+# Copyright 1999-2017 Gentoo Foundation |
74 |
+# Distributed under the terms of the GNU General Public License v2 |
75 |
+ |
76 |
+EAPI=6 |
77 |
+ |
78 |
+inherit eutils toolchain-funcs |
79 |
+ |
80 |
+MYPN=Montage |
81 |
+ |
82 |
+DESCRIPTION="Toolkit for assembling FITS images into mosaics" |
83 |
+HOMEPAGE="http://montage.ipac.caltech.edu/" |
84 |
+SRC_URI="http://montage.ipac.caltech.edu/download/${MYPN}_v${PV}.tar.gz" |
85 |
+ |
86 |
+LICENSE="BSD GPL-2" |
87 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
88 |
+SLOT="0" |
89 |
+ |
90 |
+IUSE="doc mpi" |
91 |
+ |
92 |
+RDEPEND=" |
93 |
+ media-libs/freetype:2= |
94 |
+ sci-astronomy/wcstools:0= |
95 |
+ sci-libs/cfitsio:0= |
96 |
+ virtual/jpeg:0 |
97 |
+ mpi? ( virtual/mpi )" |
98 |
+DEPEND="${RDEPEND}" |
99 |
+ |
100 |
+PATCHES=( |
101 |
+ "${FILESDIR}"/${PN}-4.1-fix_format_errors.patch |
102 |
+ "${FILESDIR}"/${PN}-4.1-initdistdata.patch |
103 |
+ "${FILESDIR}"/${PN}-5.0-fix_freetype_incude.patch |
104 |
+) |
105 |
+ |
106 |
+S="${WORKDIR}/${MYPN}" |
107 |
+ |
108 |
+src_prepare() { |
109 |
+ default |
110 |
+ sed -e '/cfitsio/d' \ |
111 |
+ -e '/wcssubs/d' \ |
112 |
+ -e '/jpeg/d' \ |
113 |
+ -e '/freetype/d' \ |
114 |
+ -i lib/src/Makefile || die |
115 |
+ |
116 |
+ tc-export CC AR |
117 |
+ |
118 |
+ find . -name Makefile\* | xargs sed -i \ |
119 |
+ -e "/^CC.*=/s:\(gcc\|cc\):$(tc-getCC):g" \ |
120 |
+ -e "/^CFLAGS.*=/s:-g:${CFLAGS} $($(tc-getPKG_CONFIG) --cflags wcstools):g" \ |
121 |
+ -e "s:-I../../lib/freetype/include :$($(tc-getPKG_CONFIG) --cflags freetype2):g" \ |
122 |
+ -e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:g' \ |
123 |
+ -e "s:-lwcs:$($(tc-getPKG_CONFIG) --libs wcstools):g" \ |
124 |
+ -e "s:-lcfitsio:$($(tc-getPKG_CONFIG) --libs cfitsio):g" \ |
125 |
+ -e 's:-lnsl::g' \ |
126 |
+ -e "s:ar q:$(tc-getAR) q:g" || die |
127 |
+ |
128 |
+ if use mpi; then |
129 |
+ sed -e 's:# MPICC:MPICC:' \ |
130 |
+ -e 's:# BINS:BINS:' \ |
131 |
+ -i Montage/Makefile.* || die |
132 |
+ fi |
133 |
+} |
134 |
+ |
135 |
+src_install () { |
136 |
+ dobin bin/* |
137 |
+ dodoc README* ChangeHistory |
138 |
+ use doc && dodoc -r man/* |
139 |
+} |