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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15382138334 for ; Mon, 11 Mar 2019 14:31:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F4D1E0AE7; Mon, 11 Mar 2019 14:31:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA424E0AE7 for ; Mon, 11 Mar 2019 14:31:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF468335D51 for ; Mon, 11 Mar 2019 14:31:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 648E952B for ; Mon, 11 Mar 2019 14:31:34 +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: <1552314689.58d21e4a4ee241d8e0468da2176f09bb3706757e.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-2.4.0_beta2.ebuild 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: 58d21e4a4ee241d8e0468da2176f09bb3706757e X-VCS-Branch: master Date: Mon, 11 Mar 2019 14:31:34 +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: bdda527f-39ca-45ff-b76c-aca99ba62940 X-Archives-Hash: 4f507184057ae09945ee481a5797e135 commit: 58d21e4a4ee241d8e0468da2176f09bb3706757e Author: Lars Wendler gentoo org> AuthorDate: Mon Mar 11 14:31:19 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 11 14:31:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d21e4a app-admin/keepassxc: Handle beta releases more gracefully. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild | 4 ++++ app-admin/keepassxc/keepassxc-9999.ebuild | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild b/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild index b05a5089d56..c7e8d14ab63 100644 --- a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild +++ b/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild @@ -69,6 +69,7 @@ src_prepare() { } src_configure() { + local mycmakeargs=( -DWITH_GUI_TESTS=OFF -DWITH_TESTS="$(usex test)" @@ -79,6 +80,9 @@ src_configure() { -DWITH_XC_SSHAGENT=ON -DWITH_XC_YUBIKEY="$(usex yubikey)" ) + if [[ "${PV}" == *_beta* ]] ; then + mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + fi cmake-utils_src_configure } diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 1b5f2654570..85eaad62e18 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -65,6 +65,7 @@ src_prepare() { } src_configure() { + local mycmakeargs=( -DWITH_GUI_TESTS=OFF -DWITH_TESTS="$(usex test)" @@ -75,6 +76,9 @@ src_configure() { -DWITH_XC_SSHAGENT=ON -DWITH_XC_YUBIKEY="$(usex yubikey)" ) + if [[ "${PV}" == *_beta* ]] ; then + mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + fi cmake-utils_src_configure }