commit: 821463492d2793609dfd628dc319d1772ee27bd6 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Thu May 26 07:39:57 2016 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Thu May 26 07:41:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82146349
p/f/p/package.mask: sys-apps/baselayout-prefix should only be used in prefix-rpath. profiles/features/prefix/package.mask | 4 ---- profiles/features/prefix/packages | 4 ---- profiles/features/prefix/rpath/packages | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask index cb0e984..9207383 100644 --- 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 <[email protected]> (07 Aug 2012) -# mask revision for testing out openrc. bug #415895. -=sys-apps/baselayout-prefix-1.12.14-r1 - # Fabian Groffen <[email protected]> (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 2116bab..5fadbfe 100644 --- 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 3f6c868..7474427a 100644 --- 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 +
