p/f/p/package.mask: sys-apps/baselayout-prefix should only be used in prefix-rpath.

diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask
index cb0e984c9f11a196ca71915bc72876de43a8e221..92073834c95e33c421cdd1711ac578ce704a8fa5 100644 (file)
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -13,10 +13,6 @@
 # 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.

diff --git a/profiles/features/prefix/packages b/profiles/features/prefix/packages
index 2116babb229c9ee5e2cfafab0680dbfe09babb27..5fadbfe817a98bcb4b69c506be3646bbe8513ac6 100644 (file)
--- a/profiles/features/prefix/packages
+++ b/profiles/features/prefix/packages
@@ -14,7 +14,6 @@
 # This file removes everything from the base profile which is not
 # necessary/desired in a prefix environment.
 
--*>=sys-apps/baselayout-2
 -*net-misc/iputils
 -*sys-apps/iproute2
 -*sys-apps/kbd
@@ -23,9 +22,6 @@
 -*virtual/modutils
 -*virtual/shadow
 
-# add back prefix baselayout
-*sys-apps/baselayout-prefix
-
 # 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
index 3f6c868c505f6ca1ae776e0b000c80d139d6afef..7474427ab0c39afdf3e3f3eb1a944aa12c5ee612 100644 (file)
--- a/profiles/features/prefix/rpath/packages
+++ b/profiles/features/prefix/rpath/packages
@@ -5,3 +5,8 @@
 # we don't ever will install these, so no need to depend on them
 -*virtual/libc
 -*virtual/os-headers
+
+-*>=sys-apps/baselayout-2
+# add back prefix baselayout
+*sys-apps/baselayout-prefix
+