commit: 94ddd6f3cac271dc3777f1d59344790c15e161ff
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 3 20:48:52 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Mar 4 01:26:03 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ddd6f3
app-admin/keepassxc: bump to 2.7.10
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-admin/keepassxc/Manifest | 1 +
.../keepassxc/files/keepassxc-2.7.10-tests.patch | 26 +++++
app-admin/keepassxc/keepassxc-2.7.10.ebuild | 115 +++++++++++++++++++++
3 files changed, 142 insertions(+)
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index beb1fa1a8a9d..721c82a741be 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
+DIST keepassxc-2.7.10.gh.tar.gz 12367110 BLAKE2B
13016a01006cb7c7689e2b1c65a3d245c31cc445def80d8858f6c0f29ce23f0129dadaf5f31bdbdf99d9fbed51e69bc80fbb5f4ba414bb45bfc35512f3d27e3a
SHA512
265edbafdfd2951219fac8f28fe72672be798dbd93242d6b6d528a017adfed2f16f98ad753b6cdff0eca3f4d7158c9de87aa626ff7e66d3bac470595e248e271
DIST keepassxc-2.7.9-src.tar.xz 9789312 BLAKE2B
d9be3e577ae918160662558bb8bd724b5ca5982cb1bba5cda47f0dff042ea9a5c7393dd76ad195a7ba6c9b9e8371c4416840e4ff89e07c610d7351859586acfa
SHA512
255102d3b3723a80cdd5f14cde2130b37807db226b48e985bcc2ab537b482e3fb23afde331e15ed02727e98b526d894aa4567f2e82039a2ad9d33a6ad9ea08a4
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.10-tests.patch
b/app-admin/keepassxc/files/keepassxc-2.7.10-tests.patch
new file mode 100644
index 000000000000..b602024b5193
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.10-tests.patch
@@ -0,0 +1,26 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -116,8 +116,8 @@ add_unit_test(NAME testkeys SOURCES TestKeys.cpp
mock/MockChallengeResponseKey.c
+ add_unit_test(NAME testgroupmodel SOURCES TestGroupModel.cpp
+ LIBS testsupport ${TEST_LIBRARIES})
+
+-add_unit_test(NAME testentrymodel SOURCES TestEntryModel.cpp
+- LIBS testsupport ${TEST_LIBRARIES})
++# add_unit_test(NAME testentrymodel SOURCES TestEntryModel.cpp
++# LIBS testsupport ${TEST_LIBRARIES})
+
+ add_unit_test(NAME testcryptohash SOURCES TestCryptoHash.cpp
+ LIBS ${TEST_LIBRARIES})
+@@ -246,9 +246,9 @@ if(WITH_XC_NETWORKING OR WITH_XC_BROWSER)
+ add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS
${TEST_LIBRARIES})
+ endif()
+
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+- LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE
KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
++# add_unit_test(NAME testcli SOURCES TestCli.cpp
++# LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES})
++# target_compile_definitions(testcli PRIVATE
KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
diff --git a/app-admin/keepassxc/keepassxc-2.7.10.ebuild
b/app-admin/keepassxc/keepassxc-2.7.10.ebuild
new file mode 100644
index 000000000000..40ff4a658bf1
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+ https://github.com/keepassxreboot/keepassxc/";
+
+if [[ "${PV}" = *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_BRANCH="develop"
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}";
+else
+ if [[ "${PV}" == *_beta* ]] ; then
+
SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
+ -> ${P}.gh.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+
SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+ fi
+
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +keyring +network +ssh-agent test
yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/botan:3=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/readline:0=
+ sys-libs/zlib:=[minizip]
+ X? (
+ dev-qt/qtx11extras:5
+ )
+ autotype? (
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+ yubikey? (
+ dev-libs/libusb:1
+ sys-apps/pcsc-lite
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-qt/qttest:5
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ doc? (
+ dev-ruby/asciidoctor
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.7.10-tests.patch" )
+
+src_prepare() {
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] ; then
+ printf '%s' "${PV}" > .version || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # https://github.com/keepassxreboot/keepassxc/issues/5801
+ filter-lto
+
+ 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_XC_BOTAN3="ON"
+ -DWITH_XC_UPDATECHECK="OFF"
+
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)"
+ -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_X11="$(usex X)"
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=(
+ -DOVERRIDE_VERSION="${PV/_/-}"
+ )
+ fi
+
+ cmake_src_configure
+}
