From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E0281581EE for ; Mon, 07 Apr 2025 16:10:41 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8501D3430D4 for ; Mon, 07 Apr 2025 16:10:41 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C55471104B7; Mon, 07 Apr 2025 16:10:37 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id BE0AE1104B7 for ; Mon, 07 Apr 2025 16:10:37 +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 74C603430CD for ; Mon, 07 Apr 2025 16:10:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC9691EEA for ; Mon, 07 Apr 2025 16:10:35 +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: <1744042231.1dbfd4afdf92d98d4f1d080559e344014e91638a.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepassxc/keepassxc-2.7.10.ebuild X-VCS-Directories: app-admin/keepassxc/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 1dbfd4afdf92d98d4f1d080559e344014e91638a X-VCS-Branch: master Date: Mon, 07 Apr 2025 16:10:35 +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: c82b5e49-fe6a-4665-95dc-c24fa5fc56b0 X-Archives-Hash: 34b889269691a10fd2af78c6af735089 commit: 1dbfd4afdf92d98d4f1d080559e344014e91638a Author: Filip Kobierski pm me> AuthorDate: Mon Apr 7 15:49:42 2025 +0000 Commit: Maciej Barć gentoo org> CommitDate: Mon Apr 7 16:10:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dbfd4af app-admin/keepassxc: minor tweaks - remove github from HOMEPAGE - fix LICENSE - simplify src_prepare - use bash's `=~` for regex matching - use plain `echo` instead of `printf '%s' Signed-off-by: Filip Kobierski pm.me> Closes: https://github.com/gentoo/gentoo/pull/41475 Signed-off-by: Maciej Barć gentoo.org> app-admin/keepassxc/keepassxc-2.7.10.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-admin/keepassxc/keepassxc-2.7.10.ebuild b/app-admin/keepassxc/keepassxc-2.7.10.ebuild index b0be6548e2c5..c82d98106dc3 100644 --- a/app-admin/keepassxc/keepassxc-2.7.10.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.10.ebuild @@ -6,8 +6,7 @@ EAPI=8 inherit cmake flag-o-matic xdg DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org/ - https://github.com/keepassxreboot/keepassxc/" +HOMEPAGE="https://keepassxc.org" if [[ "${PV}" = *9999* ]] ; then inherit git-r3 @@ -27,7 +26,8 @@ else KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" fi -LICENSE="LGPL-2.1 GPL-2 GPL-3" +# COPYING order +LICENSE="|| ( GPL-2 GPL-3 ) BSD LGPL-2.1 MIT LGPL-2 CC0-1.0 Apache-2.0 GPL-2+ BSD-2" SLOT="0" IUSE="X autotype browser doc keeshare +keyring +network +ssh-agent test yubikey" @@ -73,8 +73,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.7.10-tests.patch" ) src_prepare() { - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] ; then - printf '%s' "${PV}" > .version || die + if ! [[ "${PV}" =~ _beta|9999 ]]; then + echo "${PV}" > .version || die fi cmake_src_prepare