From d7190b3fef8835363175b78fbe6c888b1337151d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Sep 2013 14:41:31 -0400 Subject: [PATCH] churn(profiles): Replace features/multilib with upstream. --- .../coreos-overlay/profiles/arch/amd64/parent | 2 +- .../profiles/arch/amd64/x32/parent | 2 +- .../features/multilib/lib32/make.defaults | 13 -------- .../profiles/features/multilib/lib32/parent | 1 - .../profiles/features/multilib/make.defaults | 33 ------------------- .../features/multilib/package.use.mask | 8 ----- .../profiles/features/multilib/use.force | 2 -- .../profiles/features/multilib/use.mask | 9 ----- 8 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.mask diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent index d8d1efff84..9df910173c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent @@ -1,2 +1,2 @@ ../base -../../features/multilib/lib32 +portage-stable:features/multilib/lib32 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent index a433076ccc..5e9dc95235 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent @@ -1,3 +1,3 @@ .. # Need to clobber amd64 pulling in lib32 on us. -../../../features/multilib +portage-stable:features/multilib diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/make.defaults deleted file mode 100644 index 18eaa53908..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/make.defaults +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/lib32/make.defaults,v 1.2 2011/03/21 04:39:31 vapier Exp $ - -# Let baselayout create the lib symlink. -SYMLINK_LIB="yes" - -# 32-bit LIBDIR -LIBDIR_ppc="lib32" -LIBDIR_x86="lib32" -LIBDIR_x86_fbsd="lib32" -LIBDIR_sparc32="lib32" -LIBDIR_s390="lib32" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/parent b/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/parent deleted file mode 100644 index f3229c5b98..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/make.defaults deleted file mode 100644 index d7109b1cce..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/make.defaults +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.8 2011/12/07 19:21:37 vapier Exp $ - -# Jorge Manuel B. S. Vicetto (16 Nov 2011) -# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value -# This is so we build with multilib from the start -BOOTSTRAP_USE="${BOOTSTRAP_USE} multilib" - -# FEATURES="multilib-strict" specific settings. -MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib" -MULTILIB_STRICT_DENY="64-bit.*shared object" -MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev)" - -# 64-bit LIBDIR -LIBDIR_amd64="lib64" -LIBDIR_amd64_fbsd="lib64" -LIBDIR_n64="lib64" # MIPS n64 -LIBDIR_ppc64="lib64" -LIBDIR_s390x="lib64" -LIBDIR_sparc64="lib64" - -# 32-bit LIBDIR -LIBDIR_x86="lib" -LIBDIR_x86_fbsd="lib" -LIBDIR_o32="lib" # MIPS o32 -LIBDIR_ppc="lib" -LIBDIR_s390="lib" -LIBDIR_sparc32="lib" - -# Somewhere in-between! -LIBDIR_x32="libx32" # x86-64 x32 -LIBDIR_n32="lib32" # MIPS n32 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/package.use.mask deleted file mode 100644 index c705bca0e5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/package.use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/package.use.mask,v 1.1 2012/09/20 11:42:57 chithanh Exp $ - -# Matt Turner (19 Sep 2012) -# multilib requires 32-bit libGL provided by emul-linux-x86-opengl -# but also collides with 32-bit libGLU installed by emul-linux-x86-opengl -media-libs/glu multilib diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.force deleted file mode 100644 index e5a5660bc2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.force +++ /dev/null @@ -1,2 +0,0 @@ -# Force enable multilib USE flag -multilib diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.mask deleted file mode 100644 index cf7412dbac..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.mask +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2004-2008 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/use.mask,v 1.1 2008/04/01 17:41:09 wolf31o2 Exp $ - -# SECTION: Unmask - -# 2008/02/13 - Chris Gianelloni -# Unmask multilib, since we need to use it. --multilib