1 |
commit: 54b64d301333a23e55c8ab7372d36ffc72dedf8b |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 27 20:52:43 2014 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 27 20:52:43 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=54b64d30 |
7 |
|
8 |
sci-astronomy/stuff: EAPI-5, autotools-utils |
9 |
|
10 |
Package-Manager: portage-2.2.8-prefix |
11 |
|
12 |
--- |
13 |
sci-astronomy/stuff/ChangeLog | 7 ++- |
14 |
sci-astronomy/stuff/files/stuff-configure.patch | 65 ------------------------- |
15 |
sci-astronomy/stuff/stuff-1.19.ebuild | 27 ---------- |
16 |
sci-astronomy/stuff/stuff-9999.ebuild | 14 +++--- |
17 |
4 files changed, 12 insertions(+), 101 deletions(-) |
18 |
|
19 |
diff --git a/sci-astronomy/stuff/ChangeLog b/sci-astronomy/stuff/ChangeLog |
20 |
index 2f967da..dfb71f7 100644 |
21 |
--- a/sci-astronomy/stuff/ChangeLog |
22 |
+++ b/sci-astronomy/stuff/ChangeLog |
23 |
@@ -1,7 +1,11 @@ |
24 |
# ChangeLog for sci-astronomy/stuff |
25 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
26 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
27 |
# $Header: $ |
28 |
|
29 |
+ 27 Feb 2014; Sébastien Fabbro <bicatali@g.o> -Manifest, |
30 |
+ -files/stuff-configure.patch, -stuff-1.19.ebuild, stuff-9999.ebuild: |
31 |
+ sci-astronomy/stuff: EAPI-5, autotools-utils |
32 |
+ |
33 |
04 Aug 2011; Sébastien Fabbro <bicatali@g.o> metadata.xml: |
34 |
Switched herd to sci-astronomy |
35 |
|
36 |
@@ -13,4 +17,3 @@ |
37 |
27 Jul 2009; Sébastien Fabbro <bicatali@g.o> +stuff-1.19.ebuild, |
38 |
+files/stuff-configure.patch, +metadata.xml: |
39 |
Initial import |
40 |
- |
41 |
|
42 |
diff --git a/sci-astronomy/stuff/files/stuff-configure.patch b/sci-astronomy/stuff/files/stuff-configure.patch |
43 |
deleted file mode 100644 |
44 |
index 4f8c1bd..0000000 |
45 |
--- a/sci-astronomy/stuff/files/stuff-configure.patch |
46 |
+++ /dev/null |
47 |
@@ -1,65 +0,0 @@ |
48 |
---- configure.ac.orig 2009-03-25 18:21:24.000000000 +0000 |
49 |
-+++ configure.ac 2009-03-25 18:27:33.000000000 +0000 |
50 |
-@@ -20,42 +20,17 @@ |
51 |
- AC_SUBST(DATE3, "$date3") |
52 |
- |
53 |
- # Include macros |
54 |
--sinclude(acx_prog_cc_optim.m4) |
55 |
- sinclude(acx_pthread.m4) |
56 |
- sinclude(acx_urbi_resolve_dir.m4) |
57 |
- |
58 |
- # Display pakage and version number |
59 |
- AC_MSG_RESULT([******** Configuring: $PACKAGE_NAME $VERSION ($date) ********]) |
60 |
- |
61 |
--# Initialize the list of compilers to consider |
62 |
--cclist="cc gcc" |
63 |
-- |
64 |
--# Backup and reset the input CFLAGS |
65 |
--mycflags="$CFLAGS" |
66 |
--CFLAGS="" |
67 |
--myldflags="$LDFLAGS" |
68 |
--LDFLAGS="" |
69 |
-- |
70 |
--# Provide special option for the Linux Intel C compiler |
71 |
--AC_MSG_CHECKING([for Linux Intel C compiler mode]) |
72 |
--AC_ARG_ENABLE(icc, |
73 |
-- [AC_HELP_STRING([--enable-icc], |
74 |
-- [Enable special mode for compilation with the Intel compiler \ |
75 |
--(off by default)])], |
76 |
-- use_icc="yes" |
77 |
-- cclist="icc $cclist" |
78 |
-- AC_MSG_RESULT([yes]), |
79 |
-- use_icc="no" |
80 |
-- AC_MSG_RESULT([no])) |
81 |
-- |
82 |
- # Checks for programs. |
83 |
--# GCC is chosen last because it is likely to yield less optimized code |
84 |
--AC_PROG_CC([$cclist]) |
85 |
- # C Compiler: Check that it is ANSI C |
86 |
- AM_PROG_CC_STDC |
87 |
- # C Compiler: Check that it is POSIX-compliant |
88 |
- AC_ISC_POSIX |
89 |
--ACX_PROG_CC_OPTIM |
90 |
- AC_PROG_RANLIB |
91 |
- AC_PROG_INSTALL |
92 |
- |
93 |
-@@ -154,19 +129,6 @@ |
94 |
- use_static="no" |
95 |
- fi |
96 |
- |
97 |
--# Static linking option |
98 |
--if test "$use_static" = "yes"; then |
99 |
-- LDFLAGS="-static -shared-libgcc $LDFLAGS" |
100 |
--fi |
101 |
-- |
102 |
--# Override automatic CFLAGS and LDFLAGS with those of user |
103 |
--#if test -n "$mycflags"; then |
104 |
--#CFLAGS="$mycflags" |
105 |
--#fi |
106 |
--#if test -n "$myldflags"; then |
107 |
--#LDFLAGS="$myldflags" |
108 |
--#fi |
109 |
-- |
110 |
- # Display compiler and linker flags |
111 |
- AC_MSG_RESULT([***************************************************************]) |
112 |
- AC_MSG_RESULT([Compile cmdline: $CC $CFLAGS]) |
113 |
|
114 |
diff --git a/sci-astronomy/stuff/stuff-1.19.ebuild b/sci-astronomy/stuff/stuff-1.19.ebuild |
115 |
deleted file mode 100644 |
116 |
index eb91517..0000000 |
117 |
--- a/sci-astronomy/stuff/stuff-1.19.ebuild |
118 |
+++ /dev/null |
119 |
@@ -1,27 +0,0 @@ |
120 |
-# Copyright 1999-2014 Gentoo Foundation |
121 |
-# Distributed under the terms of the GNU General Public License v2 |
122 |
-# $Header: $ |
123 |
- |
124 |
-EAPI=4 |
125 |
-inherit autotools eutils |
126 |
- |
127 |
-DESCRIPTION="Tool for automatic generation of astronomical catalogs" |
128 |
-HOMEPAGE="http://www.astromatic.net/software/stuff/" |
129 |
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" |
130 |
- |
131 |
-LICENSE="GPL-3" |
132 |
-SLOT="0" |
133 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
134 |
-IUSE="threads" |
135 |
- |
136 |
-DEPEND="" |
137 |
-RDEPEND="${DEPEND}" |
138 |
- |
139 |
-src_prepare() { |
140 |
- epatch "${FILESDIR}"/${PN}-configure.patch |
141 |
- eautoreconf |
142 |
-} |
143 |
- |
144 |
-src_configure() { |
145 |
- econf $(use_enable threads) |
146 |
-} |
147 |
|
148 |
diff --git a/sci-astronomy/stuff/stuff-9999.ebuild b/sci-astronomy/stuff/stuff-9999.ebuild |
149 |
index 77b9182..c020416 100644 |
150 |
--- a/sci-astronomy/stuff/stuff-9999.ebuild |
151 |
+++ b/sci-astronomy/stuff/stuff-9999.ebuild |
152 |
@@ -2,7 +2,7 @@ |
153 |
# Distributed under the terms of the GNU General Public License v2 |
154 |
# $Header: $ |
155 |
|
156 |
-EAPI=4 |
157 |
+EAPI=5 |
158 |
|
159 |
if [[ ${PV} == "9999" ]] ; then |
160 |
_SVN=subversion |
161 |
@@ -14,7 +14,10 @@ else |
162 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
163 |
fi |
164 |
|
165 |
-inherit ${_SVN} autotools |
166 |
+AUTOTOOLS_AUTORECONF=1 |
167 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
168 |
+ |
169 |
+inherit ${_SVN} autotools-utils |
170 |
|
171 |
DESCRIPTION="Tool for automatic generation of astronomical catalogs" |
172 |
HOMEPAGE="http://www.astromatic.net/software/stuff/" |
173 |
@@ -27,10 +30,7 @@ IUSE="threads" |
174 |
RDEPEND="sci-libs/fftw:3.0" |
175 |
DEPEND="${RDEPEND}" |
176 |
|
177 |
-src_prepare() { |
178 |
- eautoreconf |
179 |
-} |
180 |
- |
181 |
src_configure() { |
182 |
- econf $(use_enable threads) |
183 |
+ local myeconfargs=( $(use_enable threads) ) |
184 |
+ autotools-utils_src_configure |
185 |
} |