1 |
commit: df61d4ce347c741e58f74b088ed257fd5182ca0e |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 29 20:44:13 2016 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 29 23:12:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df61d4ce |
7 |
|
8 |
sci-astronomy/sofa_c: Version bump and cleanup |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
sci-astronomy/sofa_c/Manifest | 2 +- |
13 |
sci-astronomy/sofa_c/files/sofa_c-makefile.patch | 56 ++++++++++------------ |
14 |
..._c-20120301a.ebuild => sofa_c-20150209a.ebuild} | 14 +++--- |
15 |
3 files changed, 33 insertions(+), 39 deletions(-) |
16 |
|
17 |
diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest |
18 |
index cead38f..078a0f3 100644 |
19 |
--- a/sci-astronomy/sofa_c/Manifest |
20 |
+++ b/sci-astronomy/sofa_c/Manifest |
21 |
@@ -1 +1 @@ |
22 |
-DIST sofa_c-20120301_a.tar.gz 1267551 SHA256 3534538b4abda067ef07f1aaef869f3b72ddc7f246447558b708d2968e63e66f SHA512 00da8e834e790922200c25b55cba3b48e49770cbada2271e4b7720f5170a422c9a47e6ebd1c51787256e88aaa656c347f21add14fbc353a9346d395ea3eda2c2 WHIRLPOOL d4f13d08b6ff1f67c808ba09858cd0f77664031ea466b71fc65f48f09bd216cd384db7660b574385d1c65ddcbdd5f894a2631335be557ffb29f1b8703d517a46 |
23 |
+DIST sofa_c-20150209_a.tar.gz 1685051 SHA256 b542c5e4ca42d91ada3c66e8d5b86eb9dec085bf1a07d058c01920c6c0b1174a SHA512 45524228db30c388315ce76c1d85db422fac09da3c3ed1442e362a6a2b4a10d27c19ea4a2d51c854280102a99706663622e0375b4afbf096b79877e7602fec4c WHIRLPOOL f4b084145cb3b9c2d722885ed89d2b8298d8fa4a21da25778852d76d20342331c3e7e2c6e28b3d0df04bc9bdf6fc921fe0e60f545ca91dcf69fe86316252006f |
24 |
|
25 |
diff --git a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch |
26 |
index b992d40..3a942e3 100644 |
27 |
--- a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch |
28 |
+++ b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch |
29 |
@@ -1,5 +1,5 @@ |
30 |
---- makefile.orig 2013-05-22 20:51:58.398491342 +0000 |
31 |
-+++ makefile 2013-05-22 21:05:52.055466710 +0000 |
32 |
+--- src/makefile.orig |
33 |
++++ src/makefile |
34 |
@@ -49,7 +49,7 @@ |
35 |
|
36 |
# Specify the installation home directory. |
37 |
@@ -9,7 +9,7 @@ |
38 |
|
39 |
# Specify the installation directory for the library. |
40 |
|
41 |
-@@ -63,9 +63,10 @@ |
42 |
+@@ -63,9 +63,9 @@ |
43 |
# of your preferred C compiler (CCOMPC) and compilation flags (CFLAGF |
44 |
# for functions, CFLAGX for executables) here. |
45 |
|
46 |
@@ -17,17 +17,15 @@ |
47 |
-CFLAGF = -c -pedantic -Wall -W -O |
48 |
-CFLAGX = -pedantic -Wall -W -O |
49 |
+CCOMPC = $(CC) |
50 |
-+CFLAGF = -c -pedantic -Wall -W -fPIC $(CFLAGS) |
51 |
-+CFLAGX = -pedantic -Wall -W $(CFLAGS) |
52 |
-+ |
53 |
++CFLAGF = $(CPPFLAGS) -I. -c -fPIC $(CFLAGS) |
54 |
++CFLAGX = $(CPPFLAGS) -I. $(CFLAGS) |
55 |
|
56 |
#----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE--------- |
57 |
|
58 |
-@@ -80,6 +81,12 @@ |
59 |
+@@ -80,6 +80,11 @@ |
60 |
SOFA_LIB_NAME = libsofa_c.a |
61 |
SOFA_LIB = $(SOFA_LIB_DIR)$(SOFA_LIB_NAME) |
62 |
|
63 |
-+ |
64 |
+# Name the SOFA/C library in its source and target locations. |
65 |
+ |
66 |
+SOFA_SHLIB_NAME = libsofa_c.so |
67 |
@@ -36,7 +34,7 @@ |
68 |
# Name the SOFA/C testbed in its source and target locations. |
69 |
|
70 |
SOFA_TEST_NAME = t_sofa_c.c |
71 |
-@@ -88,7 +95,7 @@ |
72 |
+@@ -88,7 +93,7 @@ |
73 |
# Name the SOFA/C includes in their source and target locations. |
74 |
|
75 |
SOFA_INC_NAMES = sofa.h sofam.h |
76 |
@@ -44,8 +42,8 @@ |
77 |
+SOFA_INC = $(SOFA_INC_NAMES:%=$(SOFA_INC_DIR)%) |
78 |
|
79 |
# The list of SOFA/C library object files. |
80 |
- SOFA_OBS = iauA2af.o \ |
81 |
-@@ -285,29 +292,32 @@ |
82 |
+ |
83 |
+@@ -321,28 +326,31 @@ |
84 |
#----------------------------------------------------------------------- |
85 |
|
86 |
# Build (but do not install) the library. |
87 |
@@ -63,22 +61,21 @@ |
88 |
+ cp $(SOFA_SHLIB_NAME).0.0 $(SOFA_LIB_DIR) |
89 |
+ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB).0 |
90 |
+ ln -s $(SOFA_SHLIB_NAME).0 $(SOFA_SHLIB) |
91 |
++ |
92 |
|
93 |
# Deinstall the library and header files. |
94 |
- deinstall: |
95 |
-- rm -f $(SOFA_LIB) $(SOFA_INC) |
96 |
-+ rm -f $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC) |
97 |
+ uninstall: |
98 |
+- - $(RM) $(SOFA_LIB) $(SOFA_INC) |
99 |
++ - $(RM) $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC) |
100 |
|
101 |
# Test the build. |
102 |
- check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME) |
103 |
+-check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME) |
104 |
- $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_LIB_NAME) \ |
105 |
++check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_SHLIB_NAME) |
106 |
+ $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \ |
107 |
-lm -o $(SOFA_TEST) |
108 |
- ./$(SOFA_TEST) |
109 |
-- rm -f $(SOFA_TEST) |
110 |
-+ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB_NAME).0 |
111 |
-+ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." ./$(SOFA_TEST) |
112 |
-+ rm -f $(SOFA_TEST) $(SOFA_SHLIB_NAME).0 |
113 |
++ LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:." ./$(SOFA_TEST) |
114 |
|
115 |
# Test the installed library. |
116 |
-installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB) |
117 |
@@ -86,27 +83,22 @@ |
118 |
$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \ |
119 |
-L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST) |
120 |
./$(SOFA_TEST) |
121 |
-@@ -315,11 +325,11 @@ |
122 |
+@@ -353,7 +361,7 @@ |
123 |
|
124 |
- # Local clean up. |
125 |
- clean realclean: |
126 |
-- rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) |
127 |
-+ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME) |
128 |
- |
129 |
- # Clean up and deinstall. |
130 |
- distclean: |
131 |
-- rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB) |
132 |
-+ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB) $(SOFA_SHLIB_NAME) |
133 |
+ # Delete all generated binaries in the current directory. |
134 |
+ realclean distclean : clean |
135 |
+- - $(RM) $(SOFA_LIB_NAME) $(SOFA_TEST) |
136 |
++ - $(RM) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)* $(SOFA_TEST) |
137 |
|
138 |
# Create the installation directories if not already present. |
139 |
$(INSTALL_DIRS): |
140 |
-@@ -329,6 +339,10 @@ |
141 |
+@@ -363,6 +371,10 @@ |
142 |
$(SOFA_LIB_NAME): $(SOFA_OBS) |
143 |
ar ru $(SOFA_LIB_NAME) $? |
144 |
|
145 |
+$(SOFA_SHLIB_NAME): $(SOFA_OBS) |
146 |
-+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 -lm -o $(SOFA_SHLIB_NAME).0.0 $? |
147 |
-+ |
148 |
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 -lm $? -o $(SOFA_SHLIB_NAME).0.0 |
149 |
++ ln -sfn $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB_NAME).0 |
150 |
+ |
151 |
# Install the header files. |
152 |
$(SOFA_INC) : $(INSTALL_DIRS) $(SOFA_INC_NAMES) |
153 |
|
154 |
diff --git a/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild b/sci-astronomy/sofa_c/sofa_c-20150209a.ebuild |
155 |
similarity index 77% |
156 |
rename from sci-astronomy/sofa_c/sofa_c-20120301a.ebuild |
157 |
rename to sci-astronomy/sofa_c/sofa_c-20150209a.ebuild |
158 |
index 55d0acf..39ee91a 100644 |
159 |
--- a/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild |
160 |
+++ b/sci-astronomy/sofa_c/sofa_c-20150209a.ebuild |
161 |
@@ -1,10 +1,10 @@ |
162 |
-# Copyright 1999-2013 Gentoo Foundation |
163 |
+# Copyright 1999-2016 Gentoo Foundation |
164 |
# Distributed under the terms of the GNU General Public License v2 |
165 |
# $Id$ |
166 |
|
167 |
-EAPI=5 |
168 |
+EAPI=6 |
169 |
|
170 |
-inherit eutils flag-o-matic multilib |
171 |
+inherit toolchain-funcs |
172 |
|
173 |
YYYY=${PV:0:4} |
174 |
MMDD=${PV:4:4} |
175 |
@@ -22,16 +22,18 @@ IUSE="doc" |
176 |
RDEPEND="" |
177 |
DEPEND="" |
178 |
|
179 |
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" ) |
180 |
+ |
181 |
S="${WORKDIR}/sofa/${MYPV}/c/src" |
182 |
|
183 |
src_prepare() { |
184 |
- epatch "${FILESDIR}"/${PN}-makefile.patch |
185 |
+ default |
186 |
sed -i -e "s:/lib:/$(get_libdir):" makefile || die |
187 |
- replace-flags -O? -O1 |
188 |
+ tc-export CC |
189 |
} |
190 |
|
191 |
src_install() { |
192 |
- emake DESTDIR="${ED}" -j1 install |
193 |
+ emake DESTDIR="${ED}" install |
194 |
cd .. |
195 |
dodoc 00READ.ME |
196 |
use doc && dodoc doc/*.lis doc/*.pdf |