[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/embedded/, profiles/arch/powerpc/ppc64/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/embedded/, profiles/arch/powerpc/ppc64/, ...

[David Seifert]

commit:     58d3fd255f80ce2f45275cc6e16b5529a10072f4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 20:12:49 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 20:12:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d3fd25

profiles: remove dead abi_ppc_* flags

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 profiles/arch/base/use.mask                | 2 --
 profiles/arch/powerpc/ppc32/use.force      | 3 ---
 profiles/arch/powerpc/ppc32/use.mask       | 4 ----
 profiles/arch/powerpc/ppc64/32ul/use.force | 5 -----
 profiles/arch/powerpc/ppc64/32ul/use.mask  | 5 -----
 profiles/arch/powerpc/ppc64/use.force      | 3 ---
 profiles/arch/powerpc/ppc64/use.mask       | 6 +-----
 profiles/base/make.defaults                | 4 ++--
 profiles/embedded/make.defaults            | 4 ++--
 9 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index f55dfd0cd001..229a41186f2d 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -193,8 +193,6 @@ abi_x86_x32
 abi_mips_o32
 abi_mips_n32
 abi_mips_n64
-abi_ppc_32
-abi_ppc_64
 abi_s390_32
 abi_s390_64
 

diff --git a/profiles/arch/powerpc/ppc32/use.force b/profiles/arch/powerpc/ppc32/use.force
index 5da3746141ae..ebd35a2034ce 100644
--- a/profiles/arch/powerpc/ppc32/use.force
+++ b/profiles/arch/powerpc/ppc32/use.force
@@ -1,5 +1,2 @@
 # Force the flag which corresponds to ARCH.
 ppc
-
-# Force the flag corresponding to the only ABI.
-abi_ppc_32

diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 58adf43e9b93..a51476ff3230 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -30,10 +30,6 @@ gnome-shell
 # Java is no longer supported on ppc.
 java
 
-# Michał Górny <mgorny@gentoo.org> (2014-06-27)
-# Unmask multilib flag for the ABI.
--abi_ppc_32
-
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # keyworded on ppc
 -clisp

diff --git a/profiles/arch/powerpc/ppc64/32ul/use.force b/profiles/arch/powerpc/ppc64/32ul/use.force
index e7102de1a2df..c74bf3460241 100644
--- a/profiles/arch/powerpc/ppc64/32ul/use.force
+++ b/profiles/arch/powerpc/ppc64/32ul/use.force
@@ -3,8 +3,3 @@ ppc
 
 # Unforce the flag which corresponds to the 64-bit ARCH.
 -ppc64
-
-# Michał Górny <mgorny@gentoo.org> (2014-06-27)
-# Switch multilib flags for the ABI.
--abi_ppc_64
-abi_ppc_32

diff --git a/profiles/arch/powerpc/ppc64/32ul/use.mask b/profiles/arch/powerpc/ppc64/32ul/use.mask
index abf49705cc6b..2e4685d1f36d 100644
--- a/profiles/arch/powerpc/ppc64/32ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/use.mask
@@ -6,8 +6,3 @@ ppc64
 
 # We mask this since we're not really a multilib profile
 multilib
-
-# Michał Górny <mgorny@gentoo.org> (2014-06-27)
-# Switch multilib flags for the ABI.
-abi_ppc_64
--abi_ppc_32

diff --git a/profiles/arch/powerpc/ppc64/use.force b/profiles/arch/powerpc/ppc64/use.force
index 85c8ee8c145f..88544d5e9243 100644
--- a/profiles/arch/powerpc/ppc64/use.force
+++ b/profiles/arch/powerpc/ppc64/use.force
@@ -1,5 +1,2 @@
 # Force the flag which corresponds to ARCH.
 ppc64
-
-# Force the flag corresponding to the only ABI.
-abi_ppc_64

diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index ab9cefcf66ac..7de0634ed869 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ### THIS FILE IS ONLY FOR PACKAGES MASKED ON BOTH 64-BIT AND 32-BIT USERLAND!!!
@@ -14,10 +14,6 @@
 openexr
 osg
 
-# Michał Górny <mgorny@gentoo.org> (2014-06-27)
-# Unmask multilib flag for the ABI.
--abi_ppc_64
-
 # Samuli Suominen <ssuominen@gentoo.org> (2012-11-24)
 # TODO: Keyword and stabilize media-gfx/opencolorio and media-libs/opencv
 color-management

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7c4cc85f1cbc..ff9d142dabf7 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 9a78933d6fd1..2ec8febf5f4f 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -30,11 +30,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.