1 |
commit: c34f378cc207d91142eadf7003ac05ea987fdb8f |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 27 20:31:12 2014 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 27 20:31:12 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c34f378c |
7 |
|
8 |
sci-astronomy/psfex: EAPI-5, autotools-utils, fixed plplot flag |
9 |
|
10 |
Package-Manager: portage-2.2.8-prefix |
11 |
|
12 |
--- |
13 |
sci-astronomy/psfex/ChangeLog | 8 ++++- |
14 |
sci-astronomy/psfex/metadata.xml | 10 +++--- |
15 |
sci-astronomy/psfex/psfex-3.9.1-r1.ebuild | 54 ------------------------------- |
16 |
sci-astronomy/psfex/psfex-3.9.1.ebuild | 1 + |
17 |
sci-astronomy/psfex/psfex-9999.ebuild | 26 ++++++++++----- |
18 |
5 files changed, 31 insertions(+), 68 deletions(-) |
19 |
|
20 |
diff --git a/sci-astronomy/psfex/ChangeLog b/sci-astronomy/psfex/ChangeLog |
21 |
index 40b804c..1baf9a8 100644 |
22 |
--- a/sci-astronomy/psfex/ChangeLog |
23 |
+++ b/sci-astronomy/psfex/ChangeLog |
24 |
@@ -1,7 +1,13 @@ |
25 |
# ChangeLog for sci-astronomy/psfex |
26 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
# $Header: $ |
29 |
|
30 |
+*psfex-3.9.1 (27 Feb 2014) |
31 |
+ |
32 |
+ 27 Feb 2014; Sébastien Fabbro <bicatali@g.o> +psfex-3.9.1.ebuild, |
33 |
+ -psfex-3.9.1-r1.ebuild, metadata.xml, psfex-9999.ebuild: |
34 |
+ sci-astronomy/psfex: EAPI-5, autotools-utils, fixed plplot flag |
35 |
+ |
36 |
14 Jun 2013; Justin Lecher <jlec@g.o> psfex-9999.ebuild, metadata.xml: |
37 |
Drop KEYWORDS of live ebuilds |
38 |
|
39 |
|
40 |
diff --git a/sci-astronomy/psfex/metadata.xml b/sci-astronomy/psfex/metadata.xml |
41 |
index 1dfc18a..4f00f5a 100644 |
42 |
--- a/sci-astronomy/psfex/metadata.xml |
43 |
+++ b/sci-astronomy/psfex/metadata.xml |
44 |
@@ -1,14 +1,14 @@ |
45 |
<?xml version="1.0" encoding="UTF-8"?> |
46 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
47 |
<pkgmetadata> |
48 |
- <herd>sci-astronomy</herd> |
49 |
- <longdescription lang="en"> |
50 |
+<herd>sci-astronomy</herd> |
51 |
+<longdescription lang="en"> |
52 |
PSFEx (“PSF Extractor”) extracts models of the Point Spread |
53 |
Function (PSF) from FITS images processed with <pkg>sci-libs/sextractor</pkg>, and |
54 |
measures the quality of images. The generated PSF models can be used |
55 |
for model-fitting photometry or morphological analyses. |
56 |
</longdescription> |
57 |
- <use> |
58 |
- <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag> |
59 |
- </use> |
60 |
+<use> |
61 |
+ <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag> |
62 |
+</use> |
63 |
</pkgmetadata> |
64 |
|
65 |
diff --git a/sci-astronomy/psfex/psfex-3.9.1-r1.ebuild b/sci-astronomy/psfex/psfex-3.9.1-r1.ebuild |
66 |
deleted file mode 100644 |
67 |
index 95db3e0..0000000 |
68 |
--- a/sci-astronomy/psfex/psfex-3.9.1-r1.ebuild |
69 |
+++ /dev/null |
70 |
@@ -1,54 +0,0 @@ |
71 |
-# Copyright 1999-2014 Gentoo Foundation |
72 |
-# Distributed under the terms of the GNU General Public License v2 |
73 |
-# $Header: $ |
74 |
- |
75 |
-EAPI=4 |
76 |
- |
77 |
-inherit autotools |
78 |
- |
79 |
-DESCRIPTION="Extracts models of the Point Spread Function from FITS images" |
80 |
-HOMEPAGE="http://www.astromatic.net/software/psfex" |
81 |
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" |
82 |
- |
83 |
-LICENSE="GPL-3" |
84 |
-SLOT="0" |
85 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
86 |
-IUSE="doc plplot threads" |
87 |
- |
88 |
-RDEPEND="sci-libs/atlas[lapack] |
89 |
- sci-libs/fftw:3.0 |
90 |
- plplot? ( sci-libs/plplot )" |
91 |
-DEPEND="${RDEPEND}" |
92 |
- |
93 |
-src_prepare() { |
94 |
- local mycblas=atlcblas myclapack=atlclapack |
95 |
- if use threads; then |
96 |
- [[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \ |
97 |
- mycblas=ptcblas |
98 |
- [[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] && \ |
99 |
- myclapack=ptclapack |
100 |
- fi |
101 |
- # fix the configure and not the acx_atlas.m4. the eautoreconf will |
102 |
- # produce a configure giving a wrong install Makefile target (to fix) |
103 |
- sed -i \ |
104 |
- -e "s/-lcblas/-l${mycblas}/g" \ |
105 |
- -e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \ |
106 |
- -e "s/-llapack/-l${myclapack}/g" \ |
107 |
- -e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \ |
108 |
- acx_atlas.m4 || die |
109 |
- # fix for newer plplot |
110 |
- sed -i -e 's/plcol(/plcol0(/g' src/cplot.c || die |
111 |
- eautoreconf |
112 |
-} |
113 |
- |
114 |
-src_configure() { |
115 |
- econf \ |
116 |
- --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \ |
117 |
- $(use_with plplot) \ |
118 |
- $(use_enable threads) |
119 |
-} |
120 |
- |
121 |
-src_install () { |
122 |
- default |
123 |
- use doc && dodoc doc/* |
124 |
-} |
125 |
|
126 |
diff --git a/sci-astronomy/psfex/psfex-3.9.1.ebuild b/sci-astronomy/psfex/psfex-3.9.1.ebuild |
127 |
new file mode 120000 |
128 |
index 0000000..1942f52 |
129 |
--- /dev/null |
130 |
+++ b/sci-astronomy/psfex/psfex-3.9.1.ebuild |
131 |
@@ -0,0 +1 @@ |
132 |
+psfex-9999.ebuild |
133 |
\ No newline at end of file |
134 |
|
135 |
diff --git a/sci-astronomy/psfex/psfex-9999.ebuild b/sci-astronomy/psfex/psfex-9999.ebuild |
136 |
index 0e10198..db4df69 100644 |
137 |
--- a/sci-astronomy/psfex/psfex-9999.ebuild |
138 |
+++ b/sci-astronomy/psfex/psfex-9999.ebuild |
139 |
@@ -2,7 +2,7 @@ |
140 |
# Distributed under the terms of the GNU General Public License v2 |
141 |
# $Header: $ |
142 |
|
143 |
-EAPI=4 |
144 |
+EAPI=5 |
145 |
|
146 |
if [[ ${PV} == "9999" ]] ; then |
147 |
_SVN=subversion |
148 |
@@ -14,7 +14,10 @@ else |
149 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
150 |
fi |
151 |
|
152 |
-inherit ${_SVN} autotools |
153 |
+AUTOTOOLS_AUTORECONF=1 |
154 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
155 |
+ |
156 |
+inherit ${_SVN} autotools-utils multilib |
157 |
|
158 |
DESCRIPTION="Extracts models of the Point Spread Function from FITS images" |
159 |
HOMEPAGE="http://www.astromatic.net/software/psfex" |
160 |
@@ -23,7 +26,8 @@ LICENSE="GPL-3" |
161 |
SLOT="0" |
162 |
IUSE="doc threads plplot" |
163 |
|
164 |
-RDEPEND="sci-libs/atlas[lapack] |
165 |
+RDEPEND=" |
166 |
+ sci-libs/atlas[lapack,threads=] |
167 |
sci-libs/fftw:3.0 |
168 |
plplot? ( sci-libs/plplot )" |
169 |
DEPEND="${RDEPEND}" |
170 |
@@ -42,19 +46,25 @@ src_prepare() { |
171 |
-e "s/-lcblas/-l${mycblas}/g" \ |
172 |
-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \ |
173 |
-e "s/-llapack/-l${myclapack}/g" \ |
174 |
+ -e "s/\(lapack_lib=\).*/\1${myclapack}/g" \ |
175 |
-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \ |
176 |
acx_atlas.m4 || die |
177 |
- eautoreconf |
178 |
+ |
179 |
+ # fix for newer plplot |
180 |
+ sed -i -e 's/plcol(/plcol0(/g' src/cplot.c || die |
181 |
+ autotools-utils_src_prepare |
182 |
} |
183 |
|
184 |
src_configure() { |
185 |
- econf \ |
186 |
- --with-atlas-incdir="${EPREFIX}/usr/include/atlas" \ |
187 |
- $(use_with plplot) \ |
188 |
+ local myeconfargs=( |
189 |
+ --with-atlas-incdir="${EPREFIX}/usr/include/atlas" |
190 |
+ $(use_enable plplot) |
191 |
$(use_enable threads) |
192 |
+ ) |
193 |
+ autotools-utils_src_configure |
194 |
} |
195 |
|
196 |
src_install () { |
197 |
- default |
198 |
+ autotools-utils_src_install |
199 |
use doc && dodoc doc/* |
200 |
} |