gentoo resync : 02.02.2022

4 files changed, 119 insertions, 22 deletions

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 44170446b99c..aa558cde8e34 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,5 @@
-DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7
-EBUILD keepassxc-2.6.6.ebuild 2388 BLAKE2B 47c1666bfb48d6316711e468a03d878447600c7a36718888de3a0e2be75b8d55c524253b7a0f77cb11222113f8949901fe7ddadeca415d8264269537bfb1b1f7 SHA512 d51dde83d9f49c11b9f24429e0defca964087d154e009fc15ac42dd9295b5a2d5d316310d47cc3dde4a1eaf71fe0a5a907662dadb5ceb1c051c9dd3b1ce5fdff
-EBUILD keepassxc-9999.ebuild 2383 BLAKE2B f89da1f90b7c4e09ca19905a9b7daf3cc0cd114fc1f6873499fd58800d5b2706bad5d57d5313c9c11ced1fa666cc06ec90d251822c45c5c4deea1a20d6d4dc2d SHA512 e60806680f7e6bcc088b07dcf255f4477b079ae3bcc4f903db1507eb0d6b6476d7249120593fbd0b564efd13c2a6d36a6b6f2b7f74446ca361de655fff04eb4d
+DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c SHA512 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
+EBUILD keepassxc-2.6.6.ebuild 2310 BLAKE2B befacb8a5edf657b7dc182b4c1b5580a30e037342d590df9ba4450d2344c0a208ba09b59047880638cbc8c68f4bdd5653cfba873e6682949f967c40d545952fd SHA512 6f5d85aa92508284a335374c4b4c190104e4e70c4c4c228f7015e0c15efdb28931f2d97748ed30edd7fc09d65a0017cef2cb5bd28731cc3cace80dfc2b01db4f
+EBUILD keepassxc-2.6.9999.ebuild 2414 BLAKE2B d25231ddef6df71cf2574b46b8c902ba89ad046144a26d011dd3c26ba5061b5e474f80e00d0370fc04bc86e448a377c4dfd1f99535b6e29894b7d951e4a8ed53 SHA512 f3accbf2750712fb4302e7fbd792680b3d3a7094975a56e10bdc205089e8d90520cbc9b29b1cab82196abff1ccd94101d7f49f7ba49ea6ab7cef1fb74b091a33
+EBUILD keepassxc-9999.ebuild 2368 BLAKE2B ae26a3fd44bfd49e8f4485dd4021917f1e494b8cfdf40eb01028082ad5b639bf89878f36ec629340ebb2115082b682bbbc901cc5da96c4df5665484c5afba7ef SHA512 329fb0e528eaa90ee42fad29a9758d0e7cd763c529e2d712cf14c324e129a432ca96ce6f09b6172a0ac3f82247d2ac7a59c8252b4530d60b055e15fc5f457810
 MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
index af0c59d08079..2c4ae038afba 100644
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~arm64 ~ppc64 ~riscv x86"
 	fi
 else
@@ -63,9 +63,6 @@ BDEPEND="
 "
 
 src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
 		printf '%s' "${PV}" > .version || die
 	fi
diff --git a/app-admin/keepassxc/keepassxc-2.6.9999.ebuild b/app-admin/keepassxc/keepassxc-2.6.9999.ebuild
new file mode 100644
index 000000000000..e2016b26a2c8
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic 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 ~arm64 ~ppc64 ~x86"
+	fi
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser ccache doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+
+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/readline:0=
+	sys-libs/zlib:=
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	keeshare? ( sys-libs/zlib:=[minizip] )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+"
+BDEPEND="
+	ccache? ( dev-util/ccache )
+	doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+		printf '%s' "${PV}" > .version || die
+	fi
+
+	 cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
+	local mycmakeargs=(
+		-DWITH_CCACHE="$(usex ccache)"
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_DOCS="$(usex doc)"
+		-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
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" )
+	fi
+	cmake_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 44ca0b85d8d9..6eb2c5dbb6e3 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic xdg
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
 
-if [[ "${PV}" != 9999 ]] ; then
+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/_/-}"
@@ -20,6 +20,7 @@ if [[ "${PV}" != 9999 ]] ; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
@@ -29,9 +30,7 @@ IUSE="autotype browser ccache doc keeshare +network test yubikey"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
+	dev-libs/botan:2
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -45,11 +44,13 @@ RDEPEND="
 	autotype? (
 		dev-qt/qtx11extras:5
 		x11-libs/libX11
-		x11-libs/libXi
 		x11-libs/libXtst
 	)
-	keeshare? ( dev-libs/quazip:0= )
-	yubikey? ( sys-auth/ykpers )
+	keeshare? ( sys-libs/zlib:=[minizip] )
+	yubikey? (
+		dev-libs/libusb:1
+		sys-apps/pcsc-lite
+	)
 "
 
 DEPEND="
@@ -63,10 +64,7 @@ BDEPEND="
 "
 
 src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
 		printf '%s' "${PV}" > .version || die
 	fi
 
@@ -86,7 +84,6 @@ src_configure() {
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_UPDATECHECK=OFF
@@ -95,5 +92,8 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" )
+	fi
 	cmake_src_configure
 }