| 1 |
commit: 9adb37d87d413c6d361a178d92edacab78226691 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 28 14:46:37 2022 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 28 14:56:50 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9adb37d8 |
| 7 |
|
| 8 |
app-admin/keepassxc: Only use 2.7 development branch in 9999 live ebuild |
| 9 |
|
| 10 |
Fixed dependencies |
| 11 |
|
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
app-admin/keepassxc/keepassxc-9999.ebuild | 26 +++++++++++++------------- |
| 15 |
1 file changed, 13 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild |
| 18 |
index 44ca0b85d8d9..6eb2c5dbb6e3 100644 |
| 19 |
--- a/app-admin/keepassxc/keepassxc-9999.ebuild |
| 20 |
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=8 |
| 27 |
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic xdg |
| 28 |
DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" |
| 29 |
HOMEPAGE="https://keepassxc.org" |
| 30 |
|
| 31 |
-if [[ "${PV}" != 9999 ]] ; then |
| 32 |
+if [[ "${PV}" != *9999 ]] ; then |
| 33 |
if [[ "${PV}" == *_beta* ]] ; then |
| 34 |
SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" |
| 35 |
S="${WORKDIR}/${P/_/-}" |
| 36 |
@@ -20,6 +20,7 @@ if [[ "${PV}" != 9999 ]] ; then |
| 37 |
else |
| 38 |
inherit git-r3 |
| 39 |
EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" |
| 40 |
+ [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" |
| 41 |
fi |
| 42 |
|
| 43 |
LICENSE="LGPL-2.1 GPL-2 GPL-3" |
| 44 |
@@ -29,9 +30,7 @@ IUSE="autotype browser ccache doc keeshare +network test yubikey" |
| 45 |
RESTRICT="!test? ( test )" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
- app-crypt/argon2:= |
| 49 |
- dev-libs/libgcrypt:= |
| 50 |
- >=dev-libs/libsodium-1.0.12:= |
| 51 |
+ dev-libs/botan:2 |
| 52 |
dev-qt/qtconcurrent:5 |
| 53 |
dev-qt/qtcore:5 |
| 54 |
dev-qt/qtdbus:5 |
| 55 |
@@ -45,11 +44,13 @@ RDEPEND=" |
| 56 |
autotype? ( |
| 57 |
dev-qt/qtx11extras:5 |
| 58 |
x11-libs/libX11 |
| 59 |
- x11-libs/libXi |
| 60 |
x11-libs/libXtst |
| 61 |
) |
| 62 |
- keeshare? ( dev-libs/quazip:0= ) |
| 63 |
- yubikey? ( sys-auth/ykpers ) |
| 64 |
+ keeshare? ( sys-libs/zlib:=[minizip] ) |
| 65 |
+ yubikey? ( |
| 66 |
+ dev-libs/libusb:1 |
| 67 |
+ sys-apps/pcsc-lite |
| 68 |
+ ) |
| 69 |
" |
| 70 |
|
| 71 |
DEPEND=" |
| 72 |
@@ -63,10 +64,7 @@ BDEPEND=" |
| 73 |
" |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
- use test || \ |
| 77 |
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die |
| 78 |
- |
| 79 |
- if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then |
| 80 |
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then |
| 81 |
printf '%s' "${PV}" > .version || die |
| 82 |
fi |
| 83 |
|
| 84 |
@@ -86,7 +84,6 @@ src_configure() { |
| 85 |
-DWITH_XC_BROWSER="$(usex browser)" |
| 86 |
-DWITH_XC_FDOSECRETS=ON |
| 87 |
-DWITH_XC_KEESHARE="$(usex keeshare)" |
| 88 |
- -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" |
| 89 |
-DWITH_XC_NETWORKING="$(usex network)" |
| 90 |
-DWITH_XC_SSHAGENT=ON |
| 91 |
-DWITH_XC_UPDATECHECK=OFF |
| 92 |
@@ -95,5 +92,8 @@ src_configure() { |
| 93 |
if [[ "${PV}" == *_beta* ]] ; then |
| 94 |
mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) |
| 95 |
fi |
| 96 |
+ if [[ "${PV}" != 9999 ]] ; then |
| 97 |
+ mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" ) |
| 98 |
+ fi |
| 99 |
cmake_src_configure |
| 100 |
} |
Archives