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

[Lars Wendler]

commit:     231dbd0f539647e3304f172323fe71e58e40e09d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 14:51:41 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 15:06:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231dbd0f

app-admin/keepassxc: Adjusted live ebuild to new features.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/keepassxc/keepassxc-9999.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 96bd13881e8..6207e109fd6 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -3,24 +3,23 @@
 
 EAPI=6
 
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit cmake-utils gnome2-utils xdg-utils ${SCM}
-unset SCM
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	#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"
 else
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser debug http network test yubikey"
+IUSE="autotype browser debug network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
@@ -37,6 +36,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
 	yubikey? ( sys-auth/ykpers )
 "
 
@@ -59,7 +59,7 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_HTTP="$(usex http)"
+		-DWITH_XC_HTTP=OFF
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"