[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/arch/amd64/, app-arch/7zip/

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/arch/amd64/, app-arch/7zip/

[Arthur Zamarin]

commit:     22add0b379f23a7d401ec3d4bb7447ca1e98e3bf
Author:     Jared Allard <jaredallard <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Jun  8 21:59:38 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 16:13:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22add0b3

app-arch/7zip: add ~arm64 keyword

Adds the `~arm64` keyword to app-arch/7zip because I've
been able to use it in a few different use-cases successfully
now.

As part of this, the USE flags `uasm` and `jwasm` are now masked
by default and unmasked on amd64, as it causes amd64-specific
asm to be used.

Signed-off-by: Jared Allard <jaredallard <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/37086
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-arch/7zip/7zip-23.01.ebuild      | 2 +-
 app-arch/7zip/7zip-24.05.ebuild      | 2 +-
 app-arch/7zip/7zip-24.06.ebuild      | 2 +-
 profiles/arch/amd64/package.use.mask | 4 ++++
 profiles/arch/base/package.use.mask  | 4 ++++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 51c0b76b70b0..0d983a22a12f 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"
 

diff --git a/app-arch/7zip/7zip-24.05.ebuild b/app-arch/7zip/7zip-24.05.ebuild
index 51c0b76b70b0..0d983a22a12f 100644
--- a/app-arch/7zip/7zip-24.05.ebuild
+++ b/app-arch/7zip/7zip-24.05.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"
 

diff --git a/app-arch/7zip/7zip-24.06.ebuild b/app-arch/7zip/7zip-24.06.ebuild
index a6bf83168b8c..59e13dc0c5e5 100644
--- a/app-arch/7zip/7zip-24.06.ebuild
+++ b/app-arch/7zip/7zip-24.06.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"
 

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 365a5cbd6812..016e8763c70a 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -21,6 +21,10 @@
 # Pulls in kde-apps/kgpg is keyworded here
 >=kde-apps/kdeutils-meta-24.05.1 -gpg
 
+# Jared Allard <jared@rgst.io> (2024-06-21)
+# uasm and jwasm include amd64-specific ASM
+app-arch/7zip -uasm -jwasm
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-25)
 # ROCm and Level-Zero are amd64-only at the moment
 sys-apps/hwloc -rocm -l0

diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index afa5d9efabee..e409b19b7ac1 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -7,6 +7,10 @@
 # on amd64 and arm64.
 >=kde-apps/kdeutils-meta-24.05.1 gpg
 
+# Jared Allard <jared@rgst.io> (2024-06-21)
+# uasm and jwasm include amd64-specific ASM
+app-arch/7zip uasm jwasm
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-25)
 # ROCm and Level-Zero are amd64-only at the moment
 sys-apps/hwloc rocm l0