gentoo resync : 21.07.2018

7 files changed, 144 insertions, 143 deletions

diff --git a/games-emulation/yabause/Manifest b/games-emulation/yabause/Manifest
index 25365c78d8f0..06bc2fbe62e1 100644
--- a/games-emulation/yabause/Manifest
+++ b/games-emulation/yabause/Manifest
@@ -1,5 +1,5 @@
-AUX yabause-0.9.14-RWX.patch 688 BLAKE2B eb74169adfdee83d68458ebf4e6e274cb94f7e1866f0d7489b9d1ba067df1110213edb80c1cfd53a00c84723249bd7d0e0529afe0d48541bbe6310b055ade06a SHA512 9da2ca641bcd0df8c05d9d5727158952ff41a8d88f685b9263661bf0fe71eca8b338c37fbcdfce252131c5fe6e4a73fa27ae51d161495f8596feeebc3f2d6d63
-AUX yabause-0.9.14-cmake.patch 1905 BLAKE2B 59a479173d555262877626dedad50ea2cde8cecc5d2127cd8e36af4fdb4ec3d438917294d10378d7442086eaad8740a02f88086516cf7e7aed29a6dc65adbf1f SHA512 13e6c72113e06a0baee7051122c1d2cc56a13ecacd383e76aad0d6784b2bcb7593d8ff27184231e9356a2aa0bff98a74d0af2860dea62075d3d2992e8a56eec2
-DIST yabause-0.9.14.tar.gz 1662762 BLAKE2B 83f3bcdf8d513a87ed596171cfc1768cdb1cd2f3329766b92ef2e94f176fbafe16ac4970c5515e5d12537b20bd6473b209b1ec6090a07d6d1521b7d2094957ed SHA512 8b14d9146cf12d104fcf43369cd949f1f47e7891a54241914f6141facf871bcc158f4e80a8c5b61fdeefe6f1b8d425ff301ba653df134a030c323c9e3ccf3a58
-EBUILD yabause-0.9.14.ebuild 1515 BLAKE2B f439c4a4b1a72e9034b68238ef19855347ea8cf4441f704b907a3e440e1fb146f6adc77ee5a0a7fe2df1886a4b786b24fb2c86cca8a7836c1b3673a98a48284b SHA512 9ac2f7400a883c732edf2e0b5204a825ae32c468a621daacfc57eb9f329e768a83ab4ba412b7517b41391b6120c48a182222b3e3eae725f6f9445dc46cbe27cb
-MISC metadata.xml 428 BLAKE2B 7707db2fbcc0dd98e8bc2721abef693d8c06625ce607beaf419e0a60c21f96bea529780f912764f90dae2a6ac66650893d3d2ea7751ac33242a5eb804ef174f0 SHA512 1695012927826ba97b0457e9d1051396a1da0b582cebf64269fe02431c019dbf4ca20a42368b825a28ba24b0a781126be82727428e3ab92adffc667bb6c575ef
+AUX yabause-0.9.15-RWX.patch 556 BLAKE2B e64fbcb60ad606ec64f712f99fc73a449fb13a30adec7b21a73370c8c9059ebf8320e7a1fe392837e8ed583ac3e3fc3dc27f19290e8673e8f51d009bfd1793e9 SHA512 18407541de268afe34eb3110c072fae0859c8cc1e7937e435e043eedff13d075b104c38cb09cadca303b62992984fbf2340d33941fc829f58f2aa249c0a1e078
+AUX yabause-0.9.15-qt-5.11.patch 1716 BLAKE2B a0d696ffc186e21758110546e17b421dd4fe4a661b037ee2eb342f0fccc9259d289612c64cde5eb4ff4fa1c45d40a9c9ad1ad8d0e46d4a5234f170bb779f65ec SHA512 93e9da7bfc80b03352fbbb25ac50c48104dadf4e4a45741addcd54fefc9c7ce75ce89ff191ca6c7e3aa7f519b8e77ccaa8f71e9126625aa16be978e1c3b2b0ec
+DIST yabause-0.9.15.tar.gz 2481650 BLAKE2B c211f4372c1cb3c8dc757d60b2106898a637c6852c19856d3cb619fed4a04788d70c132ff78be4382e67c7ce368b8939c039d057c4597e27e4349c7caa01950d SHA512 f7e992e3326e68aca1c0ce6dd0d382eea00cd3e47492c045d17526909356198448c533b00568af3ab311307e6b3d47a28708a8c0ff74e5b6c98d62da8c01a3c7
+EBUILD yabause-0.9.15.ebuild 1345 BLAKE2B d15fcc47c81fddb3dbe70d3c3fbc0bcffcfc6b26045c4bfe6e874f3ac2b68cae8c8a7312e2aca1a6353cdc35f6f3ba7e71173b540be380e75f1f351788022811 SHA512 fb25a23f07f2d3b5806aa78b88fbc8938bec4f1e5827063f83ec2e5f0a32880870c5cdbf60020db9e784a75b8d14b0a3373eb3617dfdc59df6b9a3f885d54497
+MISC metadata.xml 333 BLAKE2B 5dcf088b796127de03a35a6c6a646d9d8501a4083489dab6d5e72a4bf8ea7f6fde1e79b30d7313120bea0a3848e8c127a1dd69017bef53f98b579efc67d099a0 SHA512 11e9e94bb7bd43f1ea7a5e203b2540055da973ed2d094a40494ab7b7c6f4bf862bb2604e4742e2cb566d35e7db6a6cf026284977c54dd4644523a47f05995fba
diff --git a/games-emulation/yabause/files/yabause-0.9.14-cmake.patch b/games-emulation/yabause/files/yabause-0.9.14-cmake.patch
deleted file mode 100644
index a126c010bb7a..000000000000
--- a/games-emulation/yabause/files/yabause-0.9.14-cmake.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- yabause-0.9.13.orig/l10n/CMakeLists.txt
-+++ yabause-0.9.13/l10n/CMakeLists.txt
-@@ -2,9 +2,12 @@
- 
- set(LANGS de es fr it lt nl pt pt_BR sv)
- 
-+# paths
-+set(TRANSDIR "share/yabause/yts" CACHE STRING "dir to translation files")
-+
- if (UNIX AND NOT APPLE)
-     foreach(LANG ${LANGS})
--	    install(FILES "yabause_${LANG}.yts" DESTINATION "share/yabause/yts" RENAME "${LANG}.yts")
-+	    install(FILES "yabause_${LANG}.yts" DESTINATION ${TRANSDIR} RENAME "${LANG}.yts")
-     endforeach()
- elseif (WIN32)
-     foreach(LANG ${LANGS})
---- yabause-0.9.13.orig/src/gtk/CMakeLists.txt
-+++ yabause-0.9.13/src/gtk/CMakeLists.txt
-@@ -59,7 +59,10 @@
- yab_port_success(yabause-gtk)
- configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
- 
--install(TARGETS yabause-gtk DESTINATION "bin")
-+# paths
-+set(BINDIR "bin" CACHE STRING "dir to binary")
-+
-+install(TARGETS yabause-gtk DESTINATION ${BINDIR})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
- install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
- install(FILES "yabause.png" DESTINATION "share/pixmaps")
---- yabause-0.9.13.orig/src/qt/CMakeLists.txt
-+++ yabause-0.9.13/src/qt/CMakeLists.txt
-@@ -237,6 +237,9 @@
- yab_port_success(yabause-qt)
- configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
- 
-+# paths
-+set(BINDIR "bin" CACHE STRING "dir to binary")
-+
- if (WIN32)
- 	install(TARGETS yabause-qt DESTINATION ".")
- 	if (GLUT_FOUND)
-@@ -277,7 +280,7 @@
- 		endif()
- 	endif ()
- else ()
--	install(TARGETS yabause-qt DESTINATION "bin")
-+	install(TARGETS yabause-qt DESTINATION ${BINDIR})
- 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
- 	install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
- 	install(FILES "resources/icons/yabause.png" DESTINATION "share/pixmaps")
diff --git a/games-emulation/yabause/files/yabause-0.9.14-RWX.patch b/games-emulation/yabause/files/yabause-0.9.15-RWX.patch
index 8022be90f852..e08a8a7a7d50 100644
--- a/games-emulation/yabause/files/yabause-0.9.14-RWX.patch
+++ b/games-emulation/yabause/files/yabause-0.9.15-RWX.patch
@@ -1,6 +1,6 @@
---- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x64.s
-+++ yabause-0.9.13/src/sh2_dynarec/linkage_x64.s
-@@ -747,3 +747,11 @@
+--- a/src/sh2_dynarec/linkage_x64.s
++++ b/src/sh2_dynarec/linkage_x64.s
+@@ -747,3 +747,7 @@ breakpoint:
  	ret
  	/* Set breakpoint here for debugging */
  	.size	breakpoint, .-breakpoint
