gentoo auto-resync : 18:05:2023 - 16:12:55

3 files changed, 29 insertions, 4 deletions

diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index d184da28f873..2d572d3ed964 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,4 @@
+AUX system-config-printer-1.5.18-fix-debugprint-exception.patch 866 BLAKE2B 00e4c099d6b4a713d925962bcf7f3a2fece0ed86bab860d4726364cb2605035f35e49f057493b539d282bd0cfed0d81b7ea63ea9e06c9613eb5bcc9150d7940b SHA512 3d050231a42776a1f1d802cf03d873e7e2efb265e508395ed4f54359090845095cd232e045a0f1bb95e26856455c019468263b23f3214857aa085cb2f5b2cd2d
 DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
-EBUILD system-config-printer-1.5.18.ebuild 2081 BLAKE2B 6026929f395c642e2eb45aaf0cad77e93358dd54444fc1a0801b7c01424db3e4903f58862df330d287908d5da7c3e9cd7dee15d0a68f4c36a3f24b6d5ee0a18c SHA512 8ee70272675442ff1e4b1ed1fe026777de0e67fd6364ee447c229339783e6dec74fb5db92f5865b688dd44b84177f4030a4da1448c7b8d2798dfc110d942d3e9
+EBUILD system-config-printer-1.5.18-r1.ebuild 2155 BLAKE2B c7bea686d21f69d7bf4237a7bd55e74f1add00cc5faa566e8b63afdf601f61920f0073967a310ec49d02b183e4b4600aac664c62d3edea67ffa084851617083d SHA512 1a23e2639ab1670f42c422f7fbf745a66347feacc0dba48ace614a098adfe77074438e5c6d0abbbf33721c37b46f2baf78d2dbd65c235b0458d3cadd88408a05
 MISC metadata.xml 597 BLAKE2B 4691f7f385a864b26ed00b5d05310d45aa52d1cbcfb118ec4b1323df470a761162bb7c037cc8eec253f1dd5302d0036379044e83257ba6be43d878b28ebf11e6 SHA512 e4b52d3a4070116472e4fb617796a7cdaef0b3cfc825ccdc39392b5ba63afdedad4232a9eacf89c209a3202d95c2c0cadf17ae8d3698d2e2258310cebfa89744
diff --git a/app-admin/system-config-printer/files/system-config-printer-1.5.18-fix-debugprint-exception.patch b/app-admin/system-config-printer/files/system-config-printer-1.5.18-fix-debugprint-exception.patch
new file mode 100644
index 000000000000..829166ad9d8e
--- /dev/null
+++ b/app-admin/system-config-printer/files/system-config-printer-1.5.18-fix-debugprint-exception.patch
@@ -0,0 +1,22 @@
+From 399b3334d6519639cfe7f1c0457e2475b8ee5230 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Thu, 13 Oct 2022 14:03:37 +0200
+Subject: [PATCH] Fix debugprint() in options.py (fixes #291)
+
+---
+ options.py | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/options.py b/options.py
+index d756f98dc..d7c236deb 100644
+--- a/options.py
++++ b/options.py
+@@ -423,7 +423,7 @@ def __init__(self, name, value, supported, on_change):
+             debugprint("Unknown value for %s: %s" % (name, value))
+             debugprint("Choices: %s" % (supported))
+             if len(supported) > 0:
+-                debugprint("Selecting from choices:", supported[0])
++                debugprint("Selecting from choices: %s" % supported[0])
+                 self.selector.set_active(0)
+         self.selector.connect("changed", self.changed)
+ 
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild
index 2d949358637b..0c83ac608bfc 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 inherit python-single-r1 systemd udev xdg
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="gnome-keyring policykit"
+IUSE="keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Needs cups running, bug 284005
@@ -50,10 +50,12 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/urllib3[${PYTHON_USEDEP}]
 	')
-	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	keyring? ( app-crypt/libsecret[introspection] )
 	policykit? ( net-print/cups-pk-helper )
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-debugprint-exception.patch" ) # git master (1.5.19)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }