Install and use /etc/bash/bashrc; half of fix for bug 26952. Thanks to Toby Dickenson for the dircolors tip

9 files changed, 81 insertions, 224 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index f8bb540c6c12..8c1b6597a36a 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/bash
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.37 2004/06/24 22:22:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.38 2004/07/22 02:30:30 agriffis Exp $
+
+*bash-2.05b-r10 (21 Jul 2004)
+
+  21 Jul 2004; Aron Griffis <agriffis@gentoo.org> +files/bashrc,
+  +bash-2.05b-r10.ebuild, -bash-2.05b-r5.ebuild, -bash-2.05b-r7.ebuild,
+  -bash-2.05b-r8.ebuild:
+  Install and use /etc/bash/bashrc; half of fix for bug 26952. Thanks to Toby
+  Dickenson for the dircolors tip
 
   15 Jun 2004; <solar@gentoo.org> bash-2.05b-r9.ebuild:
   remove *bashbug* when using uclibc
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index b02013f26d15..27e35d57792e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 927c3ec445afe39dce357b9b3cc3d915 bash-2.05b-r7.ebuild 2130
+MD5 7191ad809505d8aa0ecf82979d92ce47 bash-2.05b-r9.ebuild 2974
+MD5 baaadcbb35621dabf483ad243cc60799 bash-2.05b-r8.ebuild 2280
 MD5 00382cce3a57f21a5ef6dd155913cf4d ChangeLog 7618
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7191ad809505d8aa0ecf82979d92ce47 bash-2.05b-r10.ebuild 2974
 MD5 12265b01204702e467da5f0fdb201ccf bash-2.05b-r5.ebuild 2011
-MD5 927c3ec445afe39dce357b9b3cc3d915 bash-2.05b-r7.ebuild 2130
-MD5 baaadcbb35621dabf483ad243cc60799 bash-2.05b-r8.ebuild 2280
-MD5 7191ad809505d8aa0ecf82979d92ce47 bash-2.05b-r9.ebuild 2974
-MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
-MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
 MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
-MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
 MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
+MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r10 461
 MD5 867b3b11e48acac6d09794c8d36cb204 files/digest-bash-2.05b-r5 296
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r7 461
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r8 461
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4Oc/HTu7gpaalycRArQZAJ9T995UyOv7z74Wp6j0rB/HZBbCmACfTQVx
-joiI/O/N0BreZASvH3n2MyY=
-=Xrt8
------END PGP SIGNATURE-----
+MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
+MD5 b5886c25a293a63e6f099b15be7e8504 files/bash.bashrc 759
+MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
diff --git a/app-shells/bash/bash-2.05b-r8.ebuild b/app-shells/bash/bash-2.05b-r10.ebuild
index 76abb64e90b9..6a369ae6bb0e 100644
--- a/app-shells/bash/bash-2.05b-r8.ebuild
+++ b/app-shells/bash/bash-2.05b-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r8.ebuild,v 1.7 2004/06/29 03:51:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r10.ebuild,v 1.1 2004/07/22 02:30:30 agriffis Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://gnu/bash/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ppc64"
-IUSE="nls build"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="nls build uclibc"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
 
@@ -38,21 +38,35 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-multibyte-locale.patch
 	# Segfault on empty herestring
 	epatch ${FILESDIR}/${P}-empty-herestring.patch
-	# fix broken rbash functionality
+	# Fix broken rbash functionality
 	epatch ${FILESDIR}/${P}-rbash.patch
+	# Fix parallel make, bug #41002.
+	epatch ${FILESDIR}/${P}-parallel-build.patch
 
-	# enable SSH_SOURCE_BASHRC (#24762)
-	sed -i "87s:^.*$:#define SSH_SOURCE_BASHRC:g" config-top.h
+	# 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() {
-
 	# If running mips64, we need updated configure data
 	use mips && gnuconfig_update
 
 	filter-flags -malign-double
 
-	local myconf=""
+	local myconf=
 
 	# Always use the buildin readline, else if we update readline
 	# bash gets borked as readline is usually not binary compadible
@@ -60,6 +74,10 @@ src_compile() {
 	#
 	# 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"
 
@@ -80,15 +98,18 @@ src_install() {
 	dosym bash /bin/sh
 	dosym bash /bin/rbash
 
-	use build \
-		&& rm -rf ${D}/usr \
-		|| ( \
-			doman doc/*.1
-			dodoc README NEWS AUTHORS CHANGES COMPAT Y2K
-			dodoc doc/FAQ doc/INTRO
-
-			ebegin "creating info symlink"
-			dosym bash.info.gz /usr/share/info/bashref.info.gz
-			eend $?
-	)
+	use uclibc && 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-2.05b-r5.ebuild b/app-shells/bash/bash-2.05b-r5.ebuild
deleted file mode 100644
index 74f481574197..000000000000
--- a/app-shells/bash/bash-2.05b-r5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r5.ebuild,v 1.13 2004/06/29 03:51:06 vapier Exp $
-
-inherit eutils flag-o-matic
-
-# Official patches
-PLEVEL="x002 x003 x004"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://www.gnu.org/software/bash/bash.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="x86 ppc sparc mips ~alpha hppa amd64"
-IUSE="nls build"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-
-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
-	cp Makefile.in Makefile.in.orig
-	sed -e "/&& autoconf/d" Makefile.in.orig > 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
-}
-
-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"
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf \
-		--disable-profiling \
-		--with-curses \
-		--without-gnu-malloc \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	einstall || die
-
-	dodir /bin
-	mv ${D}/usr/bin/bash ${D}/bin
-	dosym bash /bin/sh
-
-	use build \
-		&& rm -rf ${D}/usr \
-		|| ( \
-			doman doc/*.1
-			dodoc README NEWS AUTHORS CHANGES COMPAT Y2K
-			dodoc doc/FAQ doc/INTRO
-
-			ebegin "creating info symlink"
-			dosym bash.info.gz /usr/share/info/bashref.info.gz
-			eend $?
-	)
-}
diff --git a/app-shells/bash/bash-2.05b-r7.ebuild b/app-shells/bash/bash-2.05b-r7.ebuild
deleted file mode 100644
index ded715677455..000000000000
--- a/app-shells/bash/bash-2.05b-r7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r7.ebuild,v 1.17 2004/06/29 03:51:06 vapier Exp $
-
-inherit eutils flag-o-matic
-
-# Official patches
-PLEVEL="x002 x003 x004 x005 x006 x007"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://www.gnu.org/software/bash/bash.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="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64"
-IUSE="nls build"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-
-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
-	cp Makefile.in Makefile.in.orig
-	sed -e "/&& autoconf/d" Makefile.in.orig > 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
-}
-
-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"
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf \
-		--disable-profiling \
-		--with-curses \
-		--without-gnu-malloc \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	einstall || die
-
-	dodir /bin
-	mv ${D}/usr/bin/bash ${D}/bin
-	dosym bash /bin/sh
-	dosym bash /bin/rbash
-
-	use build \
-		&& rm -rf ${D}/usr \
-		|| ( \
-			doman doc/*.1
-			dodoc README NEWS AUTHORS CHANGES COMPAT Y2K
-			dodoc doc/FAQ doc/INTRO
-
-			ebegin "creating info symlink"
-			dosym bash.info.gz /usr/share/info/bashref.info.gz
-			eend $?
-	)
-}
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
new file mode 100644
index 000000000000..bb72d3503306
--- /dev/null
+++ b/app-shells/bash/files/bashrc
@@ -0,0 +1,23 @@
+# /etc/bash.bashrc:
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/files/bashrc,v 1.1 2004/07/22 02:30:30 agriffis Exp $
+# 
+# This file is sourced by all *interactive* bash shells on startup,
+# including some apparently interactive shells such as scp and rcp
+# that can't tolerate any output.
+
+
+# Test for an interactive shell.  There is no need to set anything
+# past this point for scp and rcp, and it's important to refrain from
+# outputting anything in those cases.
+if [[ $- != *i* ]]; then
+	# Shell is non-interactive.  Be done now
+	return
+fi
+
+# Set colorful PS1 only on colorful terminals
+if dircolors --print-database | grep -Fqx "TERM $TERM"; then
+	PS1='\[\033[01;32m\]\u@\h \[\033[01;34m\]\w \$ \[\033[00m\]'
+else
+	PS1='\u@\h \w \$ '
+fi
+export PS1
diff --git a/app-shells/bash/files/digest-bash-2.05b-r7 b/app-shells/bash/files/digest-bash-2.05b-r10
index cda4481c8b5e..cda4481c8b5e 100644
--- a/app-shells/bash/files/digest-bash-2.05b-r7
+++ b/app-shells/bash/files/digest-bash-2.05b-r10
diff --git a/app-shells/bash/files/digest-bash-2.05b-r5 b/app-shells/bash/files/digest-bash-2.05b-r5
deleted file mode 100644
index 9e2103210e00..000000000000
--- a/app-shells/bash/files/digest-bash-2.05b-r5
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 5238251b4926d778dfe162f6ce729733 bash-2.05b.tar.gz 1956216
-MD5 acac0949285525a5920d80f2aa4668de bash-2.05b-gentoo.diff.bz2 2744
-MD5 2957bbe5f6db1830d649d1071baba63c bash205b-002 755
-MD5 2828e78563927b806246e2b4806ee0f5 bash205b-003 2356
-MD5 6bf89831209ba6d208943d2ebaa7fe3a bash205b-004 1110
diff --git a/app-shells/bash/files/digest-bash-2.05b-r8 b/app-shells/bash/files/digest-bash-2.05b-r8
deleted file mode 100644
index cda4481c8b5e..000000000000
--- a/app-shells/bash/files/digest-bash-2.05b-r8
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 5238251b4926d778dfe162f6ce729733 bash-2.05b.tar.gz 1956216
-MD5 acac0949285525a5920d80f2aa4668de bash-2.05b-gentoo.diff.bz2 2744
-MD5 2957bbe5f6db1830d649d1071baba63c bash205b-002 755
-MD5 2828e78563927b806246e2b4806ee0f5 bash205b-003 2356
-MD5 6bf89831209ba6d208943d2ebaa7fe3a bash205b-004 1110
-MD5 311b7f0e3dabec51767bfabe6afd4ded bash205b-005 2217
-MD5 f8a86d0a66b51080f3fbc5cc34ef1a06 bash205b-006 3155
-MD5 37d2acecc9146883f9b331c03b274f21 bash205b-007 1072