gentoo resync : 22.10.2018

3 files changed, 62 insertions, 3 deletions

diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 3fe16f4ade71..07d0b0b0205c 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtnetwork-5.11.1.ebuild 1234 BLAKE2B e8fb412c0ac65ed5863cec2645321592af1dbede3000b50b91a635101fb9db0e79af243423dc7304f2fbf33c1a5cb3faacef7be22cc8df3dd88b7d6b401473f6 SHA512 f8b7076c2d22fa2350ae6d96bd6e643f725088897d1497f36b5576eb4d3abc9c4fc9e26300d28b4b6d7e74e7c27ce80bd6d50b4c167a65a6e5f8a32a676e820d
+EBUILD qtnetwork-5.11.1.ebuild 1229 BLAKE2B 8710186e3865824c3983d5eb1125ed57463a90bef975c64af6951a779d3a2aab4573a3242bde2d339c5f19fe3512333e3ced1fc07ce30a7e3131c9960831f624 SHA512 2a60819284f6645f895666de22b76dd5299efac8b92fa1f4d9553030b93c938f82d37ec9e5a943d124125f1265108133d1aedf77c7315f2c80b08d4c3e8056b1
+EBUILD qtnetwork-5.11.2.ebuild 1231 BLAKE2B e9ca316106941bd7c530220118190cc86970d6c619586df2d6fbd4e98d047c0276635ad860b88b3705c21c94b8fea3e19ed4bdff54c43d34abdc438ce1e3be91 SHA512 c67fc0bbba64519cb71232be5cddb1b5bb1a20520a381f6172aaaa3773d46f0e196e025446116a3a8cac70f6b17cc151d52e22cbad792c9c7952aaf1a687d9fe
 EBUILD qtnetwork-5.9.6.ebuild 1294 BLAKE2B f915e4805388cfa15d08d01b8015d0ba839d66978679c2f43d36bddbaac8bad8dd80f30ae8d9f5649d608fa83fc2ae116537f5be0ef2def920941041dcd66f0e SHA512 6a10aac3ce86fd5ba78378e1b2c190b68aaad9842266666ceace907ebf7260080215498baaa15ff6b7a4a854884f2c584d2592b9734a039bff4a8de5b049696a
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
index b88634d343fd..28b505bc74ba 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy networkmanager +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild
new file mode 100644
index 000000000000..d462c11f736f
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ~sparc ~x86 ~amd64-fbsd"
+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
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+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
+}