Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/calc/files/, sci-mathematics/calc/
Date: Sun, 06 Mar 2016 23:05:22
Message-Id: 1457305495.e4cad4b39c4b1f35a2ffe4a7c747fa1ac1a6f9cc.soap@gentoo
1 commit: e4cad4b39c4b1f35a2ffe4a7c747fa1ac1a6f9cc
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 6 22:58:40 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 6 23:04:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cad4b3
7
8 sci-mathematics/calc: Version bump to 2.12.5.4
9
10 Gentoo-Bug: 524544
11 * EAPI=6
12
13 Package-Manager: portage-2.2.27
14
15 sci-mathematics/calc/Manifest | 1 +
16 sci-mathematics/calc/calc-2.12.5.4.ebuild | 61 ++++++++
17 .../calc/files/calc-2.12.5.4-as-needed.patch | 161 +++++++++++++++++++++
18 3 files changed, 223 insertions(+)
19
20 diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
21 index e8036b0..e29e442 100644
22 --- a/sci-mathematics/calc/Manifest
23 +++ b/sci-mathematics/calc/Manifest
24 @@ -3,3 +3,4 @@ DIST calc-2.12.2.2.tar.bz2 864687 SHA256 0a334cd331a4953a86365becce9b9f401b264a5
25 DIST calc-2.12.4.13.tar.bz2 970778 SHA256 1e6fd3256bd7bf738fcfe6e2d6a9d8a6bb0f37393aba6020b01d96274419a92c SHA512 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534 WHIRLPOOL 365700655f53eb5efb58ee6fbdf1d123943c2cc6a799318d9a48e2c5b8e0e2e871fd36e54b185442e0a0bc5380644edca1612bbfe7e2506247015743cdb556ee
26 DIST calc-2.12.4.3.tar.bz2 865956 SHA256 a4e7d8a9313e7d28653e2c372fca9b0defdc02f965b833bb43479bbdfee51a92 SHA512 b1ab7724769a39fe5d57715bb6edfe775b9a14ecfe14d9db7adc2ea44d1794b969edbf0d8265dfb30b2be0c022e7ff8af271be8e9bd78faa483e29a31fdf1b88 WHIRLPOOL 2abdacea7f2e363947c9911b38d6787edb75b2a6f5b7088e0b2a16d8f80bef549de2e3c58e4d38a8bf75ebd35ae52dbc0b63bed3b08da63dad742c21d598df5a
27 DIST calc-2.12.4.4.tar.bz2 867180 SHA256 106a0e5dc4da94ec8711a8631cd5d17b3979cde1d248ba9385cdcb862cb1390b SHA512 58be9d70a2c79adeb44d86da6f5f2d04dbf09aaec10ad4e8eed870a7b8de1d4a7cd35b1738ccb5cc64ef5f945e6cfbe1944e27f064541289abe1a4e7f4703690 WHIRLPOOL 1a106ba7b10463aca673329b625721d47a14721467e7847fdbe509b8bf16b4c5829b006240faf58f915abb0f0bf9cbc033289077f20f0c74c2704fb63ccaf340
28 +DIST calc-2.12.5.4.tar.bz2 956258 SHA256 a776121efe49f3230a293e28682e52ff6d5f2f1896d3a9b474a51de8c890919e SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f WHIRLPOOL 210f259749c7ea5427b7c3698d17cb9af72243e39cde54d1371f246d96a9f9e360f645e8f0ce64514e92275a17756cf57c4757410bd7db192f0767f48676abfd
29
30 diff --git a/sci-mathematics/calc/calc-2.12.5.4.ebuild b/sci-mathematics/calc/calc-2.12.5.4.ebuild
31 new file mode 100644
32 index 0000000..14bfe65
33 --- /dev/null
34 +++ b/sci-mathematics/calc/calc-2.12.5.4.ebuild
35 @@ -0,0 +1,61 @@
36 +# Copyright 1999-2016 Gentoo Foundation
37 +# Distributed under the terms of the GNU General Public License v2
38 +# $Id$
39 +
40 +EAPI=6
41 +
42 +inherit toolchain-funcs
43 +
44 +DESCRIPTION="Arbitrary precision C-like arithmetic system"
45 +HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
46 +SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2"
47 +
48 +SLOT="0"
49 +LICENSE="LGPL-2"
50 +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
51 +
52 +IUSE=""
53 +
54 +RDEPEND="
55 + sys-libs/ncurses:0=
56 + sys-libs/readline:0="
57 +DEPEND="${RDEPEND}
58 + virtual/pkgconfig"
59 +
60 +PATCHES=(
61 + "${FILESDIR}/${P}-as-needed.patch"
62 +)
63 +
64 +src_prepare() {
65 + default
66 + ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die
67 + sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die
68 +}
69 +
70 +src_compile() {
71 + # parallel compilation hard to fix. better to leave upstream.
72 + emake -j1 \
73 + CC="$(tc-getCC)" \
74 + DEBUG="${CFLAGS}" \
75 + LDFLAGS="${LDFLAGS}" \
76 + CALCPAGER="${PAGER}" \
77 + USE_READLINE="-DUSE_READLINE" \
78 + READLINE_LIB="-lreadline -lhistory $(pkg-config --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
79 + all
80 +}
81 +
82 +src_test() {
83 + if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
84 + ewarn "Can't run check when running in sandbox - see bug #59676"
85 + else
86 + emake chk
87 + fi
88 +}
89 +
90 +src_install() {
91 + emake \
92 + T="${D}" \
93 + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
94 + install
95 + dodoc BUGS CHANGES LIBRARY README
96 +}
97
98 diff --git a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
99 new file mode 100644
100 index 0000000..3e7e030
101 --- /dev/null
102 +++ b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
103 @@ -0,0 +1,161 @@
104 +--- calc-2.12.5.3/Makefile
105 ++++ calc-2.12.5.3/Makefile
106 +@@ -1136,14 +1136,14 @@
107 + BLD_TYPE= calc-dynamic-only
108 + #
109 + CC_SHARE= -fPIC
110 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
111 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
112 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
113 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
114 ++LD_SHARE=
115 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
116 + ifdef ALLOW_CUSTOM
117 +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
118 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
119 ++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
120 + else
121 +-LIBCUSTCALC_SHLIB=
122 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
123 ++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
124 + endif
125 + #
126 + CC_STATIC=
127 +@@ -1173,7 +1173,6 @@
128 + BLD_TYPE= calc-dynamic-only
129 + #
130 + CC_SHARE= -fPIC
131 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
132 + LD_SHARE= ${DARWIN_ARCH}
133 + #SET_INSTALL_NAME= no
134 + SET_INSTALL_NAME= yes
135 +@@ -1249,14 +1248,14 @@
136 + BLD_TYPE= calc-dynamic-only
137 + #
138 + CC_SHARE= -fPIC
139 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
140 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
141 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
142 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
143 ++LD_SHARE=
144 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
145 + ifdef ALLOW_CUSTOM
146 +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
147 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
148 ++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
149 + else
150 +-LIBCUSTCALC_SHLIB=
151 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
152 ++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
153 + endif
154 + #
155 + CC_STATIC=
156 +@@ -1294,12 +1293,10 @@
157 + BLD_TYPE= calc-dynamic-only
158 + #
159 + CC_SHARE= -fPIC
160 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
161 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
162 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
163 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
164 ++LD_SHARE=
165 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
166 + ifdef ALLOW_CUSTOM
167 +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
168 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
169 + else
170 + LIBCUSTCALC_SHLIB=
171 + endif
172 +@@ -1333,12 +1330,10 @@
173 + BLD_TYPE= calc-dynamic-only
174 + #
175 + CC_SHARE= -fPIC
176 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
177 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
178 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
179 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
180 ++LD_SHARE=
181 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
182 + ifdef ALLOW_CUSTOM
183 +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
184 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
185 + else
186 + LIBCUSTCALC_SHLIB=
187 + endif
188 +@@ -1370,12 +1365,10 @@
189 + BLD_TYPE= calc-static-only
190 + #
191 + CC_SHARE= -fPIC
192 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
193 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
194 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
195 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
196 ++LD_SHARE=
197 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
198 + ifdef ALLOW_CUSTOM
199 +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
200 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
201 + else
202 + LIBCUSTCALC_SHLIB=
203 + endif
204 +@@ -1411,11 +1404,9 @@
205 + BLD_TYPE= calc-static-only
206 + #
207 + CC_SHARE= -fPIC
208 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
209 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
210 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
211 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
212 +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
213 ++LD_SHARE=
214 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
215 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
216 + #
217 + CC_STATIC=
218 + LD_STATIC=
219 +@@ -1470,12 +1461,11 @@
220 + BLD_TYPE= calc-static-only
221 + #
222 + CC_SHARE= -fPIC
223 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
224 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
225 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
226 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
227 ++LD_SHARE=
228 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
229 + ifdef ALLOW_CUSTOM
230 + LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
231 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
232 + else
233 + LIBCUSTCALC_SHLIB=
234 + endif
235 +@@ -1510,14 +1500,14 @@
236 + BLD_TYPE= calc-static-only
237 + #
238 + CC_SHARE= -fPIC
239 +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
240 +-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
241 +- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
242 +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
243 ++LD_SHARE=
244 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
245 + ifdef ALLOW_CUSTOM
246 +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
247 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
248 ++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
249 + else
250 +-LIBCUSTCALC_SHLIB=
251 ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
252 ++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
253 + endif
254 + #
255 + CC_STATIC=
256 +@@ -2110,7 +2100,7 @@
257 +
258 + calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
259 + ${RM} -f $@
260 +- ${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
261 ++ ${CC} ${LDFLAGS} ${CALCOBJS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
262 + ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
263 +
264 + libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
Report Message
Find on MARC Find on Google Groups