commit:     4dcc7a47101df332b9a15face741c68901d0a525
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 01:12:52 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 01:14:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcc7a47

app-admin/keepassxc: bump to 2.7.4

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

 app-admin/keepassxc/Manifest                       |   1 +
 .../keepassxc/files/keepassxc-2.7.4-tests.patch    |  13 +++
 app-admin/keepassxc/keepassxc-2.7.4.ebuild         | 101 +++++++++++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index b05501f8dc26..40e3c23e67d0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 
4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae
 SHA512 
c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
 DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 
7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080
 SHA512 
29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
+DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 
5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4
 SHA512 
76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb

diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch 
b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
new file mode 100644
index 000000000000..ccee26cb5ba9
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
@@ -0,0 +1,13 @@
+--- 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-2.7.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
new file mode 100644
index 000000000000..eced3151172f
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 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
+       if [[ "${PV}" == *_beta* ]] ; then
+               
SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz 
-> ${P}.tar.gz"
+               S="${WORKDIR}/${P/_/-}"
+       else
+               
#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+               
SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz";
+               KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+       fi
+else
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}";
+       [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+       app-crypt/argon2:=
+       dev-libs/botan:2=
+       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:=
+       X? ( dev-qt/qtx11extras:5 )
+       autotype? (
+               x11-libs/libX11
+               x11-libs/libXtst
+       )
+       keeshare? ( sys-libs/zlib:=[minizip] )
+       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}"/${P}-tests.patch )
+
+src_prepare() {
+       if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f 
.version ]] ; then
+               printf '%s' "${PV}" > .version || die
+       fi
+
+       cmake_src_prepare
+}
+
+src_configure() {
+       # https://github.com/keepassxreboot/keepassxc/issues/5801
+       filter-flags -flto*
+
+       local 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_TESTS="$(usex test)"
+               -DWITH_XC_AUTOTYPE="$(usex autotype)"
+               -DWITH_XC_DOCS="$(usex doc)"
+               -DWITH_XC_BROWSER="$(usex browser)"
+               -DWITH_XC_FDOSECRETS=ON
+               -DWITH_XC_KEESHARE="$(usex keeshare)"
+               -DWITH_XC_NETWORKING="$(usex network)"
+               -DWITH_XC_SSHAGENT=ON
+               -DWITH_XC_UPDATECHECK=OFF
+               -DWITH_XC_YUBIKEY="$(usex yubikey)"
+               -DWITH_XC_X11="$(usex X)"
+       )
+       if [[ "${PV}" == *_beta* ]] ; then
+               mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+       fi
+       cmake_src_configure
+}

Reply via email to