From 68e67c1806e9f3f7f6352718cd3ce2870ff156d6 Mon Sep 17 00:00:00 2001
From: Benda Xu <heroxbd@gentoo.org>
Date: Fri, 12 Jan 2018 22:28:01 +0900
Subject: profiles/prefix: rename beyond-kernel-? to kernel-?+

  In addition, mask python 3 USE flags for kernel-2.6.16+.
---
 .../standalone/beyond-kernel-2.6.16/make.defaults      | 17 -----------------
 .../standalone/beyond-kernel-2.6.16/package.mask       |  8 --------
 .../standalone/beyond-kernel-2.6.16/package.unmask     |  3 ---
 .../prefix/standalone/beyond-kernel-2.6.16/parent      |  1 -
 .../standalone/beyond-kernel-2.6.16/profile.bashrc     |  6 ------
 .../standalone/beyond-kernel-2.6.32/package.mask       |  7 -------
 .../standalone/beyond-kernel-2.6.32/package.unmask     |  7 -------
 .../prefix/standalone/beyond-kernel-2.6.32/parent      |  1 -
 .../prefix/standalone/kernel-2.6.16+/make.defaults     | 18 ++++++++++++++++++
 .../prefix/standalone/kernel-2.6.16+/package.mask      |  8 ++++++++
 .../prefix/standalone/kernel-2.6.16+/package.unmask    |  3 +++
 .../features/prefix/standalone/kernel-2.6.16+/parent   |  1 +
 .../prefix/standalone/kernel-2.6.16+/profile.bashrc    |  6 ++++++
 .../features/prefix/standalone/kernel-2.6.16+/use.mask |  7 +++++++
 .../prefix/standalone/kernel-2.6.32+/package.mask      |  7 +++++++
 .../prefix/standalone/kernel-2.6.32+/package.unmask    |  7 +++++++
 .../features/prefix/standalone/kernel-2.6.32+/parent   |  1 +
 17 files changed, 58 insertions(+), 50 deletions(-)
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask
 delete mode 100644 profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.16+/parent
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask
 create mode 100644 profiles/features/prefix/standalone/kernel-2.6.32+/parent

(limited to 'profiles/features')

diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
deleted file mode 100644
index 22044de87632..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
+++ /dev/null
@@ -1,17 +0,0 @@
-# This profile is supporting >=linux-2.6.16[a] and <linux-2.6.32[b].
-
-# a. https://sourceware.org/ml/libc-announce/2012/msg00001.html
-# lowest version supported by glibc-2.17 to glibc-2.19.
-
-# b. https://sourceware.org/ml/libc-alpha/2014-09/msg00088.html
-# lowest version supported by glibc-2.20 onwards.
-
-
-# utimensat is missing or not reliable until linux-2.6.32.
-# needed by python-3.
-ac_cv_func_utimensat=no
-# pipe2 requires >=linux-2.6.27.  Needed by python-3.
-ac_cv_func_pipe2=no
-
-# >=python-3 is masked.
-PYTHON_TARGETS="-python3_5"
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
deleted file mode 100644
index 0aa01a72efb0..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# >=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
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
deleted file mode 100644
index 9b37b1386380..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
+++ /dev/null
@@ -1,3 +0,0 @@
-# >=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
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc
deleted file mode 100644
index e537cc0fa319..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# tricks to circumvent false positive checks of old kernel
-
-if [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == configure ]]; then
-    einfo "Removing utimensat outputs..."
-    sed -i '/UTIMENSAT=/d' ${S}/Source/kwsys/CMakeLists.txt
-fi
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask b/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask
deleted file mode 100644
index 666a526176df..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# https://www.sourceware.org/ml/libc-alpha/2016-08/msg00212.html
-# glibc-2.24 needs linux-3.2 at runtime, except on x86 and amd64.
-# on x86 and amd64, it is glibc-2.26 to require linux-3.2.
-# https://www.sourceware.org/ml/libc-alpha/2017-08/msg00010.html
-
-# we just use a universal glibc-2.24 on all ARCHes for simplicity.
->=sys-libs/glibc-2.24
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask b/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask
deleted file mode 100644
index 9f79b4f81de0..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# https://www.sourceware.org/ml/libc-alpha/2016-08/msg00212.html
-# glibc-2.24 needs linux-3.2 at runtime, except on x86 and amd64.
-# on x86 and amd64, it is glibc-2.26 to require linux-3.2.
-# https://www.sourceware.org/ml/libc-alpha/2017-08/msg00010.html
-
-# we just use a universal glibc-2.24 on all ARCHes for simplicity.
-<sys-libs/glibc-2.24
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent b/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
new file mode 100644
index 000000000000..510e5e21b3ce
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
@@ -0,0 +1,18 @@
+# This profile is supporting >=linux-2.6.16[a] and <linux-2.6.32[b].
+
+# a. https://sourceware.org/ml/libc-announce/2012/msg00001.html
+# lowest version supported by glibc-2.17 to glibc-2.19.
+
+# b. https://sourceware.org/ml/libc-alpha/2014-09/msg00088.html
+# lowest version supported by glibc-2.20 onwards.
+
+
+# utimensat is missing or not reliable until linux-2.6.32.
+# needed by python-3.
+ac_cv_func_utimensat=no
+# pipe2 requires >=linux-2.6.27.  Needed by python-3.
+ac_cv_func_pipe2=no
+
+# >=python-3 is masked.
+PYTHON_TARGETS="-python3_*"
+PYTHON_SINGLE_TARGET=python2_7
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
new file mode 100644
index 000000000000..0aa01a72efb0
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
@@ -0,0 +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
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask
new file mode 100644
index 000000000000..9b37b1386380
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask
@@ -0,0 +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/kernel-2.6.16+/parent b/profiles/features/prefix/standalone/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
new file mode 100644
index 000000000000..e537cc0fa319
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
@@ -0,0 +1,6 @@
+# tricks to circumvent false positive checks of old kernel
+
+if [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == configure ]]; then
+    einfo "Removing utimensat outputs..."
+    sed -i '/UTIMENSAT=/d' ${S}/Source/kwsys/CMakeLists.txt
+fi
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
new file mode 100644
index 000000000000..2a1686418a8f
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -0,0 +1,7 @@
+# >=python-3 is masked
+python_single_target_python3_6
+python_single_target_python3_5
+python_single_target_python3_4
+python_targets_python3_6
+python_targets_python3_5
+python_targets_python3_4
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
new file mode 100644
index 000000000000..666a526176df
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
@@ -0,0 +1,7 @@
+# https://www.sourceware.org/ml/libc-alpha/2016-08/msg00212.html
+# glibc-2.24 needs linux-3.2 at runtime, except on x86 and amd64.
+# on x86 and amd64, it is glibc-2.26 to require linux-3.2.
+# https://www.sourceware.org/ml/libc-alpha/2017-08/msg00010.html
+
+# we just use a universal glibc-2.24 on all ARCHes for simplicity.
+>=sys-libs/glibc-2.24
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask
new file mode 100644
index 000000000000..9f79b4f81de0
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask
@@ -0,0 +1,7 @@
+# https://www.sourceware.org/ml/libc-alpha/2016-08/msg00212.html
+# glibc-2.24 needs linux-3.2 at runtime, except on x86 and amd64.
+# on x86 and amd64, it is glibc-2.26 to require linux-3.2.
+# https://www.sourceware.org/ml/libc-alpha/2017-08/msg00010.html
+
+# we just use a universal glibc-2.24 on all ARCHes for simplicity.
+<sys-libs/glibc-2.24
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/parent b/profiles/features/prefix/standalone/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/parent
@@ -0,0 +1 @@
+..
-- 
cgit v1.2.3-65-gdbad