commit:     65bd8a90eb02e39eebc0e16742fcff6eee62eec0
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 15:41:21 2025 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 15:56:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bd8a90

app-emulation/winetricks: add 'app-arch/7zip' as an alternative

Also silence a couple of 'pkgcheck' messages related to variable use.

Closes: https://bugs.gentoo.org/954141
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 ...ricks-99999999.ebuild => winetricks-20250102-r1.ebuild} | 14 ++++++++------
 app-emulation/winetricks/winetricks-99999999.ebuild        | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild 
b/app-emulation/winetricks/winetricks-20250102-r1.ebuild
similarity index 94%
copy from app-emulation/winetricks/winetricks-99999999.ebuild
copy to app-emulation/winetricks/winetricks-20250102-r1.ebuild
index 1a7b9025d53b..cf2af490e70c 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-20250102-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
@@ -6,10 +6,12 @@ EAPI=8
 WTG="winetricks-gentoo-2012.11.24"
 inherit xdg
 
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks 
https://wiki.winehq.org/Winetricks";
+
 if [[ ${PV} == *99999999* ]] ; then
        EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git";
        inherit git-r3
-       SRC_URI=""
 else
        SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
@@ -17,9 +19,6 @@ fi
 
 SRC_URI+=" gui? ( https://dev.gentoo.org/~chiitoo/distfiles/${WTG}.tar.bz2 )"
 
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks 
https://wiki.winehq.org/Winetricks";
-
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gui rar test"
@@ -40,7 +39,10 @@ BDEPEND="
 "
 RDEPEND="
        app-arch/cabextract
-       app-arch/p7zip
+       || (
+               >=app-arch/7zip-24.09[symlink(+)]
+               app-arch/p7zip
+       )
        app-arch/unzip
        net-misc/wget
        virtual/wine

diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild 
b/app-emulation/winetricks/winetricks-99999999.ebuild
index 1a7b9025d53b..cf2af490e70c 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.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
@@ -6,10 +6,12 @@ EAPI=8
 WTG="winetricks-gentoo-2012.11.24"
 inherit xdg
 
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks 
https://wiki.winehq.org/Winetricks";
+
 if [[ ${PV} == *99999999* ]] ; then
        EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git";
        inherit git-r3
-       SRC_URI=""
 else
        SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
@@ -17,9 +19,6 @@ fi
 
 SRC_URI+=" gui? ( https://dev.gentoo.org/~chiitoo/distfiles/${WTG}.tar.bz2 )"
 
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks 
https://wiki.winehq.org/Winetricks";
-
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gui rar test"
@@ -40,7 +39,10 @@ BDEPEND="
 "
 RDEPEND="
        app-arch/cabextract
-       app-arch/p7zip
+       || (
+               >=app-arch/7zip-24.09[symlink(+)]
+               app-arch/p7zip
+       )
        app-arch/unzip
        net-misc/wget
        virtual/wine

Reply via email to