1 |
commit: 8d9d0ff89910ae6e6caccdcf93245cddf3e9219a |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 28 16:32:14 2019 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 28 16:32:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9d0ff8 |
7 |
|
8 |
sci-astronomy/astrometry: remove last-rited pkg |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
|
12 |
sci-astronomy/astrometry/Manifest | 3 - |
13 |
sci-astronomy/astrometry/astrometry-0.67-r2.ebuild | 108 ------------------- |
14 |
sci-astronomy/astrometry/astrometry-0.70.ebuild | 108 ------------------- |
15 |
sci-astronomy/astrometry/astrometry-0.72.ebuild | 115 --------------------- |
16 |
.../astrometry/files/astrometry-0.67-dynlink.patch | 78 -------------- |
17 |
.../astrometry/files/astrometry-0.67-qsortr.patch | 10 -- |
18 |
.../astrometry/files/astrometry-0.67-soname.patch | 25 ----- |
19 |
.../astrometry/files/astrometry-0.72-dynlink.patch | 92 ----------------- |
20 |
sci-astronomy/astrometry/metadata.xml | 18 ---- |
21 |
9 files changed, 557 deletions(-) |
22 |
|
23 |
diff --git a/sci-astronomy/astrometry/Manifest b/sci-astronomy/astrometry/Manifest |
24 |
deleted file mode 100644 |
25 |
index 2c1665c77d8..00000000000 |
26 |
--- a/sci-astronomy/astrometry/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1,3 +0,0 @@ |
29 |
-DIST astrometry.net-0.67.tar.gz 10941863 BLAKE2B 16c88e9040d2cecec831fd4775f8b5a3b8e10223e2f17b185f92fe222ab1f4cbea8ec5fae9af661cc069987e7cddcfee9e1bdd88a77ffce8db8fb66afad124ba SHA512 f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb |
30 |
-DIST astrometry.net-0.70.tar.gz 11195158 BLAKE2B f0de1cd592873194199810e095d81559754f73bf433cbf803c63c1d4b81db15722c61e3d5ee3798f8f3e5d9b4f67e87ab2e38edaac8639665ec5a9348337fb0e SHA512 27e1dd27d69427bdff46613723423048959e447662126d25c8b2fbab571d09b834e4085e5a4a9a9f6e8122ff0868a1762a335086de8f674f49fdbc7374299409 |
31 |
-DIST astrometry.net-0.72.tar.gz 11339766 BLAKE2B 91dfe1e49c21a7d0a6b1a39c32d3f50ceafd2d1aa9b75c151d71faef4511164292546013a103d277f127e0391310f40521e6ec9bf83660734cb60c8ed415b3fd SHA512 6fa63ea1075b267ebbe0a5aea4c66679b552350b206f098fb64f69f0e13fb9f8cf9c12e3fbc18942a444165cfd68251201dee9e18d6ebb01a2f16899675c70ff |
32 |
|
33 |
diff --git a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild |
34 |
deleted file mode 100644 |
35 |
index 75a92d3581f..00000000000 |
36 |
--- a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,108 +0,0 @@ |
39 |
-# Copyright 1999-2019 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=6 |
43 |
- |
44 |
-PYTHON_COMPAT=( python2_7 ) |
45 |
- |
46 |
-inherit eutils toolchain-funcs python-single-r1 |
47 |
- |
48 |
-MYP=${PN}.net-${PV} |
49 |
- |
50 |
-DESCRIPTION="Automated astrometric calibration programs and service" |
51 |
-HOMEPAGE="http://astrometry.net/" |
52 |
-SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz" |
53 |
- |
54 |
-LICENSE="BSD GPL-2 GPL-3" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
57 |
-IUSE="examples" |
58 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
59 |
- |
60 |
-RDEPEND=" |
61 |
- dev-python/astropy[${PYTHON_USEDEP}] |
62 |
- dev-python/numpy[${PYTHON_USEDEP}] |
63 |
- media-libs/libpng:0 |
64 |
- media-libs/netpbm |
65 |
- sci-astronomy/wcslib:0= |
66 |
- sci-libs/cfitsio:0= |
67 |
- sci-libs/gsl:0= |
68 |
- sys-libs/zlib:0= |
69 |
- virtual/jpeg:0 |
70 |
- x11-libs/cairo |
71 |
- ${PYTHON_DEPS}" |
72 |
-DEPEND="${RDEPEND} |
73 |
- dev-lang/swig:0 |
74 |
- virtual/pkgconfig" |
75 |
- |
76 |
-S="${WORKDIR}/${MYP}" |
77 |
- |
78 |
-PATCHES=( |
79 |
- "${FILESDIR}"/${P}-soname.patch |
80 |
- "${FILESDIR}"/${P}-dynlink.patch |
81 |
- "${FILESDIR}"/${P}-qsortr.patch |
82 |
-) |
83 |
- |
84 |
-src_prepare() { |
85 |
- default |
86 |
- # fix python scripts |
87 |
- python_fix_shebang "${S}" |
88 |
- sed -e "s|python setup-util.py|${EPYTHON} setup-util.py|" -i util/Makefile || die |
89 |
- sed -e "s|python setup.py|${EPYTHON} setup.py|" -i {libkd,sdss,blind}/Makefile || die |
90 |
- sed -e "s|python -c|${EPYTHON} -c|" -i blind/Makefile || die |
91 |
- sed -e "s|python <<EOF|${EPYTHON} <<EOF|" -i util/simplexy.c || die |
92 |
- sed -e "s|python -V|${EPYTHON} -V|" -i Makefile || die |
93 |
- # respect use compilation flags |
94 |
- sed -e '/-O3/d' -e '/-fomit-frame-pointer/d' -i util/makefile.common || die |
95 |
- # as-needed |
96 |
- sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" -i util/Makefile || die |
97 |
- export SYSTEM_GSL=yes |
98 |
-} |
99 |
- |
100 |
-src_compile() { |
101 |
- tc-export CC RANLIB AR |
102 |
- # fragile makefiles, build targets sequentially |
103 |
- emake |
104 |
- emake py |
105 |
- emake extra |
106 |
- emake report.txt |
107 |
-} |
108 |
- |
109 |
-src_test() { |
110 |
- emake test |
111 |
- local d |
112 |
- for d in util blind libkd; do |
113 |
- pushd ${d} > /dev/null |
114 |
- ./test || die "failed tests in ${d}" |
115 |
- popd ${d} > /dev/null |
116 |
- done |
117 |
-} |
118 |
- |
119 |
-ap_make() { |
120 |
- emake \ |
121 |
- INSTALL_DIR="${ED%/}/usr" \ |
122 |
- DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \ |
123 |
- LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \ |
124 |
- ETC_INSTALL_DIR="${ED%/}/etc" \ |
125 |
- MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \ |
126 |
- DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \ |
127 |
- EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \ |
128 |
- PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \ |
129 |
- PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \ |
130 |
- FINAL_DIR="${EPREFIX%/}/usr" \ |
131 |
- DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \ |
132 |
- $@ |
133 |
-} |
134 |
- |
135 |
-src_install() { |
136 |
- ap_make install-core |
137 |
- ap_make -C util install |
138 |
- ap_make -C blind install-extra |
139 |
- |
140 |
- # remove duplicates and non installable libraries |
141 |
- rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die |
142 |
- rm "${ED}"/usr/$(get_libdir)/lib*.a || die |
143 |
- rm "${ED}"/usr/share/doc/${PF}/LICENSE || die |
144 |
- |
145 |
- use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples |
146 |
-} |
147 |
|
148 |
diff --git a/sci-astronomy/astrometry/astrometry-0.70.ebuild b/sci-astronomy/astrometry/astrometry-0.70.ebuild |
149 |
deleted file mode 100644 |
150 |
index d17b0d7aaf9..00000000000 |
151 |
--- a/sci-astronomy/astrometry/astrometry-0.70.ebuild |
152 |
+++ /dev/null |
153 |
@@ -1,108 +0,0 @@ |
154 |
-# Copyright 1999-2019 Gentoo Authors |
155 |
-# Distributed under the terms of the GNU General Public License v2 |
156 |
- |
157 |
-EAPI=6 |
158 |
- |
159 |
-PYTHON_COMPAT=( python2_7 ) |
160 |
- |
161 |
-inherit eutils toolchain-funcs python-single-r1 |
162 |
- |
163 |
-MYP=${PN}.net-${PV} |
164 |
- |
165 |
-DESCRIPTION="Automated astrometric calibration programs and service" |
166 |
-HOMEPAGE="http://astrometry.net/" |
167 |
-SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz" |
168 |
- |
169 |
-LICENSE="BSD GPL-2 GPL-3" |
170 |
-SLOT="0" |
171 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
172 |
-IUSE="examples" |
173 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
174 |
- |
175 |
-RDEPEND=" |
176 |
- dev-python/astropy[${PYTHON_USEDEP}] |
177 |
- dev-python/numpy[${PYTHON_USEDEP}] |
178 |
- media-libs/libpng:0 |
179 |
- media-libs/netpbm |
180 |
- sci-astronomy/wcslib:0= |
181 |
- sci-libs/cfitsio:0= |
182 |
- sci-libs/gsl:0= |
183 |
- sys-libs/zlib:0= |
184 |
- virtual/jpeg:0 |
185 |
- x11-libs/cairo |
186 |
- ${PYTHON_DEPS}" |
187 |
-DEPEND="${RDEPEND} |
188 |
- dev-lang/swig:0 |
189 |
- virtual/pkgconfig" |
190 |
- |
191 |
-S="${WORKDIR}/${MYP}" |
192 |
- |
193 |
-PATCHES=( |
194 |
- "${FILESDIR}"/${PN}-0.67-soname.patch |
195 |
- "${FILESDIR}"/${PN}-0.67-dynlink.patch |
196 |
- "${FILESDIR}"/${PN}-0.67-qsortr.patch |
197 |
-) |
198 |
- |
199 |
-src_prepare() { |
200 |
- default |
201 |
- # fix python scripts |
202 |
- python_fix_shebang "${S}" |
203 |
- sed -e "s|python setup-util.py|${EPYTHON} setup-util.py|" -i util/Makefile || die |
204 |
- sed -e "s|python setup.py|${EPYTHON} setup.py|" -i {libkd,sdss,blind}/Makefile || die |
205 |
- sed -e "s|python -c|${EPYTHON} -c|" -i blind/Makefile || die |
206 |
- sed -e "s|python <<EOF|${EPYTHON} <<EOF|" -i util/simplexy.c || die |
207 |
- sed -e "s|python -V|${EPYTHON} -V|" -i Makefile || die |
208 |
- # respect use compilation flags |
209 |
- sed -e '/-O3/d' -e '/-fomit-frame-pointer/d' -i util/makefile.common || die |
210 |
- # as-needed |
211 |
- sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" -i util/Makefile || die |
212 |
- export SYSTEM_GSL=yes |
213 |
-} |
214 |
- |
215 |
-src_compile() { |
216 |
- tc-export CC RANLIB AR |
217 |
- # fragile makefiles, build targets sequentially |
218 |
- emake |
219 |
- emake py |
220 |
- emake extra |
221 |
- emake report.txt |
222 |
-} |
223 |
- |
224 |
-src_test() { |
225 |
- emake test |
226 |
- local d |
227 |
- for d in util blind libkd; do |
228 |
- pushd ${d} > /dev/null |
229 |
- ./test || die "failed tests in ${d}" |
230 |
- popd ${d} > /dev/null |
231 |
- done |
232 |
-} |
233 |
- |
234 |
-ap_make() { |
235 |
- emake \ |
236 |
- INSTALL_DIR="${ED%/}/usr" \ |
237 |
- DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \ |
238 |
- LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \ |
239 |
- ETC_INSTALL_DIR="${ED%/}/etc" \ |
240 |
- MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \ |
241 |
- DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \ |
242 |
- EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \ |
243 |
- PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \ |
244 |
- PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \ |
245 |
- FINAL_DIR="${EPREFIX%/}/usr" \ |
246 |
- DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \ |
247 |
- $@ |
248 |
-} |
249 |
- |
250 |
-src_install() { |
251 |
- ap_make install-core |
252 |
- ap_make -C util install |
253 |
- ap_make -C blind install-extra |
254 |
- |
255 |
- # remove duplicates and non installable libraries |
256 |
- rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die |
257 |
- rm "${ED}"/usr/$(get_libdir)/lib*.a || die |
258 |
- rm "${ED}"/usr/share/doc/${PF}/LICENSE || die |
259 |
- |
260 |
- use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples |
261 |
-} |
262 |
|
263 |
diff --git a/sci-astronomy/astrometry/astrometry-0.72.ebuild b/sci-astronomy/astrometry/astrometry-0.72.ebuild |
264 |
deleted file mode 100644 |
265 |
index b0fe8ea5b2a..00000000000 |
266 |
--- a/sci-astronomy/astrometry/astrometry-0.72.ebuild |
267 |
+++ /dev/null |
268 |
@@ -1,115 +0,0 @@ |
269 |
-# Copyright 1999-2019 Gentoo Authors |
270 |
-# Distributed under the terms of the GNU General Public License v2 |
271 |
- |
272 |
-EAPI=6 |
273 |
- |
274 |
-# this could be a multiple python package |
275 |
-# but the way it is packaged makes it very time consuming. |
276 |
- |
277 |
-PYTHON_COMPAT=( python2_7 ) |
278 |
- |
279 |
-inherit eutils toolchain-funcs python-single-r1 |
280 |
- |
281 |
-MYP=${PN}.net-${PV} |
282 |
- |
283 |
-DESCRIPTION="Automated astrometric calibration programs and service" |
284 |
-HOMEPAGE="http://astrometry.net/" |
285 |
-SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz" |
286 |
- |
287 |
-LICENSE="BSD GPL-2 GPL-3" |
288 |
-SLOT="0" |
289 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
290 |
-IUSE="examples" |
291 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
292 |
- |
293 |
-RDEPEND=" |
294 |
- dev-python/astropy[${PYTHON_USEDEP}] |
295 |
- dev-python/fitsio[${PYTHON_USEDEP}] |
296 |
- dev-python/numpy[${PYTHON_USEDEP}] |
297 |
- media-libs/libpng:0 |
298 |
- media-libs/netpbm |
299 |
- sci-astronomy/wcslib:0= |
300 |
- sci-libs/cfitsio:0= |
301 |
- sci-libs/gsl:0= |
302 |
- sys-libs/zlib:0= |
303 |
- virtual/jpeg:0 |
304 |
- x11-libs/cairo |
305 |
- ${PYTHON_DEPS}" |
306 |
-DEPEND="${RDEPEND} |
307 |
- dev-lang/swig:0 |
308 |
- virtual/pkgconfig" |
309 |
- |
310 |
-S="${WORKDIR}/${MYP}" |
311 |
- |
312 |
-PATCHES=( |
313 |
- "${FILESDIR}"/${PN}-0.67-soname.patch |
314 |
- "${FILESDIR}"/${PN}-0.67-qsortr.patch |
315 |
-) |
316 |
-# "${FILESDIR}"/${PN}-0.72-dynlink.patch |
317 |
- |
318 |
-src_prepare() { |
319 |
- default |
320 |
- # respect user compilation flags |
321 |
- sed -e '/-O3/d' \ |
322 |
- -e '/-fomit-frame-pointer/d' \ |
323 |
- -i util/makefile.common || die |
324 |
- # fix underlinking |
325 |
- sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" \ |
326 |
- -i util/Makefile || die |
327 |
- export SYSTEM_GSL=yes |
328 |
-} |
329 |
- |
330 |
-src_compile() { |
331 |
- tc-export CC RANLIB AR |
332 |
- # fragile makefiles, build targets sequentially |
333 |
- emake |
334 |
- emake py |
335 |
- emake extra |
336 |
- emake report.txt |
337 |
-} |
338 |
- |
339 |
-src_test() { |
340 |
- emake test |
341 |
- local d |
342 |
- for d in util blind libkd; do |
343 |
- pushd ${d} > /dev/null |
344 |
- ./test || die "failed tests in ${d}" |
345 |
- popd ${d} > /dev/null |
346 |
- done |
347 |
-} |
348 |
- |
349 |
-ap_make() { |
350 |
- emake \ |
351 |
- INSTALL_DIR="${ED%/}/usr" \ |
352 |
- DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \ |
353 |
- LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \ |
354 |
- ETC_INSTALL_DIR="${ED%/}/etc" \ |
355 |
- MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \ |
356 |
- DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \ |
357 |
- EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \ |
358 |
- PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \ |
359 |
- PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \ |
360 |
- FINAL_DIR="${EPREFIX%/}/usr" \ |
361 |
- DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \ |
362 |
- $@ |
363 |
-} |
364 |
- |
365 |
-src_install() { |
366 |
- ap_make install-core |
367 |
- ap_make -C util install |
368 |
- ap_make -C blind install-extra |
369 |
- |
370 |
- # remove duplicates and non installable libraries |
371 |
- # cfitsio |
372 |
- rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die |
373 |
- # cfitsio utilities |
374 |
- rm "${ED}"/usr/bin/{fitsverify,imarith,imstat,liststruc,modhead,tablist,tabmerge} || die |
375 |
- rm "${ED}"/usr/$(get_libdir)/lib*.a || die |
376 |
- rm "${ED}"/usr/share/doc/${PF}/LICENSE || die |
377 |
- |
378 |
- if use examples; then |
379 |
- docompress -x /usr/share/doc/${PF}/examples |
380 |
- else |
381 |
- rm -r "${ED}"/usr/share/doc/${PF}/examples || die |
382 |
- fi |
383 |
-} |
384 |
|
385 |
diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch b/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch |
386 |
deleted file mode 100644 |
387 |
index 64b87c033ca..00000000000 |
388 |
--- a/sci-astronomy/astrometry/files/astrometry-0.67-dynlink.patch |
389 |
+++ /dev/null |
390 |
@@ -1,78 +0,0 @@ |
391 |
-Author: Ole Streicher <olebole@××××××.org> |
392 |
-Description: Dynamically link to libastrometry.so, when possible |
393 |
---- a/blind/Makefile |
394 |
-+++ b/blind/Makefile |
395 |
-@@ -43,9 +43,7 @@ |
396 |
- LDLIBS := $(LDLIBS_DEF) |
397 |
- LDLIBS += $(ANFILES_LIB) |
398 |
- |
399 |
--SLIB := $(ENGINE_LIB) |
400 |
--SLIB += $(CATS_SLIB) |
401 |
--SLIB += $(ANFILES_SLIB) |
402 |
-+SLIB := $(ENGINE_SO) |
403 |
- |
404 |
- CAIRO_SLIB := $(COMMON)/cairoutils.o |
405 |
- CAIRO_SLIB += $(SLIB) |
406 |
-@@ -131,7 +129,7 @@ |
407 |
- resort-xylist.o |
408 |
- |
409 |
- BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startree2.o hpquads.o \ |
410 |
-- quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \ |
411 |
-+ quad-builder.o codefile.o codetree.o unpermute-stars.o \ |
412 |
- unpermute-quads.o merge-index.o |
413 |
- ENGINE_OBJS += $(BUILD_INDEX_OBJS) |
414 |
- |
415 |
-@@ -147,8 +145,8 @@ |
416 |
- $(AR) rc $@ $(ENGINE_OBJS) |
417 |
- $(RANLIB) $@ |
418 |
- |
419 |
--$(ENGINE_SO): $(ENGINE_OBJS) $(SLIB) |
420 |
-- $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS) |
421 |
-+$(ENGINE_SO): $(ENGINE_LIB) $(CATS_SLIB) $(ANFILES_SLIB) |
422 |
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 -Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDLIBS) -lpthread |
423 |
- ln -s $@.0 $@ |
424 |
- |
425 |
- # old and miscellaneous executables that aren't part of the pipeline. |
426 |
---- a/util/Makefile |
427 |
-+++ b/util/Makefile |
428 |
-@@ -86,8 +86,7 @@ |
429 |
- |
430 |
- LDFLAGS += $(LDFLAGS_DEF) |
431 |
- |
432 |
--LDLIBS := $(LDLIBS_DEF) |
433 |
--LDLIBS += $(ANFILES_LIB) |
434 |
-+LDLIBS := $(LDLIBS_DEF) -lm |
435 |
- |
436 |
- SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) |
437 |
- |
438 |
-@@ -122,8 +121,7 @@ |
439 |
- ANUTILS_H_PATH := $(addprefix $(INCLUDE_DIR)/,$(ANUTILS_H)) |
440 |
- |
441 |
- ifndef NO_QFITS |
442 |
--ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \ |
443 |
-- tic.o |
444 |
-+ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o |
445 |
- ANUTILS_DEPS += $(QFITS_LIB) |
446 |
- endif |
447 |
- |
448 |
-@@ -164,7 +162,7 @@ |
449 |
- ALL_OBJ += wcs-pv2sip.o |
450 |
- |
451 |
- _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB) |
452 |
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \ |
453 |
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \ |
454 |
- INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \ |
455 |
- python setup.py build_ext -v --inplace --build-temp . |
456 |
- util.py: util.i lanczos.i |
457 |
---- a/libkd/Makefile |
458 |
-+++ b/libkd/Makefile |
459 |
-@@ -90,8 +90,7 @@ |
460 |
- PYSPHEREMATCH_OBJ := pyspherematch.o |
461 |
- |
462 |
- spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB) |
463 |
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \ |
464 |
-- SLIB="$(SLIB)" \ |
465 |
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \ |
466 |
- INC="$(INC)" \ |
467 |
- CFLAGS="$(CFLAGS)" \ |
468 |
- python setup.py build_ext --inplace --force --build-temp . |
469 |
|
470 |
diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch b/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch |
471 |
deleted file mode 100644 |
472 |
index 6a7868884ea..00000000000 |
473 |
--- a/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch |
474 |
+++ /dev/null |
475 |
@@ -1,10 +0,0 @@ |
476 |
---- a/util/test_qsort_r.c 2016-11-17 00:21:29.211561563 +0000 |
477 |
-+++ b/util/test_qsort_r.c 2016-11-17 00:21:43.281493095 +0000 |
478 |
-@@ -5,6 +5,7 @@ |
479 |
- #include <stdio.h> |
480 |
- #include <string.h> |
481 |
- #include <stdarg.h> |
482 |
-+#include <stdlib.h> |
483 |
- |
484 |
- #include "cutest.h" |
485 |
- |
486 |
|
487 |
diff --git a/sci-astronomy/astrometry/files/astrometry-0.67-soname.patch b/sci-astronomy/astrometry/files/astrometry-0.67-soname.patch |
488 |
deleted file mode 100644 |
489 |
index 595dd79a2f4..00000000000 |
490 |
--- a/sci-astronomy/astrometry/files/astrometry-0.67-soname.patch |
491 |
+++ /dev/null |
492 |
@@ -1,25 +0,0 @@ |
493 |
-Author: Ole Streicher <olebole@××××××.org> |
494 |
-Description: Add SONAME to libastrometry.so |
495 |
---- a/blind/Makefile |
496 |
-+++ b/blind/Makefile |
497 |
-@@ -148,7 +148,8 @@ |
498 |
- $(RANLIB) $@ |
499 |
- |
500 |
- $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB) |
501 |
-- $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -o $@ $^ $(LDLIBS) |
502 |
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS) |
503 |
-+ ln -s $@.0 $@ |
504 |
- |
505 |
- # old and miscellaneous executables that aren't part of the pipeline. |
506 |
- OLDEXECS := plotquads rawstartree checkquads |
507 |
-@@ -233,8 +234,8 @@ |
508 |
- done |
509 |
- mkdir -p '$(LIB_INSTALL_DIR)' |
510 |
- @for x in $(INSTALL_LIB); do \ |
511 |
-- echo cp $$x '$(LIB_INSTALL_DIR)'; \ |
512 |
-- cp $$x '$(LIB_INSTALL_DIR)'; \ |
513 |
-+ echo cp -d $$x* '$(LIB_INSTALL_DIR)'; \ |
514 |
-+ cp -d $$x* '$(LIB_INSTALL_DIR)'; \ |
515 |
- done |
516 |
- mkdir -p '$(PY_INSTALL_DIR)' |
517 |
- @for x in $(PYTHON_INSTALL); do \ |
518 |
|
519 |
diff --git a/sci-astronomy/astrometry/files/astrometry-0.72-dynlink.patch b/sci-astronomy/astrometry/files/astrometry-0.72-dynlink.patch |
520 |
deleted file mode 100644 |
521 |
index 371a2129bd5..00000000000 |
522 |
--- a/sci-astronomy/astrometry/files/astrometry-0.72-dynlink.patch |
523 |
+++ /dev/null |
524 |
@@ -1,92 +0,0 @@ |
525 |
-From: Ole Streicher <olebole@××××××.org> |
526 |
-Date: Thu, 1 Dec 2016 21:18:56 +0100 |
527 |
-Subject: Dynamically link to libastrometry.so, when possible |
528 |
- |
529 |
---- |
530 |
- blind/Makefile | 10 ++++------ |
531 |
- libkd/Makefile | 3 +-- |
532 |
- util/Makefile | 8 +++----- |
533 |
- 3 files changed, 8 insertions(+), 13 deletions(-) |
534 |
- |
535 |
-diff --git a/blind/Makefile b/blind/Makefile |
536 |
-index 33895df..6e7c55c 100644 |
537 |
---- a/blind/Makefile |
538 |
-+++ b/blind/Makefile |
539 |
-@@ -43,9 +43,7 @@ LDFLAGS := $(LDFLAGS_DEF) |
540 |
- LDLIBS := $(LDLIBS_DEF) |
541 |
- LDLIBS += $(ANFILES_LIB) |
542 |
- |
543 |
--SLIB := $(ENGINE_LIB) |
544 |
--SLIB += $(CATS_SLIB) |
545 |
--SLIB += $(ANFILES_SLIB) |
546 |
-+SLIB := $(ENGINE_SO) |
547 |
- |
548 |
- CAIRO_SLIB := $(COMMON)/cairoutils.o |
549 |
- CAIRO_SLIB += $(SLIB) |
550 |
-@@ -131,7 +129,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \ |
551 |
- resort-xylist.o |
552 |
- |
553 |
- BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startree2.o hpquads.o \ |
554 |
-- quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \ |
555 |
-+ quad-builder.o codefile.o codetree.o unpermute-stars.o \ |
556 |
- unpermute-quads.o merge-index.o |
557 |
- ENGINE_OBJS += $(BUILD_INDEX_OBJS) |
558 |
- |
559 |
-@@ -147,8 +145,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) |
560 |
- $(AR) rc $@ $(ENGINE_OBJS) |
561 |
- $(RANLIB) $@ |
562 |
- |
563 |
--$(ENGINE_SO): $(ENGINE_OBJS) $(SLIB) |
564 |
-- $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS) |
565 |
-+$(ENGINE_SO): $(ENGINE_LIB) $(CATS_SLIB) $(ANFILES_SLIB) |
566 |
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 -Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDLIBS) -lpthread |
567 |
- ln -s $@.0 $@ |
568 |
- |
569 |
- # old and miscellaneous executables that aren't part of the pipeline. |
570 |
-diff --git a/libkd/Makefile b/libkd/Makefile |
571 |
-index f535986..0442518 100644 |
572 |
---- a/libkd/Makefile |
573 |
-+++ b/libkd/Makefile |
574 |
-@@ -90,8 +90,7 @@ py: pyspherematch |
575 |
- PYSPHEREMATCH_OBJ := pyspherematch.o |
576 |
- |
577 |
- spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB) |
578 |
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \ |
579 |
-- SLIB="$(SLIB)" \ |
580 |
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \ |
581 |
- INC="$(INC)" \ |
582 |
- CFLAGS="$(CFLAGS)" \ |
583 |
- $(PYTHON) setup.py build_ext --inplace --force --build-temp . |
584 |
-diff --git a/util/Makefile b/util/Makefile |
585 |
-index f88df1b..0ecf716 100644 |
586 |
---- a/util/Makefile |
587 |
-+++ b/util/Makefile |
588 |
-@@ -86,8 +86,7 @@ CFLAGS += -I. |
589 |
- |
590 |
- LDFLAGS += $(LDFLAGS_DEF) |
591 |
- |
592 |
--LDLIBS := $(LDLIBS_DEF) |
593 |
--LDLIBS += $(ANFILES_LIB) |
594 |
-+LDLIBS := $(LDLIBS_DEF) -lm |
595 |
- |
596 |
- SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) |
597 |
- |
598 |
-@@ -122,8 +121,7 @@ ANUTILS_H := an-bool.h an-endian.h an-opts.h an-thread-pthreads.h \ |
599 |
- ANUTILS_H_PATH := $(addprefix $(INCLUDE_DIR)/,$(ANUTILS_H)) |
600 |
- |
601 |
- ifndef NO_QFITS |
602 |
--ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \ |
603 |
-- tic.o |
604 |
-+ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o |
605 |
- ANUTILS_DEPS += $(QFITS_LIB) |
606 |
- endif |
607 |
- |
608 |
-@@ -164,7 +162,7 @@ wcs-pv2sip: wcs-pv2sip.o $(ANUTILS_SLIB) |
609 |
- ALL_OBJ += wcs-pv2sip.o |
610 |
- |
611 |
- _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB) |
612 |
-- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \ |
613 |
-+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \ |
614 |
- INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \ |
615 |
- $(PYTHON) setup.py build_ext -v --inplace --build-temp . |
616 |
- util.py: util.i lanczos.i |
617 |
|
618 |
diff --git a/sci-astronomy/astrometry/metadata.xml b/sci-astronomy/astrometry/metadata.xml |
619 |
deleted file mode 100644 |
620 |
index 2e748354d4f..00000000000 |
621 |
--- a/sci-astronomy/astrometry/metadata.xml |
622 |
+++ /dev/null |
623 |
@@ -1,18 +0,0 @@ |
624 |
-<?xml version="1.0" encoding="UTF-8"?> |
625 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
626 |
-<pkgmetadata> |
627 |
- <maintainer type="project"> |
628 |
- <email>sci-astronomy@g.o</email> |
629 |
- <name>Gentoo Astronomy Project</name> |
630 |
- </maintainer> |
631 |
- <longdescription lang="en"> |
632 |
- If you have astronomical imaging of the sky with celestial |
633 |
- coordinates you do not know—or do not trust—then Astrometry.net is |
634 |
- for you. Input an image and we'll give you back astrometric |
635 |
- calibration meta-data, plus lists of known objects falling inside |
636 |
- the field of view. |
637 |
-</longdescription> |
638 |
-<upstream> |
639 |
- <remote-id type="github">dstndstn/astrometry.net</remote-id> |
640 |
-</upstream> |
641 |
-</pkgmetadata> |