gentoo resync : 14.05.2020

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 064bcda4d0a5..9ce9cd902449 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtnetwork-5.13.2.ebuild 1266 BLAKE2B f1ad876153e22e47accb681ab8158a209335676926a6b5c278e3c874616a0fc3086d6fb77f54b1793c5d571ee1aa5306adb0f706a484737762f5601f27d93010 SHA512 bc57eadf4f994deb95e68c3913c9b597764a3c8df4bf756e477f38a9288fb452c7aa6ca061980dcaf580f5ba0ed557bf6b2711405c6e6329302fc06e7f29da00
 EBUILD qtnetwork-5.14.1.ebuild 1306 BLAKE2B d37589fa1ae053eb05d8371563636c06b873119b9b0bb3f186371424cdfb49420a9e1f3b32b0d329307e61b2c91ef531c4d821f914c46009689035fadb2b6c16 SHA512 dd4855a70afa1f21ef95f98f9d8a038d115d2ff106e9b6a136c0a225457e47889116473e3dfe3f26b91ae05c6a0d64d28b68d08d224710948545297a1a66a6bf
-EBUILD qtnetwork-5.14.2.ebuild 1399 BLAKE2B e5c751524fb363914b7e31713cf3e9bd0edea518bf3e0373aee70d23e923258041441bb4aab33a5205f68178177fa747c07b4b6bae8e1e3c4fa7c557d71d5172 SHA512 ff0cf8090d491daa09d7c12376f92dba0bd2aededf4c7aa312aade4e95993773cf802d4f6bceeb72241a33fabe29bd7a9c2fe81d5d06110c67e1146eabbf64db
+EBUILD qtnetwork-5.14.2.ebuild 1397 BLAKE2B a8cbc27b5661382942636bbeba77a83bdf934b4195911cab6f058f72a467bd45d81f26cc654be3ce812e04dcc0297c18fd7399a1995ec20b635022ad9c603ef5 SHA512 f96650d17749081581fd27a104bac82c14ef22597a806bf66e3b596392b3c8e9aeb25b2aa01297b2f52da81811eece2e059ab4d8ac1692a61b5bfc04971f175e
 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
deleted file mode 100644
index 4b97e02f2233..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="bindist connman libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	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: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=(
-		$(usex connman -dbus-linked '')
-		$(qt_use libproxy)
-		$(usex networkmanager -dbus-linked '')
-		$(qt_use sctp)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
index 1e8c4106e03a..4d10e16d3906 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.14.2.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"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"