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 25876158020 for ; Wed, 26 Oct 2022 13:40:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48BAFE0916; Wed, 26 Oct 2022 13:40:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 2E1E3E0916 for ; Wed, 26 Oct 2022 13:40:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 05FD633E830 for ; Wed, 26 Oct 2022 13:40:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E3AC61D for ; Wed, 26 Oct 2022 13:40:14 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1666791332.98a9e1bb66465f35d24eb9ee564277ecd782aed4.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepassxc/Manifest app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch app-admin/keepassxc/keepassxc-2.7.3.ebuild X-VCS-Directories: app-admin/keepassxc/ app-admin/keepassxc/files/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 98a9e1bb66465f35d24eb9ee564277ecd782aed4 X-VCS-Branch: master Date: Wed, 26 Oct 2022 13:40:14 +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: fce6d6b2-bc7d-485c-9111-6797772c8031 X-Archives-Hash: f6497d2e7562260c907391c0f9d5d70c commit: 98a9e1bb66465f35d24eb9ee564277ecd782aed4 Author: Maciej Barć gentoo org> AuthorDate: Wed Oct 26 13:29:22 2022 +0000 Commit: Maciej Barć gentoo org> CommitDate: Wed Oct 26 13:35:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a9e1bb app-admin/keepassxc: bump to 2.7.3 Signed-off-by: Maciej Barć gentoo.org> app-admin/keepassxc/Manifest | 1 + .../keepassxc/files/keepassxc-2.7.3-tests.patch | 14 +++ app-admin/keepassxc/keepassxc-2.7.3.ebuild | 101 +++++++++++++++++++++ 3 files changed, 116 insertions(+) diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index f0479c7ab83a..b05501f8dc26 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1 +1,2 @@ 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 diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch new file mode 100644 index 000000000000..52ca2b7eb610 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch @@ -0,0 +1,14 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 776c40d9..477bf179 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER) + LIBS ${TEST_LIBRARIES}) + endif() + +-add_unit_test(NAME testcli SOURCES TestCli.cpp +- LIBS testsupport cli ${TEST_LIBRARIES}) +- + if(WITH_GUI_TESTS) + add_subdirectory(gui) + endif(WITH_GUI_TESTS) diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.3.ebuild new file mode 100644 index 000000000000..eced3151172f --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.7.3.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 +}