From 58d21e4a4ee241d8e0468da2176f09bb3706757e Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 11 Mar 2019 15:31:19 +0100 Subject: [PATCH] app-admin/keepassxc: Handle beta releases more gracefully. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler --- 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 b05a5089d561..c7e8d14ab636 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 1b5f2654570d..85eaad62e18d 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 } -- 2.26.2