Inherit Mac OS X arch-specific masks through arch sub-tree

37 files changed, 182 insertions, 142 deletions

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 8e85df4a669c..e857f9c05905 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.314 2011/12/30 14:52:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.315 2011/12/30 15:49:34 grobian Exp $
+
+  30 Dec 2011; Fabian Groffen <grobian@gentoo.org>
+  +darwin/macos/10.4/package.use.mask, +darwin/macos/arch/ppc/package.mask,
+  +darwin/macos/arch/ppc/package.use.mask,
+  +darwin/macos/arch/ppc64/package.mask,
+  +darwin/macos/arch/ppc64/package.use.mask, +darwin/macos/arch/ppc64/parent,
+  +darwin/macos/arch/x64/package.mask, +darwin/macos/arch/x64/package.use.mask,
+  +darwin/macos/arch/x64/parent, +darwin/macos/arch/x86/package.mask,
+  +darwin/macos/arch/x86/package.use.mask,
+  darwin/macos/10.4/ppc/package.use.mask, darwin/macos/10.4/ppc/parent,
+  darwin/macos/10.4/ppc64/package.use.mask, darwin/macos/10.4/ppc64/parent,
+  darwin/macos/10.4/x86/package.use.mask, darwin/macos/10.4/x86/parent,
+  darwin/macos/10.5/package.use.mask, darwin/macos/10.5/ppc/package.use.mask,
+  darwin/macos/10.5/ppc/parent, darwin/macos/10.5/ppc64/package.use.mask,
+  darwin/macos/10.5/ppc64/parent, darwin/macos/10.5/x64/package.use.mask,
+  darwin/macos/10.5/x64/parent, darwin/macos/10.5/x86/package.use.mask,
+  darwin/macos/10.5/x86/parent, darwin/macos/10.6/package.use.mask,
+  darwin/macos/10.6/x64/package.use.mask, darwin/macos/10.6/x64/parent,
+  darwin/macos/10.6/x86/package.use.mask, darwin/macos/10.6/x86/parent,
+  darwin/macos/10.7/x64/package.use.mask, darwin/macos/10.7/x64/parent,
+  darwin/macos/10.7/x86/package.use.mask, darwin/macos/10.7/x86/parent,
+  darwin/macos/package.use.mask:
+  Inherit Mac OS X arch-specific masks through arch sub-tree
 
   30 Dec 2011; Fabian Groffen <grobian@gentoo.org>
   +sunos/solaris/5.11/sparc/package.mask, darwin/package.mask,
diff --git a/profiles/prefix/darwin/macos/10.4/package.use.mask b/profiles/prefix/darwin/macos/10.4/package.use.mask
new file mode 100644
index 000000000000..5b704bb0bcb1
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.4/package.use.mask
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/package.use.mask,v 1.1 2011/12/30 15:49:34 grobian Exp $
+
+
+# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
+# mach_override.h missing
+# http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
+dev-lang/erlang hipe
+
+# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
+# there's no (official) java6 on macosx
+dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask b/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
index 4f711c05002c..2b8ffe1e07fa 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
@@ -1,11 +1,4 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask,v 1.1 2011/05/01 15:32:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask,v 1.2 2011/12/30 15:49:34 grobian Exp $
 
-# Joseph Jezak <JoseJX@gentoo.org> (25 Jan 2011)
-# x11-libs/qt-webkit doesn't have a working JIT yet on PowerPC
-x11-libs/qt-webkit jit
-
-# Tomas Touceda <chiiph@gentoo.org> (21 Nov 2010)
-# JIT isn't implemented on ppc: bug #346167
-x11-libs/qt-script jit
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/parent b/profiles/prefix/darwin/macos/10.4/ppc/parent
index f3229c5b9876..6cb6381b7779 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc/parent
+++ b/profiles/prefix/darwin/macos/10.4/ppc/parent
@@ -1 +1,2 @@
+../../arch/ppc
 ..
diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask b/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask
index 64e979335cfa..d0c06b601b90 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask
@@ -1,12 +1,4 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask,v 1.1 2011/05/01 15:32:07 grobian Exp $
-
-# Joseph Jezak <JoseJX@gentoo.org> (25 Jan 2011)
-# x11-libs/qt-webkit doesn't have a working JIT yet on PowerPC
-x11-libs/qt-webkit jit
-
-# Tomas Touceda <chiiph@gentoo.org> (21 Nov 2010)
-# JIT isn't implemented on ppc: bug #346167
-x11-libs/qt-script jit
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/package.use.mask,v 1.2 2011/12/30 15:49:34 grobian Exp $
 
diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/parent b/profiles/prefix/darwin/macos/10.4/ppc64/parent
index f3229c5b9876..4d64089b7bd3 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc64/parent
+++ b/profiles/prefix/darwin/macos/10.4/ppc64/parent
@@ -1 +1,2 @@
+../../arch/ppc64
 ..
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.use.mask b/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
index 2e0d9c443648..8b5d9ac0bdc1 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
@@ -1,19 +1,5 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/package.use.mask,v 1.3 2010/07/29 16:48:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/package.use.mask,v 1.4 2011/12/30 15:49:35 grobian Exp $
 
-# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
-# Issues on 32bit osx, bug 329859
-media-sound/mpg123 mmx sse
 
-# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
-# http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
-dev-lang/erlang hipe
-
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
-
-# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
-# mc fails to compile with USE=slang (unicode implies slang)
-app-misc/mc unicode slang
diff --git a/profiles/prefix/darwin/macos/10.4/x86/parent b/profiles/prefix/darwin/macos/10.4/x86/parent
index f3229c5b9876..4a6aa36b18d9 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/parent
+++ b/profiles/prefix/darwin/macos/10.4/x86/parent
@@ -1 +1,2 @@
+../../arch/x86
 ..
diff --git a/profiles/prefix/darwin/macos/10.5/package.use.mask b/profiles/prefix/darwin/macos/10.5/package.use.mask
index b6d839970ac2..0528d3694e6d 100644
--- a/profiles/prefix/darwin/macos/10.5/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/package.use.mask
@@ -1,3 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/package.use.mask,v 1.1 2009/06/06 03:54:49 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
+
+
+# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
+# mach_override.h missing
+# http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
+dev-lang/erlang hipe
+
+# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
+# there's no (official) java6 on macosx
+dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
index 67659d0ca17e..e29aa3b4bded 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
@@ -1,37 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask,v 1.7 2011/05/01 15:32:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask,v 1.8 2011/12/30 15:49:35 grobian Exp $
 
-# Joseph Jezak <JoseJX@gentoo.org> (25 Jan 2011)
-# x11-libs/qt-webkit doesn't have a working JIT yet on PowerPC
-x11-libs/qt-webkit jit
-
-# Tomas Touceda <chiiph@gentoo.org> (21 Nov 2010)
-# JIT isn't implemented on ppc: bug #346167
-x11-libs/qt-script jit
-
-# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
-# mc fails to compile with USE=slang (unicode implies slang)
-app-misc/mc unicode slang
-
-# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
-# imlib2 does not compile with USE=mmx
-media-libs/imlib2 mmx
-
-# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
-# libpng does not compile with USE=mmx
-media-libs/libpng mmx
-
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
 
 # flag returns compile errors
 media-video/mplayer livecd cpudetection
 # libs mising
 media-video/mplayer gtk sdl libcaca dv nas musepack bidi enca real win32codecs cdparanoia samba xanim live openal
-# X only
-media-video/mplayer xvmc xv dga X xinerama
-# linux only
-media-video/mplayer dvb esd lirc svga jack joystick matrox
-media-sound/mpg123 mmx
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/parent b/profiles/prefix/darwin/macos/10.5/ppc/parent
index f3229c5b9876..6cb6381b7779 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/parent
+++ b/profiles/prefix/darwin/macos/10.5/ppc/parent
@@ -1 +1,2 @@
+../../arch/ppc
 ..
diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask b/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask
index 881662a58db2..aa759d61cb25 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask
@@ -1,12 +1,4 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask,v 1.1 2011/05/01 15:32:07 grobian Exp $
-
-# Joseph Jezak <JoseJX@gentoo.org> (25 Jan 2011)
-# x11-libs/qt-webkit doesn't have a working JIT yet on PowerPC
-x11-libs/qt-webkit jit
-
-# Tomas Touceda <chiiph@gentoo.org> (21 Nov 2010)
-# JIT isn't implemented on ppc: bug #346167
-x11-libs/qt-script jit
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/ppc64/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
 
diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/parent b/profiles/prefix/darwin/macos/10.5/ppc64/parent
index f3229c5b9876..4d64089b7bd3 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc64/parent
+++ b/profiles/prefix/darwin/macos/10.5/ppc64/parent
@@ -1 +1,2 @@
+../../arch/ppc64
 ..
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.use.mask b/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
index 1bcffe030266..64b290da4ef0 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
@@ -1,11 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.use.mask,v 1.4 2011/04/08 14:28:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.use.mask,v 1.5 2011/12/30 15:49:35 grobian Exp $
 
-# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
-# mc fails to compile with USE=slang (unicode implies slang)
-app-misc/mc unicode slang
 
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/10.5/x64/parent b/profiles/prefix/darwin/macos/10.5/x64/parent
index f3229c5b9876..fc24616eeda4 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/parent
+++ b/profiles/prefix/darwin/macos/10.5/x64/parent
@@ -1 +1,2 @@
+../../arch/x64
 ..
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.use.mask b/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
index 70f2cbe5166c..40b737e0e084 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
@@ -1,19 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/package.use.mask,v 1.5 2011/04/07 18:47:44 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/package.use.mask,v 1.6 2011/12/30 15:49:35 grobian Exp $
 
-# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
-# Issues on 32bit osx, bug 329859
-media-sound/mpg123 mmx sse
 
-# Fabian Groffen <grobian@gentoo.org> (01 Feb 2009)
-# Doesn't compile, bug #257225
-media-video/ffmpeg mmx
-
-# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
-# http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
-dev-lang/erlang hipe
-
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/10.5/x86/parent b/profiles/prefix/darwin/macos/10.5/x86/parent
index f3229c5b9876..4a6aa36b18d9 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/parent
+++ b/profiles/prefix/darwin/macos/10.5/x86/parent
@@ -1 +1,2 @@
+../../arch/x86
 ..
diff --git a/profiles/prefix/darwin/macos/10.6/package.use.mask b/profiles/prefix/darwin/macos/10.6/package.use.mask
index 595eb24945c4..aaf2b7779d9d 100644
--- a/profiles/prefix/darwin/macos/10.6/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.6/package.use.mask
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/package.use.mask,v 1.2 2011/04/10 18:39:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/package.use.mask,v 1.3 2011/12/30 15:49:35 grobian Exp $
 
-# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
-# as long as util-linux installs uuid.h which breaks the system headers
-# (hence we don't) we can't do uuid support here
-x11-libs/libSM -uuid
+
+# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
+# there's no (official) java6 on macosx
+dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.use.mask b/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
index eab716864a72..191ff805e7bd 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
@@ -1,11 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.use.mask,v 1.4 2011/04/07 18:47:44 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.use.mask,v 1.5 2011/12/30 15:49:35 grobian Exp $
 
-# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
-# mc fails to compile with USE=slang (unicode implies slang)
-app-misc/mc unicode slang
 
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/10.6/x64/parent b/profiles/prefix/darwin/macos/10.6/x64/parent
index f3229c5b9876..fc24616eeda4 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/parent
+++ b/profiles/prefix/darwin/macos/10.6/x64/parent
@@ -1 +1,2 @@
+../../arch/x64
 ..
diff --git a/profiles/prefix/darwin/macos/10.6/x86/package.use.mask b/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
index ae791949c546..067c294d2afe 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
@@ -1,15 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/package.use.mask,v 1.5 2011/04/07 18:47:44 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x86/package.use.mask,v 1.6 2011/12/30 15:49:35 grobian Exp $
 
-# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
-# Issues on 32bit osx, bug 329859
-media-sound/mpg123 mmx sse
 
-# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
-# mc fails to compile with USE=slang (unicode implies slang)
-app-misc/mc unicode slang
-
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/10.6/x86/parent b/profiles/prefix/darwin/macos/10.6/x86/parent
index f3229c5b9876..4a6aa36b18d9 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/parent
+++ b/profiles/prefix/darwin/macos/10.6/x86/parent
@@ -1 +1,2 @@
+../../arch/x86
 ..
diff --git a/profiles/prefix/darwin/macos/10.7/x64/package.use.mask b/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
index e240021bdbb0..ce97a8166fbf 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
@@ -1,11 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x64/package.use.mask,v 1.1 2011/07/04 08:27:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x64/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
 
-# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
-# mc fails to compile with USE=slang (unicode implies slang)
-app-misc/mc unicode slang
 
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/10.7/x64/parent b/profiles/prefix/darwin/macos/10.7/x64/parent
index f3229c5b9876..fc24616eeda4 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/parent
+++ b/profiles/prefix/darwin/macos/10.7/x64/parent
@@ -1 +1,2 @@
+../../arch/x64
 ..
diff --git a/profiles/prefix/darwin/macos/10.7/x86/package.use.mask b/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
index 678212c19f26..79f4e3deada7 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
@@ -1,15 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x86/package.use.mask,v 1.1 2011/07/04 08:27:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.7/x86/package.use.mask,v 1.2 2011/12/30 15:49:35 grobian Exp $
 
-# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
-# Issues on 32bit osx, bug 329859
-media-sound/mpg123 mmx sse
 
-# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
-# mc fails to compile with USE=slang (unicode implies slang)
-app-misc/mc unicode slang
-
-# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
-# elinks does not compile with USE=perl (tested with 0.11.{2,3})
-www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/10.7/x86/parent b/profiles/prefix/darwin/macos/10.7/x86/parent
index f3229c5b9876..4a6aa36b18d9 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/parent
+++ b/profiles/prefix/darwin/macos/10.7/x86/parent
@@ -1 +1,2 @@
+../../arch/x86
 ..
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask b/profiles/prefix/darwin/macos/arch/ppc/package.mask
new file mode 100644
index 000000000000..44a3caa4de08
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/ppc/package.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
+
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
new file mode 100644
index 000000000000..22910145e9ee
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/ppc/package.use.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
+
+# Joseph Jezak <JoseJX@gentoo.org> (25 Jan 2011)
+# x11-libs/qt-webkit doesn't have a working JIT yet on PowerPC
+x11-libs/qt-webkit jit
+
+# Tomas Touceda <chiiph@gentoo.org> (21 Nov 2010)
+# JIT isn't implemented on ppc: bug #346167
+x11-libs/qt-script jit
+
+# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
+# imlib2 does not compile with USE=mmx
+media-libs/imlib2 mmx
+
+# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
+# libpng does not compile with USE=mmx
+media-libs/libpng mmx
+
+# Elias Pipping <pipping@gentoo.org> (01 Sep 2007)
+# mpg123 does not compile with USE=mmx
+media-sound/mpg123 mmx
diff --git a/profiles/prefix/darwin/macos/arch/ppc64/package.mask b/profiles/prefix/darwin/macos/arch/ppc64/package.mask
new file mode 100644
index 000000000000..99325323344e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc64/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/ppc64/package.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
diff --git a/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask b/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask
new file mode 100644
index 000000000000..ac534b421c9d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/ppc64/package.use.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
diff --git a/profiles/prefix/darwin/macos/arch/ppc64/parent b/profiles/prefix/darwin/macos/arch/ppc64/parent
new file mode 100644
index 000000000000..3f4be82271fb
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc64/parent
@@ -0,0 +1 @@
+../ppc
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.mask b/profiles/prefix/darwin/macos/arch/x64/package.mask
new file mode 100644
index 000000000000..1e2eb49bed1d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x64/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x64/package.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.mask b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
new file mode 100644
index 000000000000..52bab7b181f3
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x64/package.use.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
+
+# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
+# Relocation issues on 32-bit OSX only, bug #329859
+media-sound/mpg123 -mmx -sse
+
+# Fabian Groffen <grobian@gentoo.org> (01 Feb 2009)
+# Doesn't compile on 32-bits OSX only, bug #257225
+media-video/ffmpeg -mmx
diff --git a/profiles/prefix/darwin/macos/arch/x64/parent b/profiles/prefix/darwin/macos/arch/x64/parent
new file mode 100644
index 000000000000..e6e4a52dfb37
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x64/parent
@@ -0,0 +1 @@
+../x86
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.mask b/profiles/prefix/darwin/macos/arch/x86/package.mask
new file mode 100644
index 000000000000..55491bb281b7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x86/package.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.mask b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
new file mode 100644
index 000000000000..f0fb4a656f6a
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/arch/x86/package.use.mask,v 1.1 2011/12/30 15:49:36 grobian Exp $
+
+# The 32-bits profile is inherited by the 64-bits one!
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
+
+# Jeremy Olexa <darkside@gentoo.org> (29 Jul 2010)
+# Relocation issues on 32-bit OSX, bug #329859
+media-sound/mpg123 mmx sse
+
+# Fabian Groffen <grobian@gentoo.org> (01 Feb 2009)
+# Doesn't compile, bug #257225
+media-video/ffmpeg mmx
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index 1daed6c3bd53..84abde1adf17 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.use.mask,v 1.9 2011/02/09 18:59:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.use.mask,v 1.10 2011/12/30 15:49:34 grobian Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (30 Oct 2009)
-# X only
+# X and linux only
 media-video/mplayer xvmc xv dga X xinerama
+media-video/mplayer dvb esd lirc svga jack joystick matrox
 
 # Jeremy Olexa <darkside@gentoo.org> (12 Feb 2009)
 # Doesn't work with python support, bug 257572
@@ -15,6 +16,10 @@ gnome-extra/libgsf python
 # that's fixed it still doesn't work)
 dev-vcs/subversion dso
 
-# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
-# there's no (official) java6 on macosx
-dev-util/checkstyle test
+# Elias Pipping <pipping@gentoo.org> (13 Sep 2007)
+# mc fails to compile with USE=slang (unicode implies slang)
+app-misc/mc unicode slang
+
+# Elias Pipping <pipping@gentoo.org> (27 Aug 2007)
+# elinks does not compile with USE=perl (tested with 0.11.{2,3})
+www-client/elinks perl