gentoo resync : 28.04.2019

5 files changed, 18 insertions, 24 deletions

diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 01b9f5bcfe85..5c91ffd40c2e 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -3,8 +3,8 @@ DIST libwebsockets-1.7.9.tar.gz 2915358 BLAKE2B 07aad4ab716212924177aa76233d743d
 DIST libwebsockets-2.0.2.tar.gz 2998585 BLAKE2B 0eaf2301abf9a0e47bd865b6e653f3ea23f3b00d4c6da785a8bd871f3ca729dc43152cad10aeaa9a3cd360aeecd0be87e434102e91e0eeaa6b1865031310a362 SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a
 DIST libwebsockets-2.1.1.tar.gz 3769593 BLAKE2B 8d3aaa0a844925fb927fffaf0d11ba1bdbd013db8a680ce4b85cd5d951219598288fa0f2b97ec22bc00ef879586cb5c2c076b774f3411cb6d8ca553e66fb90e2 SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683
 DIST libwebsockets-2.4.2.tar.gz 3777160 BLAKE2B 6aedc0d340e9e03745309cd1a9674b6c7e84ebdbd5232a265c7a4e0deb612665982353c3ba973b58a835b1747448d415a3625ed044973212b5a897b221d73106 SHA512 7bee49f6763ff3ab7861fcda25af8d80f6757c56e197ea42be53e0b2480969eee73de3aee5198f5ff06fd1cb8ab2be4c6495243e83cd0acc235b0da83b2353d1
-EBUILD libwebsockets-1.7.9.ebuild 1190 BLAKE2B c13f3292d000ca410dc8007f9e31e833780e26ded88d6a20818eecc7d0c5783da741ec69d78ba712cf7ff0fe9f244027672411318cf6c4419328f3af22953b13 SHA512 ae405094c922c0004a2b5f312b8a8c0c8b7674208bdb89b969643ba0444624ade3bbb5a8264c1c58c955e320ddb60ca6b06f0d6ab1a823e12bf1e8a8890c8afa
-EBUILD libwebsockets-2.0.2.ebuild 1191 BLAKE2B 786470eb779e4dc27bf18edb1d53940bfde004b6661e2d07d43c16edbdc30c53e60e15e6a425cfeaa443a727fe8a76607c361a3d54d3f900d23409bbe54bba6c SHA512 8f4c590d1a9c72d752190dbfb8e4e9a99f940851ea52e3ef2e1959a981a03169409d71c38e3adda3284d554bf7126342984f1861844d9f762227bdd7c7611d8b
-EBUILD libwebsockets-2.1.1.ebuild 1864 BLAKE2B c3002a67df06bff1d6f9459103557e336b701139ab165137638052c382b771af75f4cb347e9e9ff9bd2c10e1b5ba8c7f52feeec50a1ce7e69ab281dfdba2ff32 SHA512 ce55d4465133c73062ebb2fdcd28e58b277da6f099f3c020d1921e66dac3b64838ada69eb6ce5b6b3d8a4551e8d714600cf1d5d42a348096d1d8b5de7b3b4d99
-EBUILD libwebsockets-2.4.2.ebuild 2143 BLAKE2B f6f3dbbbec4e227305552552239438dc1c0f14048c69046d3580e5d90079466fca692b9e2c5f90f2fa362d88019f5550e7aba0040ab25e1d4859dbd612a0b488 SHA512 07729c4069c8a70f207b16a1076caa6c5512601a4a1e319c4dd989ddd674da2fb356ec2cc30f136b5009c79ca6ff47238426cf80322d668d1edd781e9e646261
+EBUILD libwebsockets-1.7.9.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
+EBUILD libwebsockets-2.0.2.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
+EBUILD libwebsockets-2.1.1.ebuild 1841 BLAKE2B c79cdc197d2800a7924cfa134269e1d679c0f6df185f83de157b1211a55e01d0a4cb05797e74ce8946dcda0b1b7266be030824af6fe136aedb89fd21e1535cac SHA512 5561f0c233aad102971bc9d4e626178771b349543bca91e816eace0502672e2e8edcd71e26b9791f657d2f9864b93f5aadcd63f18057ec632d939354d475f191
+EBUILD libwebsockets-2.4.2.ebuild 2120 BLAKE2B 2276db115471732eb30f81cea4fb54aa01fd0f2202c41d1b26234d9468988eca8f376ea3bac3ea105133b56a1b7ef802b9d5ab22de6e107037b1cf2d2d6aaa3a SHA512 4be547c69cfa37ad311270927512d2825facb5ed2fd3aa30498d9301b54fbe05d6138977bdcf2f8fb5672df94ccba2e835757ca6379dadde5bd199fcfe27be2c
 MISC metadata.xml 1829 BLAKE2B f5f9a3e819382eeaf1a024ef53ff6d2c94f34566b4d0220f9a3a289ba5fd55c0d3d3d73d8ac46a9e10b7a5223cce44ebad2048efcf0d896762adfb04c6a2b67c SHA512 b29f893c28c5c27260838b440ae98a42d30291272c2c78aa80f61ea2ba877c29c2bed1bf10e68e59f98c732703c6a975938b7aee04f051cbb775d85cd93e00c2
diff --git a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
index 12fa48d815be..b9bba7e9a999 100644
--- a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,16 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
 
-REQUIRED_USE="libressl? ( ssl )"
-
 RDEPEND="
 	sys-libs/zlib
-	libev?      ( dev-libs/libev )
-	libuv?      ( dev-libs/libuv )
+	libev? ( dev-libs/libev )
+	libuv? ( dev-libs/libuv )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl?  ( dev-libs/libressl:0= )
-		)
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
diff --git a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
index 47332620d0bf..b9bba7e9a999 100644
--- a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,16 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
 
-REQUIRED_USE="libressl? ( ssl  )"
-
 RDEPEND="
 	sys-libs/zlib
-	libev?      ( dev-libs/libev )
-	libuv?      ( dev-libs/libuv )
+	libev? ( dev-libs/libev )
+	libuv? ( dev-libs/libuv )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl?  ( dev-libs/libressl:0= )
-		)
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
index 86151e80cb69..3dcea8a73465 100644
--- a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,6 @@ KEYWORDS="amd64 arm x86"
 IUSE="+http2 +ssl access-log cgi client generic-sessions http-proxy ipv6 lejp libev libressl libuv server-status smtp sqlite3 static-libs"
 
 REQUIRED_USE="
-	libressl? ( ssl )
 	http-proxy? ( client )
 	generic-sessions? ( sqlite3 )
 	generic-sessions? ( smtp )
@@ -31,7 +30,7 @@ RDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl?  ( dev-libs/libressl:0= )
-		)
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
diff --git a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
index dc1e64652689..38798f5926c7 100644
--- a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ IUSE="+http2 +ssl access-log caps cgi client generic-sessions http-proxy ipv6 le
 	libevent libressl libuv peer-limits server-status socks5 smtp sqlite3 static-libs +zip"
 
 REQUIRED_USE="
-	libressl? ( ssl )
 	http-proxy? ( client )
 	generic-sessions? ( sqlite3 )
 	generic-sessions? ( smtp )
@@ -34,7 +33,7 @@ RDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl?  ( dev-libs/libressl:0= )
-		)
+	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl