Hi,

Here's a patchset doing two things:

1. Restructuring s390 profiles so that s390 and s390x trees are more
   independent, and top-level arch/s390 includes only common stuff.
   This avoids the current ping-pong of masking stuff in s390 just
   to unmask it in s390x.

2. Adding a common "feature" profile (i.e. effectively a mixin)
   common to architectures (and subprofiles) that aren't supported
   by Rust.  This saves us from duplicating the same (or a little
   different) masks all over the place.

This patch series can also be found on MicrosoftⓇ GitHubⓇ:
https://github.com/gentoo/gentoo/pull/25951

-- 
Best regards,
Michał Górny

Michał Górny (6):
  profiles: Make s390x 17.0 profiles independent of s390 (NFC)
  profiles/arch/s390: Introduce a s390 sub-profile (NFC)
  profiles/arch/s390: Make s390 inherit from top s390 profile (NFC)
  profiles/arch/s390: Move s390-specific stuff to subprofile
  net-p2p/deluge: Dekeyword ~sparc due to twisted[crypt] dep
  profiles: Introduce a dedicated "feature" profile for no Rust

 net-p2p/deluge/deluge-2.0.5-r1.ebuild         |  2 +-
 net-p2p/deluge/deluge-9999.ebuild             |  2 +-
 profiles/arch/alpha/package.use.mask          |  8 ----
 profiles/arch/alpha/parent                    |  1 +
 profiles/arch/arm/armv4/package.mask          | 28 -----------
 profiles/arch/arm/armv4/package.use.mask      | 11 -----
 profiles/arch/arm/armv4/parent                |  1 +
 profiles/arch/arm/armv4/use.mask              |  6 ---
 profiles/arch/arm/armv4t/package.mask         | 28 -----------
 profiles/arch/arm/armv4t/package.use.force    |  6 ---
 profiles/arch/arm/armv4t/package.use.mask     | 11 -----
 profiles/arch/arm/armv4t/parent               |  1 +
 profiles/arch/arm/armv5te/package.mask        | 24 ----------
 profiles/arch/arm/armv5te/package.use.force   |  6 ---
 profiles/arch/arm/armv5te/package.use.mask    | 11 -----
 profiles/arch/arm/armv5te/parent              |  1 +
 profiles/arch/arm/armv5te/use.mask            |  4 --
 profiles/arch/arm/armv6j/package.mask         | 15 ------
 profiles/arch/arm/armv6j/package.use.mask     | 17 +------
 profiles/arch/arm/armv6j/use.mask             |  4 --
 profiles/arch/arm/armv7a/package.mask         | 15 +-----
 profiles/arch/arm/armv7a/package.use.mask     | 18 +------
 profiles/arch/arm/armv7a/use.mask             |  6 +--
 profiles/arch/arm/package.mask                | 16 +------
 profiles/arch/arm/package.use.mask            | 18 -------
 profiles/arch/arm/use.mask                    |  5 --
 profiles/arch/hppa/package.use.mask           |  4 --
 profiles/arch/hppa/parent                     |  1 +
 profiles/arch/ia64/package.use.mask           | 15 ------
 profiles/arch/ia64/parent                     |  1 +
 profiles/arch/ia64/use.mask                   |  4 --
 profiles/arch/loong/package.mask              |  5 --
 profiles/arch/loong/package.use.force         |  4 --
 profiles/arch/loong/package.use.mask          |  9 ----
 profiles/arch/loong/parent                    |  1 +
 profiles/arch/m68k/parent                     |  1 +
 profiles/arch/m68k/use.mask                   |  4 --
 profiles/arch/s390/make.defaults              | 15 +-----
 profiles/arch/s390/package.mask               | 20 --------
 profiles/arch/s390/package.use.force          |  4 --
 profiles/arch/s390/package.use.mask           |  7 +--
 profiles/arch/s390/s390/eapi                  |  1 +
 profiles/arch/s390/s390/make.defaults         | 16 +++++++
 profiles/arch/s390/s390/package.mask          |  6 +++
 profiles/arch/s390/s390/parent                |  2 +
 profiles/arch/s390/s390/use.force             |  5 ++
 profiles/arch/s390/s390/use.mask              |  9 ++++
 profiles/arch/s390/s390x/make.defaults        |  4 +-
 profiles/arch/s390/s390x/package.mask         | 20 --------
 profiles/arch/s390/s390x/package.use.force    |  4 ++
 profiles/arch/s390/s390x/package.use.mask     |  5 ++
 profiles/arch/s390/s390x/parent               |  1 +
 profiles/arch/s390/s390x/use.force            |  3 +-
 profiles/arch/s390/s390x/use.mask             | 14 ++----
 profiles/arch/s390/use.force                  |  5 +-
 profiles/arch/s390/use.mask                   |  7 ---
 profiles/arch/sparc/package.use.mask          |  4 --
 profiles/arch/sparc/parent                    |  1 +
 profiles/default/linux/s390/17.0/s390x/parent |  4 +-
 profiles/default/linux/s390/parent            |  2 +-
 profiles/features/wd40/eapi                   |  1 +
 profiles/features/wd40/package.mask           | 36 ++++++++++++++
 .../armv4 => features/wd40}/package.use.force |  0
 profiles/features/wd40/package.use.mask       | 48 +++++++++++++++++++
 .../arm/armv4t => features/wd40}/use.mask     |  2 +
 65 files changed, 166 insertions(+), 394 deletions(-)
 delete mode 100644 profiles/arch/arm/armv4/package.use.mask
 delete mode 100644 profiles/arch/arm/armv4/use.mask
 delete mode 100644 profiles/arch/arm/armv4t/package.use.force
 delete mode 100644 profiles/arch/arm/armv4t/package.use.mask
 delete mode 100644 profiles/arch/arm/armv5te/package.use.force
 delete mode 100644 profiles/arch/arm/armv5te/package.use.mask
 delete mode 100644 profiles/arch/arm/armv6j/package.mask
 delete mode 100644 profiles/arch/s390/package.mask
 create mode 100644 profiles/arch/s390/s390/eapi
 create mode 100644 profiles/arch/s390/s390/make.defaults
 create mode 100644 profiles/arch/s390/s390/package.mask
 create mode 100644 profiles/arch/s390/s390/parent
 create mode 100644 profiles/arch/s390/s390/use.force
 create mode 100644 profiles/arch/s390/s390/use.mask
 delete mode 100644 profiles/arch/s390/s390x/package.mask
 create mode 100644 profiles/arch/s390/s390x/parent
 create mode 100644 profiles/features/wd40/eapi
 create mode 100644 profiles/features/wd40/package.mask
 rename profiles/{arch/arm/armv4 => features/wd40}/package.use.force (100%)
 create mode 100644 profiles/features/wd40/package.use.mask
 rename profiles/{arch/arm/armv4t => features/wd40}/use.mask (97%)

-- 
2.35.1


Reply via email to