gentoo resync : 17.10.2017

8 files changed, 23 insertions, 14 deletions

diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 0e11eec280c6..d224fbed89b0 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,7 +1,7 @@
 AUX hatari-1.8.0-gentoo-docdir.patch 583 SHA256 159dd7203fa9feefb33f49b331f237f5d80639bc2d0ca33342c4359648161782 SHA512 95ee37df0b0bca685c2e03f02bcbcced71eb8463c32356956b440cb53248accd970d63a77bbb072d2703201cc7d40de1d13bacab2e8c36370664f4d8e085ebb9 WHIRLPOOL 4a6f7aa067293d9206ed8d4a693ce264d188fec70bc7447e7135a1484419f83ace5e178502aa81ac1e32f145d2d08b178235c5c4d9d42593c29b9c2611d197de
 AUX hatari-1.8.0-gentoo.patch 3174 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e WHIRLPOOL 365d14b2aa87ae9213aac48367728605665cf3dc05ed3c2a12956b446dbba6514f60f6fd1c966cd70c42462dbe1c0605c341b751f1cb36c6d0450b58d920b982
 DIST hatari-1.8.0.tar.bz2 1985358 SHA256 7ecf486ba578e3b4d7a3d3e86ef3e879d5e5611b39c2504e38ccafdaacb5ffeb SHA512 498a6636eef78e85a4715e9df169d928ce97c0548145a95b41aa3aae28817b8e843de1d1390893863be05e4e9981c89236571ab2eb9239faad23b711542e4fa0 WHIRLPOOL 9e62bdf08247da20e451e032355849cbb0c4b683711ed5cea29f03a52cb5b276e996b9ea4fe5c38ecc09456248bd099eb8b1f35d93e6cba5d00b93a456329a01
-EBUILD hatari-1.8.0.ebuild 2396 SHA256 1a7ccdd4a69025e47be2b74a6d8d4d3e73ca032ccde68f4d20be5b419bf150ed SHA512 6a4e5b5afc1b1732b9ccb2176a7e3ebe86902903f9dd739a7afa93076dd45b324ae5e9369b012b08db03549908d90aa04241bbfb090f27e451bf0a209a4ad353 WHIRLPOOL 62a5f3ad511db3837858017a136f6deb77c5632472cc54367f25d3f7c48b7c98a5b5d81589aca2a9923c80a55b54c5eec5a280d5492c7548f532f5fb4e88995e
+EBUILD hatari-1.8.0.ebuild 2425 SHA256 1699111693a53c7d19621119a1ca1f50ee826fff6b8531cdbdcad9a2611274f4 SHA512 dc88c568ec3a9a574043d441e894b27316cfb3e7c94343afa41d469cedda9cfa6d003ed373f9cc891b976ee3d3f1521c6a551c6928cd61a52d8135f7287d28bd WHIRLPOOL f8e90e28f034d3b625d8dea6a517a04ea0862af2e56a2400a02f0a6886ed0815b71e2ea6c3c2bb25c5d71fbd1e613c8ce3ed26d51bd0fff994e39a1511970dc0
 MISC ChangeLog 2508 SHA256 8fb13928066d178f0e159a7889bfb8c6da53b6e6ee695f9251f707334134eeb3 SHA512 b3e381faac1b43afe15aaf1557fdea4d2e749eebd453fa03120ae9578d721e8d3cf3cd06eb4fdc6cc69f55cbca48c44667747c752b5ff9b5b3633c8696b889db WHIRLPOOL f6f5235b22a00f377899a4bf6f5019be922e74dccb7c110ca8727cb005ae7ffe48502c86e6215d95d2e90652827d19c0166098c48432bbc900daeec130c7af73
 MISC ChangeLog-2015 7865 SHA256 3361c3826827a4fc169f67ee787a954903fddff4845fd869361c7fbe29fb7ed3 SHA512 978aa4191274708a88c5fd803620ae7b6eff1f566d540410b6b2283f24e2a38066e797cfe0f151e8d196469350aff7da985945d69701185181732b27149f28b2 WHIRLPOOL b9cedbca26d3b5f7c85e13e6c2a6fd3029241075e179c7189b8dee30bdf74906650f3cef04ffc23603ceb261ad9be22c81da810c283561586447602605265310
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-emulation/hatari/hatari-1.8.0.ebuild b/games-emulation/hatari/hatari-1.8.0.ebuild
index defb5f6da8ce..50898e87d78d 100644
--- a/games-emulation/hatari/hatari-1.8.0.ebuild
+++ b/games-emulation/hatari/hatari-1.8.0.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
@@ -26,14 +26,19 @@ RDEPEND="${RDEPEND}
 	dev-python/pygtk[${PYTHON_USEDEP}]
 	games-emulation/emutos"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo-docdir.patch
+)
+
 pkg_setup() {
 	games_pkg_setup
 	python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-gentoo-docdir.patch
+	cmake-utils_src_prepare
+
 	# build with newer zlib (bug #387829)
 	sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die
 	sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 9c4cacd40c5c..52467095de24 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -2,8 +2,8 @@ AUX mgba-0.5.2-imagemagick7.patch 2041 SHA256 7010f2542d1b628484cb76cde06481b094
 DIST mgba-0.5.2.tar.gz 5343635 SHA256 3d9fda762e6e0dd26ffbd3cbaa5365dc7ca7ed324cee5c65b7c85eaa3c37c4f3 SHA512 8d3ef901bae9b503f8d5afff63c23be9af4b519f86cc6f3656c51374756107e4852bc0472cb7393cb04c8f0ff2f134367a81e32a5ff3dab8ae0c6cbd7d3858da WHIRLPOOL 977da5589b6e04fd67d32295befccf76988b3f23d13d0d92ab525deb51c58aae18ae1d40d0849b8bd2b3fc9e8c15703367458812404ca797b4f0eedbc26f1272
 DIST mgba-0.6.0.tar.gz 7434157 SHA256 d8cf01befd7f452415a9191b058bc21e47e39c7f2c865257cd93c2780b17fe07 SHA512 24a9c75370465246e467f03498994e2f142bed18435658aa75ee8dc7ad9f8fa649b476b7846c0f3c4be474ca1d3b7c36e34af05b4088fa3a7a11e3edb0074308 WHIRLPOOL 26588a452d9c2ae8456f0f8be63246ae8a637b6d0bce7b90ba2a11813682ae9402652a99b2d4844f8eddd5c07347f63dbbeb857887448cd328bb27e38939da07
 DIST mgba-0.6.1.tar.gz 7437240 SHA256 7c78feb0aa12930b993ca1b220d282ed178e306621559e48bb168623030eb876 SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57 WHIRLPOOL 333b663dfff0610cf6701178f68beed2fc3ae6fe21380d96636a9a2ac66c2ed98081d31fae78a97cd14d9c6cbc89e246961cc8d246ea3214bd26dd98dd6a3a66
-EBUILD mgba-0.5.2.ebuild 2054 SHA256 c65273680ea2c9d292cb7e916dac5be1d55a9375f07b0422502f187855594dc2 SHA512 7be10a54c893de9aeef6cb155a078e6a33f04c3bea0f6d261134a33a1558ab369995984950fc41b3b8595159b2271ad2f95f00d6a84a76c3dbd022a5ffa2dc92 WHIRLPOOL cb57ac9167e4d6a0afaca6375883557d8ba5297021ab3ea089c339577dd7222c213ba2b70184c6e4a36667367d9388a74b706fb2c0f373eb6951fd10bac5b328
-EBUILD mgba-0.6.0.ebuild 2358 SHA256 4f4756232fc487e24ebe207c3cc0530dc48e5f45fac7fd814ecf384a0bd67a5b SHA512 263d981a93d88680fb08730a04b1c6ecc729f0d1d9e9baa5c8914a8e7a1bc1d9408a0062d10df8ce5985675b61592c9ccbd8ad11b702be56d46fbc7cd4716601 WHIRLPOOL 1acb9dd2d72e98248c4734ebfa416c15f75bfef2ba3b4c5d7ececa7ad22f4020fdc326a5e14ee841c3892978017ed1e341c6f0c2ebe1a0d01d61757ad921386b
-EBUILD mgba-0.6.1.ebuild 2358 SHA256 4f4756232fc487e24ebe207c3cc0530dc48e5f45fac7fd814ecf384a0bd67a5b SHA512 263d981a93d88680fb08730a04b1c6ecc729f0d1d9e9baa5c8914a8e7a1bc1d9408a0062d10df8ce5985675b61592c9ccbd8ad11b702be56d46fbc7cd4716601 WHIRLPOOL 1acb9dd2d72e98248c4734ebfa416c15f75bfef2ba3b4c5d7ececa7ad22f4020fdc326a5e14ee841c3892978017ed1e341c6f0c2ebe1a0d01d61757ad921386b
+EBUILD mgba-0.5.2.ebuild 2070 SHA256 9d2d31c35fe80994d0ec9e2cabfa403fa0f7e877ed0b0af710a8f0a53dfac674 SHA512 2d02395a1ac81d5a1da1aaaaa14c5a668e87a3ff2a6220a25b44158a25ee5ba8ff298a0b70a2240b462cb64b6e6aed5603c18efd88960055ffa2e569c56a4328 WHIRLPOOL 0590cae70da03c2fd804662c04674b1bf1bf142b84e3deb8d17c49cb8e0901770e726457020abd1ae8d5e26f283db5be72ba381a3aeedb6cb5f36fb570483756
+EBUILD mgba-0.6.0.ebuild 2374 SHA256 a63cd964d777ebeda9eb7b1a6726fe05899ef0da88ccdd0ceba9edd91e0c3834 SHA512 85a8f13f9f53d776652be617fc9c6c0ec5d75a5e66546a6da7cb587ac2cb357aa60d47588750e96390d43a28a4bbfbe653d0e61c524feadf8b5f24f5ddae0820 WHIRLPOOL 9cfedc19d1b778070c0af9dca526e761dca39e06a35b0b61282b0b8f639263b54a1f8dcae952395305f5ac19c2e96920e5840bc8904168d72da56b63cd78b9e1
+EBUILD mgba-0.6.1.ebuild 2374 SHA256 a63cd964d777ebeda9eb7b1a6726fe05899ef0da88ccdd0ceba9edd91e0c3834 SHA512 85a8f13f9f53d776652be617fc9c6c0ec5d75a5e66546a6da7cb587ac2cb357aa60d47588750e96390d43a28a4bbfbe653d0e61c524feadf8b5f24f5ddae0820 WHIRLPOOL 9cfedc19d1b778070c0af9dca526e761dca39e06a35b0b61282b0b8f639263b54a1f8dcae952395305f5ac19c2e96920e5840bc8904168d72da56b63cd78b9e1
 MISC ChangeLog 679 SHA256 073cedf0d8110ad7a1d6b7169d357fdf94bc7007b33d6ade700a31970c99f44a SHA512 73a7f435d382b0ed0a1c7c10b170c992b073c99cbbdb9674d1084992d7084bfc7ae99a1365c1760a732dfc53a411974d96f196f0bbf37be6b7bfe389e7a55df6 WHIRLPOOL c6f3725a19438a47986160f3ec9fd298830cf69fe2250796cacbd81b9da6e931a29639ceff3522cac947059a1bf8c9519291695be949a778f22ce3e7eb512195
 MISC metadata.xml 339 SHA256 df391f543467bfd72a6034ef0d2e6fdd0bf3161722c949f807d80124ff7391ca SHA512 33798a7a9145daff0c4f0e31cbd6ac05e49632edbec02709f51952716af659a7f3e76f378e9432c15e5bda68619816318a1d2fbfa27b4a5ef136970241ebfa03 WHIRLPOOL 3f9cf544a70b137890c6f84b0fbf0bc84bf975feac0e78c8bc9cafa81e21aee9e842dadf8d23007ea172c1e831b4665f66386d482cc46dda5a68271fa0e78a7a
diff --git a/games-emulation/mgba/mgba-0.5.2.ebuild b/games-emulation/mgba/mgba-0.5.2.ebuild
index 98352dd40e10..be3429d13af3 100644
--- a/games-emulation/mgba/mgba-0.5.2.ebuild
+++ b/games-emulation/mgba/mgba-0.5.2.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# Get rid of any bundled stuff we don't want
 	for pkg in libpng lzma zlib ; do
diff --git a/games-emulation/mgba/mgba-0.6.0.ebuild b/games-emulation/mgba/mgba-0.6.0.ebuild
index 7ba7da1f8956..0df5f259babc 100644
--- a/games-emulation/mgba/mgba-0.6.0.ebuild
+++ b/games-emulation/mgba/mgba-0.6.0.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# Get rid of any bundled stuff we don't want
 	for pkg in libpng lzma sqlite3 zlib ; do
diff --git a/games-emulation/mgba/mgba-0.6.1.ebuild b/games-emulation/mgba/mgba-0.6.1.ebuild
index 7ba7da1f8956..0df5f259babc 100644
--- a/games-emulation/mgba/mgba-0.6.1.ebuild
+++ b/games-emulation/mgba/mgba-0.6.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# Get rid of any bundled stuff we don't want
 	for pkg in libpng lzma sqlite3 zlib ; do
diff --git a/games-emulation/yabause/Manifest b/games-emulation/yabause/Manifest
index 42619c2b733f..c8e65f9f6309 100644
--- a/games-emulation/yabause/Manifest
+++ b/games-emulation/yabause/Manifest
@@ -1,7 +1,7 @@
 AUX yabause-0.9.14-RWX.patch 688 SHA256 46eb0906390717f0f10901b188c7bd5d27b8dd59405841d3c2ec977de79598eb SHA512 9da2ca641bcd0df8c05d9d5727158952ff41a8d88f685b9263661bf0fe71eca8b338c37fbcdfce252131c5fe6e4a73fa27ae51d161495f8596feeebc3f2d6d63 WHIRLPOOL 9587e71990868965f3a8e56ec8d1219ab86a5796ca8683710122f36f7679bc00cdae989c47f9508f2fe27c85efc7c0dcbb6b360754b059a41bba5427a5e7f5b8
 AUX yabause-0.9.14-cmake.patch 1905 SHA256 25d30d95db0ea66f84b68ce505ea50541502deeba7b12a04fc303c0ae4eeb39e SHA512 13e6c72113e06a0baee7051122c1d2cc56a13ecacd383e76aad0d6784b2bcb7593d8ff27184231e9356a2aa0bff98a74d0af2860dea62075d3d2992e8a56eec2 WHIRLPOOL 075126e157256453bcb243ae5eb2c86d8c873e28ba35d42843afa28f84932b1c720c361ab1c3cf165201d89d23427df5a7a60b0b9bcd7eb1f773bdfcd0540df0
 DIST yabause-0.9.14.tar.gz 1662762 SHA256 75e6320873ef6f8ec956568bff5a8f3b67500bdf52a7e0aa88e0a554b2dd775a SHA512 8b14d9146cf12d104fcf43369cd949f1f47e7891a54241914f6141facf871bcc158f4e80a8c5b61fdeefe6f1b8d425ff301ba653df134a030c323c9e3ccf3a58 WHIRLPOOL 637b5be9e889bb59e0ff3e78163b19256b8b6a7cd3b7c03e5922989c0fbdf7721293eb1673d3ead0334c7132ae095ebd067e95373b33a036b7c65c8108823260
-EBUILD yabause-0.9.14.ebuild 1485 SHA256 f1acd7cc6662e9396c52502e8a0eb488e6fbe87cb746135b4b63769255814307 SHA512 1dc475e1b6962437599df959f527e4394861d5242175bdcb5a1c9bac7bd5e62426dde3f16dbc921cc5ca81bb14d98844eab13ccf1d914383e1099239c75ce4b5 WHIRLPOOL 23de9246e4fa32c247f42b82a6dba004110ec83a3dd1bcfc12cb613aae4f1fe992d2b17c069d2ee370ec56f724e8c2493ab6fb4bdcec0100b2b63f53119f8189
+EBUILD yabause-0.9.14.ebuild 1513 SHA256 6bfe3f4b8e0bd8a0f5eb2a6ec584f40d88099d0afe2b10ca928905325523ff0a SHA512 a20c79ae9526689cd19789858e7d054bed9ca2111e4ef3036b32fd525c54a5f7d82271f43f2393145c7ecabf7ac772ce00bce44a60762c9960d4f30fdfe7854e WHIRLPOOL f37e05a4b20840c9507e9e21530ec9a33f4a0964df516963b1a8d7ee2c3fe0809ec21415e221da6949d6d0ebdf365888c5c63dd7e0c7fa2eb9029ff9bf9d729a
 MISC ChangeLog 2736 SHA256 f19fa5bd65a4775627eb8e72100cea202bf5dd1806d165e060d69e9092cebad4 SHA512 900e54ae525da479a069b4c363f8d14bfa8efb40f819380098f7220c3774e5d17d96de54218d33bd413cf44eeb614aac68fce2cc8458c29779ba0992964f0440 WHIRLPOOL 8445636ba65e7e2bce0d35757e603a55a50161dcacb06dad74b8bb62404d524e7fd58841d5442649b6582892a2a80283e924667d61da0d8e5a4bc64421c300b2
 MISC ChangeLog-2015 5769 SHA256 43585c1050e31d6ca588eb34f6b2dd055a16c8e9c238cbacd99c80a954bbd67d SHA512 d80096c16d1e54dac4ef9e7ddb5902711938dd800f1375c2c71db4cd135c87ad4813c387031e19ce30c55940e9dc0f91ad7a8ad7ccdcab072ccba0a0867653ef WHIRLPOOL 312481336a658026503f1db3d30321007fd2a30e6ad956a93cbd171707e60935b0d3bbf96e6cc8c502938feed58a7ae3f0e42d3ce76849f9da7de08b53f19408
 MISC metadata.xml 428 SHA256 406d7f359195131cd72cb09bd7325c5ec8b72768a331af5e34d7367febc0ee38 SHA512 1695012927826ba97b0457e9d1051396a1da0b582cebf64269fe02431c019dbf4ca20a42368b825a28ba24b0a781126be82727428e3ab92adffc667bb6c575ef WHIRLPOOL 50bfd585a94d76db65db9cd4520ee20d9b04f6a530ff4d80d4744604a59b859daa67c8bff4d3a18b642a4b82262090540b75bd52865b96cd29cf19193b055f35
diff --git a/games-emulation/yabause/yabause-0.9.14.ebuild b/games-emulation/yabause/yabause-0.9.14.ebuild
index 7ac82647b3d3..57559da8b5b6 100644
--- a/games-emulation/yabause/yabause-0.9.14.ebuild
+++ b/games-emulation/yabause/yabause-0.9.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,9 +39,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-RWX.patch
+	"${FILESDIR}"/${P}-cmake.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-RWX.patch \
-		"${FILESDIR}"/${P}-cmake.patch
+	cmake-utils_src_prepare
 }
 
 src_configure() {