Moved most of the prefix base profile to the new features/prefix profile.

28 files changed, 276 insertions, 238 deletions

diff --git a/profiles/features/ChangeLog b/profiles/features/ChangeLog
index 720f9b1517fe..4f8b4c440cd9 100644
--- a/profiles/features/ChangeLog
+++ b/profiles/features/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.74 2013/12/29 14:28:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/ChangeLog,v 1.75 2014/01/18 02:01:20 redlizard Exp $
+
+  18 Jan 2014; Ruud Koolen <redlizard@gentoo.org> prefix:
+  Created prefix feature profile tree
 
   29 Dec 2013; Sven Vermeulen <swift@gentoo.org> selinux/package.mask:
   Unmask selinux-mandb
diff --git a/profiles/features/prefix/Changelog b/profiles/features/prefix/Changelog
new file mode 100644
index 000000000000..a1586d9f25e5
--- /dev/null
+++ b/profiles/features/prefix/Changelog
@@ -0,0 +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.1 2014/01/18 02:01:20 redlizard Exp $
+
+  18 Jan 2014; Ruud Koolen <redlizard@gentoo.org> eapi, make.defaults,
+  package.mask, packages, package.use.mask, use.force, use.mask,
+  use.mask.stable, rpath/packages, rpath/parent, rpath/profile.bashrc,
+  rpath/use.mask:
+  Imported profile contents from ../../prefix
+
diff --git a/profiles/prefix/eapi b/profiles/features/prefix/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/prefix/eapi
+++ b/profiles/features/prefix/eapi
diff --git a/profiles/features/prefix/make.defaults b/profiles/features/prefix/make.defaults
new file mode 100644
index 000000000000..561927a782e2
--- /dev/null
+++ b/profiles/features/prefix/make.defaults
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/make.defaults,v 1.1 2014/01/18 02:01:20 redlizard Exp $
+
+# Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
+# As of now, there does not exist a reliable working sandbox implementation on
+# any Gentoo Prefix platform. Lately, sandbox has caused *many* issues that
+# the Gentoo Prefix team has no time to fix and/or troubleshoot. see: bug 271424
+# see:
+# http://archives.gentoo.org/gentoo-alt/msg_3c355ca5e70e7975eae293823f1751f2.xml
+# see: bug 274239
+# and other issues, etc etc.
+#
+# If in the future, there does exist a working sandbox implementation then it
+# should be enabled on a per-profile basis only.
+FEATURES="${FEATURES} -sandbox"
+
+# this probably already is like this, but we assure that in prefix we
+# have a GNU userland
+USERLAND="GNU"
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask
new file mode 100644
index 000000000000..7020e41dad66
--- /dev/null
+++ b/profiles/features/prefix/package.mask
@@ -0,0 +1,103 @@
+# 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.mask,v 1.1 2014/01/18 02:01:20 redlizard Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (09 Nov 2012)
+# fails to properly run config.status (and thus create libtool) on
+# non-Linux platforms, fails with hard error when not using bash, caused
+# by EAPI 4's --disable-dependency-tracking (#383863 c12)
+=dev-libs/libgpg-error-1.10-r1
+
+# Fabian Groffen <grobian@gentoo.org> (27 Oct 2012)
+# fails to compile with parallel make (help2man issues)
+# fails to link wrt libiconv
+=sys-apps/coreutils-8.20
+
+# Benda Xu <heroxbd@gentoo.org> (07 Aug 2012)
+# mask revision for testing out openrc. bug #415895. 
+=sys-apps/baselayout-prefix-1.12.14-r1
+
+# Fabian Groffen <grobian@gentoo.org> (01 Aug 2012)
+# Causes spurious errors due to considering some small files being
+# binary, bug #425668, comment #21.
+=sys-apps/grep-2.13
+
+# Jeremy Olexa <darkside@gentoo.org> (28 Oct 2011)
+# Masking selective games-*, www-apps/*, net-proxy/* packages because:
+# 1) It is unclear if there are any users
+# 2) We would like to NOT migrate packages (to gentoo-x86) if we don't have to.
+#
+# If this is a package that you would like to see in the tree, please open a bug
+# report for inclusion (search first).
+# This mask will be lifted in 60 days and the packages will not be supporting
+# Gentoo Prefix at that time.
+games-arcade/rocksndiamonds
+games-board/xscrabble
+games-misc/cowsay
+games-misc/fortune-mod-gentoo-dev
+games-misc/rfksay
+games-sports/bygfoot
+net-proxy/tinyproxy
+www-apps/trac
+
+# Fabian Groffen <grobian@gentoo.org> (21 Apr 2011)
+# Fails to link anything, since it crt1.o cannot be found.  They haven't
+# got linking right yet, numerous people on the web report the same
+# problem.  Let's just wait for the moment.
+~sys-devel/llvm-2.9
+~sys-devel/clang-2.9
+
+# Fabian Groffen <grobian@gentoo.org> (03 Feb 2011)
+# Diego's experimental flex for fixing from autoconf problem, breaks
+# bootstrapping, bug #353609
+=sys-devel/flex-2.5.35_p10
+
+# Fabian Groffen <grobian@gentoo.org> (24 Jan 2011)
+# This release breaks in multiple ways (posix_memalign, O_DIRECT), wait
+# for upstream to sanitise their code (or someone else to do it, since
+# many people are affected: uClibc, BSD, ...)
+=sys-fs/e2fsprogs-1.41.14
+
+# Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
+# The PAM auth system just will not work in Gentoo Prefix, instead the host auth
+# system should be used.
+sys-libs/pam
+sys-auth/pambase
+
+# Jeremy Olexa <darkside@gentoo.org> (02 Jun 2009)
+# If you have MacFuse or some other implementation of fuse installed, you can
+# probably use this by placing sys-fs/fuse in package.provided, bug 272210
+net-fs/curlftpfs
+
+# Jeremy Olexa <darkside@gentoo.org> (21 Apr 2009)
+# User reported that it works fine but will not install for me due to unknown
+# kernel location, etc. See bug 265276 for an example.
+net-wireless/iw
+dev-libs/libnl
+net-wireless/aircrack-ng
+
+# Jeremy Olexa <darkside@gentoo.org> (02 Dec 2008)
+# Reported to work. However, you will need to package.provide some deps. 
+# See bug 248809 for more details.
+net-fs/openafs
+
+# Markus Duft <mduft@gentoo.org> (17 Apr 2008)
+# Breaks things like gettext and fastjar because it introduces some
+# circular dependencies while running aclocal (bug #218122)
+~sys-devel/autoconf-2.62
+
+# Fabian Groffen <grobian@gentoo.org> (11 Jan 2008)
+# Screws up things, see bug #204998
+<sys-devel/gcc-3.4.0
+
+# Fabian Groffen <grobian@gentoo.org> (05 Jan 2008)
+# missing rule in the build.xml file
+=dev-java/sun-javamail-1.4.1
+
+# Fabian Groffen <grobian@gentoo.org> (02 Jan 2008)
+# rlogin seems not to work, consider using ssh anyway
+net-misc/netkit-rsh
+
+# Elias Pipping <pipping@gentoo.org>
+# work in progress (in prefix)
+app-emacs/jde
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask
new file mode 100644
index 000000000000..32aa199eaf49
--- /dev/null
+++ b/profiles/features/prefix/package.use.mask
@@ -0,0 +1,58 @@
+# 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 $
+
+# Kacper Kowalik <xarthisius@gentoo.org> (14 Jan 2012)
+# sci-libs/mkl don't have prefix keywords
+dev-python/numexpr mkl
+
+# Fabian Groffen <grobian@gentoo.org> (08 Dec 2011)
+# USE=vanilla produces a broken compiler for Prefix.  Only use this flag
+# when you're absolutely sure what you're doing.  Do NOT report bugs
+# 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)
+sci-electronics/gtkwave judy
+
+# Jonathan Callen <abcd@gentoo.org> (22 Feb 2010)
+# ppp is not available in Prefix
+kde-base/kdenetwork-meta ppp
+
+# Christian Faulhammer <fauli@gentoo.org> (09 Jan 2010)
+# hesiod and m17n-lib are not available in Prefix
+app-editors/emacs-vcs hesiod m17n-lib
+app-editors/emacs hesiod m17n-lib
+
+# Jeremy Olexa <darkside@gentoo.org> (30 Sep 2009)
+# berkdb has hardcoded paths all over, breaks on linux at least. Use flag
+# disappearing in next bump: prefix can be early and force it to be not used to
+# save headaches.
+# NOTE to prefix devs: if it needs to not be a global mask, talk to me because
+# it currently causes failures on linux. It can be made a "less global" mask.
+dev-lang/python berkdb
+
+# Jeremy Olexa <darkside@gentoo.org> (02 Sep 2009)
+# these don't work, because they rely on the host having sufficient xorg-server
+# version.
+xfce-base/xfce4-meta session
+
+# Jeremy Olexa <darkside@gentoo.org> (13 Feb 2009)
+# Can't make USE=ssl to work, bad build system. bug #256699
+dev-lang/pike ssl
+
+# Elias Pipping <pipping@gentoo.org> (18 Nov 2007)
+# feynmf fails to build documentation
+dev-tex/feynmf doc
+
+# Elias Pipping <pipping@gentoo.org> (15 Nov 2007)
+# pkg_postinst tries to create/delete a user, fails
+dev-libs/cyrus-sasl berkdb gdbm
diff --git a/profiles/prefix/packages b/profiles/features/prefix/packages
index 21c949412af7..fca85af9464b 100644
--- a/profiles/prefix/packages
+++ b/profiles/features/prefix/packages
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/packages,v 1.8 2013/08/29 02:58:55 jcallen Exp $
+# 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 $
 
 # Gentoo Base Prefix Profile
 
