[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

["David Seifert" <soap@gentoo.org>]

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

games-strategy/megaglest: 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-strategy/megaglest/megaglest-3.11.1-r100.ebuild | 6 +++---
 games-strategy/megaglest/megaglest-3.13.0.ebuild      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
index d19c6ffd579..353d0ce3f9b 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
@@ -14,6 +14,7 @@ LUA_COMPAT=( lua5-{1..2} )
 # Only needed by certain features
 VIRTUALX_REQUIRED="manual"
 
+WX_GTK_VER="3.0"
 inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
@@ -43,9 +44,9 @@ RDEPEND="${LUA_DEPS}
 	virtual/glu
 	x11-libs/libX11
 	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:3.0[X,opengl] )
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:3.0[X] )
+	model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 	dev-libs/xerces-c[icu]
 	media-libs/ftgl
 	media-libs/glew:=
@@ -73,7 +74,6 @@ src_prepare() {
 	cmake_src_prepare
 
 	if use editor || use model-viewer ; then
-		WX_GTK_VER="3.0"
 		setup-wxwidgets
 	fi
 }

diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild b/games-strategy/megaglest/megaglest-3.13.0.ebuild
index 9b8867d2938..212ab76aac3 100644
--- a/games-strategy/megaglest/megaglest-3.13.0.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -13,6 +13,7 @@ LUA_COMPAT=( lua5-{1..2} )
 # Only needed by certain features
 VIRTUALX_REQUIRED="manual"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
@@ -49,9 +50,9 @@ RDEPEND="
 	virtual/jpeg:0=
 	x11-libs/libX11
 	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:3.0-gtk3[X] )
+	model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 	videos? ( media-video/vlc )
 "
 DEPEND="${RDEPEND}"
@@ -69,7 +70,6 @@ src_prepare() {
 	cmake_src_prepare
 
 	if use editor || use model-viewer ; then
-		WX_GTK_VER="3.0"
 		setup-wxwidgets
 	fi
 }