Gentoo Archives: gentoo-commits

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