Don't call eselect with obsolete/removed --no-color option.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

9 files changed, 32 insertions, 26 deletions

diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog
index 3a73fbec6257..48d150aadde8 100644
--- a/dev-ada/asis-gcc/ChangeLog
+++ b/dev-ada/asis-gcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ada/asis-gcc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.20 2012/06/14 13:08:30 george Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.21 2014/07/13 16:23:26 ulm Exp $
+
+  13 Jul 2014; Ulrich Müller <ulm@gentoo.org> asis-gcc-3.4.6.ebuild,
+  asis-gcc-4.1.2.ebuild, asis-gcc-4.1.2-r1.ebuild, asis-gcc-4.2.2.ebuild,
+  asis-gcc-4.3.0_pre132166.ebuild, asis-gcc-4.3.1.ebuild,
+  asis-gcc-4.3.1-r1.ebuild, asis-gcc-4.4.ebuild:
+  Don't call eselect with obsolete/removed --no-color option.
 
   14 Jun 2012; George Shapovalov <george@gentoo.org> asis-gcc-4.4.ebuild:
   the 4.4 needs this catch too.
diff --git a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
index f3f19d62c87f..9f3bd798611f 100644
--- a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.11 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.12 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -41,7 +41,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
 My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
 
 pkg_setup() {
-	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
index 158ab701a07f..5d53b403f7ad 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild,v 1.8 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild,v 1.9 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -39,7 +39,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
 My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
 
 pkg_setup() {
-	local currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	local currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild
index 4d6b8c5e0ff3..8f49813aa0d7 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild,v 1.6 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild,v 1.7 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -35,7 +35,7 @@ QA_EXECSTACK="usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis-4.1.so
 replace-flags -O3 -O2
 
 pkg_setup() {
-	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild b/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
index 9f993f3c3a38..9eaba4d8d0ce 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild,v 1.5 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild,v 1.6 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild multilib
 
@@ -40,7 +40,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
 My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
 
 pkg_setup() {
-	local currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	local currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild b/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild
index d957c0bf47e6..fdc1ecb686f1 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild,v 1.5 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild,v 1.6 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild multilib
 
@@ -40,7 +40,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
 My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
 
 pkg_setup() {
-	local currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	local currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
index ae33e9b68b79..c678f1de59dc 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild,v 1.2 2012/06/14 11:38:14 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild,v 1.3 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -35,7 +35,7 @@ DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
 #	${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
 
 pkg_setup() {
-	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild
index 0a0ce7bb976f..384807da1fb9 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild,v 1.1 2012/04/19 13:30:42 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild,v 1.2 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -35,7 +35,7 @@ DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
 #	${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
 
 pkg_setup() {
-	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.4.ebuild b/dev-ada/asis-gcc/asis-gcc-4.4.ebuild
index c0e80df5d302..6b00692763de 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.4.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.4.ebuild,v 1.2 2012/06/14 13:08:30 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.4.ebuild,v 1.3 2014/07/13 16:23:26 ulm Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -35,7 +35,7 @@ DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
 #	${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
 
 pkg_setup() {
-	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
 	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
 		echo
 		eerror "The active gnat profile does not correspond to the selected"