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

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
net-p2p/deluge/deluge-2.0.5-r1.ebuild | 2 +-
net-p2p/deluge/deluge-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.5-r1.ebuild b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
index 087d6c65dbd4..ecb8c4c8a4fd 100644
--- a/net-p2p/deluge/deluge-2.0.5-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
else
SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
fi

LICENSE="GPL-2"
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index f432594a17df..300f86532165 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
else
SRC_URI="http://download.deluge-t

Rather than setting stuff specific to not-x s390 in the top profile
and undoing it for s390x, move it to the new subprofile.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
profiles/arch/s390/make.defaults | 15 +--------------
profiles/arch/s390/s390/make.defaults | 16 ++++++++++++++++
profiles/arch/s390/{ => s390}/package.mask | 0
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/use.force | 3 +--
profiles/arch/s390/s390x/use.mask | 10 ++++------
profiles/arch/s390/use.force | 5 +----
profiles/arch/s390/use.mask | 7 -------
11 files changed, 39 insertions(+), 55 deletions(-)
create mode 100644 profiles/arch/s390/s390/make.defaults
rename profiles/arch/s390/{ => s390}/package.mask (100%)
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

diff --git a/profiles/a

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
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/arm

On 19 Jun 2022, at 11:03, Michał Górny <mgorny@gentoo.org> wrote:

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

I need to review the details just to check for any errors (and I'll do that now),
but conceptual ACK, and unless you hear otherwise, LGTM.

And I like the name (wd40). It's a nice bit of Gentoo "personality"
which some folks say we're lacking nowadays ;)

Thanks for working on this. It'll make life a lot easier for the
platforms which aren't support Rust. Might even make it easier
to "support" systems w/o e.g. SSE2.

(For non-technical observers: this is an internal mechanism
to allow easily referencing "no Rust" settings, rather than
creating a profile for users to actually easily opt in to
removing Rust. Although in theory you may add it to
a custom profile and add it as a parent.)

Best,
sam

-----BEGIN PGP SIGNATURE-----

iNUEARYKAH0WIQQlpruI3Zt2TGtVQcJzhAn1IN+RkAUCYq/TsV8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MjVB NkJCODhERDlCNzY0QzZCNTU0MUMyNzM4NDA5RjUyMERGOTE5MAAKCRBzhAn1IN+R kDgnAP9VcT3JNmIZIjY0SMeFbHZsTX5kYvQfHvpqjfGTdK3AWQEAzDmKXKgfLmXf K6zhRLFhV9Ap7dCVXrkrRC+DPioSbAo=
=kumR
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)