gentoo resync : 25.08.2020

5 files changed, 22 insertions, 116 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index ec41764c4f9b..1ed7debb6b92 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,7 +1,5 @@
-AUX dolphin-19.12.2-create-new-consistency.patch 2399 BLAKE2B f4f11330e7a7f31085556df24f0cb71f644b8caf21e2871b5bbfa63a922cc0b7fd3268be4c60887cb281c03060e55450515f001790b5b5c6016a833f966e38a6 SHA512 d03e5ddbd428f7b4b1eae1496ae4bbad0985b16ab2f94b63ce09ad0fbf3cf03bd6ad12811b4f88639b29e5bce330d40bffeef0da9098d6b49f42c2974d51ad4d
-AUX dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch 633 BLAKE2B 7a03b7b88ff39adcd342032c3a0d2544d09f844417e1c859fc4deeaef04759f4187e79013d35722ba46f59c61370e07c217839a97a6ebfa1a5e07dffbb8fafc3 SHA512 82a2fdc3d6cbfd2282daeada07358366d02f325c69fa3ff3c75da19fa6d255932ee419bf7ad2c044e09091dc9a72aabcc0fa74fb12d0b9b0d5831df7b6bd5214
-DIST dolphin-19.12.3.tar.xz 4781456 BLAKE2B 310d0ea5e25b5d934bd501ac0c9bed15a4545b6b16299ad138715b6a33f20edd91675af679bb4249fd523fbf5ffe57c12cc1d7691a167e1783648698a533d584 SHA512 d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5
-DIST dolphin-20.04.2.tar.xz 4799692 BLAKE2B e6ac4b8001665b540e2b5920d384ab8da794b4dbda7d611c02d7ec8e2c38060d809eba97d4084fdd89b3eb1f5b5deb9acfd673968afe40fabafd24cad8402b17 SHA512 7896dcbd8a476b4c1c6ff4d6b0696c345aad8fd3611f7dedd9ec412d1bab9579651ce72c3802c83adbde373b9df400116ba785e0c7b4d905b6f79d60a5547802
-EBUILD dolphin-19.12.3-r1.ebuild 3060 BLAKE2B b1e508b9c964d649d55c847e76df740e998d594b7dc1ca33cba16cf9a45eda34171388c5dcec94f75e8333415bd6fe32f9da104bea51ebf71afa9fb9d785570c SHA512 a26725d666832451f3296b4b008545bf3961f4756896d95a0dabb454eb8e40dc32378c0e855a6e800d5e77db35a5eebc429bcc4422870b6e87b278cb362e1f47
-EBUILD dolphin-20.04.2.ebuild 2914 BLAKE2B 6c3e9b6e393db20c6527cb50349c5666fa6582537559f983e5f93a3575518c7456acf73a1aae54da9504ad54f2e1a528d7efdc2931f03208e6491c4030de0e48 SHA512 a3d903cd8a27e379fe2e4e173b8d11a381e68bd1cfaed3a170f6a16475eb4cbf7b1b265135b55019ebe259e0a5d95369dc41b2e66a845aef5a5f04b399db08f0
+DIST dolphin-20.04.3.tar.xz 4798732 BLAKE2B 080fbe7c2a5156623f6558caaa980aa9202e0e0a21330d7b1bc7800d790daa60a6c4c90a9d5806a9330b0d29908bf1ef755d0900560613e137cdd1e80b28fdac SHA512 fc4ad5ff645387d7a058cff42db00d55db8b0cb7793cdc3adbbaff2e8465c469a5ad6040625bfde564e18c25c16ae3962d6eb7ac9618e0ae8783a2fe030fc5ca
+DIST dolphin-20.08.0.tar.xz 5088256 BLAKE2B 0fddb399b77122431d4f29cf2b8965ffe86897bfcf75a4764d5564f70e15121417a3270424366a47cc233470f0206c7dfe46f41090d2015d5ff48b7c219c91b7 SHA512 62bb7c3fc566e2b767ec59fddc0c59d83bd73facf3f73de06441568377ad228db538b6c4597f4133ed8360f7bb7be049ee7122c3cd4681c091b8136b8205c744
+EBUILD dolphin-20.04.3.ebuild 2911 BLAKE2B ad92970a4c937ce2480333d56b4ac90f2104b47a209d542d84eb511d9801422efa0468ee375530dd986d592227d1eeaa021e0fed79a9378460719f695de90025 SHA512 ddb228662b73f51ad71df5b1127b58b9aab11aa9635a8ed56604f1497920e86fa3af521886020f42308ceda5416064caad9b29469bc38e8b23cd9aca2c5c4c11
+EBUILD dolphin-20.08.0.ebuild 2962 BLAKE2B f4681989e295bbd7db3084dd394c229d5b45926c7bd5de607e2929bd0e75ef3d85a195ea6b7f25fb1f0a4a2ee44b0eff15a0771fdd51b2ebb84a4838eef64b57 SHA512 b3f3a946c6cfb4c76ba4b7dec1b1131b1dd9643acd0be420918df8b8db9164ef8df69e09bb87793a2467895d6511faa0b45e7ad6466c3acde7f13d9f923e3333
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.04.2.ebuild b/kde-apps/dolphin/dolphin-20.04.3.ebuild
index c3043b6edbd7..2f316fcb1f78 100644
--- a/kde-apps/dolphin/dolphin-20.04.2.ebuild
+++ b/kde-apps/dolphin/dolphin-20.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,10 +17,15 @@ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities semantic-desktop"
 
 DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -45,17 +50,12 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	media-libs/phonon[qt5(+)]
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	semantic-desktop? (
+		>=kde-apps/baloo-widgets-${PVCUT}:5
 		>=kde-frameworks/baloo-${KFMIN}:5
 		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-		>=kde-apps/baloo-widgets-${PVCUT}:5
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-20.08.0.ebuild
index 0af7ad212f43..0ad3a95417da 100644
--- a/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,10 +17,15 @@ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="activities semantic-desktop"
 
 DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -45,17 +50,12 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	media-libs/phonon[qt5(+)]
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	semantic-desktop? (
+		>=kde-apps/baloo-widgets-${PVCUT}:5
 		>=kde-frameworks/baloo-${KFMIN}:5
 		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-		>=kde-apps/baloo-widgets-${PVCUT}:5
 	)
 "
 RDEPEND="${DEPEND}
@@ -64,13 +64,9 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-19.12.2-create-new-consistency.patch" # from 20.04
-	"${FILESDIR}/${P}-fix-crash-w-qt-5.14.2.patch" # KDE-Bug 419585
-)
-
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
diff --git a/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch b/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch
deleted file mode 100644
index dc70220d9568..000000000000
--- a/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4c923a531f77bc4c44b5c8687fe18dd6438eb9c5 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 9 Feb 2020 08:58:10 -0700
-Subject: Restore former position of "Create New" menu item in viewport context
- menu
-
-Summary:
-I've seem various complaints from users about the fact that the {nav Create New...} menu
-item in the viewport context menu is now below {nav Open With} item. All the other
-changes to menus seem to have been well-received but this one has garnered criticism.
-Looking through D23757 and D11884, I can't actually see that this was intentional, so
-it might even be a bug.
-
-Either way, this patch restores the old position of the {nav Create New} menu items at
-the top of the Viewport context menu.
-
-BUG: 417640
-FIXED-IN: 20.04.0
-
-Test Plan: {F8093605}
-
-Reviewers: #vdg, #dolphin, elvisangelaccio, ndavis
-
-Reviewed By: #vdg, ndavis
-
-Subscribers: asturmlechner, markuss, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D27267
----
- src/dolphincontextmenu.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
-index 79143d4..9f39671 100644
---- a/src/dolphincontextmenu.cpp
-+++ b/src/dolphincontextmenu.cpp
-@@ -342,12 +342,6 @@ void DolphinContextMenu::openViewportContextMenu()
-     fileItemActions.setParentWidget(m_mainWindow);
-     fileItemActions.setItemListProperties(baseUrlProperties);
- 
--    // Don't show "Open With" menu items if the current dir is empty, because there's
--    // generally no app that can do anything interesting with an empty directory
--    if (view->itemsCount() != 0) {
--        addOpenWithActions(fileItemActions);
--    }
--
-     // Set up and insert 'Create New' menu
-     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
-     newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
-@@ -355,6 +349,12 @@ void DolphinContextMenu::openViewportContextMenu()
-     newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl);
-     addMenu(newFileMenu->menu());
- 
-+    // Don't show "Open With" menu items if the current dir is empty, because there's
-+    // generally no app that can do anything interesting with an empty directory
-+    if (view->itemsCount() != 0) {
-+        addOpenWithActions(fileItemActions);
-+    }
-+
-     QAction* pasteAction = createPasteAction();
-     addAction(pasteAction);
- 
--- 
-cgit v1.1
diff --git a/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch
deleted file mode 100644
index 3e5245001bb3..000000000000
--- a/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
---- a/src/kitemviews/kfileitemmodel.cpp
-+++ b/src/kitemviews/kfileitemmodel.cpp
-@@ -33,6 +33,9 @@
- #include <QMimeData>
- #include <QTimer>
- #include <QWidget>
-+#include <QMutex>
-+
-+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_collatorMutex, (QMutex::Recursive))
- 
- // #define KFILEITEMMODEL_DEBUG
- 
-@@ -1878,6 +1881,8 @@
- 
- int KFileItemModel::stringCompare(const QString& a, const QString& b, const QCollator& collator) const
- {
-+    QMutexLocker collatorLock(s_collatorMutex());
-+
-     if (m_naturalSorting) {
-         return collator.compare(a, b);
-     }