gentoo resync : 25.08.2020

5 files changed, 2 insertions, 203 deletions

diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index a60a3522c5d5..0fe6daa41d8a 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,8 +1,4 @@
-AUX libfm-qt-0.14.1-phantom-desktop-files.patch 4871 BLAKE2B 9466f517953a8733f72296bda5c8b0081828fceda505f1603b7d5db193fb7bf72b6ce7c3c007877558b8f1a4295fa73a496e0b279790126a5859bdbd246b07c4 SHA512 19b3803704dba01da16725f1cc20b4cbb6b50210fcc7f0aea397dd8061cff55f9a0e57838b48f59649d6b8e4cc53dfb992b6160687cfa0b8f46b2dda6d431021
 AUX libfm-qt-0.15.1-update-runtime-colours.patch 1921 BLAKE2B 6adc0a2fc8a807adb865216406893aa35c2cd192daf004f71cddb62d8d4dfa357d6d79ee9d11bbd52567bca11e1d3a5225230b6350d46ae50eb9f4dc64978f79 SHA512 a3aa7bc3569c33299ce0bacb8fabd597ddbd2180138c6da2b99124893f7db486636234312cb1d8d0a63e08ddabfda0dc100ca6a4480aba7d60ab87cd48b92880
-DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7
 DIST libfm-qt-0.15.1.tar.xz 337396 BLAKE2B 619787039857f0b67245ff86f4c8de1b5305909bbf1dc07f20ab53f07a955d541853066a9011bb76d04a49006732ea23c4100e94fe3c61de77f1edbbbdef5854 SHA512 9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5
