From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1267812-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2389F1382C5
for <garchives@archives.gentoo.org>; Mon, 5 Apr 2021 22:27:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 713E7E0901;
Mon, 5 Apr 2021 22:27:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 36182E0901
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 22:27:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7C86933BEAE
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 22:27:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 069E5641
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 22:26:59 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1617661576.03215998f924c0d6cf72a79bc70d0b21b48e6844.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild games-emulation/pcsx2/pcsx2-9999.ebuild
X-VCS-Directories: games-emulation/pcsx2/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 03215998f924c0d6cf72a79bc70d0b21b48e6844
X-VCS-Branch: master
Date: Mon, 5 Apr 2021 22:26:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b5f0525c-a6a0-4e8b-9848-14953441baf4
X-Archives-Hash: fafc5dfd833be4b2d74974eaa21e8b09
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
}