Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-libs/readline/, sys-libs/readline/files/
Date: Sat, 26 Dec 2020 12:57:19
Message-Id: 1608987387.2aeeb30dab6abf608919351a3d63603e731f6b85.grobian@gentoo
1 commit: 2aeeb30dab6abf608919351a3d63603e731f6b85
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 26 12:56:27 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 26 12:56:27 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2aeeb30d
7
8 sys-libs/readline: migrated to gx86
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 sys-libs/readline/Manifest | 6 -
13 .../readline/files/readline-5.0-no_rpath.patch | 13 --
14 sys-libs/readline/files/readline-6.0-mint.patch | 36 ----
15 .../readline/files/readline-6.0-rlfe-solaris.patch | 17 --
16 .../readline/files/readline-6.2-rlfe-tgoto.patch | 14 --
17 sys-libs/readline/files/readline-7.0-headers.patch | 24 ---
18 .../readline-8.0-darwin-shlib-versioning.patch | 40 -----
19 sys-libs/readline/files/readline-8.0-headers.patch | 17 --
20 sys-libs/readline/metadata.xml | 11 --
21 sys-libs/readline/readline-8.0_p4.ebuild | 181 --------------------
22 sys-libs/readline/readline-8.1.ebuild | 188 ---------------------
23 11 files changed, 547 deletions(-)
24
25 diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
26 deleted file mode 100644
27 index db9715837e..0000000000
28 --- a/sys-libs/readline/Manifest
29 +++ /dev/null
30 @@ -1,6 +0,0 @@
31 -DIST readline-8.0.tar.gz 2975937 BLAKE2B 95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69 SHA512 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
32 -DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
33 -DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
34 -DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
35 -DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
36 -DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
37
38 diff --git a/sys-libs/readline/files/readline-5.0-no_rpath.patch b/sys-libs/readline/files/readline-5.0-no_rpath.patch
39 deleted file mode 100644
40 index befad63e42..0000000000
41 --- a/sys-libs/readline/files/readline-5.0-no_rpath.patch
42 +++ /dev/null
43 @@ -1,13 +0,0 @@
44 -ripped from Fedora
45 -
46 ---- a/support/shobj-conf
47 -+++ b/support/shobj-conf
48 -@@ -102,7 +102,7 @@
49 - SHOBJ_LD='${CC}'
50 - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
51 -
52 -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
53 -+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
54 - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
55 - ;;
56 -
57
58 diff --git a/sys-libs/readline/files/readline-6.0-mint.patch b/sys-libs/readline/files/readline-6.0-mint.patch
59 deleted file mode 100644
60 index d126ba5626..0000000000
61 --- a/sys-libs/readline/files/readline-6.0-mint.patch
62 +++ /dev/null
63 @@ -1,36 +0,0 @@
64 -Patch by Alan Hourihane for FreeMiNT
65 -http://archives.gentoo.org/gentoo-alt/msg_c989ade3c4f92f866fe1c40ff2da0c4a.xml
66 -
67 -diff -ur readline-5.2/examples/rlfe/rlfe.c readline-5.2-mint/examples/rlfe/rlfe.c
68 ---- readline-5.2/examples/rlfe/rlfe.c 2008-03-11 19:23:25.800436592 +0000
69 -+++ readline-5.2-mint/examples/rlfe/rlfe.c 2008-03-11 19:23:38.877438387 +0000
70 -@@ -541,6 +541,13 @@
71 - add_special_char(t.c_cc[VDISCARD]);
72 - #endif
73 -
74 -+#ifndef ECHOKE
75 -+#define ECHOKE 0
76 -+#endif
77 -+#ifndef ECHOPRT
78 -+#define ECHOPRT 0
79 -+#endif
80 -+
81 - t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | \
82 - ECHOK | ECHOKE | ECHONL | ECHOPRT );
83 - t.c_iflag &= ~ICRNL;
84 -Only in readline-5.2: readline-5.2-mint.patch
85 -diff -ur readline-5.2/support/shobj-conf readline-5.2-mint/support/shobj-conf
86 ---- readline-5.2/support/shobj-conf 2006-04-11 14:15:43.000000000 +0100
87 -+++ readline-5.2-mint/support/shobj-conf 2008-03-11 17:34:33.588499957 +0000
88 -@@ -487,6 +487,11 @@
89 - SHLIB_STATUS=unsupported
90 - ;;
91 -
92 -+mint*)
93 -+ SHOBJ_STATUS=unsupported
94 -+ SHLIB_STATUS=unsupported
95 -+ ;;
96 -+
97 - cygwin*)
98 - SHOBJ_LD='$(CC)'
99 - SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a'
100
101 diff --git a/sys-libs/readline/files/readline-6.0-rlfe-solaris.patch b/sys-libs/readline/files/readline-6.0-rlfe-solaris.patch
102 deleted file mode 100644
103 index cff94ebe15..0000000000
104 --- a/sys-libs/readline/files/readline-6.0-rlfe-solaris.patch
105 +++ /dev/null
106 @@ -1,17 +0,0 @@
107 -<grobian@g.o>:
108 -* Panic is just used, but never defined or included (at least not on Solaris)
109 -
110 ---- a/examples/rlfe/pty.c
111 -+++ b/examples/rlfe/pty.c
112 -@@ -54,6 +54,11 @@
113 - # include <sys/sysmacros.h>
114 - #endif /* sgi */
115 -
116 -+#ifndef Panic
117 -+# include <string.h>
118 -+# define Panic(X, Y) fprintf(stderr, "%s: %s", Y, strerror(X))
119 -+#endif
120 -+
121 - #include "extern.h"
122 -
123 - /*
124
125 diff --git a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
126 deleted file mode 100644
127 index b898bf053e..0000000000
128 --- a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
129 +++ /dev/null
130 @@ -1,14 +0,0 @@
131 -https://bugs.gentoo.org/385091
132 -
133 -https://lists.gnu.org/archive/html/bug-readline/2011-10/msg00000.html
134 -
135 ---- a/examples/rlfe/configure
136 -+++ b/examples/rlfe/configure
137 -@@ -4062,6 +4062,7 @@ cat confdefs.h >>conftest.$ac_ext
138 - cat >>conftest.$ac_ext <<_ACEOF
139 - /* end confdefs.h. */
140 -
141 -+extern char *tgoto(char *, int, int);
142 - main()
143 - {
144 - exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
145
146 diff --git a/sys-libs/readline/files/readline-7.0-headers.patch b/sys-libs/readline/files/readline-7.0-headers.patch
147 deleted file mode 100644
148 index 892ec21f51..0000000000
149 --- a/sys-libs/readline/files/readline-7.0-headers.patch
150 +++ /dev/null
151 @@ -1,24 +0,0 @@
152 -From 4bc0aa68aff12a59628dd3c99a53360a9aa1ce93 Mon Sep 17 00:00:00 2001
153 -From: Mike Frysinger <vapier@g.o>
154 -Date: Thu, 11 Aug 2016 17:49:27 +0800
155 -Subject: [PATCH] include ctype.h for isdigit usage
156 -
157 ----
158 - lib/readline/histexpand.c | 1 +
159 - 1 file changed, 1 insertion(+)
160 -
161 -diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c
162 -index 46a99aa62e30..13248db83048 100644
163 ---- a/histexpand.c
164 -+++ b/histexpand.c
165 -@@ -26,6 +26,7 @@
166 - #endif
167 -
168 - #include <stdio.h>
169 -+#include <ctype.h>
170 -
171 - #if defined (HAVE_STDLIB_H)
172 - # include <stdlib.h>
173 ---
174 -2.9.0
175 -
176
177 diff --git a/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch b/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch
178 deleted file mode 100644
179 index 5012300b7c..0000000000
180 --- a/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch
181 +++ /dev/null
182 @@ -1,40 +0,0 @@
183 -diff -ur readline-6.3.orig/support/shobj-conf readline-6.3/support/shobj-conf
184 ---- readline-6.3.orig/support/shobj-conf 2014-11-29 13:14:17.000000000 -0200
185 -+++ readline-6.3/support/shobj-conf 2014-11-29 13:32:43.000000000 -0200
186 -@@ -180,34 +180,8 @@
187 - SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
188 - SHLIB_LIBSUFF='dylib'
189 -
190 -- # unused at this time
191 -- SHLIB_SONAME='$(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)'
192 --
193 -- case "${host_os}" in
194 -- # Darwin versions 1, 5, 6, 7 correspond to Mac OS X 10.0, 10.1, 10.2,
195 -- # and 10.3, respectively.
196 -- darwin[1-7].*)
197 -- SHOBJ_STATUS=unsupported
198 -- SHOBJ_LDFLAGS='-dynamic'
199 -- SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -v'
200 -- ;;
201 -- # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
202 -- *)
203 -- case "${host_os}" in
204 -- darwin[89]*|darwin1[012]*)
205 -- SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`'
206 -- ;;
207 -- *) # Mac OS X 10.9 (Mavericks) and later
208 -- SHOBJ_ARCHFLAGS=
209 -- # for 32 and 64bit universal library
210 -- #SHOBJ_ARCHFLAGS='-arch i386 -arch x86_64'
211 -- #SHOBJ_CFLAGS=${SHOBJ_CFLAGS}' -arch i386 -arch x86_64'
212 -- ;;
213 -- esac
214 -- SHOBJ_LDFLAGS="-dynamiclib -dynamic -undefined dynamic_lookup ${SHOBJ_ARCHFLAGS}"
215 -- SHLIB_XLDFLAGS="-dynamiclib ${SHOBJ_ARCHFLAGS}"' -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -v'
216 -- ;;
217 -- esac
218 -+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
219 -+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/`basename $@ $(SHLIB_MINOR)$(SHLIB_DOT)$(SHLIB_LIBSUFF)`$(SHLIB_DOT)$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)'
220 -
221 - SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
222 - ;;
223
224 diff --git a/sys-libs/readline/files/readline-8.0-headers.patch b/sys-libs/readline/files/readline-8.0-headers.patch
225 deleted file mode 100644
226 index f19a3b136e..0000000000
227 --- a/sys-libs/readline/files/readline-8.0-headers.patch
228 +++ /dev/null
229 @@ -1,17 +0,0 @@
230 -Required by bash-5.0 or else compilation fails:
231 -
232 - bashline.c:69:10: fatal error: readline/rlmbutil.h: No such file or directory
233 - #include <readline/rlmbutil.h>
234 - ^~~~~~~~~~~~~~~~~~~~~
235 -
236 ---- readline-8.0/Makefile.in
237 -+++ readline-8.0/Makefile.in
238 -@@ -153,7 +153,7 @@
239 - CREATED_TAGS = TAGS tags
240 -
241 - INSTALLED_HEADERS = readline.h chardefs.h keymaps.h history.h tilde.h \
242 -- rlstdc.h rlconf.h rltypedefs.h
243 -+ rlstdc.h rlconf.h rltypedefs.h rlmbutil.h
244 -
245 - OTHER_DOCS = $(srcdir)/CHANGES $(srcdir)/INSTALL $(srcdir)/README
246 - OTHER_INSTALLED_DOCS = CHANGES INSTALL README
247
248 diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
249 deleted file mode 100644
250 index 49d63436c4..0000000000
251 --- a/sys-libs/readline/metadata.xml
252 +++ /dev/null
253 @@ -1,11 +0,0 @@
254 -<?xml version="1.0" encoding="UTF-8"?>
255 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
256 -<pkgmetadata>
257 -<maintainer type="project">
258 - <email>base-system@g.o</email>
259 - <name>Gentoo Base System</name>
260 -</maintainer>
261 -<use>
262 - <flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
263 -</use>
264 -</pkgmetadata>
265
266 diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild
267 deleted file mode 100644
268 index 1dca8248a0..0000000000
269 --- a/sys-libs/readline/readline-8.0_p4.ebuild
270 +++ /dev/null
271 @@ -1,181 +0,0 @@
272 -# Copyright 1999-2020 Gentoo Authors
273 -# Distributed under the terms of the GNU General Public License v2
274 -
275 -EAPI=7
276 -
277 -inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
278 -
279 -# Official patches
280 -# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
281 -PLEVEL="${PV##*_p}"
282 -MY_PV="${PV/_p*}"
283 -MY_PV="${MY_PV/_/-}"
284 -MY_P="${PN}-${MY_PV}"
285 -[[ ${PV} != *_p* ]] && PLEVEL=0
286 -patches() {
287 - [[ ${PLEVEL} -eq 0 ]] && return 1
288 - local opt=$1
289 - eval set -- {1..${PLEVEL}}
290 - set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
291 - if [[ ${opt} == -s ]] ; then
292 - echo "${@/#/${DISTDIR}/}"
293 - else
294 - local u
295 - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
296 - printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
297 - done
298 - fi
299 -}
300 -
301 -DESCRIPTION="Another cute console display library"
302 -HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
303 -
304 -case ${PV} in
305 - *_alpha*|*_beta*|*_rc*)
306 - SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
307 - ;;
308 - *)
309 - SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
310 - ;;
311 -esac
312 -
313 -LICENSE="GPL-3"
314 -SLOT="0/8" # subslot matches SONAME major
315 -KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
316 -IUSE="static-libs +unicode utils"
317 -
318 -RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
319 -DEPEND="${RDEPEND}"
320 -BDEPEND="
321 - virtual/pkgconfig
322 -"
323 -
324 -S="${WORKDIR}/${MY_P}"
325 -
326 -PATCHES=(
327 - "${FILESDIR}"/${PN}-5.0-no_rpath.patch
328 - "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
329 - "${FILESDIR}"/${PN}-7.0-headers.patch
330 - "${FILESDIR}"/${PN}-8.0-headers.patch
331 -
332 - "${FILESDIR}"/${PN}-6.0-mint.patch
333 - "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch
334 - "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
335 -)
336 -
337 -src_prepare() {
338 - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
339 - default
340 -
341 - # Force ncurses linking. #71420
342 - # Use pkg-config to get the right values. #457558
343 - local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
344 - sed -i \
345 - -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
346 - support/shobj-conf || die
347 - sed -i \
348 - -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
349 - examples/rlfe/configure || die
350 -
351 - # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
352 - # objformat for years, so we don't want to rely on that.
353 - sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
354 -
355 - ln -s ../.. examples/rlfe/readline || die # for local readline headers
356 -}
357 -
358 -src_configure() {
359 - # fix implicit decls with widechar funcs
360 - append-cppflags -D_GNU_SOURCE
361 - # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
362 - append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
363 -
364 - # Make sure configure picks a better ar than `ar`. #484866
365 - export ac_cv_prog_AR=$(tc-getAR)
366 -
367 - # Force the test since we used sed above to force it.
368 - export bash_cv_termcap_lib=ncurses
369 -
370 - # Control cross-compiling cases when we know the right answer.
371 - # In cases where the C library doesn't support wide characters, readline
372 - # itself won't work correctly, so forcing the answer below should be OK.
373 - if tc-is-cross-compiler ; then
374 - use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
375 - export bash_cv_func_ctype_nonascii='yes'
376 - export bash_cv_wcwidth_broken='no' #503312
377 - fi
378 -
379 - # This is for rlfe, but we need to make sure LDFLAGS doesn't change
380 - # so we can re-use the config cache file between the two.
381 - append-ldflags -L.
382 -
383 - multilib-minimal_src_configure
384 -}
385 -
386 -multilib_src_configure() {
387 - local myeconfargs=(
388 - --cache-file="${BUILD_DIR}"/config.cache
389 - --with-curses
390 - $(use_enable static-libs static)
391 - )
392 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
393 -
394 - if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
395 - # code is full of AC_TRY_RUN()
396 - mkdir -p examples/rlfe || die
397 - cd examples/rlfe || die
398 - ECONF_SOURCE="${S}"/examples/rlfe \
399 - econf --cache-file="${BUILD_DIR}"/config.cache
400 - fi
401 -}
402 -
403 -multilib_src_compile() {
404 - emake
405 -
406 - if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
407 - # code is full of AC_TRY_RUN()
408 - cd examples/rlfe || die
409 - local l
410 - for l in readline history ; do
411 - ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
412 - ln -s ../../lib${l}.a lib${l}.a || die
413 - done
414 - emake
415 - fi
416 -}
417 -
418 -multilib_src_install() {
419 - default
420 -
421 - if multilib_is_native_abi ; then
422 - gen_usr_ldscript -a readline history #4411
423 -
424 - if use utils && ! tc-is-cross-compiler; then
425 - dobin examples/rlfe/rlfe
426 - fi
427 - fi
428 -}
429 -
430 -multilib_src_install_all() {
431 - HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
432 - dodoc USAGE
433 - docinto ps
434 - dodoc doc/*.ps
435 -}
436 -pkg_preinst() {
437 - # bug #29865
438 - # Reappeared in #595324 with paludis so keeping this for now...
439 - preserve_old_lib \
440 - /$(get_libdir)/lib{history,readline}$(get_libname 4) \
441 - /$(get_libdir)/lib{history,readline}$(get_libname 5) \
442 - /$(get_libdir)/lib{history,readline}$(get_libname 6) \
443 - /$(get_libdir)/lib{history,readline}$(get_libname 7)
444 -}
445 -
446 -pkg_postinst() {
447 - preserve_old_lib_notify \
448 - /$(get_libdir)/lib{history,readline}$(get_libname 4) \
449 - /$(get_libdir)/lib{history,readline}$(get_libname 5) \
450 - /$(get_libdir)/lib{history,readline}$(get_libname 6) \
451 - /$(get_libdir)/lib{history,readline}$(get_libname 7)
452 -}
453
454 diff --git a/sys-libs/readline/readline-8.1.ebuild b/sys-libs/readline/readline-8.1.ebuild
455 deleted file mode 100644
456 index 53aa5de3fd..0000000000
457 --- a/sys-libs/readline/readline-8.1.ebuild
458 +++ /dev/null
459 @@ -1,188 +0,0 @@
460 -# Copyright 1999-2020 Gentoo Authors
461 -# Distributed under the terms of the GNU General Public License v2
462 -
463 -EAPI=7
464 -
465 -inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
466 -
467 -# Official patches
468 -# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
469 -PLEVEL="${PV##*_p}"
470 -MY_PV="${PV/_p*}"
471 -MY_PV="${MY_PV/_/-}"
472 -MY_P="${PN}-${MY_PV}"
473 -[[ ${PV} != *_p* ]] && PLEVEL=0
474 -patches() {
475 - [[ ${PLEVEL} -eq 0 ]] && return 1
476 - local opt=$1
477 - eval set -- {1..${PLEVEL}}
478 - set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
479 - if [[ ${opt} == -s ]] ; then
480 - echo "${@/#/${DISTDIR}/}"
481 - else
482 - local u
483 - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
484 - printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
485 - done
486 - fi
487 -}
488 -
489 -DESCRIPTION="Another cute console display library"
490 -HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
491 -
492 -case ${PV} in
493 - *_alpha*|*_beta*|*_rc*)
494 - SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
495 - ;;
496 - *)
497 - SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
498 - ;;
499 -esac
500 -
501 -LICENSE="GPL-3"
502 -SLOT="0/8" # subslot matches SONAME major
503 -[[ "${PV}" == *_rc* ]] || \
504 -KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
505 -IUSE="static-libs +unicode utils"
506 -
507 -RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
508 -DEPEND="${RDEPEND}"
509 -BDEPEND="
510 - virtual/pkgconfig
511 -"
512 -
513 -S="${WORKDIR}/${MY_P}"
514 -
515 -PATCHES=(
516 - "${FILESDIR}"/${PN}-5.0-no_rpath.patch
517 - "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
518 - "${FILESDIR}"/${PN}-7.0-headers.patch
519 - "${FILESDIR}"/${PN}-8.0-headers.patch
520 -
521 - "${FILESDIR}"/${PN}-6.0-mint.patch
522 - "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch
523 - "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
524 -)
525 -
526 -# Needed because we don't want the patches being unpacked
527 -# (which emits annoying and useless error messages)
528 -src_unpack() {
529 - unpack ${MY_P}.tar.gz
530 -}
531 -
532 -src_prepare() {
533 - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
534 - default
535 -
536 - # Force ncurses linking. #71420
537 - # Use pkg-config to get the right values. #457558
538 - local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
539 - sed -i \
540 - -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
541 - support/shobj-conf || die
542 - sed -i \
543 - -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
544 - examples/rlfe/configure || die
545 -
546 - # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
547 - # objformat for years, so we don't want to rely on that.
548 - sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
549 -
550 - ln -s ../.. examples/rlfe/readline || die # for local readline headers
551 -}
552 -
553 -src_configure() {
554 - # fix implicit decls with widechar funcs
555 - append-cppflags -D_GNU_SOURCE
556 - # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
557 - append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
558 -
559 - # Make sure configure picks a better ar than `ar`. #484866
560 - export ac_cv_prog_AR=$(tc-getAR)
561 -
562 - # Force the test since we used sed above to force it.
563 - export bash_cv_termcap_lib=ncurses
564 -
565 - # Control cross-compiling cases when we know the right answer.
566 - # In cases where the C library doesn't support wide characters, readline
567 - # itself won't work correctly, so forcing the answer below should be OK.
568 - if tc-is-cross-compiler ; then
569 - use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
570 - export bash_cv_func_ctype_nonascii='yes'
571 - export bash_cv_wcwidth_broken='no' #503312
572 - fi
573 -
574 - # This is for rlfe, but we need to make sure LDFLAGS doesn't change
575 - # so we can re-use the config cache file between the two.
576 - append-ldflags -L.
577 -
578 - multilib-minimal_src_configure
579 -}
580 -
581 -multilib_src_configure() {
582 - local myeconfargs=(
583 - --cache-file="${BUILD_DIR}"/config.cache
584 - --with-curses
585 - $(use_enable static-libs static)
586 - )
587 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
588 -
589 - if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
590 - # code is full of AC_TRY_RUN()
591 - mkdir -p examples/rlfe || die
592 - cd examples/rlfe || die
593 - ECONF_SOURCE="${S}"/examples/rlfe \
594 - econf --cache-file="${BUILD_DIR}"/config.cache
595 - fi
596 -}
597 -
598 -multilib_src_compile() {
599 - emake
600 -
601 - if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
602 - # code is full of AC_TRY_RUN()
603 - cd examples/rlfe || die
604 - local l
605 - for l in readline history ; do
606 - ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
607 - ln -s ../../lib${l}.a lib${l}.a || die
608 - done
609 - emake
610 - fi
611 -}
612 -
613 -multilib_src_install() {
614 - default
615 -
616 - if multilib_is_native_abi ; then
617 - gen_usr_ldscript -a readline history #4411
618 -
619 - if use utils && ! tc-is-cross-compiler; then
620 - dobin examples/rlfe/rlfe
621 - fi
622 - fi
623 -}
624 -
625 -multilib_src_install_all() {
626 - HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
627 - dodoc USAGE
628 - docinto ps
629 - dodoc doc/*.ps
630 -}
631 -pkg_preinst() {
632 - # bug #29865
633 - # Reappeared in #595324 with paludis so keeping this for now...
634 - preserve_old_lib \
635 - /$(get_libdir)/lib{history,readline}$(get_libname 4) \
636 - /$(get_libdir)/lib{history,readline}$(get_libname 5) \
637 - /$(get_libdir)/lib{history,readline}$(get_libname 6) \
638 - /$(get_libdir)/lib{history,readline}$(get_libname 7)
639 -}
640 -
641 -pkg_postinst() {
642 - preserve_old_lib_notify \
643 - /$(get_libdir)/lib{history,readline}$(get_libname 4) \
644 - /$(get_libdir)/lib{history,readline}$(get_libname 5) \
645 - /$(get_libdir)/lib{history,readline}$(get_libname 6) \
646 - /$(get_libdir)/lib{history,readline}$(get_libname 7)
647 -}