-EBUILD libfm-qt-0.14.1-r2.ebuild 891 BLAKE2B dbcefdec629df0704f774e9bb62f4469edcc8ba402299a50f0aa96fedb620736ce669bc8f30f4b294ae858204aa7f43ce29052b2fcb83a984a8354d9b1dee775 SHA512 a5e69d0ef73ee74fe74217ae55b2937ca42d6b70d52abeaad0f47649ebf409cb0a03c51b81ab417c86842272735d10b15bd00e6853ea45cdc0f825e8079fb31b
-EBUILD libfm-qt-0.15.1-r1.ebuild 972 BLAKE2B c439999d322ec90b3bb35a8a61676ce3471a1decb3f70efc3bf1cc4bf2dbb3e88b1ccf0238ca5bd3f0dad9e78fe1a516c5b0e4e780953195bbc0103b56dfbf69 SHA512 88cc807873337f7eac71c5eee48d51572af07eb8964be5ea8f7867009fd3c636623c6da0c7039eac82f5781794b67cd51bfb81785fde7f8c40092796fc1bf598
-EBUILD libfm-qt-0.15.1.ebuild 903 BLAKE2B 18b712e1adcf4cad1b8dbfd8c7466431c5fae102d285fb9d412688092dd7e30b54eef42f7bbca89a65cc0991021f66c1a7c40f0f7c1b414e7b452af1e2a4ef20 SHA512 3c01045c648f1fc33602e74a7fa8538c0144f8421858afa556dac933c41bda1707b4b62592ef98da2664778ca5f5571ffc2c4bbc25ff22cc325aaf9ea25253f7
+EBUILD libfm-qt-0.15.1-r1.ebuild 970 BLAKE2B 842346064e7a6964eaf3fae8cf4b067baf1b70c965b31abc694f6b2c949fef04e57368638ae7a9ca5a7268b6a1861053ad3bb9390aaa0f298edd267b3acb6ce2 SHA512 47189888a0ade9e0ffd7723e9f8065e448e2945ace6aee7e83177df955415209e5ab0ac0c6d777ea9d5b03797f534d7e18cfc844f8c7084d5fc184a08a072822
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch b/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch
deleted file mode 100644
index b9edab299cd4..000000000000
--- a/x11-libs/libfm-qt/files/libfm-qt-0.14.1-phantom-desktop-files.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From f944be7d2447d5c579a57fb5519ee5e2dece5871 Mon Sep 17 00:00:00 2001
-From: Tsu Jan <tsujan2000@gmail.com>
-Date: Sun, 21 Apr 2019 14:11:14 +0430
-Subject: [PATCH] Don't ignore creation-deletion sequences
-
-Fixes https://github.com/lxqt/pcmanfm-qt/issues/944
-
-Previously, if a file was in addition queue and then it came into the deletion queue, its addition and deletion were both ignored. That was wrong and could result in showing nonexistent files because addition can also happen in directory list job before being processed by file info job.
-
-Also process accumulated changes only after finishing the current info job and don't clear all deletion paths after processing them (because, logically, only those paths that can be deleted should be removed).
----
- src/core/folder.cpp | 60 +++++++++++++++++++++++----------------------
- 1 file changed, 31 insertions(+), 29 deletions(-)
-
-diff --git a/src/core/folder.cpp b/src/core/folder.cpp
-index 6c2b27d..2385a8b 100644
---- a/src/core/folder.cpp
-+++ b/src/core/folder.cpp
-@@ -228,16 +228,6 @@ void Folder::onFileInfoFinished() {
-         return;
-     }
- 
--    // process the changes accumulated during this info job
--    if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
--       || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
--        QTimer::singleShot(0, this, &Folder::processPendingChanges);
--    }
--    // there's no pending change at the moment; let the next one be processed
--    else {
--        has_idle_update_handler = false;
--    }
--
-     FileInfoList files_to_add;
-     FileInfoList files_to_delete;
-     std::vector<FileInfoPair> files_to_update;
-@@ -271,6 +261,16 @@ void Folder::onFileInfoFinished() {
-         Q_EMIT filesChanged(files_to_update);
-     }
-     Q_EMIT contentChanged();
-+
-+    // process the changes accumulated during this info job
-+    if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
-+       || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
-+        QTimer::singleShot(0, this, &Folder::processPendingChanges);
-+    }
-+    // there's no pending change at the moment; let the next one be processed
-+    else {
-+        has_idle_update_handler = false;
-+    }
- }
- 
- void Folder::processPendingChanges() {
-@@ -314,21 +314,24 @@ void Folder::processPendingChanges() {
-     }
- 
-     // process deletion
--    if(!paths_to_del.empty()) {
--        FileInfoList deleted_files;
--        for(const auto &path: paths_to_del) {
--            auto name = path.baseName();
--            auto it = files_.find(name.get());
--            if(it != files_.end()) {
--                deleted_files.push_back(it->second);
--                files_.erase(it);
--            }
-+    FileInfoList deleted_files;
-+    auto path_it = paths_to_del.begin();
-+    while(path_it != paths_to_del.end()) {
-+        const auto& path = *path_it;
-+        auto name = path.baseName();
-+        auto it = files_.find(name.get());
-+        if(it != files_.end()) {
-+            deleted_files.push_back(it->second);
-+            files_.erase(it);
-+            path_it = paths_to_del.erase(path_it);
-         }
--        if(!deleted_files.empty()) {
--            Q_EMIT filesRemoved(deleted_files);
--            Q_EMIT contentChanged();
-+        else {
-+            ++path_it;
-         }
--        paths_to_del.clear();
-+    }
-+    if(!deleted_files.empty()) {
-+        Q_EMIT filesRemoved(deleted_files);
-+        Q_EMIT contentChanged();
-     }
- 
-     if(pending_change_notify) {
-@@ -404,13 +407,12 @@ void Folder::eventFileDeleted(const FilePath& path) {
-     bool deleted = true;
-     // qDebug() << "delete " << path.baseName().get();
-     // G_LOCK(lists);
--    if(std::find(paths_to_add.cbegin(), paths_to_add.cend(), path) != paths_to_add.cend()) {
--        // if the file was going to be added, just remove it from the addition queue
--        paths_to_add.erase(std::remove(paths_to_add.begin(), paths_to_add.end(), path), paths_to_add.cend());
--    }
--    else if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
-+    /* WARNING: If the file is in the addition queue, we shouldn not remove it from that queue
-+       and ignore its deletion because it may have been added by the directory list job, in
-+       which case, ignoring an addition-deletion sequence would result in a nonexistent file. */
-+    if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
-         paths_to_del.push_back(path);
--        // the update queue should be cancelled for a file that is going to be deleted
-+        // the update queue can be cancelled for a file that is going to be deleted
-         paths_to_update.erase(std::remove(paths_to_update.begin(), paths_to_update.end(), path), paths_to_update.cend());
-     }
-     else {
diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
deleted file mode 100644
index 57a6caf855e8..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/5"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-1.1.0
-	media-libs/libexif:=
-	x11-libs/libxcb:=
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-PATCHES="${FILESDIR}/${PN}-0.14.1-phantom-desktop-files.patch"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
index b820cada88ec..f7b601350e68 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild
deleted file mode 100644
index d22a9ffd9ab0..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Library for Building File Managers"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="BSD GPL-2+ LGPL-2.1+"
-SLOT="0/7"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.7.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-1.1.0:=
-	media-libs/libexif
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}