commit:     f42c7639d857f81a6e4553d88c1f6e0db707b3fd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 20 09:31:08 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 20 09:31:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f42c7639

*/*: restore amd/x86 keywords

When all *-linux keywords were dropped, I didn't take into consideration
that for some ebuilds the variant without -linux suffix were not
present.  As a result, this de-keyworded the ebuild for Linux Prefix
instances.

Add back the keywords where they were dropped this way.  Thanks hsk17
for noticing.

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

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild                     | 2 +-
 dev-lang/python/python-3.12.10.ebuild                    | 2 +-
 dev-lang/python/python-3.13.3-r1.ebuild                  | 2 +-
 dev-lang/python/python-3.13.3.ebuild                     | 2 +-
 sys-apps/coreutils/coreutils-9.3-r1.ebuild               | 2 +-
 sys-apps/coreutils/coreutils-9.5.ebuild                  | 2 +-
 sys-apps/coreutils/coreutils-9.7.ebuild                  | 2 +-
 sys-apps/debianutils/debianutils-4.11.2.ebuild           | 2 +-
 sys-apps/portage/portage-3.0.63.ebuild                   | 2 +-
 sys-apps/portage/portage-3.0.72.ebuild                   | 2 +-
 sys-apps/portage/portage-3.0.73.ebuild                   | 2 +-
 sys-apps/sed/sed-4.8.ebuild                              | 2 +-
 sys-apps/sed/sed-4.9.ebuild                              | 2 +-
 sys-devel/binutils-config/binutils-config-5.1-r13.ebuild | 2 +-
 sys-devel/binutils/binutils-2.40-r8.ebuild               | 2 +-
 sys-devel/binutils/binutils-2.44.ebuild                  | 2 +-
 sys-devel/gcc-config/gcc-config-2.7-r1.ebuild            | 2 +-
 sys-devel/gcc/gcc-13.3.0.ebuild                          | 2 +-
 sys-devel/gcc/gcc-14.1.0.ebuild                          | 2 +-
 sys-devel/gcc/gcc-14.2.0.ebuild                          | 2 +-
 sys-devel/gcc/gcc-14.2.1_p20241221.ebuild                | 2 +-
 sys-devel/gcc/gcc-14.2.1_p20250419.ebuild                | 2 +-
 sys-devel/gcc/gcc-15.1.0.ebuild                          | 2 +-
 sys-devel/gcc/gcc-15.2.0.ebuild                          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 6e0f41d27f..a8e636a905 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static static-libs"
 
 BDEPEND="

diff --git a/dev-lang/python/python-3.12.10.ebuild 
b/dev-lang/python/python-3.12.10.ebuild
index 5e6d72889f..6a08bbb1f4 100644
--- a/dev-lang/python/python-3.12.10.ebuild
+++ b/dev-lang/python/python-3.12.10.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="
        bluetooth build debug +ensurepip examples gdbm libedit
        +ncurses pgo +readline +sqlite +ssl test tk valgrind

diff --git a/dev-lang/python/python-3.13.3-r1.ebuild 
b/dev-lang/python/python-3.13.3-r1.ebuild
index 7f9d8a45c9..d39936ec08 100644
--- a/dev-lang/python/python-3.13.3-r1.ebuild
+++ b/dev-lang/python/python-3.13.3-r1.ebuild
@@ -35,7 +35,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="
        bluetooth build debug +ensurepip examples gdbm jit
        libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind

diff --git a/dev-lang/python/python-3.13.3.ebuild 
b/dev-lang/python/python-3.13.3.ebuild
index 7c110fa281..de6d6636df 100644
--- a/dev-lang/python/python-3.13.3.ebuild
+++ b/dev-lang/python/python-3.13.3.ebuild
@@ -35,7 +35,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="
        bluetooth build debug +ensurepip examples gdbm jit
        libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind

diff --git a/sys-apps/coreutils/coreutils-9.3-r1.ebuild 
b/sys-apps/coreutils/coreutils-9.3-r1.ebuild
index a26df298c7..1bd000e52b 100644
--- a/sys-apps/coreutils/coreutils-9.3-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.3-r1.ebuild
@@ -33,7 +33,7 @@ else
                verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
        "
 
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 SRC_URI+=" !vanilla? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"

diff --git a/sys-apps/coreutils/coreutils-9.5.ebuild 
b/sys-apps/coreutils/coreutils-9.5.ebuild
index a8ad4eafa9..ee18a1e438 100644
--- a/sys-apps/coreutils/coreutils-9.5.ebuild
+++ b/sys-apps/coreutils/coreutils-9.5.ebuild
@@ -41,7 +41,7 @@ else
                verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
        "
 
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 SRC_URI+=" !vanilla? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"

diff --git a/sys-apps/coreutils/coreutils-9.7.ebuild 
b/sys-apps/coreutils/coreutils-9.7.ebuild
index d793c1842a..6e7ffce19d 100644
--- a/sys-apps/coreutils/coreutils-9.7.ebuild
+++ b/sys-apps/coreutils/coreutils-9.7.ebuild
@@ -38,7 +38,7 @@ else
                verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
        "
 
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 SRC_URI+=" !vanilla? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"

diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild 
b/sys-apps/debianutils/debianutils-4.11.2.ebuild
index 0fe260d700..05da9be815 100644
--- a/sys-apps/debianutils/debianutils-4.11.2.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+installkernel static"
 
 PDEPEND="

diff --git a/sys-apps/portage/portage-3.0.63.ebuild 
b/sys-apps/portage/portage-3.0.63.ebuild
index 2b5284fcc6..feab3a566f 100644
--- a/sys-apps/portage/portage-3.0.63.ebuild
+++ b/sys-apps/portage/portage-3.0.63.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
        inherit git-r3
 else
        SRC_URI="https://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/sys-apps/portage/portage-3.0.72.ebuild 
b/sys-apps/portage/portage-3.0.72.ebuild
index 9e3722d71e..0a5c9c7392 100644
--- a/sys-apps/portage/portage-3.0.72.ebuild
+++ b/sys-apps/portage/portage-3.0.72.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
        inherit git-r3
 else
        SRC_URI="https://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/sys-apps/portage/portage-3.0.73.ebuild 
b/sys-apps/portage/portage-3.0.73.ebuild
index 8ae746fac5..f2546d769b 100644
--- a/sys-apps/portage/portage-3.0.73.ebuild
+++ b/sys-apps/portage/portage-3.0.73.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
        inherit git-r3
 else
        SRC_URI="https://dev.gentoo.org/~grobian/distfiles/prefix-${P}.tar.bz2";
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index f60bfde4d5..c77ee6ede4 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="acl forced-sandbox nls selinux static"
 
 RDEPEND="

diff --git a/sys-apps/sed/sed-4.9.ebuild b/sys-apps/sed/sed-4.9.ebuild
index b1158e2878..cc89d49f08 100644
--- a/sys-apps/sed/sed-4.9.ebuild
+++ b/sys-apps/sed/sed-4.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="acl nls selinux static"
 
 RDEPEND="

diff --git a/sys-devel/binutils-config/binutils-config-5.1-r13.ebuild 
b/sys-devel/binutils-config/binutils-config-5.1-r13.ebuild
index b3edea63d8..0ca0a19c94 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r13.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r13.ebuild
@@ -12,7 +12,7 @@ WRAPPER_REV="${PV%%.*}.3.4"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system

diff --git a/sys-devel/binutils/binutils-2.40-r8.ebuild 
b/sys-devel/binutils/binutils-2.40-r8.ebuild
index 1ddf75a32c..c56c9ea4d7 100644
--- a/sys-devel/binutils/binutils-2.40-r8.ebuild
+++ b/sys-devel/binutils/binutils-2.40-r8.ebuild
@@ -32,7 +32,7 @@ else
        [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
                
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz";
        SLOT=$(ver_cut 1-2)
-       KEYWORDS="~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~x64-solaris"
 fi
 
 #

diff --git a/sys-devel/binutils/binutils-2.44.ebuild 
b/sys-devel/binutils/binutils-2.44.ebuild
index 1d95ecd512..494df5d630 100644
--- a/sys-devel/binutils/binutils-2.44.ebuild
+++ b/sys-devel/binutils/binutils-2.44.ebuild
@@ -35,7 +35,7 @@ else
        [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
                
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz";
        SLOT=$(ver_cut 1-2)
-       KEYWORDS="~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~x64-solaris"
 fi
 
 #

diff --git a/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild 
b/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
index b709fa9592..fb299601e2 100644
--- a/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
        inherit git-r3
 else
        
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz";
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Utility to manage compilers"

diff --git a/sys-devel/gcc/gcc-13.3.0.ebuild b/sys-devel/gcc/gcc-13.3.0.ebuild
index 53bced7a59..7cf24347a7 100644
--- a/sys-devel/gcc/gcc-13.3.0.ebuild
+++ b/sys-devel/gcc/gcc-13.3.0.ebuild
@@ -38,7 +38,7 @@ if tc_is_live ; then
        EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
        # Don't keyword live ebuilds
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # use alternate source for Apple M1 (also works for x86_64)

diff --git a/sys-devel/gcc/gcc-14.1.0.ebuild b/sys-devel/gcc/gcc-14.1.0.ebuild
index 7b75602e81..8b2129af43 100644
--- a/sys-devel/gcc/gcc-14.1.0.ebuild
+++ b/sys-devel/gcc/gcc-14.1.0.ebuild
@@ -26,7 +26,7 @@ if tc_is_live ; then
        EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
        # Don't keyword live ebuilds
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # use alternate source for Apple M1 (also works for x86_64)

diff --git a/sys-devel/gcc/gcc-14.2.0.ebuild b/sys-devel/gcc/gcc-14.2.0.ebuild
index 43859fd1b2..558059effd 100644
--- a/sys-devel/gcc/gcc-14.2.0.ebuild
+++ b/sys-devel/gcc/gcc-14.2.0.ebuild
@@ -27,7 +27,7 @@ if tc_is_live ; then
        EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
        # Don't keyword live ebuilds
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # use alternate source for Apple M1 (also works for x86_64)

diff --git a/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild 
b/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild
index 9ac22a906b..f06db4c8de 100644
--- a/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild
+++ b/sys-devel/gcc/gcc-14.2.1_p20241221.ebuild
@@ -27,7 +27,7 @@ if tc_is_live ; then
        EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
        # m68k doesnt build (ICE, bug 932733)
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
        :;
 fi
 

diff --git a/sys-devel/gcc/gcc-14.2.1_p20250419.ebuild 
b/sys-devel/gcc/gcc-14.2.1_p20250419.ebuild
index 5aaca70971..fb59bdaae7 100644
--- a/sys-devel/gcc/gcc-14.2.1_p20250419.ebuild
+++ b/sys-devel/gcc/gcc-14.2.1_p20250419.ebuild
@@ -30,7 +30,7 @@ if tc_is_live ; then
        EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
        # m68k doesnt build (ICE, bug 932733)
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
        :;
 fi
 

diff --git a/sys-devel/gcc/gcc-15.1.0.ebuild b/sys-devel/gcc/gcc-15.1.0.ebuild
index 4c87d78ba2..6927c4668f 100644
--- a/sys-devel/gcc/gcc-15.1.0.ebuild
+++ b/sys-devel/gcc/gcc-15.1.0.ebuild
@@ -30,7 +30,7 @@ if tc_is_live ; then
        EGIT_BRANCH=master
 elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
        # Don't keyword live ebuilds
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
        :;
 fi
 

diff --git a/sys-devel/gcc/gcc-15.2.0.ebuild b/sys-devel/gcc/gcc-15.2.0.ebuild
index bc216544e3..2e95dd0371 100644
--- a/sys-devel/gcc/gcc-15.2.0.ebuild
+++ b/sys-devel/gcc/gcc-15.2.0.ebuild
@@ -30,7 +30,7 @@ if tc_is_live ; then
        EGIT_BRANCH=master
 elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
        # Don't keyword live ebuilds
-       KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
+       KEYWORDS="~amd64 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
        :;
 fi
 

Reply via email to