gentoo resync : 17.10.2017

4 files changed, 12 insertions, 7 deletions

diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
index c2eeecdf9d1e..e047e8c60ec6 100644
--- a/games-action/lugaru/Manifest
+++ b/games-action/lugaru/Manifest
@@ -1,9 +1,9 @@
 AUX lugaru-20151204-dir.patch 317 SHA256 2bcfbf4d5de56f7d22d0c2b11e01770b38eed07ab6781b829590a7ddedfaa0be SHA512 c0830385ca57dfda082596f65e7166ba71148fcb2b99e416a4a6ef8882c280a823e6308fce9fcfab62127667a10f0ed0ef49df60f1f39627615ff21c9ffd62e2 WHIRLPOOL 4e641870b78a7d239402792348a6512ae2b0fda517d37dbdb01ebeb8fac3604e8136c058d707d3e1d0f56bb8a0f50194edf6366a34f7c2007f860be565b4fcbd
 AUX lugaru-9999-dir.patch 317 SHA256 2bcfbf4d5de56f7d22d0c2b11e01770b38eed07ab6781b829590a7ddedfaa0be SHA512 c0830385ca57dfda082596f65e7166ba71148fcb2b99e416a4a6ef8882c280a823e6308fce9fcfab62127667a10f0ed0ef49df60f1f39627615ff21c9ffd62e2 WHIRLPOOL 4e641870b78a7d239402792348a6512ae2b0fda517d37dbdb01ebeb8fac3604e8136c058d707d3e1d0f56bb8a0f50194edf6366a34f7c2007f860be565b4fcbd
 DIST lugaru-20151204.tar.bz2 88950866 SHA256 dae6a9e8ee70cc965a4299d2062725ce19dc9e4f1ba2a46c9205cb4e138be6b8 SHA512 8e448b782847376ac10585996a91a571fd005ac51e0e510765a35bf44bfcbb09e566d9a9c3d87277e69511b0f8d74c04edcc4b59f467bed640d8ba7c74045e30 WHIRLPOOL b2bcae57d8bfd13361c42c6d56fa285bc58fcd4bd6fb119931501db66005e5ece98487e413e41d1419c8f0408dc7507efa7f721db7df2b8d8a1572a65c28eb0e
