vapier 14/05/08 19:42:07 Modified: coreutils-8.22-r1.ebuild ChangeLog Log: Drop old migration logic as we have moved way beyond it and it causes issues with /usr merge #509596 by Duncan. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 sys-apps/coreutils/coreutils-8.22-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/coreutils-8.22-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/coreutils-8.22-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/coreutils-8.22-r1.ebuild?r1=1.1&r2=1.2 Index: coreutils-8.22-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.22-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-8.22-r1.ebuild 27 Apr 2014 19:09:46 -0000 1.1 +++ coreutils-8.22-r1.ebuild 8 May 2014 19:42:07 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.22-r1.ebuild,v 1.1 2014/04/27 19:09:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.22-r1.ebuild,v 1.2 2014/05/08 19:42:07 vapier Exp $ EAPI="3" @@ -157,14 +157,6 @@ ewarn "You should also re-source your shell settings for LS_COLORS" ewarn " changes, such as: source /etc/profile" - # /bin/dircolors sometimes sticks around #224823 - if [ -e "${EROOT}/usr/bin/dircolors" ] && [ -e "${EROOT}/bin/dircolors" ] ; then - if strings "${EROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then - einfo "Deleting orphaned GNU /bin/dircolors for you" - rm -f "${EROOT}/bin/dircolors" - fi - fi - # Help out users using experimental filesystems if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then case $(uname -r) in 1.390 sys-apps/coreutils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/ChangeLog?rev=1.390&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/ChangeLog?rev=1.390&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/ChangeLog?r1=1.389&r2=1.390 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- ChangeLog 27 Apr 2014 19:09:46 -0000 1.389 +++ ChangeLog 8 May 2014 19:42:07 -0000 1.390 @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/coreutils # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.389 2014/04/27 19:09:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.390 2014/05/08 19:42:07 vapier Exp $ + + 08 May 2014; Mike Frysinger <vap...@gentoo.org> coreutils-8.22-r1.ebuild: + Drop old migration logic as we have moved way beyond it and it causes issues + with /usr merge #509596 by Duncan. *coreutils-8.22-r1 (27 Apr 2014)
