From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78764158088 for ; Fri, 28 Jan 2022 14:57:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CA912BC017; Fri, 28 Jan 2022 14:57:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCE1B2BC017 for ; Fri, 28 Jan 2022 14:57:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E1A0342D44 for ; Fri, 28 Jan 2022 14:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 068941BD for ; Fri, 28 Jan 2022 14:56:58 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1643381810.9adb37d87d413c6d361a178d92edacab78226691.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepassxc/keepassxc-9999.ebuild X-VCS-Directories: app-admin/keepassxc/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9adb37d87d413c6d361a178d92edacab78226691 X-VCS-Branch: master Date: Fri, 28 Jan 2022 14:56:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cf969702-721c-46eb-926f-c5a6e81f0485 X-Archives-Hash: a3f4773c5294034a595790db724937a8 commit: 9adb37d87d413c6d361a178d92edacab78226691 Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 28 14:46:37 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 28 14:56:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9adb37d8 app-admin/keepassxc: Only use 2.7 development branch in 9999 live ebuild Fixed dependencies Signed-off-by: Lars Wendler gentoo.org> app-admin/keepassxc/keepassxc-9999.ebuild | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 44ca0b85d8d9..6eb2c5dbb6e3 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit cmake flag-o-matic xdg DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" HOMEPAGE="https://keepassxc.org" -if [[ "${PV}" != 9999 ]] ; then +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/_/-}" @@ -20,6 +20,7 @@ if [[ "${PV}" != 9999 ]] ; then 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" @@ -29,9 +30,7 @@ IUSE="autotype browser ccache doc keeshare +network test yubikey" RESTRICT="!test? ( test )" RDEPEND=" - app-crypt/argon2:= - dev-libs/libgcrypt:= - >=dev-libs/libsodium-1.0.12:= + dev-libs/botan:2 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -45,11 +44,13 @@ RDEPEND=" autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 - x11-libs/libXi x11-libs/libXtst ) - keeshare? ( dev-libs/quazip:0= ) - yubikey? ( sys-auth/ykpers ) + keeshare? ( sys-libs/zlib:=[minizip] ) + yubikey? ( + dev-libs/libusb:1 + sys-apps/pcsc-lite + ) " DEPEND=" @@ -63,10 +64,7 @@ BDEPEND=" " src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die - - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then printf '%s' "${PV}" > .version || die fi @@ -86,7 +84,6 @@ src_configure() { -DWITH_XC_BROWSER="$(usex browser)" -DWITH_XC_FDOSECRETS=ON -DWITH_XC_KEESHARE="$(usex keeshare)" - -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" -DWITH_XC_NETWORKING="$(usex network)" -DWITH_XC_SSHAGENT=ON -DWITH_XC_UPDATECHECK=OFF @@ -95,5 +92,8 @@ src_configure() { if [[ "${PV}" == *_beta* ]] ; then mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) fi + if [[ "${PV}" != 9999 ]] ; then + mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" ) + fi cmake_src_configure }