gentoo resync : 17.10.2017

4 files changed, 11 insertions, 9 deletions

diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index df4a22ae3b4b..c429fc112156 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -2,9 +2,9 @@ AUX libsfml-2.2-no-docs.patch 432 SHA256 7e31edbe092460b564c04882af42a6e7173dc01
 DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83
 DIST libsfml-2.4.1.tar.gz 24573418 SHA256 f9d1191b02e2df1cbe296601eee20bdf56d98fb69d49fde27c6ca789eb57398e SHA512 50b2bdd914faccb9e44409f7a3b20909efef034be15e298c34710eafc52b36494272e4f5f9c882516fa1312c2e2ff3ebff0dd5246f193724ea6bc5be9ef8530f WHIRLPOOL 2528c1906c085f9b574414476f3f5ec5a85bc358c57dc47b91fe4c8a5398a771893825a6ad1671f8fb144a6f13634bfa5f186a2b34b58e1e405eac25677b71ca
 DIST libsfml-2.4.2.tar.gz 24576150 SHA256 cf268fb487e4048c85e5b2f53d62596854762c98cba1c1b61ccd91f78253ef4b SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972 WHIRLPOOL 6ea18fae58ab90235158abffc1492eccbdd8f8173a6c5ea3a55b447a47d75ecc53a4615996fff16f9e826e417a7d0028cf9366aed6913aec5fbc5d9c592054de
-EBUILD libsfml-2.3.2-r1.ebuild 1415 SHA256 c54c2f27a03f34068e8fb8065b6861bcc3d251957c15bc5804c7de6cb95e96b1 SHA512 96c993a60547a9ddeeb7d53d70edcef240b22bcd301800d981b4589cccc63da56a3083bd00db44012a4fa946322af73cef27c497f68dcf0cc8f34c7b456d3f33 WHIRLPOOL 24daab48860558c6d20e9b730b33cab6ec79f74ca987b36f250b8193620b794d29c0f87d85e752d0fe22c6e8021e04876c7a685a3bd509f62ad2d81a9b9559b5
-EBUILD libsfml-2.4.1.ebuild 1469 SHA256 e790f21834c5ec97c6260a8f57f008ba7aed5c244f20635c60a5e1f302278e2e SHA512 95e2eea29b7f8ff3a309368ed61c5f58416d5d986cb94d29869155955a84ba3dac84ff0fb3c52c9b22461fab79852a36611e9b3fffa2f91a5cd40553042ad4f5 WHIRLPOOL 2dd4907dbbedbf1f601442c8887079f72ca9bb580fdaa078391f3d8362b67afcdeb2c4df4d46cf820128edc04a6580bc5744b4b73b6dfde5baa334126e362d36
-EBUILD libsfml-2.4.2.ebuild 1474 SHA256 01636926492cbce237540fd03562bdbe0254f310464fa5d19537f2a06d2c745f SHA512 7a3536e6d5e99ff1741171c20ffb6319cd581e81d85e3c08d4df9363540de456c04ea27f24847289d438df24b6d8eb48d753d5ceb5258efafc6145e88a5db474 WHIRLPOOL c08e464dfbc49f3fab2dcdbac9e1e72c32c4cbd54b55ca290fa04d639c1919f58bc3af053e3334138af73073a0dfe673445ef9f7668e6101ecbf91ddd43fb9db
+EBUILD libsfml-2.3.2-r1.ebuild 1445 SHA256 90dfb8fd1771900fd54849a80a88bda15def4296750229588819b5648c9d155b SHA512 17fd32d0bfe2cd4e4a1c6d835a15b9551dfcc867d43923457f4388802d4eab818c2aed2a99c8183dde507532f6da47ae6e062859677569e1a0c23a57c2a46862 WHIRLPOOL 203684b942931bf37eeb20748662f57c739217f8b22c067a541e4e4b2364c09363a48ea8ef81a3061f4ad1c0ade5a978587247e7f3832d6226ad0f4c8424b607
+EBUILD libsfml-2.4.1.ebuild 1485 SHA256 7042f4dbb4db273ea43b43a474bc2cdc0375124f19602f9a5bdfe1df3ee22ff5 SHA512 a9085fb18cd0f8e6b96068a0b402cac838246b30b7850bc91ded4edfb6ec94daee75c67a706ff39f342c2b6b1ff2a24c1a7ceb381cc990c1342254560d83826e WHIRLPOOL 397398f60a796667267d2a5eb252cef538e09c83173d3e0ab1515feda28cf21d76cbb72fe051e9a472b672379f8951339b53a20570f53246c132a4ffda6453c0
+EBUILD libsfml-2.4.2.ebuild 1489 SHA256 3704a0883042d6c36fb41a235c7bb180c6764984c65d2e2dc1d2d178d971bcfc SHA512 86ce3db45ab46bc886fc1ac888746f08c1c1db05ef8a69d5f9a11f77a8ff9a114b921aeaac409db990c3ee6e2c4832dce70bd1dc5835a148b30cd766c33319bf WHIRLPOOL 14e3a38421b7135bd58b541f12729f09255f2e274d81e5ddd3db9f869bff3a786070196d2507372f6f41cde0ffeec7cc22608f29bc87bb3449124ea1656af689
 MISC ChangeLog 4688 SHA256 5dfe3f7a8cd794c3821da216582fee277ebf5bbebdabd9594c2c38368efc46ee SHA512 64a0589b8e8c839e1a7ef6562fa754207008e5bbce9effe1f193d2277b523848128a8e6d1e56f5d07d05188d290f082376a6dd85b6b8953255d44baa643c0392 WHIRLPOOL 1869c0ad431c2ee5694fb1603a0af383bdce9313557fa6229d9e5528342772f69e7e5e333b583cc6cf6b227a59fdf93468663ffeb8180528883e3d945ef946ff
 MISC ChangeLog-2015 3190 SHA256 0965333a651fad50fad3ea065db1e28310b9ba047cc20a795ebdbb73afcf8f2e SHA512 cc1260188ec705124f5cb941b0f5d97f8a17a2ab3703b42ca14c8d513a413f5b9760839912c5314539c6412e05f3aa763540df6cb7f37e68d184706287217cb6 WHIRLPOOL 4a5388bd46f88b2ee6ba441ceaac80e09622d37148036cf9a87ca9a5d8d7766513aee78d36e74a8dc9db391073d3489ebcf246576dd5eb14b4c8a6d19defec5a
 MISC metadata.xml 732 SHA256 f883cb17a205bee93220040a2bfb7ffde8dddaddac7331744317c841fd41fdd9 SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2 WHIRLPOOL 0413c6b22a359df2f315f4113bcde335e067ebb22ec2a223479ff9a3d5239e3fc7cabb1bbf80c52ca3b62152b6c14469e2e23010f1102a7f347c27fe28fc0d5d
diff --git a/media-libs/libsfml/libsfml-2.3.2-r1.ebuild b/media-libs/libsfml/libsfml-2.3.2-r1.ebuild
index 3a3d39abe39b..ab1db567cd3c 100644
--- a/media-libs/libsfml/libsfml-2.3.2-r1.ebuild
+++ b/media-libs/libsfml/libsfml-2.3.2-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
@@ -38,8 +38,10 @@ DOCS="changelog.txt readme.txt"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2-no-docs.patch
+	cmake-utils_src_prepare
 
 	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
 		doc/CMakeLists.txt || die
diff --git a/media-libs/libsfml/libsfml-2.4.1.ebuild b/media-libs/libsfml/libsfml-2.4.1.ebuild
index fe2e6ac0c094..01bb090a4a65 100644
--- a/media-libs/libsfml/libsfml-2.4.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.4.1.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
@@ -44,7 +44,7 @@ src_prepare() {
 	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
 		doc/CMakeLists.txt || die
 
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/media-libs/libsfml/libsfml-2.4.2.ebuild b/media-libs/libsfml/libsfml-2.4.2.ebuild
index 9ea02efc173b..b27433df7bd9 100644
--- a/media-libs/libsfml/libsfml-2.4.2.ebuild
+++ b/media-libs/libsfml/libsfml-2.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug doc examples"
 
 RDEPEND="
@@ -48,7 +48,7 @@ src_prepare() {
 	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
 		doc/CMakeLists.txt || die
 
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {