1 |
commit: 96691fbee2869ccf9e21432f9e0b8f8adaaa7c9a |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 24 21:12:42 2016 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 24 21:31:43 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96691fbe |
7 |
|
8 |
sci-astronomy/cpl: Version bump |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
sci-astronomy/cpl/Manifest | 4 +- |
13 |
sci-astronomy/cpl/cpl-6.3.1.ebuild | 74 ---------------------- |
14 |
sci-astronomy/cpl/cpl-6.4.ebuild | 74 ---------------------- |
15 |
.../cpl/{cpl-6.4.1.ebuild => cpl-6.6.1.ebuild} | 36 ++++++----- |
16 |
.../cpl/files/cpl-6.6.1-use-system-ltdl.patch | 41 ++++++++++++ |
17 |
5 files changed, 62 insertions(+), 167 deletions(-) |
18 |
|
19 |
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest |
20 |
index c81650d..a19b267 100644 |
21 |
--- a/sci-astronomy/cpl/Manifest |
22 |
+++ b/sci-astronomy/cpl/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST cpl-6.3.1.tar.gz 2981414 SHA256 457d54d01cf356e9898fb2f226f057099a481e183a2eaabd34a7b4c865e10089 SHA512 b597968978ca87048b25ee7fd8ff6ebb483e1fd4c6c4fb515720bf468fe67e7b8a25cc9bf7141c18520ba37dcde9654bd5b46d9adcacba8b51780ff671bcdf76 WHIRLPOOL 1f5c224daaa79c689196cfdf2825574881f060d0e5c2ea6c48937a33c5feaec404f30c5f0abf48d352f0240255accdec1223a9c7b11b93b410f1d5e38a8c7e96 |
25 |
-DIST cpl-6.4.1.tar.gz 3013536 SHA256 03ded24eb87a57023b20e51a7a46d0f807c6dd9ea9c3286fe45f94e26cab4193 SHA512 5925f2bc5bf3828e6cfca78636bb2bb3d08f1b75ca8a16b8279b40bf5f57096d4ba7444aa28c0c354ae0755e2524ef0e56a23d2c87a23b7a9f52560667ce8bab WHIRLPOOL 7eb3be12692d2f72ba5211d001da4bc5d830daa1fd6059d15591c3987131fc54081120adb1519677b46274d71a91c7b1507174bab62be29589f9af0a0d122b19 |
26 |
DIST cpl-6.4.2.tar.gz 3165143 SHA256 848dbbc581670b32eeb3d87a7c3c10c9d3969f0fcbe7daf8ba18ef0081cbc793 SHA512 636ce549f23862a111fd88e97878eff8b86c88e8e2e800533b2f34f219f6b6ea3f03bd9de6ce9606c3787d0a61fb66a6bd92087d24c57c47e5a26e31eb362a11 WHIRLPOOL 7368e323c4f00af8fc684ba1448eec20f229df310b9cd66f0fe046dd6900a195c04fbc1c78dd31600651c8e7911f49517a37ddb4ba89df235fadb5c0e1a0cb81 |
27 |
-DIST cpl-6.4.tar.gz 3012686 SHA256 af3024bccf70632df613a6aff475d3614983cdac31211614fb0412217af0b79f SHA512 26170c144cd72c7b597286458fdbb5c91ebdfff4362d095b47035a8569f930ff5956ffd6b7f86ea066d8dbd6b78ae0569eba5ce6a5c6a20381478e188161ead8 WHIRLPOOL be59b8c9347a701573da97a6e142d725332a6c9f3de291eb6982706cae33d14c0f1edb23a3467a656e1378558e3292c8deba19f2a17a901fe6217f974a229c54 |
28 |
+DIST cpl-6.6.1.tar.gz 3082051 SHA256 16cd1c5a165526423d5dd7999f9080e1fa143fc38778329744cf59fd24e1bb84 SHA512 261cd092b3d0f1865f2e1aca0760232497cfe85b92f61601b22d81619147cad17c427791adad5a863acb3febcfe78590c8f8d10de1d626f4b90302326f936064 WHIRLPOOL ea7c5f7792da54a46eec9f3a8e040c2598b8ec95a9aeccc8451e77aa9773c2ccdf3113e91f2f6f2c21782ab31293922a6195e0df7da30a369a1396328ace5251 |
29 |
|
30 |
diff --git a/sci-astronomy/cpl/cpl-6.3.1.ebuild b/sci-astronomy/cpl/cpl-6.3.1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 199b8db..0000000 |
33 |
--- a/sci-astronomy/cpl/cpl-6.3.1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,74 +0,0 @@ |
36 |
-# Copyright 1999-2013 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
-# $Id$ |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-JAVA_PKG_OPT_USE=gasgano |
43 |
-AUTOTOOLS_AUTORECONF=1 |
44 |
- |
45 |
-inherit eutils java-pkg-opt-2 autotools-utils |
46 |
- |
47 |
-DESCRIPTION="ESO common pipeline library for astronomical data reduction" |
48 |
-HOMEPAGE="http://www.eso.org/sci/software/cpl/" |
49 |
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz" |
50 |
- |
51 |
-LICENSE="GPL-2" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
54 |
- |
55 |
-IUSE="doc gasgano static-libs threads" |
56 |
- |
57 |
-RDEPEND=" |
58 |
- >=sci-astronomy/wcslib-4.8.4 |
59 |
- >=sci-libs/cfitsio-3.310 |
60 |
- >=sci-libs/fftw-3.1.2 |
61 |
- gasgano? ( sci-astronomy/gasgano )" |
62 |
-DEPEND="${RDEPEND} |
63 |
- doc? ( app-doc/doxygen )" |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch |
67 |
- "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch |
68 |
-) |
69 |
- |
70 |
-src_prepare() { |
71 |
- # bug 422455 and remove cpu chcking |
72 |
- sed -i \ |
73 |
- -e '/AM_C_PROTOTYPES/d' \ |
74 |
- -e '/CPL_CHECK_CPU/d' \ |
75 |
- configure.ac libcext/configure.ac || die |
76 |
- autotools-utils_src_prepare |
77 |
-} |
78 |
- |
79 |
-src_configure() { |
80 |
- local myeconfargs=( |
81 |
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
82 |
- --disable-ltdl-install |
83 |
- --without-included-ltdl |
84 |
- --with-cfitsio="${EPREFIX}/usr" |
85 |
- --with-wcs="${EPREFIX}/usr" |
86 |
- --with-fftw="${EPREFIX}/usr" |
87 |
- $(use_enable doc maintainer-mode) |
88 |
- $(use_enable threads) |
89 |
- ) |
90 |
- if use gasgano; then |
91 |
- myeconfargs+=( |
92 |
- --enable-gasgano |
93 |
- --with-gasgano="${EPREFIX}/usr" |
94 |
- --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib" |
95 |
- --with-java="$(java-config -O)" |
96 |
- ) |
97 |
- else |
98 |
- myeconfargs+=( --disable-gasgano ) |
99 |
- fi |
100 |
- autotools-utils_src_configure |
101 |
-} |
102 |
- |
103 |
-src_compile() { |
104 |
- autotools-utils_src_compile all $(use doc && echo html) |
105 |
-} |
106 |
- |
107 |
-src_install() { |
108 |
- autotools-utils_src_install all $(use doc && echo install-html) |
109 |
-} |
110 |
|
111 |
diff --git a/sci-astronomy/cpl/cpl-6.4.ebuild b/sci-astronomy/cpl/cpl-6.4.ebuild |
112 |
deleted file mode 100644 |
113 |
index d714c53..0000000 |
114 |
--- a/sci-astronomy/cpl/cpl-6.4.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,74 +0,0 @@ |
117 |
-# Copyright 1999-2014 Gentoo Foundation |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
-# $Id$ |
120 |
- |
121 |
-EAPI=5 |
122 |
- |
123 |
-JAVA_PKG_OPT_USE=gasgano |
124 |
-AUTOTOOLS_AUTORECONF=1 |
125 |
- |
126 |
-inherit eutils java-pkg-opt-2 autotools-utils |
127 |
- |
128 |
-DESCRIPTION="ESO common pipeline library for astronomical data reduction" |
129 |
-HOMEPAGE="http://www.eso.org/sci/software/cpl/" |
130 |
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz" |
131 |
- |
132 |
-LICENSE="GPL-2" |
133 |
-SLOT="0/20" |
134 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
135 |
- |
136 |
-IUSE="doc gasgano static-libs threads" |
137 |
- |
138 |
-RDEPEND=" |
139 |
- >=sci-astronomy/wcslib-4.8.4 |
140 |
- >=sci-libs/cfitsio-3.310 |
141 |
- >=sci-libs/fftw-3.1.2 |
142 |
- gasgano? ( sci-astronomy/gasgano )" |
143 |
-DEPEND="${RDEPEND} |
144 |
- doc? ( app-doc/doxygen )" |
145 |
- |
146 |
-PATCHES=( |
147 |
- "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch |
148 |
- "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch |
149 |
-) |
150 |
- |
151 |
-src_prepare() { |
152 |
- # bug 422455 and remove cpu chcking |
153 |
- sed -i \ |
154 |
- -e '/AM_C_PROTOTYPES/d' \ |
155 |
- -e '/CPL_CHECK_CPU/d' \ |
156 |
- configure.ac libcext/configure.ac || die |
157 |
- autotools-utils_src_prepare |
158 |
-} |
159 |
- |
160 |
-src_configure() { |
161 |
- local myeconfargs=( |
162 |
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
163 |
- --disable-ltdl-install |
164 |
- --without-included-ltdl |
165 |
- --with-cfitsio="${EPREFIX}/usr" |
166 |
- --with-wcs="${EPREFIX}/usr" |
167 |
- --with-fftw="${EPREFIX}/usr" |
168 |
- $(use_enable doc maintainer-mode) |
169 |
- $(use_enable threads) |
170 |
- ) |
171 |
- if use gasgano; then |
172 |
- myeconfargs+=( |
173 |
- --enable-gasgano |
174 |
- --with-gasgano="${EPREFIX}/usr" |
175 |
- --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib" |
176 |
- --with-java="$(java-config -O)" |
177 |
- ) |
178 |
- else |
179 |
- myeconfargs+=( --disable-gasgano ) |
180 |
- fi |
181 |
- autotools-utils_src_configure |
182 |
-} |
183 |
- |
184 |
-src_compile() { |
185 |
- autotools-utils_src_compile all $(use doc && echo html) |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- autotools-utils_src_install all $(use doc && echo install-html) |
190 |
-} |
191 |
|
192 |
diff --git a/sci-astronomy/cpl/cpl-6.4.1.ebuild b/sci-astronomy/cpl/cpl-6.6.1.ebuild |
193 |
similarity index 67% |
194 |
rename from sci-astronomy/cpl/cpl-6.4.1.ebuild |
195 |
rename to sci-astronomy/cpl/cpl-6.6.1.ebuild |
196 |
index 36da138..6fbc159 100644 |
197 |
--- a/sci-astronomy/cpl/cpl-6.4.1.ebuild |
198 |
+++ b/sci-astronomy/cpl/cpl-6.6.1.ebuild |
199 |
@@ -1,13 +1,12 @@ |
200 |
-# Copyright 1999-2014 Gentoo Foundation |
201 |
+# Copyright 1999-2016 Gentoo Foundation |
202 |
# Distributed under the terms of the GNU General Public License v2 |
203 |
# $Id$ |
204 |
|
205 |
-EAPI=5 |
206 |
+EAPI=6 |
207 |
|
208 |
JAVA_PKG_OPT_USE=gasgano |
209 |
-AUTOTOOLS_AUTORECONF=1 |
210 |
|
211 |
-inherit eutils java-pkg-opt-2 autotools-utils |
212 |
+inherit autotools java-pkg-opt-2 |
213 |
|
214 |
DESCRIPTION="ESO common pipeline library for astronomical data reduction" |
215 |
HOMEPAGE="http://www.eso.org/sci/software/cpl/" |
216 |
@@ -21,24 +20,25 @@ IUSE="doc gasgano static-libs threads" |
217 |
|
218 |
RDEPEND=" |
219 |
sci-astronomy/wcslib:0= |
220 |
- >=sci-libs/cfitsio-3.310:0= |
221 |
+ sci-libs/cfitsio:0= |
222 |
sci-libs/fftw:3.0= |
223 |
gasgano? ( sci-astronomy/gasgano )" |
224 |
DEPEND="${RDEPEND} |
225 |
doc? ( app-doc/doxygen )" |
226 |
|
227 |
PATCHES=( |
228 |
- "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch |
229 |
- "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch |
230 |
+ "${FILESDIR}"/${PN}-6.6.1-use-system-ltdl.patch |
231 |
) |
232 |
|
233 |
src_prepare() { |
234 |
- # bug 422455 and remove cpu chcking |
235 |
- sed -i \ |
236 |
- -e '/AM_C_PROTOTYPES/d' \ |
237 |
- -e '/CPL_CHECK_CPU/d' \ |
238 |
- configure.ac libcext/configure.ac || die |
239 |
- autotools-utils_src_prepare |
240 |
+ default |
241 |
+ # remove cpu chcking |
242 |
+ sed -e '/CPL_CHECK_CPU/d' \ |
243 |
+ -i configure.ac libcext/configure.ac || die |
244 |
+ # search for shared libs, not static |
245 |
+ sed -e 's/\.a/\.so/g' \ |
246 |
+ -i m4/cpl.m4 || die |
247 |
+ eautoreconf |
248 |
} |
249 |
|
250 |
src_configure() { |
251 |
@@ -50,6 +50,7 @@ src_configure() { |
252 |
--with-wcs="${EPREFIX}/usr" |
253 |
--with-fftw="${EPREFIX}/usr" |
254 |
$(use_enable doc maintainer-mode) |
255 |
+ $(use_enable static-libs static) |
256 |
$(use_enable threads) |
257 |
) |
258 |
if use gasgano; then |
259 |
@@ -62,13 +63,16 @@ src_configure() { |
260 |
else |
261 |
myeconfargs+=( --disable-gasgano ) |
262 |
fi |
263 |
- autotools-utils_src_configure |
264 |
+ econf ${myeconfargs[@]} |
265 |
} |
266 |
|
267 |
src_compile() { |
268 |
- autotools-utils_src_compile all $(use doc && echo html) |
269 |
+ default |
270 |
+ use doc && emake html |
271 |
} |
272 |
|
273 |
src_install() { |
274 |
- autotools-utils_src_install all $(use doc && echo install-html) |
275 |
+ default |
276 |
+ prune_libtool_files --all |
277 |
+ use doc && emake install-html |
278 |
} |
279 |
|
280 |
diff --git a/sci-astronomy/cpl/files/cpl-6.6.1-use-system-ltdl.patch b/sci-astronomy/cpl/files/cpl-6.6.1-use-system-ltdl.patch |
281 |
new file mode 100644 |
282 |
index 0000000..37ef2b5 |
283 |
--- /dev/null |
284 |
+++ b/sci-astronomy/cpl/files/cpl-6.6.1-use-system-ltdl.patch |
285 |
@@ -0,0 +1,41 @@ |
286 |
+use system libtdl from libtool instead of bundled one |
287 |
+see http://www.flameeyes.eu/autotools-mythbuster/libtool/plugins.html |
288 |
+bicatali@g.o |
289 |
+ |
290 |
+--- cpl-7.0.orig/configure.ac 2012-06-04 18:38:01.000000000 +0100 |
291 |
++++ cpl-7.0/configure.ac 2012-06-04 22:14:23.000000000 +0100 |
292 |
+@@ -60,8 +60,9 @@ |
293 |
+ AC_ENABLE_STATIC(yes) |
294 |
+ AC_ENABLE_SHARED(yes) |
295 |
+ |
296 |
+-AC_LIBLTDL_CONVENIENCE |
297 |
+-AC_PROG_LIBTOOL |
298 |
++LT_INIT([dlopen]) |
299 |
++LT_CONFIG_LTDL_DIR([libltdl]) |
300 |
++AC_LIB_LTDL |
301 |
+ AC_SUBST(INCLTDL) |
302 |
+ AC_SUBST(LIBLTDL) |
303 |
+ AC_SUBST(LIBTOOL_DEPS) |
304 |
+@@ -131,7 +135,6 @@ |
305 |
+ CPL_CONFIG_FUNC |
306 |
+ |
307 |
+ # Configure subpackages |
308 |
+-AC_CONFIG_SUBDIRS(libltdl) |
309 |
+ |
310 |
+ if test ! x$"cpl_cv_with_system_cext" = xyes; then |
311 |
+ AC_CONFIG_SUBDIRS([libcext]) |
312 |
+--- cpl-7.0.orig/Makefile.am |
313 |
++++ cpl-7.0/Makefile.am |
314 |
+@@ -25,11 +25,10 @@ |
315 |
+ DISTCLEANFILES = *~ |
316 |
+ |
317 |
+ if GASGANO_SUPPORT |
318 |
+-libltdl = libltdl |
319 |
+ cpljava = cpljava |
320 |
+ endif |
321 |
+ |
322 |
+-SUBDIRS = $(libltdl) $(libcext) cplcore cplui cpldrs cpldfs $(cpljava) |
323 |
++SUBDIRS = $(libcext) cplcore cplui cpldrs cpldfs $(cpljava) |
324 |
+ |
325 |
+ HTML_SUBDIRS = |
326 |
+ |