-# NOTE: THIS IS THE BASE PROFILE FOR *ANY* PREFIX BASED OPERATING SYSTEM.
+# NOTE: THIS MODIFIES THE BASE PROFILE FOR *ANY* PREFIX BASED OPERATING SYSTEM.
 # NO MODIFICATIONS MAY BE MADE TO THIS FILE WITHOUT PRIOR DISCUSSION.  IF
 # YOU ARE CREATING A NEW PROFILE, YOU SIMPLY NEED TO INHERIT THIS BASE
 # PROFILE IN YOUR PROFILE DIRECTORY'S "parent" FILE.
 
-# Read the descriptions of ../base/packages for some explanation
+# Read the descriptions of ../../base/packages for some explanation
 
 # This file removes everything from the base profile which is not
 # necessary/desired in a prefix environment.
@@ -27,13 +27,6 @@
 # add back prefix baselayout
 *sys-apps/baselayout-prefix
 
-# we don't want binutils everywhere, only in linux and solaris
--*sys-devel/binutils
-
-# we don't ever will install these, so no need to depend on them
--*virtual/libc
--*virtual/os-headers
-
 # we don't want this either (as baselayout-prefix provides the functions.sh
 # file that this was added to ../base/packages for)
 -*sys-apps/openrc
diff --git a/profiles/features/prefix/rpath/packages b/profiles/features/prefix/rpath/packages
new file mode 100644
index 000000000000..3dd03bccce18
--- /dev/null
+++ b/profiles/features/prefix/rpath/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/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
+
+# we don't ever will install these, so no need to depend on them
+-*virtual/libc
+-*virtual/os-headers
diff --git a/profiles/features/prefix/rpath/parent b/profiles/features/prefix/rpath/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/features/prefix/rpath/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/profile.bashrc b/profiles/features/prefix/rpath/profile.bashrc
index a8e6802877fa..198874b470e3 100644
--- a/profiles/prefix/profile.bashrc
+++ b/profiles/features/prefix/rpath/profile.bashrc
@@ -1,5 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/profile.bashrc,v 1.5 2012/11/10 09:46:11 grobian Exp $
+# 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/profile.bashrc,v 1.1 2014/01/18 02:01:20 redlizard Exp $
 
 # Hack to avoid every package that uses libiconv/gettext
 # install a charset.alias that will collide with libiconv's one
