old

(Portage version: 2.2_rc23/cvs/Linux x86_64)
author: Mike Frysinger <vapier@gentoo.org> 2009-02-21 21:59:12 +0000
committer: Mike Frysinger <vapier@gentoo.org> 2009-02-21 21:59:12 +0000
commit: fd1fd05375c890959a7a479af3f09681f7d273d3 (patch)
tree: 437ac5b6758b6b1277e56085bc51fc79b8053b16 /app-shells
parent: m68k stable (diff)
download: gentoo-2-fd1fd05375c890959a7a479af3f09681f7d273d3.tar.gz
gentoo-2-fd1fd05375c890959a7a479af3f09681f7d273d3.tar.bz2
gentoo-2-fd1fd05375c890959a7a479af3f09681f7d273d3.zip
41 files changed, 0 insertions, 2980 deletions
diff --git a/app-shells/bash/bash-2.05b-r11.ebuild b/app-shells/bash/bash-2.05b-r11.ebuild
deleted file mode 100644
index 17a37c3b8f78..000000000000
--- a/app-shells/bash/bash-2.05b-r11.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r11.ebuild,v 1.11 2006/03/23 23:07:21 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# Official patches
-PLEVEL="x002 x003 x004 x005 x006 x007"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2
-	${PLEVEL//x/mirror://gnu/bash/bash-${PV}-patches/bash${PV/\.}-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls build minimal"
-
-# we link statically with ncurses
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"
-	epatch "${DISTDIR}"/${P}-gentoo.diff.bz2
-
-	for x in ${PLEVEL//x}
-	do
-		epatch "${DISTDIR}"/${PN}${PV/\.}-${x}
-	done
-
-	# Remove autoconf dependency
-	sed -i -e "/&& autoconf/d" Makefile.in
-
-	# Readline is slow with multibyte locale, bug #19762
-	epatch "${FILESDIR}"/${P}-multibyte-locale.patch
-	# Segfault on empty herestring
-	epatch "${FILESDIR}"/${P}-empty-herestring.patch
-	# Fix broken rbash functionality
-	epatch "${FILESDIR}"/${P}-rbash.patch
-	# Fix parallel make, bug #41002.
-	epatch "${FILESDIR}"/${P}-parallel-build.patch
-	# Fix using bash with post-20040808 glibc ebuilds (from fedora)
-	epatch "${FILESDIR}"/${P}-jobs.patch
-	# Fix bash call to setlocale #64266
-	epatch "${FILESDIR}"/${P}-setlocale.patch
-
-	# Enable SSH_SOURCE_BASHRC (#24762)
-	echo '#define SSH_SOURCE_BASHRC' >> config-top.h
-
-	# Enable system-wide bashrc (#26952)
-	echo '#define SYS_BASHRC "/etc/bash/bashrc"' >> config-top.h
-
-	# Force pgrp synchronization
-	# (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653)
-	#
-	# The session will hang cases where you 'su' (not 'su -') and
-	# then run a piped command in emacs.
-	# This problem seem to happen due to scheduler changes kernel
-	# side - although reproduceble with later 2.4 kernels, it is
-	# especially easy with 2.6 kernels.
-	echo '#define PGRP_PIPE 1' >> config-bot.h
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	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.
-	#
-	# Martin Schlemmer <azarah@gentoo.org> (1 Sep 2002)
-	#use readline && myconf="--with-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"
-
-	econf \
-		--disable-profiling \
-		--without-gnu-malloc \
-		${myconf} || die
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die
-
-	dodir /bin
-	mv ${D}/usr/bin/bash ${D}/bin
-	dosym bash /bin/sh
-	dosym bash /bin/rbash
-
-	use minimal && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bashrc
-
-	if use build; then
-		rm -rf ${D}/usr
-	else
-		doman doc/*.1
-		dodoc README NEWS AUTHORS CHANGES COMPAT Y2K
-		dodoc doc/FAQ doc/INTRO
-
-		dosym bash.info.gz /usr/share/info/bashref.info.gz
-	fi
-}
diff --git a/app-shells/bash/bash-3.0-r12.ebuild b/app-shells/bash/bash-3.0-r12.ebuild
deleted file mode 100644
index b36cf62745b5..000000000000
--- a/app-shells/bash/bash-3.0-r12.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r12.ebuild,v 1.10 2007/06/26 01:42:11 mr_bones_ Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
-PLEVEL=16
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-# Hit the GNU mirrors before hitting Chet's site
-SRC_URI="mirror://gnu/bash/${P}.tar.gz
-	ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2
-	$(for ((i=1; i<=PLEVEL; i++)); do
-		printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
-			${PV} ${PV/\.} ${i}
-		printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
-			${PV} ${PV/\.} ${i}
-	done)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls build bashlogger"
-
-# we link statically with ncurses
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${DISTDIR}"/${P}-gentoo.diff.bz2
-
-	# Remove autoconf dependency
-	sed -i -e "/&& autoconf/d" Makefile.in
-
-	# Include official patches
-	local i
-	for ((i=1; i<=PLEVEL; i++)); do
-		epatch "${DISTDIR}"/${PN}${PV/\.}-$(printf '%03d' ${i})
-	done
-
-	# Patch readline's bind.c so that /etc/inputrc is read as a last resort
-	# following ~/.inputrc.  This is better than putting INPUTRC in
-	# the environment because INPUTRC will override even after the
-	# user creates a ~/.inputrc
-	epatch "${FILESDIR}"/${P}-etc-inputrc.patch
-	# Fix network tests on Darwin #79124
-	epatch "${FILESDIR}"/${P}-darwin-conn.patch
-	# A bunch of fixes from fedora
-	for i in afs crash jobs manpage pwd read-e-segfault ulimit ; do
-		epatch "${FILESDIR}"/${P}-${i}.patch
-	done
-	# Fix read-builtin and the -u pipe option #87093
-	epatch "${FILESDIR}"/${P}-read-builtin-pipe.patch
-	# Don't barf on handled signals in scripts
-	epatch "${FILESDIR}"/${P}-trap-fg-signals.patch
-	# Fix a problem when using pipes and PGRP_PIPE #92349
-	epatch "${FILESDIR}"/${P}-pgrp-pipe-fix.patch
-	# Make sure static linking always works #100138
-	epatch "${FILESDIR}"/${P}-force-static-linking.patch
-	# Fix parallel builds #87247
-	epatch "${FILESDIR}"/${P}-parallel.patch
-	# 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}"/${P}-bash-logger.patch
-	fi
-
-	# Enable SSH_SOURCE_BASHRC (#24762)
-	echo '#define SSH_SOURCE_BASHRC' >> config-top.h
-	# Enable system-wide bashrc (#26952)
-	echo '#define SYS_BASHRC "/etc/bash/bashrc"' >> config-top.h
-	# Enable system-wide logout (#90488)
-	echo '#define SYS_BASH_LOGOUT "/etc/bash/bash_logout"' >> config-top.h
-
-	# Force pgrp synchronization
-	# (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653)
-	#
-	# The session will hang cases where you 'su' (not 'su -') and
-	# then run a piped command in emacs.
-	# This problem seem to happen due to scheduler changes kernel
-	# side - although reproduceble with later 2.4 kernels, it is
-	# especially easy with 2.6 kernels.
-	echo '#define PGRP_PIPE 1' >> config-bot.h
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	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.
-	#
-	# Martin Schlemmer <azarah@gentoo.org> (1 Sep 2002)
-	#use readline && myconf="--with-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"
-
-	econf \
-		--disable-profiling \
-		--without-gnu-malloc \
-		${myconf} || die
-	emake -j1 || die "make failed"  # see bug 102426
-}
-
-src_install() {
-	einstall || die
-
-	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/
-	[[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh
-	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
-
-	if use build ; then
-		rm -rf "${D}"/usr
-	else
-		doman doc/*.1
-		dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-		dosym bash.info.gz /usr/share/info/bashref.info.gz
-	fi
-}
-
-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
-
-	# our bash_logout is just a place holder so dont
-	# force users to go through etc-update all the time
-	if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
-		rm -f "${D}"/etc/bash/bash_logout
-	fi
-}
diff --git a/app-shells/bash/bash-3.0-r13.ebuild b/app-shells/bash/bash-3.0-r13.ebuild
deleted file mode 100644
index 693721d84817..000000000000
--- a/app-shells/bash/bash-3.0-r13.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r13.ebuild,v 1.6 2007/06/26 01:42:11 mr_bones_ Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
-PLEVEL=16
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-# Hit the GNU mirrors before hitting Chet's site
-SRC_URI="mirror://gnu/bash/${P}.tar.gz
-	ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz
-	$(for ((i=1; i<=PLEVEL; i++)); do
-		printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
-			${PV} ${PV/\.} ${i}
-		printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
-			${PV} ${PV/\.} ${i}
-	done)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs nls build bashlogger unicode"
-
-# we link statically with ncurses
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# Remove autoconf dependency
-	sed -i -e "/&& autoconf/d" Makefile.in
-
-	# Include official patches
-	local i
-	for ((i=1; i<=PLEVEL; i++)); do
-		epatch "${DISTDIR}"/${PN}${PV/\.}-$(printf '%03d' ${i})
-	done
-
-	# Fall back to /etc/inputrc
-	epatch "${FILESDIR}"/${P}-etc-inputrc.patch
-	# Fix network tests on Darwin #79124
-	epatch "${FILESDIR}"/${P}-darwin-conn.patch
-	# read patch headers for more info ... many ripped from Fedora/Debian/SuSe
-	for i in afs crash jobs manpage pwd read-e-segfault ulimit histtimeformat \
-	         locale multibyteifs rl-display rl-self-insert
-	do
-		epatch "${FILESDIR}"/${P}-${i}.patch
-	done
-	# Hacks for bugs in unicode support #69407 #108936
-	if use unicode ; then
-		epatch "${FILESDIR}"/${P}-prompt.patch
-		epatch "${FILESDIR}"/${P}-utf8.patch
-	fi
-	# Fix read-builtin and the -u pipe option #87093
-	epatch "${FILESDIR}"/${P}-read-builtin-pipe.patch
-	# Don't barf on handled signals in scripts
-	epatch "${FILESDIR}"/${P}-trap-fg-signals.patch
-	# Fix a problem when using pipes and PGRP_PIPE #92349
-	epatch "${FILESDIR}"/${P}-pgrp-pipe-fix.patch
-	# Make sure static linking always works #100138
-	epatch "${FILESDIR}"/${P}-force-static-linking.patch
-	# Fix parallel builds #87247
-	epatch "${FILESDIR}"/${P}-parallel.patch
-	# 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}"/${P}-bash-logger.patch
-	fi
-
-	epatch "${FILESDIR}"/${P}-configs.patch
-
-	# Add strnlen function for non-glibc systems, as one of Fedora's patches
-	# requires it.
-	epatch "${FILESDIR}"/${P}-strnlen.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	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.
-	#
-	# Martin Schlemmer <azarah@gentoo.org> (1 Sep 2002)
-	#use readline && myconf="--with-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"
-
-	econf \
-		$(use_with afs) \
-		--disable-profiling \
-		--without-gnu-malloc \
-		${myconf} || die
-	emake -j1 || die "make failed"  # see bug 102426
-}
-
-src_install() {
-	einstall || die
-
-	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/
-	[[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh
-	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
-
-	if use build ; then
-		rm -rf "${D}"/usr
-	else
-		doman doc/*.1
-		dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-		dosym bash.info.gz /usr/share/info/bashref.info.gz
-	fi
-}
-
-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
-
-	# our bash_logout is just a place holder so dont
-	# force users to go through etc-update all the time
-	if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
-		rm -f "${D}"/etc/bash/bash_logout
-	fi
-}
diff --git a/app-shells/bash/bash-3.0-r14.ebuild b/app-shells/bash/bash-3.0-r14.ebuild
deleted file mode 100644
index 51b75a01f2fd..000000000000
--- a/app-shells/bash/bash-3.0-r14.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r14.ebuild,v 1.6 2007/06/26 01:42:11 mr_bones_ Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
-PLEVEL=16
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-# Hit the GNU mirrors before hitting Chet's site
-SRC_URI="mirror://gnu/bash/${P}.tar.gz
-	ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz
-	$(for ((i=1; i<=PLEVEL; i++)); do
-		printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
-			${PV} ${PV/\.} ${i}
-		printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
-			${PV} ${PV/\.} ${i}
-	done)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs nls build bashlogger unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# Remove autoconf dependency
-	sed -i -e "/&& autoconf/d" Makefile.in
-
-	# Include official patches
-	local i
-	for ((i=1; i<=PLEVEL; i++)); do
-		epatch "${DISTDIR}"/${PN}${PV/\.}-$(printf '%03d' ${i})
-	done
-
-	# Fall back to /etc/inputrc
-	epatch "${FILESDIR}"/${P}-etc-inputrc.patch
-	# Fix network tests on Darwin #79124
-	epatch "${FILESDIR}"/${P}-darwin-conn.patch
-	# read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
-	for i in afs crash jobs manpage pwd read-e-segfault ulimit histtimeformat \
-	         locale multibyteifs rl-display rl-self-insert subshell \
-	         volatile-command
-	do
-		epatch "${FILESDIR}"/${P}-${i}.patch
-	done
-	# Hacks for bugs in unicode support #69407 #108936
-	if use unicode ; then
-		epatch "${FILESDIR}"/${P}-prompt.patch
-		epatch "${FILESDIR}"/${P}-utf8.patch
-	fi
-	# Fix read-builtin and the -u pipe option #87093
-	epatch "${FILESDIR}"/${P}-read-builtin-pipe.patch
-	# Don't barf on handled signals in scripts
-	epatch "${FILESDIR}"/${P}-trap-fg-signals.patch
-	# Fix a problem when using pipes and PGRP_PIPE #92349
-	epatch "${FILESDIR}"/${P}-pgrp-pipe-fix.patch
-	# Make sure static linking always works #100138
-	epatch "${FILESDIR}"/${P}-force-static-linking.patch
-	# Fix parallel builds #87247
-	epatch "${FILESDIR}"/${P}-parallel.patch
-	# Fix generation of signals list when cross-compiling
-	#epatch "${FILESDIR}"/${P}-cross-signals.patch
-	# 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}"/${P}-bash-logger.patch
-	fi
-
-	epatch "${FILESDIR}"/${P}-configs.patch
-
-	# Add strnlen function for non-glibc systems, as one of Fedora's patches
-	# requires it.
-	epatch "${FILESDIR}"/${P}-strnlen.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	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"
-
-	econf \
-		$(use_with afs) \
-		--disable-profiling \
-		--without-gnu-malloc \
-		${myconf} || die
-	emake -j1 || die "make failed"  # see bug 102426
-}
-
-src_install() {
-	einstall || die
-
-	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/
-	[[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh
-	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
-
-	if use build ; then
-		rm -rf "${D}"/usr
-	else
-		doman doc/*.1
-		dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-		dosym bash.info.gz /usr/share/info/bashref.info.gz
-	fi
-}
-
-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
-
-	# our bash_logout is just a place holder so dont
-	# force users to go through etc-update all the time
-	if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
-		rm -f "${D}"/etc/bash/bash_logout
-	fi
-}
diff --git a/app-shells/bash/bash-3.2_p17-r1.ebuild b/app-shells/bash/bash-3.2_p17-r1.ebuild
deleted file mode 100644
index 043e65a52130..000000000000
--- a/app-shells/bash/bash-3.2_p17-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p17-r1.ebuild,v 1.10 2008/02/09 20:34:52 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://cnswww.cns.cwru.edu/~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 nls plugins vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-
-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}"/${PN}-3.1-gentoo.patch
-		epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
-		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
-
-		# 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"
-
-	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
-
-	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
-
-	# our bash_logout is just a place holder so dont
-	# force users to go through etc-update all the time
-	if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
-		rm -f "${D}"/etc/bash/bash_logout
-	fi
-
-	# If /bin/sh does not exist or is bash, then provide it
-	# Otherwise leave it alone
-	if [[ ! -e ${ROOT}/bin/sh ]] ; then
-		ln -s bash "${ROOT}"/bin/sh
-	elif [[ -L ${ROOT}/bin/sh ]] ; then
-		case $(readlink "${ROOT}"/bin/sh) in
-			bash|/bin/bash) cp -pPR "${ROOT}"/bin/sh "${D}"/bin/ ;;
-		esac
-	fi
-}
diff --git a/app-shells/bash/bash-3.2_p33.ebuild b/app-shells/bash/bash-3.2_p33.ebuild
deleted file mode 100644
index 010c4c0955c0..000000000000
--- a/app-shells/bash/bash-3.2_p33.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p33.ebuild,v 1.12 2008/06/01 12:18:46 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://cnswww.cns.cwru.edu/~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 nls plugins vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.4_rc1
-	!<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}"/${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
-
-	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
-
-	# our bash_logout is just a place holder so dont
-	# force users to go through etc-update all the time
-	if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
-		rm -f "${D}"/etc/bash/bash_logout
-	fi
-
-	# If /bin/sh does not exist or is bash, then provide it
-	# Otherwise leave it alone
-	if [[ ! -e ${ROOT}/bin/sh ]] ; then
-		ln -s bash "${ROOT}"/bin/sh
-	elif [[ -L ${ROOT}/bin/sh ]] ; then
-		case $(readlink "${ROOT}"/bin/sh) in
-			bash|/bin/bash) cp -pPR "${ROOT}"/bin/sh "${D}"/bin/ ;;
-		esac
-	fi
-}
diff --git a/app-shells/bash/files/bash-2.05b-empty-herestring.patch b/app-shells/bash/files/bash-2.05b-empty-herestring.patch
deleted file mode 100644
index 62e231c646f5..000000000000
--- a/app-shells/bash/files/bash-2.05b-empty-herestring.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-###################################################################
-# Added by Tavis Ormandy <taviso@gentoo.org> 01/05/2003
-# Reproduce with 
-#
-#  $ xargs <<< ${EMTPY_VARIABLE}
-#  Segmentation fault.
-#
-# note: bash will still give you a "\n" with this patch, but this is 
-# standard behaviour, if you need proof:
-#
-#  $ wc -l <<< ""
-###############################
-diff -u bash-2.05b.orig/redir.c bash-2.05b/redir.c
---- bash-2.05b.orig/redir.c	2002-03-12 20:27:38.000000000 +0000
-+++ bash-2.05b/redir.c	2003-05-01 13:04:07.000000000 +0100
-@@ -263,8 +263,10 @@
-   int herelen, n, e;
- 
-   herestr = expand_string_to_string (redirectee->word, 0);
--  herelen = strlen (herestr);
- 
-+  /* verify string wasnt empty */
-+  herelen = (herestr == NULL) ? 0 : strlen (herestr);
-+  
-   n = write (fd, herestr, herelen);
-   if (n == herelen)
-     {
diff --git a/app-shells/bash/files/bash-2.05b-jobs.patch b/app-shells/bash/files/bash-2.05b-jobs.patch
deleted file mode 100644
index 6d68059535f2..000000000000
--- a/app-shells/bash/files/bash-2.05b-jobs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nru bash-2.05b.old/jobs.c bash-2.05b/jobs.c
---- bash-2.05b.old/jobs.c	2004-09-28 04:24:20.656378576 -0400
-+++ bash-2.05b/jobs.c	2004-09-28 04:24:30.586868912 -0400
-@@ -2423,6 +2423,7 @@
-   PROCESS *child;
-   pid_t pid;
-   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
-+  static int wcontinued_not_supported = 0;
- 
-   call_set_current = children_exited = 0;
-   last_stopped_job = NO_JOB;
-@@ -2436,7 +2437,15 @@
- 			: 0;
-       if (sigchld || block == 0)
- 	waitpid_flags |= WNOHANG;
-+    retry:
-+      if (wcontinued_not_supported)
-+	waitpid_flags &= ~WCONTINUED;
-       pid = WAITPID (-1, &status, waitpid_flags);
-+      if (pid == -1 && errno == EINVAL)
-+	{
-+	  wcontinued_not_supported = 1;
-+	  goto retry;
-+	}
- 
-       /* The check for WNOHANG is to make sure we decrement sigchld only
- 	 if it was non-zero before we called waitpid. */
diff --git a/app-shells/bash/files/bash-2.05b-multibyte-locale.patch b/app-shells/bash/files/bash-2.05b-multibyte-locale.patch
deleted file mode 100644
index e5f2eb497b09..000000000000
--- a/app-shells/bash/files/bash-2.05b-multibyte-locale.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru bash-2.05b.orig/lib/readline/display.c bash-2.05b/lib/readline/display.c
---- bash-2.05b.orig/lib/readline/display.c	2002-06-04 23:54:47.000000000 +0900
-+++ bash-2.05b/lib/readline/display.c	2002-12-12 16:31:06.000000000 +0900
-@@ -1129,16 +1129,24 @@
-       memset (&ps_new, 0, sizeof(mbstate_t));
-       memset (&ps_old, 0, sizeof(mbstate_t));
- 
--      new_offset = old_offset = 0;
--      for (ofd = old, nfd = new;
--	   (ofd - old < omax) && *ofd &&
--	     _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); )
--	{
--	  old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY);
--	  new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY);
--	  ofd = old + old_offset;
--	  nfd = new + new_offset;
--	}
-+      if(omax == nmax && strncmp(new,old,omax) == 0)
-+        {
-+          ofd = old + omax;
-+          nfd = new + nmax;
-+        }
-+      else
-+        {
-+          new_offset = old_offset = 0;
-+          for (ofd = old, nfd = new;
-+               (ofd - old < omax) && *ofd &&
-+                 _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); )
-+            {
-+              old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY);
-+              new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY);
-+              ofd = old + old_offset;
-+              nfd = new + new_offset;
-+            }
-+        }
-     }
-   else
- #endif
-@@ -1169,8 +1177,9 @@
- 	  memset (&ps_old, 0, sizeof (mbstate_t));
- 	  memset (&ps_new, 0, sizeof (mbstate_t));
- 
--	  _rl_adjust_point (old, ols - old, &ps_old);
--	  _rl_adjust_point (new, nls - new, &ps_new);
-+          /* these doesn't make sense */
-+	  /* _rl_adjust_point (old, ols - old, &ps_old); */
-+          /* _rl_adjust_point (new, nls - new, &ps_new); */
- 
- 	  if (_rl_compare_chars (old, ols - old, &ps_old, new, nls - new, &ps_new) == 0)
- 	    break;
diff --git a/app-shells/bash/files/bash-2.05b-parallel-build.patch b/app-shells/bash/files/bash-2.05b-parallel-build.patch
deleted file mode 100644
index 83f29cc739ec..000000000000
--- a/app-shells/bash/files/bash-2.05b-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2002-05-31 19:44:23.000000000 +0200
-+++ Makefile.in-parallelbuild	2004-02-09 21:25:28.000000000 +0100
-@@ -604,7 +604,7 @@
- 
- config.h:	stamp-h 
- 
--stamp-h:	config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
-+stamp-h:	version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
- 	CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
- 
- config.status:	$(srcdir)/configure
diff --git a/app-shells/bash/files/bash-2.05b-rbash.patch b/app-shells/bash/files/bash-2.05b-rbash.patch
deleted file mode 100644
index a08159f14f3b..000000000000
--- a/app-shells/bash/files/bash-2.05b-rbash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nru bash-2.05b.orig/shell.c bash-2.05b/shell.c
---- bash-2.05b.orig/shell.c	2002-07-01 11:27:11.000000000 -0400
-+++ bash-2.05b/shell.c	2003-08-18 21:20:26.000000000 -0400
-@@ -1065,7 +1065,7 @@
-   if (restricted)
-     return 1;
-   temp = base_pathname (name);
--  return (STREQ (temp, RESTRICTED_SHELL_NAME));
-+  return ( (STREQ (temp, RESTRICTED_SHELL_NAME)) || (STREQ (temp, ("-"RESTRICTED_SHELL_NAME))) );
- }
- 
- /* Perhaps make this shell a `restricted' one, based on NAME.  If the
-@@ -1082,7 +1082,7 @@
-   char *temp;
- 
-   temp = base_pathname (name);
--  if (restricted || (STREQ (temp, RESTRICTED_SHELL_NAME)))
-+  if (restricted || (STREQ (temp, RESTRICTED_SHELL_NAME)) || (STREQ (temp, ("-"RESTRICTED_SHELL_NAME))) )
-     {
-       set_var_read_only ("PATH");
-       set_var_read_only ("SHELL");
diff --git a/app-shells/bash/files/bash-2.05b-setlocale.patch b/app-shells/bash/files/bash-2.05b-setlocale.patch
deleted file mode 100644
index db480304d59e..000000000000
--- a/app-shells/bash/files/bash-2.05b-setlocale.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use NULL instead of "" to prevent overriding locale information set in
-the environment.  See
-	http://bugs.gentoo.org/show_bug.cgi?id=64266
-	http://lists.debian.or.jp/debian-devel/200210/msg00047.html
-
-diff -urN bash-2.05b.orig/lib/readline/nls.c bash-2.05b/lib/readline/nls.c
---- bash-2.05b.orig/lib/readline/nls.c	2001-10-15 14:32:29.000000000 -0400
-+++ bash-2.05b/lib/readline/nls.c	2004-09-29 12:25:24.585683597 -0400
-@@ -87,7 +87,7 @@
-   char *t;
- 
-   /* Set the LC_CTYPE locale category from environment variables. */
--  t = setlocale (LC_CTYPE, "");
-+  t = setlocale (LC_CTYPE, NULL);
-   if (t && *t && (t[0] != 'C' || t[1]) && (STREQ (t, "POSIX") == 0))
-     {
-       _rl_meta_flag = 1;
diff --git a/app-shells/bash/files/bash-3.0-afs.patch b/app-shells/bash/files/bash-3.0-afs.patch
deleted file mode 100644
index f07371c39eb4..000000000000
--- a/app-shells/bash/files/bash-3.0-afs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Ripped from Fedora
-
-- Fixed AFS support for output redirection, so that the correct errors
-  are reported for other filesystems (bug #155373).
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155373
-
---- bash-3.0/redir.c.afs	2005-04-20 09:16:15.000000000 +0100
-+++ bash-3.0/redir.c	2005-04-20 09:16:58.000000000 +0100
-@@ -596,7 +596,9 @@
-       fd = open (filename, flags, mode);
- #if defined (AFS)
-       if ((fd < 0) && (errno == EACCES))
--	fd = open (filename, flags & ~O_CREAT, mode);
-+	if ((fd = open (filename, flags & ~O_CREAT, mode)) < 0)
-+	  /* Restore previous errno. */
-+	  errno = EACCES;
- #endif /* AFS */
-     }
- 
diff --git a/app-shells/bash/files/bash-3.0-array-stripping.patch b/app-shells/bash/files/bash-3.0-array-stripping.patch
deleted file mode 100644
index 8b2384c3657b..000000000000
--- a/app-shells/bash/files/bash-3.0-array-stripping.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix from Chet Ramey (bash maintainer) for array stripping
-
-http://bugs.gentoo.org/60127
-
-*** ../bash-3.0/subst.c Sun Jul  4 13:56:13 2004
---- subst.c     Thu Aug 12 13:36:17 2004
-***************
-*** 4892,4896 ****
-      *e1p += len;
-  
-!   if (*e1p >= len || *e1p < 0)
-      return (-1);
-  
---- 4912,4916 ----
-      *e1p += len;
-  
-!   if (*e1p > len || *e1p < 0)
-      return (-1);
diff --git a/app-shells/bash/files/bash-3.0-bash-logger.patch b/app-shells/bash/files/bash-3.0-bash-logger.patch
deleted file mode 100644
index b0660aeaa65b..000000000000
--- a/app-shells/bash/files/bash-3.0-bash-logger.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Add support for logging bash commands via syslog().
-Useful for deploying in honeypot environments.
-
-http://bugs.gentoo.org/show_bug.cgi?id=91327
-http://www.nardware.co.uk/Security/html/bashlogger.htm
-
---- bashhist.c
-+++ bashhist.c
-@@ -698,7 +698,7 @@
-      char *line;
- {
-   hist_last_line_added = 1;
--  add_history (line);
-+  add_history (line, 1);
-   history_lines_this_session++;
- }
- 
---- lib/readline/histexpand.c
-+++ lib/readline/histexpand.c
-@@ -1220,9 +1220,7 @@
- 
-   if (only_printing)
-     {
--#if 0
--      add_history (result);
--#endif
-+      add_history (result, 1);
-       return (2);
-     }
- 
---- lib/readline/histfile.c
-+++ lib/readline/histfile.c
-@@ -262,7 +262,7 @@
- 	  {
- 	    if (HIST_TIMESTAMP_START(line_start) == 0)
- 	      {
--		add_history (line_start);
-+		add_history (line_start,0);
- 		if (last_ts)
- 		  {
- 		    add_history_time (last_ts);
---- lib/readline/history.c
-+++ lib/readline/history.c
-@@ -31,6 +31,8 @@
- 
- #include <stdio.h>
- 
-+#include <syslog.h>
-+
- #if defined (HAVE_STDLIB_H)
- #  include <stdlib.h>
- #else
-@@ -246,10 +250,24 @@
- /* Place STRING at the end of the history list.  The data field
-    is  set to NULL. */
- void
--add_history (string)
--     const char *string;
-+add_history (string, logme)
-+     const char *string;
-+     int logme; /* 0 means no sending history to syslog */
- {
-   HIST_ENTRY *temp;
-+  if (logme) {
-+    if (strlen(string)<600) {
-+      syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s",
-+        getpid(), getuid(), string);
-+    }
-+    else {
-+      char trunc[600];
-+      strncpy(trunc,string,sizeof(trunc));
-+      trunc[sizeof(trunc)-1]='\0';
-+      syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s(++TRUNC)",
-+          getpid(), getuid(), trunc);
-+    }
-+  }
- 
-   if (history_stifled && (history_length == history_max_entries))
-     {
---- lib/readline/history.h
-+++ lib/readline/history.h
-@@ -80,7 +80,7 @@
- 
- /* Place STRING at the end of the history list.
-    The associated data field (if any) is set to NULL. */
--extern void add_history PARAMS((const char *));
-+extern void add_history PARAMS((const char *, int ));
- 
- /* Change the timestamp associated with the most recent history entry to
-    STRING. */
diff --git a/app-shells/bash/files/bash-3.0-crash.patch b/app-shells/bash/files/bash-3.0-crash.patch
deleted file mode 100644
index 984e85d82ed3..000000000000
--- a/app-shells/bash/files/bash-3.0-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-> Machine Type: i686-pc-linux-gnu
-> 
-> Bash Version: 3.0
-> Patch Level: 0
-> Release Status: release
-> 
-> Description:
->         GNU bash, version 3.00.0(1)-release (i686-pc-linux-gnu)
->         (and
->         GNU bash, version 2.05b.0(1)-release (i386-redhat-linux-gnu)
-> 
->         dumps a core because of a null pointer "in make_bare_word 
->         at make_cmd.c:90" (see gdb output below)
-
-Thanks for the report.  Here's a quick fix:
-
-*** arrayfunc.c~	Sat Nov  6 15:08:29 2004
---- arrayfunc.c	Mon Jan 31 11:56:21 2005
-***************
-*** 709,713 ****
-  	  return ((char *)NULL);
-  	}
-!       else if (var == 0)
-  	return ((char *)NULL);
-        else if (array_p (var) == 0)
---- 709,713 ----
-  	  return ((char *)NULL);
-  	}
-!       else if (var == 0 || value_cell (var) == 0)
-  	return ((char *)NULL);
-        else if (array_p (var) == 0)
-
-
-Chet
-
--- 
-``The lyf so short, the craft so long to lerne.'' - Chaucer
-( ``Discere est Dolere'' -- chet )
-						Live...Laugh...Love
-Chet Ramey, ITS, CWRU    chet@po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
-
-
-_______________________________________________
-Bug-bash mailing list
-Bug-bash@gnu.org
-http://lists.gnu.org/mailman/listinfo/bug-bash
diff --git a/app-shells/bash/files/bash-3.0-cross-signals.patch b/app-shells/bash/files/bash-3.0-cross-signals.patch
deleted file mode 100644
index ca0850b225c3..000000000000
--- a/app-shells/bash/files/bash-3.0-cross-signals.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- bash-3.0/Makefile.in
-+++ bash-3.0/Makefile.in
-@@ -607,7 +607,11 @@
- 
- ${LIBINTL_H}:	${INTL_LIBRARY}
- 
--mksignames$(EXEEXT):	$(SUPPORT_SRC)mksignames.c
-+$(SUPPORT_SRC)mksignames.h:	$(SUPPORT_SRC)mksignames.sh
-+	CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" /bin/sh $(SUPPORT_SRC)mksignames.sh
-+	mv mksignames.h $(SUPPORT_SRC)mksignames.h
-+
-+mksignames$(EXEEXT):	$(SUPPORT_SRC)mksignames.c $(SUPPORT_SRC)mksignames.h
- 	$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)mksignames.c
- 
- mksyntax$(EXEEXT):	${srcdir}/mksyntax.c config.h syntax.h ${BASHINCDIR}/chartypes.h
---- bash-3.0/support/mksignames.c
-+++ bash-3.0/support/mksignames.c
-@@ -30,9 +30,7 @@
- #  include "ansi_stdlib.h"
- #endif /* HAVE_STDLIB_H */
- 
--#if !defined (NSIG)
--#  define NSIG 64
--#endif
-+#include "mksignames.h"
- 
- /*
-  * Special traps:
---- bash-3.0/support/mksignames.sh
-+++ bash-3.0/support/mksignames.sh
-@@ -0,0 +1,60 @@
-+#!/bin/sh
-+
-+input_header=mksignames.input.h
-+output_header=mksignames.h
-+
-+rm -f $input_header $output_header
-+
-+cat >> $input_header << _ACEOF
-+#include <config.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <signal.h>
-+#if defined (HAVE_STDLIB_H)
-+#  include <stdlib.h>
-+#else
-+#  include "ansi_stdlib.h"
-+#endif /* HAVE_STDLIB_H */
-+
-+#if !defined (NSIG)
-+# define NSIG 64
-+#endif
-+
-+_ACEOF
-+
-+deflist="NSIG SIGRTMAX SIGRTMIN SIGLOST SIGMSG SIGDANGER SIGMIGRATE SIGPRE 
-+SIGVIRT SIGALRM1 SIGWAITING SIGGRANT SIGKAP SIGRETRACT SIGSOUND SIGSAK SIGLWP 
-+SIGFREEZE SIGTHAW SIGCANCEL SIGDIL SIGCLD SIGPWR SIGPOLL SIGWINDOW SIGHUP 
-+SIGINT SIGQUIT SIGILL SIGTRAP SIGIOT SIGABRT SIGEMT SIGFPE SIGKILL SIGBUS 
-+SIGSEGV SIGSYS SIGPIPE SIGALRM SIGTERM SIGURG SIGSTOP SIGTSTP SIGCONT SIGCHLD 
-+SIGTTIN SIGTTOU SIGIO SIGXCPU SIGXFSZ SIGVTALRM SIGPROF SIGWINCH SIGINFO 
-+SIGUSR1 SIGUSR2 SIGKILLTHR"
-+
-+for def in $deflist ; do
-+	echo "#undef $def" >> $output_header
-+	cat >> $input_header << _ACEOF
-+#if defined($def)
-+MKSIGNAMES_$def $def
-+#endif
-+_ACEOF
-+done
-+
-+if test "x${CPPFLAGS+set}" != "xset" ; then
-+	if test -f "./mksignames.c" ; then
-+		CPPFLAGS="-I.. -I../include"
-+	else
-+		CPPFLAGS="-I. -Iinclude"
-+	fi
-+fi
-+if test "x${CPP+set}" != "xset" ; then
-+	CPP="gcc -E"
-+fi
-+if test "x${EGREP+set}" != "xset" ; then
-+	EGREP="grep"
-+fi
-+$CPP $CPPFLAGS $input_header \
-+	| $EGREP '^MKSIGNAMES_' \
-+	| sed 's/MKSIGNAMES_/#define /' \
-+	>> $output_header
-+echo "/* $CPP $CPPFLAGS */" >> $output_header
-+rm -f $input_header
diff --git a/app-shells/bash/files/bash-3.0-darwin-conn.patch b/app-shells/bash/files/bash-3.0-darwin-conn.patch
deleted file mode 100644
index 1687acabf5e6..000000000000
--- a/app-shells/bash/files/bash-3.0-darwin-conn.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Sune Foldager writes:
-On Darwin (Mac OS X), bash incorrectly assumed that it has been called over a 
-network connection (such as ssh, rsh etc.), when stdin stems from the pipe() 
-system call. This is because bash's heuristic code for determining if it's 
-been started over a net connection is incorrect on Darwin kernels.
-
-http://bugs.gentoo.org/79124
-
---- a/lib/sh/netconn.c
-+++ b/lib/sh/netconn.c
-@@ -53,7 +53,8 @@
-   l = sizeof(sa);
-   rv = getpeername(fd, &sa, &l);
-   /* Solaris 2.5 getpeername() returns EINVAL if the fd is not a socket. */
--  return ((rv < 0 && (errno == ENOTSOCK || errno == EINVAL)) ? 0 : 1);
-+  /* Darwin 7.7.0 getpeername() returns ENOTCONN if the fd was created with pipe(). */
-+  return ((rv < 0 && (errno == ENOTSOCK || errno == ENOTCONN || errno == EINVAL)) ? 0 : 1);
- #else /* !HAVE_GETPEERNAME || SVR4_2 || __BEOS__ */
- #  if defined (SVR4) || defined (SVR4_2)
-   /* Sockets on SVR4 and SVR4.2 are character special (streams) devices. */
diff --git a/app-shells/bash/files/bash-3.0-force-static-linking.patch b/app-shells/bash/files/bash-3.0-force-static-linking.patch
deleted file mode 100644
index 6a3f165bb71a..000000000000
--- a/app-shells/bash/files/bash-3.0-force-static-linking.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Make sure linking against included readline always works.
-
-http://bugs.gentoo.org/100138
-
---- configure
-+++ configure
-@@ -477,8 +477,8 @@
- #define READLINE 1
- _ACEOF
- 
--	READLINE_LIB=-lreadline
- 	if test "$opt_with_installed_readline" != "no" ; then
-+		READLINE_LIB=-lreadline
- 		case "$opt_with_installed_readline" in
- 		yes)	RL_INCLUDE= ;;
- 		*)	case "$RL_INCLUDEDIR" in
-@@ -490,6 +490,7 @@
- 		READLINE_DEP=
- 	else
- 		RL_LIBDIR='$(dot)/$(LIBSUBDIR)/readline'
-+		READLINE_LIB='$(RL_LIBDIR)/libreadline.a'
- 		READLINE_DEP='$(READLINE_LIBRARY)'
- 	fi
- else
-@@ -503,8 +504,8 @@
- _ACEOF
- 
- 	fi
--	HISTORY_LIB=-lhistory
-  	if test "$opt_with_installed_readline" != "no"; then
-+		HISTORY_LIB=-lhistory
- 		HIST_LIBDIR=$RL_LIBDIR
- 		HISTORY_DEP=
- 		case "$opt_with_installed_readline" in
-@@ -517,6 +518,7 @@
- 		esac
- 	else
- 		HIST_LIBDIR='$(dot)/$(LIBSUBDIR)/readline'
-+		HISTORY_LIB='$(HIST_LIBDIR)/libhistory.a'
- 		HISTORY_DEP='$(HISTORY_LIBRARY)'
- 	fi
- else
diff --git a/app-shells/bash/files/bash-3.0-gentoo.patch b/app-shells/bash/files/bash-3.0-gentoo.patch
deleted file mode 100644
index dc595152519d..000000000000
--- a/app-shells/bash/files/bash-3.0-gentoo.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Collection of fixes from mandrake
-
---- bash-3.0/doc/builtins.1
-+++ bash-3.0/doc/builtins.1
-@@ -8,8 +8,5 @@
- let, local, logout, popd, printf, pushd, pwd, read, readonly, return, set,
- shift, shopt, source, suspend, test, times, trap, type, typeset,
- ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
--.SH BASH BUILTIN COMMANDS
--.nr zZ 1
--.so bash.1
- .SH SEE ALSO
- bash(1), sh(1)
---- bash-3.0/lib/readline/complete.c
-+++ bash-3.0/lib/readline/complete.c
-@@ -1529,9 +1529,7 @@
-   if (rl_filename_completion_desired)
-     {
-       filename = tilde_expand (text);
--      s = (nontrivial_match && rl_completion_mark_symlink_dirs == 0)
--		? LSTAT (filename, &finfo)
--		: stat (filename, &finfo);
-+      s = stat (filename, &finfo);
-       if (s == 0 && S_ISDIR (finfo.st_mode))
- 	{
- 	  if (_rl_complete_mark_directories)
---- bash-3.0/lib/readline/terminal.c
-+++ bash-3.0/lib/readline/terminal.c
-@@ -313,7 +313,7 @@
-   { "ei", &_rl_term_ei },
-   { "ic", &_rl_term_ic },
-   { "im", &_rl_term_im },
--  { "kH", &_rl_term_kH },	/* home down ?? */
-+  { "@", &_rl_term_kH },	/* home down ?? */
-   { "kI", &_rl_term_kI },	/* insert */
-   { "kd", &_rl_term_kd },
-   { "ke", &_rl_term_ke },	/* end keypad mode */
---- bash-3.0/lib/readline/text.c
-+++ bash-3.0/lib/readline/text.c
-@@ -1113,6 +1113,9 @@
-       rl_delete_text (start, rl_point);
-       rl_point = start;
-     }
-+  /* check for arithmetic overflow */
-+  if (rl_point < 0)
-+    rl_point = 0;
-   return 0;
- }
- 
---- bash-3.0/Makefile.in
-+++ bash-3.0/Makefile.in
-@@ -656,7 +656,7 @@
- 
- config.h:	stamp-h 
- 
--stamp-h:	config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
-+stamp-h:	version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
- 	CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
- 
- config.status:	$(srcdir)/configure
-@@ -664,7 +664,7 @@
- 
- # comment out for distribution
- $(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
--	cd $(srcdir) && autoconf
-+	cd $(srcdir)
- 
- # for chet
- reconfig: force
---- bash-3.0/parse.y
-+++ bash-3.0/parse.y
-@@ -388,7 +388,9 @@
- 			}
- 	;
- 
--word_list:	WORD
-+word_list:
-+			{ $$ = (WORD_LIST *)NULL; }
-+	|	WORD
- 			{ $$ = make_word_list ($1, (WORD_LIST *)NULL); }
- 	|	word_list WORD
- 			{ $$ = make_word_list ($2, $1); }
-@@ -1180,7 +1182,7 @@
- 
- #if defined (READLINE)
- char *current_readline_prompt = (char *)NULL;
--char *current_readline_line = (char *)NULL;
-+unsigned char *current_readline_line = (unsigned char *)NULL;
- int current_readline_line_index = 0;
- 
- static int
---- bash-3.0/shell.c
-+++ bash-3.0/shell.c
-@@ -1089,7 +1089,7 @@
-   if (restricted)
-     return 1;
-   temp = base_pathname (name);
--  return (STREQ (temp, RESTRICTED_SHELL_NAME));
-+  return ( (STREQ (temp, RESTRICTED_SHELL_NAME)) || (STREQ (temp, ("-"RESTRICTED_SHELL_NAME))) );
- }
- 
- /* Perhaps make this shell a `restricted' one, based on NAME.  If the
diff --git a/app-shells/bash/files/bash-3.0-histtimeformat.patch b/app-shells/bash/files/bash-3.0-histtimeformat.patch
deleted file mode 100644
index b910600fd896..000000000000
--- a/app-shells/bash/files/bash-3.0-histtimeformat.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Ripped from Debian
-
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00008.html
-
-From: Enrique Perez-Terron <enrio@online.no>
-To: bug-bash@gnu.org
-Subject: When using HISTTIMEFORMAT, the date and the command are run
-	together.
-Date: Sun, 01 Aug 2004 18:36:45 +0200
-
-Configuration Information [Automatically generated, do not change]:
-Machine: i586
-OS: linux-gnu
-Compiler: gcc
-Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='i586'
--DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i586-pc-linux-gnu'
--DCONF_VENDOR='pc' -DLOCALEDIR='/usr/local/share/locale'
--DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H  -I.  -I. -I./include -I./lib  
--g -O2
-uname output: Linux arabia.home.lan 2.6.6-1.435.2.3 #1 Thu Jul 1
-09:11:28 EDT 2004 i586 i586 i386 GNU/Linux
-Machine Type: i586-pc-linux-gnu
-
-# DP: Add space separating the time and the command in the
-# DP: output from the history builtin command.
-
-Bash Version: 3.0
-Patch Level: 0
-Release Status: release
-
-Description:
-	There is no space separating the time and the command in the 
-	output from the history builtin command.
-
-Repeat-By:
-	$ export HISTTIMEFORMAT=_A_format_string_
-	$ history 3
-	  997  _A_format_string_echo $BASH_VERSION
-	  998  _A_format_string_export HISTTIMEFORMAT=_A_format_string_
-	  999  _A_format_string_history 3
-
-Fix:
---- ./builtins/history.def.orig	2003-12-20 00:02:09.000000000 +0100
-+++ ./builtins/history.def	2004-08-01 18:18:02.652720102 +0200
-@@ -287,9 +287,10 @@
- 	  QUIT;
- 
- 	  timestr = (histtimefmt && *histtimefmt) ? histtime (hlist[i], histtimefmt) : (char *)NULL;
--	  printf ("%5d%c %s%s\n", i + history_base,
-+	  printf ("%5d%c %s%s%s\n", i + history_base,
- 		  histdata(i) ? '*' : ' ',
- 		  ((timestr && *timestr) ? timestr : ""),
-+		  ((timestr && *timestr) ? " " : ""),
- 		  histline(i));
- 	  i++;
- 	}
diff --git a/app-shells/bash/files/bash-3.0-invisible.patch b/app-shells/bash/files/bash-3.0-invisible.patch
deleted file mode 100644
index bfc5f9b23518..000000000000
--- a/app-shells/bash/files/bash-3.0-invisible.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix the bug reported by Alexander Skwar:
-bash applies all invisible characters to the first line instead of the ones 
-that actually (dis)appear in that line.  I've also pushed this upstream.
-
-http://bugs.gentoo.org/36393
-
---- bash-3.0/lib/readline/display.c
-+++ bash-3.0/lib/readline/display.c
-@@ -258,23 +258,21 @@
- #endif
- 	    {
- 	      *r++ = *p;
--	      if (!ignoring)
-+	      if (!ignoring) 
- 		rl++;			/* visible length byte counter */
--	      else
--		ninvis++;		/* invisible chars byte counter */
-+	      else 
-+		{
-+		  ninvis++;		/* invisible chars byte counter */
-+		  if (rl < _rl_screenwidth)
-+		    invfl = ninvis;
-+		}
- 	    }
- 
--	  if (rl >= _rl_screenwidth)
--	    invfl = ninvis;
--
- 	  if (ignoring == 0)
- 	    physchars++;
- 	}
-     }
- 
--  if (rl < _rl_screenwidth)
--    invfl = ninvis;
--
-   *r = '\0';
-   if (lp)
-     *lp = rl;
diff --git a/app-shells/bash/files/bash-3.0-jobs.patch b/app-shells/bash/files/bash-3.0-jobs.patch
deleted file mode 100644
index 72c149c71cf5..000000000000
--- a/app-shells/bash/files/bash-3.0-jobs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Ripped from Fedora
-
-* Wed Sep  8 2004 Tim Waugh <twaugh@redhat.com> 3.0-13
-- Check for EINVAL from waitpid() and avoid WCONTINUED in that case.
-- Fixed jobs4 test.
-
-From: 	Tim Waugh
-Subject: 	[patch] bash-3.0: avoid WCONTINUED if invalid
-Date: 	Wed, 8 Sep 2004 16:52:38 +0100
-User-agent: 	Mutt/1.4.1i
-
-Hi,
-
-GNU libc defines WCONTINUED, but (at least on Linux 2.4.x kernels)
-waitpid() returns -1 with errno set to EINVAL if WCONTINUED is
-supplied in options.
-
-Here is a patch to retry without WCONTINUED set in that case.
-
-Tim.
-
---- bash-3.0/tests/jobs4.sub
-+++ bash-3.0/tests/jobs4.sub
-@@ -18,5 +18,5 @@
- 
- wait
- 
--cat &
-+sleep 100 &
- kill -1 %% && echo i killed it || echo could not kill it
---- bash-3.0/jobs.c
-+++ bash-3.0/jobs.c
-@@ -2475,6 +2475,7 @@
-   PROCESS *child;
-   pid_t pid;
-   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
-+  static int wcontinued_not_supported = 0;
- 
-   call_set_current = children_exited = 0;
-   last_stopped_job = NO_JOB;
-@@ -2488,7 +2489,15 @@
- 			: 0;
-       if (sigchld || block == 0)
- 	waitpid_flags |= WNOHANG;
-+    retry:
-+      if (wcontinued_not_supported)
-+	waitpid_flags &= ~WCONTINUED;
-       pid = WAITPID (-1, &status, waitpid_flags);
-+      if (pid == -1 && errno == EINVAL)
-+	{
-+	  wcontinued_not_supported = 1;
-+	  goto retry;
-+	}
- 
-       /* The check for WNOHANG is to make sure we decrement sigchld only
- 	 if it was non-zero before we called waitpid. */
diff --git a/app-shells/bash/files/bash-3.0-local-array.patch b/app-shells/bash/files/bash-3.0-local-array.patch
deleted file mode 100644
index 82be7762ae1b..000000000000
--- a/app-shells/bash/files/bash-3.0-local-array.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix from Chet Ramey (bash maintainer) to prevent segfault
-
-http://bugs.gentoo.org/58961
-
-*** ../bash-3.0/arrayfunc.c	Fri Dec 19 00:03:09 2003
---- arrayfunc.c	Sun Aug  1 20:43:00 2004
-***************
-*** 612,616 ****
-  
-    free (t);
-!   return var;
-  }
-  
---- 612,616 ----
-  
-    free (t);
-!   return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var;
-  }
-  
diff --git a/app-shells/bash/files/bash-3.0-locale.patch b/app-shells/bash/files/bash-3.0-locale.patch
deleted file mode 100644
index ea1ef3deae36..000000000000
--- a/app-shells/bash/files/bash-3.0-locale.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Ripped from SuSe
-
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00005.html
-
-From: schwab@suse.de
-To: bug-bash@gnu.org
-Subject: HISTTIMEFORMAT doesn't track locale changes
-Date: Sun,  1 Aug 2004 11:14:00 +0200 (CEST)
-
-Configuration Information [Automatically generated, do not change]:
-Machine: ia64
-OS: linux-gnu
-Compiler: gcc
-Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='ia64' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='ia64-unknown-linux-gnu' -DCONF_VENDOR='unknown' -DLOCALEDIR='/usr/local/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H  -I.  -I../bash-3.0 -I../bash-3.0/include -I../bash-3.0/lib   -O2 -g
-uname output: Linux sykes 2.6.5-22-default #1 SMP Fri Jul 2 13:43:23 UTC 2004 ia64 ia64 ia64 GNU/Linux
-Machine Type: ia64-unknown-linux-gnu
-
-Bash Version: 3.0
-Patch Level: 0
-Release Status: release
-
-Description:
-Bash doesn't use the current locale when formatting HISTTIMEFORMAT.
-
-Repeat-By:
-sykes:/tmp/bash/Build/:[0]$ locale
-LANG=de_DE.UTF-8
-LC_CTYPE="de_DE.UTF-8"
-LC_NUMERIC=POSIX
-LC_TIME=POSIX
-LC_COLLATE=POSIX
-LC_MONETARY="de_DE.UTF-8"
-LC_MESSAGES=en_US.UTF-8
-LC_PAPER="de_DE.UTF-8"
-LC_NAME="de_DE.UTF-8"
-LC_ADDRESS="de_DE.UTF-8"
-LC_TELEPHONE="de_DE.UTF-8"
-LC_MEASUREMENT="de_DE.UTF-8"
-LC_IDENTIFICATION="de_DE.UTF-8"
-LC_ALL=
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1502  history 1
-sykes:/tmp/bash/Build/:[0]$ HISTTIMEFORMAT=%c
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1504  Sun Aug  1 10:56:59 2004history 1
-sykes:/tmp/bash/Build/:[0]$ export LC_TIME=$LANG
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1506  Sun Aug  1 10:57:24 2004history 1
-
---- bash-3.0/locale.c
-+++ bash-3.0/locale.c
-@@ -71,9 +71,10 @@ set_default_locale ()
-   textdomain (PACKAGE);
- }
- 
--/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES and LC_NUMERIC
--   if they are not specified in the environment, but LC_ALL is.  This
--   should be called from main() after parsing the environment. */
-+/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES, LC_NUMERIC
-+   and LC_TIME if they are not specified in the environment, but LC_ALL
-+   is.  This should be called from main() after parsing the
-+   environment. */
- void
- set_default_locale_vars ()
- {
-@@ -109,6 +110,12 @@ set_default_locale_vars ()
-     setlocale (LC_NUMERIC, lc_all);
- #  endif /* LC_NUMERIC */
- 
-+#  if defined (LC_TIME)
-+  val = get_string_value ("LC_TIME");
-+  if (val == 0 && lc_all && *lc_all)
-+    setlocale (LC_TIME, lc_all);
-+#  endif /* LC_TIME */
-+
- #endif /* HAVE_SETLOCALE */
- 
-   val = get_string_value ("TEXTDOMAIN");
-@@ -213,6 +220,13 @@ set_locale_var (var, value)
- 	return (setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC")) != 0);
- #  endif /* LC_NUMERIC */
-     }
-+  else if (var[3] == 'T' && var[4] == 'I')	/* LC_TIME */
-+    {
-+#  if defined (LC_TIME)
-+      if (lc_all == 0 || *lc_all == '\0')
-+	return (setlocale (LC_TIME, get_locale_var ("LC_TIME")) != 0);
-+#  endif /* LC_TIME */
-+    }
- #endif /* HAVE_SETLOCALE */
- 
-   return (0);
-@@ -285,6 +299,9 @@ reset_locale_vars ()
- #  if defined (LC_NUMERIC)
-   setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC"));
- #  endif
-+#  if defined (LC_TIME)
-+  setlocale (LC_TIME, get_locale_var ("LC_TIME"));
-+#  endif
- 
-   locale_setblanks ();  
- 
---- bash-3.0/variables.c
-+++ bash-3.0/variables.c
-@@ -3646,6 +3646,7 @@ static struct name_and_function special_
-   { "LC_CTYPE", sv_locale },
-   { "LC_MESSAGES", sv_locale },
-   { "LC_NUMERIC", sv_locale },
-+  { "LC_TIME", sv_locale },
- 
-   { "MAIL", sv_mail },
-   { "MAILCHECK", sv_mail },
diff --git a/app-shells/bash/files/bash-3.0-manpage.patch b/app-shells/bash/files/bash-3.0-manpage.patch
deleted file mode 100644
index 08e3143e5422..000000000000
--- a/app-shells/bash/files/bash-3.0-manpage.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ripped from Fedora
-
-fix obvious display bug
-
---- bash-3.0/doc/bash.1
-+++ bash-3.0/doc/bash.1
-@@ -3929,7 +3929,7 @@
- .B SIGHUP
- to all jobs when an interactive login shell exits.
- .PP
--If \Bbash\fP is waiting for a command to complete and receives a signal
-+If \fBbash\fP is waiting for a command to complete and receives a signal
- for which a trap has been set, the trap will not be executed until
- the command completes. 
- When \fBbash\fP is waiting for an asynchronous command via the \fBwait\fP
diff --git a/app-shells/bash/files/bash-3.0-multibyteifs.patch b/app-shells/bash/files/bash-3.0-multibyteifs.patch
deleted file mode 100644
index 1e74832b638a..000000000000
--- a/app-shells/bash/files/bash-3.0-multibyteifs.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Tim Waugh <twaugh@redhat.com>
-To: bug-bash@gnu.org
-Subject: [patch] multibyte IFS values
-Date: Tue, 24 Aug 2004 13:34:59 +0100
-
-Hi,
-
-Here is a patch to address these problems:
-
-http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00294.html
-http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00296.html
-
-It works well for me at least.
-
-Tim.
-
---- bash-3.0/subst.c.multibyteifs	2004-08-20 15:22:48.366497771 +0100
-+++ bash-3.0/subst.c	2004-08-20 18:13:30.833624616 +0100
-@@ -124,7 +124,12 @@
- SHELL_VAR *ifs_var;
- char *ifs_value;
- unsigned char ifs_cmap[UCHAR_MAX + 1];
-+#if defined (HANDLE_MULTIBYTE)
-+unsigned char ifs_firstc[MB_LEN_MAX];
-+size_t ifs_firstc_len;
-+#else
- unsigned char ifs_firstc;
-+#endif
- 
- /* Extern functions and variables from different files. */
- extern int last_command_exit_value, last_command_exit_signal;
-@@ -862,8 +867,14 @@
-      char *charlist;
- {
-   register int i = *sindex;
-+  size_t slen;
-+#if defined (HANDLE_MULTIBYTE)
-+  size_t clen;
-+  wchar_t *wcharlist = NULL;
-+#endif
-   int c;
-   char *temp;
-+  DECLARE_MBSTATE;
- 
-   if (charlist[0] == '\'' && charlist[1] == '\0')
-     {
-@@ -872,18 +883,65 @@
-       return temp;
-     }
- 
--  for (i = *sindex; c = string[i]; i++)
-+  slen = strlen (string + *sindex) + *sindex;
-+  i = *sindex;
-+#if defined (HANDLE_MULTIBYTE)
-+  clen = strlen (charlist);
-+#endif
-+  while ((c = string[i]))
-     {
-+#if defined (HANDLE_MULTIBYTE)
-+      size_t mblength;
-+#endif
-+
-       if (c == CTLESC)
- 	{
--	  i++;
-+	  i += 2;
- 	  continue;
- 	}
- 
-+#if defined (HANDLE_MULTIBYTE)
-+      mblength = mblen (string + i, slen - i);
-+      if (mblength > 1)
-+	{
-+	  wchar_t wc;
-+	  size_t mblength = mbtowc (&wc, string + i, slen - i);
-+	  if (MB_INVALIDCH (mblength))
-+	    {
-+	      if (MEMBER (c, charlist))
-+		break;
-+	    }
-+	  else
-+	    {
-+	      if (!wcharlist)
-+		{
-+		  size_t len = mbstowcs (wcharlist, charlist, 0);
-+		  if (len == -1)
-+		    len = 0;
-+		  wcharlist = xmalloc (sizeof (wchar_t) * (len + 1));
-+		  mbstowcs (wcharlist, charlist, 1 + len);
-+		}
-+
-+	      if (wcschr (wcharlist, wc))
-+		{
-+		  break;
-+		}
-+	    }
-+	}
-+      else
-+#endif
-+
-       if (MEMBER (c, charlist))
- 	break;
-+
-+      ADVANCE_CHAR (string, slen, i);
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (wcharlist)
-+    free (wcharlist);
-+#endif
-+
-   temp = substring (string, *sindex, i);
-   *sindex = i;
- 
-@@ -1456,11 +1514,36 @@
-   d2 = 0;
-   if (delims)
-     {
--      d2 = (char *)xmalloc (strlen (delims) + 1);
--      for (i = ts = 0; delims[i]; i++)
-+      size_t slength = strlen (delims);
-+#if defined (HANDLE_MULTIBYTE)
-+      size_t mblength = 1;
-+      DECLARE_MBSTATE;
-+#endif
-+
-+      d2 = (char *)xmalloc (slength + 1);
-+      i = ts = 0;
-+      while (delims[i])
- 	{
-+#if defined (HANDLE_MULTIBYTE)
-+	  mbstate_t state_bak = state;
-+	  mblength = mbrlen (delims + i, slength, &state);
-+
-+	  if (MB_INVALIDCH (mblength))
-+	    state = state_bak;
-+	  else if (mblength != 1)
-+	    {
-+	      memcpy (d2 + ts, delims + i, mblength);
-+	      ts += mblength;
-+	      i += mblength;
-+	      slength -= mblength;
-+	      continue;
-+	    }
-+#endif
-+
- 	  if (whitespace(delims[i]) == 0)
- 	    d2[ts++] = delims[i];
-+	  i++;
-+	  slength--;
- 	}
-       d2[ts] = '\0';
-     }
-@@ -1654,10 +1737,19 @@
- string_list_dollar_star (list)
-      WORD_LIST *list;
- {
-+#if defined (HANDLE_MULTIBYTE)
-+  char sep[MB_CUR_MAX + 1];
-+#else
-   char sep[2];
-+#endif
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  memcpy (sep, ifs_firstc, ifs_firstc_len);
-+  sep[ifs_firstc_len] = '\0';
-+#else
-   sep[0] = ifs_firstc;
-   sep[1] = '\0';
-+#endif
- 
-   return (string_list_internal (list, sep));
- }
-@@ -1676,14 +1768,41 @@
-      WORD_LIST *list;
-      int quoted;
- {
--  char *ifs, sep[2];
-+  char *ifs;
-+#if defined (HANDLE_MULTIBYTE)
-+  char sep[MB_CUR_MAX + 1];
-+#else
-+  char sep[2];
-+#endif
-   WORD_LIST *tlist;
- 
-   /* XXX this could just be ifs = ifs_value; */
-   ifs = ifs_var ? value_cell (ifs_var) : (char *)0;
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (ifs && *ifs)
-+    {
-+      size_t mblength = mblen (ifs, strnlen (ifs, MB_CUR_MAX));
-+      if (MB_INVALIDCH (mblength))
-+	{
-+	  sep[0] = *ifs;
-+	  sep[1] = '\0';
-+	}
-+      else
-+	{
-+	  memcpy (sep, ifs, mblength);
-+	  sep[mblength] = '\0';
-+	}
-+    }
-+  else
-+    {
-+      sep[0] = ' ';
-+      sep[1] = '\0';
-+    }
-+#else
-   sep[0] = (ifs == 0 || *ifs == 0) ? ' ' : *ifs;
-   sep[1] = '\0';
-+#endif
- 
-   tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0))
- 		? quote_list (list)
-@@ -1732,6 +1851,7 @@
-   WORD_DESC *t;
-   char *current_word, *s;
-   int sindex, sh_style_split, whitesep;
-+  size_t slen = 0;
- 
-   if (!string || !*string)
-     return ((WORD_LIST *)NULL);
-@@ -1805,7 +1925,12 @@
- 
-       /* Move past the current separator character. */
-       if (string[sindex])
--	sindex++;
-+	{
-+	  DECLARE_MBSTATE;
-+	  if (!slen)
-+	    slen = strlen (string);
-+	  ADVANCE_CHAR (string, slen, sindex);
-+	}
- 
-       /* Now skip sequences of space, tab, or newline characters if they are
- 	 in the list of separators. */
-@@ -6796,7 +6921,27 @@
-       ifs_cmap[uc] = 1;
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (!ifs_value)
-+    {
-+      ifs_firstc[0] = '\0';
-+      ifs_firstc_len = 1;
-+    }
-+  else
-+    {
-+      size_t ifs_len = strnlen (ifs_value, MB_CUR_MAX);
-+      ifs_firstc_len = mblen (ifs_value, ifs_len);
-+      if (MB_INVALIDCH (ifs_firstc_len))
-+        {
-+          ifs_firstc[0] = '\0';
-+          ifs_firstc_len = 1;
-+        }
-+      else
-+        memcpy (ifs_firstc, ifs_value, ifs_firstc_len);
-+    }
-+#else
-   ifs_firstc = ifs_value ? *ifs_value : 0;
-+#endif
- }
- 
- char *
---- bash-3.0/subst.h.multibyteifs	2004-08-20 15:51:08.301074583 +0100
-+++ bash-3.0/subst.h	2004-08-20 15:51:39.070206473 +0100
-@@ -231,7 +231,12 @@
- extern SHELL_VAR *ifs_var;
- extern char *ifs_value;
- extern unsigned char ifs_cmap[];
-+#if defined (HANDLE_MULTIBYTE)
-+extern unsigned char ifs_firstc[];
-+extern size_t ifs_firstc_len;
-+#else
- extern unsigned char ifs_firstc;
-+#endif
- 
- /* Evaluates to 1 if C is a character in $IFS. */
- #define isifs(c)	(ifs_cmap[(unsigned char)(c)] != 0)
diff --git a/app-shells/bash/files/bash-3.0-parallel.patch b/app-shells/bash/files/bash-3.0-parallel.patch
deleted file mode 100644
index 9ca82360b09d..000000000000
--- a/app-shells/bash/files/bash-3.0-parallel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- bash-3.0/lib/readline/Makefile.in.old	2003-12-10 12:01:39.000000000 -0500
-+++ bash-3.0/lib/readline/Makefile.in	2005-06-27 17:43:57.859826148 -0400
-@@ -115,7 +115,9 @@
- 
- ##########################################################################
- 
--all: libreadline.a libhistory.a
-+all:
-+	$(MAKE) libreadline.a
-+	$(MAKE) libhistory.a
- 
- libreadline.a: $(OBJECTS)
- 	$(RM) $@
diff --git a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
deleted file mode 100644
index 35b0b7d05924..000000000000
--- a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix an error when using pipes and PGRP_PIPE is enabled.
-( exec 3>&1; : `echo >&3` )
-bash: 3: Bad file descriptor
-
-http://bugs.gentoo.org/92349
-
-Patch from upstream
-
-*** jobs.c  Wed Sep  8 11:08:16 2004
---- jobs.c      Thu Jun 30 17:21:26 2005
-***************
-*** 3456,3459 ****
---- 3901,3907 ----
-    stop_making_children ();
-    start_pipeline ();
-+ #if defined (PGRP_PIPE)
-+   pipe_close (pgrp_pipe);
-+ #endif
-    delete_all_jobs (0);
-    set_job_control (0);
diff --git a/app-shells/bash/files/bash-3.0-posixtrap.patch b/app-shells/bash/files/bash-3.0-posixtrap.patch
deleted file mode 100644
index eaa4879dc43c..000000000000
--- a/app-shells/bash/files/bash-3.0-posixtrap.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Revert trap behavior for the sake of autoconf-generated configure scripts.  
-The problem here is that bash -c 'trap 0' works, but sh -c 'trap 0' doesn't 
-work because the bash developers are trying to adhere to POSIX in that case.  
-Since all the configure scripts are #!/bin/sh, this breaks them... That's bad
-news and will need some time to fix, so it's easier to fix here for the 
-moment.
-
-http://bugs.gentoo.org/58703
-
---- bash-3.0/builtins/trap.def.noposix	2004-07-28 22:38:38.000000000 -0400
-+++ bash-3.0/builtins/trap.def	2004-07-28 22:39:01.948314454 -0400
-@@ -122,12 +122,18 @@
- 
-       operation = SET;
-       first_arg = list->word->word;
-+#if 0
-       /* When in posix mode, the historical behavior of looking for a
- 	 missing first argument is disabled.  To revert to the original
- 	 signal handling disposition, use `-' as the first argument. */
-       if (posixly_correct == 0 && first_arg && *first_arg &&
- 		(*first_arg != '-' || first_arg[1]) &&
- 		signal_object_p (first_arg, opt) && list->next == 0)
-+#else
-+       if (first_arg && *first_arg &&
-+ 		(*first_arg != '-' || first_arg[1]) &&
-+ 		signal_object_p (first_arg, opt) && list->next == 0)
-+#endif
- 	operation = REVERT;
-       else
- 	{
diff --git a/app-shells/bash/files/bash-3.0-prompt.patch b/app-shells/bash/files/bash-3.0-prompt.patch
deleted file mode 100644
index 11ec1c00ac8e..000000000000
--- a/app-shells/bash/files/bash-3.0-prompt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Hack around this bug:
-
-http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00419.html
-
-not suitable for upstream; need a proper fix
-
-http://bugs.gentoo.org/108936
-http://bugs.gentoo.org/69407
-
---- lib/readline/display.c
-+++ lib/readline/display.c
-@@ -941,6 +941,7 @@
- 	  /* nleft == number of characters in the line buffer between the
- 	     start of the line and the cursor position. */
- 	  nleft = c_pos - pos;
-+#if 0
- 
- 	  /* Since _rl_backspace() doesn't know about invisible characters in the
- 	     prompt, and there's no good way to tell it, we compensate for
-@@ -954,6 +955,8 @@
- 		_rl_last_c_pos = nleft;
- 	    }
- 
-+#endif
-+
- 	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- 	    _rl_move_cursor_relative (nleft, &invisible_line[pos]);
- 	  else if (nleft != _rl_last_c_pos)
diff --git a/app-shells/bash/files/bash-3.0-pwd.patch b/app-shells/bash/files/bash-3.0-pwd.patch
deleted file mode 100644
index 77f0918fb4d8..000000000000
--- a/app-shells/bash/files/bash-3.0-pwd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Fedora
-
-* Tue Mar 15 2005 Tim Waugh <twaugh@redhat.com> 3.0-30
-- Fix PS1 expansion crash when PWD is unset (bg #151116).
-
---- bash-3.0/parse.y.pwd	2005-03-15 14:22:36.000000000 +0000
-+++ bash-3.0/parse.y	2005-03-15 14:22:37.000000000 +0000
-@@ -4103,7 +4103,7 @@
- #define ROOT_PATH(x)	((x)[0] == '/' && (x)[1] == 0)
- #define DOUBLE_SLASH_ROOT(x)	((x)[0] == '/' && (x)[1] == '/' && (x)[2] == 0)
- 		/* Abbreviate \W as ~ if $PWD == $HOME */
--		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, temp) == 0))
-+		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, t_string) == 0))
- 		  {
- 		    if (ROOT_PATH (t_string) == 0 && DOUBLE_SLASH_ROOT (t_string) == 0)
- 		      {
diff --git a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
deleted file mode 100644
index 466e45ae3004..000000000000
--- a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description:
-When using 'read -u 3' or the like, and the pipe-buf already contains
-more than one line, the first line is returned, and bytes up to the next
-multiple of 128 are skipped.
-
-http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00168.html
-http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00173.html
-http://bugs.gentoo.org/show_bug.cgi?id=87093
-
---- builtins/read.def
-+++ builtins/read.def
-@@ -276,7 +276,7 @@
-   input_is_tty = isatty (fd);
-   if (input_is_tty == 0)
- #ifndef __CYGWIN__
--    input_is_pipe = (lseek (0, 0L, SEEK_CUR) < 0) && (errno == ESPIPE);
-+    input_is_pipe = (lseek (fd, 0L, SEEK_CUR) < 0) && (errno == ESPIPE);
- #else
-     input_is_pipe = 1;
- #endif
diff --git a/app-shells/bash/files/bash-3.0-read-e-segfault.patch b/app-shells/bash/files/bash-3.0-read-e-segfault.patch
deleted file mode 100644
index e578631c424e..000000000000
--- a/app-shells/bash/files/bash-3.0-read-e-segfault.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-> Hmm, a better patch for this seems to be:
-
-I installed this patch a while back:
-
-*** ../bash-3.0-patched/lib/readline/display.c	Wed Sep  8 11:07:51 2004
---- lib/readline/display.c	Fri Nov 12 13:31:42 2004
-***************
-*** 336,340 ****
-  
-    local_prompt = local_prompt_prefix = (char *)0;
-!   prompt_last_invisible = prompt_visible_length = 0;
-  
-    if (prompt == 0 || *prompt == 0)
---- 341,346 ----
-  
-    local_prompt = local_prompt_prefix = (char *)0;
-!   prompt_last_invisible = prompt_invis_chars_first_line = 0;
-!   prompt_visible_length = prompt_physical_chars = 0;
-  
-    if (prompt == 0 || *prompt == 0)
-
--- 
-``The lyf so short, the craft so long to lerne.'' - Chaucer
-( ``Discere est Dolere'' -- chet )
-						Live...Laugh...Love
-Chet Ramey, ITS, CWRU    chet@po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
diff --git a/app-shells/bash/files/bash-3.0-rl-display.patch b/app-shells/bash/files/bash-3.0-rl-display.patch
deleted file mode 100644
index 77e0f33456b7..000000000000
--- a/app-shells/bash/files/bash-3.0-rl-display.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-Ripped from Debian
-
-# DP: Fix bug utilising the ``reverse-search-history'' feature of the readline
-# DP: library, if the search string matches a previously entered command (ie
-# DP: history) and must overflow the current screen width.
-
-From: Chet Ramey <chet@caleb.ins.cwru.edu>
-To: doko@cs.tu-berlin.de
-Cc: chet@po.cwru.edu
-Subject: Re: Bug#288940: bash-3.0 segfault in readline when Control-R'ing long lines (forwarded from epl@unimelb.edu.au)
-Date: Tue, 11 Jan 2005 15:25:15 -0500
-
-> Chet Ramey writes:
-> > > Package: bash
-> > > Version: 3.0-12
-> > > Severity: normal
-> > > Tags: sid
-> > > 
-> > > I have found a bug where Debian unstable's bash-3.0 will segfault when
-> > > utilising the ``reverse-search-history'' feature of the readline library.
-> > > In particular, the search string must match a previously entered command
-> > > (ie history) and must overflow the current screen width.
-> > 
-> > Thanks, I fixed this one.
-> 
-> as this is a segfault, could you provide the patch?
-
-The changes in display.c are extensive enough that it is a fairly large patch.
-Here are the essentials.  I will more than likely not be releasing this as an
-official patch.
-
-Chet
-
-*** ../bash-3.0-patched/lib/readline/display.c	Wed Sep  8 11:07:51 2004
---- lib/readline/display.c	Sat Jan  8 21:51:40 2005
-***************
-*** 181,184 ****
---- 186,201 ----
-  static int prompt_physical_chars;
-  
-+ /* Variables to save and restore prompt and display information. */
-+ 
-+ /* These are getting numerous enough that it's time to create a struct. */
-+ 
-+ static char *saved_local_prompt;
-+ static char *saved_local_prefix;
-+ static int saved_last_invisible;
-+ static int saved_visible_length;
-+ static int saved_prefix_length;
-+ static int saved_invis_chars_first_line;
-+ static int saved_physical_chars;
-+ 
-  /* Expand the prompt string S and return the number of visible
-     characters in *LP, if LP is not null.  This is currently more-or-less
-***************
-*** 1797,1803 ****
-    return ((ISPRINT (uc)) ? 1 : 2);
-  }
-- 
-  /* How to print things in the "echo-area".  The prompt is treated as a
-     mini-modeline. */
-  
-  #if defined (USE_VARARGS)
---- 1825,1831 ----
-    return ((ISPRINT (uc)) ? 1 : 2);
-  }
-  /* How to print things in the "echo-area".  The prompt is treated as a
-     mini-modeline. */
-+ static int msg_saved_prompt = 0;
-  
-  #if defined (USE_VARARGS)
-***************
-*** 1830,1835 ****
---- 1858,1874 ----
-    va_end (args);
-  
-+   if (saved_local_prompt == 0)
-+     {
-+       rl_save_prompt ();
-+       msg_saved_prompt = 1;
-+     }
-    rl_display_prompt = msg_buf;
-+   local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
-+ 					 &prompt_last_invisible,
-+ 					 &prompt_invis_chars_first_line,
-+ 					 &prompt_physical_chars);
-+   local_prompt_prefix = (char *)NULL;
-    (*rl_redisplay_function) ();
-+ 
-    return 0;
-  }
-***************
-*** 1841,1846 ****
---- 1880,1897 ----
-    sprintf (msg_buf, format, arg1, arg2);
-    msg_buf[sizeof(msg_buf) - 1] = '\0';	/* overflow? */
-+ 
-    rl_display_prompt = msg_buf;
-+   if (saved_local_prompt == 0)
-+     {
-+       rl_save_prompt ();
-+       msg_saved_prompt = 1;
-+     }
-+   local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
-+ 					 &prompt_last_invisible,
-+ 					 &prompt_invis_chars_first_line,
-+ 					 &prompt_physical_chars);
-+   local_prompt_prefix = (char *)NULL;
-    (*rl_redisplay_function) ();
-+       
-    return 0;
-  }
-***************
-*** 1852,1855 ****
---- 1903,1911 ----
-  {
-    rl_display_prompt = rl_prompt;
-+   if (msg_saved_prompt)
-+     {
-+       rl_restore_prompt ();
-+       msg_saved_prompt = 0;
-+     }
-    (*rl_redisplay_function) ();
-    return 0;
-***************
-*** 1866,1878 ****
-  }
-  
-- /* These are getting numerous enough that it's time to create a struct. */
-- 
-- static char *saved_local_prompt;
-- static char *saved_local_prefix;
-- static int saved_last_invisible;
-- static int saved_visible_length;
-- static int saved_invis_chars_first_line;
-- static int saved_physical_chars;
-- 
-  void
-  rl_save_prompt ()
---- 1922,1925 ----
-***************
-*** 1880,1883 ****
---- 1927,1931 ----
-    saved_local_prompt = local_prompt;
-    saved_local_prefix = local_prompt_prefix;
-+   saved_prefix_length = prompt_prefix_length;
-    saved_last_invisible = prompt_last_invisible;
-    saved_visible_length = prompt_visible_length;
-***************
-*** 1886,1890 ****
-  
-    local_prompt = local_prompt_prefix = (char *)0;
-!   prompt_last_invisible = prompt_visible_length = 0;
-    prompt_invis_chars_first_line = prompt_physical_chars = 0;
-  }
---- 1934,1938 ----
-  
-    local_prompt = local_prompt_prefix = (char *)0;
-!   prompt_last_invisible = prompt_visible_length = prompt_prefix_length = 0;
-    prompt_invis_chars_first_line = prompt_physical_chars = 0;
-  }
-***************
-*** 1898,1905 ****
---- 1946,1959 ----
-    local_prompt = saved_local_prompt;
-    local_prompt_prefix = saved_local_prefix;
-+   prompt_prefix_length = saved_prefix_length;
-    prompt_last_invisible = saved_last_invisible;
-    prompt_visible_length = saved_visible_length;
-    prompt_invis_chars_first_line = saved_invis_chars_first_line;
-    prompt_physical_chars = saved_physical_chars;
-+ 
-+   /* can test saved_local_prompt to see if prompt info has been saved. */
-+   saved_local_prompt = saved_local_prefix = (char *)0;
-+   saved_last_invisible = saved_visible_length = saved_prefix_length = 0;
-+   saved_invis_chars_first_line = saved_physical_chars = 0;
-  }
-  
-
-
--- 
-``The lyf so short, the craft so long to lerne.'' - Chaucer
-( ``Discere est Dolere'' -- chet )
-						Live...Laugh...Love
-Chet Ramey, ITS, CWRU    chet@po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
diff --git a/app-shells/bash/files/bash-3.0-rl-self-insert.patch b/app-shells/bash/files/bash-3.0-rl-self-insert.patch
deleted file mode 100644
index 778935edaa63..000000000000
--- a/app-shells/bash/files/bash-3.0-rl-self-insert.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Ripped from Debian
-
-# DP: Fix readline self-insert command
-
-From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: Bug#290103: readline provided with bash: self-insert doesn't work correctly
-Date: Wed, 12 Jan 2005 20:35:17 +0100
-
-Package: bash3
-Version: 3.0-10
-Severity: normal
-Tags: patch
-
-Hello,
-having the following in .inputrc:
-
-$if Bash
-    ",2": " 2>&1"
-    ",n": " 2>/dev/null"
-    ",t": "/var/tmp/sithglan/"
-    ",b": "/opt/build/thomas/"
-    ",": self-insert
-$endif
-
-should expand ,2 to " 2>&1" but , still to ','. This isn't the case and
-I asked bash maintainer Chet Ramey to fix it and he did it. :-) The
-following patch will ship with the next version of bash.
-
-> > That is a bug in the released version of readline-5.0.  Shadow keymaps
-> > are implemented by using an extra character.  When a `shadowed' key
-> > (the `,' in your case) is bound to self-insert, the 5.0 code was
-> > trying to insert the extra character (256) rather than the `,'.
-
-*** bash-20050106.orig/lib/readline/readline.c	Fri Oct 15 14:36:55 2004
---- bash/lib/readline/readline.c	Sat Jan  8 23:51:44 2005
-***************
-*** 657,665 ****
-  	       the input queue with _rl_unget_char. */
-  	    {
-- #if 0
-- 	      r = _rl_dispatch (ANYOTHERKEY, FUNCTION_TO_KEYMAP (map, key));
-- #else
-- 	      /* XXX - experimental code -- might never be executed.  Save
-- 		 for later. */
-  	      Keymap m = FUNCTION_TO_KEYMAP (map, key);
-  	      int type = m[ANYOTHERKEY].type;
---- 657,660 ----
-***************
-*** 667,673 ****
-  	      if (type == ISFUNC && func == rl_do_lowercase_version)
-  		r = _rl_dispatch (_rl_to_lower (key), map);
-  	      else
-  		r = _rl_dispatch (ANYOTHERKEY, m);
-- #endif
-  	    }
-  	  else if (r && map[ANYOTHERKEY].function)
---- 662,681 ----
-  	      if (type == ISFUNC && func == rl_do_lowercase_version)
-  		r = _rl_dispatch (_rl_to_lower (key), map);
-+ 	      else if (type == ISFUNC && func == rl_insert)
-+ 		{
-+ 		  /* If the function that was shadowed was self-insert, we
-+ 		     somehow need a keymap with map[key].func == self-insert.
-+ 		     Let's use this one. */
-+ 		  int nt = m[key].type;
-+ 		  rl_command_func_t *nf = m[key].function;
-+ 
-+ 		  m[key].type = type;
-+ 		  m[key].function = func;
-+ 		  r = _rl_dispatch (key, m);
-+ 		  m[key].type = nt;
-+ 		  m[key].function = nf;
-+ 		}
-  	      else
-  		r = _rl_dispatch (ANYOTHERKEY, m);
-  	    }
-  	  else if (r && map[ANYOTHERKEY].function)
-
diff --git a/app-shells/bash/files/bash-3.0-strnlen.patch b/app-shells/bash/files/bash-3.0-strnlen.patch
deleted file mode 100644
index afe972826542..000000000000
--- a/app-shells/bash/files/bash-3.0-strnlen.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-Index: bash-3.0/configure.in
-===================================================================
---- bash-3.0.orig/configure.in
-+++ bash-3.0/configure.in
-@@ -613,6 +613,9 @@ if test "$ac_cv_func_vprintf" = no && te
-   AC_LIBOBJ(vprint)
- fi
- 
-+AC_CHECK_FUNCS([strnlen])
-+AC_LIBOBJ(strnlen)
-+
- dnl signal stuff
- AC_TYPE_SIGNAL
- 
-Index: bash-3.0/lib/sh/strnlen.c
-===================================================================
---- /dev/null
-+++ bash-3.0/lib/sh/strnlen.c
-@@ -0,0 +1,27 @@
-+/*
-+  Copyright (C) 2005 Gentoo Foundation
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version 2
-+  of the License, or (at your option) any later version.
-+
-+  This program is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US 
-+*/
-+
-+#include <stdlib.h>
-+
-+size_t strnlen(const char *s, size_t n)
-+{
-+        int i;
-+        for (i=0; s[i] && i<n; i++)
-+                /* noop */ ;
-+        return i;
-+}
-Index: bash-3.0/configure
-===================================================================
---- bash-3.0.orig/configure
-+++ bash-3.0/configure
-@@ -10696,9 +10696,127 @@ _ACEOF
- fi
- 
- if test "$ac_cv_func_vprintf" = no && test "$ac_cv_func__doprnt" = "yes"; then
--  LIBOBJS="$LIBOBJS vprint.$ac_objext"
-+  case $LIBOBJS in
-+    "vprint.$ac_objext"   | \
-+  *" vprint.$ac_objext"   | \
-+    "vprint.$ac_objext "* | \
-+  *" vprint.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS vprint.$ac_objext" ;;
-+esac
-+
- fi
- 
-+
-+for ac_func in strnlen
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+case $LIBOBJS in
-+    "strnlen.$ac_objext"   | \
-+  *" strnlen.$ac_objext"   | \
-+    "strnlen.$ac_objext "* | \
-+  *" strnlen.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" ;;
-+esac
-+
-+
- echo "$as_me:$LINENO: checking return type of signal handlers" >&5
- echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
- if test "${ac_cv_type_signal+set}" = set; then
diff --git a/app-shells/bash/files/bash-3.0-subshell.patch b/app-shells/bash/files/bash-3.0-subshell.patch
deleted file mode 100644
index a1d7dfe7d342..000000000000
--- a/app-shells/bash/files/bash-3.0-subshell.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ripped from Fedora which took this from upstream
-
-* Tue Nov 22 2005 Tim Waugh <twaugh@redhat.com>  3.0-37
-- Applied patch from upstream to fix parsing problem (bug #146638).
-
-http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146638
-
---- bash-3.0/parse.y.subshell	2005-11-22 13:19:11.000000000 +0000
-+++ bash-3.0/parse.y	2005-11-22 13:19:24.000000000 +0000
-@@ -2055,14 +2055,6 @@
-   if (uc)
-     shell_input_line_index++;
- 
--  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
--    {
--	if (SHOULD_PROMPT ())
--	  prompt_again ();
--	line_number++;
--	goto restart_read;
--    }
--
- #if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
-   /* If UC is NULL, we have reached the end of the current input string.  If
-      pushed_string_list is non-empty, it's time to pop to the previous string
-@@ -2078,6 +2070,14 @@
-     }
- #endif /* ALIAS || DPAREN_ARITHMETIC */
- 
-+  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
-+    {
-+	if (SHOULD_PROMPT ())
-+	  prompt_again ();
-+	line_number++;
-+	goto restart_read;
-+    }
-+
-   if (!uc && shell_input_line_terminator == EOF)
-     return ((shell_input_line_index != 0) ? '\n' : EOF);
- 
diff --git a/app-shells/bash/files/bash-3.0-ulimit.patch b/app-shells/bash/files/bash-3.0-ulimit.patch
deleted file mode 100644
index 8202b95d2769..000000000000
--- a/app-shells/bash/files/bash-3.0-ulimit.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Ripped from Fedora
-
---- bash-3.0/builtins/ulimit.def
-+++ bash-3.0/builtins/ulimit.def
-@@ -34,15 +34,20 @@
-     -a	all current limits are reported
-     -c	the maximum size of core files created
-     -d	the maximum size of a process's data segment
-+    -e	the maximum scheduling priority (`nice')
-     -f	the maximum size of files created by the shell
-+    -i	the maximum number of pending signals
-     -l	the maximum size a process may lock into memory
-     -m	the maximum resident set size
-     -n	the maximum number of open file descriptors
-     -p	the pipe buffer size
-+    -q	the maximum number of bytes in POSIX message queues
-+    -r	the maximum rt priority
-     -s	the maximum stack size
-     -t	the maximum amount of cpu time in seconds
-     -u	the maximum number of user processes
-     -v	the size of virtual memory 
-+    -x	the maximum number of file locks
- 
- If LIMIT is given, it is the new value of the specified resource;
- the special LIMIT values `soft', `hard', and `unlimited' stand for
-@@ -199,7 +204,13 @@
- #ifdef RLIMIT_DATA
-   { 'd',	RLIMIT_DATA,  1024,	"data seg size",	"kbytes" },
- #endif
-+#ifdef RLIMIT_NICE
-+  { 'e',	RLIMIT_NICE, 1,		"max nice",		(char *)NULL},
-+#endif /* RLIMIT_NICE */
-   { 'f',	RLIMIT_FILESIZE, 1024,	"file size",		"blocks" },
-+#ifdef RLIMIT_SIGPENDING
-+  { 'i',	RLIMIT_SIGPENDING, 1,	"pending signals",	(char *)NULL},
-+#endif
- #ifdef RLIMIT_MEMLOCK
-   { 'l',	RLIMIT_MEMLOCK, 1024,	"max locked memory",	"kbytes" },
- #endif
-@@ -208,6 +219,12 @@
- #endif /* RLIMIT_RSS */
-   { 'n',	RLIMIT_OPENFILES, 1,	"open files",		(char *)NULL},
-   { 'p',	RLIMIT_PIPESIZE, 512,	"pipe size", 		"512 bytes" },
-+#ifdef RLIMIT_MSGQUEUE
-+  { 'q',	RLIMIT_MSGQUEUE, 1,	"POSIX message queues",	"bytes" },
-+#endif
-+#ifdef RLIMIT_RTPRIO
-+  { 'r',	RLIMIT_RTPRIO, 1,	"max rt priority",	(char *)NULL},
-+#endif /* RLIMIT_RTPRIO */
- #ifdef RLIMIT_STACK
-   { 's',	RLIMIT_STACK, 1024,	"stack size",		"kbytes" },
- #endif
-@@ -221,6 +238,9 @@
- #ifdef RLIMIT_SWAP
-   { 'w',	RLIMIT_SWAP,	1024,	"swap size",		"kbytes" },
- #endif
-+#ifdef RLIMIT_LOCKS
-+  { 'x',	RLIMIT_LOCKS, 1,	"file locks",		(char *)NULL},
-+#endif
-   { -1, -1, -1, (char *)NULL, (char *)NULL }
- };
- #define NCMDS	(sizeof(limits) / sizeof(limits[0]))
-@@ -647,11 +667,11 @@
- 
-   for (i = 0; limits[i].option > 0; i++)
-     {
--      if (get_limit (i, &softlim, &hardlim) < 0)
-+      if (get_limit (i, &softlim, &hardlim) == 0)
-+	printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
-+      else if (errno != EINVAL)
- 	builtin_error ("%s: cannot get limit: %s", limits[i].description,
- 						   strerror (errno));
--      else
--	printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
-     }
- }
- 
-@@ -670,7 +690,7 @@
-       else
-         sprintf (unitstr, "(-%c) ", limits[limind].option);
- 
--      printf ("%-18s %16s", limits[limind].description, unitstr);
-+      printf ("%-20s %16s", limits[limind].description, unitstr);
-     }
-   if (curlim == RLIM_INFINITY)
-     puts ("unlimited");
---- bash-3.0/doc/bashref.texi
-+++ bash-3.0/doc/bashref.texi
-@@ -3793,7 +3793,7 @@
- @item ulimit
- @btindex ulimit
- @example
--ulimit [-acdflmnpstuvSH] [@var{limit}]
-+ulimit [-acdeflmnpqrstuvxSH] [@var{limit}]
- @end example
- @code{ulimit} provides control over the resources available to processes
- started by the shell, on systems that allow such control.  If an
-@@ -3814,9 +3814,15 @@
- @item -d
- The maximum size of a process's data segment.
- 
-+@item -e
-+The maximum scheduling priority.
-+
- @item -f
- The maximum size of files created by the shell.
- 
-+@item -i
-+The maximum number of pending signals.
-+
- @item -l
- The maximum size that may be locked into memory.
- 
-@@ -3829,6 +3835,12 @@
- @item -p
- The pipe buffer size.
- 
-+@item -q
-+The maximum number of bytes in POSIX message queues.
-+
-+@item -r
-+The maximum RT priority.
-+
- @item -s
- The maximum stack size.
- 
-@@ -3841,6 +3853,9 @@
- @item -v
- The maximum amount of virtual memory available to the process.
- 
-+@item -x
-+The maximum amount of file locks.
-+
- @end table
- 
- If @var{limit} is given, it is the new value of the specified resource;
---- bash-3.0/doc/bash.1
-+++ bash-3.0/doc/bash.1
-@@ -8362,7 +8362,7 @@
- returns true if any of the arguments are found, false if
- none are found.
- .TP
--\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
-+\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]]
- Provides control over the resources available to the shell and to
- processes started by it, on systems that allow such control.
- The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
-@@ -8398,9 +8398,15 @@
- .B \-d
- The maximum size of a process's data segment
- .TP
-+.B \-e
-+The maximum scheduling priority (`nice')
-+.TP
- .B \-f
- The maximum size of files created by the shell
- .TP
-+.B \-i
-+The maximum number of pending signals
-+.TP
- .B \-l
- The maximum size that may be locked into memory
- .TP
-@@ -8414,6 +8420,12 @@
- .B \-p
- The pipe size in 512-byte blocks (this may not be set)
- .TP
-+.B \-q
-+The maximum number of bytes in POSIX message queues
-+.TP
-+.B \-r
-+The maximum rt priority
-+.TP
- .B \-s
- The maximum stack size
- .TP
-@@ -8425,6 +8437,9 @@
- .TP
- .B \-v
- The maximum amount of virtual memory available to the shell
-+.TP
-+.B \-x
-+The maximum number of file locks
- .PD
- .PP
- If
diff --git a/app-shells/bash/files/bash-3.0-utf8.patch b/app-shells/bash/files/bash-3.0-utf8.patch
deleted file mode 100644
index 8f10db92d5e8..000000000000
--- a/app-shells/bash/files/bash-3.0-utf8.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Hack around this bug:
-
-http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00419.html
-
-not suitable for upstream; need a proper fix
-
-http://bugs.gentoo.org/108936
-http://bugs.gentoo.org/69407
-
---- bash-3.0/lib/readline/display.c
-+++ bash-3.0/lib/readline/display.c
-@@ -1414,7 +1414,7 @@
- 	      insert_some_chars (nfd, lendiff, col_lendiff);
- 	      _rl_last_c_pos += col_lendiff;
- 	    }
--	  else if (*ols == 0 && lendiff > 0)
-+	  else if ((MB_CUR_MAX == 1 || rl_byte_oriented != 0) && *ols == 0 && col_lendiff > 0)
- 	    {
- 	      /* At the end of a line the characters do not have to
- 		 be "inserted".  They can just be placed on the screen. */
---- bash-3.0/lib/readline/histexpand.c
-+++ bash-3.0/lib/readline/histexpand.c
-@@ -206,6 +206,7 @@
- 
-   /* Only a closing `?' or a newline delimit a substring search string. */
-   for (local_index = i; c = string[i]; i++)
-+  {
- #if defined (HANDLE_MULTIBYTE)
-     if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-       {
-@@ -222,7 +223,6 @@
- 	    continue;
- 	  }
-       }
--    else
- #endif /* HANDLE_MULTIBYTE */
-       if ((!substring_okay && (whitespace (c) || c == ':' ||
- 	  (history_search_delimiter_chars && member (c, history_search_delimiter_chars)) ||
-@@ -230,7 +230,7 @@
- 	  string[i] == '\n' ||
- 	  (substring_okay && string[i] == '?'))
- 	break;
--
-+  }
-   which = i - local_index;
-   temp = (char *)xmalloc (1 + which);
-   if (which)
diff --git a/app-shells/bash/files/bash-3.0-volatile-command.patch b/app-shells/bash/files/bash-3.0-volatile-command.patch
deleted file mode 100644
index 8b89b35914b1..000000000000
--- a/app-shells/bash/files/bash-3.0-volatile-command.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Debian
-
-# DP: current_command must be declared volatile to prevent assignments from
-#     being optimized away as dead code.  In reality, the use of setjmp/longjmp
-#     makes it not dead code at all.
-
---- eval.old	2003-12-18 23:44:15.000000000 -0500
-+++ eval.c	2005-10-03 01:59:31.000000000 -0400
-@@ -63,7 +63,7 @@
- reader_loop ()
- {
-   int our_indirection_level;
--  COMMAND *current_command = (COMMAND *)NULL;
-+  COMMAND * volatile current_command = (COMMAND *)NULL;
- 
-   USE_VAR(current_command);
author	Mike Frysinger <vapier@gentoo.org>	2009-02-21 21:59:12 +0000
committer	Mike Frysinger <vapier@gentoo.org>	2009-02-21 21:59:12 +0000
commit	fd1fd05375c890959a7a479af3f09681f7d273d3 (patch)
tree	437ac5b6758b6b1277e56085bc51fc79b8053b16 /app-shells
parent	m68k stable (diff)
download	gentoo-2-fd1fd05375c890959a7a479af3f09681f7d273d3.tar.gz gentoo-2-fd1fd05375c890959a7a479af3f09681f7d273d3.tar.bz2 gentoo-2-fd1fd05375c890959a7a479af3f09681f7d273d3.zip