diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-01-09 03:48:36 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-09 03:48:36 +0000 |
commit | b43dfdb3c894eba5d5df6b18331514e27997c07b (patch) | |
tree | 1c59a1035d00f494891150a22faba3bfd251334f /app-shells/bash | |
parent | Remove unneeded sed; add prefix keywords (diff) | |
download | gentoo-2-b43dfdb3c894eba5d5df6b18331514e27997c07b.tar.gz gentoo-2-b43dfdb3c894eba5d5df6b18331514e27997c07b.tar.bz2 gentoo-2-b43dfdb3c894eba5d5df6b18331514e27997c07b.zip |
old
Diffstat (limited to 'app-shells/bash')
-rw-r--r-- | app-shells/bash/bash-3.2_p48.ebuild | 194 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p28.ebuild | 188 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0_p33.ebuild | 190 | ||||
-rw-r--r-- | app-shells/bash/files/bash-3.2-redisplay-cursor.patch | 20 |
4 files changed, 0 insertions, 592 deletions
diff --git a/app-shells/bash/bash-3.2_p48.ebuild b/app-shells/bash/bash-3.2_p48.ebuild deleted file mode 100644 index 7b80b6089248..000000000000 --- a/app-shells/bash/bash-3.2_p48.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p48.ebuild,v 1.4 2009/11/11 04:15:27 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs multilib - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_P=${PN}-${MY_PV} -READLINE_VER=5.2 -READLINE_PLEVEL=0 # both readline patches are also released as bash patches - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" -SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz - ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz - $(for ((i=1; i<=PLEVEL; i++)); do - printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \ - ${MY_PV} ${MY_PV/\.} ${i} - printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \ - ${MY_PV} ${MY_PV/\.} ${i} - done) - $(for ((i=1; i<=READLINE_PLEVEL; i++)); do - printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \ - ${READLINE_VER} ${READLINE_VER/\.} ${i} - printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \ - ${READLINE_VER} ${READLINE_VER/\.} ${i} - done)" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="afs bashlogger examples nls plugins vanilla" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !<sys-apps/portage-2.1.5 - !<sys-apps/paludis-0.26.0_alpha5" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if is-flag -malign-double ; then #7332 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this" - eerror "as it breaks LFS (struct stat64) on x86." - die "remove -malign-double from your CFLAGS mr ricer" - fi -} - -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" - - # Include official patches - local i - for ((i=1; i<=PLEVEL; i++)); do - epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i}) - done - cd lib/readline - for ((i=1; i<=READLINE_PLEVEL; i++)); do - epatch "${DISTDIR}"/readline${READLINE_VER/\.}-$(printf '%03d' ${i}) - done - cd ../.. - - if ! use vanilla ; then - epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040 - epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch - epatch "${FILESDIR}"/${PN}-3.2-loadables.patch - epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 - epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947 - - # Fix process substitution on BSD. - epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch - - epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch - # Don't barf on handled signals in scripts - epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch - epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875 - # Log bash commands to syslog #91327 - if use bashlogger ; then - echo - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." - ewarn "This will log ALL output you enter into the shell, you have been warned." - ebeep - epause - epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch - fi - fi - - epatch "${FILESDIR}"/${PN}-3.0-configs.patch -} - -src_compile() { - local myconf= - - # Always use the buildin readline, else if we update readline - # bash gets borked as readline is usually not binary compadible - # between minor versions. - #myconf="${myconf} $(use_with !readline installed-readline)" - myconf="${myconf} --without-installed-readline" - - # Don't even think about building this statically without - # reading Bug 7714 first. If you still build it statically, - # don't come crying to use with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf="${myconf} --disable-nls" - - # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses - myconf="${myconf} --with-curses" - - # Default path is to use /usr/local/..... regardless. This little - # magic will set the default path to /usr/..... and keep us from - # worrying about the rest of the path getting out of sync with the - # ebuild code. - eval $(echo export $(ac_default_prefix=/usr; eval echo $(grep DEBUGGER_START_FILE= configure))) - - use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash - econf \ - $(use_with afs) \ - --disable-profiling \ - --without-gnu-malloc \ - ${myconf} || die - emake || die "make failed" - - if use plugins ; then - emake -C examples/loadables all others || die - fi -} - -src_install() { - emake install DESTDIR="${D}" || die - - dodir /bin - mv "${D}"/usr/bin/bash "${D}"/bin/ || die - dosym bash /bin/rbash - - insinto /etc/bash - doins "${FILESDIR}"/{bashrc,bash_logout} - insinto /etc/skel - for f in bash{_logout,_profile,rc} ; do - newins "${FILESDIR}"/dot-${f} .${f} - done - - sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc - sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc - - if use plugins ; then - exeinto /usr/$(get_libdir)/bash - doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die - fi - - if use examples ; then - for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do - exeinto /usr/share/doc/${PF}/${d} - insinto /usr/share/doc/${PF}/${d} - for f in ${d}/* ; do - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then - doexe ${f} - else - doins ${f} - fi - done - done - fi - - doman doc/*.1 - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO - dosym bash.info /usr/share/info/bashref.info -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then - mkdir -p "${ROOT}"/etc/bash - mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/ - fi - - if [[ -L ${ROOT}/bin/sh ]]; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${ROOT}"/bin/sh) - ln -sf "${target}" "${ROOT}"/bin/sh - fi -} - -pkg_postinst() { - # If /bin/sh does not exist, provide it - if [[ ! -e ${ROOT}/bin/sh ]]; then - ln -sf bash "${ROOT}"/bin/sh - fi -} diff --git a/app-shells/bash/bash-4.0_p28.ebuild b/app-shells/bash/bash-4.0_p28.ebuild deleted file mode 100644 index c770f4f23b51..000000000000 --- a/app-shells/bash/bash-4.0_p28.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p28.ebuild,v 1.12 2009/11/11 04:15:27 vapier Exp $ - -EAPI="1" - -inherit eutils flag-o-matic toolchain-funcs multilib - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_P=${PN}-${MY_PV} -[[ ${PV} != *_p* ]] && PLEVEL=0 -READLINE_VER=6.0 -READLINE_PLEVEL=0 # both readline patches are also released as bash patches -patches() { - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} - [[ ${plevel} -eq 0 ]] && return 1 - eval set -- {1..${plevel}} - set -- $(printf "${pn}${pv/\.}-%03d " "$@") - if [[ ${opt} == -s ]] ; then - echo "${@/#/${DISTDIR}/}" - else - local u - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do - printf "${u}/${pn}-${pv}-patches/%s " "$@" - done - fi -} - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" -SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches) - $(patches ${READLINE_PLEVEL} readline ${READLINE_VER})" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="afs bashlogger examples +net nls plugins vanilla" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !<sys-apps/portage-2.1.5 - !<sys-apps/paludis-0.26.0_alpha5" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if is-flag -malign-double ; then #7332 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this" - eerror "as it breaks LFS (struct stat64) on x86." - die "remove -malign-double from your CFLAGS mr ricer" - fi -} - -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" - - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - cd lib/readline - [[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER}) - cd ../.. - - if ! use vanilla ; then - epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 - epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947 - epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch - epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613 - # Log bash commands to syslog #91327 - if use bashlogger ; then - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." - ewarn "This will log ALL output you enter into the shell, you have been warned." - ebeep - epause - epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch - fi - sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613 - fi -} - -src_compile() { - local myconf= - - # For descriptions of these, see config-top.h - # bashrc/#26952 bash_logout/#90488 ssh/#24762 - append-cppflags \ - -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \ - -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \ - -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \ - -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \ - -DNON_INTERACTIVE_LOGIN_SHELLS \ - -DSSH_SOURCE_BASHRC - - # Always use the buildin readline, else if we update readline - # bash gets borked as readline is usually not binary compadible - # between minor versions. - #myconf="${myconf} $(use_with !readline installed-readline)" - myconf="${myconf} --without-installed-readline" - - # Don't even think about building this statically without - # reading Bug 7714 first. If you still build it statically, - # don't come crying to us with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf="${myconf} --disable-nls" - - # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses - myconf="${myconf} --with-curses" - - use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash - econf \ - $(use_with afs) \ - $(use_enable net net-redirections) \ - --disable-profiling \ - --without-gnu-malloc \ - ${myconf} || die - emake || die "make failed" - - if use plugins ; then - emake -C examples/loadables all others || die - fi -} - -src_install() { - emake install DESTDIR="${D}" || die - - dodir /bin - mv "${D}"/usr/bin/bash "${D}"/bin/ || die - dosym bash /bin/rbash - - insinto /etc/bash - doins "${FILESDIR}"/{bashrc,bash_logout} - insinto /etc/skel - for f in bash{_logout,_profile,rc} ; do - newins "${FILESDIR}"/dot-${f} .${f} - done - - sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc - sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc - - if use plugins ; then - exeinto /usr/$(get_libdir)/bash - doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die - fi - - if use examples ; then - for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do - exeinto /usr/share/doc/${PF}/${d} - insinto /usr/share/doc/${PF}/${d} - for f in ${d}/* ; do - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then - doexe ${f} - else - doins ${f} - fi - done - done - fi - - doman doc/*.1 - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO - dosym bash.info /usr/share/info/bashref.info -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then - mkdir -p "${ROOT}"/etc/bash - mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/ - fi - - if [[ -L ${ROOT}/bin/sh ]]; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${ROOT}"/bin/sh) - ln -sf "${target}" "${ROOT}"/bin/sh - fi -} - -pkg_postinst() { - # If /bin/sh does not exist, provide it - if [[ ! -e ${ROOT}/bin/sh ]]; then - ln -sf bash "${ROOT}"/bin/sh - fi -} diff --git a/app-shells/bash/bash-4.0_p33.ebuild b/app-shells/bash/bash-4.0_p33.ebuild deleted file mode 100644 index bd9492808fc7..000000000000 --- a/app-shells/bash/bash-4.0_p33.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p33.ebuild,v 1.3 2009/11/11 04:15:27 vapier Exp $ - -EAPI="1" - -inherit eutils flag-o-matic toolchain-funcs multilib - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_P=${PN}-${MY_PV} -[[ ${PV} != *_p* ]] && PLEVEL=0 -READLINE_VER=6.0 -READLINE_PLEVEL=0 # both readline patches are also released as bash patches -patches() { - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} - [[ ${plevel} -eq 0 ]] && return 1 - eval set -- {1..${plevel}} - set -- $(printf "${pn}${pv/\.}-%03d " "$@") - if [[ ${opt} == -s ]] ; then - echo "${@/#/${DISTDIR}/}" - else - local u - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do - printf "${u}/${pn}-${pv}-patches/%s " "$@" - done - fi -} - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" -SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches) - $(patches ${READLINE_PLEVEL} readline ${READLINE_VER})" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !<sys-apps/portage-2.1.5 - !<sys-apps/paludis-0.26.0_alpha5" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if is-flag -malign-double ; then #7332 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this" - eerror "as it breaks LFS (struct stat64) on x86." - die "remove -malign-double from your CFLAGS mr ricer" - fi -} - -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" - - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - cd lib/readline - [[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER}) - cd ../.. - - if ! use vanilla ; then - sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl - epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 - epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947 - epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch - epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613 - # Log bash commands to syslog #91327 - if use bashlogger ; then - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." - ewarn "This will log ALL output you enter into the shell, you have been warned." - ebeep - epause - epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch - fi - sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613 - fi -} - -src_compile() { - local myconf= - - # For descriptions of these, see config-top.h - # bashrc/#26952 bash_logout/#90488 ssh/#24762 - append-cppflags \ - -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \ - -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \ - -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \ - -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \ - -DNON_INTERACTIVE_LOGIN_SHELLS \ - -DSSH_SOURCE_BASHRC - - # Always use the buildin readline, else if we update readline - # bash gets borked as readline is usually not binary compadible - # between minor versions. - #myconf="${myconf} $(use_with !readline installed-readline)" - myconf="${myconf} --without-installed-readline" - - # Don't even think about building this statically without - # reading Bug 7714 first. If you still build it statically, - # don't come crying to us with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf="${myconf} --disable-nls" - - # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses - myconf="${myconf} --with-curses" - - use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash - econf \ - $(use_with afs) \ - $(use_enable net net-redirections) \ - --disable-profiling \ - $(use_enable mem-scramble) \ - $(use_with mem-scramble bash-malloc) \ - ${myconf} || die - emake || die "make failed" - - if use plugins ; then - emake -C examples/loadables all others || die - fi -} - -src_install() { - emake install DESTDIR="${D}" || die - - dodir /bin - mv "${D}"/usr/bin/bash "${D}"/bin/ || die - dosym bash /bin/rbash - - insinto /etc/bash - doins "${FILESDIR}"/{bashrc,bash_logout} - insinto /etc/skel - for f in bash{_logout,_profile,rc} ; do - newins "${FILESDIR}"/dot-${f} .${f} - done - - sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc - sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc - - if use plugins ; then - exeinto /usr/$(get_libdir)/bash - doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die - fi - - if use examples ; then - for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do - exeinto /usr/share/doc/${PF}/${d} - insinto /usr/share/doc/${PF}/${d} - for f in ${d}/* ; do - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then - doexe ${f} - else - doins ${f} - fi - done - done - fi - - doman doc/*.1 - dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO - dosym bash.info /usr/share/info/bashref.info -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then - mkdir -p "${ROOT}"/etc/bash - mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/ - fi - - if [[ -L ${ROOT}/bin/sh ]]; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${ROOT}"/bin/sh) - ln -sf "${target}" "${ROOT}"/bin/sh - fi -} - -pkg_postinst() { - # If /bin/sh does not exist, provide it - if [[ ! -e ${ROOT}/bin/sh ]]; then - ln -sf bash "${ROOT}"/bin/sh - fi -} diff --git a/app-shells/bash/files/bash-3.2-redisplay-cursor.patch b/app-shells/bash/files/bash-3.2-redisplay-cursor.patch deleted file mode 100644 index b9713bc619ed..000000000000 --- a/app-shells/bash/files/bash-3.2-redisplay-cursor.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://bugs.gentoo.org/155369 - -*** ../bash-3.2.10/lib/readline/display.c Fri Jan 19 13:34:50 2007 ---- lib/readline/display.c Sat Mar 10 17:25:44 2007 -*************** -*** 1733,1737 **** - { - dpos = _rl_col_width (data, 0, new); -! if (dpos > prompt_last_invisible) /* XXX - don't use woff here */ - { - dpos -= woff; ---- 1765,1772 ---- - { - dpos = _rl_col_width (data, 0, new); -! /* Use NEW when comparing against the last invisible character in the -! prompt string, since they're both buffer indices and DPOS is a -! desired display position. */ -! if (new > prompt_last_invisible) /* XXX - don't use woff here */ - { - dpos -= woff; |