Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/
Date: Wed, 30 May 2018 22:25:30
Message-Id: 1527719109.e4d588b21b8513d5d34936516a0333b0d7809cb8.bman@gentoo
1 commit: e4d588b21b8513d5d34936516a0333b0d7809cb8
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 30 15:14:45 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Wed May 30 22:25:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d588b2
7
8 app-shells/bash: drop EAPI=2 ebuild
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11 Closes: https://github.com/gentoo/gentoo/pull/8645
12
13 app-shells/bash/bash-4.3_p39_pre0.ebuild | 136 -------------------------------
14 1 file changed, 136 deletions(-)
15
16 diff --git a/app-shells/bash/bash-4.3_p39_pre0.ebuild b/app-shells/bash/bash-4.3_p39_pre0.ebuild
17 deleted file mode 100644
18 index d16084790da..00000000000
19 --- a/app-shells/bash/bash-4.3_p39_pre0.ebuild
20 +++ /dev/null
21 @@ -1,136 +0,0 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -# Old ebuild to help with people doing live upgrades w/old portage versions.
26 -# We use the bundled versions of readline & termcap to avoid external deps
27 -# (which in turn would require those packages to keep an old EAPI version).
28 -
29 -EAPI="2"
30 -
31 -inherit eutils flag-o-matic toolchain-funcs
32 -
33 -# Official patchlevel
34 -# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
35 -PLEVEL=${PV##*_p}
36 -MY_PV=${PV/_p*}
37 -MY_PV=${MY_PV/_/-}
38 -MY_P=${PN}-${MY_PV}
39 -[[ ${PV} != *_p* ]] && PLEVEL=0
40 -patches() {
41 - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
42 - [[ ${plevel} -eq 0 ]] && return 1
43 - eval set -- {1..${plevel}}
44 - set -- $(printf "${pn}${pv/\.}-%03d " "$@")
45 - if [[ ${opt} == -s ]] ; then
46 - echo "${@/#/${DISTDIR}/}"
47 - else
48 - local u
49 - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
50 - printf "${u}/${pn}-${pv}-patches/%s " "$@"
51 - done
52 - fi
53 -}
54 -
55 -DESCRIPTION="The standard GNU Bourne again shell"
56 -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
57 -SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
58 -
59 -LICENSE="GPL-3"
60 -SLOT="0"
61 -#KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
62 -# Note: We export this because portage wants it enabled.
63 -IUSE="+readline"
64 -
65 -S=${WORKDIR}/${MY_P}
66 -
67 -src_unpack() {
68 - unpack ${MY_P}.tar.gz
69 -}
70 -
71 -src_prepare() {
72 - # Include official patches
73 - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
74 -
75 - # Avoid regenerating docs after patches #407985
76 - sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
77 - touch -r . doc/*
78 -
79 - epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
80 - epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
81 - epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
82 - epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
83 -}
84 -
85 -src_configure() {
86 - local myconf=()
87 -
88 - # For descriptions of these, see config-top.h
89 - # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
90 - append-cppflags \
91 - -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
92 - -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
93 - -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
94 - -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
95 - -DNON_INTERACTIVE_LOGIN_SHELLS \
96 - -DSSH_SOURCE_BASHRC \
97 - -DUSE_MKTEMP -DUSE_MKSTEMP
98 -
99 - # Force internal copy of termcap to be used (to avoid ncurses dep).
100 - export bash_cv_termcap_lib=gnutermcap
101 -
102 - # Disable the plugins logic by hand since bash doesn't
103 - # provide a way of doing it.
104 - export ac_cv_func_dl{close,open,sym}=no \
105 - ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
106 - sed -i \
107 - -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
108 - configure || die
109 -
110 - tc-export AR #444070
111 - econf \
112 - --docdir='$(datarootdir)'/doc/${PF} \
113 - --htmldir='$(docdir)/html' \
114 - --disable-nls \
115 - --without-curses \
116 - --without-afs \
117 - --disable-net-redirections \
118 - --disable-profiling \
119 - --disable-mem-scramble \
120 - --without-bash-malloc \
121 - --enable-readline \
122 - --enable-history \
123 - --enable-bang-history \
124 - "${myconf[@]}"
125 -}
126 -
127 -src_compile() {
128 - emake || die
129 -}
130 -
131 -src_install() {
132 - local f
133 -
134 - emake DESTDIR="${D}" install || die
135 -
136 - dodir /bin
137 - mv "${D}"/usr/bin/bash "${D}"/bin/ || die
138 - dosym bash /bin/rbash
139 -
140 - insinto /etc/bash
141 - doins "${FILESDIR}"/bash_logout
142 - doins "${FILESDIR}"/bashrc
143 - keepdir /etc/bash/bashrc.d
144 - insinto /etc/skel
145 - for f in bash{_logout,_profile,rc} ; do
146 - newins "${FILESDIR}"/dot-${f} .${f}
147 - done
148 -
149 - local sed_args=(
150 - -e "s:#${USERLAND}#@::"
151 - -e '/#@/d'
152 - )
153 - sed -i \
154 - "${sed_args[@]}" \
155 - "${D}"/etc/skel/.bashrc \
156 - "${D}"/etc/bash/bashrc || die
157 -}