[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/, ...

[Benda XU]

commit:     432cbaf78b08c242af523efc80d360c148fa95e7
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 06:30:20 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 07:04:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432cbaf7

profiles: prefix refactorization.

  legacy profiles explicitly refer to the kernel supported.

 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/make.defaults   | 0
 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/package.mask    | 3 ++-
 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/package.unmask  | 1 +
 profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent        | 1 +
 .../prefix/standalone/{legacy => beyond-kernel-2.6.16}/profile.bashrc  | 0
 profiles/features/prefix/standalone/make.defaults                      | 2 ++
 .../{prefix/linux-standalone => features/prefix/standalone}/packages   | 0
 .../linux-standalone => features/prefix/standalone}/profile.bashrc     | 0
 profiles/prefix/linux-standalone/amd64/legacy/parent                   | 2 +-
 profiles/prefix/linux-standalone/eapi                                  | 1 -
 profiles/prefix/linux-standalone/x86/legacy/parent                     | 2 +-
 11 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/profiles/features/prefix/standalone/legacy/make.defaults b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
similarity index 100%
rename from profiles/features/prefix/standalone/legacy/make.defaults
rename to profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults

diff --git a/profiles/features/prefix/standalone/legacy/package.mask b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
similarity index 78%
rename from profiles/features/prefix/standalone/legacy/package.mask
rename to profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
index 5125269d289..0aa01a72efb 100644
--- a/profiles/features/prefix/standalone/legacy/package.mask
+++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
@@ -1,7 +1,8 @@
 # >=glibc-2.20 requires >=linux-2.6.32.
+# https://lwn.net/Articles/611162
 >=sys-libs/glibc-2.20
 
 # >=python-3.4 assumes F_DUPFD_CLOEXEC of fcntl,
 # which requires >=linux-2.6.24.
 # python-3.3 seems to be unconditionally using utimensat.
->=dev-lang/python-3
\ No newline at end of file
+>=dev-lang/python-3

diff --git a/profiles/features/prefix/standalone/legacy/package.unmask b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
similarity index 64%
rename from profiles/features/prefix/standalone/legacy/package.unmask
rename to profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
index 0d7380b4273..9b37b138638 100644
--- a/profiles/features/prefix/standalone/legacy/package.unmask
+++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
@@ -1,2 +1,3 @@
 # >=glibc-2.20 requires >=linux-2.6.32.
+# https://lwn.net/Articles/611162
 <sys-libs/glibc-2.20

diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent
new file mode 100644
index 00000000000..f3229c5b987
--- /dev/null
+++ b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent
@@ -0,0 +1 @@
+..

diff --git a/profiles/features/prefix/standalone/legacy/profile.bashrc b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc
similarity index 100%
rename from profiles/features/prefix/standalone/legacy/profile.bashrc
rename to profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc

diff --git a/profiles/features/prefix/standalone/make.defaults b/profiles/features/prefix/standalone/make.defaults
index 0e1661e1014..09b32b13eaa 100644
--- a/profiles/features/prefix/standalone/make.defaults
+++ b/profiles/features/prefix/standalone/make.defaults
@@ -5,3 +5,5 @@
 # and when python-2.7 goes end-of-life on 2020-01-01.
 # https://docs.python.org/devguide/#status-of-python-branches
 ac_cv_func_getentropy=no
+# Reconsider the stability of Prefix in 2019.
+ACCEPT_KEYWORDS="~${ARCH}"

diff --git a/profiles/prefix/linux-standalone/packages b/profiles/features/prefix/standalone/packages
similarity index 100%
rename from profiles/prefix/linux-standalone/packages
rename to profiles/features/prefix/standalone/packages

diff --git a/profiles/prefix/linux-standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
similarity index 100%
rename from profiles/prefix/linux-standalone/profile.bashrc
rename to profiles/features/prefix/standalone/profile.bashrc

diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent b/profiles/prefix/linux-standalone/amd64/legacy/parent
index 0ca4be1beb9..a0af8587772 100644
--- a/profiles/prefix/linux-standalone/amd64/legacy/parent
+++ b/profiles/prefix/linux-standalone/amd64/legacy/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/prefix/standalone/legacy
+../../../../features/prefix/standalone/beyond-kernel-2.6.16

diff --git a/profiles/prefix/linux-standalone/eapi b/profiles/prefix/linux-standalone/eapi
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/profiles/prefix/linux-standalone/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/prefix/linux-standalone/x86/legacy/parent b/profiles/prefix/linux-standalone/x86/legacy/parent
index 0ca4be1beb9..a0af8587772 100644
--- a/profiles/prefix/linux-standalone/x86/legacy/parent
+++ b/profiles/prefix/linux-standalone/x86/legacy/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/prefix/standalone/legacy
+../../../../features/prefix/standalone/beyond-kernel-2.6.16