From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1519675-garchives=archives.gentoo.org@lists.gentoo.org>
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 01EDC15806E
for <garchives@archives.gentoo.org>; Fri, 19 May 2023 08:37:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2CAB3E0882;
Fri, 19 May 2023 08:37:55 +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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0E583E0882
for <gentoo-commits@lists.gentoo.org>; Fri, 19 May 2023 08:37:55 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1AC2B3408A2
for <gentoo-commits@lists.gentoo.org>; Fri, 19 May 2023 08:37:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 784DFA75
for <gentoo-commits@lists.gentoo.org>; Fri, 19 May 2023 08:37:51 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1684485459.02e2e4a6fa33e33d73a43c1b257350ee00aa004a.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-admin/keepassxc/Manifest app-admin/keepassxc/keepassxc-2.7.5.ebuild app-admin/keepassxc/keepassxc-9999.ebuild
X-VCS-Directories: app-admin/keepassxc/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 02e2e4a6fa33e33d73a43c1b257350ee00aa004a
X-VCS-Branch: master
Date: Fri, 19 May 2023 08:37:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9b1a8114-6eb5-4e1c-9b25-2f4a463d7509
X-Archives-Hash: 26a6c0941518bf290863f2e3ebf7123e
commit: 02e2e4a6fa33e33d73a43c1b257350ee00aa004a
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 08:36:42 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 19 08:37:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e2e4a6
app-admin/keepassxc: add 2.7.5
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/keepassxc/Manifest | 1 +
.../{keepassxc-9999.ebuild => keepassxc-2.7.5.ebuild} | 10 +++++-----
app-admin/keepassxc/keepassxc-9999.ebuild | 5 ++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 67aa48a88ca0..ab65dd45f920 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
+DIST keepassxc-2.7.5-src.tar.xz 8706996 BLAKE2B 6df7ec9e560b469b8e3ae9026464e6c2064ffd262b118842a3cd5fbf72758aa0e5614cb2581392b6ab35b3d202acbdad24e1679ca162468f78e88dd94af2422f SHA512 904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-2.7.5.ebuild
similarity index 86%
copy from app-admin/keepassxc/keepassxc-9999.ebuild
copy to app-admin/keepassxc/keepassxc-2.7.5.ebuild
index 2254b764e96e..d1389c67cc81 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.5.ebuild
@@ -11,11 +11,10 @@ HOMEPAGE="https://keepassxc.org/
if [[ "${PV}" != *9999 ]] ; then
if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/${PN}/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"
+ SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
else
@@ -33,7 +32,7 @@ REQUIRED_USE="autotype? ( X )"
RDEPEND="
app-crypt/argon2:=
- dev-libs/botan:3=
+ dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -63,6 +62,8 @@ BDEPEND="
doc? ( dev-ruby/asciidoctor )
"
+PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
+
src_prepare() {
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
printf '%s' "${PV}" > .version || die
@@ -84,7 +85,6 @@ src_configure() {
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-DWITH_XC_DOCS="$(usex doc)"
-DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_BOTAN3=ON
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 2254b764e96e..6a9c59967077 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -11,11 +11,10 @@ HOMEPAGE="https://keepassxc.org/
if [[ "${PV}" != *9999 ]] ; then
if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/${PN}/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"
+ SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
else