@@ -8,13 +8,9 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x86.s
-+++ yabause-0.9.13/src/sh2_dynarec/linkage_x86.s
-@@ -743,3 +743,7 @@
+--- a/src/sh2_dynarec/linkage_x86.s
++++ b/src/sh2_dynarec/linkage_x86.s
+@@ -743,3 +743,7 @@ breakpoint:
  	ret
  	/* Set breakpoint here for debugging */
  	.size	breakpoint, .-breakpoint
diff --git a/games-emulation/yabause/files/yabause-0.9.15-qt-5.11.patch b/games-emulation/yabause/files/yabause-0.9.15-qt-5.11.patch
new file mode 100644
index 000000000000..3f4528482b3d
--- /dev/null
+++ b/games-emulation/yabause/files/yabause-0.9.15-qt-5.11.patch
@@ -0,0 +1,65 @@
+From 06a816c032c6f7fd79ced6e594dd4b33571a0e73 Mon Sep 17 00:00:00 2001
+From: Guillaume Duhamel <guillaume.duhamel@gmail.com>
+Date: Fri, 6 Jul 2018 08:08:22 +0200
+Subject: [PATCH] Fix qt 5.11 (#422)
+
+Header fixes for Qt 5.11
+---
+ yabause/src/qt/ui/UICheatRaw.cpp | 2 --
+ yabause/src/qt/ui/UICheatRaw.h   | 2 +-
+ yabause/src/qt/ui/UICheats.cpp   | 2 ++
+ yabause/src/qt/ui/UIHexInput.h   | 2 ++
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp
+index 4ad82d770..3f78486bf 100755
+--- a/src/qt/ui/UICheatRaw.cpp
++++ b/src/qt/ui/UICheatRaw.cpp
+@@ -20,8 +20,6 @@
+ #include "UIHexInput.h"

+ #include "../QtYabause.h"

+ 

+-#include <QButtonGroup>

+-

+ UICheatRaw::UICheatRaw( QWidget* p )

+ 	: QDialog( p )

+ {

+diff --git a/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h
+index d97b429da..20318c670 100755
+--- a/src/qt/ui/UICheatRaw.h
++++ b/src/qt/ui/UICheatRaw.h
+@@ -21,7 +21,7 @@
+ 

+ #include "ui_UICheatRaw.h"

+ 

+-class QButtonGroup;

++#include <QButtonGroup>

+ 

+ class UICheatRaw : public QDialog, public Ui::UICheatRaw

+ {

+diff --git a/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp
+index c60279723..44d341c34 100755
+--- a/src/qt/ui/UICheats.cpp
++++ b/src/qt/ui/UICheats.cpp
+@@ -21,6 +21,8 @@
+ #include "UICheatRaw.h"
+ #include "../CommonDialogs.h"
+ 
++#include <QButtonGroup>
++
+ UICheats::UICheats( QWidget* p )
+ 	: QDialog( p )
+ {
+diff --git a/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h
+index f333b0166..4bd8aed48 100644
+--- a/src/qt/ui/UIHexInput.h
++++ b/src/qt/ui/UIHexInput.h
+@@ -22,6 +22,8 @@
+ #include "ui_UIHexInput.h"

+ #include "../QtYabause.h"

+ 

++#include <QValidator>

++

+ class HexValidator : public QValidator

+ {

+    Q_OBJECT

diff --git a/games-emulation/yabause/metadata.xml b/games-emulation/yabause/metadata.xml
index 518c975f9d26..93d5ca4ee29d 100644
--- a/games-emulation/yabause/metadata.xml
+++ b/games-emulation/yabause/metadata.xml
@@ -5,10 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-	</use>
 	<upstream>
-		<remote-id type="sourceforge">yabause</remote-id>
+		<remote-id type="github">Yabause/yabause</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/yabause/yabause-0.9.14.ebuild b/games-emulation/yabause/yabause-0.9.14.ebuild
deleted file mode 100644
index b13959e8a4a0..000000000000
--- a/games-emulation/yabause/yabause-0.9.14.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils games
-
-DESCRIPTION="A Sega Saturn emulator"
-HOMEPAGE="http://yabause.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openal opengl pic qt5 sdl"
-
-# x11-libs/libXrandr is an automagic dep
-# qt5 over qt4 and libsdl2 over libsdl is
-# also done automatically.  Send patches
-# upstream to make the choices explicit.
-RDEPEND="
-	x11-libs/libXrandr
-	openal? ( media-libs/openal )
-	opengl? (
-		media-libs/freeglut
-		virtual/glu
-		virtual/opengl
-	)
-	qt5? (
-		dev-qt/qtcore: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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-RWX.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINDIR="${GAMES_BINDIR}"
-		-DTRANSDIR="${GAMES_DATADIR}"/${PN}/yts
-		-DYAB_OPTIMIZATION=""
-		$(cmake-utils_use sdl YAB_WANT_SDL)
-		$(cmake-utils_use openal YAB_WANT_OPENAL)
-		$(cmake-utils_use opengl YAB_WANT_OPENGL)
-		$(cmake-utils_use !pic SH2_DYNAREC)
-		-DYAB_PORTS=$(usex qt5 "qt" "gtk")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog GOALS README README.LIN
-	prepgamesdirs
-}
diff --git a/games-emulation/yabause/yabause-0.9.15.ebuild b/games-emulation/yabause/yabause-0.9.15.ebuild
new file mode 100644
index 000000000000..b0f88a4d472e
--- /dev/null
+++ b/games-emulation/yabause/yabause-0.9.15.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A 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"
+
+# Qt5 is the recommended UI and 0.9.15 the last release w/ GTK+
+RDEPEND="
+	sys-libs/zlib:=
+	x11-libs/libXrandr
+	x11-libs/libX11
+	openal? ( media-libs/openal )
+	opengl? (
+		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
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-RWX.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DYAB_NETWORK=ON
+		-DYAB_USE_CXX=ON
+		-DYAB_USE_SCSP2=OFF # breaks build
+		-DYAB_USE_SCSPMIDI=ON
+		-DYAB_USE_SSF=ON
+		-DSH2_DYNAREC=OFF # bug 582326
+		-DYAB_OPTIMIZATION=""
+		-DYAB_WANT_MPEG=OFF
+		-DYAB_WANT_SDL=$(usex sdl)
+		-DYAB_WANT_OPENAL=$(usex openal)
+		-DYAB_WANT_OPENGL=$(usex opengl)
+		-DYAB_PORTS=$(usex qt5 "qt" "gtk")
+	)
+	cmake-utils_src_configure
+}