Merge updates from master

17 files changed, 262 insertions, 200 deletions

diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index afc799a89612..518a8269b50e 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -2,3 +2,5 @@ DIST yubikey_manager-5.1.1.tar.gz 167947 BLAKE2B 4f0b7a3ba3f083112c0a43c9b9304e7
 DIST yubikey_manager-5.1.1.tar.gz.sig 310 BLAKE2B 4f636b5eab0602ec203c8d3d5b6d1de85c7341559b09fc131a994c75b15cb141706ccc65a8efb39e33d5a3704496e85c08a67d105d45f5264644b993c2585f20 SHA512 e964e39a995de7bd24a3e417d5e98cf68cdcd6412b7c95b552545468bbb434105fad97bbf82d758c9320bf9917d32312e6e286e9259d004899af2cde540cc731
 DIST yubikey_manager-5.2.0.tar.gz 184873 BLAKE2B 09041c23e23ff01cad2d126face63006d1648dfe8d2e7a47b7113deed990143c83a36b6c60458dc9cbf55a71ddf286b8259c97ee982044dbc554231655fb82e2 SHA512 988c25f378e0ce5b53ba5a47aac5fd5a136653f1592af5e9c7440eef7336903cf459a567b4be02119262dba70c3058f5d9f26049dc21c1d934dcf8897eedc03d
 DIST yubikey_manager-5.2.0.tar.gz.sig 309 BLAKE2B bb1a012832c99aaa94404717560e72fb93352b82dd3c0091cb492cde65706c39b9e2411e38a36150d77e72f6397d98cef643d0b392c1751e9c109de3468c9a39 SHA512 926a7a7c40d38bcc0a48e3b44f3eb673c16f7bed73701f5cb6f9ac4418c9f2a242b8d2af9459093ec10e8c188410412a8ba8c05a0fd4774a738629a4b0f874d4
