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

[Andreas Sturmlechner]

commit:     03bb3ab3b9ce3d606ff92c0aa44ee3dc9517b681
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 00:11:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 15:37:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03bb3ab3

games-emulation/yabause: Drop USE qt5, EAPI-7 bump

Qt5 is used unconditionally from now on.

Closes: https://bugs.gentoo.org/705140
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/yabause/yabause-0.9.15.ebuild | 41 +++++++++++----------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/games-emulation/yabause/yabause-0.9.15.ebuild b/games-emulation/yabause/yabause-0.9.15.ebuild
index b0f88a4d472..7a9c578d68a 100644
--- a/games-emulation/yabause/yabause-0.9.15.ebuild
+++ b/games-emulation/yabause/yabause-0.9.15.ebuild
@@ -1,47 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="A Sega Saturn emulator"
+DESCRIPTION="Sega Saturn emulator"
 HOMEPAGE="https://yabause.org/"
 SRC_URI="https://download.tuxfamily.org/${PN}/releases/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="openal opengl +qt5 sdl"
+IUSE="openal opengl sdl"
 
-# Qt5 is the recommended UI and 0.9.15 the last release w/ GTK+
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
-	sys-libs/zlib:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
 	x11-libs/libXrandr
 	x11-libs/libX11
 	openal? ( media-libs/openal )
 	opengl? (
+		dev-qt/qtopengl:5
 		media-libs/freeglut
 		virtual/glu
 		virtual/opengl
 	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	!qt5? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-	)
 	sdl? ( media-libs/libsdl2[opengl?,video] )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-RWX.patch
@@ -61,7 +54,7 @@ src_configure() {
 		-DYAB_WANT_SDL=$(usex sdl)
 		-DYAB_WANT_OPENAL=$(usex openal)
 		-DYAB_WANT_OPENGL=$(usex opengl)
-		-DYAB_PORTS=$(usex qt5 "qt" "gtk")
+		-DYAB_PORTS=qt
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }