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

8 files changed, 115 insertions, 6 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b7a96ab9f9ea..7cb0ec96bcd0 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index cda43fdab9e6..5928d46a4d66 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,5 +1,7 @@
 AUX passwordsafe-1.15.0-gcc12-time.patch 306 BLAKE2B 03c0d2cefc7cab1b1342df38bd49e6b4fcce6d4c656c0cfabc678a4dd037c95d45e4e5ddeebb4bf8b2031e4c3b2c3c8738eb4e4b8fcb567f472ccd5c861136fa SHA512 2f209a5ae3691b37144b5c32eb467dd50abfe1b8f440bf63b6e3c3f070f788a160a56dd1e28f631df695c58981bd5596534b3d931ce7096555cd0cd12a3bfdb7
 AUX passwordsafe-1.15.0-gtest-no-gnu++11.patch 467 BLAKE2B d3d09e3ed71c722abf11b07edcbf5f430b0eb1f1b530824cacee9ad35c301e45a942c5494c5767ef2cc62f4b63c3a3f9fd39877f4de5821b5164d12640e302f8 SHA512 a1f133b23e2e8651e30e15335b3e06e570c960cd0e31d567bdceb6862ad0df6576182f8784e97ba6cf66b6777ac99a052f7e6a077c6274af32401f9156edd605
 DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738
+DIST passwordsafe-1.16.0.tar.gz 15369804 BLAKE2B 344e77f74e588f41ba3696f5ea05cf054fca9f285437294033284561cbb83c76dc1311033b78673db0049132b7c9f37493c3698bb3b66e8e0a91ae63f7a83cdf SHA512 839de5072d6c9ec8fb82456e4516e51408be271ac8041b6dd9cf30990ac88914a139d96b40ee09764892acd8320abb2950d7f159a5b18c3d1549e58b922aa024
 EBUILD passwordsafe-1.15.0.ebuild 1869 BLAKE2B 31576c5fc6aeafe6246e02c03c9b5d435b771f0139e54b536e6f10bffb4c4bbb0fafc55f51d0511dba84b2ffc959f3010ac0a0e61cf99d417109fef3076fdf37 SHA512 ddcb1d77847eb265a1b36b9259dc2390a6eaa5608f6a8da4e64ba3d72cfe61eee9c6df0ae530fefe2a031d62997f655c39fa54889538a13b76bf04ae1963461b
+EBUILD passwordsafe-1.16.0.ebuild 1756 BLAKE2B 307b531f6f8ef9f17f3383cbdfb8aad5e5828e030d1395514d80da2ac2175762546189f4e8c23878d32c686875ba50912a6e8ac15590c5614e4d483921f13286 SHA512 59f3ae1e868852076fd98c7d3e520e68025e0d96a79c452a02901883fb653dea246e5d557b85b6f0d42456767e8d0b1969e4114282c48e67bf4939fe93f71ea2
 MISC metadata.xml 714 BLAKE2B 336a69bebe009487ad72444b3805a0b332fc78aacff06566601a431d91d7799a750cf2b7aa9d61df26061a4a073c9a3fe478e80419256bdb472374eeee3c3599 SHA512 d0e6fb3b93211ca74371beecf4099bad8c9ef608d804942b961ed0ec954cebd690c3d6157caf200c07f22af3169728f2a541be334142bce060890b88cac4b246
diff --git a/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild
new file mode 100644
index 000000000000..d63224c667fb
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop flag-o-matic optfeature wxwidgets xdg
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/pwsafe-${MY_PV}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qr test +xml yubikey"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	net-misc/curl
+	sys-apps/util-linux
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	qr? ( media-gfx/qrencode )
+	xml? ( dev-libs/xerces-c )
+	yubikey? ( sys-auth/ykpers )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	sys-devel/gettext
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DNO_QR=$(usex !qr)
+		-DNO_GTEST=$(usex !test)
+		-DGTEST_BUILD=OFF
+		-DXML_XERCESC=$(usex xml)
+		-DNO_YUBI=$(usex !yubikey)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	dobin pwsafe
+	dobin cli/pwsafe-cli
+	dosym pwsafe /usr/bin/${PN}
+	dosym pwsafe-cli /usr/bin/${PN}-cli
+
+	insinto /usr/share/locale
+	doins -r src/ui/wxWidgets/I18N/mos/*
+
+	insinto /usr/share/${PN}/help
+	doins help/*.zip
+
+	popd || die
+
+	newman docs/pwsafe.1 ${PN}.1
+
+	dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt}
+
+	insinto /usr/share/${PN}
+	doins -r xml
+
+	doicon -s 48 install/graphics/pwsafe.png
+	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	optfeature "on-screen keyboard for password entry" x11-misc/xvkbd
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index fc0523fb2d3b..bc3e7e3f7fae 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -26,4 +26,4 @@ DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10
 DIST salt-3006.0.tar.gz 20377846 BLAKE2B d39a55676f6bc5f70a558684811dd6175b633ceb5b73f4e95bd0137e7a507456f2e77099c05aca082591b9bdff1948632adc9f141e2f8ad26c4bfedd98af3d15 SHA512 999e2eb362607e1a8a0636c3bfa305fb070a5df309b837975a03a0bf02d25e4678eae38e8a1a356ea857a6d81cbb68aeb9f903a55dd221c7485d2f22b309dd77
 EBUILD salt-3005.1-r1.ebuild 7220 BLAKE2B 5a045d17bcd6b6402a16963bf6df5875a09cbbaa70d35a8e6e730e918b040aa2905785b766379045f5a2c0c95b438fbd54d5ab256a3dc4a5ad24d7589c5cd479 SHA512 956f1ed2a31cb6962fa90cf63e37bfa4054cc7057305a7ecc957a96f6920f6360acd9b38cef32a56c85ee9117777cafb33f72ce0a6114b0bf39599e0850ed0bf
 EBUILD salt-3006.0.ebuild 7298 BLAKE2B 2aa6fb3a23676446c1efe95fafdabf26d8136c974733d9d495ba02efe490c1e0323a65803b5030d4069d0b2c1af8d9a27289d2bec51cdd2ce7cf118c82bc5b1d SHA512 5add066f1e9a8f4f15d6378ea93a50378f57ab6ffaf0780f757eb888d0d13255e4e33daeed024bc996e2e4421fce00b50ecf04905f27e911003134cbe2c8fb70
-MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da
+MISC metadata.xml 2304 BLAKE2B 8fac51fe1b0c0dae5fe71d88f1bf84df1de8cc8b3d836b59c3b2e82bfa085f57352e3aafd999766ae69104a8bd9798f2fffdb64e1df1e0a1ca8561dba1ef7d5e SHA512 7d3706c40c27dd67509bd638cd0550bb4822f0895fef929ecad21c218cdaa0512da443c901cc2b3a8d4afd9f5e9bc461622ac3bab2a332ccd9c64c4cbf99bf74
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 618790903e88..4e6f05022cda 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -27,7 +27,6 @@ backbone of cloud and data center management.
     <flag name="libvirt">Support managing virtual machines with <pkg>app-emulation/libvirt</pkg>.</flag>
     <flag name="genshi">Enable support for <pkg>dev-python/genshi</pkg></flag>
     <flag name="gnupg">Enable support for gnupg via python-gnupg.</flag>
-    <flag name="keyring">Enable support for keyrings via python-keyring.</flag>
     <flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
     <flag name="mongodb">Support returning data to a mongodb server.</flag>
     <flag name="neutron">Support the OpenStack neutron network service.</flag>
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
 }