diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-07-06 22:33:58 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-07-06 22:33:58 +0000 |
commit | 5d23ea8a977214a635c5b99c0ff9241c771c213b (patch) | |
tree | 1a184a64e9973c7b40dc2155db9681a1aa58d511 /sys-apps | |
parent | Version bump. Add examples USE flag, bug #264083. Do not install .la files an... (diff) | |
download | gentoo-2-5d23ea8a977214a635c5b99c0ff9241c771c213b.tar.gz gentoo-2-5d23ea8a977214a635c5b99c0ff9241c771c213b.tar.bz2 gentoo-2-5d23ea8a977214a635c5b99c0ff9241c771c213b.zip |
Auto delete /bin/dircolors if it is from early coreutils #224823 by Stefan de Konink.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/coreutils/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/coreutils/coreutils-7.4.ebuild | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog index 5aaf0f76f708..f75ff3a9faca 100644 --- a/sys-apps/coreutils/ChangeLog +++ b/sys-apps/coreutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/coreutils # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.255 2009/05/16 16:10:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.256 2009/07/06 22:33:58 vapier Exp $ + + 06 Jul 2009; Mike Frysinger <vapier@gentoo.org> coreutils-7.4.ebuild: + Auto delete /bin/dircolors if it is from early coreutils #224823 by Stefan + de Konink. 16 May 2009; Mike Frysinger <vapier@gentoo.org> coreutils-7.1.ebuild, coreutils-7.2.ebuild, coreutils-7.4.ebuild: diff --git a/sys-apps/coreutils/coreutils-7.4.ebuild b/sys-apps/coreutils/coreutils-7.4.ebuild index 6982d98a8e0d..b73d260cacfc 100644 --- a/sys-apps/coreutils/coreutils-7.4.ebuild +++ b/sys-apps/coreutils/coreutils-7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.4.ebuild,v 1.2 2009/05/16 16:10:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.4.ebuild,v 1.3 2009/07/06 22:33:58 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -134,4 +134,12 @@ src_install() { pkg_postinst() { ewarn "Make sure you run 'hash -r' in your active shells" + + # /bin/dircolors sometimes sticks around #224823 + if [ -e "${ROOT}/usr/bin/dircolors" ] && [ -e "${ROOT}/bin/dircolors" ] ; then + if strings "${ROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then + einfo "Deleting orphaned GNU /bin/dircolors for you" + rm -f "${ROOT}/bin/dircolors" + fi + fi } |