gentoo resync : 17.10.2017

12 files changed, 39 insertions, 25 deletions

diff --git a/games-strategy/freesynd/Manifest b/games-strategy/freesynd/Manifest
index 7f387825c6bd..2ef1ec9bce03 100644
--- a/games-strategy/freesynd/Manifest
+++ b/games-strategy/freesynd/Manifest
@@ -1,6 +1,6 @@
 AUX freesynd-0.7.1-cmake.patch 931 SHA256 e5c058dc4a4c3633c45eed4f0de4f33230236fe3231cd2f35a1896a9ba329b4c SHA512 994d12a2f079582bda03a600888c2d7ed2043468d69ce752e64deb45d156de5a7556edabd00d2635acc2c39882a8074193dc559e423e8e0181e9d4ea9d8b8b6f WHIRLPOOL 7fcb80febf70b6d238a94ea2c00a7922393be7df764f48edca8c2bd08b40b6772def67543b7ceed789ddd07f3cac88d508c3fe98f841f17a54444606682251ee
 DIST freesynd-0.7.1.tar.gz 2576695 SHA256 e55b0b3386cdace81fdcd8e33943535abf19ba0797b78c404689bcdd2c55f7de SHA512 b87e6adaf71206532b4f90cd230ca6be00438fe26f000c5a0bfebf2839fea80d78d98ddc27331a2224874338c3e14ffbfa58b8c5bdbdc53c93bba8d6a9e6b7b4 WHIRLPOOL c6b49b4971a4b6404006e3579fba23342cdb98119836f0db489d05db10ed8b45f8d4282f16b9cd726a810ec9eb6d06be95d3e0f67985e993a4010d97c715cf14
-EBUILD freesynd-0.7.1.ebuild 1665 SHA256 b0484dbfe776ecda97e9efe014ea35b3ca6e8277c6ae55f94e0ab66f8d85ce56 SHA512 912f6ba3b63c4f814f2faef18dd1b9fb7b89db250280406524352c8f4a4602f14fbbadeeddfd8206931729136de8af340fe391b30658755b27d922ddd6fde72d WHIRLPOOL afb611b7e0cf9e2c1c7ca00e0ae89a3a2a4c18fb5f129a0225615c1150d36ca4d487378814c697275d05f5447189f8f129bac6f722b10d1612134cf276af1f89
+EBUILD freesynd-0.7.1.ebuild 1689 SHA256 69060d025cc0d9bddbbb38831789ab9f81d1aa3141c6e15f7664d6e7f76ad130 SHA512 3c702c520fb374def050e5f1ee83a4a18269d9829c230993b5d08b72ceeb0ca1eac872f29b08b7f462c8c02d2447f7f565836b6d462406bdc5b6d18719348405 WHIRLPOOL b907c4e98cac5ab2b3bee791259b7311d30d37a89e033d6de3916155be65a498db69430c730f56a1945cf70c188087e3c290b89c6518bcc7179db337c69b1081
 MISC ChangeLog 2471 SHA256 c66126aac4d3379bca181fcf1c0d4c7691eb93d3f31db5d711f7c3522a4d83b7 SHA512 1b37516b7f9ac9cfb68ed03a43a78d215d4843798ff0766204e1a00f7dba4c8c47d24998ec2ee9ba7d4d5a7a17048052e9727805eabda92c757bb91f000bf4a3 WHIRLPOOL 1a5d517cb21d8d87d81ff06501f9c5bc85aff61d2678426e5517d9acb37b30b75260226f83648637bbd6a433137d8aba13e64ffe92c4f5aced4cb2f65115f987
 MISC ChangeLog-2015 1257 SHA256 9a5b2a63f8dac922a90d30252aa9f229ca74d3b8ce5ab38c14a988866d0286a2 SHA512 e86ce06474cd29fcdbe30c4e553b293a6bcf66da63d5f1fa7c63eebe0fd815a11d01e26d697abf1b207a7a391843211f8b2c56e7aadc8397d196b0eb3cf082f2 WHIRLPOOL b5101eb249d3cc47d7f6c6d00827b3f8618584bdeca089891cfc3e2cda3526a66693a6e009accb4c3b4ea01807398a4bd7fbde77bc85b0ec3318782fa2a89080
 MISC metadata.xml 401 SHA256 377a15b5363d584c8b8b26925f566e4a76f4395e7966e89f437dba3c34f20751 SHA512 5750ad5bed978d8a906a3cea47f3602257b5390bb87096c1e005d0c2bd1921b9033bdfb87f14506e88e8929268a9c9bb0003c9b343d0a0040b30df2058726152 WHIRLPOOL 900a0e3d0a9f9c6015357cd6d4fb0dfa811677d3d13f15f3acce94fb542f3f1c9f964d55f957bcd5e654359b3f6cb1807991942f5b7d683528e07c224a2295d9
diff --git a/games-strategy/freesynd/freesynd-0.7.1.ebuild b/games-strategy/freesynd/freesynd-0.7.1.ebuild
index ca97959a7212..ec26a73395b2 100644
--- a/games-strategy/freesynd/freesynd-0.7.1.ebuild
+++ b/games-strategy/freesynd/freesynd-0.7.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils cmake-utils gnome2-utils games
 
-DESCRIPTION="A cross-platform reimplementation of engine for the classic Bullfrog game, Syndicate"
+DESCRIPTION="A portable reimplementation of engine for the classic Bullfrog game, Syndicate"
 HOMEPAGE="http://freesynd.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -21,10 +21,12 @@ RDEPEND="media-libs/libogg
 	media-libs/sdl-image[png]"
 DEPEND=${RDEPEND}
 
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
 CMAKE_IN_SOURCE_BUILD=1
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch
+	cmake-utils_src_prepare
 
 	sed \
 		-e "s:#freesynd_data_dir = /usr/share/freesynd/data:freesynd_data_dir = ${GAMES_DATADIR}/${PN}/data:" \
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
index 910bbc0f3ecd..3760749e298c 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,5 +1,5 @@
 DIST megaglest-data-3.11.1.tar.xz 283383936 SHA256 5f1f6ad9f89a929122a26e1c1cabc887b75c09f4a84720d9ce5aa6aa0fc9cbe8 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357 WHIRLPOOL bec2417a1884d5f6ded736981714eaf3a79ebf015163958b55396373bbb0e6ae6548bf9e30b4615aa9fbca1b9a779e1f8afd6086a48204561ddb361d98588771
