Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-shells/bash: ChangeLog bash-3.2_p39.ebuild
Date: Sat, 03 May 2008 04:42:27
Message-Id: E1Js9Zn-0002ru-RM@stork.gentoo.org
1 vapier 08/05/03 04:42:23
2
3 Modified: ChangeLog
4 Added: bash-3.2_p39.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.2_pre5)
8
9 Revision Changes Path
10 1.169 app-shells/bash/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.169&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.169&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?r1=1.168&r2=1.169
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v
19 retrieving revision 1.168
20 retrieving revision 1.169
21 diff -u -r1.168 -r1.169
22 --- ChangeLog 1 Mar 2008 21:09:26 -0000 1.168
23 +++ ChangeLog 3 May 2008 04:42:23 -0000 1.169
24 @@ -1,6 +1,11 @@
25 # ChangeLog for app-shells/bash
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.168 2008/03/01 21:09:26 grobian Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.169 2008/05/03 04:42:23 vapier Exp $
29 +
30 +*bash-3.2_p39 (03 May 2008)
31 +
32 + 03 May 2008; Mike Frysinger <vapier@g.o> +bash-3.2_p39.ebuild:
33 + Version bump.
34
35 01 Mar 2008; Fabian Groffen <grobian@g.o> files/bashrc:
36 Add support for Interix's terminal, bug #211875 by Markus Duft
37
38
39
40 1.1 app-shells/bash/bash-3.2_p39.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?rev=1.1&content-type=text/plain
44
45 Index: bash-3.2_p39.ebuild
46 ===================================================================
47 # Copyright 1999-2008 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.1 2008/05/03 04:42:23 vapier Exp $
50
51 inherit eutils flag-o-matic toolchain-funcs multilib
52
53 # Official patchlevel
54 # See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
55 PLEVEL=${PV##*_p}
56 MY_PV=${PV/_p*}
57 MY_P=${PN}-${MY_PV}
58 READLINE_VER=5.2
59 READLINE_PLEVEL=0 # both readline patches are also released as bash patches
60
61 DESCRIPTION="The standard GNU Bourne again shell"
62 HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
63 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz
64 ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz
65 $(for ((i=1; i<=PLEVEL; i++)); do
66 printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
67 ${MY_PV} ${MY_PV/\.} ${i}
68 printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
69 ${MY_PV} ${MY_PV/\.} ${i}
70 done)
71 $(for ((i=1; i<=READLINE_PLEVEL; i++)); do
72 printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \
73 ${READLINE_VER} ${READLINE_VER/\.} ${i}
74 printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \
75 ${READLINE_VER} ${READLINE_VER/\.} ${i}
76 done)"
77
78 LICENSE="GPL-2"
79 SLOT="0"
80 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
81 IUSE="afs bashlogger nls plugins vanilla"
82
83 DEPEND=">=sys-libs/ncurses-5.2-r2"
84 RDEPEND="${DEPEND}
85 !<sys-apps/portage-2.1.4_rc1
86 !<sys-apps/paludis-0.26.0_alpha5"
87
88 S=${WORKDIR}/${MY_P}
89
90 pkg_setup() {
91 if is-flag -malign-double ; then #7332
92 eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
93 eerror "as it breaks LFS (struct stat64) on x86."
94 die "remove -malign-double from your CFLAGS mr ricer"
95 fi
96 }
97
98 src_unpack() {
99 unpack ${MY_P}.tar.gz
100 cd "${S}"
101
102 # Include official patches
103 local i
104 for ((i=1; i<=PLEVEL; i++)); do
105 epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
106 done
107 cd lib/readline
108 for ((i=1; i<=READLINE_PLEVEL; i++)); do
109 epatch "${DISTDIR}"/readline${READLINE_VER/\.}-$(printf '%03d' ${i})
110 done
111 cd ../..
112
113 if ! use vanilla ; then
114 epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
115 epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
116 epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
117 epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
118
119 # Fix process substitution on BSD.
120 epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
121
122 epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
123 # Don't barf on handled signals in scripts
124 epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
125 epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
126 # Log bash commands to syslog #91327
127 if use bashlogger ; then
128 echo
129 ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
130 ewarn "This will log ALL output you enter into the shell, you have been warned."
131 ebeep
132 epause
133 epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
134 fi
135 fi
136
137 epatch "${FILESDIR}"/${PN}-3.0-configs.patch
138 }
139
140 src_compile() {
141 local myconf=
142
143 # Always use the buildin readline, else if we update readline
144 # bash gets borked as readline is usually not binary compadible
145 # between minor versions.
146 #myconf="${myconf} $(use_with !readline installed-readline)"
147 myconf="${myconf} --without-installed-readline"
148
149 # Don't even think about building this statically without
150 # reading Bug 7714 first. If you still build it statically,
151 # don't come crying to use with bugs ;).
152 #use static && export LDFLAGS="${LDFLAGS} -static"
153 use nls || myconf="${myconf} --disable-nls"
154
155 # Force linking with system curses ... the bundled termcap lib
156 # sucks bad compared to ncurses
157 myconf="${myconf} --with-curses"
158
159 # Default path is to use /usr/local/..... regardless. This little
160 # magic will set the default path to /usr/..... and keep us from
161 # worrying about the rest of the path getting out of sync with the
162 # ebuild code.
163 eval $(echo export $(ac_default_prefix=/usr; eval echo $(grep DEBUGGER_START_FILE= configure)))
164
165 use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
166 econf \
167 $(use_with afs) \
168 --disable-profiling \
169 --without-gnu-malloc \
170 ${myconf} || die
171 emake || die "make failed"
172
173 if use plugins ; then
174 emake -C examples/loadables all others || die
175 fi
176 }
177
178 src_install() {
179 emake install DESTDIR="${D}" || die
180
181 dodir /bin
182 mv "${D}"/usr/bin/bash "${D}"/bin/ || die
183 dosym bash /bin/rbash
184
185 insinto /etc/bash
186 doins "${FILESDIR}"/{bashrc,bash_logout}
187 insinto /etc/skel
188 for f in bash{_logout,_profile,rc} ; do
189 newins "${FILESDIR}"/dot-${f} .${f}
190 done
191
192 sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
193 sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
194
195 if use plugins ; then
196 exeinto /usr/$(get_libdir)/bash
197 doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die
198 fi
199
200 doman doc/*.1
201 dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
202 dosym bash.info /usr/share/info/bashref.info
203 }
204
205 pkg_preinst() {
206 if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
207 mkdir -p "${ROOT}"/etc/bash
208 mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
209 fi
210
211 # our bash_logout is just a place holder so dont
212 # force users to go through etc-update all the time
213 if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
214 rm -f "${D}"/etc/bash/bash_logout
215 fi
216
217 # If /bin/sh does not exist or is bash, then provide it
218 # Otherwise leave it alone
219 if [[ ! -e ${ROOT}/bin/sh ]] ; then
220 ln -s bash "${ROOT}"/bin/sh
221 elif [[ -L ${ROOT}/bin/sh ]] ; then
222 case $(readlink "${ROOT}"/bin/sh) in
223 bash|/bin/bash) cp -pPR "${ROOT}"/bin/sh "${D}"/bin/ ;;
224 esac
225 fi
226 }
227
228
229
230 --
231 gentoo-commits@l.g.o mailing list