+DIST yubikey_manager-5.2.1.tar.gz 185533 BLAKE2B 7aa61043eb7f8a9502ee3c3aaea8d2cae63bde564aa8d2332570247959df966049b181bc1b3fa5749d1f66f21c2a2b10871cbe8e6a83c81ee67648957a2eb869 SHA512 96118f1b4e9509f9b299f8dfea2b29f7ac2958797facfae6bacb425fd4aa4cf5c91a14dcdbb9edbc9cf5785cfb9d5e4c465ad3e3813fd902cf12ad2d6b072329
+DIST yubikey_manager-5.2.1.tar.gz.sig 310 BLAKE2B 1338fd7f05766629790188e20d0dc71548941522ce02e0b3d0f7db0be6ee61655000aeb45b3a58c80d0cb891a13a816f4af2f145339d2fb09b9c6293a882bf86 SHA512 57a63bd272e61f93182fb26e1378d8e355efd91c2e2eede70744223fd47e02f4e210725ad31b1ce1bfdc81a67183159054a8238930ca4bdaec2aa7970b170f35
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.2.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.2.1.ebuild
new file mode 100644
index 000000000000..de7ffa61172e
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-5.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1 verify-sig
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
+# tarballs on Yubico Web site and on GitHub should be identical, and at least
+# for recent releases the latter are signed as well. Only the automatically
+# generated "Source code (tar.gz)" tarballs should not be used.
+# Still, prefer the former if available.
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
+	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ssl"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/yubico.com.asc"
+
+# app-crypt/ccid required for
+# - 'ykman oath'
+# - 'ykman openpgp'
+# - 'ykman piv'
+RDEPEND="
+	app-crypt/ccid
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	<dev-python/cryptography-44[${PYTHON_USEDEP}]
+	dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
+	<dev-python/keyring-25[${PYTHON_USEDEP}]
+	>=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
+	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? ( dev-python/makefun[${PYTHON_USEDEP}] )
+	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
+
+S="${WORKDIR}"/${MY_P}
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/ykman.1
+}
diff --git a/app-misc/gramps/gramps-5.1.6-r1.ebuild b/app-misc/gramps/gramps-5.1.6-r1.ebuild
deleted file mode 100644
index 308f1fc3dd70..000000000000
--- a/app-misc/gramps/gramps-5.1.6-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2001-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="exif geo postscript +rcs +reports spell test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Some of the tests fail unless the deprecated BerkeleyDB back-end is enabled.
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyicu[${PYTHON_USEDEP}]
-		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	')
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-	reports? ( media-gfx/graphviz[postscript?] )
-"
-BDEPEND="test? (
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.3-test_locale.patch
-)
-
-src_prepare() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the ${PF} variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-
-	default
-}
-
-src_compile() {
-	${PYTHON} setup.py --verbose build || die
-}
-
-src_test() {
-	LC_ALL=C.UTF-8 ${PYTHON} setup.py --verbose test || die
-}
-
-src_install() {
-	${PYTHON} setup.py --verbose install --root="${ED}" --resourcepath=/usr/share --no-compress-manpages || die
-	einstalldocs
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/sentry-native/Manifest b/dev-libs/sentry-native/Manifest
index edea38c2f4c5..824f11070e28 100644
--- a/dev-libs/sentry-native/Manifest
+++ b/dev-libs/sentry-native/Manifest
@@ -1 +1,2 @@
 DIST sentry-native-0.6.5.tar.gz 325573 BLAKE2B 6308bef5cc194c3eb8f6f30d1ee894f3d7528d31604f26d6d54cfcc1545ef561346f60c9f35e80662431ad6145cf27a4adac70255b01f230551a541fd4dae709 SHA512 0c0be06f72f53277c9a34ca6514dc96ad14b4239ee92ae65e00d45a515ce13bc314982a651c476ddbb453079ea3fc3fa0bb75cc683dce046f69f0fe1d024f32e
+DIST sentry-native-0.6.6.tar.gz 325897 BLAKE2B 0613e41aa1163c9ceb6d0aff2ad5db36d84fc0c86d3ebe9993b5e1a0ed06bcb811f0f58b20c6abfa3abbc3c2a5db655908372d439ec67412f4d152d82111509c SHA512 ee39641ee3138b92e33b29d8bfbb454f61d5ab5621d71e199be8bcbbfc220a3456372e3757a820a69c5f2ad4be474216a6b816d3e1fb483479f39ebd864a09dd
diff --git a/dev-libs/sentry-native/sentry-native-0.6.6.ebuild b/dev-libs/sentry-native/sentry-native-0.6.6.ebuild
new file mode 100644
index 000000000000..1e3a691a642a
--- /dev/null
+++ b/dev-libs/sentry-native/sentry-native-0.6.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Sentry SDK for C, C++ and native applications"
+HOMEPAGE="https://sentry.io/ https://github.com/getsentry/sentry-native"
+SRC_URI="https://github.com/getsentry/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+breakpad +curl test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	breakpad? (
+		dev-util/breakpad
+		virtual/pkgconfig
+	)
+	curl? ( net-misc/curl )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.5_cmake-breakpad.patch
+	"${FILESDIR}"/${PN}-0.6.5_no-fuzz-test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSENTRY_BUILD_EXAMPLES=OFF
+		-DSENTRY_BACKEND=$(usex breakpad "breakpad" "inproc")
+		-DSENTRY_BUILD_TESTS=$(usex test)
+		-DSENTRY_TRANSPORT=$(usex curl "curl" "none")
+	)
+	# Avoid "not used by the project" warnings when USE=-breakpad
+	if use breakpad; then
+		mycmakeargs+=( -DSENTRY_BREAKPAD_SYSTEM=ON )
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index 8f6d17a1192d..546a91de83d2 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,3 +1,2 @@
-DIST git-machete-3.17.6.gh.tar.gz 1638444 BLAKE2B 91995dec3dba53cd538db549248d9c42932ab4f4c3b7f016d60e4999617bd428c1c4fcfae3bc2aca75bba7bf62b4466e139ddada47a962f0f7d876cd220dbe34 SHA512 0766997db950a04ed5eec560be7fe1e76370d2c5f747bf121241280d44a3aff094c5828535bd11831ce1b326e05d48c8e4edf620c1dcccfbeb20e9d94c3cf023
-DIST git-machete-3.18.0.gh.tar.gz 1639576 BLAKE2B cd77ef6c86dc2eee6430bec5d371566082dd9243dc9a99d7b60e78155ce7340f8f798d59073acbb65e75483389d8ffd9a6f75520ed9f1aaa517ea31281dbd672 SHA512 ca070000020defa69e4b8592ee77e8b7f6e7a8b0397b90f0f5b6b31a9d46a85f3d17ed96b7795fab145794182d7b40dd8acd9bda498533deada6e6efae24dbca
 DIST git-machete-3.18.2.gh.tar.gz 1640834 BLAKE2B c6d19b2207fcfa649ff5a1a32a5764b7c133c0bbf9f4ee16b6dbf9b1085d328e355d7267ab07f76ae4ebb6de4db94256a85bd8fc89a4a2e54724955452f7f616 SHA512 7a1aff9e3f8a4792a33de455e97a3435a64e4a9feede2d53aa12a8d7c12528a00e232a756726b94267acb8d25264e6122240b30cf3498db03de4fafb6c6fe725
+DIST git-machete-3.20.0.gh.tar.gz 1645348 BLAKE2B d07a7a78e835eb1afbed40d4133ba9ed914492cce03fbcd5c63bdd4260e65b6300e77d1f33175c7471667f044960b2948278db27b2d29731e7afe86564207311 SHA512 ba2a7e6741ad6cf47577301dd810fcd2bf7b2436fedf4b5fd566faad62fae54861d21b14ffa9395297e28e4176a9710b13e22dbb917bc7a8cc7f9f286c9f8afc
diff --git a/dev-vcs/git-machete/git-machete-3.17.6.ebuild b/dev-vcs/git-machete/git-machete-3.17.6.ebuild
deleted file mode 100644
index 6558af28a767..000000000000
--- a/dev-vcs/git-machete/git-machete-3.17.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool"
-HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/"
-# No tests in PyPI tarballs
-SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="dev-vcs/git"
-BDEPEND="test? (
-	>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}]
-)"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	newbashcomp completion/${PN}.completion.bash ${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completion/${PN}.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/${PN}.completion.zsh _${PN}
-}
diff --git a/dev-vcs/git-machete/git-machete-3.18.2.ebuild b/dev-vcs/git-machete/git-machete-3.18.2.ebuild
index c26324c6913a..cdad063abdda 100644
--- a/dev-vcs/git-machete/git-machete-3.18.2.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.18.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-vcs/git"
 BDEPEND="test? (
diff --git a/dev-vcs/git-machete/git-machete-3.18.0.ebuild b/dev-vcs/git-machete/git-machete-3.20.0.ebuild
index c26324c6913a..c26324c6913a 100644
--- a/dev-vcs/git-machete/git-machete-3.18.0.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.20.0.ebuild
diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index b9e6820cb224..3b3c92a21275 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -2,3 +2,5 @@ DIST proton-mail-bridge-3.1.3-deps.tar.xz 206716212 BLAKE2B 4f79e4428ef37452d0ab
 DIST proton-mail-bridge-3.1.3.tar.gz 4443963 BLAKE2B 2c8fc571612c11c0e281e8f268774e886ba3742b696bdd1180d7cf45525d21d9c062cd3d33acb57a6ceed8dad6b864490c89c090ebfd4bceb4e8c41b19015ae8 SHA512 4f4ca3a2b95c7eed34a13d7f8f296d95717b9c1f95bd157e08c3f21cc752ea3dac5eaefac27662f57f875d9690a5d77a9e15f71406280dcaad6f9054b2ef54b9
 DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 2d7c8961c1ed8a6fb15a26f6b3ee650932b89626c0eea1d3acaf24b5ef6b44a90cb021a051a5f018cf94db5ccb029c4b79390275bca9a39ceeb6b5ef62aa1386 SHA512 52ff54e80635e795462e0bdbd5e02b831478a49225d296ec46ef5591cef173c49bcf63d925d503537d57ccaf65a09424f82d1c8ad8e906d822306ca22bba1121
 DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b SHA512 1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0
