gentoo auto-resync : 07:05:2024 - 00:00:56

3 files changed, 48 insertions, 28 deletions

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 38f5f4025a25..7f9cb4c6439f 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,7 +1,7 @@
 AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a919059efadc68712e4f6b8e72885f3088ed96793c8ad26f53000e76414b13b9ebcd52ea447b17e7822ce7d3245f30414 SHA512 e401e341c34a117395cb5852f561770a1f65904e6f649cdd2904a89f7b068c53f46e8509d2e4cafc3c213e2326a01838f719d360fde21d63f29962969f3d16ef
-DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812
 DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
-EBUILD keepassxc-2.7.6.ebuild 2445 BLAKE2B f9c77b86135647269ba4e811fb9c1bc8099c569bd7aa4fcef000646844bc8e16e07849448d1a7b40b2e1210018c6aac10ebca862eca8607cea290e7dfb69938d SHA512 d463f50715d1c40b3422ca15e3ec7a5b6865caf332a6c4b5f28af3f6e96625cd32d35c7055e275a5b7a8c14cfc8d77dffda75e2f738368a9525e9b461487a896
+DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04 SHA512 c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a
 EBUILD keepassxc-2.7.7-r2.ebuild 2475 BLAKE2B 16d23dc524610072a785e868b4c732b81d106eebbe72731f3ecaec8aafe2858e2d36e2fec4c86dc62c3b8abf6ce2e1ad1ea5ba392d6335150968b6989f6b9768 SHA512 c72d9249a3a33e45f97600185e90d3bf95a46e5472bf441c4ce5a7e4bff21210bd2a6e1942ae8d89367b39f5d44d95dde984077f1d671f076bfb1d8cde236e4f
-EBUILD keepassxc-9999.ebuild 2378 BLAKE2B e55dea5e89824e32b3413a17e10db58f1efc5ad98069f0843f32223f1d8201f5f597f02b2b9fa0f60d23daed0bb32ef48b3782ce1f313d212548927ec325fe09 SHA512 0f697b681b485b4db0f12ccf304c63fef3eaf97abab1ae64d7a8404c717b60f367587e0325de316560d38b2c8832847a7569d0aee265c88d76dfccafe556fd19
+EBUILD keepassxc-2.7.8.ebuild 2460 BLAKE2B be9ae94e8b24fb5a174760ddb98a9183f20a9239f8ce003016093b7734c7e98573c66a080c4fd250211af67d42e99faeb87619716255c5944a00b8b8718dbd52 SHA512 6afe18fe78f6e8fdc1b994a27fa16422624b2a2547e723ccd5dc542813aad253fd4fc9bb073bc5a47ac5c2bbc70d270e77ebc9f3e6354cb4d45497b09ca4039a
+EBUILD keepassxc-9999.ebuild 2460 BLAKE2B be9ae94e8b24fb5a174760ddb98a9183f20a9239f8ce003016093b7734c7e98573c66a080c4fd250211af67d42e99faeb87619716255c5944a00b8b8718dbd52 SHA512 6afe18fe78f6e8fdc1b994a27fa16422624b2a2547e723ccd5dc542813aad253fd4fc9bb073bc5a47ac5c2bbc70d270e77ebc9f3e6354cb4d45497b09ca4039a
 MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20
diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
index 0ca6281dbb85..11cc2ac9b84e 100644
--- a/app-admin/keepassxc/keepassxc-2.7.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,18 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org/
 	https://github.com/keepassxreboot/keepassxc/"
 
-if [[ "${PV}" != *9999 ]] ; then
+if [[ "${PV}" = *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+else
 	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
+			-> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
 		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
@@ -42,27 +45,33 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	media-gfx/qrencode:=
 	sys-libs/readline:0=
-	sys-libs/zlib:=
-	X? ( dev-qt/qtx11extras:5 )
+	sys-libs/zlib:=[minizip]
+	X? (
+		dev-qt/qtx11extras:5
+	)
 	autotype? (
 		x11-libs/libX11
 		x11-libs/libXtst
 	)
-	keeshare? ( sys-libs/zlib:=[minizip] )
 	yubikey? (
 		dev-libs/libusb:1
 		sys-apps/pcsc-lite
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qttest:5
 "
 BDEPEND="
 	dev-qt/linguist-tools:5
-	doc? ( dev-ruby/asciidoctor )
+	doc? (
+		dev-ruby/asciidoctor
+	)
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.7.4-tests.patch"
+)
 
 src_prepare() {
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
@@ -76,7 +85,7 @@ src_configure() {
 	# https://github.com/keepassxreboot/keepassxc/issues/5801
 	filter-lto
 
-	local mycmakeargs=(
+	local -a mycmakeargs=(
 		# Gentoo users enable ccache via e.g. FEATURES=ccache or
 		# other means. We don't want the build system to enable it for us.
 		-DWITH_CCACHE=OFF
@@ -85,6 +94,7 @@ src_configure() {
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_DOCS="$(usex doc)"
 		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_BROWSER_PASSKEYS="$(usex browser)"
 		-DWITH_XC_BOTAN3=ON
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
@@ -95,7 +105,9 @@ src_configure() {
 		-DWITH_XC_X11="$(usex X)"
 	)
 	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+		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 4b24b9ee85b7..11cc2ac9b84e 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -9,20 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org/
 	https://github.com/keepassxreboot/keepassxc/"
 
-if [[ "${PV}" != *9999 ]] ; then
+if [[ "${PV}" = *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+else
 	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
+			-> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
 		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
-
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	fi
-else
-	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
@@ -68,6 +69,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.7.4-tests.patch"
+)
+
 src_prepare() {
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
 		printf '%s' "${PV}" > .version || die
@@ -89,6 +94,7 @@ src_configure() {
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_DOCS="$(usex doc)"
 		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_BROWSER_PASSKEYS="$(usex browser)"
 		-DWITH_XC_BOTAN3=ON
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
@@ -99,7 +105,9 @@ src_configure() {
 		-DWITH_XC_X11="$(usex X)"
 	)
 	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+		mycmakeargs+=(
+			-DOVERRIDE_VERSION="${PV/_/-}"
+		)
 	fi
 	cmake_src_configure
 }