gentoo resync : 20.03.2022

3 files changed, 99 insertions, 4 deletions

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index aa558cde8e34..3f8d9de4c0a2 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,5 +1,7 @@
 DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c SHA512 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
+DIST keepassxc-2.7.0_beta1.tar.gz 10634757 BLAKE2B 3ec079dacbf6f13f60ac68084d167e90f213894f3141a55962720646673de0bf466c81493a4f449b4871298d8067b1971e7e25477b7cbecb47a277e5594b425e SHA512 b1fbdf5afea1514a8e42338ea26077b0a6d3088674baf1761e8ac0060ffd5c14da6f7bf11d31cd04f90d02c30e6db39e559c2995863cb3f563d7e6894f7680a9
 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
+EBUILD keepassxc-2.7.0_beta1.ebuild 2267 BLAKE2B f8398a4b3508d94cd391d401e7fd4f78999e729329859f90d4ecbec7ebf80960e5b3e92d37d4aa6f0c4b0a751e44b9d0acc67888541bb6e22e3e5187ddfeb2aa SHA512 c42dd509dbab70047c1ef710c0abbfd93359ba1d5ec030f077d787db44f913358a5111b0c096bfd562dd7a0d33e8eb6c34a3629e2b90e6433324ea7a737e06f1
+EBUILD keepassxc-9999.ebuild 2267 BLAKE2B f8398a4b3508d94cd391d401e7fd4f78999e729329859f90d4ecbec7ebf80960e5b3e92d37d4aa6f0c4b0a751e44b9d0acc67888541bb6e22e3e5187ddfeb2aa SHA512 c42dd509dbab70047c1ef710c0abbfd93359ba1d5ec030f077d787db44f913358a5111b0c096bfd562dd7a0d33e8eb6c34a3629e2b90e6433324ea7a737e06f1
 MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
diff --git a/app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild b/app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild
new file mode 100644
index 000000000000..3d0e25a306e7
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild
@@ -0,0 +1,96 @@
+# 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="
+	dev-libs/botan:2
+	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/libXtst
+	)
+	keeshare? ( sys-libs/zlib:=[minizip] )
+	yubikey? (
+		dev-libs/libusb:1
+		sys-apps/pcsc-lite
+	)
+"
+
+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
+	cmake_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 6eb2c5dbb6e3..3d0e25a306e7 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -92,8 +92,5 @@ 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
 }