[patch] 0001-app-admin-keepassxc-add-missing-dependencies.patch (fixed)

0001-app-admin-keepassxc-add-missing-dependencies.patch (text/plain), 2.24 KB, created by Sam James on 2022-03-22 21:26:35 UTC

From 6287eed55028ba0a69823cdd449acec54a73fb40 Mon Sep 17 00:00:00 2001
From: Sam James <[e-mail]>
Date: Tue, 22 Mar 2022 21:16:08 +0000
Subject: [PATCH 1/2] app-admin/keepassxc: add missing dependencies

- Botan exposes a subslot for its ABI so a subslot (:=) dep should be used
- Add missing argon2 dependency
- autotype: add missing libXi dependency

(Note that for autotype, it seems to always end up being built
(and finding dependencies?) even if the option is off?)

Closes: https://bugs.gentoo.org/782244
Signed-off-by: Sam James <[e-mail]>
---
 .../{keepassxc-2.7.0.ebuild => keepassxc-2.7.0-r1.ebuild}     | 4 +++-
 app-admin/keepassxc/keepassxc-9999.ebuild                     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename app-admin/keepassxc/{keepassxc-2.7.0.ebuild => keepassxc-2.7.0-r1.ebuild} (97%)

diff --git a/app-admin/keepassxc/keepassxc-2.7.0.ebuild b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
similarity index 97%
rename from app-admin/keepassxc/keepassxc-2.7.0.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
index 3d0e25a306e7..7e361326ccd8 100644
--- a/app-admin/keepassxc/keepassxc-2.7.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
@@ -30,7 +30,8 @@ IUSE="autotype browser ccache doc keeshare +network test yubikey"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/botan:2
+	app-crypt/argon2:=
+	dev-libs/botan:2=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -44,6 +45,7 @@ RDEPEND="
 	autotype? (
 		dev-qt/qtx11extras:5
 		x11-libs/libX11
+		x11-libs/libXi
 		x11-libs/libXtst
 	)
 	keeshare? ( sys-libs/zlib:=[minizip] )
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 3d0e25a306e7..7e361326ccd8 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -30,7 +30,8 @@ IUSE="autotype browser ccache doc keeshare +network test yubikey"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/botan:2
+	app-crypt/argon2:=
+	dev-libs/botan:2=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -44,6 +45,7 @@ RDEPEND="
 	autotype? (
 		dev-qt/qtx11extras:5
 		x11-libs/libX11
+		x11-libs/libXi
 		x11-libs/libXtst
 	)
 	keeshare? ( sys-libs/zlib:=[minizip] )
-- 
2.35.1