gentoo resync 08.09.2018

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 2260d08033ac..3fe16f4ade71 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 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.9.4.ebuild 1287 BLAKE2B 970af30659e4e4df96b619d5db6d052d3141c4736ee8e5a6893d72208785f19af48008d5dd614b631429d38d4fb04aef2193093288eee8051b93d97e52bd05b2 SHA512 4e39ee832dba2c0de5210366e59d05b4acd917b67f3d09d5bf8e1f602626edb0f25afaad4f8f2d06ba52fdb0454d461b9d35cd6028e61a63f92df86a8ea7485b
-EBUILD qtnetwork-5.9.6.ebuild 1295 BLAKE2B e72dbd51542821de3a5f2e2e8dd6b90af35ebc5207c5d19c9afcafbf759a8752f29c5c5e653c4740dce5763280991442ad3e66e58dbd63644027a11797c43b5a SHA512 e4ee5876986a7afd7b068d7bb1cb3e7b6ece30958e4984a82dae6548f69557c671051a48ab87639e668378a96f10dc58d2ca8d1d097f08252f7fa49eafc656c9
+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.9.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
deleted file mode 100644
index 3a3a82834ea5..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 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 ~amd64-fbsd"
-fi
-
-IUSE="bindist connman libproxy libressl 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? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-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
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
index c6a76d2e4bf3..c2db4ac2887b 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.6.ebuild
@@ -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 libressl networkmanager +ssl"