-EBUILD megaglest-data-3.11.1.ebuild 930 SHA256 7997df1d7cb8466a8793022ca3c0032d868b84a4c85d1589668a6fa3c4880d97 SHA512 32f7893ed356587bf32105296ce4cb4fcf08697803ae47738a033313dfb73fa9b8e71456ea2ecc7781209c597a309929adf4c6dbb5e2fbf18ea5364b20f901f9 WHIRLPOOL e94aec024a3e1dd208e5932e107d58e4b6f58ed4e9f0c2ea28768592f00f6e6bfea4b80ad726606649be7ba62334b29c8f869ee96b69d18253307dfbbd8dd338
+EBUILD megaglest-data-3.11.1.ebuild 974 SHA256 a809df08898983b2800fe4dd96aecfe0d8050b80fb65d38111a5907ba1052f76 SHA512 ccae8e91f72008125d0233564584cbc4d5fc20a2375183826f93c536866caad1e8d05a358c3e3b47b35b4b3dcc761ac96e0378e2c1357bdc61404e80cf39fc91 WHIRLPOOL ae4b713d46b769169060a16ff6635758531f68d195382df6ba4ca0f0d892e58d13c5790361ec666699eca33ae5606444fc3b7a102555858290dbef7175f849f0
 MISC ChangeLog 2737 SHA256 5e503d0de3ae8fe266ba6e428112faab735f6ad85b20258a4e82c9d455b906f8 SHA512 77a6934f092e026d81a256d985544e3409a9cf90007ccf0f2fceaa53c40d88ca54880a0c43e77d8adbd23e535c4cb865917d3b355be8ac3280f021dd89ea651d WHIRLPOOL 3a27c9c1248362f8800267507b03b5081b075e6ca0a48cb7d9dbc736ef03036bc35b0d0590c8dac44d120f625b0d088c16b2ed262a57f40c301823d3a1b9354d
 MISC ChangeLog-2015 2714 SHA256 61ded1a4a58a27a5dbfa89e3321f07f8babfa1a8368322e21fd78aedf63a81bb SHA512 17629082899635d748a644921bd346148ccef2db425305b2faaae033d2705248c42374a7da85a7db47071a272e6e42b5ebee69d2395414888f7786808ee01400 WHIRLPOOL ce67440aa3327ca359d8f430ac448def3a470c16822e2b14313c339ad46e3a3652f85cde73d31d47c8dc85096d5d2de26af294271822648e84a8f63f8ce9077f
 MISC metadata.xml 342 SHA256 f181f9cb5d926b3d8c8fe6487db7affe6d2f1b346049f3dddb090916663b73e4 SHA512 6ae571607c0fefd0ff846ea1f9946d1e5de8a208494b71474f2c46495beb4d306edc37d7ed754305c6e325e7b7306f13f3e78010235bef1c97873cf01de519fe WHIRLPOOL 3e7de83eba657bbeb1eeb28d2736b3505d11596f1449dfb6c82af35607756d79319912d619e1a68ba91aaba1f1c94eec85ae12ffed042dc57625b738624cb98a
diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
index 78413a49228f..961bbe9ace1d 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.11.1.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
@@ -18,6 +18,10 @@ DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 17c1efd0f793..ca64ebc72a24 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -6,7 +6,7 @@ AUX s25rttr-0.8.1-gcc6.patch 1504 SHA256 2f67486e324b733e32c60e3801456aabed9c7f5
 AUX s25rttr-0.8.1-miniupnpc-api-14.patch 1385 SHA256 96caa43391a3661efdb4e05498a2c0d57244677d91b3dd3dec6d5e678c293d25 SHA512 163a83ac734ff2accca133c20c0e15f7f21140e41661add4229f2a878baebebf09eb82420b2d0b0a7a77042be35608bd00c30006265395e842ae28d64b8986f6 WHIRLPOOL 6fb83e5c8335509dd9fad3ad3545ecaa28c097552aeb3d3db3affef7790de46ac696a2ebedbd7ec008afa74e44be18455cd805267a9a067e37003f8790d2b9bb
 AUX s25rttr-0.8.1-soundconverter.patch 763 SHA256 a3a490b4efb2182400fc9b07a67f66c939a2fe8a58983e85f4cd5125bfc2de37 SHA512 0f16e86057cb1574b8dd2303c49547ce855897683de3af52a437da9304c7bc821bcd3278dae6652fb8a0a358e64c1fa4c0eaec88323ab2dc5a0c56da3ce61afe WHIRLPOOL 3d427181fa8354f5b01e4ebfe8a3d445099163bd705094ee43a7d1b6dcb0f2a873d8262e1a23816ba089b4efa0189c0a3c8c8ad5e5b89595337de9d2aad98163
 DIST s25rttr-0.8.1.tar.xz 39644940 SHA256 683282a1d7d0549bb3a9db64c14aea111fcef79212461a099a2fe2e3960263bf SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2 WHIRLPOOL 6558b6235b805489b8bc16b51175c7f46cc4d4887a088d79680826542b65f73f93bcd5801847b6284390a2f0ddbb112cfdb5decd1fb89a8c6ed585280f2f7de4