-EBUILD lugaru-20151204-r1.ebuild 1141 SHA256 b026ae962e24bca330e296fcfaf65f30ccbcd64251829e0fec410fb4bb0da4f5 SHA512 e10be76f0a4d285de07678121ae7e60b9bd2ce3e7b582c6e5bf593c5cdfe3b10db48ef89ff1627b06954c794f65edf7c20c425ead9ac75e3327aa0ddc344d5aa WHIRLPOOL 916bfe1eafe5db34396dec820b24a3d75ca62cf3ecea2523bb02b01f5df8f09a6d420e62ed12d98e451ab6a7d7e90690dd9c336cbb92843c3612501d0c73f134
-EBUILD lugaru-20151204.ebuild 1164 SHA256 c68fa615f5dda8c924f20c12c4c7118097ba032d9d4529dfa6d3cb34adae509d SHA512 813e9d46864428ff58b733a1b03ff85a4c8904469678ad74a13f0384abba7663457d57e7a534f684efe915090fc2e17d170f951b27558bf8a22fbccee8082733 WHIRLPOOL 9a84231832d7eadeddca4950253743cd8e30b2b140ef5438ec1aee84ce2b015dde8be5190d9b99158be47976eca502657dd1cef08c273993b315c5f8542e5164
-EBUILD lugaru-9999.ebuild 1219 SHA256 7ee5ba91f3b8bb81f5a41670bd8cc32e7092ed6c34c3833c1a32d2edaf9d1042 SHA512 808e2b417c127100fa34d64aeff09e7ede3494feb3daddd3225d4b5f5cba724ebb4e6f0ba3740cc30f9aa5c6410616be74376564faba648dfefd80fd6e495eb0 WHIRLPOOL 78b80fcb4eb6f42cc00c36b38884cdea11f728aaf526e9e1c10e9a262f79b516486901c4d29fd6cbd7f73b6132e2ab21bfd91aa65ada81ec6c71b2c1b5b8a82c
+EBUILD lugaru-20151204-r1.ebuild 1158 SHA256 a66b18bd958a9a4a1490e86e9f0deefe852937e0a5aa4bfd6b2fe1a92ae87e74 SHA512 c71ed998364c6938154a298ed6ff6333ed93fc5c27eba047537823c2e1141671b313b51f0a3758def6e81418372119f2bbb81fc8678e632034c648af5d1e6cf1 WHIRLPOOL e5b7ad07b22df9b7f457a4ee134af73124660d8d5bf4f3667ddf79efc239ef7db537500b1f45502d6fc257a25b0bfff59bb688bebb8b6573559206b81a9c5b25
+EBUILD lugaru-20151204.ebuild 1195 SHA256 4654535fe329993782b5142e66ac494cc724f404bcae4b0f586d5baf12c86b41 SHA512 a2f6937cf0b0583e643b2af10aeab56706b2b52d308989da1b4df544c2422084baebcf2b556ddde67365059edba858407f81c2c5d12a0bf09325ce4a12c0c2e5 WHIRLPOOL 07cd1b45df6aae57a177bc7471691d5a61e1c8030ba32418fec93e4576f5d929950c9c0df3bc0caac0d19d5d6105897d566f7568309b17e77ebaca23682280b8
+EBUILD lugaru-9999.ebuild 1236 SHA256 12c7b740de0dcaa0c4a338cdd10dd8b9e751e5b7ecf36e1722285936e8cebd60 SHA512 7cc6f48522395dd75beb3b5ce5efd3bd8cd86ce19ff2f69715099f16e0ad6fe0cafe9f6963ba9b847199460fa9dfc2dbf0c9527de2d03912dd232f93a2dbfb11 WHIRLPOOL a6bd145e01f7e653d22b5146dbb9cdfbada2f4fae15bd8fd431a83f11c414053fdbea0f1e6506cbe7e81940ac5964859663f39ea5493aea3fa17defc209695f6
 MISC ChangeLog 4017 SHA256 59051ce8100fdb7cc95cd0b7302370e16402c87d82430aedb34185e21d7e4c64 SHA512 aa5d5c81396a0eb3264f434f862a428aee02cbc3bc77a283eb6b0aec062f4dfb8ae141735b6a06e98e23257bc366cb92c26b12f0c14a320584bd6d8cd7615efb WHIRLPOOL 86209db12a8bc6426656fd04dc5510ed778d75637853e16a6c934a99dd5055a0fea146426e217dd8912fd66f1bb8df2885827d8d0c53b651196d0a4dedd3cad9
 MISC ChangeLog-2015 1267 SHA256 1863be6ef621ee3a0f00f53fe1045e22d92ce5a602db2619743d70a19f68fd65 SHA512 bc5daae3d1fb55ce65a7b66623293fe9847c0c734a1c9dc860fb8d9089b9bb6a46849da7b256a791e6ebeeace723594ce43131ccac7ff2f324cb8c368943875e WHIRLPOOL 708d7e91a198c292bf99d5d6d26051d9edd8186d431558d85c97e6d76ef3158a3f6c64e01c9e0c340b62fe9e96d68175f12e509cc0d18a5f8279183a8696a70d
 MISC metadata.xml 337 SHA256 7c49c04cc43dc6cc69def4aa02a80f5ae937d4f09e5855e0e279cd5e517041ec SHA512 10af1cda47d8d683fc8245f23c05243fb5809636399d75779081a3da09209829da31a8d5fa070687656e9c235e78c75f1571b5b4f1a686359a11d1232a543b5e WHIRLPOOL 3c31d0a2ca33035c73c723d2df972795c7cdaa7f47cadb8ca9e06d583c8a541751b805970f11e6b47329ffa79c10ae28a875d5d6c9633230065a80c5be8b4a94
diff --git a/games-action/lugaru/lugaru-20151204-r1.ebuild b/games-action/lugaru/lugaru-20151204-r1.ebuild
index ac9ad89e8c7f..f53cecb8d748 100644
--- a/games-action/lugaru/lugaru-20151204-r1.ebuild
+++ b/games-action/lugaru/lugaru-20151204-r1.ebuild
@@ -30,7 +30,8 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
+
 	sed -i \
 		-e "s:@GENTOO_DIR@:/usr/share/${PN}:" \
 		Source/OpenGL_Windows.cpp || die
diff --git a/games-action/lugaru/lugaru-20151204.ebuild b/games-action/lugaru/lugaru-20151204.ebuild
index 0a4ed3e8879a..3944efc4601d 100644
--- a/games-action/lugaru/lugaru-20151204.ebuild
+++ b/games-action/lugaru/lugaru-20151204.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
@@ -25,8 +25,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-dir.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-dir.patch"
+	cmake-utils_src_prepare
+
 	sed -i \
 		-e "s:@GENTOO_DIR@:${GAMES_DATADIR}/${PN}:" \
 		Source/OpenGL_Windows.cpp || die
diff --git a/games-action/lugaru/lugaru-9999.ebuild b/games-action/lugaru/lugaru-9999.ebuild
index c447775fa520..2e65288097ba 100644
--- a/games-action/lugaru/lugaru-9999.ebuild
+++ b/games-action/lugaru/lugaru-9999.ebuild
@@ -35,7 +35,8 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
+
 	sed -i \
         -e "s:@GENTOO_DIR@:/usr/share/${PN}:" \
         Source/OpenGL_Windows.cpp || die