summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenda Xu <heroxbd@gentoo.org>2018-01-12 22:28:01 +0900
committerBenda Xu <heroxbd@gentoo.org>2018-01-12 22:31:42 +0900
commit68e67c1806e9f3f7f6352718cd3ce2870ff156d6 (patch)
tree5d9bc0535ff8d604cb0bdc3ef1c028ffa5c25c0d
parentnet-misc/openssh: Exclude s390-seccomp.patch w/ USE=X509 - already in X509 pa... (diff)
downloadgentoo-68e67c1806e9f3f7f6352718cd3ce2870ff156d6.tar.gz
gentoo-68e67c1806e9f3f7f6352718cd3ce2870ff156d6.tar.bz2
gentoo-68e67c1806e9f3f7f6352718cd3ce2870ff156d6.zip
profiles/prefix: rename beyond-kernel-? to kernel-?+
In addition, mask python 3 USE flags for kernel-2.6.16+.
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults)3
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/package.mask (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask)0
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask)0
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/parent (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent)0
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc)0
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/use.mask7
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.32+/package.mask (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask)0
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask)0
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.32+/parent (renamed from profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent)0
-rw-r--r--profiles/prefix/linux-standalone/amd64/legacy/parent2
-rw-r--r--profiles/prefix/linux-standalone/x86/legacy/parent2
11 files changed, 11 insertions, 3 deletions
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
index 22044de87632..510e5e21b3ce 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
@@ -14,4 +14,5 @@ ac_cv_func_utimensat=no
ac_cv_func_pipe2=no
# >=python-3 is masked.
-PYTHON_TARGETS="-python3_5"
+PYTHON_TARGETS="-python3_*"
+PYTHON_SINGLE_TARGET=python2_7
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
index 0aa01a72efb0..0aa01a72efb0 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask
index 9b37b1386380..9b37b1386380 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent b/profiles/features/prefix/standalone/kernel-2.6.16+/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/parent
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
index e537cc0fa319..e537cc0fa319 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
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/beyond-kernel-2.6.32/package.mask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
index 666a526176df..666a526176df 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask
index 9f79b4f81de0..9f79b4f81de0 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent b/profiles/features/prefix/standalone/kernel-2.6.32+/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/parent
diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent b/profiles/prefix/linux-standalone/amd64/legacy/parent
index a0af85877726..f8002c688eb9 100644
--- a/profiles/prefix/linux-standalone/amd64/legacy/parent
+++ b/profiles/prefix/linux-standalone/amd64/legacy/parent
@@ -1,2 +1,2 @@
..
-../../../../features/prefix/standalone/beyond-kernel-2.6.16
+../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/prefix/linux-standalone/x86/legacy/parent b/profiles/prefix/linux-standalone/x86/legacy/parent
index a0af85877726..f8002c688eb9 100644
--- a/profiles/prefix/linux-standalone/x86/legacy/parent
+++ b/profiles/prefix/linux-standalone/x86/legacy/parent
@@ -1,2 +1,2 @@
..
-../../../../features/prefix/standalone/beyond-kernel-2.6.16
+../../../../features/prefix/standalone/kernel-2.6.16+