1 |
commit: 4dcc7a47101df332b9a15face741c68901d0a525 |
2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 30 01:12:52 2022 +0000 |
4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 30 01:14:06 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcc7a47 |
7 |
|
8 |
app-admin/keepassxc: bump to 2.7.4 |
9 |
|
10 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
11 |
|
12 |
app-admin/keepassxc/Manifest | 1 + |
13 |
.../keepassxc/files/keepassxc-2.7.4-tests.patch | 13 +++ |
14 |
app-admin/keepassxc/keepassxc-2.7.4.ebuild | 101 +++++++++++++++++++++ |
15 |
3 files changed, 115 insertions(+) |
16 |
|
17 |
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest |
18 |
index b05501f8dc26..40e3c23e67d0 100644 |
19 |
--- a/app-admin/keepassxc/Manifest |
20 |
+++ b/app-admin/keepassxc/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9 |
23 |
DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842 |
24 |
+DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb |
25 |
|
26 |
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch |
27 |
new file mode 100644 |
28 |
index 000000000000..ccee26cb5ba9 |
29 |
--- /dev/null |
30 |
+++ b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch |
31 |
@@ -0,0 +1,13 @@ |
32 |
+--- a/tests/CMakeLists.txt |
33 |
++++ b/tests/CMakeLists.txt |
34 |
+@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER) |
35 |
+ LIBS ${TEST_LIBRARIES}) |
36 |
+ endif() |
37 |
+ |
38 |
+-add_unit_test(NAME testcli SOURCES TestCli.cpp |
39 |
+- LIBS testsupport cli ${TEST_LIBRARIES}) |
40 |
+-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>") |
41 |
+- |
42 |
+ if(WITH_GUI_TESTS) |
43 |
+ add_subdirectory(gui) |
44 |
+ endif(WITH_GUI_TESTS) |
45 |
|
46 |
diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild b/app-admin/keepassxc/keepassxc-2.7.4.ebuild |
47 |
new file mode 100644 |
48 |
index 000000000000..eced3151172f |
49 |
--- /dev/null |
50 |
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild |
51 |
@@ -0,0 +1,101 @@ |
52 |
+# Copyright 1999-2022 Gentoo Authors |
53 |
+# Distributed under the terms of the GNU General Public License v2 |
54 |
+ |
55 |
+EAPI=8 |
56 |
+ |
57 |
+inherit cmake flag-o-matic xdg |
58 |
+ |
59 |
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" |
60 |
+HOMEPAGE="https://keepassxc.org/ |
61 |
+ https://github.com/keepassxreboot/keepassxc/" |
62 |
+ |
63 |
+if [[ "${PV}" != *9999 ]] ; then |
64 |
+ if [[ "${PV}" == *_beta* ]] ; then |
65 |
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" |
66 |
+ S="${WORKDIR}/${P/_/-}" |
67 |
+ else |
68 |
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
69 |
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" |
70 |
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" |
71 |
+ fi |
72 |
+else |
73 |
+ inherit git-r3 |
74 |
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" |
75 |
+ [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" |
76 |
+fi |
77 |
+ |
78 |
+LICENSE="LGPL-2.1 GPL-2 GPL-3" |
79 |
+SLOT="0" |
80 |
+IUSE="X autotype browser doc keeshare +network test yubikey" |
81 |
+ |
82 |
+RESTRICT="!test? ( test )" |
83 |
+REQUIRED_USE="autotype? ( X )" |
84 |
+ |
85 |
+RDEPEND=" |
86 |
+ app-crypt/argon2:= |
87 |
+ dev-libs/botan:2= |
88 |
+ dev-qt/qtconcurrent:5 |
89 |
+ dev-qt/qtcore:5 |
90 |
+ dev-qt/qtdbus:5 |
91 |
+ dev-qt/qtgui:5 |
92 |
+ dev-qt/qtnetwork:5 |
93 |
+ dev-qt/qtsvg:5 |
94 |
+ dev-qt/qtwidgets:5 |
95 |
+ media-gfx/qrencode:= |
96 |
+ sys-libs/readline:0= |
97 |
+ sys-libs/zlib:= |
98 |
+ X? ( dev-qt/qtx11extras:5 ) |
99 |
+ autotype? ( |
100 |
+ x11-libs/libX11 |
101 |
+ x11-libs/libXtst |
102 |
+ ) |
103 |
+ keeshare? ( sys-libs/zlib:=[minizip] ) |
104 |
+ yubikey? ( |
105 |
+ dev-libs/libusb:1 |
106 |
+ sys-apps/pcsc-lite |
107 |
+ ) |
108 |
+" |
109 |
+DEPEND="${RDEPEND} |
110 |
+ dev-qt/qttest:5 |
111 |
+" |
112 |
+BDEPEND=" |
113 |
+ dev-qt/linguist-tools:5 |
114 |
+ doc? ( dev-ruby/asciidoctor ) |
115 |
+" |
116 |
+ |
117 |
+PATCHES=( "${FILESDIR}"/${P}-tests.patch ) |
118 |
+ |
119 |
+src_prepare() { |
120 |
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then |
121 |
+ printf '%s' "${PV}" > .version || die |
122 |
+ fi |
123 |
+ |
124 |
+ cmake_src_prepare |
125 |
+} |
126 |
+ |
127 |
+src_configure() { |
128 |
+ # https://github.com/keepassxreboot/keepassxc/issues/5801 |
129 |
+ filter-flags -flto* |
130 |
+ |
131 |
+ local mycmakeargs=( |
132 |
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or |
133 |
+ # other means. We don't want the build system to enable it for us. |
134 |
+ -DWITH_CCACHE=OFF |
135 |
+ -DWITH_GUI_TESTS=OFF |
136 |
+ -DWITH_TESTS="$(usex test)" |
137 |
+ -DWITH_XC_AUTOTYPE="$(usex autotype)" |
138 |
+ -DWITH_XC_DOCS="$(usex doc)" |
139 |
+ -DWITH_XC_BROWSER="$(usex browser)" |
140 |
+ -DWITH_XC_FDOSECRETS=ON |
141 |
+ -DWITH_XC_KEESHARE="$(usex keeshare)" |
142 |
+ -DWITH_XC_NETWORKING="$(usex network)" |
143 |
+ -DWITH_XC_SSHAGENT=ON |
144 |
+ -DWITH_XC_UPDATECHECK=OFF |
145 |
+ -DWITH_XC_YUBIKEY="$(usex yubikey)" |
146 |
+ -DWITH_XC_X11="$(usex X)" |
147 |
+ ) |
148 |
+ if [[ "${PV}" == *_beta* ]] ; then |
149 |
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) |
150 |
+ fi |
151 |
+ cmake_src_configure |
152 |
+} |