gentoo Easter resync : 12.04.2020

5 files changed, 14 insertions, 11 deletions

diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 3fa7e412673d..064bcda4d0a5 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,7 @@
-DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 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
-EBUILD qtnetwork-5.12.3.ebuild 1266 BLAKE2B 9a89cc38e5a5232115b8a279203929565c073e395044d94b65d5ec25c25afe38703a3a4429ccad31371529e5693d1b1b2e9f02e684cb05c5e0965339d5c24c2f SHA512 5a36e799173fc63c71b751fd81ed8f801a2167986ea9a5f8512ec904ccedc8f357ca8c362b200107a4cbd0d5fa89edc20139dad3d3ca4ef96f4c1c89f42fb63e
-EBUILD qtnetwork-5.13.2.ebuild 1306 BLAKE2B daad6c9e76243a5b964fc8aeb8ea476c82d5d7edd096d4d7ed16fe5240ce417bfa7a50f19345d728dcec2feba83d6252409415b1ab0baf7bc3c7473327e22678 SHA512 0f9030be11cba5333370ae2c78ac3513667497c0333feec046d2a0693642945aab85ba2253a2d38810e2ca95f8b056d85884b901ab320757027c8fbd7bb555ee
-EBUILD qtnetwork-5.14.1.ebuild 1311 BLAKE2B 3aa1670f27cf31d63665ae1a95a0697e1a325d795f0b4beba32d38c446c95aace0ba13c7131157eae75b44d7f6d8e67d166aad7360ad15348694ebf39e0fc37a SHA512 fdba4d755b5eeb36c30e1c2e0e67021b3b641149144bb34ffd9a07e484340f22302f0632f59420cd514b36123e0679b8544273096842745c5686d2691cb5cc2c
-MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
+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
+MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index cc8f0589d94a..19a09a6d744f 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag>
+		<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic
 			HTTP/SOCKS proxy configuration</flag>
 		<flag name="networkmanager">Enable <pkg>net-misc/networkmanager</pkg>-based
diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
index a8a5da57db9d..4b97e02f2233 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.13.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="arm"
 fi
 
 IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild
index 66f05153348a..c041860cc9ea 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.14.1.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 libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
index 17473a4c7e33..1e8c4106e03a 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="bindist connman libproxy networkmanager sctp +ssl"
+IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
+	~dev-qt/qtcore-${PV}:5=
 	sys-libs/zlib:=
 	connman? ( ~dev-qt/qtdbus-${PV} )
+	gssapi? ( virtual/krb5 )
 	libproxy? ( net-libs/libproxy )
 	networkmanager? ( ~dev-qt/qtdbus-${PV} )
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
@@ -51,6 +52,7 @@ pkg_setup() {
 src_configure() {
 	local myconf=(
 		$(usex connman -dbus-linked '')
+		$(usex gssapi -feature-gssapi -no-feature-gssapi)
 		$(qt_use libproxy)
 		$(usex networkmanager -dbus-linked '')
 		$(qt_use sctp)