gentoo auto-resync : 21:06:2024 - 00:11:18

3 files changed, 28 insertions, 12 deletions

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index f1be3e824b81..cfe01b10f30d 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,7 +1,8 @@
 AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a919059efadc68712e4f6b8e72885f3088ed96793c8ad26f53000e76414b13b9ebcd52ea447b17e7822ce7d3245f30414 SHA512 e401e341c34a117395cb5852f561770a1f65904e6f649cdd2904a89f7b068c53f46e8509d2e4cafc3c213e2326a01838f719d360fde21d63f29962969f3d16ef
-DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
+AUX keepassxc-2.7.9-tests.patch 473 BLAKE2B 3d260ca4dcd7b5dd67e3c98bc30b5dd0e2b87e9dc508f3b24f418f1a20e9aa45e5c4da375b737833dc88a33c1bc5a2512eb636a5ffd9fbb686360364ac9f346b SHA512 e321d866ecc632756af85324b2e5b9a58db6442c8361c2ce210d223de8a6435eb4233a967314109f3fa0416883ef5fe34827320881a448ddbf0204cbd5111123
 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
+DIST keepassxc-2.7.9-src.tar.xz 9789312 BLAKE2B d9be3e577ae918160662558bb8bd724b5ca5982cb1bba5cda47f0dff042ea9a5c7393dd76ad195a7ba6c9b9e8371c4416840e4ff89e07c610d7351859586acfa SHA512 255102d3b3723a80cdd5f14cde2130b37807db226b48e985bcc2ab537b482e3fb23afde331e15ed02727e98b526d894aa4567f2e82039a2ad9d33a6ad9ea08a4
 EBUILD keepassxc-2.7.8.ebuild 2458 BLAKE2B bea0da6dfc99875329b9dace4a8aa5a7558d12000d82e04ad3cb3d73658279d84ce6269b3eb486421985b3919931b53ac82ce619550b192671961edf6ccc9c99 SHA512 55ea0c8a4af6f9998094e66749e0c34ce6c202c1e01f76f87aae83a74eec6f8869eaa7fe8b1d07cf31602201719dc9a47e456e7ea342b48b9d766547f84eefac
+EBUILD keepassxc-2.7.9.ebuild 2460 BLAKE2B 6e4dbf32994a329337652e1eea92eeedf419f7435e2794af2d0cd254a1c708d3a1af23ddee6b6de0290031063b3eded0bd1420484727bb7e7b690c81a784a3ec SHA512 454da236e266e96528baeb1db2ad884c2f4b379e3eb8d40fefd4b904ae15d918b5bde78bf65433b8b02e2bc2e6a33e039a6583adf0021e955d14f22001ec9664
 EBUILD keepassxc-9999.ebuild 2460 BLAKE2B be9ae94e8b24fb5a174760ddb98a9183f20a9239f8ce003016093b7734c7e98573c66a080c4fd250211af67d42e99faeb87619716255c5944a00b8b8718dbd52 SHA512 6afe18fe78f6e8fdc1b994a27fa16422624b2a2547e723ccd5dc542813aad253fd4fc9bb073bc5a47ac5c2bbc70d270e77ebc9f3e6354cb4d45497b09ca4039a
 MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch
new file mode 100644
index 000000000000..153b3c721018
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch
@@ -0,0 +1,12 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -246,9 +246,6 @@ if(WITH_XC_NETWORKING OR WITH_XC_BROWSER)
+     add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES})
+ endif()
+ 
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+-        LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+ 
+ if(WITH_GUI_TESTS)
+     add_subdirectory(gui)
diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
index 6d17e534e3b4..fe31c46f4f47 100644
--- a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.9.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"
@@ -69,7 +70,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.7.4-tests.patch"
+	"${FILESDIR}/${PN}-2.7.9-tests.patch"
 )
 
 src_prepare() {
@@ -104,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
 }