From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 93177139084 for ; Sun, 3 Dec 2017 19:41:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4D47E0E82; Sun, 3 Dec 2017 19:41:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7E941E0E82 for ; Sun, 3 Dec 2017 19:41:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0029A33BF24 for ; Sun, 3 Dec 2017 19:41:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67CF3AE5C for ; Sun, 3 Dec 2017 19:41:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1512330044.0eb12c94c3e58d777a79ab67d07c7a1210dca62d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/higan/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/higan/higan-094.ebuild games-emulation/higan/higan-099.ebuild X-VCS-Directories: games-emulation/higan/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0eb12c94c3e58d777a79ab67d07c7a1210dca62d X-VCS-Branch: master Date: Sun, 3 Dec 2017 19:41:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d38f1c0c-b2d4-4321-9c67-cf65b615f82a X-Archives-Hash: 4773e86dce508e37790dfa37997fd19e commit: 0eb12c94c3e58d777a79ab67d07c7a1210dca62d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 3 18:52:42 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 3 19:40:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb12c94 games-emulation/higan: Drop USE=qt4, bug #631788 Package-Manager: Portage-2.3.16, Repoman-2.3.6 games-emulation/higan/higan-094.ebuild | 20 +++++--------------- games-emulation/higan/higan-099.ebuild | 19 ++++--------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/games-emulation/higan/higan-094.ebuild b/games-emulation/higan/higan-094.ebuild index ec815cc3da6..1401fc403ff 100644 --- a/games-emulation/higan/higan-094.ebuild +++ b/games-emulation/higan/higan-094.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,12 +14,13 @@ SRC_URI="http://byuu.org/files/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio qt4 +sdl udev xv" +IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio +sdl udev xv" REQUIRED_USE="|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl ) || ( profile_accuracy profile_balanced profile_performance )" RDEPEND=" + x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext ao? ( media-libs/libao ) @@ -30,8 +31,7 @@ RDEPEND=" opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) - !qt4? ( x11-libs/gtk+:2 ) - qt4? ( >=dev-qt/qtgui-4.5:4 )" +" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -69,12 +69,6 @@ src_prepare() { use sdl || disable_module input.sdl use udev || disable_module input.udev - # regenerate .moc if needed - if use qt4; then - cd phoenix/qt || die - "$(qt4_get_bindir)"/moc -i -I. -o platform.moc platform.moc.hpp || die - fi - for i in profile_accuracy profile_balanced profile_performance ; do if use ${i} ; then cp -dRP "${S}" "${S}_${i}" || die @@ -85,11 +79,7 @@ src_prepare() { src_compile() { local mytoolkit i - if use qt4; then - mytoolkit="qt" - else - mytoolkit="gtk" - fi + mytoolkit="gtk" for i in profile_accuracy profile_balanced profile_performance ; do if use ${i} ; then diff --git a/games-emulation/higan/higan-099.ebuild b/games-emulation/higan/higan-099.ebuild index 2a660f3b6e1..7bea4f56b14 100644 --- a/games-emulation/higan/higan-099.ebuild +++ b/games-emulation/higan/higan-099.ebuild @@ -14,11 +14,12 @@ SRC_URI="http://download.byuu.org/${MY_P}.7z" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ao +alsa +icarus openal opengl oss pulseaudio qt4 +sdl udev xv" +IUSE="ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv" REQUIRED_USE="|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl )" RDEPEND=" + x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtksourceview:2.0 @@ -39,9 +40,7 @@ RDEPEND=" opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) - !qt4? ( x11-libs/gtk+:2 ) - qt4? ( dev-qt/qtcore:4 - >=dev-qt/qtgui-4.5:4 )" +" DEPEND="${RDEPEND} app-arch/p7zip virtual/pkgconfig" @@ -77,22 +76,12 @@ src_prepare() { # input modules use sdl || disable_module input.sdl use udev || disable_module input.udev - - # regenerate .moc if needed - if use qt4; then - cd hiro/qt || die - "$(qt4_get_bindir)"/moc -i -I. -o qt.moc qt.hpp || die - fi } src_compile() { local mytoolkit - if use qt4; then - mytoolkit="qt" - else - mytoolkit="gtk" - fi + mytoolkit="gtk" if use icarus; then cd "${S}/icarus" || die