-EBUILD s25rttr-0.8.1-r2.ebuild 2640 SHA256 caa8835e971c85bada6581b0f52a6b04e6a63c11a0014ba058a9b7a7ddd76a0f SHA512 0fb9e0de437a729753ad25a5a49e077e83871cf523dd51ed69dba43ad0115f00f9eaf6f9d89a8410da19a448defcb2081d012966b3961bb21643753768d8a86d WHIRLPOOL ffeeae60c11496b639b75389842cc27f592a02e18fa9a982fc283cebeb6ebc5248ba875162d38de10eece7fad92c1ed79edabae20b6e0d6c6d9f7b5c7f1894a3
+EBUILD s25rttr-0.8.1-r2.ebuild 2653 SHA256 cfe2d8a47f3a4412a003cae57d3bb421e248c8eb8fa10b0674e791a9b014fdd4 SHA512 60187d496c81988a13cb66c46c4863b1c3b43ea4903a9f26e99163aa1c190072abef46089ab1211df740ecdc7cd5953bc59a42ad53a21223e4f32dbb82da53a5 WHIRLPOOL 1e43bd56a3eb0afef2f7a3989275c0812c77570b81af96e1cf59e299335fd8de763ee2d25b53322ea356aa10aa45a650bba15e2120f1c7165f256deb8e784ff1
 MISC ChangeLog 5288 SHA256 a41af7e0777465168894f97cb0ca42511fcb36c8a5870b45f27ebc76d07805b6 SHA512 3ab79edef66bf3089897eb749084b947b5cbcec6d53f3cb1e9f64ccf476c0498e8835a5f34e09c9d56244bb2ca9680d68a9eb5279345bd52d70171dbc44fa0c2 WHIRLPOOL 9f3ab6354000945394f8839088b0e88ddc585747bb75c5f555fb9564b36a71d3e3b454befec0f67dc56198ae2fb5dba3a3a131a5a537b2e7e11cc0121353097f
 MISC ChangeLog-2015 1639 SHA256 d9919e0bdd04b2db741f6d87b1313fa17c693d197c631d04cb1f10eb3ef96445 SHA512 e5b0c9e35dfb5660575433b314b0ac76afd57ace40c6e128e6843e24d9b6a19428510c8caa8e605bf3f73dbb9e8868432e61bd5f0ff9d35ed9ecc143b8771e6d WHIRLPOOL a77a840f2537613a6c12d1e46f22565010e444792c690896ddfd4e83c0981ea9e68cdc6320e9cfa398ed54b0369610833d25a2631006e2ab2d095e479bf21543
