gentoo resync : 04.12.2017

3 files changed, 11 insertions, 32 deletions

diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
index fdab5a1a7c11..5e6902bab1b7 100644
--- a/games-emulation/higan/Manifest
+++ b/games-emulation/higan/Manifest
@@ -3,6 +3,6 @@ AUX higan-099-QA.patch 2597 BLAKE2B 0737dd216f1dc63620c43478e372a41736d47da6df5e
 AUX higan-wrapper 124 BLAKE2B 3b87ba7212551d8c5b4814ff41e2ecd647589dafe8abfac6f354970e1093cf2ef53e885c9f88f6755c8e2a72c08c61491da073819a19494dbb6a75f8ba413f8e SHA512 af3163d06f3bc14b14ec38cf84d11cc706eb6359727743eea35670b4f1ac120af40102ee5409695eba00ead70fcf964073c24d2f47d6824776391927ebbf3f45
 DIST higan_v094-source.tar.xz 882732 SHA256 5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da WHIRLPOOL 42e2b628e83b6cb8d87ce82c2e91105b0be06790a1927aa7d52f0b1a181af5d627f467009d15daffd470e3c38a2bb7d67ba84919fb1aa9c8d06ad88ca3163641
 DIST higan_v099-source.7z 1012348 SHA256 1c62f2f1ec98da9d098c2df5c8b539a192b5a70eff0896c3e27d541fb4d28e86 SHA512 567f0c9841fb3fed1c78f2afcd9865cbfe06d04b995d4dc468269e459249b758daed949b461b5b8645ebab40edc1f4f28a566de5795325dae4f604190ca9eae6 WHIRLPOOL 096b4da32f9f030a402690e81dc64e0a242072fd7cb3aa1520783a3a69bd76ff73d3fbcfb3624ad9cf9396e5123777a9cd4fd13f04191fe7faf9ec385c1a929e
-EBUILD higan-094.ebuild 3596 BLAKE2B 0c1afa01465c4cfe8b7b72cf8d6aa80f99426116ee96598ed4f30a5694885f377b030fb06f13be82b0240b497548764a05ab302cb8065b54916adb7a12e01a94 SHA512 96b4c27f7a217c36476a1ab90891f151e124ca40b2e96042c9d5530f75742613c939311e71f57497368e3ad993e072684f64001a79fba19bb0903a904ea045c0
-EBUILD higan-099.ebuild 3321 BLAKE2B 7422c6bc6a36cb0bf824e2fdeed43a2de631c065ea6ab43ea8299fd8ea1fb9439960e371d460709350165e74d54690e1791fe7e5a626ac723d755980da6ef0ee SHA512 826e888abda2b7f5340277b0b6d2b470b553449cf36a1e7ff748b559df0ad69079ebff49770155529b8c314429d43ec15a03f3be69c599f407fa9782ddb270ca
+EBUILD higan-094.ebuild 3357 BLAKE2B eb354f770e0881677cca6aaa659b520b05e7f98afb1e83d5083d8d2b41b8b6f589ee9793239b31c521faa4101f3daad438d4eb4d09e649a9a7d036e931ea5ed1 SHA512 eae543c1705a3d7e2af1b0425a1839d3121cf3ff22c0b15a8a3564be6c088d7cf16798f5a74133b2b1681b0f2ba6009f8e456c0737ce102fba8faa6545002a38
+EBUILD higan-099.ebuild 3081 BLAKE2B ff75470da256db5e49f8313d87135af2def1d6bd185effa328bb49b97c783d23cc517e46160888707724a56c73ec1303fd2fd98638197e8f62c28f95ffac6e3b SHA512 3e7eff25fc8649bf2181eba3f383e824230c4d574643c5ef0c986fadcd1464f2db0c5db0b3fcb22ae2d26ebdc5504b24916ee5f91025d7fcdc2e0c9ba64f35d9
 MISC metadata.xml 636 BLAKE2B 445ca6a449f6972817e33eb020450420cee9af2f27d605e08764d43d9265d06ba8bb059936c5597f362032964631ffc3fe1b01c3970b23c29e6a988c00448187 SHA512 a835b9cb4fa482754349eaddee279a6bca17cbc070806c0a59c923502159375bbfb481964faae23bbee8379fdbe7e9f0e070cbc783e3c2e62ddd2d88f511170b
diff --git a/games-emulation/higan/higan-094.ebuild b/games-emulation/higan/higan-094.ebuild
index ec815cc3da6f..1401fc403ff3 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 2a660f3b6e1e..7bea4f56b144 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