diff --git a/profiles/features/prefix/rpath/use.mask b/profiles/features/prefix/rpath/use.mask
new file mode 100644
index 000000000000..80ad42e21fcb
--- /dev/null
+++ b/profiles/features/prefix/rpath/use.mask
@@ -0,0 +1,7 @@
+# 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/use.mask,v 1.1 2014/01/18 02:01:20 redlizard Exp $
+
+# multilib is never going to work as expected in Prefix rpath
+multilib
+
diff --git a/profiles/features/prefix/use.force b/profiles/features/prefix/use.force
new file mode 100644
index 000000000000..ce1721b8e078
--- /dev/null
+++ b/profiles/features/prefix/use.force
@@ -0,0 +1,9 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/use.force,v 1.1 2014/01/18 02:01:20 redlizard Exp $
+
+# force prefix flag to be set
+prefix
+
+# force GNU userland (even though base profile sets this too)
+userland_GNU
diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask
new file mode 100644
index 000000000000..7d136d0943e4
--- /dev/null
+++ b/profiles/features/prefix/use.mask
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/use.mask,v 1.1 2014/01/18 02:01:20 redlizard Exp $
+
+# prefix USE flag should always be unmasked in prefix profiles
+-prefix
+
+# re-add userland GNU
+-userland_GNU
+
+# USE flags inherited by the base/use.defaults file that shouldn't be in Prefix
+cups
+gpm
+
+# USE=pam just does not make sense in Gentoo Prefix. Should be using the host
+# auth system.
+pam
+
+# USE=udev just does not make sense in Gentoo Prefix. bug 293480
+udev
+
+# The JRuby stack adds *alot* of non-tested ebuilds. If someone has time and
+# motivation, please look into porting this to Gentoo Prefix. bug 302563
+ruby_targets_jruby
+
+# suid requires root privilege, which is not support by prefix in general
+# one example: bug 447340.
+suid
diff --git a/profiles/prefix/use.stable.mask b/profiles/features/prefix/use.stable.mask
index 81725135c419..15f1acd6917a 100644
--- a/profiles/prefix/use.stable.mask
+++ b/profiles/features/prefix/use.stable.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/use.stable.mask,v 1.1 2013/12/17 20:08:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/use.stable.mask,v 1.1 2014/01/18 02:01:20 redlizard Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (17 Dec 2013)
 # Python 3.3 is better patched than 3.2 for us, gx86 goes too, bug #474128
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index ff0678b5869d..0bca68decd0a 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.408 2014/01/16 17:45:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.409 2014/01/18 02:01:21 redlizard Exp $
+
+  18 Jan 2014; Ruud Koolen <redlizard@gentoo.org> eapi, make.defaults,
+  package.mask, packages, package.use.mask, parent, use.force, use.mask,
+  use.mask.stable:
+  Moved base prefix profile content to ../features/prefix, to be shared with
+  prefix-standalone profiles.
 
   16 Jan 2014; Jeroen Roovers <jer@gentoo.org> bsd/package.use.mask,
   linux/package.use.mask:
diff --git a/profiles/prefix/aix/parent b/profiles/prefix/aix/parent
index cd1149221a41..f3229c5b9876 100644
--- a/profiles/prefix/aix/parent
+++ b/profiles/prefix/aix/parent
@@ -1,2 +1 @@
-../../base
 ..
diff --git a/profiles/prefix/bsd/parent b/profiles/prefix/bsd/parent
index cd1149221a41..f3229c5b9876 100644
--- a/profiles/prefix/bsd/parent
+++ b/profiles/prefix/bsd/parent
@@ -1,2 +1 @@
-../../base
 ..
diff --git a/profiles/prefix/darwin/parent b/profiles/prefix/darwin/parent
index cd1149221a41..f3229c5b9876 100644
--- a/profiles/prefix/darwin/parent
+++ b/profiles/prefix/darwin/parent
@@ -1,2 +1 @@
-../../base
 ..
diff --git a/profiles/prefix/hpux/parent b/profiles/prefix/hpux/parent
index cd1149221a41..f3229c5b9876 100644
--- a/profiles/prefix/hpux/parent
+++ b/profiles/prefix/hpux/parent
@@ -1,2 +1 @@
-../../base
 ..
diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent
index f3229c5b9876..9c654750f678 100644
--- a/profiles/prefix/linux/parent
+++ b/profiles/prefix/linux/parent
@@ -1 +1 @@
-..
+../../features/prefix/rpath
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index 43dd81c09f18..509800e8ee7c 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/make.defaults,v 1.6 2013/12/17 20:08:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/make.defaults,v 1.7 2014/01/18 02:01:21 redlizard Exp $
 
 # Some USE-flags that only die-hards don't want:
 # readline:  to have some sane command line editing, e.g. in python