-MISC metadata.xml 487 SHA256 8d6d8239cb93b14a68c20740466170d923cc3b4b7504bb2fbc80757590ecf3b4 SHA512 2a637b479281ed9b3df211fd2090e9ea42bb7f7bc5cc7fa8b40e8a665e9dbb9206e9f142199d596676fdcc546e3df1550fa8f5a13d81818d484674c4643ab3af WHIRLPOOL c8e820efa3612c76f5eb6f520c41bbb005e0357aa063b6fae06b3ee8d0428ca436d555f2bc66ef295e1de80b34b5ee5841ec14b8847a3cea698e4ab9518ed97b
+MISC metadata.xml 463 SHA256 17fe1b3a81b8db96b94db72cd48a6f1898f072523ed6b39f932547d885036cac SHA512 dd5ea72d1f7ceda9bb2f033c8482e2978924ebee1a61e00fb515b0b0e846553bb1a4024aa739ae1f51608dcb90d0138d6679df1133a8140bfa2bfdb48163c885 WHIRLPOOL a06faf17a9714bddf930d8fa9c52ea994ed6cb5494cdc01e7b627e2da954a95a11a668d39fe8c277a59a5a5776c2d4da75938240fae264074be7d0e8217e8157
diff --git a/games-strategy/s25rttr/metadata.xml b/games-strategy/s25rttr/metadata.xml
index e5e3b0f43654..7603c5eda305 100644
--- a/games-strategy/s25rttr/metadata.xml
+++ b/games-strategy/s25rttr/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>games@gentoo.org</email>
-        <name>Gentoo Games Project</name>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-        <changelog>http://www.siedler25.org/index.php?com=dynamic&amp;mod=9&amp;PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5</changelog>
-        <bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
+		<changelog>http://www.siedler25.org/index.php?com=dynamic&amp;mod=9&amp;PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5</changelog>
+		<bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
index 9ecfd153901b..ccc3e61cc799 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
@@ -26,14 +26,18 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-soundconverter.patch
+	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-miniupnpc-api-14.patch
+	"${FILESDIR}"/${P}-cmake-3.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-soundconverter.patch \
-		"${FILESDIR}"/${P}-fpic.patch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-miniupnpc-api-14.patch \
-		"${FILESDIR}"/${P}-cmake-3.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 8ff1c608ead2..43f2393ec072 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -8,7 +8,7 @@ AUX scorched3d-44-win32.patch 464 SHA256 325ec09315a102ebb2290007c28fe263771991a
 AUX scorched3d-44-wxgtk.patch 7001 SHA256 6e3e210addeae643f353496c47fa4cebd11e46d0bcf11c7848d51108cecaec6f SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120 WHIRLPOOL 48fdb4f6636a6d19035236665c9256cd410adb50209ecaa2306e4084b8090ef5c3fdc9050cc6a50c7aa4828fc696ae70b2b232d74ba2aa226920843bc11af4b5
 DIST Scorched3D-44-src.tar.gz 41689613 SHA256 1c8320bb2210030be71dd713c214fbd32f7dd663ea82031383e6b3636f8a8dba SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca WHIRLPOOL 6b7c744702b86df856d8879454e7c9616e31dc3a9f539bd97c53cba4bea0e59f44e3c703f847f3cd505ba0e90386887f7134f9500421b3d58ba12a9cc1fdbc0e
 EBUILD scorched3d-44-r1.ebuild 2221 SHA256 d9fff21262ba08c74da8f057e1ba379a46deeccfc6eb88b76c0bd6524576d4a6 SHA512 1cca46096ecf2cf87a913733a1e92777a44f91bdc721a0c78b046380adda16a25f229afb0a223c3c4e945adce85610f0b1772d9a0f9042d85908828bbb2705a4 WHIRLPOOL da7a5d351e4bf19cf7d32d378d73daf75b154fd73392d557bbefa9077bc328f041c0b82850c62eac1cd832a3bbe30ac28a86bd7ae09377a92fb864ae49500fc3
