1 |
commit: 589d6c55b867c291c2caa4c8a259d8a3747a7544 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 6 15:41:23 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 6 15:41:23 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=589d6c55 |
7 |
|
8 |
sys-libs/readline: drop 8.0_p4, 8.1 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
sys-libs/readline/Manifest | 5 - |
13 |
sys-libs/readline/readline-8.0_p4.ebuild | 175 ----------------------------- |
14 |
sys-libs/readline/readline-8.1.ebuild | 185 ------------------------------- |
15 |
3 files changed, 365 deletions(-) |
16 |
|
17 |
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest |
18 |
index 00598ae67ab..64c0055b309 100644 |
19 |
--- a/sys-libs/readline/Manifest |
20 |
+++ b/sys-libs/readline/Manifest |
21 |
@@ -1,7 +1,2 @@ |
22 |
-DIST readline-8.0.tar.gz 2975937 BLAKE2B 95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69 SHA512 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f |
23 |
DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00 |
24 |
-DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c |
25 |
-DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c |
26 |
-DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca |
27 |
-DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461 |
28 |
DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54 |
29 |
|
30 |
diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild |
31 |
deleted file mode 100644 |
32 |
index 3918add9dde..00000000000 |
33 |
--- a/sys-libs/readline/readline-8.0_p4.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,175 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript |
42 |
- |
43 |
-# Official patches |
44 |
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ |
45 |
-PLEVEL="${PV##*_p}" |
46 |
-MY_PV="${PV/_p*}" |
47 |
-MY_PV="${MY_PV/_/-}" |
48 |
-MY_P="${PN}-${MY_PV}" |
49 |
-[[ ${PV} != *_p* ]] && PLEVEL=0 |
50 |
-patches() { |
51 |
- [[ ${PLEVEL} -eq 0 ]] && return 1 |
52 |
- local opt=$1 |
53 |
- eval set -- {1..${PLEVEL}} |
54 |
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") |
55 |
- if [[ ${opt} == -s ]] ; then |
56 |
- echo "${@/#/${DISTDIR}/}" |
57 |
- else |
58 |
- local u |
59 |
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do |
60 |
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" |
61 |
- done |
62 |
- fi |
63 |
-} |
64 |
- |
65 |
-DESCRIPTION="Another cute console display library" |
66 |
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html" |
67 |
- |
68 |
-case ${PV} in |
69 |
- *_alpha*|*_beta*|*_rc*) |
70 |
- SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" |
71 |
- ;; |
72 |
- *) |
73 |
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" |
74 |
- ;; |
75 |
-esac |
76 |
- |
77 |
-LICENSE="GPL-3" |
78 |
-SLOT="0/8" # subslot matches SONAME major |
79 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" |
80 |
-IUSE="static-libs +unicode utils" |
81 |
- |
82 |
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]" |
83 |
-DEPEND="${RDEPEND}" |
84 |
-BDEPEND=" |
85 |
- virtual/pkgconfig |
86 |
-" |
87 |
- |
88 |
-S="${WORKDIR}/${MY_P}" |
89 |
- |
90 |
-PATCHES=( |
91 |
- "${FILESDIR}"/${PN}-5.0-no_rpath.patch |
92 |
- "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
93 |
- "${FILESDIR}"/${PN}-7.0-headers.patch |
94 |
- "${FILESDIR}"/${PN}-8.0-headers.patch |
95 |
-) |
96 |
- |
97 |
-# Needed because we don't want the patches being unpacked |
98 |
-# (which emits annoying and useless error messages) |
99 |
-src_unpack() { |
100 |
- unpack ${MY_P}.tar.gz |
101 |
-} |
102 |
- |
103 |
-src_prepare() { |
104 |
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) |
105 |
- default |
106 |
- |
107 |
- # Force ncurses linking. #71420 |
108 |
- # Use pkg-config to get the right values. #457558 |
109 |
- local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) |
110 |
- sed -i \ |
111 |
- -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ |
112 |
- support/shobj-conf || die |
113 |
- sed -i \ |
114 |
- -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ |
115 |
- examples/rlfe/configure || die |
116 |
- |
117 |
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
118 |
- # objformat for years, so we don't want to rely on that. |
119 |
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die |
120 |
- |
121 |
- ln -s ../.. examples/rlfe/readline || die # for local readline headers |
122 |
-} |
123 |
- |
124 |
-src_configure() { |
125 |
- # fix implicit decls with widechar funcs |
126 |
- append-cppflags -D_GNU_SOURCE |
127 |
- # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
128 |
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free |
129 |
- |
130 |
- # Make sure configure picks a better ar than `ar`. #484866 |
131 |
- export ac_cv_prog_AR=$(tc-getAR) |
132 |
- |
133 |
- # Force the test since we used sed above to force it. |
134 |
- export bash_cv_termcap_lib=ncurses |
135 |
- |
136 |
- # Control cross-compiling cases when we know the right answer. |
137 |
- # In cases where the C library doesn't support wide characters, readline |
138 |
- # itself won't work correctly, so forcing the answer below should be OK. |
139 |
- if tc-is-cross-compiler ; then |
140 |
- use kernel_Winnt || export bash_cv_func_sigsetjmp='present' |
141 |
- export bash_cv_func_ctype_nonascii='yes' |
142 |
- export bash_cv_wcwidth_broken='no' #503312 |
143 |
- fi |
144 |
- |
145 |
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change |
146 |
- # so we can re-use the config cache file between the two. |
147 |
- append-ldflags -L. |
148 |
- |
149 |
- multilib-minimal_src_configure |
150 |
-} |
151 |
- |
152 |
-multilib_src_configure() { |
153 |
- local myeconfargs=( |
154 |
- --cache-file="${BUILD_DIR}"/config.cache |
155 |
- --with-curses |
156 |
- $(use_enable static-libs static) |
157 |
- ) |
158 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
159 |
- |
160 |
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
161 |
- # code is full of AC_TRY_RUN() |
162 |
- mkdir -p examples/rlfe || die |
163 |
- cd examples/rlfe || die |
164 |
- ECONF_SOURCE="${S}"/examples/rlfe \ |
165 |
- econf --cache-file="${BUILD_DIR}"/config.cache |
166 |
- fi |
167 |
-} |
168 |
- |
169 |
-multilib_src_compile() { |
170 |
- emake |
171 |
- |
172 |
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
173 |
- # code is full of AC_TRY_RUN() |
174 |
- cd examples/rlfe || die |
175 |
- local l |
176 |
- for l in readline history ; do |
177 |
- ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die |
178 |
- ln -s ../../lib${l}.a lib${l}.a || die |
179 |
- done |
180 |
- emake |
181 |
- fi |
182 |
-} |
183 |
- |
184 |
-multilib_src_install() { |
185 |
- default |
186 |
- |
187 |
- if multilib_is_native_abi ; then |
188 |
- gen_usr_ldscript -a readline history #4411 |
189 |
- |
190 |
- if use utils && ! tc-is-cross-compiler; then |
191 |
- dobin examples/rlfe/rlfe |
192 |
- fi |
193 |
- fi |
194 |
-} |
195 |
- |
196 |
-multilib_src_install_all() { |
197 |
- HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs |
198 |
- dodoc USAGE |
199 |
- docinto ps |
200 |
- dodoc doc/*.ps |
201 |
-} |
202 |
-pkg_preinst() { |
203 |
- # bug #29865 |
204 |
- # Reappeared in #595324 with paludis so keeping this for now... |
205 |
- preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7} |
206 |
-} |
207 |
- |
208 |
-pkg_postinst() { |
209 |
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7} |
210 |
-} |
211 |
|
212 |
diff --git a/sys-libs/readline/readline-8.1.ebuild b/sys-libs/readline/readline-8.1.ebuild |
213 |
deleted file mode 100644 |
214 |
index 4a4f8c7b6f2..00000000000 |
215 |
--- a/sys-libs/readline/readline-8.1.ebuild |
216 |
+++ /dev/null |
217 |
@@ -1,185 +0,0 @@ |
218 |
-# Copyright 1999-2021 Gentoo Authors |
219 |
-# Distributed under the terms of the GNU General Public License v2 |
220 |
- |
221 |
-EAPI=7 |
222 |
- |
223 |
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript |
224 |
- |
225 |
-# Official patches |
226 |
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ |
227 |
-PLEVEL="${PV##*_p}" |
228 |
-MY_PV="${PV/_p*}" |
229 |
-MY_PV="${MY_PV/_/-}" |
230 |
-MY_P="${PN}-${MY_PV}" |
231 |
-[[ ${PV} != *_p* ]] && PLEVEL=0 |
232 |
-patches() { |
233 |
- [[ ${PLEVEL} -eq 0 ]] && return 1 |
234 |
- local opt=$1 |
235 |
- eval set -- {1..${PLEVEL}} |
236 |
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") |
237 |
- if [[ ${opt} == -s ]] ; then |
238 |
- echo "${@/#/${DISTDIR}/}" |
239 |
- else |
240 |
- local u |
241 |
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do |
242 |
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" |
243 |
- done |
244 |
- fi |
245 |
-} |
246 |
- |
247 |
-DESCRIPTION="Another cute console display library" |
248 |
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html" |
249 |
- |
250 |
-case ${PV} in |
251 |
- *_alpha*|*_beta*|*_rc*) |
252 |
- SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" |
253 |
- ;; |
254 |
- *) |
255 |
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" |
256 |
- ;; |
257 |
-esac |
258 |
- |
259 |
-LICENSE="GPL-3" |
260 |
-SLOT="0/8" # subslot matches SONAME major |
261 |
-[[ "${PV}" == *_rc* ]] || \ |
262 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
263 |
-IUSE="static-libs +unicode utils" |
264 |
- |
265 |
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]" |
266 |
-DEPEND="${RDEPEND}" |
267 |
-BDEPEND=" |
268 |
- virtual/pkgconfig |
269 |
-" |
270 |
- |
271 |
-S="${WORKDIR}/${MY_P}" |
272 |
- |
273 |
-PATCHES=( |
274 |
- "${FILESDIR}"/${PN}-5.0-no_rpath.patch |
275 |
- "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
276 |
- "${FILESDIR}"/${PN}-7.0-headers.patch |
277 |
- "${FILESDIR}"/${PN}-8.0-headers.patch |
278 |
- "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch |
279 |
-) |
280 |
- |
281 |
-# Needed because we don't want the patches being unpacked |
282 |
-# (which emits annoying and useless error messages) |
283 |
-src_unpack() { |
284 |
- unpack ${MY_P}.tar.gz |
285 |
-} |
286 |
- |
287 |
-src_prepare() { |
288 |
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) |
289 |
- default |
290 |
- |
291 |
- # Force ncurses linking. #71420 |
292 |
- # Use pkg-config to get the right values. #457558 |
293 |
- local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) |
294 |
- sed -i \ |
295 |
- -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ |
296 |
- support/shobj-conf || die |
297 |
- sed -i \ |
298 |
- -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ |
299 |
- examples/rlfe/configure || die |
300 |
- |
301 |
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
302 |
- # objformat for years, so we don't want to rely on that. |
303 |
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die |
304 |
- |
305 |
- ln -s ../.. examples/rlfe/readline || die # for local readline headers |
306 |
-} |
307 |
- |
308 |
-src_configure() { |
309 |
- # fix implicit decls with widechar funcs |
310 |
- append-cppflags -D_GNU_SOURCE |
311 |
- # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
312 |
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free |
313 |
- |
314 |
- # Make sure configure picks a better ar than `ar`. #484866 |
315 |
- export ac_cv_prog_AR=$(tc-getAR) |
316 |
- |
317 |
- # Force the test since we used sed above to force it. |
318 |
- export bash_cv_termcap_lib=ncurses |
319 |
- |
320 |
- # Control cross-compiling cases when we know the right answer. |
321 |
- # In cases where the C library doesn't support wide characters, readline |
322 |
- # itself won't work correctly, so forcing the answer below should be OK. |
323 |
- if tc-is-cross-compiler ; then |
324 |
- use kernel_Winnt || export bash_cv_func_sigsetjmp='present' |
325 |
- export bash_cv_func_ctype_nonascii='yes' |
326 |
- export bash_cv_wcwidth_broken='no' #503312 |
327 |
- fi |
328 |
- |
329 |
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change |
330 |
- # so we can re-use the config cache file between the two. |
331 |
- append-ldflags -L. |
332 |
- |
333 |
- multilib-minimal_src_configure |
334 |
-} |
335 |
- |
336 |
-multilib_src_configure() { |
337 |
- local myeconfargs=( |
338 |
- --cache-file="${BUILD_DIR}"/config.cache |
339 |
- --with-curses |
340 |
- $(use_enable static-libs static) |
341 |
- ) |
342 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
343 |
- |
344 |
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
345 |
- # code is full of AC_TRY_RUN() |
346 |
- mkdir -p examples/rlfe || die |
347 |
- cd examples/rlfe || die |
348 |
- ECONF_SOURCE="${S}"/examples/rlfe \ |
349 |
- econf --cache-file="${BUILD_DIR}"/config.cache |
350 |
- fi |
351 |
-} |
352 |
- |
353 |
-multilib_src_compile() { |
354 |
- emake |
355 |
- |
356 |
- if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
357 |
- # code is full of AC_TRY_RUN() |
358 |
- cd examples/rlfe || die |
359 |
- local l |
360 |
- for l in readline history ; do |
361 |
- ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die |
362 |
- ln -s ../../lib${l}.a lib${l}.a || die |
363 |
- done |
364 |
- emake |
365 |
- fi |
366 |
-} |
367 |
- |
368 |
-multilib_src_install() { |
369 |
- default |
370 |
- |
371 |
- if multilib_is_native_abi ; then |
372 |
- gen_usr_ldscript -a readline history #4411 |
373 |
- |
374 |
- if use utils && ! tc-is-cross-compiler; then |
375 |
- dobin examples/rlfe/rlfe |
376 |
- fi |
377 |
- fi |
378 |
-} |
379 |
- |
380 |
-multilib_src_install_all() { |
381 |
- HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs |
382 |
- dodoc USAGE |
383 |
- docinto ps |
384 |
- dodoc doc/*.ps |
385 |
-} |
386 |
-pkg_preinst() { |
387 |
- # bug #29865 |
388 |
- # Reappeared in #595324 with paludis so keeping this for now... |
389 |
- preserve_old_lib \ |
390 |
- /$(get_libdir)/lib{history,readline}$(get_libname 4) \ |
391 |
- /$(get_libdir)/lib{history,readline}$(get_libname 5) \ |
392 |
- /$(get_libdir)/lib{history,readline}$(get_libname 6) \ |
393 |
- /$(get_libdir)/lib{history,readline}$(get_libname 7) |
394 |
-} |
395 |
- |
396 |
-pkg_postinst() { |
397 |
- preserve_old_lib_notify \ |
398 |
- /$(get_libdir)/lib{history,readline}$(get_libname 4) \ |
399 |
- /$(get_libdir)/lib{history,readline}$(get_libname 5) \ |
400 |
- /$(get_libdir)/lib{history,readline}$(get_libname 6) \ |
401 |
- /$(get_libdir)/lib{history,readline}$(get_libname 7) |
402 |
-} |