gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 213 deletions

diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 8752ace88ef5..4bc668c1c3b4 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,7 +1,3 @@
-AUX print-manager-19.08.3-crash-w-cups-jobs-w-duplicate-id.patch 3059 BLAKE2B 3aca0faae876385d7c94d6567caf8403cca51471d1ac225ac68e9589bc8c5db411830d3a54aba453ea9c14fe960ddb131abb254d73572c5bfbd5bf13270558ec SHA512 5050d299d362c5f1047fa6c3e01327e3b702d06512c8f7b2e2b53470bb3e480ae7e5957ff2f2eb0f14c88f6a5f65429ccc1b20f64d05fade4ae547ca7ad8e178
-DIST print-manager-19.08.3.tar.xz 245476 BLAKE2B 218c2d0676ecc5fbb2fbb8ad60cafdc85ccb388db3577f19867fe2e8a266617d010e67878f34d7c02c1e161923db24d817d7b624c1d6472f343d8bd9c025d66f SHA512 b68d9f28a2e387ee11c5756c18a08e60dfb31561721e97b7d55749c60b65b887c217e096ec8bc27004f7da22700500c767b894b84e16a6d571a4cc8e112ffcb8
-DIST print-manager-19.12.2.tar.xz 250988 BLAKE2B 56307e6b0fba04254dfe67dc3461e0bd3814b1d21bdd4cc2cc380671ce6bc02efa54a83629b01b1b845a47e45f8911b5e25775bae6f90db5a36cabab9296edaa SHA512 c7cc2aed3342d88f8276400407d1e0c6ffb4f2cf0e342b8717115da869d8321f211846d2979918af363acc34f6c057985e302d4e57c3c1aff2c0d4f80a6506bf
-EBUILD print-manager-19.08.3-r1.ebuild 1773 BLAKE2B 7532033403eab731fc44e7ffd7bf38fe2b2b5804403023b2bb2c20236b090235544bb3fe62a3536a36f75254553b54921d99071c54446d8c88838d1637fcc5d7 SHA512 60fc6d637d07d3faaccccefe625c6d5f1db268d1839f508d52fcc4a1b73c685ecc7dd48d81319706ba29d1500e7540dcd7b7f08d8d0c88bce851817c76d8814e
-EBUILD print-manager-19.08.3.ebuild 1699 BLAKE2B 31a9cbc1e5b17142cd6962b23da31e7d9403b590a031d5a61d00e969b502224490a4554dafe202c715317399119409808f98fa4fff37efa3d87688ef5ec3babd SHA512 4f98080edd870c8fff9df04a00c067ebad96d199af874cb65f7917eb2368e07c7c482ec1cba1a5e6bebd08ce21ebb0ac3a9e7e21b0b4dd55da109fa49adfef62
-EBUILD print-manager-19.12.2.ebuild 1710 BLAKE2B af1b84a6df6edf6d8094de74146840ec679c4220431acc922ea6700da6256e043ef641b9a07f0e87e17a5fad6a3d8e00c3ceb1615d4b651ed8d3f3c57cbae3eb SHA512 91060bd1f71993995d55eb6a88e31ac781054fcbdca896c467f717e81ddd95478f1e06553c4440df93c2613ca5111fe31f2a731afc87151f1aaa198dca345864
+DIST print-manager-19.12.3.tar.xz 251568 BLAKE2B 52f7ef3911c42c04a51ea1b7d398c312e1e77ebcac65cb29859aaaaa7250aed16035868c55738fcf1f6004d4ad7e70eefcb6bfb3e1387e18fdd3ccd4f47565fb SHA512 58b65aab504d1f51d238dad6ebbbc717573ec8a332807a3ca93a74d82d753255175a1b4609bef019209e03760e98853f0ce75bbee6a6141af72c7e77c84e3d36
+EBUILD print-manager-19.12.3.ebuild 1706 BLAKE2B 013856bbc55a11e0220f1e0cec559023bbd29fe307c38fbe2cde464d032598c44f6743d4f7260462e1ee94d516c8f436d9f48c399ab57d57046e2213d117438c SHA512 9a9045274b19dd6b61c6195a4bbc0916111c8a7cb96d0c0914921e34aecae52fd424f7a00f5f7a0e759c16a6d4f26972f66183fd2c7113bb1e5b06d4fcd911f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/files/print-manager-19.08.3-crash-w-cups-jobs-w-duplicate-id.patch b/kde-apps/print-manager/files/print-manager-19.08.3-crash-w-cups-jobs-w-duplicate-id.patch
deleted file mode 100644
index be4b2efd4935..000000000000
--- a/kde-apps/print-manager/files/print-manager-19.08.3-crash-w-cups-jobs-w-duplicate-id.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From c93f2f16c30d10fbd0f4bfb4c0bf0cec07a4c93b Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Mon, 2 Dec 2019 23:04:42 +0100
-Subject: Fix crash when cups returns jobs with duplicate id
-
-Summary:
-For some reason my cups was giving me two withheld jobs with id 33 and two with id 40
-
-That made the JobModel code crash, because it went like this
-
- * First job with id 33 found
- * insertRow with 0 called
- * Row 0 inserted
- * Job at row 0 updated (from inside insertRow)
- * Second job with id 33 found
- * The "oh i already have this job code triggers", updates the job, then takesRow 0 and inserts at row 1. QStandardItemModel doesn't like getting a row add at 1 inserted when empty
- * First job with id 40 found
- * insertRow with 2 called
- * Row 2 inserted, it fails, QStandardItemModel doesn't like getting a row add at 2 when empty
- * Job at row 2 updated (from iniside insertRow)
- * Crash because there's no row 2 in the model
-
-BUGS: 326289
-
-Test Plan: Doesn't crash anymore with my weird cups list of pending jobs
-
-Reviewers: dantti
-
-Reviewed By: dantti
-
-Subscribers: ngraham, marcelm, fvogt, broulik, nicolasfella, kmaterka, kde-utils-devel
-
-Differential Revision: https://phabricator.kde.org/D25623
----
- libkcups/JobModel.cpp | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/libkcups/JobModel.cpp b/libkcups/JobModel.cpp
-index 73c5174..3c4878b 100644
---- a/libkcups/JobModel.cpp
-+++ b/libkcups/JobModel.cpp
-@@ -174,6 +174,25 @@ void JobModel::getJobs()
-     m_processingJob.clear();
- }
- 
-+static KCupsJobs sanitizeJobs(KCupsJobs jobs)
-+{
-+    // For some reason sometimes cups has broken job queues with jobs with duplicated id
-+    // our model doesn't like that at all so sanitize the job list before processing it
-+    QVector<int> seenIds;
-+    int i = 0;
-+    while (i < jobs.count()) {
-+        const int jobId = jobs.at(i).id();
-+        if (seenIds.contains(jobId)) {
-+            qCWarning(LIBKCUPS) << "Found job with duplicated id" << jobId;
-+            jobs.removeAt(i);
-+        } else {
-+            seenIds << jobId;
-+            ++i;
-+        }
-+    }
-+    return jobs;
-+}
-+
- void JobModel::getJobFinished(KCupsRequest *request)
- {
-     if (request) {
-@@ -181,7 +200,7 @@ void JobModel::getJobFinished(KCupsRequest *request)
-             // clear the model after so that the proper widget can be shown
-             clear();
-         } else {
--            const KCupsJobs jobs = request->jobs();
-+            const KCupsJobs jobs = sanitizeJobs(request->jobs());
-             qCDebug(LIBKCUPS) << jobs.size();
-             for (int i = 0; i < jobs.size(); ++i) {
-                 const KCupsJob job = jobs.at(i);
-@@ -207,7 +226,7 @@ void JobModel::getJobFinished(KCupsRequest *request)
-                 }
-             }
- 
--            // remove old printers
-+            // remove old jobs
-             // The above code starts from 0 and make sure
-             // dest == modelIndex(x) and if it's not the
-             // case it either inserts or moves it.
--- 
-cgit v1.1
diff --git a/kde-apps/print-manager/print-manager-19.08.3-r1.ebuild b/kde-apps/print-manager/print-manager-19.08.3-r1.ebuild
deleted file mode 100644
index fa4ea22b7b11..000000000000
--- a/kde-apps/print-manager/print-manager-19.08.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+gtk"
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-	gtk? ( app-admin/system-config-printer )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-crash-w-cups-jobs-w-duplicate-id.patch )
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-	fi
-}
diff --git a/kde-apps/print-manager/print-manager-19.08.3.ebuild b/kde-apps/print-manager/print-manager-19.08.3.ebuild
deleted file mode 100644
index 6fec4d8f4f9a..000000000000
--- a/kde-apps/print-manager/print-manager-19.08.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+gtk"
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-	gtk? ( app-admin/system-config-printer )
-"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-	fi
-}
diff --git a/kde-apps/print-manager/print-manager-19.12.2.ebuild b/kde-apps/print-manager/print-manager-19.12.3.ebuild
index 44c34364c24a..91c280a5451f 100644
--- a/kde-apps/print-manager/print-manager-19.12.2.ebuild
+++ b/kde-apps/print-manager/print-manager-19.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Manage print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+gtk"
 
 DEPEND="
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}
 	gtk? ( app-admin/system-config-printer )
 "
 
-pkg_postinst() {
+pkg_postinst(){
 	ecm_pkg_postinst
 
 	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then