gentoo resync : 17.10.2017

7 files changed, 18 insertions, 12 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
diff --git a/games-action/openastromenace/Manifest b/games-action/openastromenace/Manifest
index 239dd547bcf7..aa6f83538953 100644
--- a/games-action/openastromenace/Manifest
+++ b/games-action/openastromenace/Manifest
@@ -1,6 +1,6 @@
 DIST astromenace-src-1.3.2.tar.bz2 55390211 SHA256 9b775df2b157565b97aca008dd879b867cd3377c07b829cee6b5342639357fe6 SHA512 0a06278a8a7fdaaf5c730590fcc1f8f59503fe4c94dcbb6dd6b6ee638048f9bebf7c49c75cd32f26e4cd08cfbe01f5082002860901b7196f08a55712bb3ed5d4 WHIRLPOOL b5dee8d3cef2f143e44730c2eb0a60e3537675499c7c726752fc016faace498bf9a951bf96fb03ff2b3e3b8699d9f0575cb5e39ceacceb01a0c270c21691aa1f
-EBUILD openastromenace-1.3.2-r1.ebuild 1515 SHA256 72c4877229f3c00e56da623c464446f631d0839ae5e170f1411cbc00d3a57027 SHA512 4acf0703ce89b8b1fe8e64f8af07dc852f5d41438b71243d2fcac11d8c32670d4e3a5bf71b27e2c7dde65f9246154158e9ef809e34d9f0014f77dc448eff3d3b WHIRLPOOL dc4d9ce7dabcd07fdd473e44b74a2dc147efd40255c80dd8486b32a8657d1c07f2cb979617a8844c291d371dde20f941d65827edd879b2b924e92b2fb1311df4
-EBUILD openastromenace-1.3.2.ebuild 1605 SHA256 80b8542841e1f6f5790233b9c8431443f1b287e0226ff2f424452c7c2ae9b8b4 SHA512 31f3842dbd4d64e20aac0a32aee21bb29b7cd6c6473609304479bc1b01d8a691a297f5cb817eeaf7d85f61cf8d20fa9809814de0d0b0825cc3b01f4fdc6e0de6 WHIRLPOOL d92430001d96961ac84773763daeff1d5278f97dcdaef2cf6013414a79e57de8bc4564d580d4ba3e47255597b182aefae2a03b251bb7d5e58a290dc67bb577fe
+EBUILD openastromenace-1.3.2-r1.ebuild 1531 SHA256 bd91fe6b5978f0e6ef8cdc0e4e3ff85617e7a519e47fa5be946fc1123e61bd76 SHA512 07a61135ce4b2c05b6ce3a83b0c18073cf970b73b7caac7ac85e1ad8dac8438713878e9dc1276cc39f0cd182977bed38ff4c256dc8de461c157def6055de3234 WHIRLPOOL a3da2e52443ebd9c326af68cce87f3fc358bac379097bf21dcd8f3743f35c08cc7ffa841302b4e8da6d1281f07cfe27f99d78bdda1732ee595bb66da250acc37
+EBUILD openastromenace-1.3.2.ebuild 1604 SHA256 71cd7f95c584f26230ccc3b6b9bc06cc6dbc75d2be040a19897ba18ef6b06e77 SHA512 6143d3ae5d3f2b583c734471679c8b6aca74e7d325af555653cd76864eca1309e9b862b255639e2969588a94d3fb9a832fdc06e344b82a4750cb3295f373b9e3 WHIRLPOOL a30525a8d5a3911e264e2d7493e02a4d7b6db235724b80826883b28717017cc30883ad8ebc3882284a684c4f3f455044972625edd1c2345a20ab6c85364ba9ec
 MISC ChangeLog 2714 SHA256 a5b356523a062aace2dcd5db2551184028acf19ef5aee2da4e0e0fbbd0da632a SHA512 05b9cda130c83cdd8ea961ab8e85fea908607d80ed58d596a3c4acca6e723ea29d53da8403a13a1aa3d60e9f4f3309becff5c82ee389696f5a032e7214350774 WHIRLPOOL b64f8e22460b17bb05227eb8f323c288cb39c8ae97dbd7dc7073c510da1dc057dce5122fedd519fe5d02a8cf8c725390a98cbb45453ca4dceac8a5a1b83bbbe4
 MISC ChangeLog-2015 4097 SHA256 55ee25bcfcb0dd136928aa601e2371f9e19fb78b652ba4413909802b23984812 SHA512 a97a82a565eaba440645c79659a575aa10c2b26215ec1f7fc4db6eeea884bcb62e082dc6cfd5a3fce85f6436bd6059a8865b30fe85ea818f71388653264cb579 WHIRLPOOL 9f7344c0e0363070413af2d3b59c38b0f4487a8c11916dd4733ee9e9084c6dc579ae867f6414d72967fbaca6d817b3717e86d479b66571ffe2c256c8af6b09fa
 MISC metadata.xml 338 SHA256 d39703abfcdc995b130742cc94f476611cb21a97926c9faaa936f20135e5c365 SHA512 b2364e10d11ba13a39560816a4b7bc99bd00eb5917e81842a909813cd0fe55bb5324baf4181238fcd1122508bde58f2f0d064c6d6cf52401bc7a76372c6e6e44 WHIRLPOOL e67347b64b3a5a4f576b785b236e7403d685bcd4b962f6fa58f46f2910457f13dd247922881453aa8115cfd2b2041dded720fc4a5a8793b9a18d7d4781fba48d
diff --git a/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild b/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild
index ef7a4f821d85..cdd657e1958c 100644
--- a/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild
+++ b/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND=${DEPEND}
 S=${WORKDIR}/AstroMenace
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# no messing with CXXFLAGS please.
 	sed -i -e '/-Os/d' CMakeLists.txt || die
diff --git a/games-action/openastromenace/openastromenace-1.3.2.ebuild b/games-action/openastromenace/openastromenace-1.3.2.ebuild
index a84ba6057389..02e004964e59 100644
--- a/games-action/openastromenace/openastromenace-1.3.2.ebuild
+++ b/games-action/openastromenace/openastromenace-1.3.2.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
@@ -27,9 +27,10 @@ RDEPEND=${DEPEND}
 S=${WORKDIR}/AstroMenace
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# no messing with CXXFLAGS please.
 	sed -i -e '/-Os/d' CMakeLists.txt || die
-	epatch_user # bug #542930
 }
 
 src_configure() {