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

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

[Fabian Groffen]

commit:     bfe27dc08ea31ad160791f1e83467f9a2511f246
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 17:55:07 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 17:57:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe27dc0

profiles/prefix/linux: use regular stable + unstable keywords

Bite the bullet, and get moving with bug #473598, just share keywords
for Prefix and non-Prefix linux installs.  It is tedious to keep the
keywords up to date, and they are basically extremely close anyway.
Tested this change on a fairly sizable amd64-linux install, and it
actually resolves a lot of problems, no new problems seen, so this seems
like the best way forwards.

Step two would be to finally remove the *-linux keywords completely.

Bug: https://bugs.gentoo.org/473598
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 profiles/prefix/linux/amd64/make.defaults   | 8 +++++---
 profiles/prefix/linux/ppc64/make.defaults   | 7 +++----
 profiles/prefix/linux/ppc64le/make.defaults | 7 +++----
 profiles/prefix/linux/x86/make.defaults     | 8 +++++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults
index 22be1cd833fb..f8433cd75e77 100644
--- a/profiles/prefix/linux/amd64/make.defaults
+++ b/profiles/prefix/linux/amd64/make.defaults
@@ -1,10 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 #Note: this is Gentoo Prefix specific! (2008-07-13, darkside)
 
-# The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-amd64 ~amd64-linux"
+# The base profile sets ACCEPT_KEYWORDS=amd64, add unstable on top of
+# that, and retain historical Prefix-only amd64-linux keyword for a
+# transition period, bug #473598.
+ACCEPT_KEYWORDS="~amd64 ~amd64-linux"
 
 # We don't have lib64 or multilib in prefix, but single ABI, so remove it here.
 SYMLINK_LIB=""

diff --git a/profiles/prefix/linux/ppc64/make.defaults b/profiles/prefix/linux/ppc64/make.defaults
index 6be345d8d6b6..7e20f0928180 100644
--- a/profiles/prefix/linux/ppc64/make.defaults
+++ b/profiles/prefix/linux/ppc64/make.defaults
@@ -1,11 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ppc64"
 CHOST="powerpc64-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=ppc64 and we don't have that in prefix.
-# Eventually, ~* should be removed once someone is motivated for this arch
-ACCEPT_KEYWORDS="-ppc64 ~ppc64-linux ~*"
+# The base profile sets ACCEPT_KEYWORDS=ppc64, add unstable
+ACCEPT_KEYWORDS="~ppc64"
 
 # We don't have lib64 in prefix so, remove it here.
 SYMLINK_LIB=""

diff --git a/profiles/prefix/linux/ppc64le/make.defaults b/profiles/prefix/linux/ppc64le/make.defaults
index 477b3c262767..95c3cb0ca9f9 100644
--- a/profiles/prefix/linux/ppc64le/make.defaults
+++ b/profiles/prefix/linux/ppc64le/make.defaults
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ppc64"
 CHOST="powerpc64le-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=ppc64 and we don't have that in prefix.
-# Eventually, ~* should be removed once someone is motivated for this arch
-ACCEPT_KEYWORDS="-ppc64 ~ppc64-linux ~*"
+# The base profile sets ACCEPT_KEYWORDS=ppc64, add unstable on top of that
+ACCEPT_KEYWORDS="~ppc64"
 
 # We don't have lib64 in prefix so, remove it here.
 SYMLINK_LIB=""

diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults
index 8a679deb0752..704bcb6ff405 100644
--- a/profiles/prefix/linux/x86/make.defaults
+++ b/profiles/prefix/linux/x86/make.defaults
@@ -1,8 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-x86 ~x86-linux"
+# The base profile sets ACCEPT_KEYWORDS=x86, add unstable on top of
+# that, and retain historical prefix-only x86-linux keyword for
+# transition period, bug #473598
+ACCEPT_KEYWORDS="~x86 ~x86-linux"
 
 # in case we are bootstrapping with the host compiler on an amd64 linux host:
 CFLAGS="${CFLAGS} -m32"