-EBUILD scorched3d-44-r2.ebuild 2310 SHA256 f2279ceacb4ad8c3a4ce76aa841c07d0157ef2a87d6bc0296cc5e18bdaef4b81 SHA512 6b145b4f8f71f338a3535cedff106a4dec6119a37b99ed59b035f51ffa48bf857e6a4dd72f162455fd50d99f7e195ab3418d4f378735c1a417ded077d034a42a WHIRLPOOL e40cc2f7adb6e41eb0d7fa2cb5aa8badb50b53f8851023077fcb29e0cff55e802b4a4f8281489687b1b0d88c64786ad7e1675b78f9d244ca8c9a090c069c4da8
+EBUILD scorched3d-44-r2.ebuild 2309 SHA256 70cd4051872e03c3a8becb94e86ba47c530de915765da0e14994f3402b9383f9 SHA512 a2d4eaef9edaf09e94b593f45daf753f1bb56acba327fbf57fbbfe6de69875030f1d56a794b1bb9f804e336545ed945e5ca036d937c8dd363435167a759a0fe1 WHIRLPOOL ef84d9049bcfd61f010d07a45041047af37d52cd34148510ad4a5bc5c49efdf199e4337acc60e05f72d52ea41d0133b4c42c6cf91d9410b4dc49fc32af6854f4
 MISC ChangeLog 3881 SHA256 7d78ef5132c961a884ce8ea88129b5c1bd405697787209f7c881ecef2a0786b4 SHA512 3dca1cd6b028a18e5e048492e5ba30a9a0faa554b552962229e6b000e86caf571e66c0433fc04a00751e3cf69ad7793950ef58df4ba89bd5c81fea65d54ab66d WHIRLPOOL ba081308815ca61b8aa63eb1d176d9cd38c21531b77e8cbf46ccc97d98e013e82754239955b49d982efd72c24cea548dedb854bec0d7d8cabf20847d46a376a1
 MISC ChangeLog-2015 16385 SHA256 a4bbf80de049d02acd34341baac4e19aa020e88d37f73bca668ba963951ab87a SHA512 7bcf80ac0e1b26f825e829fbb8d748de5672067f0a83ed0518d9b8e4600c9a227cdad3acbc27d5c2efb4b61898d3b30a4c20933a5004727aefecd83a4a5f52ba WHIRLPOOL b6ae93961727860e049c475ce1c590aa7ea2662d688cc54d2558e0926bb8154d6070dda837c5e77225b345591639631f93897f174727404b40635edcba527822
 MISC metadata.xml 333 SHA256 1ad69c015c8f04f5608782f77b591dcfdbfb9566b76cc2ba63b85e846811c43a SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171 WHIRLPOOL e615857beedeb663193434eea5546d01dc37f9fe2ce47b5f07067089c958dc5a69d8da4d0f0d072aadbaa25dd7b32bd1696509290f283331682ea2e8176b9666
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index e156ff902fda..bc99fa9132b1 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.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=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 ~x86"
 IUSE="dedicated mysql"
 
 RDEPEND="
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index c11fde84c3b5..ca00062a13cf 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,8 +1,8 @@
 AUX wesnothd.rc 502 SHA256 ffade973497785e468df98a7192277779ad33f0b7c588a10d36af490525549a2 SHA512 5e0a4680a35f81e749b8e0d56e3cf372c4a13b19578deda072560d0c63460426d7bde3e0e955287c8fbc939c700dc487283373ff9bc72bbcd9cf633ddaeafc96 WHIRLPOOL af8039bd4b82667b0dc3916092fa76ca87385f2cbac86665bd23e05d60e7ef01fae0c13db0850a12aa59570d9228055b7e350f217e4195df277d3e10998b85bb
 DIST wesnoth-1.12.5.tar.bz2 387726941 SHA256 599aad40da4b271c5138ac5a4391d9ff9c367ee51f5c30ca138f6baf92aea81d SHA512 1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4 WHIRLPOOL 7afbbf28de36ce3a55a177bc5b6de7f635c4e18de5934378fce6ea6a1da7ab95c55ff6c35b4a3166927efc17138fb18ef600e08969b29001455e21a260c8f6b6
 DIST wesnoth-1.12.6.tar.bz2 387869758 SHA256 a50f384cead15f68f31cfa1a311e76a12098428702cb674d3521eb169eb92e4e SHA512 12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a WHIRLPOOL a1ca73e86ab66cb263e288f12d005210b1b9275012a9de470f1d60a1fa8b80d81d834c9bb9002920b8a6c94b13a413f451a5703d377bd8fbadfe455a41967221