@@ -11,23 +11,6 @@ USE="readline zlib ncurses ssl"
 
 FEATURES="collision-protect"
 
-# Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
-# As of now, there does not exist a reliable working sandbox implementation on
-# any Gentoo Prefix platform. Lately, sandbox has caused *many* issues that
-# the Gentoo Prefix team has no time to fix and/or troubleshoot. see: bug 271424
-# see:
-# http://archives.gentoo.org/gentoo-alt/msg_3c355ca5e70e7975eae293823f1751f2.xml
-# see: bug 274239
-# and other issues, etc etc.
-#
-# If in the future, there does exist a working sandbox implementation then it
-# should be enabled on a per-profile basis only.
-FEATURES="${FEATURES} -sandbox"
-
 # Fabian Groffen <grobian@gentoo.org> (17 Dec 2013)
 # Unmask/use Python 3.3, bug #474128
 USE="${USE} -python_targets_python3_2 python_targets_python3_3"
-
-# this probably already is like this, but we assure that in prefix we
-# have a GNU userland
-USERLAND="GNU"
diff --git a/profiles/prefix/mint/parent b/profiles/prefix/mint/parent
index cd1149221a41..f3229c5b9876 100644
--- a/profiles/prefix/mint/parent
+++ b/profiles/prefix/mint/parent
@@ -1,2 +1 @@
-../../base
 ..
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index 35d0be6dc462..751210de8d89 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.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/prefix/package.mask,v 1.119 2014/01/02 22:49:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.mask,v 1.120 2014/01/18 02:01:21 redlizard Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked.  This file is for
@@ -9,120 +9,19 @@
 # NOTE: Please add your entry at the top!
 #
 
-
-# Fabian Groffen <grobian@gentoo.org> (09 Nov 2012)
-# fails to properly run config.status (and thus create libtool) on
-# non-Linux platforms, fails with hard error when not using bash, caused
-# by EAPI 4's --disable-dependency-tracking (#383863 c12)
-=dev-libs/libgpg-error-1.10-r1
-
-# Fabian Groffen <grobian@gentoo.org> (27 Oct 2012)
-# fails to compile with parallel make (help2man issues)
-# fails to link wrt libiconv
-=sys-apps/coreutils-8.20
-
-# Benda Xu <heroxbd@gentoo.org> (07 Aug 2012)
-# mask revision for testing out openrc. bug #415895. 
-=sys-apps/baselayout-prefix-1.12.14-r1
-
-# Fabian Groffen <grobian@gentoo.org> (01 Aug 2012)
-# Causes spurious errors due to considering some small files being
-# binary, bug #425668, comment #21.
-=sys-apps/grep-2.13
-
 # Fabian Groffen <grobian@gentoo.org> (29 Apr 2012)
 # AT_FDCWD, openat, faccessat, etc. issues on probably all but Linux
 # platforms, masking for now.
 >=app-misc/pax-utils-0.3
 
