gentoo resync : 13.03.2018

4 files changed, 5 insertions, 66 deletions

diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 479c7bc00765..1a63137ef3dc 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,6 +1,5 @@
-AUX networkmanager-qt-add_EAP-PWD.patch 3077 BLAKE2B 5725f8f6b4a2580e50c236b366513e4adf99f46725742ba4716e73f0218457bc29651f2a7ad6c601a881b0582e90fbd754c766c66afb763f404f1e677d9e23f3 SHA512 fe483c7b53a98965e37e1e424dff2582b386aaaa420e95dddfef9619cf7297127714d079b5f4035936c22d7a0b3a0445fd1aada9706b7351e70760a0631c1303
-DIST networkmanager-qt-5.40.0.tar.xz 163456 BLAKE2B c8d0e85f06219ba5d89817c86cd97c493146b5a184f363b5367c93d138d52cb2c4901536afd9950a0c9cb54b1cd4ee9356f614d4573ddc6158da5cff873f99c7 SHA512 6c04dd10c85573fa33d1651aa17afd1f987cade3ec299b1f73c3f6052aaf65aa393aca97e0a22f6434e325e99a9c72c7c6398946c1573be3df57c08905460bac
 DIST networkmanager-qt-5.43.0.tar.xz 163504 BLAKE2B 6c06f3ba40e8402795cbb25560153f3b2ca8252dcdefb5bda1af70f1032bc0d136fc1981ab3cd57f1bdf631ca448fec29dfefbc61a3674a87036144d1717ff9e SHA512 29c4102f3de6eabb18e9afc15f96032153a073bc189a7422b39d405549cc5b206a1519dda15341669b63bb487c60f377cb66a215cbd3345d40def485d0205de4
-EBUILD networkmanager-qt-5.40.0-r1.ebuild 738 BLAKE2B a18a548f08cf2965094300879ca32b62a024db5797cf8306fcc6fea6cdd122065feabc3eedb72e9a1d9545a4a6a239911e959231c30aa6e01a009c8a5696345f SHA512 652f60e7a849bc413c1e8469aaa3e65b5761986bce3d921a9def195f7b02c0c3dc8e1e5545ef03f8e0df54b7117d9e6e7a5b78940856cf2d8da312e910593e92
-EBUILD networkmanager-qt-5.43.0.ebuild 689 BLAKE2B 381d4293e75c7f90ab393154bd6222ef1a8c66d1a22be892dd511320ca7a6e87aed918d65cab3890ed06397c0d8a9954e9fb8020bc745b6710d9748d962b8ce7 SHA512 64742eb2066a71672b057ae0fe0a57e1de27c6736ed25cc05395947ac8df69d2c8469df4b343de1219a71309f0bb4a41135d6e0f80ce2bd73553bc39eee53d68
+DIST networkmanager-qt-5.44.0.tar.xz 163508 BLAKE2B 980e368512d325d5bf252a938840e3712620407d039b31fec68df25f12e452347b7f195297ca0ab331f366df6b14b3ecfaf39bae43b312d0a404e6c0856813ff SHA512 926ece0d7e869613bc78cb71c915ad8b1573b4111ab38377dee9c196ba31422a95311819c36aa4e14b42590fcc628141d5ee8d1e025f56c57da5e5b48f438725
+EBUILD networkmanager-qt-5.43.0.ebuild 687 BLAKE2B ba61c5b558e83835697e5db9440b5f844333abdbd43ab3e37d312fa852149fa55709b79152772fdd731d61649093cf2ec9cd44bfda245093f27705ad7c486e80 SHA512 06150a496c4eb0d58a022030d4e89c24d0f35b968b1b4e78c662269fb90b25b56e68ccb7e324785d15d64670d507a14be202354cd73770331504cc0922194688
+EBUILD networkmanager-qt-5.44.0.ebuild 689 BLAKE2B 381d4293e75c7f90ab393154bd6222ef1a8c66d1a22be892dd511320ca7a6e87aed918d65cab3890ed06397c0d8a9954e9fb8020bc745b6710d9748d962b8ce7 SHA512 64742eb2066a71672b057ae0fe0a57e1de27c6736ed25cc05395947ac8df69d2c8469df4b343de1219a71309f0bb4a41135d6e0f80ce2bd73553bc39eee53d68
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch b/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch
deleted file mode 100644
index adba0ed461cc..000000000000
--- a/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f185da94f628e4384607703928e26fcf2f34fa7a Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Mon, 11 Dec 2017 14:24:14 +0100
-Subject: 802-11-x: support for PWD EAP method
-
----
- src/settings/security8021xsetting.cpp | 7 ++++++-
- src/settings/security8021xsetting.h   | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/settings/security8021xsetting.cpp b/src/settings/security8021xsetting.cpp
-index 0fc9bde..38323b0 100644
---- a/src/settings/security8021xsetting.cpp
-+++ b/src/settings/security8021xsetting.cpp
-@@ -569,7 +569,8 @@ QStringList NetworkManager::Security8021xSetting::needSecrets(bool requestNew) c
-             !privateKeyPasswordFlags().testFlag(NotRequired)) {
-         secrets << QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
-     } else if ((eapMethods().contains(EapMethodTtls) || eapMethods().contains(EapMethodPeap) ||
--                eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast)) &&
-+                eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast) ||
-+                eapMethods().contains(EapMethodPwd)) &&
-                (password().isEmpty() || requestNew) && !passwordFlags().testFlag(NotRequired)) {
-         secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD);
-         secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW);
-@@ -655,6 +656,8 @@ void NetworkManager::Security8021xSetting::fromMap(const QVariantMap &setting)
-                 eapMethods << EapMethodSim;
-             } else if (method == "fast") {
-                 eapMethods << EapMethodFast;
-+            } else if (method == "pwd") {
-+                eapMethods << EapMethodPwd;
-             }
-         }
- 
-@@ -862,6 +865,8 @@ QVariantMap NetworkManager::Security8021xSetting::toMap() const
-                 methods << "sim";
-             } else if (method == EapMethodFast) {
-                 methods << "fast";
-+            } else if (method == EapMethodPwd) {
-+                methods << "pwd";
-             }
-         }
- 
-diff --git a/src/settings/security8021xsetting.h b/src/settings/security8021xsetting.h
-index 8b1f5a3..5289771 100644
---- a/src/settings/security8021xsetting.h
-+++ b/src/settings/security8021xsetting.h
-@@ -37,7 +37,7 @@ class NETWORKMANAGERQT_EXPORT Security8021xSetting : public Setting
- public:
-     typedef QSharedPointer<Security8021xSetting> Ptr;
-     typedef QList<Ptr> List;
--    enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast};
-+    enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast, EapMethodPwd};
-     enum PeapVersion {PeapVersionUnknown = -1, PeapVersionZero, PeapVersionOne};
-     enum PeapLabel {PeapLabelUnknown = 0, PeapLabelForce};
-     enum FastProvisioning {FastProvisioningUnknown = -1, FastProvisioningDisabled, FastProvisioningAllowUnauthenticated, FastProvisioningAllowAuthenticated, FastProvisioningAllowBoth};
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
index 4bcf5b7443f8..aeb639341a59 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="teamd"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.40.0-r1.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.44.0.ebuild
index c0ec2aecc0f9..4bcf5b7443f8 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.40.0-r1.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.44.0.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="teamd"
 
 COMMON_DEPEND="
@@ -26,8 +26,6 @@ RDEPEND="${COMMON_DEPEND}
 	!net-libs/libnm-qt:5
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
-
 src_test() {
 	# bug: 625276
 	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )