Changing parent on the ppc64 profiles to point to the new 32ul and 64ul sub-profiles for arch/powerpc/ppc64.

8 files changed, 14 insertions, 94 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b38f90424868..e63d26ec046b 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1374 2008/04/30 19:36:45 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1375 2008/04/30 23:37:15 wolf31o2 Exp $
+
+  30 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  -default/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults,
+  default/linux/powerpc/ppc64/2008.0/32bit-userland/parent,
+  -default/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask,
+  -default/linux/powerpc/ppc64/2008.0/64bit-userland/package.mask,
+  default/linux/powerpc/ppc64/2008.0/64bit-userland/parent,
+  -default/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask,
+  -default/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals:
+  Changing parent on the ppc64 profiles to point to the new 32ul and 64ul
+  sub-profiles for arch/powerpc/ppc64.
 
   30 Apr 2008; Ryan Hill <dirtyepic@gentoo.org> arch/mips/use.mask,
   default-linux/mips/use.mask:
diff --git a/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults b/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults
deleted file mode 100644
index 060066630a86..000000000000
--- a/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults,v 1.1 2008/04/01 17:40:38 wolf31o2 Exp $
-
-# All extra USE/etc should be specified in sub-profiles.
-# DO NOT POLLUTE USE ON THIS PROFILE.
-
-ARCH="ppc"
-CHOST="powerpc-unknown-linux-gnu"
diff --git a/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/parent b/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/parent
index bacba104e0b2..898d55cbcebd 100644
--- a/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/parent
+++ b/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/parent
@@ -1,3 +1,2 @@
 ..
-../../../../../../arch/powerpc/ppc32
-../../../../../../features/32bit-userland
+../../../../../../arch/powerpc/ppc64/32ul
diff --git a/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask b/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask
deleted file mode 100644
index 9b09de2deaf0..000000000000
--- a/profiles/default/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# We mask this since we're not really a multilib profile
-multilib
diff --git a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/package.mask b/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/package.mask
deleted file mode 100644
index 0a1e66d858c6..000000000000
--- a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/package.mask,v 1.1 2008/04/08 15:44:45 wolf31o2 Exp $
-
-# <gcc-4 does not compile with >=gcc-4 on ppc64
-sys-libs/libstdc++-v3
-<sys-devel/gcc-4.1
diff --git a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/parent b/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/parent
index 2479a24f890a..0e4ae1732886 100644
--- a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/parent
+++ b/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../features/64bit-native
+../../../../../../arch/powerpc/ppc64/64ul
diff --git a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask b/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask
deleted file mode 100644
index 05b47661108a..000000000000
--- a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask
+++ /dev/null
@@ -1,67 +0,0 @@
-# this is a list of USE flags
-# that should not be used on PPC64
-# Tom Gall <tgall@gentoo.org> manages this list
-directfb
-krb4
-
-pda
-prelude
-mzscheme
-chasen
-mono
-beagle
-networkmanager
-
-# dietlibc
-diet
-
-#pyste has untested/unkeyworded deps on ppc64
-pyste
-
-# we don't have hardware to test. also see bug #113398
-dvb
-
-# 2006/03/20 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_chips
-video_cards_cirrus
-video_cards_glint
-video_cards_imstt
-video_cards_newport
-video_cards_s3
-video_cards_s3virge
-video_cards_savage
-video_cards_tdfx
-video_cards_trident
-video_cards_voodoo
-
-#until netbeans is keyworded
-netbeans
-
-#build is busted
-pike
-
-# mask pcmcia (bug #131306)
-pcmcia
-
-# conky dependencies missing keywords related (dragonheart -20061112)
-# media-sound/mpd
-mpd
-# app-admin/hddtemp
-hddtemp
-
-# mask pbbuttonsd - reported by Mr Bones, ok'd by dostrow
-pbbuttonsd
-
-# Unmask this here, since only ppc64 can use it
--ibm
-
-# Masking here so sys-fs/evms quits complaining
-hb
-hb2
-
-# USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh.
-# Bug #184563, 18 Sep 2007 
-# Robin H. Johnson <robbat2@gentoo.org>
-audit
-
diff --git a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals b/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals
deleted file mode 100644
index d4b49eb4ab0f..000000000000
--- a/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2004-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals,v 1.1 2008/04/01 17:40:40 wolf31o2 Exp $
-
-virtual/bootloader     sys-boot/yaboot-static