gentoo resync : 15.12.2019

4 files changed, 183 insertions, 19 deletions

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 4e1178ae603d..416d1c03a7a2 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,7 +1,8 @@
 AUX vbam-2.1.0-performance_fixup.patch 1515 BLAKE2B fdc77976e24c1df0bb3be97f709874d768a68b238111281f2ffa0edec205bf0f7de831dd5d96e7ac77a6fa47a02781b2e248cba00d767da42c291bdc0255ffb8 SHA512 1b6cc31d6a7ef66eadc4150bf8c42edc6dbad3f08f2b508e9a62159373b218e130eeeb4afed87d2696a15d4b41775f1348f567d74d6debb3bb665b75949d2aa8
-DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
+AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
 DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd SHA512 e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321
-EBUILD vbam-2.0.2.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365
+DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
 EBUILD vbam-2.1.0.ebuild 2191 BLAKE2B 5ca4979634d3f9d04f6424b674d94ffe0dc868d831175f29ddc8943d445bd79bf378fad97ee8207ae3b65e08db17a7b1660d07e61e02eb3fab6f78ddeb535240 SHA512 a64571b4c5f9d03922a14b283ecb73bf59f03082abe12ba8427d159864fecac5b4c045ff107f5acc163473333655dd56318a9597115cece0a48a88f8e76e1bba
-EBUILD vbam-9999.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365
+EBUILD vbam-2.1.4.ebuild 2081 BLAKE2B c651c54b5f912e35ebd3a624c876df635ecf71fceaa8019bc6fc65615a5cc5b143dfbbb34a35667a6a7f2a176016d0067e308f2900ff13705aef0c952ed38467 SHA512 de8eb41e2143faa8b1c08f3cebfbce29c0155cad26d2a1a36cfaed0d12ca47e4808303adb2a70db591082fdccb441aaaf8da426ebede44576da4108757867b5a
+EBUILD vbam-9999.ebuild 2032 BLAKE2B 82888bd97148fc1fc2d1212dfb3ac6d9f8cd00c0482c930820f2c7c7c1bbac916af054ceef42609c999a049ed37d8a85bca9ee29593dff9730ca5e7a3c85565a SHA512 0d4735c460aab4c1a5190baf0f9f1bed16630141731270e042f0f7395b18719c93883aca89b57ef0d458417f90d7e21f4e17389e659db2f43b82022e0f903c0f
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
new file mode 100644
index 000000000000..d801b08317a3
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch
@@ -0,0 +1,163 @@
+From ae7349b06f86ff60b0d14dfa01b3fe2163dcfbab Mon Sep 17 00:00:00 2001
+From: Rafael Kitover <rkitover@gmail.com>
+Date: Wed, 13 Nov 2019 02:56:06 +0000
+Subject: [PATCH] cmake: Use list var VBAM_LIBS for link libs.
+
+Accumulate link libraries for wxvbam in the VBAM_LIBS list variable
+instead of listing every possible library variable in the
+target_link_libraries() call.
+
+This fixes the issue with trying to use OPENAL_LIBRARIES when it's set
+to NOTFOUND which generates a cmake error.
+
+Fix #563.
+
+Signed-off-by: Rafael Kitover <rkitover@gmail.com>
+---
+ src/wx/CMakeLists.txt | 43 ++++++++++++++++++++++---------------------
+ 1 file changed, 22 insertions(+), 21 deletions(-)
+
+diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
+index 13e0cea7..d37c1cdd 100644
+--- a/src/wx/CMakeLists.txt
++++ b/src/wx/CMakeLists.txt
+@@ -15,6 +15,8 @@ endif()
+ 
+ include(VbamFunctions)
+ 
++set(VBAM_LIBS ${VBAMCORE_LIBS})
++
+ if(WIN32)
+     # not yet implemented
+     option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF)
+@@ -46,6 +48,8 @@ if(ENABLE_OPENAL)
+ 	if(OPENAL_STATIC OR (WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe)))
+ 		add_definitions(-DAL_LIBTYPE_STATIC)
+ 	endif()
++
++        list(APPEND VBAM_LIBS ${OPENAL_LIBRARY})
+ else()
+     add_definitions(-DNO_OAL)
+ endif()
+@@ -58,18 +62,15 @@ if(NOT ENABLE_XAUDIO2)
+     add_definitions(-DNO_XAUDIO2)
+ endif()
+ 
+-if(NOT ENABLE_FAUDIO)
+-    add_definitions(-DNO_FAUDIO)
+-endif()
+-
+ if(NOT ENABLE_DIRECT3D)
+     add_definitions(-DNO_D3D)
+ endif()
+ 
+-unset(FAUDIO_LIBS)
+ if(ENABLE_FAUDIO)
+     find_package(FAudio REQUIRED)
+-    set(FAUDIO_LIBS FAudio)
++    list(APPEND VBAM_LIBS FAudio)
++else()
++    add_definitions(-DNO_FAUDIO)
+ endif()
+ 
+ # on unix we have to check for X11 before we overwrite all the compile/link
+@@ -79,7 +80,7 @@ if(NOT WIN32 AND NOT APPLE)
+ 
+     if(X11_X11_LIB AND X11_Xscreensaver_LIB)
+         include_directories(${X11_INCLUDE_DIR})
+-        set(EXTRA_X11_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
++        list(APPEND VBAM_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
+         add_definitions(-DHAVE_XSS)
+     endif()
+ endif()
+@@ -419,7 +420,7 @@ int main(int argc, char** argv) {
+             include_directories(${GTK4_INCLUDE_DIRS})
+             link_directories(${GTK4_LIBRARY_DIRS})
+             add_compile_options(${GTK4_CFLAGS_OTHER})
+-            set(GTK_LIBRARIES ${GTK4_LIBRARIES})
++            list(APPEND VBAM_LIBS ${GTK4_LIBRARIES})
+         elseif(WX_USING_GTK3)
+             pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+             if(NOT GTK3_INCLUDE_DIRS)
+@@ -428,7 +429,7 @@ int main(int argc, char** argv) {
+             include_directories(${GTK3_INCLUDE_DIRS})
+             link_directories(${GTK3_LIBRARY_DIRS})
+             add_compile_options(${GTK3_CFLAGS_OTHER})
+-            set(GTK_LIBRARIES ${GTK3_LIBRARIES})
++            list(APPEND VBAM_LIBS ${GTK3_LIBRARIES})
+         else()
+             check_cxx_symbol_exists(__WXGTK20__ ${WX_CONFIG_H} WX_USING_GTK2)
+             if(WX_USING_GTK2)
+@@ -438,7 +439,7 @@ int main(int argc, char** argv) {
+                     include_directories(${GTK2_INCLUDE_DIRS})
+                     link_directories(${GTK2_LIBRARY_DIRS})
+                     add_compile_options(${GTK2_CFLAGS_OTHER})
+-                    set(GTK_LIBRARIES ${GTK2_LIBRARIES})
++                    list(APPEND VBAM_LIBS ${GTK2_LIBRARIES})
+                 else()
+                     # and if that fails, use the cmake module
+                     find_package(GTK2 REQUIRED gtk)
+@@ -447,7 +448,7 @@ int main(int argc, char** argv) {
+                     endif()
+                     include_directories(${GTK2_INCLUDE_DIRS})
+                     add_compile_options(${GTK2_DEFINITIONS})
+-                    set(GTK_LIBRARIES ${GTK2_LIBRARIES})
++                    list(APPEND VBAM_LIBS ${GTK2_LIBRARIES})
+                 endif()
+             else()
+                 find_package(GTK REQUIRED gtk)
+@@ -456,6 +457,7 @@ int main(int argc, char** argv) {
+                 endif()
+                 include_directories(${GTK_INCLUDE_DIRS})
+                 add_compile_options(${GTK_DEFINITIONS})
++                list(APPEND VBAM_LIBS ${GTK_LIBRARIES})
+             endif()
+         endif()
+     endif()
+@@ -729,14 +731,14 @@ endif()
+ 
+ if(WIN32)
+     set(SRC_WX ${SRC_WX} wxvbam.rc dsound.cpp)
+-    set(DIRECTX_LIBRARIES dxguid dsound ws2_32)
++    list(APPEND VBAM_LIBS dxguid dsound ws2_32)
+     if(MSVC)
+         # workaround for some symbols needed by static SDL2.lib
+-        set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} imm32 version)
++        list(APPEND VBAM_LIBS imm32 version)
+     endif()
+     # not strictly directx, but win32-related
+     if(ENABLE_DEBUGGER)
+-        set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} wsock32)
++        list(APPEND VBAM_LIBS wsock32)
+     endif()
+ endif()
+ 
+@@ -783,19 +785,18 @@ endif()
+ 
+ target_link_libraries(
+     visualboyadvance-m
+-    ${VBAMCORE_LIBS}
+     ${wxWidgets_LIBRARIES}
+-    ${FFMPEG_LIBRARIES}
+-    ${DIRECTX_LIBRARIES}
+-    ${GTK_LIBRARIES}
+-    ${OPENAL_LIBRARY}
+-    ${FAUDIO_LIBS}
+-    ${EXTRA_X11_LIBS}
++    ${VBAM_LIBS}
+ )
+ 
+ if(ENABLE_FFMPEG)
+     join("${FFMPEG_LDFLAGS}" " " FFMPEG_LDFLAGS_STR)
+ 
++    target_link_libraries(
++        visualboyadvance-m
++        ${FFMPEG_LIBRARIES}
++    )
++
+     set_target_properties(
+         visualboyadvance-m
+         PROPERTIES LINK_FLAGS ${FFMPEG_LDFLAGS_STR}
+-- 
+2.24.0
+
diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index 507362bca85e..a8a2590c1f1e 100644
--- a/games-emulation/vbam/vbam-2.0.2.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
+inherit wxwidgets xdg cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -44,6 +44,10 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake_fix.patch
+)
+
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
@@ -73,20 +77,18 @@ src_install() {
 
 pkg_preinst() {
 	if use wxwidgets ; then
-		gnome2_icon_savelist
+		xdg_pkg_preinst
 	fi
 }
 
 pkg_postinst() {
 	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
+		xdg_pkg_postinst
 	fi
 }
 
 pkg_postrm() {
 	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
+		xdg_pkg_postrm
 	fi
 }
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 507362bca85e..f8607c8a0a0e 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
+inherit wxwidgets xdg cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -73,20 +73,18 @@ src_install() {
 
 pkg_preinst() {
 	if use wxwidgets ; then
-		gnome2_icon_savelist
+		xdg_pkg_preinst
 	fi
 }
 
 pkg_postinst() {
 	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
+		xdg_pkg_postinst
 	fi
 }
 
 pkg_postrm() {
 	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
+		xdg_pkg_postrm
 	fi
 }