gentoo resync : 03.11.2019

3 files changed, 104 insertions, 1 deletions

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index a70afd15e96a..0d2505fc932f 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,6 @@
 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
+DIST keepassxc-2.5.0-src.tar.xz 6752776 BLAKE2B 90c82d6a3c8144797fc0cd379bbb7e6745cd4512a47bd04eb61b52205b6efe3ad8036a0f2c0012de4e710b6184526916ac4a4453bca90e18ccd9e6db1b86e9e3 SHA512 45f76491892ee5377eb803079ee6db2987d66e569c8c53ebc706cb51a4b8f37675801df484f03d486803de2675a3a46bed5d2b211ff7be0b83daf9c2f8607d00
 EBUILD keepassxc-2.4.3-r1.ebuild 2135 BLAKE2B 499b397116dcde99805b4afa4b38b4c25a8b3121e4cd8fe473cb584e295a77ad6ab36a47cfaf447cf09bfb0d12f45bd649e7cb4e90c031ab4dd68b9b04565787 SHA512 9f2651697c320325e7dc9aba2cbb9cc6c01173a2c82072b9df13b9a8292e841bbcd059ef95c21b52ffec1c0155b3c9787cd303512139a9db38b00274edaa9c36
-EBUILD keepassxc-9999.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09
+EBUILD keepassxc-2.5.0.ebuild 2163 BLAKE2B 4b03f6d0a3bac167f66a5c8122cdadec36438a798db8336f8ee109f818431fdfb6ae5ab625c171800942a30b5a6395b6eab98e0f24e5805106753ed166919fd2 SHA512 fdad7db0660f23091b54c216311ef482565c7332ada2eaacfbaa49b5d9686b41619f29265184686742383be66af8cdea585f98bc4f5795e9badb5ddaf0973b46
+EBUILD keepassxc-9999.ebuild 2163 BLAKE2B 4b03f6d0a3bac167f66a5c8122cdadec36438a798db8336f8ee109f818431fdfb6ae5ab625c171800942a30b5a6395b6eab98e0f24e5805106753ed166919fd2 SHA512 fdad7db0660f23091b54c216311ef482565c7332ada2eaacfbaa49b5d9686b41619f29265184686742383be66af8cdea585f98bc4f5795e9badb5ddaf0973b46
 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/keepassxc-2.5.0.ebuild b/app-admin/keepassxc/keepassxc-2.5.0.ebuild
new file mode 100644
index 000000000000..20be986b6fde
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.5.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+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"
+		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"
+		KEYWORDS="~amd64 ~x86"
+	fi
+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 keeshare +network test yubikey"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/qrencode:=
+	sys-libs/zlib:=
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
+	keeshare? ( dev-libs/quazip )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+"
+
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+	x11-misc/xsel
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_FDOSECRETS=ON
+		-DWITH_XC_KEESHARE="$(usex keeshare)"
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_UPDATECHECK=OFF
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 20cd5799cdeb..20be986b6fde 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -74,6 +74,7 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_SSHAGENT=ON