-# Jeremy Olexa <darkside@gentoo.org> (28 Oct 2011)
-# Masking selective games-*, www-apps/*, net-proxy/* packages because:
-# 1) It is unclear if there are any users
-# 2) We would like to NOT migrate packages (to gentoo-x86) if we don't have to.
-#
-# If this is a package that you would like to see in the tree, please open a bug
-# report for inclusion (search first).
-# This mask will be lifted in 60 days and the packages will not be supporting
-# Gentoo Prefix at that time.
-games-arcade/rocksndiamonds
-games-board/xscrabble
-games-misc/cowsay
-games-misc/fortune-mod-gentoo-dev
-games-misc/rfksay
-games-sports/bygfoot
-net-proxy/tinyproxy
-www-apps/trac
-
-# Fabian Groffen <grobian@gentoo.org> (21 Apr 2011)
-# Fails to link anything, since it crt1.o cannot be found.  They haven't
-# got linking right yet, numerous people on the web report the same
-# problem.  Let's just wait for the moment.
-~sys-devel/llvm-2.9
-~sys-devel/clang-2.9
-
-# Fabian Groffen <grobian@gentoo.org> (03 Feb 2011)
-# Diego's experimental flex for fixing from autoconf problem, breaks
-# bootstrapping, bug #353609
-=sys-devel/flex-2.5.35_p10
-
-# Fabian Groffen <grobian@gentoo.org> (24 Jan 2011)
-# This release breaks in multiple ways (posix_memalign, O_DIRECT), wait
-# for upstream to sanitise their code (or someone else to do it, since
-# many people are affected: uClibc, BSD, ...)
-=sys-fs/e2fsprogs-1.41.14
-
-# Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
-# The PAM auth system just will not work in Gentoo Prefix, instead the host auth
-# system should be used.
-sys-libs/pam
-sys-auth/pambase
-
-# Jeremy Olexa <darkside@gentoo.org> (02 Jun 2009)
-# If you have MacFuse or some other implementation of fuse installed, you can
-# probably use this by placing sys-fs/fuse in package.provided, bug 272210
-net-fs/curlftpfs
-
-# Jeremy Olexa <darkside@gentoo.org> (21 Apr 2009)
-# User reported that it works fine but will not install for me due to unknown
-# kernel location, etc. See bug 265276 for an example.
-net-wireless/iw
-dev-libs/libnl
-net-wireless/aircrack-ng
-
 # Fabian Groffen <grobian@gentoo.org> (22 Jan 2009)
 # b0rkened on Darwin, Solaris and IRIX, bug #256022, bug #255742
 =sys-apps/groff-1.20.1-r1
 
-# Jeremy Olexa <darkside@gentoo.org> (02 Dec 2008)
-# Reported to work. However, you will need to package.provide some deps. 
-# See bug 248809 for more details.
-net-fs/openafs
-
-# Markus Duft <mduft@gentoo.org> (17 Apr 2008)
-# Breaks things like gettext and fastjar because it introduces some
-# circular dependencies while running aclocal (bug #218122)
-~sys-devel/autoconf-2.62
-
-# Fabian Groffen <grobian@gentoo.org> (11 Jan 2008)
-# Screws up things, see bug #204998
-<sys-devel/gcc-3.4.0
-
-# Fabian Groffen <grobian@gentoo.org> (05 Jan 2008)
-# missing rule in the build.xml file
-=dev-java/sun-javamail-1.4.1
-
-# Fabian Groffen <grobian@gentoo.org> (02 Jan 2008)
-# rlogin seems not to work, consider using ssh anyway
-net-misc/netkit-rsh
-
 # Elias Pipping <pipping@gentoo.org> (09 Oct 2007)
 # darwin-miscutils are only available on darwin
 sys-apps/darwin-miscutils
 
-# Elias Pipping <pipping@gentoo.org>
-# work in progress (in prefix)
-app-emacs/jde
-
 # Fabian Groffen <grobian@gentoo.org> (04 Apr 2007)
 # Don't use this, it is only provided for experimentation and as tool to
 # recover from broken linker situations.
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index dedb0e5d1716..f6e7fab54b91 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,67 +1,11 @@
 # 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.21 2014/01/16 17:44:47 jer Exp $
-
-
-# Kacper Kowalik <xarthisius@gentoo.org> (14 Jan 2012)
-# sci-libs/mkl don't have prefix keywords
-dev-python/numexpr mkl
-
-# Fabian Groffen <grobian@gentoo.org> (08 Dec 2011)
-# USE=vanilla produces a broken compiler for Prefix.  Only use this flag
-# when you're absolutely sure what you're doing.  Do NOT report bugs
-# 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)
-sci-electronics/gtkwave judy
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.use.mask,v 1.22 2014/01/18 02:01:21 redlizard Exp $
 
 # Michael Haubenwallner <haubi@gentoo.org> (17 Sep 2010)
 # sys-apps/keyutils is a linux only package
 app-crypt/mit-krb5 keyutils
 
