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: app-shells/bash/
Date: Mon, 17 Sep 2018 14:49:38
Message-Id: 1537195764.2f5d601b510d75a738207e1888cb2655fd70c774.polynomial-c@gentoo
1 commit: 2f5d601b510d75a738207e1888cb2655fd70c774
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 17 14:38:13 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 17 14:49:24 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5d601b
7
8 app-shells/bash: Removed old.
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 app-shells/bash/bash-4.4_p12-r1.ebuild | 260 ---------------------------------
13 app-shells/bash/bash-4.4_p18.ebuild | 260 ---------------------------------
14 app-shells/bash/bash-4.4_p19.ebuild | 260 ---------------------------------
15 3 files changed, 780 deletions(-)
16
17 diff --git a/app-shells/bash/bash-4.4_p12-r1.ebuild b/app-shells/bash/bash-4.4_p12-r1.ebuild
18 deleted file mode 100644
19 index c11c5b32237..00000000000
20 --- a/app-shells/bash/bash-4.4_p12-r1.ebuild
21 +++ /dev/null
22 @@ -1,260 +0,0 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=6
27 -
28 -inherit flag-o-matic toolchain-funcs multilib prefix
29 -
30 -# Official patchlevel
31 -# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
32 -PLEVEL=${PV##*_p}
33 -MY_PV=${PV/_p*}
34 -MY_PV=${MY_PV/_/-}
35 -MY_P=${PN}-${MY_PV}
36 -is_release() {
37 - case ${PV} in
38 - *_alpha*|*_beta*|*_rc*) return 1 ;;
39 - *) return 0 ;;
40 - esac
41 -}
42 -[[ ${PV} != *_p* ]] && PLEVEL=0
43 -patches() {
44 - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
45 - [[ ${plevel} -eq 0 ]] && return 1
46 - eval set -- {1..${plevel}}
47 - set -- $(printf "${pn}${pv/\.}-%03d " "$@")
48 - if [[ ${opt} == -s ]] ; then
49 - echo "${@/#/${DISTDIR}/}"
50 - else
51 - local u
52 - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
53 - printf "${u}/${pn}-${pv}-patches/%s " "$@"
54 - done
55 - fi
56 -}
57 -
58 -# The version of readline this bash normally ships with.
59 -READLINE_VER="7.0"
60 -
61 -DESCRIPTION="The standard GNU Bourne again shell"
62 -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
63 -if is_release ; then
64 - SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
65 -else
66 - SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
67 -fi
68 -
69 -LICENSE="GPL-3"
70 -SLOT="0"
71 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
72 -IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
73 -
74 -DEPEND="
75 - >=sys-libs/ncurses-5.2-r2:0=
76 - readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
77 - nls? ( virtual/libintl )
78 -"
79 -RDEPEND="
80 - ${DEPEND}
81 - !<sys-apps/portage-2.1.6.7_p1
82 - !<sys-apps/paludis-0.26.0_alpha5
83 -"
84 -# we only need yacc when the .y files get patched (bash42-005)
85 -#DEPEND+=" virtual/yacc"
86 -
87 -S="${WORKDIR}/${MY_P}"
88 -
89 -pkg_setup() {
90 - if is-flag -malign-double ; then #7332
91 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
92 - eerror "as it breaks LFS (struct stat64) on x86."
93 - die "remove -malign-double from your CFLAGS mr ricer"
94 - fi
95 - if use bashlogger ; then
96 - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
97 - ewarn "This will log ALL output you enter into the shell, you have been warned."
98 - fi
99 -}
100 -
101 -src_unpack() {
102 - unpack ${MY_P}.tar.gz
103 -}
104 -
105 -src_prepare() {
106 - # Include official patches
107 - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
108 -
109 - eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
110 -
111 - # Clean out local libs so we know we use system ones w/releases.
112 - if is_release ; then
113 - rm -rf lib/{readline,termcap}/*
114 - touch lib/{readline,termcap}/Makefile.in # for config.status
115 - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
116 - fi
117 -
118 - # Prefixify hardcoded path names. No-op for non-prefix.
119 - hprefixify pathnames.h.in
120 -
121 - # Avoid regenerating docs after patches #407985
122 - sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
123 - touch -r . doc/*
124 -
125 - eapply_user
126 -}
127 -
128 -src_configure() {
129 - local myconf=(
130 - --disable-profiling
131 - --docdir='$(datarootdir)'/doc/${PF}
132 - --htmldir='$(docdir)/html'
133 - --with-curses
134 - $(use_enable mem-scramble)
135 - $(use_enable net net-redirections)
136 - $(use_enable readline)
137 - $(use_enable readline bang-history)
138 - $(use_enable readline history)
139 - $(use_with afs)
140 - $(use_with mem-scramble bash-malloc)
141 - )
142 -
143 - # For descriptions of these, see config-top.h
144 - # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
145 - append-cppflags \
146 - -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
147 - -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
148 - -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
149 - -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
150 - -DNON_INTERACTIVE_LOGIN_SHELLS \
151 - -DSSH_SOURCE_BASHRC \
152 - $(use bashlogger && echo -DSYSLOG_HISTORY)
153 -
154 - # Don't even think about building this statically without
155 - # reading Bug 7714 first. If you still build it statically,
156 - # don't come crying to us with bugs ;).
157 - #use static && export LDFLAGS="${LDFLAGS} -static"
158 - use nls || myconf+=( --disable-nls )
159 -
160 - # Historically, we always used the builtin readline, but since
161 - # our handling of SONAME upgrades has gotten much more stable
162 - # in the PM (and the readline ebuild itself preserves the old
163 - # libs during upgrades), linking against the system copy should
164 - # be safe.
165 - # Exact cached version here doesn't really matter as long as it
166 - # is at least what's in the DEPEND up above.
167 - export ac_cv_rl_version=${READLINE_VER%%_*}
168 -
169 - # Force linking with system curses ... the bundled termcap lib
170 - # sucks bad compared to ncurses. For the most part, ncurses
171 - # is here because readline needs it. But bash itself calls
172 - # ncurses in one or two small places :(.
173 -
174 - if is_release ; then
175 - # Use system readline only with released versions.
176 - myconf+=( --with-installed-readline=. )
177 - fi
178 -
179 - if use plugins; then
180 - append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
181 - else
182 - # Disable the plugins logic by hand since bash doesn't
183 - # provide a way of doing it.
184 - export ac_cv_func_dl{close,open,sym}=no \
185 - ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
186 - sed -i \
187 - -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
188 - configure || die
189 - fi
190 - tc-export AR #444070
191 - econf "${myconf[@]}"
192 -}
193 -
194 -src_compile() {
195 - emake
196 -
197 - if use plugins ; then
198 - emake -C examples/loadables all others
199 - fi
200 -}
201 -
202 -src_install() {
203 - local d f
204 -
205 - default
206 -
207 - dodir /bin
208 - mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
209 - dosym bash /bin/rbash
210 -
211 - insinto /etc/bash
212 - doins "${FILESDIR}"/bash_logout
213 - doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
214 - keepdir /etc/bash/bashrc.d
215 - insinto /etc/skel
216 - for f in bash{_logout,_profile,rc} ; do
217 - newins "${FILESDIR}"/dot-${f} .${f}
218 - done
219 -
220 - local sed_args=(
221 - -e "s:#${USERLAND}#@::"
222 - -e '/#@/d'
223 - )
224 - if ! use readline ; then
225 - sed_args+=( #432338
226 - -e '/^shopt -s histappend/s:^:#:'
227 - -e 's:use_color=true:use_color=false:'
228 - )
229 - fi
230 - sed -i \
231 - "${sed_args[@]}" \
232 - "${ED%/}"/etc/skel/.bashrc \
233 - "${ED%/}"/etc/bash/bashrc || die
234 -
235 - if use plugins ; then
236 - exeinto /usr/$(get_libdir)/bash
237 - doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
238 - insinto /usr/include/bash-plugins
239 - doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
240 - fi
241 -
242 - if use examples ; then
243 - for d in examples/{functions,misc,scripts,startup-files} ; do
244 - exeinto /usr/share/doc/${PF}/${d}
245 - insinto /usr/share/doc/${PF}/${d}
246 - for f in ${d}/* ; do
247 - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
248 - doexe ${f}
249 - else
250 - doins ${f}
251 - fi
252 - done
253 - done
254 - fi
255 -
256 - doman doc/*.1
257 - newdoc CWRU/changelog ChangeLog
258 - dosym bash.info /usr/share/info/bashref.info
259 -}
260 -
261 -pkg_preinst() {
262 - if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
263 - mkdir -p "${EROOT}"/etc/bash
264 - mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
265 - fi
266 -
267 - if [[ -L ${EROOT}/bin/sh ]] ; then
268 - # rewrite the symlink to ensure that its mtime changes. having /bin/sh
269 - # missing even temporarily causes a fatal error with paludis.
270 - local target=$(readlink "${EROOT}"/bin/sh)
271 - local tmp=$(emktemp "${EROOT}"/bin)
272 - ln -sf "${target}" "${tmp}"
273 - mv -f "${tmp}" "${EROOT}"/bin/sh
274 - fi
275 -}
276 -
277 -pkg_postinst() {
278 - # If /bin/sh does not exist, provide it
279 - if [[ ! -e ${EROOT}/bin/sh ]] ; then
280 - ln -sf bash "${EROOT}"/bin/sh
281 - fi
282 -}
283
284 diff --git a/app-shells/bash/bash-4.4_p18.ebuild b/app-shells/bash/bash-4.4_p18.ebuild
285 deleted file mode 100644
286 index c11c5b32237..00000000000
287 --- a/app-shells/bash/bash-4.4_p18.ebuild
288 +++ /dev/null
289 @@ -1,260 +0,0 @@
290 -# Copyright 1999-2018 Gentoo Foundation
291 -# Distributed under the terms of the GNU General Public License v2
292 -
293 -EAPI=6
294 -
295 -inherit flag-o-matic toolchain-funcs multilib prefix
296 -
297 -# Official patchlevel
298 -# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
299 -PLEVEL=${PV##*_p}
300 -MY_PV=${PV/_p*}
301 -MY_PV=${MY_PV/_/-}
302 -MY_P=${PN}-${MY_PV}
303 -is_release() {
304 - case ${PV} in
305 - *_alpha*|*_beta*|*_rc*) return 1 ;;
306 - *) return 0 ;;
307 - esac
308 -}
309 -[[ ${PV} != *_p* ]] && PLEVEL=0
310 -patches() {
311 - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
312 - [[ ${plevel} -eq 0 ]] && return 1
313 - eval set -- {1..${plevel}}
314 - set -- $(printf "${pn}${pv/\.}-%03d " "$@")
315 - if [[ ${opt} == -s ]] ; then
316 - echo "${@/#/${DISTDIR}/}"
317 - else
318 - local u
319 - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
320 - printf "${u}/${pn}-${pv}-patches/%s " "$@"
321 - done
322 - fi
323 -}
324 -
325 -# The version of readline this bash normally ships with.
326 -READLINE_VER="7.0"
327 -
328 -DESCRIPTION="The standard GNU Bourne again shell"
329 -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
330 -if is_release ; then
331 - SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
332 -else
333 - SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
334 -fi
335 -
336 -LICENSE="GPL-3"
337 -SLOT="0"
338 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
339 -IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
340 -
341 -DEPEND="
342 - >=sys-libs/ncurses-5.2-r2:0=
343 - readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
344 - nls? ( virtual/libintl )
345 -"
346 -RDEPEND="
347 - ${DEPEND}
348 - !<sys-apps/portage-2.1.6.7_p1
349 - !<sys-apps/paludis-0.26.0_alpha5
350 -"
351 -# we only need yacc when the .y files get patched (bash42-005)
352 -#DEPEND+=" virtual/yacc"
353 -
354 -S="${WORKDIR}/${MY_P}"
355 -
356 -pkg_setup() {
357 - if is-flag -malign-double ; then #7332
358 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
359 - eerror "as it breaks LFS (struct stat64) on x86."
360 - die "remove -malign-double from your CFLAGS mr ricer"
361 - fi
362 - if use bashlogger ; then
363 - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
364 - ewarn "This will log ALL output you enter into the shell, you have been warned."
365 - fi
366 -}
367 -
368 -src_unpack() {
369 - unpack ${MY_P}.tar.gz
370 -}
371 -
372 -src_prepare() {
373 - # Include official patches
374 - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
375 -
376 - eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
377 -
378 - # Clean out local libs so we know we use system ones w/releases.
379 - if is_release ; then
380 - rm -rf lib/{readline,termcap}/*
381 - touch lib/{readline,termcap}/Makefile.in # for config.status
382 - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
383 - fi
384 -
385 - # Prefixify hardcoded path names. No-op for non-prefix.
386 - hprefixify pathnames.h.in
387 -
388 - # Avoid regenerating docs after patches #407985
389 - sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
390 - touch -r . doc/*
391 -
392 - eapply_user
393 -}
394 -
395 -src_configure() {
396 - local myconf=(
397 - --disable-profiling
398 - --docdir='$(datarootdir)'/doc/${PF}
399 - --htmldir='$(docdir)/html'
400 - --with-curses
401 - $(use_enable mem-scramble)
402 - $(use_enable net net-redirections)
403 - $(use_enable readline)
404 - $(use_enable readline bang-history)
405 - $(use_enable readline history)
406 - $(use_with afs)
407 - $(use_with mem-scramble bash-malloc)
408 - )
409 -
410 - # For descriptions of these, see config-top.h
411 - # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
412 - append-cppflags \
413 - -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
414 - -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
415 - -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
416 - -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
417 - -DNON_INTERACTIVE_LOGIN_SHELLS \
418 - -DSSH_SOURCE_BASHRC \
419 - $(use bashlogger && echo -DSYSLOG_HISTORY)
420 -
421 - # Don't even think about building this statically without
422 - # reading Bug 7714 first. If you still build it statically,
423 - # don't come crying to us with bugs ;).
424 - #use static && export LDFLAGS="${LDFLAGS} -static"
425 - use nls || myconf+=( --disable-nls )
426 -
427 - # Historically, we always used the builtin readline, but since
428 - # our handling of SONAME upgrades has gotten much more stable
429 - # in the PM (and the readline ebuild itself preserves the old
430 - # libs during upgrades), linking against the system copy should
431 - # be safe.
432 - # Exact cached version here doesn't really matter as long as it
433 - # is at least what's in the DEPEND up above.
434 - export ac_cv_rl_version=${READLINE_VER%%_*}
435 -
436 - # Force linking with system curses ... the bundled termcap lib
437 - # sucks bad compared to ncurses. For the most part, ncurses
438 - # is here because readline needs it. But bash itself calls
439 - # ncurses in one or two small places :(.
440 -
441 - if is_release ; then
442 - # Use system readline only with released versions.
443 - myconf+=( --with-installed-readline=. )
444 - fi
445 -
446 - if use plugins; then
447 - append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
448 - else
449 - # Disable the plugins logic by hand since bash doesn't
450 - # provide a way of doing it.
451 - export ac_cv_func_dl{close,open,sym}=no \
452 - ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
453 - sed -i \
454 - -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
455 - configure || die
456 - fi
457 - tc-export AR #444070
458 - econf "${myconf[@]}"
459 -}
460 -
461 -src_compile() {
462 - emake
463 -
464 - if use plugins ; then
465 - emake -C examples/loadables all others
466 - fi
467 -}
468 -
469 -src_install() {
470 - local d f
471 -
472 - default
473 -
474 - dodir /bin
475 - mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
476 - dosym bash /bin/rbash
477 -
478 - insinto /etc/bash
479 - doins "${FILESDIR}"/bash_logout
480 - doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
481 - keepdir /etc/bash/bashrc.d
482 - insinto /etc/skel
483 - for f in bash{_logout,_profile,rc} ; do
484 - newins "${FILESDIR}"/dot-${f} .${f}
485 - done
486 -
487 - local sed_args=(
488 - -e "s:#${USERLAND}#@::"
489 - -e '/#@/d'
490 - )
491 - if ! use readline ; then
492 - sed_args+=( #432338
493 - -e '/^shopt -s histappend/s:^:#:'
494 - -e 's:use_color=true:use_color=false:'
495 - )
496 - fi
497 - sed -i \
498 - "${sed_args[@]}" \
499 - "${ED%/}"/etc/skel/.bashrc \
500 - "${ED%/}"/etc/bash/bashrc || die
501 -
502 - if use plugins ; then
503 - exeinto /usr/$(get_libdir)/bash
504 - doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
505 - insinto /usr/include/bash-plugins
506 - doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
507 - fi
508 -
509 - if use examples ; then
510 - for d in examples/{functions,misc,scripts,startup-files} ; do
511 - exeinto /usr/share/doc/${PF}/${d}
512 - insinto /usr/share/doc/${PF}/${d}
513 - for f in ${d}/* ; do
514 - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
515 - doexe ${f}
516 - else
517 - doins ${f}
518 - fi
519 - done
520 - done
521 - fi
522 -
523 - doman doc/*.1
524 - newdoc CWRU/changelog ChangeLog
525 - dosym bash.info /usr/share/info/bashref.info
526 -}
527 -
528 -pkg_preinst() {
529 - if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
530 - mkdir -p "${EROOT}"/etc/bash
531 - mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
532 - fi
533 -
534 - if [[ -L ${EROOT}/bin/sh ]] ; then
535 - # rewrite the symlink to ensure that its mtime changes. having /bin/sh
536 - # missing even temporarily causes a fatal error with paludis.
537 - local target=$(readlink "${EROOT}"/bin/sh)
538 - local tmp=$(emktemp "${EROOT}"/bin)
539 - ln -sf "${target}" "${tmp}"
540 - mv -f "${tmp}" "${EROOT}"/bin/sh
541 - fi
542 -}
543 -
544 -pkg_postinst() {
545 - # If /bin/sh does not exist, provide it
546 - if [[ ! -e ${EROOT}/bin/sh ]] ; then
547 - ln -sf bash "${EROOT}"/bin/sh
548 - fi
549 -}
550
551 diff --git a/app-shells/bash/bash-4.4_p19.ebuild b/app-shells/bash/bash-4.4_p19.ebuild
552 deleted file mode 100644
553 index c11c5b32237..00000000000
554 --- a/app-shells/bash/bash-4.4_p19.ebuild
555 +++ /dev/null
556 @@ -1,260 +0,0 @@
557 -# Copyright 1999-2018 Gentoo Foundation
558 -# Distributed under the terms of the GNU General Public License v2
559 -
560 -EAPI=6
561 -
562 -inherit flag-o-matic toolchain-funcs multilib prefix
563 -
564 -# Official patchlevel
565 -# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
566 -PLEVEL=${PV##*_p}
567 -MY_PV=${PV/_p*}
568 -MY_PV=${MY_PV/_/-}
569 -MY_P=${PN}-${MY_PV}
570 -is_release() {
571 - case ${PV} in
572 - *_alpha*|*_beta*|*_rc*) return 1 ;;
573 - *) return 0 ;;
574 - esac
575 -}
576 -[[ ${PV} != *_p* ]] && PLEVEL=0
577 -patches() {
578 - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
579 - [[ ${plevel} -eq 0 ]] && return 1
580 - eval set -- {1..${plevel}}
581 - set -- $(printf "${pn}${pv/\.}-%03d " "$@")
582 - if [[ ${opt} == -s ]] ; then
583 - echo "${@/#/${DISTDIR}/}"
584 - else
585 - local u
586 - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
587 - printf "${u}/${pn}-${pv}-patches/%s " "$@"
588 - done
589 - fi
590 -}
591 -
592 -# The version of readline this bash normally ships with.
593 -READLINE_VER="7.0"
594 -
595 -DESCRIPTION="The standard GNU Bourne again shell"
596 -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
597 -if is_release ; then
598 - SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
599 -else
600 - SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
601 -fi
602 -
603 -LICENSE="GPL-3"
604 -SLOT="0"
605 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
606 -IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
607 -
608 -DEPEND="
609 - >=sys-libs/ncurses-5.2-r2:0=
610 - readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
611 - nls? ( virtual/libintl )
612 -"
613 -RDEPEND="
614 - ${DEPEND}
615 - !<sys-apps/portage-2.1.6.7_p1
616 - !<sys-apps/paludis-0.26.0_alpha5
617 -"
618 -# we only need yacc when the .y files get patched (bash42-005)
619 -#DEPEND+=" virtual/yacc"
620 -
621 -S="${WORKDIR}/${MY_P}"
622 -
623 -pkg_setup() {
624 - if is-flag -malign-double ; then #7332
625 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
626 - eerror "as it breaks LFS (struct stat64) on x86."
627 - die "remove -malign-double from your CFLAGS mr ricer"
628 - fi
629 - if use bashlogger ; then
630 - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
631 - ewarn "This will log ALL output you enter into the shell, you have been warned."
632 - fi
633 -}
634 -
635 -src_unpack() {
636 - unpack ${MY_P}.tar.gz
637 -}
638 -
639 -src_prepare() {
640 - # Include official patches
641 - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
642 -
643 - eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
644 -
645 - # Clean out local libs so we know we use system ones w/releases.
646 - if is_release ; then
647 - rm -rf lib/{readline,termcap}/*
648 - touch lib/{readline,termcap}/Makefile.in # for config.status
649 - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
650 - fi
651 -
652 - # Prefixify hardcoded path names. No-op for non-prefix.
653 - hprefixify pathnames.h.in
654 -
655 - # Avoid regenerating docs after patches #407985
656 - sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
657 - touch -r . doc/*
658 -
659 - eapply_user
660 -}
661 -
662 -src_configure() {
663 - local myconf=(
664 - --disable-profiling
665 - --docdir='$(datarootdir)'/doc/${PF}
666 - --htmldir='$(docdir)/html'
667 - --with-curses
668 - $(use_enable mem-scramble)
669 - $(use_enable net net-redirections)
670 - $(use_enable readline)
671 - $(use_enable readline bang-history)
672 - $(use_enable readline history)
673 - $(use_with afs)
674 - $(use_with mem-scramble bash-malloc)
675 - )
676 -
677 - # For descriptions of these, see config-top.h
678 - # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
679 - append-cppflags \
680 - -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
681 - -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
682 - -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
683 - -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
684 - -DNON_INTERACTIVE_LOGIN_SHELLS \
685 - -DSSH_SOURCE_BASHRC \
686 - $(use bashlogger && echo -DSYSLOG_HISTORY)
687 -
688 - # Don't even think about building this statically without
689 - # reading Bug 7714 first. If you still build it statically,
690 - # don't come crying to us with bugs ;).
691 - #use static && export LDFLAGS="${LDFLAGS} -static"
692 - use nls || myconf+=( --disable-nls )
693 -
694 - # Historically, we always used the builtin readline, but since
695 - # our handling of SONAME upgrades has gotten much more stable
696 - # in the PM (and the readline ebuild itself preserves the old
697 - # libs during upgrades), linking against the system copy should
698 - # be safe.
699 - # Exact cached version here doesn't really matter as long as it
700 - # is at least what's in the DEPEND up above.
701 - export ac_cv_rl_version=${READLINE_VER%%_*}
702 -
703 - # Force linking with system curses ... the bundled termcap lib
704 - # sucks bad compared to ncurses. For the most part, ncurses
705 - # is here because readline needs it. But bash itself calls
706 - # ncurses in one or two small places :(.
707 -
708 - if is_release ; then
709 - # Use system readline only with released versions.
710 - myconf+=( --with-installed-readline=. )
711 - fi
712 -
713 - if use plugins; then
714 - append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
715 - else
716 - # Disable the plugins logic by hand since bash doesn't
717 - # provide a way of doing it.
718 - export ac_cv_func_dl{close,open,sym}=no \
719 - ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
720 - sed -i \
721 - -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
722 - configure || die
723 - fi
724 - tc-export AR #444070
725 - econf "${myconf[@]}"
726 -}
727 -
728 -src_compile() {
729 - emake
730 -
731 - if use plugins ; then
732 - emake -C examples/loadables all others
733 - fi
734 -}
735 -
736 -src_install() {
737 - local d f
738 -
739 - default
740 -
741 - dodir /bin
742 - mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
743 - dosym bash /bin/rbash
744 -
745 - insinto /etc/bash
746 - doins "${FILESDIR}"/bash_logout
747 - doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
748 - keepdir /etc/bash/bashrc.d
749 - insinto /etc/skel
750 - for f in bash{_logout,_profile,rc} ; do
751 - newins "${FILESDIR}"/dot-${f} .${f}
752 - done
753 -
754 - local sed_args=(
755 - -e "s:#${USERLAND}#@::"
756 - -e '/#@/d'
757 - )
758 - if ! use readline ; then
759 - sed_args+=( #432338
760 - -e '/^shopt -s histappend/s:^:#:'
761 - -e 's:use_color=true:use_color=false:'
762 - )
763 - fi
764 - sed -i \
765 - "${sed_args[@]}" \
766 - "${ED%/}"/etc/skel/.bashrc \
767 - "${ED%/}"/etc/bash/bashrc || die
768 -
769 - if use plugins ; then
770 - exeinto /usr/$(get_libdir)/bash
771 - doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
772 - insinto /usr/include/bash-plugins
773 - doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
774 - fi
775 -
776 - if use examples ; then
777 - for d in examples/{functions,misc,scripts,startup-files} ; do
778 - exeinto /usr/share/doc/${PF}/${d}
779 - insinto /usr/share/doc/${PF}/${d}
780 - for f in ${d}/* ; do
781 - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
782 - doexe ${f}
783 - else
784 - doins ${f}
785 - fi
786 - done
787 - done
788 - fi
789 -
790 - doman doc/*.1
791 - newdoc CWRU/changelog ChangeLog
792 - dosym bash.info /usr/share/info/bashref.info
793 -}
794 -
795 -pkg_preinst() {
796 - if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
797 - mkdir -p "${EROOT}"/etc/bash
798 - mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
799 - fi
800 -
801 - if [[ -L ${EROOT}/bin/sh ]] ; then
802 - # rewrite the symlink to ensure that its mtime changes. having /bin/sh
803 - # missing even temporarily causes a fatal error with paludis.
804 - local target=$(readlink "${EROOT}"/bin/sh)
805 - local tmp=$(emktemp "${EROOT}"/bin)
806 - ln -sf "${target}" "${tmp}"
807 - mv -f "${tmp}" "${EROOT}"/bin/sh
808 - fi
809 -}
810 -
811 -pkg_postinst() {
812 - # If /bin/sh does not exist, provide it
813 - if [[ ! -e ${EROOT}/bin/sh ]] ; then
814 - ln -sf bash "${EROOT}"/bin/sh
815 - fi
816 -}