From: Chris PeBenito <pebenito@gentoo.org>
Date: Tue, 10 Oct 2006 11:35:54 +0000 (+0000)
Subject: set PORTAGE_T variable
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d94faa73926884cef875e8c9862fc5d909cd89cb;p=gentoo.git

set PORTAGE_T variable
---

diff --git a/profiles/selinux/alpha/make.defaults b/profiles/selinux/alpha/make.defaults
index a3bfb6a4525c..09f750ce925a 100644
--- a/profiles/selinux/alpha/make.defaults
+++ b/profiles/selinux/alpha/make.defaults
@@ -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/profiles/selinux/alpha/make.defaults,v 1.1 2006/10/08 18:37:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/make.defaults,v 1.2 2006/10/10 11:35:53 pebenito Exp $
 
 ARCH="alpha"
 ACCEPT_KEYWORDS="alpha"
@@ -12,3 +12,5 @@ CXXFLAGS="${CFLAGS}"
 FEATURES="sandbox sfperms"
 
 USE="berkdb crypt ipv6 ncurses nls pam python readline ssl tcpd zlib"
+
+PORTAGE_T="portage_t.merge"
diff --git a/profiles/selinux/amd64/make.defaults b/profiles/selinux/amd64/make.defaults
index d15e6c4ed71b..73d0abe9f6a0 100644
--- a/profiles/selinux/amd64/make.defaults
+++ b/profiles/selinux/amd64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/amd64/make.defaults,v 1.1 2006/10/08 18:37:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/amd64/make.defaults,v 1.2 2006/10/10 11:35:53 pebenito Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -13,6 +13,8 @@ FEATURES="sandbox sfperms"
 
 USE="berkdb crypt ipv6 ncurses nls pam python readline ssl tcpd zlib"
 
+PORTAGE_T="portage_t.merge"
+
 # 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
 # Multilib settings for all amd64 subprofiles.
 MULTILIB_ABIS="amd64 x86"
diff --git a/profiles/selinux/mips/make.defaults b/profiles/selinux/mips/make.defaults
new file mode 100644
index 000000000000..53172e13a440
--- /dev/null
+++ b/profiles/selinux/mips/make.defaults
@@ -0,0 +1 @@
+PORTAGE_T="portage_t.merge"
diff --git a/profiles/selinux/ppc/make.defaults b/profiles/selinux/ppc/make.defaults
new file mode 100644
index 000000000000..53172e13a440
--- /dev/null
+++ b/profiles/selinux/ppc/make.defaults
@@ -0,0 +1 @@
+PORTAGE_T="portage_t.merge"
diff --git a/profiles/selinux/sparc/make.defaults b/profiles/selinux/sparc/make.defaults
index 2a6fb86e9eb2..193cb6f02d6d 100644
--- a/profiles/selinux/sparc/make.defaults
+++ b/profiles/selinux/sparc/make.defaults
@@ -1,7 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/make.defaults,v 1.1 2006/10/08 18:37:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/make.defaults,v 1.2 2006/10/10 11:35:54 pebenito Exp $
 
 ARCH="sparc"
 ACCEPT_KEYWORDS="${ARCH}"
 FEATURES="sandbox sfperms"
+
+PORTAGE_T="portage_t.merge"
diff --git a/profiles/selinux/x86/make.defaults b/profiles/selinux/x86/make.defaults
index 8a887678601e..6440e39bc88b 100644
--- a/profiles/selinux/x86/make.defaults
+++ b/profiles/selinux/x86/make.defaults
@@ -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/profiles/selinux/x86/make.defaults,v 1.1 2006/10/08 18:37:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/x86/make.defaults,v 1.2 2006/10/10 11:35:54 pebenito Exp $
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
@@ -15,3 +15,5 @@ CXXFLAGS="${CFLAGS}"
 FEATURES="sandbox sfperms"
 
 USE="berkdb crypt ipv6 ncurses nls pam python readline ssl tcpd zlib"
+
+PORTAGE_T="portage_t.merge"