1 |
commit: 601acc40f97b95f74dd9a5ec388c970dbfec96a2 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 2 21:24:52 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 2 21:24:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=601acc40 |
7 |
|
8 |
sci-astronomy/stiff: cleanup to move in main tree |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
sci-astronomy/stiff/files/stiff-configure.patch | 63 ------------------------- |
13 |
sci-astronomy/stiff/stiff-2.4.0.ebuild | 43 ----------------- |
14 |
sci-astronomy/stiff/stiff-9999.ebuild | 33 ++++++------- |
15 |
3 files changed, 15 insertions(+), 124 deletions(-) |
16 |
|
17 |
diff --git a/sci-astronomy/stiff/files/stiff-configure.patch b/sci-astronomy/stiff/files/stiff-configure.patch |
18 |
deleted file mode 100644 |
19 |
index 15b8d9a..0000000 |
20 |
--- a/sci-astronomy/stiff/files/stiff-configure.patch |
21 |
+++ /dev/null |
22 |
@@ -1,63 +0,0 @@ |
23 |
---- configure.ac.orig 2009-03-10 12:34:36.000000000 +0000 |
24 |
-+++ configure.ac 2009-07-28 17:26:22.000000000 +0100 |
25 |
-@@ -21,40 +21,14 @@ |
26 |
- |
27 |
- # Include macros |
28 |
- #sinclude(acx_pthread.m4) |
29 |
--sinclude(acx_prog_cc_optim.m4) |
30 |
- |
31 |
- # Display pakage and version number |
32 |
- AC_MSG_RESULT([*********** Configuring: $PACKAGE $VERSION ($date) **********]) |
33 |
- |
34 |
--# Initialize the list of compilers to consider |
35 |
--cclist="cc gcc" |
36 |
-- |
37 |
--# Backup and reset the input CFLAGS and LDFLAGS |
38 |
--mycflags="$CFLAGS" |
39 |
--CFLAGS="" |
40 |
--myldflags="$LDFLAGS" |
41 |
--LDFLAGS="" |
42 |
-- |
43 |
--# Provide special option for the Linux Intel C compiler |
44 |
--AC_MSG_CHECKING([for Linux Intel C compiler mode]) |
45 |
--AC_ARG_ENABLE(icc, |
46 |
-- [AC_HELP_STRING([--enable-icc], |
47 |
-- [Enable special mode for compilation with the Intel compiler \ |
48 |
--(off by default)])], |
49 |
-- use_icc="yes" |
50 |
-- cclist="icc $cclist" |
51 |
-- AC_MSG_RESULT([yes]), |
52 |
-- use_icc="no" |
53 |
-- AC_MSG_RESULT([no])) |
54 |
-- |
55 |
--# Checks for programs. |
56 |
--# GCC is chosen last because it is likely to yield less optimized code |
57 |
--AC_PROG_CC([$cclist]) |
58 |
- # C Compiler: Check that it is ANSI C |
59 |
- AM_PROG_CC_STDC |
60 |
- # C Compiler: Check that it is POSIX-compliant |
61 |
- AC_ISC_POSIX |
62 |
--ACX_PROG_CC_OPTIM |
63 |
- AC_PROG_AWK |
64 |
- AC_PROG_INSTALL |
65 |
- AC_PROG_RANLIB |
66 |
-@@ -107,19 +81,9 @@ |
67 |
- |
68 |
- # Link with gprof option |
69 |
- if test "$use_gprof" = "yes"; then |
70 |
-- if test "$use_icc" = "yes"; then |
71 |
-- CFLAGS="$CFLAGS -pq" |
72 |
-- else |
73 |
-- CFLAGS="$CFLAGS -pg" |
74 |
-- fi |
75 |
- use_static="no" |
76 |
- fi |
77 |
- |
78 |
--# Static linking option |
79 |
--if test "$use_static" = "yes"; then |
80 |
-- LDFLAGS="-static -shared-libgcc $LDFLAGS" |
81 |
--fi |
82 |
-- |
83 |
- # Override automatic CFLAGS and LDFLAGS with those of user |
84 |
- #if test -n "$mycflags"; then |
85 |
- #CFLAGS="$mycflags" |
86 |
|
87 |
diff --git a/sci-astronomy/stiff/stiff-2.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0.ebuild |
88 |
deleted file mode 100644 |
89 |
index 33c0767..0000000 |
90 |
--- a/sci-astronomy/stiff/stiff-2.4.0.ebuild |
91 |
+++ /dev/null |
92 |
@@ -1,43 +0,0 @@ |
93 |
-# Copyright 1999-2015 Gentoo Foundation |
94 |
-# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $Id$ |
96 |
- |
97 |
-EAPI=5 |
98 |
- |
99 |
-if [[ ${PV} == "9999" ]] ; then |
100 |
- inherit subversion |
101 |
- ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk" |
102 |
- SRC_URI="" |
103 |
- KEYWORDS="" |
104 |
-else |
105 |
- SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" |
106 |
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
107 |
-fi |
108 |
- |
109 |
-#AUTOTOOLS_AUTORECONF=1 |
110 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
111 |
- |
112 |
-inherit autotools-utils |
113 |
- |
114 |
-DESCRIPTION="Converts astronomical FITS images to the TIFF format" |
115 |
-HOMEPAGE="http://astromatic.iap.fr/software/stiff" |
116 |
- |
117 |
-LICENSE="GPL-3" |
118 |
-SLOT="0" |
119 |
-IUSE="doc threads" |
120 |
- |
121 |
-RDEPEND=" |
122 |
- media-libs/tiff:0= |
123 |
- virtual/jpeg:0 |
124 |
- sys-libs/zlib:0=" |
125 |
-DEPEND="${RDEPEND}" |
126 |
- |
127 |
-src_configure() { |
128 |
- local myeconfargs=( $(use_enable threads) ) |
129 |
- autotools-utils_src_configure |
130 |
-} |
131 |
- |
132 |
-src_install () { |
133 |
- use doc && DOCS=( doc/. ) |
134 |
- autotools-utils_src_install |
135 |
-} |
136 |
|
137 |
diff --git a/sci-astronomy/stiff/stiff-9999.ebuild b/sci-astronomy/stiff/stiff-9999.ebuild |
138 |
index 33c0767..6c70b1f 100644 |
139 |
--- a/sci-astronomy/stiff/stiff-9999.ebuild |
140 |
+++ b/sci-astronomy/stiff/stiff-9999.ebuild |
141 |
@@ -1,23 +1,16 @@ |
142 |
-# Copyright 1999-2015 Gentoo Foundation |
143 |
+# Copyright 1999-2016 Gentoo Foundation |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
# $Id$ |
146 |
|
147 |
-EAPI=5 |
148 |
+EAPI=6 |
149 |
|
150 |
-if [[ ${PV} == "9999" ]] ; then |
151 |
- inherit subversion |
152 |
- ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk" |
153 |
- SRC_URI="" |
154 |
- KEYWORDS="" |
155 |
-else |
156 |
- SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" |
157 |
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
158 |
-fi |
159 |
+inherit subversion |
160 |
|
161 |
-#AUTOTOOLS_AUTORECONF=1 |
162 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
163 |
+ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk" |
164 |
+ESVN_OPTIONS="--trust-server-cert-failures=unknown-ca" |
165 |
|
166 |
-inherit autotools-utils |
167 |
+SRC_URI="" |
168 |
+KEYWORDS="" |
169 |
|
170 |
DESCRIPTION="Converts astronomical FITS images to the TIFF format" |
171 |
HOMEPAGE="http://astromatic.iap.fr/software/stiff" |
172 |
@@ -32,12 +25,16 @@ RDEPEND=" |
173 |
sys-libs/zlib:0=" |
174 |
DEPEND="${RDEPEND}" |
175 |
|
176 |
+src_prepare() { |
177 |
+ default |
178 |
+ subversion_src_prepare |
179 |
+} |
180 |
+ |
181 |
src_configure() { |
182 |
- local myeconfargs=( $(use_enable threads) ) |
183 |
- autotools-utils_src_configure |
184 |
+ econf $(use_enable threads) |
185 |
} |
186 |
|
187 |
src_install () { |
188 |
- use doc && DOCS=( doc/. ) |
189 |
- autotools-utils_src_install |
190 |
+ default |
191 |
+ use doc && dodoc doc/* |
192 |
} |