gentoo resync : 11.02.2018

3 files changed, 6 insertions, 58 deletions

diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 255f500c3618..42a0eb61e1ca 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 EBUILD qtnetwork-5.7.1.ebuild 1168 BLAKE2B 09b253aa055853e7a88ee0bf57a0a97b6cc7cbfa2b55f30a751c819a7be8b539f68aebe44e45bb3a85c03ebc9cc569bd0f4ecd45928da057e4e0b01223d16e0c SHA512 0d7d306fbc0dd47d697709e738a7f65f478d1fe2213aae5e5054151aedb1c2e8b0f1de2a40b1f19087d57cc98b84418b8e9df6f491af31742ab637f9ce9b53fe
-EBUILD qtnetwork-5.9.3.ebuild 1174 BLAKE2B ed1b4997679c2954ed321965304b71f7358786ea676d7cdccddef4ecdc63dda6481f834034580258778f1bf9ab2b55e639739306390e1029ade04dc79ff6457f SHA512 9180653e11c99762a603e601475a8bb8acd343a7e8183f9c3e0909cec04f82495d34daa201a2d14de05a88ce64aa9a5d56b57469a6bd7a72a4ed125bef9c46df
-EBUILD qtnetwork-5.9.4.ebuild 1215 BLAKE2B 97f34d3ec1b3c4c7b41763bc9d5c8d22fd57b26acf323a92b5bba22120bc7d593e206a9b8c8ca778ea11ab97b65b79b75d4cff3322d52da93d7c532f389c2ee7 SHA512 8fde1bbda8c9d705695f7f5768c92de5d4328ba15e362f596ae87733a92d13ef6434ad500a84902560c37ddfa93240c28ee728f6fe6059440c33e163b555c478
+EBUILD qtnetwork-5.9.4.ebuild 1279 BLAKE2B f6affc1078e11d03a26ee14f419a3b1ca3f6a30ea4cd03ddd3b964717fcf5ad496f488682c0ca1fd62e005ca5bac7ba96959df38eaea19c57d2937eef50f7e2a SHA512 23ae9457ac3ddd0327f964e777bff6688b6694c98216c2ec5cc529ba0078c9ba77a98dcbd9d3105b304c329c3f3c16e0b10c56aaf4afb3ca4ca0d19092d67e9b
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild
deleted file mode 100644
index 48c13b15cd29..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.9.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="bindist connman libproxy networkmanager +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-libs/zlib-1.2.5
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	ssl? ( dev-libs/openssl:0=[bindist=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager && echo -dbus-linked)
-		$(qt_use libproxy)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
index 3cb593402d37..94849a21a390 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="bindist connman libproxy networkmanager +ssl"
+IUSE="bindist connman libproxy libressl networkmanager +ssl"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
@@ -19,7 +19,10 @@ DEPEND="
 	connman? ( ~dev-qt/qtdbus-${PV} )
 	libproxy? ( net-libs/libproxy )
 	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	ssl? ( dev-libs/openssl:0=[bindist=] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 RDEPEND="${DEPEND}
 	connman? ( net-misc/connman )