Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/
Date: Fri, 21 Jan 2022 23:43:16
Message-Id: 1642808581.df119924c4bcdd8b2a8e04f0ad4ad18f96d2e0cc.sam@gentoo
1 commit: df119924c4bcdd8b2a8e04f0ad4ad18f96d2e0cc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 21 23:42:01 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 21 23:43:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df119924
7
8 sys-libs/readline: add 8.2_alpha
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-libs/readline/Manifest | 1 +
13 sys-libs/readline/readline-8.2_alpha.ebuild | 206 ++++++++++++++++++++++++++++
14 2 files changed, 207 insertions(+)
15
16 diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
17 index 5e92aa228d28..fec78a126892 100644
18 --- a/sys-libs/readline/Manifest
19 +++ b/sys-libs/readline/Manifest
20 @@ -1,3 +1,4 @@
21 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
22 +DIST readline-8.2-alpha.tar.gz 3004737 BLAKE2B 05af0ed2bb096d579f5c25879d8917af71f73a0d3db2e5c1c06078bad3617923c88cd3741a8d3cb762177ba9bf4eac88012d9ebf4be2d0a1dfc6f0764a9a4ba0 SHA512 3f7523db5a11eebb4a1d0162cc54260b2155f32717740d0aea0bb192b17129f686400414bef4470a771d3988ad4c24fd9bf0ed9d9cf1256c142089e33c7abd31
23 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
24 DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f54f3204c2d09b88ccec960e807c7af0ec3514b489b676e3be51f98351e377fb18e3d7a14d33d4da69d SHA512 e47c029b82cf3a4d44e85c4348f7e059c56726694c190d84186822e1c893e1c006e7ec75f33c36791112f81abd792a2e2fdae9a65cd128f3c89ff4ffd9a9a1ff
25
26 diff --git a/sys-libs/readline/readline-8.2_alpha.ebuild b/sys-libs/readline/readline-8.2_alpha.ebuild
27 new file mode 100644
28 index 000000000000..65d619f5bbbd
29 --- /dev/null
30 +++ b/sys-libs/readline/readline-8.2_alpha.ebuild
31 @@ -0,0 +1,206 @@
32 +# Copyright 1999-2022 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=7
36 +
37 +inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
38 +
39 +# Official patches
40 +# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
41 +PLEVEL="${PV##*_p}"
42 +MY_PV="${PV/_p*}"
43 +MY_PV="${MY_PV/_/-}"
44 +MY_P="${PN}-${MY_PV}"
45 +[[ ${PV} != *_p* ]] && PLEVEL=0
46 +patches() {
47 + [[ ${PLEVEL} -eq 0 ]] && return 1
48 + local opt=$1
49 + eval set -- {1..${PLEVEL}}
50 + set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
51 + if [[ ${opt} == -s ]] ; then
52 + echo "${@/#/${DISTDIR}/}"
53 + else
54 + local u
55 + for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
56 + printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
57 + done
58 + fi
59 +}
60 +
61 +DESCRIPTION="Another cute console display library"
62 +HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
63 +
64 +case ${PV} in
65 + *_alpha*|*_beta*|*_rc*)
66 + # TODO: check if needed on next alpha/beta
67 + inherit autotools
68 +
69 + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
70 + ;;
71 + *)
72 + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
73 + ;;
74 +esac
75 +
76 +LICENSE="GPL-3"
77 +SLOT="0/8" # subslot matches SONAME major
78 +if [[ ${PV} != *_alpha* && ${PV} != *_rc* ]] ; then
79 + 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"
80 +fi
81 +IUSE="static-libs +unicode utils"
82 +
83 +RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
84 +DEPEND="${RDEPEND}"
85 +BDEPEND="virtual/pkgconfig"
86 +
87 +S="${WORKDIR}/${MY_P}"
88 +
89 +PATCHES=(
90 + "${FILESDIR}"/${PN}-5.0-no_rpath.patch
91 + "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
92 + "${FILESDIR}"/${PN}-7.0-headers.patch
93 + "${FILESDIR}"/${PN}-8.0-headers.patch
94 +
95 + # TODO: rebase
96 + #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
97 +)
98 +
99 +# Needed because we don't want the patches being unpacked
100 +# (which emits annoying and useless error messages)
101 +src_unpack() {
102 + unpack ${MY_P}.tar.gz
103 +}
104 +
105 +src_prepare() {
106 + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
107 + default
108 +
109 + [[ ${PV} == *_alpha* ]] && eautoreconf
110 +
111 + if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
112 + # If we're bootstrapping, make a guess. We don't have pkg-config
113 + # around yet. bug #818103.
114 + # Incorrectly populating this leads to underlinked libreadline.
115 + local ncurses_libs
116 + local ncurses_libs_suffix=$(usex unicode w '')
117 +
118 + ncurses_libs="-lncurses${ncurses_libs_suffix}"
119 +
120 + if has_version "sys-libs/ncurses[tinfo(+)]" ; then
121 + ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
122 + fi
123 + else
124 + # Force ncurses linking. #71420
125 + # Use pkg-config to get the right values. #457558
126 + local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
127 + fi
128 +
129 + sed -i \
130 + -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
131 + support/shobj-conf || die
132 + sed -i \
133 + -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
134 + examples/rlfe/configure || die
135 +
136 + # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
137 + # objformat for years, so we don't want to rely on that.
138 + sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
139 +
140 + ln -s ../.. examples/rlfe/readline || die # for local readline headers
141 +}
142 +
143 +src_configure() {
144 + # fix implicit decls with widechar funcs
145 + append-cppflags -D_GNU_SOURCE
146 + # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
147 + append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
148 +
149 + # Make sure configure picks a better ar than `ar`. #484866
150 + export ac_cv_prog_AR=$(tc-getAR)
151 +
152 + # Force the test since we used sed above to force it.
153 + export bash_cv_termcap_lib=ncurses
154 +
155 + # Control cross-compiling cases when we know the right answer.
156 + # In cases where the C library doesn't support wide characters, readline
157 + # itself won't work correctly, so forcing the answer below should be OK.
158 + if tc-is-cross-compiler ; then
159 + use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
160 + export bash_cv_func_ctype_nonascii='yes'
161 + export bash_cv_wcwidth_broken='no' #503312
162 + fi
163 +
164 + # This is for rlfe, but we need to make sure LDFLAGS doesn't change
165 + # so we can re-use the config cache file between the two.
166 + append-ldflags -L.
167 +
168 + multilib-minimal_src_configure
169 +}
170 +
171 +multilib_src_configure() {
172 + local myeconfargs=(
173 + --cache-file="${BUILD_DIR}"/config.cache
174 + --with-curses
175 + $(use_enable static-libs static)
176 + )
177 + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
178 +
179 + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
180 + # code is full of AC_TRY_RUN()
181 + mkdir -p examples/rlfe || die
182 + cd examples/rlfe || die
183 + ECONF_SOURCE="${S}"/examples/rlfe \
184 + econf --cache-file="${BUILD_DIR}"/config.cache
185 + fi
186 +}
187 +
188 +multilib_src_compile() {
189 + emake
190 +
191 + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
192 + # code is full of AC_TRY_RUN()
193 + cd examples/rlfe || die
194 + local l
195 + for l in readline history ; do
196 + ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
197 + ln -s ../../lib${l}.a lib${l}.a || die
198 + done
199 + emake
200 + fi
201 +}
202 +
203 +multilib_src_install() {
204 + default
205 +
206 + if multilib_is_native_abi ; then
207 + gen_usr_ldscript -a readline history #4411
208 +
209 + if use utils && ! tc-is-cross-compiler; then
210 + dobin examples/rlfe/rlfe
211 + fi
212 + fi
213 +}
214 +
215 +multilib_src_install_all() {
216 + HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
217 + dodoc USAGE
218 + docinto ps
219 + dodoc doc/*.ps
220 +}
221 +pkg_preinst() {
222 + # bug #29865
223 + # Reappeared in #595324 with paludis so keeping this for now...
224 + preserve_old_lib \
225 + /$(get_libdir)/lib{history,readline}$(get_libname 4) \
226 + /$(get_libdir)/lib{history,readline}$(get_libname 5) \
227 + /$(get_libdir)/lib{history,readline}$(get_libname 6) \
228 + /$(get_libdir)/lib{history,readline}$(get_libname 7)
229 +}
230 +
231 +pkg_postinst() {
232 + preserve_old_lib_notify \
233 + /$(get_libdir)/lib{history,readline}$(get_libname 4) \
234 + /$(get_libdir)/lib{history,readline}$(get_libname 5) \
235 + /$(get_libdir)/lib{history,readline}$(get_libname 6) \
236 + /$(get_libdir)/lib{history,readline}$(get_libname 7)
237 +}