gentoo resync : 17.10.2017

3 files changed, 10 insertions, 6 deletions

diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index 677d94c5f502..ada58966df23 100644
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -1,7 +1,7 @@
 AUX polarssl-1.3.9-respect-cflags.patch 619 SHA256 8b494d78d13504b56f345ba39f9dc7fef79f97efcd72ae8b40ffa087425828be SHA512 1dc7d7ea34b95c379b8d035497b8975c0de8befadb8f918021bafa726e11ecab83f9aed1d9e295c03c4b50e1cd12efb0956322b82ac6413222a30a5079fc6cea WHIRLPOOL e739a3a0e6330931caf0b522312c2d47ee5c0647de7ac1151aea004251937ce6bc302fb0360c2c49c516af88fd9811d50ba60f75bf04ea5c904614196925fcbb
 DIST polarssl-1.3.9-gpl.tgz 1741396 SHA256 d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755 SHA512 e8958f834fd80ac996ac58152a0a5d4e31449e8b7b79ee6daac6f45bed60c5c5ad31f84b211d5e36ad0d6c82a742841e986a738735af048c286bce0e8fe4d62d WHIRLPOOL 21f27e50a8563df18c9b27a595da47715b1f04114d900dee2dfac3de51db58e4094da680a44007cf9f02fcc30689bca02d79a957509d1715dce1673d7713fa93
-EBUILD polarssl-1.3.9-r1.ebuild 2503 SHA256 a54fd5918f3d13cd80ca789f7e9a9d2268f0007b3228cde9dddd3394d1806061 SHA512 ed2fb511fbb1c6e63d7fe9cbf87753d6371282bdce0df889356d278d65c163c666a6192674199cce9c2b118f60bfaee2b2cf4d33b51bd6ffcaf08e0f0226da14 WHIRLPOOL 08d37832d486dfb0ffbc522ba33af74225fe2e5cb7dce9c522ae7a1a3861d55622680cdbb45b286a8a4bcdd7ad37df40292a3c18c33fd5941019290a8acedf64
-EBUILD polarssl-1.3.9.ebuild 2434 SHA256 561cc045be945364bda5daa8401f3f0b703d3f7d2456668c44f35d7356f9e204 SHA512 6b63b637ca5386749180730634bf4748d8ec9c75b260a5498596a6ca654e80805d7033e95b8d45952f2265bcbdabe78ebb1555330e46a8bf527bb5cae78c8527 WHIRLPOOL a3ec4b20b95bc5f21af7d91c8cb07d61d1e038ab6a777456ab1c5183d5a41d173ed580a0bd0d2b2fcfc09d131037302dcfb42e633943da6ff77489335444f449
+EBUILD polarssl-1.3.9-r1.ebuild 2533 SHA256 fa5dd7a42bab3764da09755bb4f469049902e361717994b624e27c9ccbdff340 SHA512 99ba3357af30f58f312d009e90f0c5593326483fc1ecb8ef0ef7e744526a6c4831ab6f38ab44baf89d991e99d57f600e20cd9bf53684c5766cb73cccde8cb2eb WHIRLPOOL 50c4ed24ab4a748061cc41d788607b2c801fb09e8b5ebe8ec493576ad7ed206a8172f8639cdef2c1ef75c9baa732635c301b3784f2fff4b649a58e0fcd22d42d
+EBUILD polarssl-1.3.9.ebuild 2464 SHA256 506f2742abf2f5ca137f3176a04e5ba545d2299c17fb3548b654bc536f3fa78c SHA512 35f4f764b2786babea5e76beab7d9d592d2d3516cefc0bacf1bd3fd839492a34facb7b00ec4ac2534d2af032859343f5448fb55ddedbfddd7a398422e74f35d8 WHIRLPOOL 5dd17c48a3bcff97e53ecdc9bfed6785b781b5b817914bbce54ede1e4d467279e7010188a9187e0836f80e1580c22c18abea6be1b659dbb52181422f852ab0dd
 MISC ChangeLog 4186 SHA256 9060dae254ed0e1572d3e713d6ce6f045674c64beb7cadeefee2661ca447c295 SHA512 61a18dd5bd880a455df8b19c86a5b7525352f5b13f329844c09400997a21ebacf2a07c182fcedd692454849f5354fad7a84184676cb76345915c21a612df8e0e WHIRLPOOL c39dbee48f9c74aa9dd6bc5fee3c39819e787095d3ecd059bfeb44425e8b44c1a4e4da938cec018640b35318f1c36537c2320929223b6208c31220119b227092
 MISC ChangeLog-2015 12426 SHA256 b089206f7b85970545bb20a12bbf45ebe91e9c7265ceaf3159077313d0442164 SHA512 1ab51ceac0d09efb6c9b89482ca54f02b2cd46a4bb3e3c7f0ec8b5cbac4b17f60abdfea07077a3abb537eebc6954750f7635cafd00760cd9ccc888d6913ba786 WHIRLPOOL e3690e06100bc36a455bb8a4a93c49aebf8ed26b207e216c1252134b1a41969055ca798698475fdd5a70c96d2f708a45136a390c3e111ce18c75dcc464845d35
 MISC metadata.xml 633 SHA256 5b0902a9b09cf40880365c57cba7b6bdf2118d2984ff69be96ea035b1d40540d SHA512 57018df16efca7e15c3836d744d4276bea309816dd9c345467c280d737284a45c3c4828b8dc93013d284d5f2b153ec01d4a0deed5df130c782d71d0e0553d4ab WHIRLPOOL ea3396b54474a083776784a94551e7c3bbb173f4cead0a0b02fe18e41759d0a565dd980040190b8abd5bb17ec0eb2ce5e68e41f08055149e7f5f46b552e371a2
diff --git a/net-libs/polarssl/polarssl-1.3.9-r1.ebuild b/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
index a8b641680e7f..01f8abbeec11 100644
--- a/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9-r1.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
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen media-gfx/graphviz )
 	test? ( dev-lang/perl )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch )
+
 enable_polarssl_option() {
 	local myopt="$@"
 	# check that config.h syntax is the same at version bump
@@ -39,7 +41,7 @@ src_prepare() {
 	use threads && enable_polarssl_option POLARSSL_THREADING_C
 	use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
 
-	epatch "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild b/net-libs/polarssl/polarssl-1.3.9.ebuild
index 1e9b0680450e..6dce83e4878f 100644
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9.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
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen media-gfx/graphviz )
 	test? ( dev-lang/perl )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch )
+
 enable_polarssl_option() {
 	local myopt="$@"
 	# check that config.h syntax is the same at version bump
@@ -36,7 +38,7 @@ src_prepare() {
 	use threads && enable_polarssl_option POLARSSL_THREADING_C
 	use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
 
-	epatch "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {