summaryrefslogtreecommitdiff
path: root/app-admin/keepassxc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
commitd99093fb4bb5652015c06274d64083daa2439e4f (patch)
treecf61513204d97974179580065e85df5c8009087c /app-admin/keepassxc
parent463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
gentoo resync : 03.03.2021
Diffstat (limited to 'app-admin/keepassxc')
-rw-r--r--app-admin/keepassxc/Manifest7
-rw-r--r--app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch28
-rw-r--r--app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild90
-rw-r--r--app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild (renamed from app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild)6
-rw-r--r--app-admin/keepassxc/keepassxc-9999.ebuild6
5 files changed, 39 insertions, 98 deletions
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 9e4d699823bd..236d45489efd 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,7 @@
-DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f SHA512 b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
+AUX keepassxc-2.6.4-quazip1.patch 952 BLAKE2B f4e402dc5bacb7cfbff683d43a7f494cdc7874500e53058f79dbdeae861b57ac01d11362ae66c65fb1aa15450335003a66fcef3cc1d45007ab5c1cf5c903ffe9 SHA512 df6ca3594452dfa6ada95c3a24a225f1788fdb3f9e9c61043e8a0eebd05944e76041848a04f5e8ada1cc979b0444ee439ab259358e8bb0fa6aeb568ed220e979
DIST keepassxc-2.6.3-src.tar.xz 7562816 BLAKE2B 1b33850ed996a2f07b1665309bb4680329a0f858d89e9e89f7ca39a84f27f1a4364bd8526d1907b4fc4d5dd586b3dc48d9d9b6235b78b52edc4db08ca72d79fa SHA512 37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558
DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
-EBUILD keepassxc-2.6.2-r1.ebuild 2065 BLAKE2B 05bb7bd036ee8383d6834f6fdcd9fb30f807009b2fa2ced6bb106f4e433168038ee0d67d84322f371cce9031748f664c44464e14ecafdde134b0742088c1fb2e SHA512 8982866bb8a6c38b6022eee2aac334963f25bee074ea660f36195b1972f4d2c22e107c508cd3ec05b12fbeda0997fa87dd4125401d0e6093cd18dbfebe5c4879
EBUILD keepassxc-2.6.3-r1.ebuild 2065 BLAKE2B 05bb7bd036ee8383d6834f6fdcd9fb30f807009b2fa2ced6bb106f4e433168038ee0d67d84322f371cce9031748f664c44464e14ecafdde134b0742088c1fb2e SHA512 8982866bb8a6c38b6022eee2aac334963f25bee074ea660f36195b1972f4d2c22e107c508cd3ec05b12fbeda0997fa87dd4125401d0e6093cd18dbfebe5c4879
-EBUILD keepassxc-2.6.4-r1.ebuild 2161 BLAKE2B 7b2c67880cb3134f5774f7288bdc5002b532421fdcd554ed59f26bf1bd785f93e703159898f6d415ad5a898ed964572879e223a18fff09288b9abd0336023448 SHA512 5eb8b76d4132332f6dc2d097babff375425bd907c57e017d02bc89088183b53b1ac85f4cf58c97dda31dc45aa06b9ba8e1e6fec6d198e14aa752780c5d6bc8dd
-EBUILD keepassxc-9999.ebuild 2161 BLAKE2B 7b2c67880cb3134f5774f7288bdc5002b532421fdcd554ed59f26bf1bd785f93e703159898f6d415ad5a898ed964572879e223a18fff09288b9abd0336023448 SHA512 5eb8b76d4132332f6dc2d097babff375425bd907c57e017d02bc89088183b53b1ac85f4cf58c97dda31dc45aa06b9ba8e1e6fec6d198e14aa752780c5d6bc8dd
+EBUILD keepassxc-2.6.4-r2.ebuild 2235 BLAKE2B 0a7bb2fdae9dad7a00a3563269ec78afdf5bcd595a45783473d6ee76c2aacf707c722c059eee941aa9cf3f1624156fd54196c687c5680800eed60d9fa40984e2 SHA512 67503f39c26938f9129584ca51ff4ac081c7a47f413cc236b6f7bcb858854905349de6710491727c2723975be8c5cadce1f9fbd8aeb471ea0cd562d27928f8f7
+EBUILD keepassxc-9999.ebuild 2242 BLAKE2B aaddfb010b2e972c5cdd7b32890c255369db6883cc19f97627ca9687772094e520ccdda18dc659703de805ee3f6e569e2981959f06c2669640fc88c6e3619886 SHA512 4cd105fdaac58a147f135099b395dc8585ac034324d89d7df246f665fff1349eb114b1f4be43faca419ad04ff5d4eb151712341e32dc539a507f40c3921b0c52
MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
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 000000000000..42f4fe7478bc
--- /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 <arojas@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-2.6.2-r1.ebuild b/app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild
deleted file mode 100644
index b91f2ed7a168..000000000000
--- a/app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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"
-
-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 )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- 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-2.6.4-r1.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
index 10b1cb7ce9d7..6ea4ff699bbf 100644
--- a/app-admin/keepassxc/keepassxc-2.6.4-r1.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 10b1cb7ce9d7..df01dad6f39b 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 || \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 21:58:48 +0000