+DIST proton-mail-bridge-3.5.4-deps.tar.xz 246550932 BLAKE2B 6b83a8c331e70abf026d2b74c85e5e52360f4163e23bb25b8cdf25558125e675805a2850eb43d40bf02f1109204f9f5d002e0862fd9b956b88b7078c7fdd1cd0 SHA512 a5ba16e77c6d773361223fc661959d38870b47f79ff303d0940305bdbe7a3ad8444ed47e166a13e13ca52010c1153b681728870d2cec7941bdd9185f47a2d4e2
+DIST proton-mail-bridge-3.5.4.tar.gz 4428659 BLAKE2B b366ee551279a46c928cba33b8879c12a101caae24a73d8aa6110cc2269dc94a9c7208c0e6a9c25485494a886e226d446aed29b76b8a95e4229d0a0e67bcf814 SHA512 7fc82ef135da5c24607cfca14d08aafdf4e7de51b087b279dbfb42c0a363db4bfb8ed029dc598fd30ffdb298798cebc1530338c87be28e495ee7e18c24e7558d
diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.5.4.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.5.4.ebuild
new file mode 100644
index 000000000000..d64b250bc9c0
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.5.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge https://github.com/ProtonMail/proton-bridge/"
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret
+	gui? (
+		>=dev-libs/protobuf-21.12:=
+		>=dev-libs/sentry-native-0.6.5-r1
+		dev-qt/qtbase:6=[gui,icu,widgets]
+		dev-qt/qtdeclarative:6=[widgets]
+		dev-qt/qtsvg:6=
+		media-libs/mesa
+		net-libs/grpc:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	if use gui; then
+		local PATCHES=()
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	if use gui; then
+		# TODO:
+		#  - auto-sync version number between the two executables
+		#  - can we leave BRIDGE_TAG unset? Seems it gets displayed in some info box
+		local mycmakeargs=(
+			-DBRIDGE_APP_FULL_NAME="Proton Mail Bridge"
+			-DBRIDGE_APP_VERSION="${PV}+git"
+			-DBRIDGE_REPO_ROOT="${S}"
+			-DBRIDGE_TAG="NOTAG"
+			-DBRIDGE_VENDOR="Gentoo Linux"
+		)
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_configure
+	fi
+}
+
+src_compile() {
+	emake build-nogui
+
+	if use gui; then
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_compile
+	fi
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bridge ${PN}
+
+	if use gui; then
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_install
+		mv "${ED}"/usr/bin/bridge-gui "${ED}"/usr/bin/${PN}-gui || die
+	fi
+
+	systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 3.2.0; then
+				ewarn "Please note that since version 3.2.0, ${PN} by default shares usage statistics with upstream."
+				ewarn "For details, please see"
+				ewarn
+				ewarn "	https://proton.me/support/share-usage-statistics"
+				ewarn
+				ewarn "This behaviour can be disabled through ${PN}-gui, under Advanced Settings."
+				ewarn
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index e6022652a197..a1f1b3d20bb2 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,2 @@
-DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
 DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676
+DIST oidc-agent-5.0.1.tar.gz 1802435 BLAKE2B 75bc66bb2c6cc89293c7ad155d35b7a7adb73ad7f8a5aadeb029b43a095e2a80f0fc4505737a0c53c60e6f601acbcab990ad4b572b659050fe36e5dd2e7c4092 SHA512 caffa9d7733690917472d2d48ca58092ab722c5f049750de37169dc0a76ccbe374ae3fb5e56b8c578465e84a2f40795eaa26018281b4f851f7a7c94571d2a124
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch
deleted file mode 100644
index aee7184dd4a0..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -656,19 +656,19 @@
- 
- ## Man pages
- $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- endif
- 
-@@ -685,16 +685,16 @@
- 	@ln -sf $(SHARED_LIB_NAME_SO) $@
- 
- $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- endif
- 
-@@ -702,7 +702,7 @@
- 
- ## scheme handler
- $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
--	@install -p -D $< $@
-+	@install -p -m 644 -D $< $@
- 	@echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
- 
- ## Xsession
diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch
new file mode 100644
index 000000000000..6b19950e420e
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -739,7 +739,7 @@
+ 	@install -p -m 644 $< $@
+ 
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ endif
+ 
diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch
new file mode 100644
index 000000000000..d950fc879fb8
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -185,7 +185,7 @@
+ CPPFLAGS += -fPIC
+ ifndef MAC_OS
+ ifndef ANY_MSYS
+-WEBKITGTK ?= webkit2gtk-4.0
++WEBKITGTK ?= webkit2gtk-4.1
+ CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 $(WEBKITGTK)) -lstdc++
+ endif
+ endif
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
index d42def7c515c..10d657339258 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
index 22da2bbb4431..9a69211000e7 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit xdg-utils
+inherit tmpfiles xdg-utils
 
 DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
@@ -28,8 +28,8 @@ BDEPEND="test? ( dev-libs/check )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0_install-perms.patch
-	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
+	"${FILESDIR}"/${PN}-5.0.1_install-perms.patch
+	"${FILESDIR}"/${PN}-5.0.1_webkit41.patch
 )
 
 src_prepare() {
@@ -68,6 +68,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	xdg_desktop_database_update
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
@@ -78,12 +80,15 @@ pkg_postinst() {
 		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
 		elog
 	else
-		local new_major_ver old_ver
-		new_major_ver=$(ver_cut 1)
+		local old_ver
 		for old_ver in ${REPLACING_VERSIONS}; do
-			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+			if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then
+				ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes."
+				ewarn "Please consult"
+				ewarn "    https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5"
+				ewarn "for instructions on how to upgrade your configuration to this version"
 				ewarn
-				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+				ewarn "Furthermore, please restart any running instances of ${PN}"
 				ewarn "to make sure they are compatible with the updated clients."
 				ewarn
 				break