dont export CLICOLOR for everyone as it is BSD-only cruft and drop USE=build

Package-Manager: portage-2.1.1_pre4

3 files changed, 23 insertions, 25 deletions

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 317d5bf38bfb..2c359c802699 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -193,10 +193,10 @@ AUX dot-bash_profile 193 RMD160 7ee4f60be78b1b46c5142f081d978c09700f6322 SHA1 1c
 MD5 d76b9aa6b733175df21c2bb6afe8900d files/dot-bash_profile 193
 RMD160 7ee4f60be78b1b46c5142f081d978c09700f6322 files/dot-bash_profile 193
 SHA256 ae12206aaa35dc96273ed421f4e85ca26a1707455e3cc9f054c7f5e2e9c53df6 files/dot-bash_profile 193
-AUX dot-bashrc 1108 RMD160 64c2f1a5a6c64b23fa8fd1824a71dde6208debc5 SHA1 df3231b56944f68f96aef2a984367488fb2e5cf1 SHA256 bcadf6c9ee796b4d14c57235a67de287ef08ce6d2584faf4ff75b0079cde6642
-MD5 665639723bbc1bae842e3ed58979ad39 files/dot-bashrc 1108
-RMD160 64c2f1a5a6c64b23fa8fd1824a71dde6208debc5 files/dot-bashrc 1108
-SHA256 bcadf6c9ee796b4d14c57235a67de287ef08ce6d2584faf4ff75b0079cde6642 files/dot-bashrc 1108
+AUX dot-bashrc 1100 RMD160 c9ed72b1b8c94bb2db744408adbcb9d0eebfae98 SHA1 8a280f559afe59d06637ba5b78b58e86bd48dd21 SHA256 52d6c06c9cf12ea5523f720ab5d83e6445fe3d76278460e5d4ea627d14a36c09
+MD5 ee8c9e0b9d01becf883c65d80361fd1e files/dot-bashrc 1100
+RMD160 c9ed72b1b8c94bb2db744408adbcb9d0eebfae98 files/dot-bashrc 1100
+SHA256 52d6c06c9cf12ea5523f720ab5d83e6445fe3d76278460e5d4ea627d14a36c09 files/dot-bashrc 1100
 DIST bash-2.05b-gentoo.diff.bz2 2744 RMD160 57ee5517dd6af459eacc7f0e6250ef4757ea40d6 SHA1 bf759941f4f06ea325e0b94b59bdf89b6a4ef708 SHA256 b2722b73d442ce678ea98f04a53fe5aa8b7f69797b198ff5151b6b897e1f324c
 DIST bash-2.05b.tar.gz 1956216 RMD160 d9826db03c5d38e6175af5b3ef0bc07fafa14add SHA1 b3e158877f94e66ec1c8ef604e994851ee388b09 SHA256 ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4
 DIST bash-3.0-gentoo.diff.bz2 2423 RMD160 133b6338fd320b9cac0cddeeafff27680c8d8a17 SHA1 d13eaa166c8fce9607213ccbf204d8741a38b047 SHA256 13b0c1e426914093b7fcbc57e4901945512ebc73f737f21a01e150843a699a84
@@ -266,10 +266,10 @@ EBUILD bash-3.1_p16.ebuild 4566 RMD160 3ebf807186a7abc91b63da4d5c0312b69ed991b3
 MD5 d9bcc4cb5dc03ca4519d7e651b7727bf bash-3.1_p16.ebuild 4566
 RMD160 3ebf807186a7abc91b63da4d5c0312b69ed991b3 bash-3.1_p16.ebuild 4566
 SHA256 597cf3ab71774aa33a4cf1670bed6670b7d4a5514cf9ff73c36cac1e74299e8f bash-3.1_p16.ebuild 4566
