11 files changed, 32 insertions, 52 deletions
diff --git a/profiles/features/prefix/Changelog b/profiles/features/prefix/Changelog
index 15dff508dd17..e9fa3f849264 100644
--- a/profiles/features/prefix/Changelog
+++ b/profiles/features/prefix/Changelog
@@ -1,6 +1,10 @@
 # ChangeLog for profiles/features/prefix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/Changelog,v 1.5 2014/12/15 20:37:31 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/Changelog,v 1.6 2014/12/15 20:52:04 redlizard Exp $
+
+  15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> package.use.mask, packages,
+  rpath/packages:
+  Moved several nonlinux-specific clauses to /profiles/prefix.
 
   15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> rpath/use.force,
   rpath/use.mask, standalone/eapi, standalone/parent:
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask
index 32aa199eaf49..84670af0a4c9 100644
--- a/profiles/features/prefix/package.use.mask
+++ b/profiles/features/prefix/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/package.use.mask,v 1.1 2014/01/18 02:01:20 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/package.use.mask,v 1.2 2014/12/15 20:52:04 redlizard Exp $
 
 # Kacper Kowalik <xarthisius@gentoo.org> (14 Jan 2012)
 # sci-libs/mkl don't have prefix keywords
@@ -12,12 +12,6 @@ dev-python/numexpr mkl
 # about failing packages when using a vanilla compiler!
 sys-devel/gcc vanilla
 
-# Fabian Groffen <grobian@gentoo.org> (23 Oct 2010)
-# IPC relies on pipes, selects, polls, and more stuff that Python is
-# very bad with, that really causes way more issues than it is worth to
-# have some boundary bugs solved and more robust subshell die support
-sys-apps/portage ipc
-
 # Rafael Goncalves Martins <rafaelmartins@gentoo.org> (29 Sep 2010)
 # dev-libs/judy without prefix keywords
 # (amd64-linux and x86-linux)
diff --git a/profiles/features/prefix/packages b/profiles/features/prefix/packages
index fca85af9464b..1eaa183835b6 100644
--- a/profiles/features/prefix/packages
+++ b/profiles/features/prefix/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/packages,v 1.1 2014/01/18 02:01:20 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/packages,v 1.2 2014/12/15 20:52:04 redlizard Exp $
 
 # Gentoo Base Prefix Profile
 
@@ -17,8 +17,6 @@
 -*>=sys-apps/baselayout-2
 -*net-misc/iputils
 -*sys-apps/kbd
--*sys-process/procps
--*sys-process/psmisc
 -*sys-fs/e2fsprogs
 -*virtual/dev-manager
 -*virtual/modutils
diff --git a/profiles/features/prefix/rpath/packages b/profiles/features/prefix/rpath/packages
index 3dd03bccce18..df4dce436626 100644
--- a/profiles/features/prefix/rpath/packages
+++ b/profiles/features/prefix/rpath/packages
@@ -1,9 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/rpath/packages,v 1.1 2014/01/18 02:01:20 redlizard Exp $
-
-# we don't want binutils everywhere, only in linux and solaris
--*sys-devel/binutils
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/rpath/packages,v 1.2 2014/12/15 20:52:04 redlizard Exp $
 
 # we don't ever will install these, so no need to depend on them
 -*virtual/libc
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 67055a1801c2..51d06b5c71fd 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.439 2014/12/15 18:34:40 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.440 2014/12/15 20:52:04 redlizard Exp $
+
+  15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> package.use.mask, packages,
+  linux/package.use.mask, linux/packages, linux/use.force, linux/use.mask:
+  Moved several nonlinux-specific clauses from /profiles/features/prefix
+  to /profiles/prefix.
 
   15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> linux/amd64/package.use.mask,
   linux/amd64/use.force, linux/x86/package.use.mask, linux/x86/use.force:
diff --git a/profiles/prefix/linux/package.use.mask b/profiles/prefix/linux/package.use.mask
deleted file mode 100644
index 3b442e22a82a..000000000000
--- a/profiles/prefix/linux/package.use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/package.use.mask,v 1.5 2014/01/16 17:45:58 jer Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (23 Oct 2010)
-# IPC on Linux is well tested, since it's developed on that platform.
-sys-apps/portage -ipc
-
-# Michael Haubenwallner <haubi@gentoo.org> (30 Sep 2009)
-# linux can have a uuid implementation (#230981).
-x11-libs/libSM -uuid
diff --git a/profiles/prefix/linux/packages b/profiles/prefix/linux/packages
index f6aef1fca1a0..9ea066f2bffc 100644
--- a/profiles/prefix/linux/packages
+++ b/profiles/prefix/linux/packages
@@ -1,11 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/packages,v 1.2 2010/04/21 16:29:06 darkside Exp $
-
-# Add back what the parent removes.
-*sys-devel/binutils
-*sys-process/procps
-*sys-process/psmisc
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/packages,v 1.3 2014/12/15 20:52:04 redlizard Exp $
 
 # Here we remove packages that default/linux/packages pulls in and have no
 # business being in Gentoo Prefix
diff --git a/profiles/prefix/linux/use.force b/profiles/prefix/linux/use.force
deleted file mode 100644
index f5867fce05ee..000000000000
--- a/profiles/prefix/linux/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/use.force,v 1.1 2009/06/06 03:54:55 solar Exp $
-
-# Re-add Linux OS
-kernel_linux
-elibc_glibc
diff --git a/profiles/prefix/linux/use.mask b/profiles/prefix/linux/use.mask
deleted file mode 100644
index cb058976b970..000000000000
--- a/profiles/prefix/linux/use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/use.mask,v 1.4 2011/03/29 01:58:48 flameeyes Exp $
-
-# Re-add linux stuff that is masked in base/
--elibc_glibc
--kernel_linux
-#
-
-# Re-add acl, as it does work in prefixed Linux (if the host kernel supports it)
--acl
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index 72ce3321979c..502acf7faa35 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,11 +1,17 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.use.mask,v 1.23 2014/11/29 13:08:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.use.mask,v 1.24 2014/12/15 20:52:04 redlizard Exp $
 
 # Mikle Kolyada <zlogene@gentoo.org> (29 Nov 2014)
 # Masked because of lack of manpower/time (bug #497068)
 dev-vcs/git mediawiki
 
+# Fabian Groffen <grobian@gentoo.org> (23 Oct 2010)
+# IPC relies on pipes, selects, polls, and more stuff that Python is
+# very bad with, that really causes way more issues than it is worth to
+# have some boundary bugs solved and more robust subshell die support
+sys-apps/portage ipc
+
 # Michael Haubenwallner <haubi@gentoo.org> (17 Sep 2010)
 # sys-apps/keyutils is a linux only package
 app-crypt/mit-krb5 keyutils
diff --git a/profiles/prefix/packages b/profiles/prefix/packages
new file mode 100644
index 000000000000..e334bbc7bc80
--- /dev/null
+++ b/profiles/prefix/packages
@@ -0,0 +1,10 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/packages,v 1.10 2014/12/15 20:52:04 redlizard Exp $
+
+# we don't want binutils everywhere, only in linux and solaris
+-*sys-devel/binutils
+
+# linux only
+-*sys-process/procps
+-*sys-process/psmisc