summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/bash/ChangeLog5
-rw-r--r--app-shells/bash/Manifest24
-rw-r--r--app-shells/bash/files/bashrc2
3 files changed, 28 insertions, 3 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index ca7527a7e9a1..9b72d043e5d8 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-shells/bash
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.324 2012/09/02 17:49:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.325 2012/09/13 21:46:48 vapier Exp $
+
+ 13 Sep 2012; Mike Frysinger <vapier@gentoo.org> files/bashrc:
+ Add egrep/fgrep colour aliases too #434170 by Dave Kemper.
02 Sep 2012; Raúl Porcel <armin76@gentoo.org> bash-4.2_p37.ebuild:
alpha/ia64/m68k/s390/sh/sparc stable wrt #431850
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 0738f655cb58..36be571e4d21 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX autoconf-mktime-2.59.patch 4686 SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba SHA512 4ac3951b72fcc50bc90d4fdd6286fc0ce01100d928b51f41043cf7c6f6adaddd7b19bb346bf21f306ce6cbe619750dfe18755c122e3f1a237fb07c02b25594a8 WHIRLPOOL bd4304863415e6e5b79a2df330b9add8e5378de54db2c24a3ea97c41125886204a77997ba179c42a901532ddf49314a91e1937df31d396ac8d4d6c7d612f442d
AUX bash-3.0-configs.patch 2538 SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f SHA512 4b1c0aef6b0d72e68f01dee094f9e72ba802c175aad6c9034326e11a065d92d617dbc2c289edb01880119d6c3bc454c4785fc7b7e15634ba797e3077bd4f373d WHIRLPOOL 42c229f208e3c784bfd88bfe50825d31cee265dc9a3ab4078de027df69de7a73b372b8e82dbadd95ec25dbe890581322bc017a78d9348ff5c9dabb140394b7a0
AUX bash-3.0-etc-inputrc.patch 1443 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025 SHA512 cbcdac81740cf8057c8ebba0a986b6794d5936b3ee4c621e3680db744c0cafe8b391ab556cccc35e486dff0a6d68dcc070a26679b1ae475ed704e671f83a1c52 WHIRLPOOL f26279fa19f17eeaf908401ab561f397a98ce8fa0dbb9562f5dcba997a1cc8e687a41838c1f4b95724976dcbe325a06454e935ec1da175c05d501c0853320a86
@@ -29,7 +32,7 @@ AUX bash-4.2-parallel-build.patch 4448 SHA256 1c5f7fb5c324d6f2b786ad259cc35bfdd3
AUX bash-4.2-print-heredoc.patch 854 SHA256 a686e71f9ab788015fa80eb448252eeedc2d8f8e97b0fc0c66c0d3f3088e87b4 SHA512 702ea663e19147529199404523a1a6e957dc8f36486b8fafdf647b744f58ab3fcaee667455b8a7d3146618c277068677521e038d9387f803e257e3e0827fcc43 WHIRLPOOL 0b5250775f056d2dd1e19ab35d436f1660b7dd0c5edd7b6c6a25646109bb3dde3e5031a387c2b551b6fc824c1066c1ebc8c9016a57964a3ffa33200924066a27
AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe
AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b
-AUX bashrc 2798 SHA256 537fb02f97da09b91f9e3c1b7624e43dbf650536d6a6b3a18e9003a57f610c32 SHA512 f30d711f26c83ddef8e9d4450a434f45c4b3ed417079bb0573474d9a895da015ae096daaa427e40f119340183b1d420964c4377eb804718ff010c8440af34f4d WHIRLPOOL 1579a805dde9ee18f046650a3d3932bd3e718d0ff54c602cb0742637032808e8858fb54c1d9ae409b7b7cb8b0fc211337f8bacd2c208d97204db88647dc95d30
+AUX bashrc 2868 SHA256 bf41619c84676d5f89a0480359a563a83e8575e9bf5126d38d2afabaf59e715c SHA512 3e1e23a562959b2eb63eaa7c9387862b2ea8efd5782d74d140a8163ced88abd9b170f22e2914c2bacd5ae9b003aa7f853151562d4726e4ce63bdee9f59f53d14 WHIRLPOOL ac67d48d667ae24bba0e5157fd1af7e7434960b2f4906902af3f0657190f833b5b920fc19e8bad139b7eb45d8eee037d097ecc2ed0cf33e35854d14d76c2a4e6
AUX dot-bash_logout 127 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd WHIRLPOOL 3dc6bc364f8229d123873940743866dfc330e193ab6ec7c5162c61d0ecc319198a64f27176521bfb979c31eed9ed0b2ee2ffce31b050d4cb8e3aa8a5c12c38cf
AUX dot-bash_profile 193 SHA256 ae12206aaa35dc96273ed421f4e85ca26a1707455e3cc9f054c7f5e2e9c53df6 SHA512 064227bb7658f5ac0aaddd7ddda39daa0ffa924601445afa61c02aa19a990a5def377b125111e4817bf80ed80d33e1c111ee13034958b5de1ff8e50c093359a2 WHIRLPOOL cde8efc527122adbfa90d60a79fbdffd953c5573c5c6c5d499e56093517ceb7b48d9cfadd10b7c1d161b6d7f84276403fc233fca2d6798bcff2d0d052023672b
AUX dot-bashrc 551 SHA256 e280e34af6e830c93adb6285f66ead4812ddfb2bbc6a7ff618467f4c933f6446 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b WHIRLPOOL 27c53e3f59bd89d5517b5b22bcf04a9adddee0492c52d34d26a707062fb4c4fa853cdf2726d6ec2621a08f24c32a53651ce5693b6de1be764de3e088eb9f7ee6
@@ -209,5 +212,22 @@ EBUILD bash-4.2_p29.ebuild 6166 SHA256 57928687bafac92b8aeb0f3598a026242c04aa24e
EBUILD bash-4.2_p36.ebuild 6166 SHA256 ba80733c8fc50b4958820b5fe779cc4df4dfe6ce5b65b7b5bb3a332e46914715 SHA512 109a3231f9d13412286910547d34eb272ec64502c797428f5e9ede23a0edaa0865366250e216bbf69fd5bc67a651978b5a7fbae22e11a10d872cefd3e2c414a9 WHIRLPOOL b22ecca12116d0fe430ab1331a2e507e7d48a322c72acfc3586edaa0e939c51d834c921f083071f9430a4c60ae362f33fb055abdffdc91990eb2e6d1c69044cc
EBUILD bash-4.2_p37.ebuild 6311 SHA256 c807f0def9dc9dcac9958cb7a9606dd9f1ce33142933dcf0f8cd3276434f86ea SHA512 f72570af7efb4e07b5b5e67fb81f6c12f8b177f75592b2b12da606371ee63001c43126a2da03ef41e140894e47935c21df3a8235e10da9131a4f3bdd51c35575 WHIRLPOOL 54c55493d4f9443e33ee97421abca38237c4027d2bfe0f5c43b04e56cf35b795ca08d33e62517b79a193045dd67b1286b05630621f47bc376e26a276322dcce4
EBUILD bash-4.2_p8-r1.ebuild 5549 SHA256 4ca7fc7ee535d0a034468acbe321ec37435a7790c0757b69f4a8e34fbdc0f178 SHA512 8e2c73a5e11fefc54696b4d66d0a362ded3ce5b21787b4f5fca158b36ee8d90a8344dbd44bcff66a204184b34d332b8d30bc2bf8729c4331fdd864f1c0308bcc WHIRLPOOL 97e01220b6fe2e6ccd79b1b1bada4ae554b6418b916570ea17d2b4b751c1739a7b1aba3cc2b767ac9f4e75728c569d5e51dc8dfd387e7181de430e3422da51ad
-MISC ChangeLog 49793 SHA256 053c8d29c569026afa196fee4502ca7a036cad369f91db07a24304d514505b59 SHA512 b7bc1faadc6d5a3700d66d1b30aa4c6fc0bdd9f890156d1aeb73b97fbbe9c0f8a38f00b59ade1beced6d6dc7a94deb5af4892e39811790d24f454541b086a2a2 WHIRLPOOL b0662645c1d3c2abac65e2b8a729e892413ad2916c25987cd11a79eee37b25f12c50df8c978f8c100a9d0c545c8b4ac7dc8a0069ebc4a5af7a8db6924de0077a
+MISC ChangeLog 49918 SHA256 f46eb770d18e24d5b18f0560b15b6e4b1ac3a2fe1de436e1c0dcdd6f095f8cb3 SHA512 ba7b3d6b3e3ab6c3e89b8366ae6fa05c89a59c7df8851d1c941a32a59011792c8fa7542f1b189ddc73bb438a112349e84832d0793ecf81e4dabddf81db2856ac WHIRLPOOL 3808472b56a9b1164242df39afbaecd7796d3d52e7860d5697feb41b5cb664bf5282a1316c184ae805f3ec3e6dc678d42c1164fb63d290456743b243165ddbd7
MISC metadata.xml 568 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 SHA512 e50fd93498123511ac7460795687e694d368aaa2e7001ad752aae7bb6b67ed4746c8e171e4d5ff42e6aade0fd29d001330afdb593b8446046a98b27b113b7c5e WHIRLPOOL 83ad81f6ec56c7deaaa1d6cd18ee73621f02bedb62201d59ac44676120251e040f73c9ef238d91abf0c8c7d115a8b4b8df6ea22b533102c8daadfad755de51d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQUlTnAAoJELEHsLL7fEFWFPgP/AnFORct3Y8mEaMb588ffag+
+XAC9WtsnMDXxHPyBI0PYI02jFV6jF1a3wQALBRZ38ATL+dxOtB34Qh4vNXyr7E6Q
+Udw0bjQ42D8HMKcXrHxOBgb24EYilDATDiilNiEdifsAQNi6SGnD2FxMm3cr+q6+
+AYwbEBt5r/EzWkEfatGISy4eLjpwxn6GJDf7DwI9NHrNzkzcMoxxn6zKh6rRR68r
+TW4LSFZjlKeULZQe5GsjyCe1cVLy/9BswYBqv6uVg/JqTn1zUPB2RrnZt8BEeE+S
+XnYjzMuxzD1z2YaY/FubJrQNmo4VdoqJ5LsraFQYjXqg/gz/JOs05DMyfAqsq7fC
+sNxn2+4bUCxlvdDspeMWEhHD4durm8VBlL2XA7SjGFl7OOsVCIyST7ku9xIb+aLM
+CjMwWb3aAYIvXV2Bvij9ixf5xT59nhTbF/uW4lkQorBqdmMEINTAmndDKGxT7aQH
+8JYJeJAJbH68+JlG609Ndj7396roke8jG4gr8jK86FU86RqDMm4rNG5NtiHtNt35
+zPVW4+4xIwyZy2kJCU9Zn5NfSuscn9kI1bu2cVAgP9vSUJxjvKFggoxFbB6kXBUa
+6jZdKJzXxybo8VEk3pt2SbP1Tv7KIkCw3jgz44/DDtg1w/lWJMdHHDie7rqdX67H
+SqGwtZI2PrnbNbI2Zw+l
+=AeHk
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index a3773d648ea6..ee030f758f12 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -73,6 +73,8 @@ if ${use_color} ; then
#BSD#@export CLICOLOR=1
#GNU#@alias ls='ls --color=auto'
alias grep='grep --colour=auto'
+ alias egrep='egrep --colour=auto'
+ alias fgrep='fgrep --colour=auto'
else
if [[ ${EUID} == 0 ]] ; then
# show root@ when we don't have colors