summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-10-05 08:24:29 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-10-05 08:24:29 +0000
commitdb440c1299f9086cbf5dbbc35e1922ba7c90100e (patch)
treec1921df9797f7ea8070a7e56c47cc0bf118f036a /app-admin
parentVersion bump. Closes bug #107824 (diff)
downloadgentoo-2-db440c1299f9086cbf5dbbc35e1922ba7c90100e.tar.gz
gentoo-2-db440c1299f9086cbf5dbbc35e1922ba7c90100e.tar.bz2
gentoo-2-db440c1299f9086cbf5dbbc35e1922ba7c90100e.zip
Cleaned up postinst to be a little smarter.
(Portage version: 2.0.53_rc3)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect-compiler/ChangeLog6
-rw-r--r--app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild17
2 files changed, 17 insertions, 6 deletions
diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog
index 232323b3c3c9..7f0042340ac7 100644
--- a/app-admin/eselect-compiler/ChangeLog
+++ b/app-admin/eselect-compiler/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/eselect-compiler
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.4 2005/10/03 09:14:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.5 2005/10/05 08:24:29 eradicator Exp $
+
+ 05 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ eselect-compiler-2.0.0_beta2.ebuild:
+ Cleaned up postinst to be a little smarter.
03 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
-eselect-compiler-2.0.0_beta1.ebuild, eselect-compiler-2.0.0_beta2.ebuild:
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild
index af4758a1234d..6de0627f4f5c 100644
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild
+++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild,v 1.2 2005/10/03 09:14:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_beta2.ebuild,v 1.3 2005/10/05 08:24:29 eradicator Exp $
DESCRIPTION="Utility to configure the active toolchain compiler"
HOMEPAGE="http://www.gentoo.org/"
@@ -19,18 +19,25 @@ IUSE=""
RDEPEND="app-admin/eselect"
pkg_postinst() {
+ # Some toolchain.eclass installed confs on amd64 had chost instead of
+ # ctarget.
+ sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
+
# Migrate from the old configs
if [[ ! -f "${ROOT}/etc/eselect/compiler/selection.conf" ]] ; then
+ # Migrate isn't smart enough to handle the toolchain.eclass
+ # installed confs.
+ # This should be fixed before it comes out of beta and p.m.
+ rm -f ${ROOT}/etc/eselect/compiler/*.conf
eselect compiler migrate
fi
# Update the wrappers
eselect compiler update
- sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
-
- rm -f ${ROOT}/etc/env.d/05gcc*
- ewarn "You should source /etc/profile in your open shells."
+ if rm -f ${ROOT}/etc/env.d/05gcc* &> /dev/null ; then
+ ewarn "You should source /etc/profile in your open shells."
+ fi
}
src_install() {