commit: 688026fef945d2f6bd310c363a24f33d0cafaf94 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Feb 20 18:55:00 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Feb 23 19:52:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688026fe
app-admin/keepassxc: Support build with >=dev-libs/quazip-1.0 See also: https://github.com/keepassxreboot/keepassxc/pull/5511 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../keepassxc/files/keepassxc-2.6.4-quazip1.patch | 28 ++++++++++++++++++++++ ...assxc-9999.ebuild => keepassxc-2.6.4-r2.ebuild} | 6 +++-- app-admin/keepassxc/keepassxc-9999.ebuild | 6 +++-- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch new file mode 100644 index 00000000000..42f4fe7478b --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch @@ -0,0 +1,28 @@ +From efbb6fc9da02fed4e5db21858aa7d265081df2c8 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <aro...@archlinux.org> +Date: Mon, 5 Oct 2020 21:00:24 +0200 +Subject: [PATCH] Support quazip 1.0 + +--- + cmake/FindQuaZip.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake +index a387e2f81..9fab3e579 100644 +--- a/cmake/FindQuaZip.cmake ++++ b/cmake/FindQuaZip.cmake +@@ -10,12 +10,12 @@ if(MINGW) + find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h) + else() + find_library(QUAZIP_LIBRARIES +- NAMES quazip5 quazip ++ NAMES quazip5 quazip quazip1-qt5 + PATHS /usr/lib /usr/lib64 /usr/local/lib + ) + find_path(QUAZIP_INCLUDE_DIR quazip.h + PATHS /usr/include /usr/local/include +- PATH_SUFFIXES quazip5 quazip ++ PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip + ) + find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) + endif() diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild similarity index 95% copy from app-admin/keepassxc/keepassxc-9999.ebuild copy to app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild index 10b1cb7ce9d..6ea4ff699bb 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild @@ -26,6 +26,8 @@ LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" IUSE="autotype browser ccache keeshare +network test yubikey" +RESTRICT="!test? ( test )" + RDEPEND=" app-crypt/argon2:= dev-libs/libgcrypt:= @@ -46,7 +48,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXtst ) - keeshare? ( dev-libs/quazip:0 ) + keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) " @@ -59,7 +61,7 @@ BDEPEND=" ccache? ( dev-util/ccache ) " -RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}"/${P}-quazip1.patch ) # pending upstream PR#5511 src_prepare() { use test || \ diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 10b1cb7ce9d..df01dad6f39 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -26,6 +26,8 @@ LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" IUSE="autotype browser ccache keeshare +network test yubikey" +RESTRICT="!test? ( test )" + RDEPEND=" app-crypt/argon2:= dev-libs/libgcrypt:= @@ -46,7 +48,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXtst ) - keeshare? ( dev-libs/quazip:0 ) + keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) " @@ -59,7 +61,7 @@ BDEPEND=" ccache? ( dev-util/ccache ) " -RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}"/${PN}-2.6.4-quazip1.patch ) # pending upstream PR#5511 src_prepare() { use test || \
