gentoo resync : 20.03.2022

4 files changed, 67 insertions, 6 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 15dabef62e98..b038aa1da2c9 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,7 @@
+AUX plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch 2547 BLAKE2B 1810c8c02cc947c9f302b5669770b858dc3c1c3f555563dd92d9acb04cd26b51f6417c6ff5f6a16e50f934c1824952a7e093e8247574324b3472d67de4dc11e2 SHA512 5fbf21e4536c4a315665179d3c815e829cf45c0a0c544eeb8a514dbe0ddf4b8d0b699a9051c197fe73f4eb7490167d04c6388079912d61d2139648bd2caa79b5
 DIST plasma-desktop-5.23.5.tar.xz 15794548 BLAKE2B 6e215cc5ef10598308a9fbe6c58ea67ea16ee3c3394c69bebcd1167b939e8ff1442bc839c87428cc5a57b274cc95d02983a67ab0e8fac6c27435e446f84c8630 SHA512 14cd20b24e265ef9cc4e4ebbfc743151cf5f9ba0a94fbc19e44571c7e68db61d68bab17dd1feea6f4e0844ab448110010fbfe85212b426c1e12232b73bd1c531
-DIST plasma-desktop-5.23.90.tar.xz 6223344 BLAKE2B b613a2e230603a35e076bed653963dda18aefeaa2427cfe2c7be0c3c79cfdc030e43ccb279bb270101eecb063cace0ed71a4137c5109d8e9fadfa1c0232db02c SHA512 afe4f886bd957786be2595a5937f1f394ab46e3ed96506c53f3bbb70b2f5d482815c459404fc15defb89482d161f0ce09a6956b1ec9fe3ba7d0ea326bcfff8cc
+DIST plasma-desktop-5.24.3.tar.xz 6234824 BLAKE2B dca59879db162fc8c42841ad7de89dbd8b0927f0c5793b0a632662837ec2d0eef4630aab3086a8d9ede34807affbeac1e16adeabf08bf0f7105f5b0dbe42c099 SHA512 0a479819fe8cd3665adce95367a2537921b742d31e9da30887b878a4c6dc37c97b325245c80d7c49ef8a44d278e79178319deacb924967ec5c9fec897a4c06f0
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
-EBUILD plasma-desktop-5.23.5.ebuild 5425 BLAKE2B 3345f625372e51ca02df9ad84b53f05d5cbc24ce3911e068f6642cc1fe00b2c30123d6623e21bbaf9815eac58818db636566e2e6d1ca4275af3beed6804630a7 SHA512 f454f3f02cc9bed2323697b3c9667f582adedb7abe0b6cebeaea9b94fccf02ffdfbaa27be615727a322a4f3174e146a97d1e4531109e135b8f8978b86afe2376
-EBUILD plasma-desktop-5.23.90.ebuild 5208 BLAKE2B b79fb71d47cacfa9dd1462c6f79887800efb0063a7234759cbf6766a1637e9d77ee97a3532f3275d021f4470ac46c7cfa4552112ab1be6849d5a06294054f641 SHA512 4d3017b2e53c9f0d283a25690e2ae4ac9df2d0e1f25c3e41367a2151a52d0088aa366979126dc62bd7ebb04a05b9099421edf30c841847d3339104170bf088cb
+EBUILD plasma-desktop-5.23.5-r1.ebuild 5560 BLAKE2B 62cbbef8fa7071c7b48bcc08c30e178118fab60f820d91f8a18304b6b4db9897674808de2c08a151b4cbaad4c76712d4c5e1cd94428921cf70342a137e018481 SHA512 936fe937dbc3a13fd01e698192a0d99f70800545d030c2fbceaa65298a5d5963210c8b310858b01e64fabddff97121dc9091d2a82b74fb4ba4a7836390d7f2d6
+EBUILD plasma-desktop-5.24.3.ebuild 5188 BLAKE2B 9edcb388467c24bef79ec2d7529d0d4b7572c4d0d00e3680ab171372d0ae40dd874db98dad23f3a4b270436c4ffe46b1518abc2a0e2b516403d3ea07b4b1bf71 SHA512 c42dcbc58beb412604860918369287caef1a5aa0551de3602f65866ae42ba94a3f5ac92b4d7c4255791c1745075216e1f2c898d887e929a2d08122a76098803d
 MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch
new file mode 100644
index 000000000000..fb4d0bacbd90
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch
@@ -0,0 +1,57 @@
+From 346dafd3a0e19805f77147a9515a7333a05ed584 Mon Sep 17 00:00:00 2001
+From: Dan Leinir Turthra Jensen <admin@leinir.dk>
+Date: Tue, 8 Feb 2022 11:16:16 +0000
+Subject: [PATCH] Add a granular cache preference thing to attica-kde
+
+Commit 798027fd17ab86eea022e5d269aa86138b28b130
+
+This allows us to explicitly add cache preference to specific calls.
+Usually attica calls want to be very current, but in some cases we can
+assume things aren't going to change often (such as the categories
+call), and we can just use the cached version for those calls.
+
+Fix missing variable name
+Commit 8e164050c594855ee3728678d6d0907a10b28db6
+
+Only trust the expiration date if it's less than 24 hours
+Commit b85cf34298c274b5f16cb6c2aead7b87f0dabbb8
+
+Fix build
+Commit 6e8626f2d65a03af3cd12fb5390040c56ca3258d
+---
+ attica-kde/kdeplugin/kdeplatformdependent.cpp | 20 ++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp
+index c2c90107e..850c91284 100644
+--- a/attica-kde/kdeplugin/kdeplatformdependent.cpp
++++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp
+@@ -125,6 +125,25 @@ QNetworkRequest KdePlatformDependent::addOAuthToRequest(const QNetworkRequest &r
+         const QString bearer = bearer_format.arg(token);
+         notConstReq.setRawHeader("Authorization", bearer.toUtf8());
+     }
++
++    // Add cache preference in a granular fashion (we will almost certainly want more of these, but...)
++    static const QStringList preferCacheEndpoints{QLatin1String{"/content/categories"}};
++    for (const QString &endpoint : preferCacheEndpoints) {
++        if (notConstReq.url().toString().endsWith(endpoint)) {
++            QNetworkCacheMetaData cacheMeta{m_accessManager->cache()->metaData(notConstReq.url())};
++            if (cacheMeta.isValid()) {
++                // If the expiration date is valid, but longer than 24 hours, don't trust that things
++                // haven't changed and check first, otherwise just use the cached version to relieve
++                // server strain and reduce network traffic.
++                const QDateTime tomorrow{QDateTime::currentDateTime().addDays(1)};
++                if (cacheMeta.expirationDate().isValid() && cacheMeta.expirationDate() < tomorrow) {
++                    notConstReq.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
++                }
++            }
++            break;
++        }
++    }
++
+     return notConstReq;
+ }
+ 
+-- 
+2.34.1
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild
index 7faa99b22779..a086617e1a8e 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild
@@ -74,7 +74,6 @@ COMMON_DEPEND="
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
 	>=media-libs/phonon-4.11.0
-	virtual/libcrypt:=
 	x11-libs/libX11
 	x11-libs/libXfixes
 	x11-libs/libXi
@@ -96,7 +95,10 @@ COMMON_DEPEND="
 		kde-apps/kaccounts-integration:5
 		net-libs/accounts-qt
 	)
-	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+	policykit? (
+		>=kde-frameworks/kwallet-${KFMIN}:5
+		virtual/libcrypt:=
+	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 	telemetry? ( dev-libs/kuserfeedback:5 )
@@ -123,6 +125,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	# https://mail.kde.org/pipermail/distributions/2022-February/001140.html
+	"${FILESDIR}/${P}-attica-add-granular-cache-pref.patch"
 )
 
 src_prepare() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.3.ebuild
index d35b171b5bf8..302d9b8d656b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.90.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.3.ebuild
@@ -74,7 +74,6 @@ COMMON_DEPEND="
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
 	>=media-libs/phonon-4.11.0
-	virtual/libcrypt:=
 	x11-libs/libX11
 	x11-libs/libXfixes
 	x11-libs/libXi