gentoo resync : 17.10.2017

6 files changed, 19 insertions, 13 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index f916e8ca70e8..e7553c2bc9cd 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -3,7 +3,7 @@ AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 SHA256 331eb7b47513df49edeb
 AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 SHA256 b339cc3e2d21700a6849e3c9d01bc56837e6b13ea1ef0365e246fe0993456499 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9 WHIRLPOOL aacabdaa0c7869fd6d6e8ff084b888be0b4a1a4c88a2203dad6145a81193154d84acdbdb5956060d5a2f0dcc9d35fe77bf26cd427baf0371ac1f9df2ba9d2368
 AUX ogre-1.9.0-samples.patch 226 SHA256 6dc4350267714ce564a6f2977eed60646c95e69a2d3abec1273144a8d1f74992 SHA512 7e4a90954940ab87b338c680d22666d5c9a70425e02ab314ca925346862385a1e9ace75b4099b1223da5a658b5311f4557a3f846e2d404764153cdfafb7e5b3a WHIRLPOOL 404ed091248806bd6418aaa530cdc035ce1e6bf3b5d931e93ba3e8e5900f08692301eb2339ea0c760856b8b7622803d4cc1ecf22db62be33d3f1ca97cf9acb38
 DIST ogre-1.9.0.tar.bz2 128098305 SHA256 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde WHIRLPOOL 625cc09ba5a76757b47764c41583584f538eb9561e5bfd546192e06da504aa3924d7070a7dfbe420c4db3edf5870baf5e8b77cc611aa4185806508f79302d6cd
-EBUILD ogre-1.9.0-r1.ebuild 3779 SHA256 737601014400dcc07e66f4b3017f569703eecda810f36c1ab9b63a2d7ecf9d17 SHA512 bf30a6025dee4e09875cb0557a973848415c67925207e2183c206e990b3454dff2ec955585830cb9dcfb97c6654a096a590600ff767030d77de540498f80d147 WHIRLPOOL ff2738a47d0fb797bd11ccf61f3ec21b4ee4173f908cfb9064d75b8e4187b0a966879dc6de12b53e2c798330eceefc596f6648bc04e6862494440ccd92a7d28f
+EBUILD ogre-1.9.0-r1.ebuild 3797 SHA256 3861237b2b38babc28ba9b514ae1b528a86c2e654cd733a38488afe022b43a44 SHA512 653450fe5edd8f78405f71c05ad3e4197d39118c147fa9f3575e889e196ddaa314acdf147d1dfeec21a23d7b926b4f771c999d97c29fe7dbba22833066797530 WHIRLPOOL 2534cd59e6913bf03ccdc4a8c7fd4b6b50f3e0e481899911385463c42d40126bd0a2d5828b0df8adb7535fd1fb3b4e8f44f060aae7b98b9c17c3674bb309b253
 MISC ChangeLog 3947 SHA256 a96702c5fe785b41f44b8d3a9b31875afeb2f82beed8144d43c5cddc698e3527 SHA512 0e1a6475a119ae81d28f552244236e227173c3bcb573badcf8f02f6eaefdf9c9f7489ec904e95eec4d2f91554688a35bd00fd79b9c2944461b3ee4eef3ab03b3 WHIRLPOOL 88fd1e60b97ec38935947c5f036141dd1cb4da612994669746f145d922eb5f726c71d3c9572f70e79e774fdcb8cb548b4b69da398322874603f0b5c4d98c2150
 MISC ChangeLog-2015 14769 SHA256 f5e52631051f0c33054b4a97d4da67c61136b80807fef520738f2bac700961ba SHA512 c9c8f40e0a8507c1b07ed6a8ea871628f9fd5eb279304e3d56d078a95da282b3b73a1eb775fb4b6cbc89130fe11d7c3c49ea67cb1faab3a1d6acd7e457b51a73 WHIRLPOOL a1ad7516ddd1d5df84a3d8b5bfded71d4c57fa419392f5af75315e8b1ac5ab6b1e85ea01a9486dad651f886bdd8266522389fc2d44ab8f5c6cad2408af555e99
 MISC metadata.xml 5223 SHA256 234652b68c2af651d2d2b367fc9a3643ff70bdf29536ef9ef7421da183a06e34 SHA512 0dc362c5fda467f45c1910baaa4bf51dc48dc01bcb7ae9230008d868d5556227b77c030a0d2110646bcbff8318d4c0c1c2a3a7b112b3f63c0132bcb1adaa61fe WHIRLPOOL c2d92daec07df57a7dd7066813b8574335b15987058b04e6e956f9b47248da48356c75b4c8651695926857f20a6a7310e192c5aa04b92ab91072a2ee7c6af2f3
diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
index 812a8bd94cee..85c350c407d8 100644
--- a/dev-games/ogre/ogre-1.9.0-r1.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r1.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
@@ -55,6 +55,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove_resource_path_to_bindir.patch"
+	"${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
+	"${FILESDIR}/${P}-gcc52.patch"
+	"${FILESDIR}/${P}-samples.patch"
+)
+
 src_prepare() {
 	sed -i \
 		-e "s:share/OGRE/docs:share/doc/${PF}:" \
@@ -68,11 +75,7 @@ src_prepare() {
 	rm -f Tools/XMLConverter/{include,src}/tiny*.*
 
 	# Fix some path issues
-	epatch \
-		"${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
-		"${FILESDIR}/${P}-remove_media_path_to_bindir.patch" \
-		"${FILESDIR}/${P}-gcc52.patch" \
-		"${FILESDIR}/${P}-samples.patch"
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index b9fd4b95c8d4..35da5a5ca52d 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,9 +1,9 @@
 AUX physfs-2.0.3-zip_seek.diff 535 SHA256 4371e43ae98ea9292a50e611f961e76a9f76f3b135bfdae27430031e07dd402a SHA512 016f5cafecdfc7f4d2d9dcb517f0ebe7b7765912361399e2c7e239c936c287ca15c0124fd9378c23d6d0d3669c45c4d4dc498098eb052901d349459c94a29ef2 WHIRLPOOL 0e36ec294b8f4e1cf82ff28f47a21f9df2ed8ed9b5c63b2500415704b072b38d71a531ae8b1436f6f125dea7277c689767facf54e882ab3a9ab4831fa121ad14
 DIST physfs-2.0.3.tar.bz2 560628 SHA256 ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80 WHIRLPOOL 30362f92d5702842142c08c3183a384876a03e9e3e400364b0fa59c99ffee994667c1ad08fe633ef146e98301789a980a3419f60a18b24b9c341bb74144ccc73
 DIST physfs-3.0.0.tar.bz2 194277 SHA256 f2617d6855ea97ea42e4a8ebcad404354be99dfd8a274eacea92091b27fd7324 SHA512 4293dc72a5b2e41fbd02c4426da7bfc1e94a013d8a332b3124798a91ef27b4a57adef303f23d5e03150855de69cf22fc8bb29e6395725a18e3a12f6c74b4111f WHIRLPOOL e0010e15b2449565939dd5e9d65fb63cbbb78069a0390fc0ba95c7671a484db7470ec300cfd8aaa5810aff7fd14bbc669f8e902a9469ba7d51ebeed6c94b15f4
-EBUILD physfs-2.0.3-r2.ebuild 1417 SHA256 afba6b34450c8653be2983fe921bd8a9068cd357cb83988a93cd203ea8f7bfb4 SHA512 0b13fa37b61627c4eb8309087d1e538ba19f66eef0c932f7b0070df4128cbe0e712c62f2c7a1ad1d9b3b08198ee7e2dea0e0483c302a929005df6ac9a06981be WHIRLPOOL 7c7819fa3b2ff275ff3bb25717870bd3f6a585fe3a5f93e6b26e1b0b5063bfddf3648bb836a88aa69794e7c99c727a4220b23ca3571d3a0e55708dd6d24aa699
-EBUILD physfs-3.0.0.ebuild 1132 SHA256 562cdb6452ebeb99c2afd263595dfcbdebc4d30178c76a2457a7dd8d8e79e015 SHA512 9935cf7a2af2f8b3d336d422fd93317799fc1521026a8621aa4a197a3973287ddcead7834eb890f01cee26ac2d24fc2ed4a0cf49ce6ff13c35816b12f14a7ab3 WHIRLPOOL d6c3ce478b2ea41248b57b045004174acd5244945cc6c655eb22b7660027f8b967ad778f490baf1edf7da37474ca8c3ff5880b598429f1dcdd1511f3a3709ede
-EBUILD physfs-9999.ebuild 1246 SHA256 a857081fe4a6c655b759a4b9380b649ccae33fa2857d74339e96eff210a4ad5f SHA512 1db1cb2df7f7f457710ca2b7ed2b7bc40de7d0a24cfdb90ee81b2182e5b3e86902ead39df83acbc01d2dc2142ed94ed9d10ea405d3e584740fb79d382a34d3ec WHIRLPOOL 4bea15d5e1979e879463068df2c60ccbc5692a1cfde55702944624b69f703dae6eefd1ce6e1d1d47031cbbfd433b9747cfe877bf763a3f96c634f827e0143765
+EBUILD physfs-2.0.3-r2.ebuild 1434 SHA256 592be9f1a5e3ed88ffe0404ddfc6321b92f0563fca39589c5e3fff6d7d526840 SHA512 543e02d9f4c5653c385295beb92c3e002cfb153fa968dfeb386fba205523197f35d0dbb9e57e82960583ae5ded4232001a91a39628ceaf2a195c3215ac6ce6de WHIRLPOOL 83ea9a1bc226828ce5b391720791f3bfe8c205a7f5903c71e0b1f334420d3a350aec1c795e17c600684bdf6d4db809107ce8ccb8b6a52d45b28d18760d9099db
+EBUILD physfs-3.0.0.ebuild 1149 SHA256 2a9804decada5cd978fdd058c2861d4e1b8d4a6e31392cb5062489866261e565 SHA512 34a700288cb901ba432c748e47203e8234e0f1ba68af56edf490ea798c2afabf6f905cc8d95f602fe8fa66518e2e82d051b95ec7004a913e394bb525478f6dff WHIRLPOOL 92865f39c00369f57527661ae1482049612904969ce0b7453a469edff03c43b2cee8308facf75469e4f648fdbc2c017b02c064af0aab03b49d818117d65661e0
+EBUILD physfs-9999.ebuild 1263 SHA256 484d9c96f801d2d694773c74597f94962f9b816ce038c89a2618a5fdf03cc544 SHA512 d37b4df1abea4e27a33fde03b8dd63871c68b77abba72214aa6fedd0fc351a4898fd4290590fbf5ac3b494f42f8e9f46c6cb975d66485f54bae473105d99b70c WHIRLPOOL 3ee5a8a3e227f08b83ee3ca8208655894e5c23e77131d6415e5f2c8a4bea238b2a65f58c8076c68e99c03da306bce984f6d36fa295f70f8004bf3aa70987cb5e
 MISC ChangeLog 2431 SHA256 099f43e2fdfd7460a914f8e55fcb59cd66e0be1ed600f211aa5b52d13c20409a SHA512 c019650836efe001d5a932b06951e86c393831e080803adf7a52c196979f05369cc1b7b67ad3e67062afe81a7e3d9a3057055c3d351f81c428d0d094199a11ad WHIRLPOOL 9f72642a54fbc8c8b3a41e3d18ba76abc7fdd65a58fdd3cc139ca4d568071b992e61e285e82885ba418e9fb0f182e9f791b3ca1cbdf71673e0d9593654bdeaa5
 MISC ChangeLog-2015 7649 SHA256 dfe9ed4277f66ca02c979d90d7064f1e8d8485f407bacc0a9698989102b198f6 SHA512 dda73f3b974906e287303cb06e356858f1f87ffc1d429db82b3471ff34652e5589047176b93745878cfa83516be1356a11509471b467bb755b3fa31782cbedcd WHIRLPOOL 3a44a4b735866e5f185790918e4673eeb41f47c3c630d451ddcb2997189656bc282d8a236817e3c4a0044d4c4fcfaf29cc0484953f9994c212f04085a635c691
 MISC metadata.xml 1807 SHA256 a7e6ba6e78f907c535d8ae8f470a524fd3dc89012225f9ec8b7d2f4b218ac241 SHA512 914416e5632d1587b4677b8c8997eed056603049bf71424ccc679a6a4fa050ad2c9f5bf2db0927a5925bdc662565fc2d49901c9de419a623a830a2c6da65341e WHIRLPOOL 17f6fa2ecf2bf30388d86d8cf81e90221847fcd8927c061cb3a2fbcbbf7861c37bcee6ec4b8e9ab99cd2d988b7a143687d8a8e30d2a084a94518ff3bd6004a05
diff --git a/dev-games/physfs/physfs-2.0.3-r2.ebuild b/dev-games/physfs/physfs-2.0.3-r2.ebuild
index 2411c6c35d7f..eec6c0e35460 100644
--- a/dev-games/physfs/physfs-2.0.3-r2.ebuild
+++ b/dev-games/physfs/physfs-2.0.3-r2.ebuild
@@ -21,7 +21,8 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
+
 	sed -i -e 's:-Werror::' CMakeLists.txt || die
 	# make sure these libs aren't used
 	rm -rf lzma zlib*
diff --git a/dev-games/physfs/physfs-3.0.0.ebuild b/dev-games/physfs/physfs-3.0.0.ebuild
index 6c6a34f418d9..4b0afd2bd59b 100644
--- a/dev-games/physfs/physfs-3.0.0.ebuild
+++ b/dev-games/physfs/physfs-3.0.0.ebuild
@@ -19,7 +19,8 @@ DEPEND=""
 DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
+
 	sed -i -e 's:-Werror::' CMakeLists.txt || die
 	# make sure these libs aren't used
 	rm -rf lzma zlib*
diff --git a/dev-games/physfs/physfs-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild
index 27e3aeb6c956..a3cfee4fd576 100644
--- a/dev-games/physfs/physfs-9999.ebuild
+++ b/dev-games/physfs/physfs-9999.ebuild
@@ -24,7 +24,8 @@ DEPEND=""
 DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
+
 	sed -i -e 's:-Werror::' CMakeLists.txt || die
 	# make sure these libs aren't used
 	rm -rf lzma zlib*