app-admin/keepassxc: Unconditionally depend on dev-qt/qttest:5

Added support for ssh-agent.

Closes: https://bugs.gentoo.org/649260
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/app-admin/keepassxc/keepassxc-2.3.0.ebuild b/app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild
similarity index 97%
rename from app-admin/keepassxc/keepassxc-2.3.0.ebuild
rename to app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild
index 6207e109fd62d95b1c0e792a5e9239ebc7a451b5..69a10050827849598355f00feb4809cf3ef61bd2 100644 (file)
--- a/app-admin/keepassxc/keepassxc-2.3.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild
@@ -43,8 +43,8 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        dev-qt/linguist-tools:5
+       dev-qt/qttest:5
        dev-qt/qtconcurrent:5
-       test? ( dev-qt/qttest:5 )
 "
 
 src_prepare() {
@@ -59,9 +59,10 @@ src_configure() {
                -DWITH_GUI_TESTS=OFF
                -DWITH_TESTS="$(usex test)"
                -DWITH_XC_AUTOTYPE="$(usex autotype)"
+               -DWITH_XC_BROWSER="$(usex browser)"
                -DWITH_XC_HTTP=OFF
                -DWITH_XC_NETWORKING="$(usex network)"
-               -DWITH_XC_BROWSER="$(usex browser)"
+               -DWITH_XC_SSHAGENT=ON
                -DWITH_XC_YUBIKEY="$(usex yubikey)"
        )
        cmake-utils_src_configure

diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 6207e109fd62d95b1c0e792a5e9239ebc7a451b5..69a10050827849598355f00feb4809cf3ef61bd2 100644 (file)
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -43,8 +43,8 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        dev-qt/linguist-tools:5
+       dev-qt/qttest:5
        dev-qt/qtconcurrent:5
-       test? ( dev-qt/qttest:5 )
 "
 
 src_prepare() {
@@ -59,9 +59,10 @@ src_configure() {
                -DWITH_GUI_TESTS=OFF
                -DWITH_TESTS="$(usex test)"
                -DWITH_XC_AUTOTYPE="$(usex autotype)"
+               -DWITH_XC_BROWSER="$(usex browser)"
                -DWITH_XC_HTTP=OFF
                -DWITH_XC_NETWORKING="$(usex network)"
-               -DWITH_XC_BROWSER="$(usex browser)"
+               -DWITH_XC_SSHAGENT=ON
                -DWITH_XC_YUBIKEY="$(usex yubikey)"
        )
        cmake-utils_src_configure