-EBUILD bash-3.1_p17.ebuild 4660 RMD160 a55805a72a7a86cac277d859ffd10474023e2627 SHA1 8a2c658f9050e107ff09305ef580043416e6f5c7 SHA256 12012078d8cf850ddeee726411c2c47af8c236adfb530803fc48d58105dd8672
-MD5 71ce4aa06b25652e1972233c69f2cf1e bash-3.1_p17.ebuild 4660
-RMD160 a55805a72a7a86cac277d859ffd10474023e2627 bash-3.1_p17.ebuild 4660
-SHA256 12012078d8cf850ddeee726411c2c47af8c236adfb530803fc48d58105dd8672 bash-3.1_p17.ebuild 4660
+EBUILD bash-3.1_p17.ebuild 4722 RMD160 81cffc3106528f0ee4c82a8638866b758f3b17c0 SHA1 7cffa53c35762a888cbf9f57ec24b3112083f9a3 SHA256 1eb619a2c9708693582a06735cc79c1dd369cebc391f78cb00dbb56c19db20f9
+MD5 4111a804dfb53d67ef413ef296ee12a9 bash-3.1_p17.ebuild 4722
+RMD160 81cffc3106528f0ee4c82a8638866b758f3b17c0 bash-3.1_p17.ebuild 4722
+SHA256 1eb619a2c9708693582a06735cc79c1dd369cebc391f78cb00dbb56c19db20f9 bash-3.1_p17.ebuild 4722
 MISC ChangeLog 20315 RMD160 eb6f34e53613a09e59955fdca9d9fcef1485a259 SHA1 bebc3551a0d6bc0f5082727c1a050dbd9ba5f9e6 SHA256 382758e48a6a40a63f348ca1e915544b88731a98b9bf07aa3f37fdc4611d18db
 MD5 dd73e14e164d917bebeddb67f8fb8fa0 ChangeLog 20315
 RMD160 eb6f34e53613a09e59955fdca9d9fcef1485a259 ChangeLog 20315
@@ -302,7 +302,7 @@ SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEz7KRAiZjviIA2XgRAge6AJ9zHbD7UW+kp6n3EP7OEUj1GpbPrgCg5iq0
-IszzFvd88Ko0kX0mIJ+7Tw4=
-=+IiZ
+iD8DBQFE0NA9amhnQswr0vIRAoowAJ4o1jw+jUSTEWSGwXnXtuKHQ2jdZwCfWyZW
+174X9jHtYoA0vYrkLAPdn3M=
+=7Odv
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.1_p17.ebuild b/app-shells/bash/bash-3.1_p17.ebuild
index 792a2de6859c..09738e52624a 100644
--- a/app-shells/bash/bash-3.1_p17.ebuild
+++ b/app-shells/bash/bash-3.1_p17.ebuild
@@ -1,6 +1,6 @@
 # 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-3.1_p17.ebuild,v 1.3 2006/08/01 19:59:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p17.ebuild,v 1.4 2006/08/02 16:17:49 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="afs nls build bashlogger"
+IUSE="afs nls bashlogger"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
 
@@ -126,17 +126,16 @@ src_install() {
 		newins "${FILESDIR}"/dot-${f} .${f}
 	done
 
-	if use userland_GNU; then
-		sed -i -e 's:^#GNU#::' "${D}/etc/skel/.bashrc"
+	if use userland_GNU ; then
+		sed -i -e 's:^#GNU#@::' "${D}"/etc/skel/.bashrc
+	elif use userland_BSD ; then
+		sed -i -e 's:^#BSD#@::' "${D}"/etc/skel/.bashrc
 	fi
+	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc
 
-	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
+	doman doc/*.1
+	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
+	dosym bash.info.gz /usr/share/info/bashref.info.gz
 }
 
 pkg_preinst() {
diff --git a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc
index 0191f878323c..0211a6b72b9e 100644
--- a/app-shells/bash/files/dot-bashrc
+++ b/app-shells/bash/files/dot-bashrc
@@ -21,9 +21,8 @@ elif [[ -f /etc/DIR_COLORS ]] ; then
 	eval $(dircolors -b /etc/DIR_COLORS)
 fi
 
-export CLICOLOR=1 # For FreeBSD
-
-#GNU#alias ls='ls --color=auto'
+#BSD#@export CLICOLOR=1
+#GNU#@alias ls='ls --color=auto'
 alias grep='grep --colour=auto'
 
 # Change the window title of X terminals