gentoo resync : 16.06.2019

7 files changed, 10 insertions, 8 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 7604baa874fc..f17e2b47a8df 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 8a269ef31847..b721a5b995a5 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -4,5 +4,5 @@ AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d5
 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
 EBUILD dolphin-5.0.ebuild 4655 BLAKE2B c78423d3ac3063e0a758e105f2cd3dd4e27bcf92c2bcd7544424d570e180c7c11f4ae809f1faad2ffb55357beb01b9de3c03e1bab2f60bcf7de2bdb2516256b1 SHA512 51a8927b7bf1fca75c0939c220cd1f1acba53bd9e641ee284725c0cae495c14e06bd9753db01e82cb7c64c57e6057a25d2b6fec27e4b8397eb52ca52cb4498fa
-EBUILD dolphin-9999.ebuild 3917 BLAKE2B 1f2bb40aeb8e7aac5b2fd566f23506b28ac7a895aea076cff52f5f2d1cb3cd9dafe4be6efd11ba43d53d5c24626c05ff2a37a766ac955d84a8b24b21b0e9718c SHA512 3df915167defe593a915292997b3e063b090224d82071ffbbecf9a3cf4a1b8ab03b9afcb1bd7466127b69a923bd6b6a29af25fb60b116aecfcfad39d4f2a81cd
+EBUILD dolphin-9999.ebuild 3967 BLAKE2B 690bffcd7a1e38265ea6272c08230b5de43410e0890f0d0ed7aea00cf2cb4b33fbcc97e2031a771b156902230ff16b2d227c17310afc5c3114c1e1979edd3483 SHA512 a13514a9d19db1eafc5936b8a3d4905b9f5cfba26098dcb6df9308722e450c3e7543f0f45a5815cbed9868d956729396f640974f3e2eea9d78b56668b2918ddc
 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 0fcb07051997..32d7c5abb2d6 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -77,6 +77,8 @@ src_prepare() {
 		Bochs_disasm
 		FreeSurround
 		cpp-optparse
+		# no support for for using system library
+		fmt
 		glslang
 		imgui
 		# FIXME: xxhash can't be found by cmake
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 0b0cd0a974aa..cf6a499b74a3 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -3,7 +3,7 @@ AUX dosbox-0.74.2_events.patch 1274 BLAKE2B f0041d8be1c1dbbed5595cb90f618ec6cb5c
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
-EBUILD dosbox-0.74_p20160629-r3.ebuild 1953 BLAKE2B c7cb3ac6debda1c32081b954eb751347dca7016d5fefc2402cc79bb163625dc632a790287cc031695e1ac8c0613895b8ca4a66c009b0215a5545e63e96dadff0 SHA512 cbf1578c442cdc2d8526425f39164832dba64ac232730945e09ac5f2835dcbd755b3ce9a8d496ed433573c2445e8d21a69cf583947e1068929d03332a3fc3388
+EBUILD dosbox-0.74_p20160629-r3.ebuild 1958 BLAKE2B dceeaf8ca3adae35a871096bdfe43dace297536f4bd66873cc8586c92c658bdbfa7c8223f040107ddfdd7c56851724b734e7cf440bc758310e98bac5f70dce92 SHA512 f04f92f2e646ed91668a1b09d2ace1e0e662e6a36305d0f94cbaf254d6fbf19cb6fd1939619702f538c79f79dc05f7190de6a3942f63361bcac9b1919ba73fa9
 EBUILD dosbox-0.74_p20160629.ebuild 1076 BLAKE2B e0ca5a03e6817622ef09305464a4a98661fe97d94ffe0ddb021073af2d1fe4bb31ae3fd967e4fc03c08848e2abb2a6465364bcbee1a09f0a415b0077144a9724 SHA512 ba8f55ede135d0e8a024d72b8db79db0816f845452b54e71cc7ad3460e0b1152bad67f0800b5c8a0a506a26959a606f8f57159b37b0a4dc465fd95897a083529
 EBUILD dosbox-9999.ebuild 2008 BLAKE2B 4fd2809355ff62f58a0d2313e5722c2e32260a3e6ff284c4629293dd1ad4fdd441e04a39fa5b4472ea16037b4a388e833232d4f7e08289810879ac92bce95b59 SHA512 3c820cebf87b34d2c7b05e9d15c87619a7b5c537f79faa95c27e1103642d32b47b682f64281ba73963acc6727cc42dbfc4505f2c1623d7bb76caf7b842dba7f3
 MISC metadata.xml 742 BLAKE2B 1b36ebc57b143b7fb214632f79c3f51f812ac96de39e6f8886efd5c13cf1ee86d905c2cef3d46e58171ee00cc8515852bfb177726aaab196415e47b876d28a12 SHA512 0c9ad19d1512236023a349545c8bb8790388ac49ef62b30d03a81f84407aae2b9b199f7041a513af5b34a61bc5a439d663be2cdb3cd59a7e23830f78633285b5
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
index 140ff29f6f0c..4223e8728e91 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index 39338445abf2..0cf2c19069f0 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,3 +1,3 @@
 DIST m64py-0.2.4.tar.gz 209621 BLAKE2B 05fe7044ec096767ae1eb57aad9f326b157d67ea709ca0bb74cdd68ae16a23eb662a2842bef5e038d1b29cbf0a5252669ff54268d1227390f47e8c9029b63e6a SHA512 ab78565466c6dcfe604cdc00b7e63dee2f0f33514dbf4f9115af646b1f6562042516513d054bd5cb489ad89c9d30431e9ce531f8b27925ecb9c6f7b509836348
-EBUILD m64py-0.2.4.ebuild 1062 BLAKE2B ede9adc5dba0daac2b81c85c8f989a0777e5eb164c6afb75d129db74c33a973582022c2c9775129e9b1607f83f8c1d7dbde57730de5aae8b0cc397aff176c7a9 SHA512 206499c80ddb2832948fb5351e43d535882924a2ddc6a73f16e60179ceaab5016623aa3c4f513f3b959b54204cf9c604f5f4d90c2bd8a93003bad07cc8e89745
+EBUILD m64py-0.2.4.ebuild 1072 BLAKE2B 613b40a9274d1afa3dd3d6a9d33a7d152567caea9107d23264941c740df987815e02b9de5c48bb847606e3a30ce2edbd7e0052eca01f78f4d2d3aae14b80a3a4 SHA512 106dfc5af15d1914de7e504eb52ada6e81f7921a7d17a68acb3f78bff6a4a8e420233c2c9588af4be85a7a449d909756eccab610cb1b67aa63908319c9af27de
 MISC metadata.xml 455 BLAKE2B 094f3f1db818c82e55c07512db2e94ed800bfd14595d70aa8ddca7d63e862807c5552210f9a71c01ea0fbcc61f3d46a139a762d1026d75b1f932e15ec7e0e589 SHA512 41d3ca220e71119ec7bf4ea8b1ea92289d901ba3a0058e75423dd50580d03a0cbc9aae2c368fc3c47793e0405c0e167fc546c65f039661b5b11fbb274846301b
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild b/games-emulation/m64py/m64py-0.2.4.ebuild
index bd849bbab87a..3a2bbf163379 100644
--- a/games-emulation/m64py/m64py-0.2.4.ebuild
+++ b/games-emulation/m64py/m64py-0.2.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1 xdg-utils
 
@@ -37,9 +37,9 @@ RDEPEND="
 
 python_prepare_all() {
 	# set the correct search path
-	cat >> src/m64py/platform.py <<-_EOF_
+	cat >> src/m64py/platform.py <<-_EOF_ || die
 		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
-_EOF_
+	_EOF_
 
 	distutils-r1_python_prepare_all
 }