1 |
commit: f4f777ec8fed602312d50a185be63749aa6c6a8a |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 28 17:35:35 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 28 17:48:27 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f777ec |
7 |
|
8 |
app-admin/keepassxc: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
app-admin/keepassxc/Manifest | 2 - |
13 |
.../keepassxc/files/keepassxc-2.6.4-quazip1.patch | 28 ------- |
14 |
app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild | 95 --------------------- |
15 |
app-admin/keepassxc/keepassxc-2.6.5.ebuild | 98 ---------------------- |
16 |
4 files changed, 223 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest |
19 |
index 46a0d186df9..bdde1c3d9cb 100644 |
20 |
--- a/app-admin/keepassxc/Manifest |
21 |
+++ b/app-admin/keepassxc/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb |
24 |
-DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B d51782c65fffc4499d85cfa893a908b1f5964fc018a8b878ee61896684e55c8f3d935f7c14d38ba75f26fda3b59b6e408b77b68e11504b9fb95d82fdcc02bf5a SHA512 a5993170ff7e28cb56fc14fbbb7e93a5821b2edefd6d8cd6ce798f810c8045595913a8508c9a256363028be93aaad6ff2f13904ebc19229309d356e119ed0dce |
25 |
DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7 |
26 |
|
27 |
diff --git a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch |
28 |
deleted file mode 100644 |
29 |
index 42f4fe7478b..00000000000 |
30 |
--- a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch |
31 |
+++ /dev/null |
32 |
@@ -1,28 +0,0 @@ |
33 |
-From efbb6fc9da02fed4e5db21858aa7d265081df2c8 Mon Sep 17 00:00:00 2001 |
34 |
-From: Antonio Rojas <arojas@×××××××××.org> |
35 |
-Date: Mon, 5 Oct 2020 21:00:24 +0200 |
36 |
-Subject: [PATCH] Support quazip 1.0 |
37 |
- |
38 |
---- |
39 |
- cmake/FindQuaZip.cmake | 4 ++-- |
40 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
41 |
- |
42 |
-diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake |
43 |
-index a387e2f81..9fab3e579 100644 |
44 |
---- a/cmake/FindQuaZip.cmake |
45 |
-+++ b/cmake/FindQuaZip.cmake |
46 |
-@@ -10,12 +10,12 @@ if(MINGW) |
47 |
- find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h) |
48 |
- else() |
49 |
- find_library(QUAZIP_LIBRARIES |
50 |
-- NAMES quazip5 quazip |
51 |
-+ NAMES quazip5 quazip quazip1-qt5 |
52 |
- PATHS /usr/lib /usr/lib64 /usr/local/lib |
53 |
- ) |
54 |
- find_path(QUAZIP_INCLUDE_DIR quazip.h |
55 |
- PATHS /usr/include /usr/local/include |
56 |
-- PATH_SUFFIXES quazip5 quazip |
57 |
-+ PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip |
58 |
- ) |
59 |
- find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) |
60 |
- endif() |
61 |
|
62 |
diff --git a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild |
63 |
deleted file mode 100644 |
64 |
index e15340b8174..00000000000 |
65 |
--- a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild |
66 |
+++ /dev/null |
67 |
@@ -1,95 +0,0 @@ |
68 |
-# Copyright 1999-2021 Gentoo Authors |
69 |
-# Distributed under the terms of the GNU General Public License v2 |
70 |
- |
71 |
-EAPI=7 |
72 |
- |
73 |
-inherit cmake flag-o-matic xdg |
74 |
- |
75 |
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" |
76 |
-HOMEPAGE="https://keepassxc.org" |
77 |
- |
78 |
-if [[ "${PV}" != 9999 ]] ; then |
79 |
- if [[ "${PV}" == *_beta* ]] ; then |
80 |
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" |
81 |
- S="${WORKDIR}/${P/_/-}" |
82 |
- else |
83 |
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
84 |
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" |
85 |
- KEYWORDS="amd64 ~arm64 ~ppc64 x86" |
86 |
- fi |
87 |
-else |
88 |
- inherit git-r3 |
89 |
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" |
90 |
-fi |
91 |
- |
92 |
-LICENSE="LGPL-2.1 GPL-2 GPL-3" |
93 |
-SLOT="0" |
94 |
-IUSE="autotype browser ccache keeshare +network test yubikey" |
95 |
- |
96 |
-RESTRICT="!test? ( test )" |
97 |
- |
98 |
-RDEPEND=" |
99 |
- app-crypt/argon2:= |
100 |
- dev-libs/libgcrypt:= |
101 |
- >=dev-libs/libsodium-1.0.12:= |
102 |
- dev-qt/qtconcurrent:5 |
103 |
- dev-qt/qtcore:5 |
104 |
- dev-qt/qtdbus:5 |
105 |
- dev-qt/qtgui:5 |
106 |
- dev-qt/qtnetwork:5 |
107 |
- dev-qt/qtsvg:5 |
108 |
- dev-qt/qtwidgets:5 |
109 |
- media-gfx/qrencode:= |
110 |
- sys-libs/readline:0= |
111 |
- sys-libs/zlib:= |
112 |
- autotype? ( |
113 |
- dev-qt/qtx11extras:5 |
114 |
- x11-libs/libX11 |
115 |
- x11-libs/libXi |
116 |
- x11-libs/libXtst |
117 |
- ) |
118 |
- keeshare? ( dev-libs/quazip:0= ) |
119 |
- yubikey? ( sys-auth/ykpers ) |
120 |
-" |
121 |
- |
122 |
-DEPEND=" |
123 |
- ${RDEPEND} |
124 |
- dev-qt/linguist-tools:5 |
125 |
- dev-qt/qttest:5 |
126 |
-" |
127 |
-BDEPEND=" |
128 |
- ccache? ( dev-util/ccache ) |
129 |
-" |
130 |
- |
131 |
-PATCHES=( "${FILESDIR}"/${P}-quazip1.patch ) # pending upstream PR#5511 |
132 |
- |
133 |
-src_prepare() { |
134 |
- use test || \ |
135 |
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die |
136 |
- |
137 |
- cmake_src_prepare |
138 |
-} |
139 |
- |
140 |
-src_configure() { |
141 |
- # https://github.com/keepassxreboot/keepassxc/issues/5801 |
142 |
- filter-flags -flto* |
143 |
- |
144 |
- local mycmakeargs=( |
145 |
- -DWITH_CCACHE="$(usex ccache)" |
146 |
- -DWITH_GUI_TESTS=OFF |
147 |
- -DWITH_TESTS="$(usex test)" |
148 |
- -DWITH_XC_AUTOTYPE="$(usex autotype)" |
149 |
- -DWITH_XC_DOCS=OFF |
150 |
- -DWITH_XC_BROWSER="$(usex browser)" |
151 |
- -DWITH_XC_FDOSECRETS=ON |
152 |
- -DWITH_XC_KEESHARE="$(usex keeshare)" |
153 |
- -DWITH_XC_NETWORKING="$(usex network)" |
154 |
- -DWITH_XC_SSHAGENT=ON |
155 |
- -DWITH_XC_UPDATECHECK=OFF |
156 |
- -DWITH_XC_YUBIKEY="$(usex yubikey)" |
157 |
- ) |
158 |
- if [[ "${PV}" == *_beta* ]] ; then |
159 |
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) |
160 |
- fi |
161 |
- cmake_src_configure |
162 |
-} |
163 |
|
164 |
diff --git a/app-admin/keepassxc/keepassxc-2.6.5.ebuild b/app-admin/keepassxc/keepassxc-2.6.5.ebuild |
165 |
deleted file mode 100644 |
166 |
index 4b62059e2dc..00000000000 |
167 |
--- a/app-admin/keepassxc/keepassxc-2.6.5.ebuild |
168 |
+++ /dev/null |
169 |
@@ -1,98 +0,0 @@ |
170 |
-# Copyright 1999-2021 Gentoo Authors |
171 |
-# Distributed under the terms of the GNU General Public License v2 |
172 |
- |
173 |
-EAPI=7 |
174 |
- |
175 |
-inherit cmake flag-o-matic xdg |
176 |
- |
177 |
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" |
178 |
-HOMEPAGE="https://keepassxc.org" |
179 |
- |
180 |
-if [[ "${PV}" != 9999 ]] ; then |
181 |
- if [[ "${PV}" == *_beta* ]] ; then |
182 |
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" |
183 |
- S="${WORKDIR}/${P/_/-}" |
184 |
- else |
185 |
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
186 |
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" |
187 |
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
188 |
- fi |
189 |
-else |
190 |
- inherit git-r3 |
191 |
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" |
192 |
-fi |
193 |
- |
194 |
-LICENSE="LGPL-2.1 GPL-2 GPL-3" |
195 |
-SLOT="0" |
196 |
-IUSE="autotype browser ccache doc keeshare +network test yubikey" |
197 |
- |
198 |
-RESTRICT="!test? ( test )" |
199 |
- |
200 |
-RDEPEND=" |
201 |
- app-crypt/argon2:= |
202 |
- dev-libs/libgcrypt:= |
203 |
- >=dev-libs/libsodium-1.0.12:= |
204 |
- dev-qt/qtconcurrent:5 |
205 |
- dev-qt/qtcore:5 |
206 |
- dev-qt/qtdbus:5 |
207 |
- dev-qt/qtgui:5 |
208 |
- dev-qt/qtnetwork:5 |
209 |
- dev-qt/qtsvg:5 |
210 |
- dev-qt/qtwidgets:5 |
211 |
- media-gfx/qrencode:= |
212 |
- sys-libs/readline:0= |
213 |
- sys-libs/zlib:= |
214 |
- autotype? ( |
215 |
- dev-qt/qtx11extras:5 |
216 |
- x11-libs/libX11 |
217 |
- x11-libs/libXi |
218 |
- x11-libs/libXtst |
219 |
- ) |
220 |
- keeshare? ( dev-libs/quazip:0= ) |
221 |
- yubikey? ( sys-auth/ykpers ) |
222 |
-" |
223 |
- |
224 |
-DEPEND=" |
225 |
- ${RDEPEND} |
226 |
- dev-qt/linguist-tools:5 |
227 |
- dev-qt/qttest:5 |
228 |
-" |
229 |
-BDEPEND=" |
230 |
- ccache? ( dev-util/ccache ) |
231 |
- doc? ( dev-ruby/asciidoctor ) |
232 |
-" |
233 |
- |
234 |
-src_prepare() { |
235 |
- use test || \ |
236 |
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die |
237 |
- |
238 |
- if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then |
239 |
- printf '%s' "${PV}" > .version || die |
240 |
- fi |
241 |
- |
242 |
- cmake_src_prepare |
243 |
-} |
244 |
- |
245 |
-src_configure() { |
246 |
- # https://github.com/keepassxreboot/keepassxc/issues/5801 |
247 |
- filter-flags -flto* |
248 |
- |
249 |
- local mycmakeargs=( |
250 |
- -DWITH_CCACHE="$(usex ccache)" |
251 |
- -DWITH_GUI_TESTS=OFF |
252 |
- -DWITH_TESTS="$(usex test)" |
253 |
- -DWITH_XC_AUTOTYPE="$(usex autotype)" |
254 |
- -DWITH_XC_DOCS="$(usex doc)" |
255 |
- -DWITH_XC_BROWSER="$(usex browser)" |
256 |
- -DWITH_XC_FDOSECRETS=ON |
257 |
- -DWITH_XC_KEESHARE="$(usex keeshare)" |
258 |
- -DWITH_XC_NETWORKING="$(usex network)" |
259 |
- -DWITH_XC_SSHAGENT=ON |
260 |
- -DWITH_XC_UPDATECHECK=OFF |
261 |
- -DWITH_XC_YUBIKEY="$(usex yubikey)" |
262 |
- ) |
263 |
- if [[ "${PV}" == *_beta* ]] ; then |
264 |
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) |
265 |
- fi |
266 |
- cmake_src_configure |
267 |
-} |