[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

[Lars Wendler]

commit:     826517975a66191bfaf2416edce75206c1c6ae45
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 11:42:08 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 11:44:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82651797

app-admin/keepassxc: Use real release tarball.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-admin/keepassxc/Manifest               | 2 +-
 app-admin/keepassxc/keepassxc-2.4.0.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 3cc0130cc13..0e963d06d41 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,2 @@
 DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B 
bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0
 SHA512 
edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
-DIST keepassxc-2.4.0.tar.gz 4790634 BLAKE2B 
5298baf80c48f27da16274f815dc6d83031586e3fec20356569c4d7eb652ed68f22b849595c837e736b7b3adb7636bf1f50c89626a093eecf236e3a94d89f33b
 SHA512 
a50e90389bb53ffca28d322958c01db09472bf5e3d21075ab09db7cc1ed2e8aa0ac9ff310d79c06da4f429aef0427e3706931ce5d4d02b54a52b0209ba5ab853
+DIST keepassxc-2.4.0-src.tar.xz 3252104 BLAKE2B 
7c82822f6fb0eaf6b5d086aebdf4927af215339f92e7f52104e05d5ff301461a1ad816d8a39b377c717e975001c9295ec6d8b2f2003a2215c05931eb9acb5c73
 SHA512 
b7295f5983237606efd236955dc73d477992d944e547eeb2c3a267d846e70ce6f83e489f58e3bd9b5bb21decabd9052a4ea7b98bd98e8283abbb678ae19e5559

diff --git a/app-admin/keepassxc/keepassxc-2.4.0.ebuild 
b/app-admin/keepassxc/keepassxc-2.4.0.ebuild
index 7330e781cb7..fc5f6889a73 100644
--- a/app-admin/keepassxc/keepassxc-2.4.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.0.ebuild
@@ -13,8 +13,8 @@ if [[ "${PV}" != 9999 ]] ; 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";
+               
#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 ~x86"
        fi
 else
@@ -81,7 +81,7 @@ src_configure() {
                -DWITH_XC_SSHAGENT=ON
                -DWITH_XC_YUBIKEY="$(usex yubikey)"
        )
-       if [[ "${PV}" != 9999 ]] ; then
+       if [[ "${PV}" == *_beta* ]] ; then
                mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
        fi
        cmake-utils_src_configure