-EBUILD wesnoth-1.12.5.ebuild 3078 SHA256 b309f01cc090438a614892bc804409ccceafcb35636b7701adb4e34de3da1e22 SHA512 04d3172270981dd9d8503dfe06074a6a88e2517e0e853938f4884c47ab2dc0999c364117afcafd6896370197983edf7022f779e3441497f9e9cd829146923521 WHIRLPOOL 69bf961a3f36d4c07f999d574307b697ce5f04080192545f32d8b579641dbca57d67c1b82eb4893505c2b7326f2087290eb920718dd33e313c3dc91b12536438
-EBUILD wesnoth-1.12.6.ebuild 3078 SHA256 93b803834298e7c72908516952d5a772282bd30ccab389e48f710d4b83e3dfb7 SHA512 166de42e868fbb1275facccd8517cf7a5014fe11d651d3366422e42a07dd035bc195edf9a871a4b3d8862d150d39fc18673ab4b60669a94ab14d280fc335ee9b WHIRLPOOL f195c8c66feea79778df261f6636c2fee9fccfb197bc9c520462183137d488099f480e1f2a1dab2338367e4f55ef5ac7a95341e9cfd5c52a7fa6461342cbf193
+EBUILD wesnoth-1.12.5.ebuild 3104 SHA256 1419e1b40b94922a0acdb6d82f0296f945f2abd29b40a78ec788e025ed845fe5 SHA512 0e0a2407956099bcb63c6dc25465537b15fe8a0622435e42c895660a6fee2685b8c7eb9bfdbc0912dde26e53beb4850de3557423a1f85c957cfa0d6d06e9e4a9 WHIRLPOOL b12753d25aafbb5bc8796bfc853ba6d4b1101947712b098c4fb8a55d407d5b68a228c12dc99846f26640a73d331d658d1c9c920670f85fd3712250c15a20a64e
+EBUILD wesnoth-1.12.6.ebuild 3104 SHA256 1419e1b40b94922a0acdb6d82f0296f945f2abd29b40a78ec788e025ed845fe5 SHA512 0e0a2407956099bcb63c6dc25465537b15fe8a0622435e42c895660a6fee2685b8c7eb9bfdbc0912dde26e53beb4850de3557423a1f85c957cfa0d6d06e9e4a9 WHIRLPOOL b12753d25aafbb5bc8796bfc853ba6d4b1101947712b098c4fb8a55d407d5b68a228c12dc99846f26640a73d331d658d1c9c920670f85fd3712250c15a20a64e
 MISC ChangeLog 4277 SHA256 e3a2ed52fac81ae2dfa278a8629a727b33b9cb6da2bb3a2dd9a3fcfc98fea035 SHA512 611406c1488e1760862c47e1a92530bfec0f88d5a4630dbebd34f95dc658c7bd5a8dd6a18a38c3ea3a03bc9a86fc93bc1b70e2cf319401f7e0691592c211935e WHIRLPOOL d74f80c45a729bb3836643a80030b8e5438fed123fd588a3fa9f885b1c88b9c263428b95428293c7e0235cdf50c50d663a3e9a2246c4ca880630c627dc63e7e2
 MISC ChangeLog-2015 31794 SHA256 26a500203cf457a4197ba23b36e86f53138b4be8f9f37538bef5ec3b07705325 SHA512 9193b4c8b5fe6e74a7884470971c8b1a8ae8c04d99484e5eb7f3d6de2f97845eac79b69636ab3fc783e42e3e9cdb835e409e492e5c94e25de00d169f88d0e34a WHIRLPOOL 9fffddbef4e6d3029262601f57a47bb47c138a70a7f80c5c42739c599b5c58ecd417bdad4c4ee5b72f84361d53e06628384461fbd9e219df0ad8a1101678534a
 MISC metadata.xml 485 SHA256 4868865e101fbd1879d376e95f2fb90d6b332a22c660b7386698b56920cc7039 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3 WHIRLPOOL 2ffebb7acf423fa06fe21fffded41161ceef5d170acb80c7314da43fc083d1c454b72714e2d91bb1cef43fa8c969547f357a38072ec7dedd6e29093639172097
diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index 5fdf8efcd60f..e2434dbe0a4d 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.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
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	if use dedicated || use server ; then
 		sed \
 			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
index 140ffac1776e..e2434dbe0a4d 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	if use dedicated || use server ; then
 		sed \
 			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \