gentoo resync : 15.12.2019

6 files changed, 9 insertions, 99 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 599e1157d3d2..6a9c93b509b0 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index fa03c45c4cd7..913df51f6e57 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,3 +1,2 @@
-AUX devilutionx-facebookincubator_find_libsodium.patch 3401 BLAKE2B 3f721056ffd63cb063affb4a54641859e3a45360aa1695fc31f3aecd94fa47ddfb986f5fc35a8c5fd5d706e7f1dce5d8dae4d6def5ed163dda8957ab61728818 SHA512 91ba2f33dec4ea56f0ed5aec334fab2a97bbae82ca425c9962c62d6aedf67b16821bfe47f7abfbdb737e5685531be55442972aabcf39b36092f59b79752dbcbc
-EBUILD devilutionx-9999.ebuild 1354 BLAKE2B 642a915685356f4726d28b07b8186149cb1df7a0b0f1310fe24ce6fc286cdb6c65641b6845d17dd9a52f58703c1b80f9a8be5a798e720b4e327b1dcbd5abf897 SHA512 e6399058fe35c9bb6b4c1771e3b6e008561d53887eed8ed452524a507a50c4ba58ec0ee36a60d944394be863b320e4cc0ced0a2549fea20fdab362d55a8a1c2d
+EBUILD devilutionx-9999.ebuild 1392 BLAKE2B 6b3bb5b6795f17272b52580b8a99f0e856f781fb6fc01c02b2b0374240f7163d07712bd5380cb96c8a0b1a8811511bc5e4c3deef0c3e292646619a87311d1a8f SHA512 c35c82ac12417653521a0b9c293475a0ab7320f4ac1507ae35be7e823f7c5ae3eb1573599cccb82384f16657d042cb0d07ccf9a326f61612394b7b28de06ae19
 MISC metadata.xml 349 BLAKE2B 11288d110457dff20a74658a3405aadc17fe8acce67069fd5493f0f81e8e2aa59f45ed5808377362f6840670ae6153b199c724b2801b4689394cadb98a8061a1 SHA512 b759e6fb2533964a7226df5a5877f70eb303689f7c0fd598d1d002444ee71ac0b83747a7c8c262f2ad1d087b232de2c1c7bd3b512bbcf3469eec037009ea7f4d
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 3070232b1069..d191d5e65931 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -3,6 +3,12 @@
 
 EAPI=7
 
+# Sometimes build with ninja fails.
+# Please check occasionally if we can revert back to ninja.
+# Latest known issue:
+#   https://github.com/diasurgical/devilutionX/issues/490
+CMAKE_MAKEFILE_GENERATOR="emake"
+
 inherit cmake-utils desktop
 
 DESCRIPTION="Diablo engine for modern operating systems"
@@ -31,13 +37,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# https://github.com/diasurgical/devilutionX/issues/225
-	eapply -R "${FILESDIR}"/${PN}-facebookincubator_find_libsodium.patch
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBINARY_RELEASE=ON
diff --git a/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
deleted file mode 100644
index e81de974c4db..000000000000
--- a/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 1f7f5bf3dccee957e23bdf4d976883b155d5e81a Mon Sep 17 00:00:00 2001
-From: Anders Jenbo <anders@jenbo.dk>
-Date: Tue, 23 Jul 2019 21:34:08 +0200
-Subject: [PATCH] Use facebookincubator findflindsodium cmake helper
-
-https://github.com/facebookincubator/fizz/blob/master/fizz/cmake/FindSodium.cmake
----
- CMake/Findsodium.cmake | 34 ++++++++++++++++++++--------------
- 1 file changed, 20 insertions(+), 14 deletions(-)
-
-diff --git a/CMake/Findsodium.cmake b/CMake/Findsodium.cmake
-index 0667920c..c664ccbe 100644
---- a/CMake/Findsodium.cmake
-+++ b/CMake/Findsodium.cmake
-@@ -55,22 +55,22 @@ if (UNIX)
-     endif()
- 
-     if(sodium_USE_STATIC_LIBS)
--        if (sodium_PKG_STATIC_LIBRARIES)
--            foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
--                if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
--                    list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
--                endif()
--            endforeach()
--            list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
--        else()
--            # if pkgconfig for libsodium doesn't provide
--            # static lib info, then override PKG_STATIC here..
-+        foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
-+            if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
-+                list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
-+            endif()
-+        endforeach()
-+        list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
-+
-+        # if pkgconfig for libsodium doesn't provide
-+        # static lib info, then override PKG_STATIC here..
-+        if (NOT sodium_PKG_STATIC_FOUND)
-             set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
-         endif()
- 
-         set(XPREFIX sodium_PKG_STATIC)
-     else()
--        if (sodium_PKG_LIBRARIES STREQUAL "")
-+        if (NOT sodium_PKG_FOUND)
-             set(sodium_PKG_LIBRARIES sodium)
-         endif()
- 
-@@ -101,7 +101,7 @@ elseif (WIN32)
- 
-     if (MSVC)
-         # detect target architecture
--        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[
-+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
-             #if defined _M_IX86
-             #error ARCH_VALUE x86_32
-             #elif defined _M_X64
-@@ -109,7 +109,7 @@ elseif (WIN32)
-             #endif
-             #error ARCH_VALUE unknown
-         ]=])
--        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.c"
-+        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
-             OUTPUT_VARIABLE _COMPILATION_LOG
-         )
-         string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
-@@ -224,7 +224,8 @@ endif()
- 
- # communicate results
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(sodium
-+find_package_handle_standard_args(
-+    Sodium # The name must be either uppercase or match the filename case.
-     REQUIRED_VARS
-         sodium_LIBRARY_RELEASE
-         sodium_LIBRARY_DEBUG
-@@ -233,6 +234,11 @@ find_package_handle_standard_args(sodium
-         sodium_VERSION
- )
- 
-+if(Sodium_FOUND)
-+    set(sodium_LIBRARIES
-+        optimized ${sodium_LIBRARY_RELEASE} debug ${sodium_LIBRARY_DEBUG})
-+endif()
-+
- # mark file paths as advanced
- mark_as_advanced(sodium_INCLUDE_DIR)
- mark_as_advanced(sodium_LIBRARY_DEBUG)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 1ba68153a301..86e1d27e8dd4 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -3,5 +3,5 @@ AUX scummvm-2.1.0-tts_pthread_link.patch 610 BLAKE2B 7ae2613cb65f47888a668504c64
 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
 DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09 SHA512 9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218
 EBUILD scummvm-2.0.0-r1.ebuild 2482 BLAKE2B 0ad1eae79e72b50e4f49deacaeca039d17b468a80ed10a68cf8ccc1dad424bad041de47aec35b4db5432903362d9073d1e3dc99234c5ddcb859ee596a7db60c7 SHA512 66fd6811e5b7ad4287c6aa59334eaa58be86f00b620b1222cb76d09ff75e76b3d3c1dbaccf603a0566fc46cf60921959a590e73a5d1415f34da0edc1582327f8
-EBUILD scummvm-2.1.0.ebuild 2716 BLAKE2B c9724c5e57a55e96731f202564a070f22dd4092ba470a7bcbea58647ae03c8fa81c7915d7aeb1a38c19fd8bdf5316eb5693b01df6aec8e2258f49cf5e5118e11 SHA512 9de96a87d604e8df29c26d79c419fe9950a017f4554ec223771f11b38926bf33edd31ee9d2ffd8e3470caf7a005d2c07040c21832ff017d6fb384777ab748aec
+EBUILD scummvm-2.1.0.ebuild 2728 BLAKE2B cd6a2e2aada44f0e4420b32dfc4e55996ba525f856a68f9546f2d169ac16afd21f2a141683dff5453ee380692956720e7f122020aca57e4d33a5cecf5c9c12fa SHA512 23d0c55d04c21cbc961f1bbe7a0b1daba44e03b22b9315a885a1ad8f3e48ee14877945faf627664aafd0548a65adc5c1e64d0bcdaa4da7467a9278846f4e578d
 MISC metadata.xml 794 BLAKE2B 55a51df988ba376df42552e2e943f3028aba2b9125d671f026d4a47a10da79d5da49f6307aabd33aa237812a3440b8014d498794c9837b859274221832625cca SHA512 03f3a6e1554afecc3d4f57ca58ed73a5887649170872df4940ad2bcab90a7a98fde3d2de3524c528b60f37f8ecf2b463189be72057d4495c849363d97b824b83
diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild b/games-engines/scummvm/scummvm-2.1.0.ebuild
index fa2a0700cccb..6b43908481d2 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507