[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/

[David Seifert]

commit:     03215998f924c0d6cf72a79bc70d0b21b48e6844
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 22:26:16 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 22:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03215998

games-emulation/pcsx2: Set WX_GTK_VER before inherit

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild | 8 +++++---
 games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild | 8 +++++---
 games-emulation/pcsx2/pcsx2-9999.ebuild     | 5 +++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild 
b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index c5dffc68389..7bdeda838f0 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-MY_PV="${PV/_/-}"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
+MY_PV="${PV/_/-}"
+
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/";
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
        x11-libs/libICE[abi_x86_32(-)]
        x11-libs/libX11[abi_x86_32(-)]
        x11-libs/libXext[abi_x86_32(-)]
-       >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+       x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
 "
 DEPEND="${RDEPEND}
        dev-cpp/pngpp
@@ -96,7 +98,7 @@ src_configure() {
                -DUSE_VTUNE=FALSE
        )
 
-       WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+       setup-wxwidgets
        cmake_src_configure
 }
 

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild 
b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index d394535a100..a358ecfb9da 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-MY_PV="${PV/_/-}"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
 
+MY_PV="${PV/_/-}"
+
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/";
 SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
        x11-libs/libICE[abi_x86_32(-)]
        x11-libs/libX11[abi_x86_32(-)]
        x11-libs/libXext[abi_x86_32(-)]
-       >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+       x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
 "
 DEPEND="${RDEPEND}"
 
@@ -93,7 +95,7 @@ src_configure() {
                -DUSE_VTUNE=FALSE
        )
 
-       WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+       setup-wxwidgets
        cmake_src_configure
 }
 

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild 
b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1555b343b49..6fd902402b8 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
@@ -38,7 +39,7 @@ RDEPEND="
        x11-libs/libICE
        x11-libs/libX11
        x11-libs/libXext
-       x11-libs/wxGTK:3.0-gtk3[X]
+       x11-libs/wxGTK:${WX_GTK_VER}[X]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
@@ -81,7 +82,7 @@ src_configure() {
                -DUSE_VTUNE=FALSE
        )
 
-       WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+       setup-wxwidgets
        cmake_src_configure
 }