gentoo auto-resync : 30:01:2024 - 23:49:25

3 files changed, 10 insertions, 10 deletions

diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 26899da85b66..e2e5faf05185 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,9 +1,9 @@
 AUX copyq-7.1.0-fix-gpg-2.1-support.patch 20025 BLAKE2B faab876bfd8813afea0ed2f9e822e4604cf1813233af86bd9a49ee54ff0fc121333b9a7e8aa549c9a39751cd9cb4f12b73c7b8bfd714f00715a93a8acc7a553f SHA512 d1022e3141273d1bcd1bf85822e1113cc03503c740e27f38453d1e29c8d5524e8f9dc3be4b41b82db9e5cdb845f66dcf234aac207556ca80275c63e1bda87d66
 AUX copyq-7.1.0-fix-qt-6.6.0-build.patch 1671 BLAKE2B f5e563ff590ee05ae09f37887e2ce6e72000ac13f37ccfcff7a7f9cfece2d83160fa2e8c462087f2eed377601f87bb5bc8469d2ef6734e375e662838b889356c SHA512 773b31a7976358be31a09aed93d2eca12768f8c3a8541b822e833cef409f39eb26819db2fd49ce7e2eec7b8419e0ed60bbe92c25f69de2f15a9a15fd6fa812aa
 AUX copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch 3822 BLAKE2B f95dfe294136907ee0f22d8f9810989928da18642ab674da9725daa029d75adebe4b8c5fd9d71a92298bd46b464ed9b20a6a12c2689f6f96c09742c1fda5d96b SHA512 415a24815233668e51303b3188bde028f0cfcb9483f92ec143a4350d2130f2b4752f704aa5ee27997be1ce44c3dabf2a384a7fb97756367a6be1029a10e04ec0
-AUX copyq-7.1.0-support-plugin-dir-envvar.patch 766 BLAKE2B 6e837fe85d2279b67027ccfd37558cd88fe1ecb8b160c97030d5eadc83b53aebe6ddbdee10da75672fd1ee61cfc7b4641180ec6838dd23e659d432a91e54617d SHA512 b03fa69c770c8517162e0e5462248088c8f4cd8017de53ae0d97a12e2c395b6e11649fb34ba96fea8a536d003921e3cfc463fd878c2c2b71ca72faf3d4d1c67d
+AUX copyq-7.1.0-support-plugin-dir-envvar-r1.patch 782 BLAKE2B 9cb80e575a08dad54c54e8144fa06f45691ed5914d42af07073e3882930a636a0ac1557563d2c559d20f73525374c79d3a2523b6d5f24807b9032f33e3f0b362 SHA512 3d03c47873a3a2940ce5a239d620a46d63bb28a3f0ff0f547af247f74365403b52e1a91b402cbb64921c31bc4d6fff2f7e725b71edd3ea298058ad3a2d514a25
 DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4
 DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909
 EBUILD copyq-7.0.0.ebuild 1942 BLAKE2B 04362e75f351d9ffc2477588fbe7ffa89f58d5461b3b9784b0c5c541c21f0f11687c64f7df8ffa4b5e2f9e9a696e4a8e1bbe49e5c0ba87dd8eedd1bbbe2fdb63 SHA512 7b669810c75a9317941690ab9a42462de2e4db7c7db204e0f1cef2a69fe3f5f384267e7cbb8327cdc1214feaecc98c0454da12e17bedc262cfb488e0889868ea
-EBUILD copyq-7.1.0.ebuild 3627 BLAKE2B 5f20de414218f4cd2cc5673528c86b319255c04e626b9ec48d74aa4c526d40520fe24baddd4dddf2a8463ff6c32ae7f4a2898d16a2ca86c03c24d2788c82bc4e SHA512 38ff1ab91ac10b9377f60940ef9fc51aec87a028d310861f49e4901099bdf3dc91473d800cba5f0d75b2564c6529e421339c69691fe8831ecb2b52a77e85d0ee
+EBUILD copyq-7.1.0-r1.ebuild 3630 BLAKE2B 1524647e6231a99ed85be4c954a36092a2318321938617b1a8a4f93de1cf3c3f7bdbca4541d92fb8f6c84cad125b2565105fb53c44a668b4605a4acbd4e75483 SHA512 8d86cfb0d90fb9a9facd2648bfd69786a98a260758724f192e154c1eb02389ec7685a9c8aec77283b20dd196bb724b33951d568d5c2949daadd707cd09516529
 MISC metadata.xml 429 BLAKE2B 22f09cc6c63f32d0d0bcc5dc2cf7fb8d437653e0358ba30aeb3ab79978cafd9ea971fb0f56931744146e5ab7a16401e5f366d31f91ffba52ca6c2c26c1ba5931 SHA512 32f0a4a4c0065463ae826511758b42f7a2c815a6d49657dec47560b9510f21d44fe0d6f397922998fd3ad022e9b4fa88c45babdd9aa3874d8db0cfdbab7813d8
diff --git a/x11-misc/copyq/copyq-7.1.0.ebuild b/x11-misc/copyq/copyq-7.1.0-r1.ebuild
index 8d39c5de4835..85ed9029ecee 100644
--- a/x11-misc/copyq/copyq-7.1.0.ebuild
+++ b/x11-misc/copyq/copyq-7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,7 +69,7 @@ PATCHES=(
 	"${FILESDIR}/copyq-7.1.0-fix-qt-6.6.0-build.patch"
 	"${FILESDIR}/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch"
 	"${FILESDIR}/copyq-7.1.0-fix-gpg-2.1-support.patch"
-	"${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar.patch"
+	"${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar-r1.patch"
 )
 
 src_prepare() {
diff --git a/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar.patch b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch
index 21c60f87011b..d2d0ec94b659 100644
--- a/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar.patch
+++ b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch
@@ -1,6 +1,6 @@
-From 32b45b42f0d9dbdaae077f81d11fff7bd2455492 Mon Sep 17 00:00:00 2001
+From 6d20653b924481048fa017dc40cf9d7360f95a13 Mon Sep 17 00:00:00 2001
 From: Alfred Wingate <parona@protonmail.com>
-Date: Wed, 6 Dec 2023 06:16:36 +0200
+Date: Tue, 30 Jan 2024 20:44:18 +0200
 Subject: [PATCH] itemfactory: Add support for setting plugin dir in the
  environment
 
@@ -12,11 +12,11 @@ Signed-off-by: Alfred Wingate <parona@protonmail.com>
  bool findPluginDir(QDir *pluginsDir)
  {
 +    QString pluginDirEnv = qEnvironmentVariable("COPYQ_PLUGIN_DIR");
-+    if ( !pluginDirEnv.isEmpty() )
++    if ( !pluginDirEnv.isEmpty() ) {
 +        pluginsDir->setPath(pluginDirEnv);
-+
-+    if ( pluginsDir->isReadable() )
-+        return true;
++        if ( pluginsDir->isReadable() )
++            return true;
++    }
 +
  #ifdef COPYQ_PLUGIN_PREFIX
      pluginsDir->setPath(COPYQ_PLUGIN_PREFIX);