gentoo resync : 22.10.2018

5 files changed, 15 insertions, 116 deletions

diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index c24bd9aa7a5f..78695d9e4c83 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,8 +1,7 @@
-AUX user-manager-5.12.5-fix-addAccountToCache.patch 3634 BLAKE2B 13a41b87627fbbd81dd1a3ed7083df5843a100f26ee1bd3576d98e8a61fd33df717cb1aebaf91bf49b3058089f73dc7e18ebe0ea411a42d7a8a44862df3efc8e SHA512 a0d04f03f76fab413d1f721453c996c3f88bb571eeeffe57ac85870d29447766b6ea66bbd5928b97355022778b5c74ba95021cc886c38b3911c788e3ad5661d4
-DIST user-manager-5.12.5.tar.xz 544812 BLAKE2B e885a9be4ecbedb04ea0b957606a3b8d91cf0b0b71f5efe7fd68c29d3c577dd1c2394653dbe5948f40f74f8e2f478a2feb38d05003de762ae1e88eafae7f5932 SHA512 c553287b20d0d25c79972b2de375696c8759026a4f8d2203c3f2e9b547461bd93e27a5e14a5584ccb045a25ac107bc875dbe105e97d59aefdd588406a41c515e
 DIST user-manager-5.12.7.tar.xz 545748 BLAKE2B 3cf734475de842f3fce0a7760495336dd14f21fd2bea72ebf24992e29a7051bd2c2d2235582d8fa4b3a13f9e2852452fc56f2b1931da78fc231065c5ab445fc6 SHA512 286b4adc7ff01c25f1f32bc64e9f119aa693d74e0468e575c792d5357df6066c18de233eb78acd5ed4288518902461ffa7408af8d559e8b5f4081893bdec7f8f
 DIST user-manager-5.13.5.tar.xz 545008 BLAKE2B 47a2e5cf4e2ee26f7337ab89716519ab248422b686be1acaf75306d44044bdbd931b4d032057a10a243fa12e237cc1dae5aaaeba57012b7e09d048c5ec0a1ca2 SHA512 e18902843b7b6079ad712996cc90850c2e662c710b67e1d54dbec7db9194b1c7c640b6ced0bdf51c1f0974ba24edbff691cad347689e202e4478681a194e5172
