gentoo resync : 14.05.2020

3 files changed, 14 insertions, 7 deletions

diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index ff4b39df4092..6e1dccbca758 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,7 +1,7 @@
 AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
 AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
 DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
-DIST libwebsockets-4.0.1.tar.gz 12332611 BLAKE2B bc5aaede801b61c389928b41e091a7b84fb24a73a64aa3dc2ba7a1370e146f5c98ede9489ed81fd274884c772de3fa93a9f5b7e3c88be4e28c092a045b7d5e72 SHA512 33eced9690e54106afb63ac58eb25b1eefd7998074d042209c97177f95c14c4aa97c41303918d7b0649863865d85d9579693762b8215df54879621778ffabdf4
+DIST libwebsockets-4.0.7.tar.gz 12337469 BLAKE2B 0ca58050e60afb4fcb349a8035afa629fb2d4645d7413cbaf7f1cf6cae8c5606de2aa72f1dc78778ba00c0fe723dd4aab55cd03c0a96122a1e4ff7d3cdf66644 SHA512 14b2f762db220fd6003d04c05566786b292913bfc71667327b17e8a357f4a7b5b0a09f246fc9ed527f7db106586c567345200120d32428183d39e16ae5a6287e
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.1.ebuild 2153 BLAKE2B 40ba09541f4ace3f8b5bb78f8c554939758cbf443b3e6bdb0be300c47fb2e38d9e8cdcca8a29f1279cef0e5abb1f1c29bb70244c84dff1e03c15fde34eda8a11 SHA512 584389e98a84aab0af30e3e93d2b36e11086115e09dc627ffcf4ffdf1e668ff666d4936ff43f987275b904eb2518329f240db8dac7d007dbf75e85d1d060a15f
-MISC metadata.xml 1828 BLAKE2B 5a0de78137a46817ca3d7388b6841a05b90b9a5cdb7991fdbdff62fa2404049314767dfc12c6575e9217c46027b8e63075c9aa487f764c82875fb1e0beffddd2 SHA512 9f0f17269b446ae8b521d1c50f3f23d19b14b7f261c38e1be57cdcc11bdce107ada5cdcae087136e4ea4bcaec040ac3c7f8423bbbf7c7ec16f3b85b1f1082db1
+EBUILD libwebsockets-4.0.7.ebuild 2309 BLAKE2B 3f0e70cccc43a31cb5e92c49b38307dca75b88b0993ddd237e75777b0666b57931df9e642a6b14538bfb806a392c96bb38717cf89b3627ed39c388e3f1a64739 SHA512 7d7d77884f1c1fa5514e5b98f21902fe3013663d15fcd470520bdbfdfa96c98fa6352c0ea914d3079687f8160bfd2d3c8990c473b5ff55efb9beadfb64d6ca39
+MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.1.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
index 7620aaaa0249..313e5908bc07 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
@@ -11,15 +11,17 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/16" # libwebsockets.so.16
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
-	+lejp libev libevent libressl libuv peer-limits server-status smtp socks5
+	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
 
 REQUIRED_USE="
+	access-log? ( http2 )
 	generic-sessions? ( smtp sqlite3 )
 	http-proxy? ( client )
 	smtp? ( libuv )
+	ssl? ( ?? ( libressl mbedtls ) )
 	?? ( libev libevent )
 "
 
@@ -32,8 +34,10 @@ RDEPEND="
 	libuv? ( dev-libs/libuv:= )
 	sqlite3? ( dev-db/sqlite:= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl?  ( dev-libs/libressl:0= )
+		!libressl? (
+			!mbedtls? ( dev-libs/openssl:0= )
+			mbedtls? ( >net-libs/mbedtls-2.0.0 )
+		)
 	)
 "
 DEPEND="${RDEPEND}"
@@ -44,6 +48,7 @@ PATCHES=(
 )
 
 src_configure() {
+	append-cflags -Wno-error
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
 		-DLWS_HAVE_LIBCAP=$(usex caps)
@@ -61,6 +66,7 @@ src_configure() {
 		-DLWS_WITH_LIBEV=$(usex libev)
 		-DLWS_WITH_LIBEVENT=$(usex libevent)
 		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
 		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
 		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
 		-DLWS_WITH_SMTP=$(usex smtp)
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 6aa0f75c8847..23c9033fcec9 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -28,6 +28,7 @@
 		<flag name="libev">Support event loops via dev-libs/libev</flag>
 		<flag name="libevent">Support event loops via dev-libs/libevent</flag>
 		<flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag>
+		<flag name="mbedtls">Use mbedTLS replacement for OpenSSL</flag>
 		<flag name="peer-limits">Track peers and restrict resources a single peer can allocate</flag>
 		<flag name="server-status">Support json + jscript server monitoring</flag>
 		<flag name="smtp">Provide SMTP support</flag>