Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-misc/fitscut/
Date: Thu, 27 Mar 2014 21:51:44
Message-Id: 1395957062.57ba1e264928bd287f497f1c2f44ef853b3944d4.bicatali@gentoo
1 commit: 57ba1e264928bd287f497f1c2f44ef853b3944d4
2 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 27 21:51:02 2014 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 27 21:51:02 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=57ba1e26
7
8 sci-misc/fitscut: Switch to EAPI5, autotools-utils, fixed for prefix
9
10 Package-Manager: portage-2.2.8-prefix
11
12 ---
13 sci-misc/fitscut/ChangeLog | 7 +++++--
14 sci-misc/fitscut/fitscut-1.4.4.ebuild | 23 ++++++++++++-----------
15 sci-misc/fitscut/metadata.xml | 2 +-
16 3 files changed, 18 insertions(+), 14 deletions(-)
17
18 diff --git a/sci-misc/fitscut/ChangeLog b/sci-misc/fitscut/ChangeLog
19 index 7716847..6e8a138 100644
20 --- a/sci-misc/fitscut/ChangeLog
21 +++ b/sci-misc/fitscut/ChangeLog
22 @@ -1,7 +1,11 @@
23 # ChangeLog for sci-misc/fitscut
24 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
25 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
26 # $Header: $
27
28 + 27 Mar 2014; Sébastien Fabbro <bicatali@g.o> fitscut-1.4.4.ebuild,
29 + metadata.xml:
30 + sci-misc/fitscut: Switch to EAPI5, autotools-utils, fixed for prefix
31 +
32 14 Mar 2011; Justin Lecher <jlec@g.o> fitscut-1.4.4.ebuild:
33 Moved media-libs/jpeg -> virtual/jpeg
34
35 @@ -10,4 +14,3 @@
36 02 Feb 2010; Sébastien Fabbro <bicatali@g.o>
37 +fitscut-1.4.4.ebuild, +metadata.xml:
38 Initial import
39 -
40
41 diff --git a/sci-misc/fitscut/fitscut-1.4.4.ebuild b/sci-misc/fitscut/fitscut-1.4.4.ebuild
42 index 3580896..1a5bdee 100644
43 --- a/sci-misc/fitscut/fitscut-1.4.4.ebuild
44 +++ b/sci-misc/fitscut/fitscut-1.4.4.ebuild
45 @@ -2,8 +2,11 @@
46 # Distributed under the terms of the GNU General Public License v2
47 # $Header: $
48
49 -EAPI=2
50 -inherit autotools
51 +EAPI=5
52 +
53 +AUTOTOOLS_AUTORECONF=1
54 +
55 +inherit autotools-utils
56
57 DESCRIPTION="Extract cutouts from FITS image files"
58 HOMEPAGE="http://acs.pha.jhu.edu/general/software/fitscut/"
59 @@ -11,11 +14,12 @@ SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
60
61 LICENSE="GPL-2"
62 SLOT="0"
63 -KEYWORDS="~amd64 ~x86"
64 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
65 IUSE=""
66
67 -RDEPEND=">=sci-libs/cfitsio-3
68 - sci-astronomy/wcstools
69 +RDEPEND="
70 + >=sci-libs/cfitsio-3:0=
71 + sci-astronomy/wcstools:0=
72 media-libs/libpng
73 virtual/jpeg"
74 DEPEND="${RDEPEND}"
75 @@ -25,14 +29,11 @@ src_prepare() {
76 sed -i \
77 -e 's/libwcs/wcs/g' \
78 wcs*.c fitscut.c || die
79 + # cfitsio/fitsio.h might conflict with host on prefix
80 sed -i \
81 -e 's/LIB(wcs,/LIB(wcstools,/' \
82 -e 's/-lwcs/-lwcstools/' \
83 + -e '/cfitsio\/fitsio.h/d' \
84 configure.in || die
85 - eautoreconf
86 -}
87 -
88 -src_install() {
89 - emake DESDTIR="${D}" || die "emake install failed"
90 - dodoc README AUTHORS TODO NEWS ChangeLog THANKS
91 + autotools-utils_src_prepare
92 }
93
94 diff --git a/sci-misc/fitscut/metadata.xml b/sci-misc/fitscut/metadata.xml
95 index 3b60a94..3d253f3 100644
96 --- a/sci-misc/fitscut/metadata.xml
97 +++ b/sci-misc/fitscut/metadata.xml
98 @@ -1,7 +1,7 @@
99 <?xml version="1.0" encoding="UTF-8"?>
100 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
101 <pkgmetadata>
102 -<herd>sci</herd>
103 +<herd>sci-astronomy</herd>
104 <longdescription lang="en">
105 fitscut is designed to extract cutouts from FITS image format
106 files. FITS, PNG, and JPEG output types are supported.