[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/

[Maciej Barć]

commit:     8790250a5f2b5e0a12d5442447ca6ec1958ace3b
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  3 21:04:23 2025 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Mar  4 01:26:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8790250a

app-admin/keepassxc: sync live 9999

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../keepassxc/files/keepassxc-2.7.4-tests.patch    | 13 ----------
 app-admin/keepassxc/keepassxc-9999.ebuild          | 28 ++++++++++++----------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch 
b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
deleted file mode 100644
index ccee26cb5ba9..000000000000
--- a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER)
-         LIBS ${TEST_LIBRARIES})
- endif()
- 
--add_unit_test(NAME testcli SOURCES TestCli.cpp
--        LIBS testsupport cli ${TEST_LIBRARIES})
--target_compile_definitions(testcli PRIVATE 
KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
--
- if(WITH_GUI_TESTS)
-     add_subdirectory(gui)
- endif(WITH_GUI_TESTS)

diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild 
b/app-admin/keepassxc/keepassxc-9999.ebuild
index 59e7e3954042..40ff4a658bf1 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,10 +17,11 @@ if [[ "${PV}" = *9999* ]] ; then
 else
        if [[ "${PV}" == *_beta* ]] ; then
                
SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
-                       -> ${P}.tar.gz"
+                       -> ${P}.gh.tar.gz"
                S="${WORKDIR}/${P/_/-}"
        else
-               
SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz";
+               
SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV}.tar.gz
+                       -> ${P}.gh.tar.gz"
        fi
 
        KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
@@ -69,12 +70,10 @@ BDEPEND="
        )
 "
 
-PATCHES=(
-       "${FILESDIR}/${PN}-2.7.4-tests.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2.7.10-tests.patch" )
 
 src_prepare() {
-       if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f 
.version ]] ; then
+       if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] ; then
                printf '%s' "${PV}" > .version || die
        fi
 
@@ -88,26 +87,29 @@ src_configure() {
        local -a mycmakeargs=(
                # Gentoo users enable ccache via e.g. FEATURES=ccache or
                # other means. We don't want the build system to enable it for 
us.
-               -DWITH_CCACHE=OFF
-               -DWITH_GUI_TESTS=OFF
+               -DWITH_CCACHE="OFF"
+               -DWITH_GUI_TESTS="OFF"
+               -DWITH_XC_BOTAN3="ON"
+               -DWITH_XC_UPDATECHECK="OFF"
+
                -DWITH_TESTS="$(usex test)"
                -DWITH_XC_AUTOTYPE="$(usex autotype)"
-               -DWITH_XC_DOCS="$(usex doc)"
                -DWITH_XC_BROWSER="$(usex browser)"
                -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)"
-               -DWITH_XC_BOTAN3=ON
+               -DWITH_XC_DOCS="$(usex doc)"
                -DWITH_XC_FDOSECRETS="$(usex keyring)"
                -DWITH_XC_KEESHARE="$(usex keeshare)"
                -DWITH_XC_NETWORKING="$(usex network)"
                -DWITH_XC_SSHAGENT="$(usex ssh-agent)"
-               -DWITH_XC_UPDATECHECK=OFF
-               -DWITH_XC_YUBIKEY="$(usex yubikey)"
                -DWITH_XC_X11="$(usex X)"
+               -DWITH_XC_YUBIKEY="$(usex yubikey)"
        )
+
        if [[ "${PV}" == *_beta* ]] ; then
                mycmakeargs+=(
                        -DOVERRIDE_VERSION="${PV/_/-}"
                )
        fi
+
        cmake_src_configure
 }