commit:     e3cdcb57d4b4085d8ab395e59977f869ecaafc92
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Tue Jul 29 04:45:19 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Sat Aug  2 10:34:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cdcb57

games-util/lutris: Add 7zip

Some users don't want to use p7zip due to the risk of a CVE on their system.
Using NRK's suggestion this will let users carry as normal using p7zip,
or by default use 7zip without running into blockers until a full plan is made.

Closes: https://bugs.gentoo.org/955163
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43228
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 games-util/lutris/lutris-0.5.17-r1.ebuild | 7 +++++--
 games-util/lutris/lutris-0.5.18.ebuild    | 7 +++++--
 games-util/lutris/lutris-0.5.19.ebuild    | 5 ++++-
 games-util/lutris/lutris-9999.ebuild      | 7 +++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/games-util/lutris/lutris-0.5.17-r1.ebuild 
b/games-util/lutris/lutris-0.5.17-r1.ebuild
index 765674cdc319..78606dc3250c 100644
--- a/games-util/lutris/lutris-0.5.17-r1.ebuild
+++ b/games-util/lutris/lutris-0.5.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
        ${PYTHON_DEPS}
        app-arch/cabextract
-       app-arch/p7zip
+       || (
+               >=app-arch/7zip-24.09[symlink(+)]
+               app-arch/p7zip
+       )
        app-arch/unzip
        $(python_gen_cond_dep '
                dev-python/certifi[${PYTHON_USEDEP}]

diff --git a/games-util/lutris/lutris-0.5.18.ebuild 
b/games-util/lutris/lutris-0.5.18.ebuild
index 765674cdc319..78606dc3250c 100644
--- a/games-util/lutris/lutris-0.5.18.ebuild
+++ b/games-util/lutris/lutris-0.5.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
        ${PYTHON_DEPS}
        app-arch/cabextract
-       app-arch/p7zip
+       || (
+               >=app-arch/7zip-24.09[symlink(+)]
+               app-arch/p7zip
+       )
        app-arch/unzip
        $(python_gen_cond_dep '
                dev-python/certifi[${PYTHON_USEDEP}]

diff --git a/games-util/lutris/lutris-0.5.19.ebuild 
b/games-util/lutris/lutris-0.5.19.ebuild
index b53cfc92ada3..78606dc3250c 100644
--- a/games-util/lutris/lutris-0.5.19.ebuild
+++ b/games-util/lutris/lutris-0.5.19.ebuild
@@ -29,7 +29,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
        ${PYTHON_DEPS}
        app-arch/cabextract
-       app-arch/p7zip
+       || (
+               >=app-arch/7zip-24.09[symlink(+)]
+               app-arch/p7zip
+       )
        app-arch/unzip
        $(python_gen_cond_dep '
                dev-python/certifi[${PYTHON_USEDEP}]

diff --git a/games-util/lutris/lutris-9999.ebuild 
b/games-util/lutris/lutris-9999.ebuild
index 765674cdc319..78606dc3250c 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
        ${PYTHON_DEPS}
        app-arch/cabextract
-       app-arch/p7zip
+       || (
+               >=app-arch/7zip-24.09[symlink(+)]
+               app-arch/p7zip
+       )
        app-arch/unzip
        $(python_gen_cond_dep '
                dev-python/certifi[${PYTHON_USEDEP}]

Reply via email to