-EBUILD user-manager-5.12.5-r1.ebuild 728 BLAKE2B 2e699e57889c2585febcea22bfb5c340962dc58ef5ca0af9b8ea5b19d17b3319bce2bb0eb2177d6aada3b7bc21c134a051f09c1a1de80932831c788c5c5adfb3 SHA512 35d5158acde94e6277c18eb3f022b074eb4835f33e119ce63cfd435129cd17014afe673b02a41b3ebab102908cbfa2c29857e9e63733aa75ca2d3ee81360453d
-EBUILD user-manager-5.12.7.ebuild 667 BLAKE2B db3b77457a64a8f3f505899de3847cb67af86f709a4ba8c60dd0765213e098e46cbf200e77cf5de670efc8dffde5283e1eaa7123e0b82657bc15210fc816c6b4 SHA512 8b45bf3cb0c871948f60cbc2f29d79d7b2db897e5ecbcd684dec62a63b7e05b05270578e3abce4db77186e3f180b5b24ef0587812a5fb0f719bfb9c071e9ea37
-EBUILD user-manager-5.13.5.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
+DIST user-manager-5.14.1.tar.xz 546200 BLAKE2B 25719d67396211633fa2266755f8ac9b9c09da45e29b6e969676baf577962cb7787f9e724977113a11dc5319ea94d8e867f703991784aa0b15b32a5a478ffe3f SHA512 6687ec4c7dd56e15b4b7dcdc8d9545310af6381f6ccb7e2eb2302adc09563286c0697c4d23e2013262ce143e5e88f2ef37dc12cd7ab8634918acc3eccd22549c
+EBUILD user-manager-5.12.7-r1.ebuild 694 BLAKE2B cef454ae8c7eb463fe520f948942285a3b70975a52b8998161dc909a5a06c74f39934f61af6d3f281a336d6ed2dd6bec518b73a4cc924ecd7c084ab45175514f SHA512 9695f473e4edd249011aab1bbfbb5408dc7dca38aa976ec0336d58d762bc857abcf943effda7161860346e2662cd4e03d7dec4ffb3f5cf60a7ad803952df18ae
+EBUILD user-manager-5.13.5-r1.ebuild 692 BLAKE2B 0a36109e441fc42c07a4046b08afc65a25db0f2b2f47c62b3b4a87ab15d412818ce18777d36adfa1498b99fd83f9461f1ad467b4aeb692f1f7206ff539786b74 SHA512 9926be5b944b20a4cc7a04ac9a39e0788b1a17cfeee0efe4d6d7eb0b1a803ea90292b5f58a0b5c29b4dc1b795828f548e0eb43a7a117322fca4da5c7313aa895
+EBUILD user-manager-5.14.1.ebuild 694 BLAKE2B cef454ae8c7eb463fe520f948942285a3b70975a52b8998161dc909a5a06c74f39934f61af6d3f281a336d6ed2dd6bec518b73a4cc924ecd7c084ab45175514f SHA512 9695f473e4edd249011aab1bbfbb5408dc7dca38aa976ec0336d58d762bc857abcf943effda7161860346e2662cd4e03d7dec4ffb3f5cf60a7ad803952df18ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch b/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch
deleted file mode 100644
index bc823adf8c9d..000000000000
--- a/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From ff88e24e4380a341f70f9b005acbce2ae9afa60a Mon Sep 17 00:00:00 2001
-From: Valeriy Malov <jazzvoid@gmail.com>
-Date: Sat, 12 May 2018 18:13:25 +0300
-Subject: Split replaceAccount from addAccountToCache
-
-Summary:
-We were accidentally overwriting first account in the model with
-currently logged in user after polling AccountsService
-
-BUG: 336994
-
-Test Plan: check if kcmshell5 user_manager lists mutliple users on cold boot
-
-Reviewers: #plasma, davidedmundson
-
-Reviewed By: #plasma, davidedmundson
-
-Subscribers: davidedmundson, ngraham, rdieter, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D12837
----
- src/lib/accountmodel.cpp | 26 ++++++++++++++++----------
- src/lib/accountmodel.h   |  1 +
- 2 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/src/lib/accountmodel.cpp b/src/lib/accountmodel.cpp
-index 8ebc4ff..8258810 100644
---- a/src/lib/accountmodel.cpp
-+++ b/src/lib/accountmodel.cpp
-@@ -93,8 +93,8 @@ AccountModel::AccountModel(QObject* parent)
-         addAccount(path.path());
-     }
- 
--    //Adding fake "new user" directly into cache
--    addAccountToCache("new-user", 0);
-+    // Adding fake "new user" directly into cache
-+    addAccountToCache("new-user", nullptr);
- 
-     m_kEmailSettings.setProfile(m_kEmailSettings.defaultProfileName());
- 
-@@ -368,11 +368,7 @@ void AccountModel::addAccount(const QString& path)
- void AccountModel::addAccountToCache(const QString& path, Account* acc, int pos)
- {
-     if (pos > -1) {
--        if (m_userPath.count() > 0) {
--            m_userPath.replace(pos, path);
--        } else {
--            m_userPath.insert(pos, path);
--        }
-+        m_userPath.insert(pos, path);
-     } else {
-         m_userPath.append(path);
-     }
-@@ -381,6 +377,16 @@ void AccountModel::addAccountToCache(const QString& path, Account* acc, int pos)
-     m_loggedAccounts[path] = false;
- }
- 
-+void AccountModel::replaceAccount(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos)
-+{
-+    if (pos >= m_userPath.size() || pos < 0) {
-+        return;
-+    }
-+    m_userPath.replace(pos, path);
-+
-+    m_users.insert(path, acc);
-+    m_loggedAccounts[path] = false;
-+}
- 
- void AccountModel::removeAccount(const QString& path)
- {
-@@ -429,13 +435,13 @@ void AccountModel::UserAdded(const QDBusObjectPath& dbusPath)
-     }
-     connect(acc, SIGNAL(Changed()), SLOT(Changed()));
- 
--    //First, we modify "new-user" to become the new created user
-+    // First, we modify "new-user" to become the new created user
-     int row = rowCount();
--    addAccountToCache(path, acc, row - 1);
-+    replaceAccount(path, acc, row - 1);
-     QModelIndex changedIndex = index(row - 1, 0);
-     emit dataChanged(changedIndex, changedIndex);
- 
--    //Then we add new-user again.
-+    // Then we add new-user again.
-     beginInsertRows(QModelIndex(), row, row);
-     addAccountToCache("new-user", 0);
-     endInsertRows();
-diff --git a/src/lib/accountmodel.h b/src/lib/accountmodel.h
-index b666239..f515613 100644
---- a/src/lib/accountmodel.h
-+++ b/src/lib/accountmodel.h
-@@ -79,6 +79,7 @@ class AccountModel : public QAbstractListModel
-         const QString accountPathForUid(uint uid) const;
-         void addAccount(const QString &path);
-         void addAccountToCache(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos = -1);
-+        void replaceAccount(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos);
-         void removeAccount(const QString &path);
-         bool checkForErrors(QDBusPendingReply <void> reply) const;
-         QString cryptPassword(const QString &password) const;
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/user-manager/user-manager-5.12.7.ebuild b/kde-plasma/user-manager/user-manager-5.12.7-r1.ebuild
index 5e6e28a35fff..69e0ce78d83e 100644
--- a/kde-plasma/user-manager/user-manager-5.12.7.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.12.7-r1.ebuild
@@ -24,4 +24,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-libs/libpwquality-1.3.0
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild b/kde-plasma/user-manager/user-manager-5.13.5-r1.ebuild
index 203763e4f75f..c20416d347cb 100644
--- a/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.13.5-r1.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
@@ -24,6 +24,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-libs/libpwquality-1.3.0
 "
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-addAccountToCache.patch" )
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/kde-plasma/user-manager/user-manager-5.13.5.ebuild b/kde-plasma/user-manager/user-manager-5.14.1.ebuild
index 55c31690044b..69e0ce78d83e 100644
--- a/kde-plasma/user-manager/user-manager-5.13.5.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.14.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
@@ -24,4 +24,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-libs/libpwquality-1.3.0
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"