-# Jonathan Callen <abcd@gentoo.org> (22 Feb 2010)
-# ppp is not available in Prefix
-kde-base/kdenetwork-meta ppp
-
-# Christian Faulhammer <fauli@gentoo.org> (09 Jan 2010)
-# hesiod and m17n-lib are not available in Prefix
-app-editors/emacs-vcs hesiod m17n-lib
-app-editors/emacs hesiod m17n-lib
-
 # Michael Haubenwallner <haubi@gentoo.org> (30 Sep 2009)
 # Most prefix platforms do/can not have a uuid implementation (#230981).
 x11-libs/libSM uuid
-
-# Jeremy Olexa <darkside@gentoo.org> (30 Sep 2009)
-# berkdb has hardcoded paths all over, breaks on linux at least. Use flag
-# disappearing in next bump: prefix can be early and force it to be not used to
-# save headaches.
-# NOTE to prefix devs: if it needs to not be a global mask, talk to me because
-# it currently causes failures on linux. It can be made a "less global" mask.
-dev-lang/python berkdb
-
-# Jeremy Olexa <darkside@gentoo.org> (02 Sep 2009)
-# these don't work, because they rely on the host having sufficient xorg-server
-# version.
-xfce-base/xfce4-meta session
-
-# Jeremy Olexa <darkside@gentoo.org> (13 Feb 2009)
-# Can't make USE=ssl to work, bad build system. bug #256699
-dev-lang/pike ssl
-
-# Elias Pipping <pipping@gentoo.org> (18 Nov 2007)
-# feynmf fails to build documentation
-dev-tex/feynmf doc
-
-# Elias Pipping <pipping@gentoo.org> (15 Nov 2007)
-# pkg_postinst tries to create/delete a user, fails
-dev-libs/cyrus-sasl berkdb gdbm
diff --git a/profiles/prefix/sunos/parent b/profiles/prefix/sunos/parent
index cd1149221a41..f3229c5b9876 100644
--- a/profiles/prefix/sunos/parent
+++ b/profiles/prefix/sunos/parent
@@ -1,2 +1 @@
-../../base
 ..
diff --git a/profiles/prefix/use.force b/profiles/prefix/use.force
index 1077439106cd..fcb452d47a44 100644
--- a/profiles/prefix/use.force
+++ b/profiles/prefix/use.force
@@ -1,10 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/use.force,v 1.2 2014/01/18 02:01:21 redlizard Exp $
+
 # unforce the GNU/Linux ELIBC, KERNEL, and USERLAND
 # flags that come from the base profile
 -elibc_glibc
 -kernel_linux
-
-# force prefix flag to be set
-prefix
-
-# force GNU userland (even though base profile sets this too)
-userland_GNU
diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask
index 9f372b47cc1a..24642e261836 100644
--- a/profiles/prefix/use.mask
+++ b/profiles/prefix/use.mask
@@ -1,40 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/use.mask,v 1.8 2013/12/08 18:40:38 grobian Exp $
-
-# multilib is never going to work as expected in Prefix
-multilib
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/use.mask,v 1.9 2014/01/18 02:01:21 redlizard Exp $
 
 # Mask all glibc/linux combination, unmasked in the appropriate profiles
 elibc_glibc
 kernel_linux
 
-# re-add userland GNU
--userland_GNU
-
-# USE flags inherited by the base/use.defaults file that shouldn't be in Prefix
-cups
-gpm
-
-# prefix USE flag should always be unmasked in prefix profiles
--prefix
-
 # USE=acl will probably never work because of how it is related to the kernel
 # and Gentoo Prefix does not have access to that. Also, definately problems with
 # coreutils on darwin.
 acl
-
-# USE=pam just does not make sense in Gentoo Prefix. Should be using the host
-# auth system.
-pam
-
-# USE=udev just does not make sense in Gentoo Prefix. bug 293480
-udev
-
-# The JRuby stack adds *alot* of non-tested ebuilds. If someone has time and
-# motivation, please look into porting this to Gentoo Prefix. bug 302563
-ruby_targets_jruby
-
-# suid requires root privilege, which is not support by prefix in general
-# one example: bug 447340.
-suid
diff --git a/profiles/prefix/windows/parent b/profiles/prefix/windows/parent
index cd1149221a41..f3229c5b9876 100644
--- a/profiles/prefix/windows/parent
+++ b/profiles/prefix/windows/parent
@@ -1,2 +1 @@
-../../base
 ..