From 688026fef945d2f6bd310c363a24f33d0cafaf94 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 20 Feb 2021 19:55:00 +0100 Subject: [PATCH] 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 --- .../files/keepassxc-2.6.4-quazip1.patch | 28 ++++++ app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild | 95 +++++++++++++++++++ app-admin/keepassxc/keepassxc-9999.ebuild | 6 +- 3 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch create mode 100644 app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild 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 0000000000000..42f4fe7478bc1 --- /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 +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-2.6.4-r2.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild new file mode 100644 index 0000000000000..6ea4ff699bbfe --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}" +fi + +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:= + >=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? ( dev-libs/quazip:0= ) + yubikey? ( sys-auth/ykpers ) +" + +DEPEND=" + ${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qttest:5 +" +BDEPEND=" + ccache? ( dev-util/ccache ) +" + +PATCHES=( "${FILESDIR}"/${P}-quazip1.patch ) # pending upstream PR#5511 + +src_prepare() { + use test || \ + sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die + + 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=OFF + -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 10b1cb7ce9d7a..df01dad6f39b2 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 || \