[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-07-21 Thread Sam James
commit: 9427c6f6a50004b0ed8d9c11c8e97a6a0fd3b04a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 22 01:08:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 22 01:08:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9427c6f6

app-admin/keepassxc: Stabilize 2.7.9 amd64, #936456

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.9.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
index b53c0b56d985..1e8de6d2d084 100644
--- a/app-admin/keepassxc/keepassxc-2.7.9.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
@@ -23,7 +23,7 @@ else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
fi
 
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-07-21 Thread Arthur Zamarin
commit: ef79ef664850f44c9b6c60016a55dbcb22ac
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jul 21 19:48:33 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jul 21 19:48:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef79ef66

app-admin/keepassxc: Stabilize 2.7.9 x86, #936456

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.9.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
index fe31c46f4f47..b53c0b56d985 100644
--- a/app-admin/keepassxc/keepassxc-2.7.9.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
@@ -23,7 +23,7 @@ else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
fi
 
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/

2024-06-20 Thread Maciej Barć
commit: c0bddfdde69a218af2b9da404f757d263d40743a
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Jun 20 11:54:28 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Jun 20 14:05:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bddfdd

app-admin/keepassxc: bump to 2.7.9

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |   1 +
 .../keepassxc/files/keepassxc-2.7.9-tests.patch|  12 +++
 app-admin/keepassxc/keepassxc-2.7.9.ebuild | 113 +
 3 files changed, 126 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index c195d9b9bc76..ea5f82e43830 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B 
edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04
 SHA512 
c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a
+DIST keepassxc-2.7.9-src.tar.xz 9789312 BLAKE2B 
d9be3e577ae918160662558bb8bd724b5ca5982cb1bba5cda47f0dff042ea9a5c7393dd76ad195a7ba6c9b9e8371c4416840e4ff89e07c610d7351859586acfa
 SHA512 
255102d3b3723a80cdd5f14cde2130b37807db226b48e985bcc2ab537b482e3fb23afde331e15ed02727e98b526d894aa4567f2e82039a2ad9d33a6ad9ea08a4

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 ..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="$")
+ 
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)

diff --git a/app-admin/keepassxc/keepassxc-2.7.9.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
new file mode 100644
index ..fe31c46f4f47
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+   https://github.com/keepassxreboot/keepassxc/;
+
+if [[ "${PV}" = ** ]] ; 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"
+   S="${WORKDIR}/${P/_/-}"
+   else
+   
SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
+   fi
+
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+   app-crypt/argon2:=
+   dev-libs/botan:3=
+   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:=[minizip]
+   X? (
+   dev-qt/qtx11extras:5
+   )
+   autotype? (
+   x11-libs/libX11
+   x11-libs/libXtst
+   )
+   yubikey? (
+   dev-libs/libusb:1
+   sys-apps/pcsc-lite
+   )
+"
+DEPEND="
+   ${RDEPEND}
+   dev-qt/qttest:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   doc? (
+   dev-ruby/asciidoctor
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.7.9-tests.patch"
+)
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://github.com/keepassxreboot/keepassxc/issues/5801
+   filter-lto
+
+   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
+   -DWITH_GUI_TESTS=OFF
+   -DWITH_TESTS="$(usex test)"
+   -DWITH_XC_AUTOTYPE="$(usex autotype)"
+   -DWITH_XC_DOCS="$(usex doc)"
+   

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-06-20 Thread Maciej Barć
commit: 45865036c181a854bcf00f0351c0ae05794f9014
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Jun 20 11:05:55 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Jun 20 14:05:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45865036

app-admin/keepassxc: drop old 2.7.7-r2

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest  |   1 -
 app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild | 110 --
 2 files changed, 111 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 40112daa3c5b..c195d9b9bc76 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1 @@
-DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B 
d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477
 SHA512 
fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
 DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B 
edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04
 SHA512 
c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a

diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
deleted file mode 100644
index 6d17e534e3b4..
--- a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org/
-   https://github.com/keepassxreboot/keepassxc/;
-
-if [[ "${PV}" != * ]] ; then
-   if [[ "${PV}" == *_beta* ]] ; then
-   
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}" !=  ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="X autotype browser doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="autotype? ( X )"
-
-RDEPEND="
-   app-crypt/argon2:=
-   dev-libs/botan:3=
-   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:=[minizip]
-   X? (
-   dev-qt/qtx11extras:5
-   )
-   autotype? (
-   x11-libs/libX11
-   x11-libs/libXtst
-   )
-   yubikey? (
-   dev-libs/libusb:1
-   sys-apps/pcsc-lite
-   )
-"
-DEPEND="
-   ${RDEPEND}
-   dev-qt/qttest:5
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   doc? (
-   dev-ruby/asciidoctor
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.7.4-tests.patch"
-)
-
-src_prepare() {
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
-   printf '%s' "${PV}" > .version || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-lto
-
-   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
-   -DWITH_GUI_TESTS=OFF
-   -DWITH_TESTS="$(usex test)"
-   -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)"
-   -DWITH_XC_NETWORKING="$(usex network)"
-   -DWITH_XC_SSHAGENT=ON
-   -DWITH_XC_UPDATECHECK=OFF
-   -DWITH_XC_YUBIKEY="$(usex yubikey)"
-   -DWITH_XC_X11="$(usex X)"
-   )
-   if [[ "${PV}" == *_beta* ]] ; then
-   mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-   fi
-   cmake_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-06-07 Thread Arthur Zamarin
commit: 8ee99eab8d2e2bb4c52c893accdc9e3a17a3f231
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 17:46:28 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 17:46:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee99eab

app-admin/keepassxc: Stabilize 2.7.8 amd64, #933728

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.8.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
index d0232d30d47f..5cdd333ad983 100644
--- a/app-admin/keepassxc/keepassxc-2.7.8.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
@@ -23,7 +23,7 @@ else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
fi
 
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-06-07 Thread Arthur Zamarin
commit: 9e8f32bb8b3008fc67ef4d07e7f0ed3e5545f906
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 16:46:26 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 16:46:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8f32bb

app-admin/keepassxc: Stabilize 2.7.8 x86, #933728

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.8.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
index 11cc2ac9b84e..d0232d30d47f 100644
--- a/app-admin/keepassxc/keepassxc-2.7.8.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
@@ -23,7 +23,7 @@ else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
fi
 
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-05-06 Thread Maciej Barć
commit: bd74c458f288dcfdadf6231b3c46610b104f3dee
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon May  6 16:15:18 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon May  6 18:00:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd74c458

app-admin/keepassxc: bump to 2.7.8

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |   1 +
 app-admin/keepassxc/keepassxc-2.7.8.ebuild | 113 +
 2 files changed, 114 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index ec09793fe029..40112daa3c5b 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B 
d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477
 SHA512 
fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
+DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B 
edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04
 SHA512 
c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a

diff --git a/app-admin/keepassxc/keepassxc-2.7.8.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
new file mode 100644
index ..11cc2ac9b84e
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.8.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+   https://github.com/keepassxreboot/keepassxc/;
+
+if [[ "${PV}" = ** ]] ; 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"
+   S="${WORKDIR}/${P/_/-}"
+   else
+   
SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
+   fi
+
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+   app-crypt/argon2:=
+   dev-libs/botan:3=
+   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:=[minizip]
+   X? (
+   dev-qt/qtx11extras:5
+   )
+   autotype? (
+   x11-libs/libX11
+   x11-libs/libXtst
+   )
+   yubikey? (
+   dev-libs/libusb:1
+   sys-apps/pcsc-lite
+   )
+"
+DEPEND="
+   ${RDEPEND}
+   dev-qt/qttest:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   doc? (
+   dev-ruby/asciidoctor
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.7.4-tests.patch"
+)
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://github.com/keepassxreboot/keepassxc/issues/5801
+   filter-lto
+
+   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
+   -DWITH_GUI_TESTS=OFF
+   -DWITH_TESTS="$(usex test)"
+   -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)"
+   -DWITH_XC_NETWORKING="$(usex network)"
+   -DWITH_XC_SSHAGENT=ON
+   -DWITH_XC_UPDATECHECK=OFF
+   -DWITH_XC_YUBIKEY="$(usex yubikey)"
+   -DWITH_XC_X11="$(usex X)"
+   )
+   if [[ "${PV}" == *_beta* ]] ; then
+   mycmakeargs+=(
+   -DOVERRIDE_VERSION="${PV/_/-}"
+   )
+   fi
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-05-06 Thread Maciej Barć
commit: 10be8ed05cfc60bb4b2c2faf5deb5e590d0de814
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon May  6 16:57:31 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon May  6 18:00:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10be8ed0

app-admin/keepassxc: sync live  version

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 4b24b9ee85b7..11cc2ac9b84e 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -9,20 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community 
Edition"
 HOMEPAGE="https://keepassxc.org/
https://github.com/keepassxreboot/keepassxc/;
 
-if [[ "${PV}" != * ]] ; then
+if [[ "${PV}" = ** ]] ; 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}" !=  ]] && 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}" != * ]] && [[ ! -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
 }



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-05-06 Thread Maciej Barć
commit: ebb647eee8f1d76f159011e67880cda6c2f36e2e
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon May  6 15:57:10 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon May  6 18:00:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb647ee

app-admin/keepassxc: drop old 2.7.6

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |   1 -
 app-admin/keepassxc/keepassxc-2.7.6.ebuild | 101 -
 2 files changed, 102 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index d9b76c352e07..ec09793fe029 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1 @@
-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

diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
deleted file mode 100644
index 0ca6281dbb85..
--- a/app-admin/keepassxc/keepassxc-2.7.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org/
-   https://github.com/keepassxreboot/keepassxc/;
-
-if [[ "${PV}" != * ]] ; then
-   if [[ "${PV}" == *_beta* ]] ; then
-   
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}" !=  ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="X autotype browser doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="autotype? ( X )"
-
-RDEPEND="
-   app-crypt/argon2:=
-   dev-libs/botan:3=
-   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:=
-   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}
-   dev-qt/qttest:5
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   doc? ( dev-ruby/asciidoctor )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
-
-src_prepare() {
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
-   printf '%s' "${PV}" > .version || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-lto
-
-   local 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
-   -DWITH_GUI_TESTS=OFF
-   -DWITH_TESTS="$(usex test)"
-   -DWITH_XC_AUTOTYPE="$(usex autotype)"
-   -DWITH_XC_DOCS="$(usex doc)"
-   -DWITH_XC_BROWSER="$(usex browser)"
-   -DWITH_XC_BOTAN3=ON
-   -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)"
-   -DWITH_XC_X11="$(usex X)"
-   )
-   if [[ "${PV}" == *_beta* ]] ; then
-   mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-   fi
-   cmake_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-04-17 Thread Sam James
commit: 94aedd5062c720bda87a11b2a88c43aecf6262d0
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 17 23:28:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 17 23:28:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94aedd50

app-admin/keepassxc: Stabilize 2.7.7-r2 x86, #930165

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
index 8d02ce243c7b..6d17e534e3b4 100644
--- a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != * ]] ; then
else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
 
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-04-17 Thread Sam James
commit: 96a3afb8374947362c18f71b1bed9915d0ad1cbb
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 17 22:35:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 17 22:35:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a3afb8

app-admin/keepassxc: Stabilize 2.7.7-r2 amd64, #930165

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
index d5cc5c92be33..8d02ce243c7b 100644
--- a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != * ]] ; then
else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
 
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-03-12 Thread Maciej Barć
commit: 97686f9e0ce0b38208ae36443d3406728ad93ca6
Author: Maciej Barć  gentoo  org>
AuthorDate: Tue Mar 12 16:06:57 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Mar 12 17:03:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97686f9e

app-admin/keepassxc: support browser passkeys

Closes: https://bugs.gentoo.org/926837
Signed-off-by: Maciej Barć  gentoo.org>

 .../keepassxc/{keepassxc-2.7.7-r1.ebuild => keepassxc-2.7.7-r2.ebuild}   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
similarity index 98%
rename from app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
index 843ec9b56c6f..d5cc5c92be33 100644
--- a/app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
@@ -93,6 +93,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)"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-03-11 Thread Maciej Barć
commit: 800c119ccd0f64f4a5c98bc8aa0d4154d799b190
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Mar 11 09:00:36 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Mar 11 09:03:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=800c119c

app-admin/keepassxc: sync live  version

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 186c07c60416..4b24b9ee85b7 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.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
@@ -15,10 +15,12 @@ if [[ "${PV}" != * ]] ; then
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}" !=  ]] && EGIT_BRANCH="master"
 fi
@@ -42,24 +44,28 @@ 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
+   )
 "
 
 src_prepare() {
@@ -74,7 +80,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



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-03-11 Thread Maciej Barć
commit: 9577f320a8e63c4459b6aed4833199e250bf7e54
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Mar 11 08:43:53 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Mar 11 09:03:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9577f320

app-admin/keepassxc: always require zlib[minizip]

Closes: https://bugs.gentoo.org/926732
Signed-off-by: Maciej Barć  gentoo.org>

 .../{keepassxc-2.7.7.ebuild => keepassxc-2.7.7-r1.ebuild} | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.7.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild
similarity index 96%
rename from app-admin/keepassxc/keepassxc-2.7.7.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild
index 6d0f3d1266b4..843ec9b56c6f 100644
--- a/app-admin/keepassxc/keepassxc-2.7.7.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
dev-qt/qtwidgets:5
media-gfx/qrencode:=
sys-libs/readline:0=
-   sys-libs/zlib:=
+   sys-libs/zlib:=[minizip]
X? (
dev-qt/qtx11extras:5
)
@@ -52,15 +52,13 @@ RDEPEND="
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="



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2024-03-10 Thread Maciej Barć
commit: d92636b8e9f5ed38b126094bea7ba1b8c0d857bf
Author: Maciej Barć  gentoo  org>
AuthorDate: Sun Mar 10 13:12:50 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sun Mar 10 16:19:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d92636b8

app-admin/keepassxc: bump to 2.7.7

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |   1 +
 app-admin/keepassxc/keepassxc-2.7.7.ebuild | 111 +
 2 files changed, 112 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index e1a279ed1ea6..d9b76c352e07 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 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

diff --git a/app-admin/keepassxc/keepassxc-2.7.7.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.7.ebuild
new file mode 100644
index ..6d0f3d1266b4
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+   https://github.com/keepassxreboot/keepassxc/;
+
+if [[ "${PV}" != * ]] ; then
+   if [[ "${PV}" == *_beta* ]] ; then
+   
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}" !=  ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+   app-crypt/argon2:=
+   dev-libs/botan:3=
+   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:=
+   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}
+   dev-qt/qttest:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   doc? (
+   dev-ruby/asciidoctor
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.7.4-tests.patch"
+)
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://github.com/keepassxreboot/keepassxc/issues/5801
+   filter-lto
+
+   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
+   -DWITH_GUI_TESTS=OFF
+   -DWITH_TESTS="$(usex test)"
+   -DWITH_XC_AUTOTYPE="$(usex autotype)"
+   -DWITH_XC_DOCS="$(usex doc)"
+   -DWITH_XC_BROWSER="$(usex browser)"
+   -DWITH_XC_BOTAN3=ON
+   -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)"
+   -DWITH_XC_X11="$(usex X)"
+   )
+   if [[ "${PV}" == *_beta* ]] ; then
+   mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+   fi
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-10-26 Thread Maciej Barć
commit: ff9fe645d0d7130f8ee8b34e211e1abf1ac108de
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Oct 25 14:14:13 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Oct 26 13:11:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff9fe645

app-admin/keepassxc: drop old 2.7.5-r1

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest  |   1 -
 app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild | 101 --
 2 files changed, 102 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 1f5f6d03b3c0..e1a279ed1ea6 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1 @@
-DIST keepassxc-2.7.5-src.tar.xz 8706996 BLAKE2B 
6df7ec9e560b469b8e3ae9026464e6c2064ffd262b118842a3cd5fbf72758aa0e5614cb2581392b6ab35b3d202acbdad24e1679ca162468f78e88dd94af2422f
 SHA512 
904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b
 DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 
2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe
 SHA512 
58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812

diff --git a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
deleted file mode 100644
index 0ca6281dbb85..
--- a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org/
-   https://github.com/keepassxreboot/keepassxc/;
-
-if [[ "${PV}" != * ]] ; then
-   if [[ "${PV}" == *_beta* ]] ; then
-   
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}" !=  ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="X autotype browser doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="autotype? ( X )"
-
-RDEPEND="
-   app-crypt/argon2:=
-   dev-libs/botan:3=
-   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:=
-   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}
-   dev-qt/qttest:5
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   doc? ( dev-ruby/asciidoctor )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
-
-src_prepare() {
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
-   printf '%s' "${PV}" > .version || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-lto
-
-   local 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
-   -DWITH_GUI_TESTS=OFF
-   -DWITH_TESTS="$(usex test)"
-   -DWITH_XC_AUTOTYPE="$(usex autotype)"
-   -DWITH_XC_DOCS="$(usex doc)"
-   -DWITH_XC_BROWSER="$(usex browser)"
-   -DWITH_XC_BOTAN3=ON
-   -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)"
-   -DWITH_XC_X11="$(usex X)"
-   )
-   if [[ "${PV}" == *_beta* ]] ; then
-   mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-   fi
-   cmake_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-09-20 Thread Sam James
commit: eb090a8aad9073ad61889896a57447f7bc9c5332
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 21 05:09:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 21 05:09:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb090a8a

app-admin/keepassxc: Stabilize 2.7.6 amd64, #914470

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
index b19e1918a1f4..0ca6281dbb85 100644
--- a/app-admin/keepassxc/keepassxc-2.7.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
S="${WORKDIR}/${P/_/-}"
else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-09-20 Thread Sam James
commit: e37baf9e0c0e921f35b4448dea3f12541fdfabe4
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 21 05:09:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 21 05:09:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37baf9e

app-admin/keepassxc: Stabilize 2.7.6 x86, #914470

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
index 59fe6ad29d7c..b19e1918a1f4 100644
--- a/app-admin/keepassxc/keepassxc-2.7.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
S="${WORKDIR}/${P/_/-}"
else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-08-17 Thread Maciej Barć
commit: 6bb43d1d4fd93db442d0eb97b175cd8ba7d6863f
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Aug 17 12:57:11 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Aug 17 13:22:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb43d1d

app-admin/keepassxc: patch tests

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.6.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
index 186c07c60416..59fe6ad29d7c 100644
--- a/app-admin/keepassxc/keepassxc-2.7.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
@@ -62,6 +62,8 @@ BDEPEND="
doc? ( dev-ruby/asciidoctor )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
+
 src_prepare() {
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
printf '%s' "${PV}" > .version || die



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-08-17 Thread Maciej Barć
commit: ac36c75306faf98950472f55924ebf0f83d285ba
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Thu Aug 17 03:59:09 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Aug 17 13:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac36c753

app-admin/keepassxc: add 2.7.6

Signed-off-by: Leonardo Hernández Hernández  proton.me>
Closes: https://github.com/gentoo/gentoo/pull/32351
Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.7.6.ebuild | 99 ++
 2 files changed, 100 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 29942ef8a602..1f5f6d03b3c0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 DIST keepassxc-2.7.5-src.tar.xz 8706996 BLAKE2B 
6df7ec9e560b469b8e3ae9026464e6c2064ffd262b118842a3cd5fbf72758aa0e5614cb2581392b6ab35b3d202acbdad24e1679ca162468f78e88dd94af2422f
 SHA512 
904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b
+DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 
2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe
 SHA512 
58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812

diff --git a/app-admin/keepassxc/keepassxc-2.7.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
new file mode 100644
index ..186c07c60416
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+   https://github.com/keepassxreboot/keepassxc/;
+
+if [[ "${PV}" != * ]] ; then
+   if [[ "${PV}" == *_beta* ]] ; then
+   
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}" !=  ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+   app-crypt/argon2:=
+   dev-libs/botan:3=
+   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:=
+   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}
+   dev-qt/qttest:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://github.com/keepassxreboot/keepassxc/issues/5801
+   filter-lto
+
+   local 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
+   -DWITH_GUI_TESTS=OFF
+   -DWITH_TESTS="$(usex test)"
+   -DWITH_XC_AUTOTYPE="$(usex autotype)"
+   -DWITH_XC_DOCS="$(usex doc)"
+   -DWITH_XC_BROWSER="$(usex browser)"
+   -DWITH_XC_BOTAN3=ON
+   -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)"
+   -DWITH_XC_X11="$(usex X)"
+   )
+   if [[ "${PV}" == *_beta* ]] ; then
+   mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+   fi
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-06-30 Thread Maciej Barć
commit: f32fcd7cf3675eefd5c34cbe01bf3241698ba665
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Jun 30 19:01:19 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Jun 30 19:08:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32fcd7c

app-admin/keepassxc: drop old 2.7.4

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |   1 -
 app-admin/keepassxc/keepassxc-2.7.4.ebuild | 101 -
 2 files changed, 102 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index ab65dd45f920..29942ef8a602 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1 @@
-DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 
5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4
 SHA512 
76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
 DIST keepassxc-2.7.5-src.tar.xz 8706996 BLAKE2B 
6df7ec9e560b469b8e3ae9026464e6c2064ffd262b118842a3cd5fbf72758aa0e5614cb2581392b6ab35b3d202acbdad24e1679ca162468f78e88dd94af2422f
 SHA512 
904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b

diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
deleted file mode 100644
index 68335109f7ce..
--- a/app-admin/keepassxc/keepassxc-2.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org/
-   https://github.com/keepassxreboot/keepassxc/;
-
-if [[ "${PV}" != * ]] ; 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 ~riscv x86"
-   fi
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/keepassxreboot/${PN};
-   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="X autotype browser doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="autotype? ( X )"
-
-RDEPEND="
-   app-crypt/argon2:=
-   dev-libs/botan:2=
-   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:=
-   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}
-   dev-qt/qttest:5
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   doc? ( dev-ruby/asciidoctor )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-src_prepare() {
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
-   printf '%s' "${PV}" > .version || die
-   fi
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-lto
-
-   local 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
-   -DWITH_GUI_TESTS=OFF
-   -DWITH_TESTS="$(usex test)"
-   -DWITH_XC_AUTOTYPE="$(usex autotype)"
-   -DWITH_XC_DOCS="$(usex doc)"
-   -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)"
-   -DWITH_XC_X11="$(usex X)"
-   )
-   if [[ "${PV}" == *_beta* ]] ; then
-   mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-   fi
-   cmake_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-06-23 Thread Sam James
commit: 735934ff0eecdbba4bbcddad05f134c4782cb9f5
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Sat Jun 24 02:46:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 24 02:58:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735934ff

app-admin/keepassxc: replace `filter-flags -flto*` with `filter-lto`

Signed-off-by: Leonardo Hernández Hernández  proton.me>
Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.4.ebuild| 4 ++--
 app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild | 2 +-
 app-admin/keepassxc/keepassxc-.ebuild | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
index 7608f162fbff..68335109f7ce 100644
--- a/app-admin/keepassxc/keepassxc-2.7.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -75,7 +75,7 @@ src_prepare() {
 
 src_configure() {
# https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-flags -flto*
+   filter-lto
 
local mycmakeargs=(
# Gentoo users enable ccache via e.g. FEATURES=ccache or

diff --git a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
index 1751f110cb5c..0ca6281dbb85 100644
--- a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 
 src_configure() {
# https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-flags -flto*
+   filter-lto
 
local mycmakeargs=(
# Gentoo users enable ccache via e.g. FEATURES=ccache or

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 6a9c59967077..186c07c60416 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -72,7 +72,7 @@ src_prepare() {
 
 src_configure() {
# https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-flags -flto*
+   filter-lto
 
local mycmakeargs=(
# Gentoo users enable ccache via e.g. FEATURES=ccache or



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-06-20 Thread Arthur Zamarin
commit: 6cb76e7440616535af6f7b4fc631b099a23cb78b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jun 20 16:48:08 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jun 20 16:48:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb76e74

app-admin/keepassxc: Stabilize 2.7.5-r1 amd64, #908890

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
index b10614955f0d..1751f110cb5c 100644
--- a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
S="${WORKDIR}/${P/_/-}"
else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-06-20 Thread Arthur Zamarin
commit: cd34f2e3c166c1662a587baba0ca8133fc197edf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jun 20 16:48:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jun 20 16:48:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd34f2e3

app-admin/keepassxc: Stabilize 2.7.5-r1 x86, #908890

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
index 7b6665499602..b10614955f0d 100644
--- a/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
S="${WORKDIR}/${P/_/-}"
else

SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/

2023-05-22 Thread Maciej Barć
commit: afc96be9d10e99425d691519c757fed0987bc2d6
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon May 22 17:13:52 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon May 22 17:38:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc96be9

app-admin/keepassxc: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31131
Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch | 14 --
 1 file changed, 14 deletions(-)

diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch 
b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
deleted file mode 100644
index 52ca2b7eb610..
--- a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 776c40d9..477bf179 100644
 a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER)
- LIBS ${TEST_LIBRARIES})
- endif()
- 
--add_unit_test(NAME testcli SOURCES TestCli.cpp
--LIBS testsupport cli ${TEST_LIBRARIES})
--
- if(WITH_GUI_TESTS)
- add_subdirectory(gui)
- endif(WITH_GUI_TESTS)



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-05-19 Thread Maciej Barć
commit: e5442cb4319f0b6381a36a7ead8bd6fc337b
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri May 19 14:17:19 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri May 19 14:18:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5442cb4

app-admin/keepassxc: use botan:3

Closes: https://bugs.gentoo.org/906739
Signed-off-by: Maciej Barć  gentoo.org>

 .../keepassxc/{keepassxc-2.7.5.ebuild => keepassxc-2.7.5-r1.ebuild}| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.5.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
similarity index 98%
rename from app-admin/keepassxc/keepassxc-2.7.5.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
index d1389c67cc81..7b6665499602 100644
--- a/app-admin/keepassxc/keepassxc-2.7.5.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="autotype? ( X )"
 
 RDEPEND="
app-crypt/argon2:=
-   dev-libs/botan:2=
+   dev-libs/botan:3=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -85,6 +85,7 @@ src_configure() {
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-DWITH_XC_DOCS="$(usex doc)"
-DWITH_XC_BROWSER="$(usex browser)"
+   -DWITH_XC_BOTAN3=ON
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-05-19 Thread Marek Szuba
commit: 02e2e4a6fa33e33d73a43c1b257350ee00aa004a
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 19 08:36:42 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 19 08:37:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e2e4a6

app-admin/keepassxc: add 2.7.5

Signed-off-by: Marek Szuba  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 .../{keepassxc-.ebuild => keepassxc-2.7.5.ebuild}  | 10 +-
 app-admin/keepassxc/keepassxc-.ebuild  |  5 ++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 67aa48a88ca0..ab65dd45f920 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 
5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4
 SHA512 
76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
+DIST keepassxc-2.7.5-src.tar.xz 8706996 BLAKE2B 
6df7ec9e560b469b8e3ae9026464e6c2064ffd262b118842a3cd5fbf72758aa0e5614cb2581392b6ab35b3d202acbdad24e1679ca162468f78e88dd94af2422f
 SHA512 
904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.5.ebuild
similarity index 86%
copy from app-admin/keepassxc/keepassxc-.ebuild
copy to app-admin/keepassxc/keepassxc-2.7.5.ebuild
index 2254b764e96e..d1389c67cc81 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.5.ebuild
@@ -11,11 +11,10 @@ HOMEPAGE="https://keepassxc.org/
 
 if [[ "${PV}" != * ]] ; then
if [[ "${PV}" == *_beta* ]] ; then
-   
SRC_URI="https://github.com/keepassxreboot/keepassxc/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/keepassxc/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   
SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz;
+   
SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
@@ -33,7 +32,7 @@ REQUIRED_USE="autotype? ( X )"
 
 RDEPEND="
app-crypt/argon2:=
-   dev-libs/botan:3=
+   dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -63,6 +62,8 @@ BDEPEND="
doc? ( dev-ruby/asciidoctor )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
+
 src_prepare() {
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
printf '%s' "${PV}" > .version || die
@@ -84,7 +85,6 @@ src_configure() {
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-DWITH_XC_DOCS="$(usex doc)"
-DWITH_XC_BROWSER="$(usex browser)"
-   -DWITH_XC_BOTAN3=ON
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 2254b764e96e..6a9c59967077 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -11,11 +11,10 @@ HOMEPAGE="https://keepassxc.org/
 
 if [[ "${PV}" != * ]] ; then
if [[ "${PV}" == *_beta* ]] ; then
-   
SRC_URI="https://github.com/keepassxreboot/keepassxc/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/keepassxc/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   
SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz;
+   
SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz;
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-05-19 Thread Marek Szuba
commit: eb259e50e626af6d16074b749efe0d54291f0b22
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 19 07:59:11 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 19 08:37:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb259e50

app-admin/keepassxc: drop 2.7.1-r1, 2.7.3

Signed-off-by: Marek Szuba  gentoo.org>

 app-admin/keepassxc/Manifest  |   2 -
 app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild |  96 
 app-admin/keepassxc/keepassxc-2.7.3.ebuild| 101 --
 3 files changed, 199 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 40e3c23e67d0..67aa48a88ca0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1 @@
-DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 
4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae
 SHA512 
c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
-DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 
7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080
 SHA512 
29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
 DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 
5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4
 SHA512 
76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb

diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
deleted file mode 100644
index bf2430003375..
--- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org;
-
-if [[ "${PV}" != * ]] ; 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 ~riscv x86"
-   fi
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/keepassxreboot/${PN};
-   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   app-crypt/argon2:=
-   dev-libs/botan:2=
-   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
-   dev-qt/qtx11extras:5
-   media-gfx/qrencode:=
-   sys-libs/readline:0=
-   sys-libs/zlib:=
-   autotype? (
-   x11-libs/libX11
-   x11-libs/libXtst
-   )
-   keeshare? ( sys-libs/zlib:=[minizip] )
-   yubikey? (
-   dev-libs/libusb:1
-   sys-apps/pcsc-lite
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/qttest:5
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
-   printf '%s' "${PV}" > .version || die
-   fi
-
-cmake_src_prepare
-}
-
-src_configure() {
-   # https://github.com/keepassxreboot/keepassxc/issues/5801
-   filter-flags -flto*
-
-   local 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
-   -DWITH_GUI_TESTS=OFF
-   -DWITH_TESTS="$(usex test)"
-   -DWITH_XC_AUTOTYPE="$(usex autotype)"
-   -DWITH_XC_DOCS="$(usex doc)"
-   -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/_/-}" )
-

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2023-05-07 Thread Maciej Barć
commit: 5cd928cf691732d27d8e4c46c6f620e68b1be9b2
Author: Maciej Barć  gentoo  org>
AuthorDate: Sun May  7 15:20:08 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sun May  7 15:21:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd928cf

app-admin/keepassxc: use botan3 for live

Closes: https://bugs.gentoo.org/905878
Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 0e1b46d2f295..2254b764e96e 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ REQUIRED_USE="autotype? ( X )"
 
 RDEPEND="
app-crypt/argon2:=
-   dev-libs/botan:2=
+   dev-libs/botan:3=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -84,6 +84,7 @@ src_configure() {
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-DWITH_XC_DOCS="$(usex doc)"
-DWITH_XC_BROWSER="$(usex browser)"
+   -DWITH_XC_BOTAN3=ON
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-11-30 Thread Sam James
commit: 5158bd5edeb4a80fc58823be3129016b53dc415d
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 30 22:34:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 30 22:34:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5158bd5e

app-admin/keepassxc: Stabilize 2.7.4 x86, #883763

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
index fe3795ec295f..7608f162fbff 100644
--- a/app-admin/keepassxc/keepassxc-2.7.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != * ]] ; then
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 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-11-30 Thread Jakov Smolić
commit: baeda6b12e1840d5adcf135355f093c232604210
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Nov 30 21:15:25 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Nov 30 21:15:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baeda6b1

app-admin/keepassxc: Stabilize 2.7.4 amd64, #883763

Signed-off-by: Jakov Smolić  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
index eced3151172f..fe3795ec295f 100644
--- a/app-admin/keepassxc/keepassxc-2.7.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != * ]] ; then
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 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-11-28 Thread Jakov Smolić
commit: 10b0bf5b21d2701bb4ff4a1bc9ac2f71e2552337
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Nov 29 06:57:29 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Nov 29 06:57:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10b0bf5b

app-admin/keepassxc: Stabilize 2.7.3 amd64, #883077

Signed-off-by: Jakov Smolić  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
index eced3151172f..fe3795ec295f 100644
--- a/app-admin/keepassxc/keepassxc-2.7.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != * ]] ; then
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 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-10-31 Thread Marek Szuba
commit: 0e902030e0c40369cdd7dd553b3bead6afbe7f37
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov  1 00:36:01 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov  1 00:36:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e902030

app-admin/keepassxc: update description of USE=yubikey

Signed-off-by: Marek Szuba  gentoo.org>

 app-admin/keepassxc/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index a608739dade1..dc74e3197e66 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -14,7 +14,7 @@
Enables browser plugin support
Enable KeeShare sharing integration
Enable network support
-   Enable database unlocking via 
YubiKey.
+   Enable database unlocking via hardware 
keys supporting YubiKey-style HMAC-SHA1 protocol


KeePassXC provides a safe location for your passwords and 
similar



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/

2022-10-29 Thread Maciej Barć
commit: 4dcc7a47101df332b9a15face741c68901d0a525
Author: Maciej Barć  gentoo  org>
AuthorDate: Sun Oct 30 01:12:52 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sun Oct 30 01:14:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcc7a47

app-admin/keepassxc: bump to 2.7.4

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |   1 +
 .../keepassxc/files/keepassxc-2.7.4-tests.patch|  13 +++
 app-admin/keepassxc/keepassxc-2.7.4.ebuild | 101 +
 3 files changed, 115 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index b05501f8dc26..40e3c23e67d0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 
4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae
 SHA512 
c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
 DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 
7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080
 SHA512 
29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
+DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 
5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4
 SHA512 
76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb

diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch 
b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
new file mode 100644
index ..ccee26cb5ba9
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
@@ -0,0 +1,13 @@
+--- a/tests/CMakeLists.txt
 b/tests/CMakeLists.txt
+@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER)
+ LIBS ${TEST_LIBRARIES})
+ endif()
+ 
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+-LIBS testsupport cli ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE 
KEEPASSX_CLI_PATH="$")
+-
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)

diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
new file mode 100644
index ..eced3151172f
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+   https://github.com/keepassxreboot/keepassxc/;
+
+if [[ "${PV}" != * ]] ; 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 ~riscv ~x86"
+   fi
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/keepassxreboot/${PN};
+   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+   app-crypt/argon2:=
+   dev-libs/botan:2=
+   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:=
+   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}
+   dev-qt/qttest:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://github.com/keepassxreboot/keepassxc/issues/5801
+   filter-flags -flto*
+
+   local mycmakeargs=(
+   # Gentoo users enable ccache via 

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/

2022-10-26 Thread Maciej Barć
commit: 98a9e1bb66465f35d24eb9ee564277ecd782aed4
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Oct 26 13:29:22 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Oct 26 13:35:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a9e1bb

app-admin/keepassxc: bump to 2.7.3

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/Manifest   |   1 +
 .../keepassxc/files/keepassxc-2.7.3-tests.patch|  14 +++
 app-admin/keepassxc/keepassxc-2.7.3.ebuild | 101 +
 3 files changed, 116 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index f0479c7ab83a..b05501f8dc26 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 
4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae
 SHA512 
c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
+DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 
7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080
 SHA512 
29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842

diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch 
b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
new file mode 100644
index ..52ca2b7eb610
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 776c40d9..477bf179 100644
+--- a/tests/CMakeLists.txt
 b/tests/CMakeLists.txt
+@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER)
+ LIBS ${TEST_LIBRARIES})
+ endif()
+ 
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+-LIBS testsupport cli ${TEST_LIBRARIES})
+-
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)

diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
new file mode 100644
index ..eced3151172f
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+   https://github.com/keepassxreboot/keepassxc/;
+
+if [[ "${PV}" != * ]] ; 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 ~riscv ~x86"
+   fi
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/keepassxreboot/${PN};
+   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+   app-crypt/argon2:=
+   dev-libs/botan:2=
+   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:=
+   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}
+   dev-qt/qttest:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # https://github.com/keepassxreboot/keepassxc/issues/5801
+   filter-flags -flto*
+
+   local 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
+   -DWITH_GUI_TESTS=OFF
+   -DWITH_TESTS="$(usex test)"
+   -DWITH_XC_AUTOTYPE="$(usex autotype)"
+   

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-10-26 Thread Maciej Barć
commit: cd20f27f851dd346ac49d3d2b4855237c03520c2
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Oct 26 13:36:21 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Oct 26 13:36:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd20f27f

app-admin/keepassxc: sync live

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 985aebc0d678..0e1b46d2f295 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 inherit cmake flag-o-matic xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org;
+HOMEPAGE="https://keepassxc.org/
+   https://github.com/keepassxreboot/keepassxc/;
 
 if [[ "${PV}" != * ]] ; then
if [[ "${PV}" == *_beta* ]] ; then
@@ -67,7 +68,7 @@ src_prepare() {
printf '%s' "${PV}" > .version || die
fi
 
-cmake_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-09-26 Thread Maciej Barć
commit: 7e53d4a92ff5cbaa2e339037585e8ac9f6de50b8
Author: マリウス  xn--gckvb8fzb  com>
AuthorDate: Mon Sep 26 00:37:49 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Sep 26 08:03:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e53d4a9

app-admin/keepassxc: Add X USE flag

Signed-off-by: マリウス  xn--gckvb8fzb.com>
Closes: https://github.com/gentoo/gentoo/pull/27462
Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 04056497dec9..985aebc0d678 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -25,9 +25,10 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser doc keeshare +network test yubikey"
+IUSE="X autotype browser doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
 
 RDEPEND="
app-crypt/argon2:=
@@ -39,10 +40,10 @@ RDEPEND="
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
media-gfx/qrencode:=
sys-libs/readline:0=
sys-libs/zlib:=
+   X? ( dev-qt/qtx11extras:5 )
autotype? (
x11-libs/libX11
x11-libs/libXtst
@@ -88,6 +89,7 @@ src_configure() {
-DWITH_XC_SSHAGENT=ON
-DWITH_XC_UPDATECHECK=OFF
-DWITH_XC_YUBIKEY="$(usex yubikey)"
+   -DWITH_XC_X11="$(usex X)"
)
if [[ "${PV}" == *_beta* ]] ; then
mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-07-26 Thread Maciej Barć
commit: 3784b460d4f7be8d10ad579122dc66523e8e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 25 16:43:24 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Jul 26 22:02:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3784b460

app-admin/keepassxc: Move dev-qt/linguist-tools:5 to BDEPEND

Bug: https://bugs.gentoo.org/544938
Bug: https://github.com/gentoo/gentoo/pull/26595
Closes: https://bugs.gentoo.org/861050
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild | 6 ++
 app-admin/keepassxc/keepassxc-.ebuild | 6 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index 5dfddb908929..bf2430003375 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -53,13 +53,11 @@ RDEPEND="
sys-apps/pcsc-lite
)
 "
-
-DEPEND="
-   ${RDEPEND}
-   dev-qt/linguist-tools:5
+DEPEND="${RDEPEND}
dev-qt/qttest:5
 "
 BDEPEND="
+   dev-qt/linguist-tools:5
doc? ( dev-ruby/asciidoctor )
 "
 

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index d148084c50be..04056497dec9 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -53,13 +53,11 @@ RDEPEND="
sys-apps/pcsc-lite
)
 "
-
-DEPEND="
-   ${RDEPEND}
-   dev-qt/linguist-tools:5
+DEPEND="${RDEPEND}
dev-qt/qttest:5
 "
 BDEPEND="
+   dev-qt/linguist-tools:5
doc? ( dev-ruby/asciidoctor )
 "
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-07-25 Thread Marek Szuba
commit: d5557fb080ebb477555f9edfb350ff32e5ea96f0
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul 25 20:09:52 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul 25 22:15:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5557fb0

app-admin/keepassxc: drop 2.6.6, 2.6., 2.7.0-r2

Signed-off-by: Marek Szuba  gentoo.org>

 app-admin/keepassxc/Manifest  |  2 -
 app-admin/keepassxc/keepassxc-2.6.6.ebuild| 96 --
 app-admin/keepassxc/keepassxc-2.6..ebuild | 99 ---
 app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild | 98 --
 app-admin/keepassxc/metadata.xml  |  1 -
 5 files changed, 296 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 7805b96fbea3..f0479c7ab83a 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1 @@
-DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B 
ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c
 SHA512 
175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
-DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 
74c4e9c6d06239950f1b8a64c5bce894799fdd73a562ee22d1189c60dedfff3555132c0619488e0682e94de8759e096627520b96d664f472645e4b6375d68ff9
 SHA512 
0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 
4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae
 SHA512 
c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9

diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
deleted file mode 100644
index 2c4ae038afba..
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 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}" !=  ]] ; 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 ~riscv 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 doc 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 )
-   doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" !=  ]] && [[ ! -f 
.version ]] ; then
-   printf '%s' "${PV}" > .version || die
-   fi
-
-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="$(usex doc)"
-   -DWITH_XC_BROWSER="$(usex browser)"
-   -DWITH_XC_FDOSECRETS=ON
-   -DWITH_XC_KEESHARE="$(usex keeshare)"
-   -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
-   -DWITH_XC_NETWORKING="$(usex network)"
-   -DWITH_XC_SSHAGENT=ON
-   -DWITH_XC_UPDATECHECK=OFF
-   -DWITH_XC_YUBIKEY="$(usex yubikey)"
-   )
-   if [[ "${PV}" == *_beta* ]] ; then
-  

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-06-29 Thread Marek Szuba
commit: d5c4e21756e78d015a71f393661842760b642089
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun 29 11:18:48 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun 29 11:24:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c4e217

app-admin/keepassxc/keepassxc: sync 2.6. keyword list with non-live ebuilds

Signed-off-by: Marek Szuba  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6..ebuild 
b/app-admin/keepassxc/keepassxc-2.6..ebuild
index e2016b26a2c8..606bf9740f31 100644
--- a/app-admin/keepassxc/keepassxc-2.6..ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6..ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
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"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-06-29 Thread Marek Szuba
commit: a430655746125995603a66f772a847136435577a
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun 29 11:06:08 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun 29 11:07:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4306557

app-admin/keepassxc: unify metadata formatting

Signed-off-by: Marek Szuba  gentoo.org>

 app-admin/keepassxc/metadata.xml | 41 
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index 950df54ea705..38521204bca7 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -1,29 +1,28 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-x...@gentoo.org
-Maciej Barć
-  
+   
+   x...@gentoo.org
+   Maciej Barć
+   

mare...@gentoo.org
Marek Szuba

-  
-Add support to autotype the passwords into other 
applications
-Enables browser plugin support
-Use dev-util/ccache to build 
keepassxc
-Enable KeeShare sharing integration
-Enable network support
-Enable database unlocking via YubiKey.
-  
-  
-KeePassXC provides a safe location for your passwords and similar
-data.  It encrypts its databasee with AES either by passphrase or a key
-file, compatible with a PDA and Windows version.
-  
-  
-https://github.com/keepassxreboot/keepassxc/issues/
-keepassxreboot/keepassxc
-  
+   
+   Add support to autotype the passwords 
into other applications
+   Enables browser plugin support
+   Use dev-util/ccache to build 
keepassxc
+   Enable KeeShare sharing integration
+   Enable network support
+   Enable database unlocking via 
YubiKey.
+   
+   
+   KeePassXC provides a safe location for your passwords and 
similar
+   data. It encrypts its databasee with AES either by passphrase 
or a key
+   file, compatible with a PDA and Windows version.
+   
+   
+   keepassxreboot/keepassxc
+   
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-06-29 Thread Marek Szuba
commit: 0876aa86d4488c72aaaf3dab397e785dcf36ef21
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun 29 11:04:33 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun 29 11:07:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0876aa86

app-admin/keepassxc: add myself as a maintainer

Signed-off-by: Marek Szuba  gentoo.org>

 app-admin/keepassxc/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index 144684a0da24..950df54ea705 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -5,6 +5,10 @@
 x...@gentoo.org
 Maciej Barć
   
+   
+   mare...@gentoo.org
+   Marek Szuba
+   
   
 Add support to autotype the passwords into other 
applications
 Enables browser plugin support



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-06-29 Thread Maciej Barć
commit: 9bd83a7e4e0d0f38cc11e6ff2c5a700a9146
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Jun 29 11:01:43 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Jun 29 11:01:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd83a7e

app-admin/keepassxc: add myself to maintainers

Signed-off-by: Maciej Barć  gentoo.org>

 app-admin/keepassxc/metadata.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index 8debb7a00eb3..144684a0da24 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+x...@gentoo.org
+Maciej Barć
+  
   
 Add support to autotype the passwords into other 
applications
 Enables browser plugin support
@@ -16,6 +19,7 @@
 file, compatible with a PDA and Windows version.
   
   
+https://github.com/keepassxreboot/keepassxc/issues/
 keepassxreboot/keepassxc
   
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-05-28 Thread Agostino Sarubbo
commit: b0bc3281f056e319d7bd77d220f2b36ce3961d95
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May 28 07:04:03 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May 28 07:04:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bc3281

app-admin/keepassxc: x86 stable wrt bug #847808

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index 3f0de7b50358..5dfddb908929 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
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 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-05-28 Thread Agostino Sarubbo
commit: e14df56bf294eecc016c8c32430df2640adf1053
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May 28 06:55:55 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May 28 06:55:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14df56b

app-admin/keepassxc: amd64 stable wrt bug #847808

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index 0793091a0b25..3f0de7b50358 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
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 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-04-10 Thread Sam James
commit: 4c3f8d971843b8402cc7b6002653b93c96b8a4ef
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 22 21:18:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 10 22:58:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c3f8d97

app-admin/keepassxc: remove USE=ccache

Gentoo users enable ccache via FEATURES=ccache (or if they wish,
manual means). Most packages don't have USE=ccache for this reason.

Remove it from keepassxc as an outlier.

Maintainer timeout.

Closes: https://github.com/gentoo/gentoo/pull/24713
Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild | 7 ---
 app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild | 7 ---
 app-admin/keepassxc/keepassxc-.ebuild | 7 ---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
index eadf15f62f91..d148084c50be 100644
--- a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
@@ -60,7 +60,6 @@ DEPEND="
dev-qt/qttest:5
 "
 BDEPEND="
-   ccache? ( dev-util/ccache )
doc? ( dev-ruby/asciidoctor )
 "
 
@@ -77,7 +76,9 @@ src_configure() {
filter-flags -flto*
 
local mycmakeargs=(
-   -DWITH_CCACHE="$(usex ccache)"
+   # 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
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"

diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index 447eb59eab46..0793091a0b25 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
@@ -60,7 +60,6 @@ DEPEND="
dev-qt/qttest:5
 "
 BDEPEND="
-   ccache? ( dev-util/ccache )
doc? ( dev-ruby/asciidoctor )
 "
 
@@ -77,7 +76,9 @@ src_configure() {
filter-flags -flto*
 
local mycmakeargs=(
-   -DWITH_CCACHE="$(usex ccache)"
+   # 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
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index eadf15f62f91..d148084c50be 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
@@ -60,7 +60,6 @@ DEPEND="
dev-qt/qttest:5
 "
 BDEPEND="
-   ccache? ( dev-util/ccache )
doc? ( dev-ruby/asciidoctor )
 "
 
@@ -77,7 +76,9 @@ src_configure() {
filter-flags -flto*
 
local mycmakeargs=(
-   -DWITH_CCACHE="$(usex ccache)"
+   # 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
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-04-10 Thread Sam James
commit: 61cd2760c8327648c55d0fee59cf7a96eed1f4ea
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 22 21:16:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 10 22:58:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cd2760

app-admin/keepassxc: add missing botan subslot dep

Botan exposes a subslot for its ABI so a subslot (:=) dep should be used.

Maintainer timeout.

Closes: https://bugs.gentoo.org/782244
Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild   | 2 +-
 .../keepassxc/{keepassxc-2.7.1.ebuild => keepassxc-2.7.1-r1.ebuild} | 2 +-
 app-admin/keepassxc/keepassxc-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
index fb5899e8a65b..eadf15f62f91 100644
--- a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
app-crypt/argon2:=
-   dev-libs/botan:2
+   dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5

diff --git a/app-admin/keepassxc/keepassxc-2.7.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
similarity index 99%
rename from app-admin/keepassxc/keepassxc-2.7.1.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index f2f002f7a9e2..447eb59eab46 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
app-crypt/argon2:=
-   dev-libs/botan:2
+   dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index fb5899e8a65b..eadf15f62f91 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
app-crypt/argon2:=
-   dev-libs/botan:2
+   dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-04-06 Thread Lars Wendler
commit: 81b4e87b874549d83794c74e706e060fa6d39ae8
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Apr  6 06:50:34 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Apr  6 06:50:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b4e87b

app-admin/keepassxc: Bump to version 2.7.1

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.7.1.ebuild | 97 ++
 2 files changed, 98 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index b8332fd0afed..7805b96fbea3 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
 DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B 
ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c
 SHA512 
175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
 DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 
74c4e9c6d06239950f1b8a64c5bce894799fdd73a562ee22d1189c60dedfff3555132c0619488e0682e94de8759e096627520b96d664f472645e4b6375d68ff9
 SHA512 
0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12
+DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 
4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae
 SHA512 
c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9

diff --git a/app-admin/keepassxc/keepassxc-2.7.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.1.ebuild
new file mode 100644
index ..f2f002f7a9e2
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org;
+
+if [[ "${PV}" != * ]] ; 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 ~riscv ~x86"
+   fi
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/keepassxreboot/${PN};
+   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser ccache doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   app-crypt/argon2:=
+   dev-libs/botan:2
+   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
+   dev-qt/qtx11extras:5
+   media-gfx/qrencode:=
+   sys-libs/readline:0=
+   sys-libs/zlib:=
+   autotype? (
+   x11-libs/libX11
+   x11-libs/libXtst
+   )
+   keeshare? ( sys-libs/zlib:=[minizip] )
+   yubikey? (
+   dev-libs/libusb:1
+   sys-apps/pcsc-lite
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+   dev-qt/linguist-tools:5
+   dev-qt/qttest:5
+"
+BDEPEND="
+   ccache? ( dev-util/ccache )
+   doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+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="$(usex doc)"
+   -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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-03-23 Thread Lars Wendler
commit: 166db1b3a8ecac12f80b2c186a6e79b38f017e8b
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar 23 14:39:05 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar 23 14:40:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166db1b3

app-admin/keepassxc: 2.7.0 unconditionally RDEPENDs on dev-qt/qtx11extras

Closes: https://bugs.gentoo.org/835850
Signed-off-by: Lars Wendler  gentoo.org>

 .../keepassxc/{keepassxc-2.7.0-r1.ebuild => keepassxc-2.7.0-r2.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
similarity index 98%
rename from app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
index 5a55699208b5..fb5899e8a65b 100644
--- a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
@@ -39,11 +39,11 @@ RDEPEND="
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
media-gfx/qrencode:=
sys-libs/readline:0=
sys-libs/zlib:=
autotype? (
-   dev-qt/qtx11extras:5
x11-libs/libX11
x11-libs/libXtst
)



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-03-23 Thread Lars Wendler
commit: aef50611ead5cde590a85d35ef2dd38ad1196b3c
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar 23 14:39:50 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar 23 14:40:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef50611

app-admin/keepassxc: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 5a55699208b5..fb5899e8a65b 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -39,11 +39,11 @@ RDEPEND="
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
media-gfx/qrencode:=
sys-libs/readline:0=
sys-libs/zlib:=
autotype? (
-   dev-qt/qtx11extras:5
x11-libs/libX11
x11-libs/libXtst
)



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-03-23 Thread Lars Wendler
commit: 58cb9de75dad48328f1e84ed36012888b58436c2
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar 23 08:38:42 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar 23 08:40:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cb9de7

app-admin/keepassxc: Revbump adding app-crypt/argon2 to RDEPEND

Closes: https://bugs.gentoo.org/835832
Signed-off-by: Lars Wendler  gentoo.org>

 .../keepassxc/{keepassxc-2.7.0.ebuild => keepassxc-2.7.0-r1.ebuild}| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.7.0.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
similarity index 97%
rename from app-admin/keepassxc/keepassxc-2.7.0.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
index 3d0e25a306e7..5a55699208b5 100644
--- a/app-admin/keepassxc/keepassxc-2.7.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
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"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
inherit git-r3
@@ -30,6 +30,7 @@ IUSE="autotype browser ccache doc keeshare +network test 
yubikey"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+   app-crypt/argon2:=
dev-libs/botan:2
dev-qt/qtconcurrent:5
dev-qt/qtcore:5



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-03-23 Thread Lars Wendler
commit: 428f2f3b07376df0cfb2b5b6f9f7cce1b54ab977
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar 23 08:39:44 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar 23 08:40:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428f2f3b

app-admin/keepassxc: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 3d0e25a306e7..5a55699208b5 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != * ]] ; then
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"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
 else
inherit git-r3
@@ -30,6 +30,7 @@ IUSE="autotype browser ccache doc keeshare +network test 
yubikey"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+   app-crypt/argon2:=
dev-libs/botan:2
dev-qt/qtconcurrent:5
dev-qt/qtcore:5



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-03-21 Thread Lars Wendler
commit: f34bed86c4ea478ed9377a787192042cecbe1cac
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar 22 01:59:19 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar 22 01:59:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34bed86

app-admin/keepassxc: Bump to version 2.7.0. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest| 2 +-
 .../keepassxc/{keepassxc-2.7.0_beta1.ebuild => keepassxc-2.7.0.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 2e6bcf95b9b0..b8332fd0afed 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,2 @@
 DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B 
ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c
 SHA512 
175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
-DIST keepassxc-2.7.0_beta1.tar.gz 10634757 BLAKE2B 
3ec079dacbf6f13f60ac68084d167e90f213894f3141a55962720646673de0bf466c81493a4f449b4871298d8067b1971e7e25477b7cbecb47a277e5594b425e
 SHA512 
b1fbdf5afea1514a8e42338ea26077b0a6d3088674baf1761e8ac0060ffd5c14da6f7bf11d31cd04f90d02c30e6db39e559c2995863cb3f563d7e6894f7680a9
+DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 
74c4e9c6d06239950f1b8a64c5bce894799fdd73a562ee22d1189c60dedfff3555132c0619488e0682e94de8759e096627520b96d664f472645e4b6375d68ff9
 SHA512 
0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12

diff --git a/app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.0.ebuild
similarity index 100%
rename from app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.0.ebuild



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-02-27 Thread Lars Wendler
commit: efb726749d0ff189ccd0de9faed4cfd14e6961a8
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb 27 23:02:44 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Feb 27 23:04:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efb72674

app-admin/keepassxc: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 6eb2c5dbb6e3..3d0e25a306e7 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -92,8 +92,5 @@ src_configure() {
if [[ "${PV}" == *_beta* ]] ; then
mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
fi
-   if [[ "${PV}" !=  ]] ; then
-   mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" )
-   fi
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-02-27 Thread Lars Wendler
commit: 3d720dd85f6c09f643b910e045f526af610f8451
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb 27 23:02:21 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Feb 27 23:04:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d720dd8

app-admin/keepassxc: Bump to version 2.7.0_beta1

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest |  1 +
 app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index cfe9fe1f233c..2e6bcf95b9b0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B 
ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c
 SHA512 
175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
+DIST keepassxc-2.7.0_beta1.tar.gz 10634757 BLAKE2B 
3ec079dacbf6f13f60ac68084d167e90f213894f3141a55962720646673de0bf466c81493a4f449b4871298d8067b1971e7e25477b7cbecb47a277e5594b425e
 SHA512 
b1fbdf5afea1514a8e42338ea26077b0a6d3088674baf1761e8ac0060ffd5c14da6f7bf11d31cd04f90d02c30e6db39e559c2995863cb3f563d7e6894f7680a9

diff --git a/app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild 
b/app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild
new file mode 100644
index ..3d0e25a306e7
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.0_beta1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org;
+
+if [[ "${PV}" != * ]] ; 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};
+   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser ccache doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-libs/botan:2
+   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/libXtst
+   )
+   keeshare? ( sys-libs/zlib:=[minizip] )
+   yubikey? (
+   dev-libs/libusb:1
+   sys-apps/pcsc-lite
+   )
+"
+
+DEPEND="
+   ${RDEPEND}
+   dev-qt/linguist-tools:5
+   dev-qt/qttest:5
+"
+BDEPEND="
+   ccache? ( dev-util/ccache )
+   doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+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="$(usex doc)"
+   -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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-01-28 Thread Lars Wendler
commit: 63f24afd03d1d57d60231717b4fcde28fa00a32e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 28 14:47:05 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 28 14:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f24afd

app-admin/keepassxc: Add 2.6.x live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6..ebuild | 99 +++
 1 file changed, 99 insertions(+)

diff --git a/app-admin/keepassxc/keepassxc-2.6..ebuild 
b/app-admin/keepassxc/keepassxc-2.6..ebuild
new file mode 100644
index ..e2016b26a2c8
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6..ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org;
+
+if [[ "${PV}" != * ]] ; 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};
+   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser ccache doc 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? ( sys-libs/zlib:=[minizip] )
+   yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+   ${RDEPEND}
+   dev-qt/linguist-tools:5
+   dev-qt/qttest:5
+"
+BDEPEND="
+   ccache? ( dev-util/ccache )
+   doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+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="$(usex doc)"
+   -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
+   if [[ "${PV}" !=  ]] ; then
+   mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" )
+   fi
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-01-28 Thread Lars Wendler
commit: 9adb37d87d413c6d361a178d92edacab78226691
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 28 14:46:37 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 28 14:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9adb37d8

app-admin/keepassxc: Only use 2.7 development branch in  live ebuild

Fixed dependencies

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 44ca0b85d8d9..6eb2c5dbb6e3 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic xdg
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org;
 
-if [[ "${PV}" !=  ]] ; then
+if [[ "${PV}" != * ]] ; then
if [[ "${PV}" == *_beta* ]] ; then

SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/${P/_/-}"
@@ -20,6 +20,7 @@ if [[ "${PV}" !=  ]] ; then
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/keepassxreboot/${PN};
+   [[ "${PV}" !=  ]] && EGIT_BRANCH="master"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
@@ -29,9 +30,7 @@ IUSE="autotype browser ccache doc keeshare +network test 
yubikey"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   app-crypt/argon2:=
-   dev-libs/libgcrypt:=
-   >=dev-libs/libsodium-1.0.12:=
+   dev-libs/botan:2
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -45,11 +44,13 @@ RDEPEND="
autotype? (
dev-qt/qtx11extras:5
x11-libs/libX11
-   x11-libs/libXi
x11-libs/libXtst
)
-   keeshare? ( dev-libs/quazip:0= )
-   yubikey? ( sys-auth/ykpers )
+   keeshare? ( sys-libs/zlib:=[minizip] )
+   yubikey? (
+   dev-libs/libusb:1
+   sys-apps/pcsc-lite
+   )
 "
 
 DEPEND="
@@ -63,10 +64,7 @@ BDEPEND="
 "
 
 src_prepare() {
-use test || \
-   sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" !=  ]] && [[ ! -f 
.version ]] ; then
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != * ]] && [[ ! -f 
.version ]] ; then
printf '%s' "${PV}" > .version || die
fi
 
@@ -86,7 +84,6 @@ src_configure() {
-DWITH_XC_BROWSER="$(usex browser)"
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
-   -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"
-DWITH_XC_SSHAGENT=ON
-DWITH_XC_UPDATECHECK=OFF
@@ -95,5 +92,8 @@ src_configure() {
if [[ "${PV}" == *_beta* ]] ; then
mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
fi
+   if [[ "${PV}" !=  ]] ; then
+   mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" )
+   fi
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2022-01-28 Thread Lars Wendler
commit: 8e5188d12df4e4f540588af37ea5d6da994c1754
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 28 14:52:58 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 28 14:56:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e5188d1

app-admin/keepassxc: Minor ebuild adjustments

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   | 2 +-
 app-admin/keepassxc/keepassxc-2.6.6.ebuild | 9 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index bdde1c3d9cb6..cfe9fe1f233c 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1 @@
-DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B 
cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f
 SHA512 
fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7
+DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B 
ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c
 SHA512 
175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b

diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
index af0c59d08079..2c4ae038afba 100644
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,8 +13,8 @@ if [[ "${PV}" !=  ]] ; 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;
+   
#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 ~riscv x86"
fi
 else
@@ -63,9 +63,6 @@ BDEPEND="
 "
 
 src_prepare() {
-use test || \
-   sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" !=  ]] && [[ ! -f 
.version ]] ; then
printf '%s' "${PV}" > .version || die
fi



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/

2021-09-28 Thread Lars Wendler
commit: f4f777ec8fed602312d50a185be63749aa6c6a8a
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Sep 28 17:35:35 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 28 17:48:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f777ec

app-admin/keepassxc: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  2 -
 .../keepassxc/files/keepassxc-2.6.4-quazip1.patch  | 28 ---
 app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild  | 95 -
 app-admin/keepassxc/keepassxc-2.6.5.ebuild | 98 --
 4 files changed, 223 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 46a0d186df9..bdde1c3d9cb 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1 @@
-DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B 
ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba
 SHA512 
3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
-DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B 
d51782c65fffc4499d85cfa893a908b1f5964fc018a8b878ee61896684e55c8f3d935f7c14d38ba75f26fda3b59b6e408b77b68e11504b9fb95d82fdcc02bf5a
 SHA512 
a5993170ff7e28cb56fc14fbbb7e93a5821b2edefd6d8cd6ce798f810c8045595913a8508c9a256363028be93aaad6ff2f13904ebc19229309d356e119ed0dce
 DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B 
cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f
 SHA512 
fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7

diff --git a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch 
b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch
deleted file mode 100644
index 42f4fe7478b..000
--- a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index e15340b8174..000
--- a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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}" !=  ]] ; 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}
-   

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-09-28 Thread Lars Wendler
commit: b85c84a3b871e0efcf09a9be47f82c2a9514bf3c
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Sep 28 17:43:08 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 28 17:48:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85c84a3

app-admin/keepassxc: EAPI-8 bump

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 377737479d9..44ca0b85d8d 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake flag-o-matic xdg
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-07-15 Thread Agostino Sarubbo
commit: 9131ba5d11bf6f387bca4b3503b3f499d8244193
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 15 07:41:50 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 15 07:41:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9131ba5d

app-admin/keepassxc: x86 stable wrt bug #802135

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
index cc729b4207a..e88a934d8a6 100644
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-07-15 Thread Agostino Sarubbo
commit: 085d0603a53959658e3130ad36344325810624f2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 15 07:38:07 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 15 07:38:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085d0603

app-admin/keepassxc: amd64 stable wrt bug #802135

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
index f6bd89c1df7..cc729b4207a 100644
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-06-12 Thread Lars Wendler
commit: 02c362a480e15f9a34148df2a0599ba79d54d68b
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jun 12 10:52:28 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jun 12 14:20:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c362a4

app-admin/keepassxc: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 7eb04e31712..377737479d9 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -86,6 +86,7 @@ src_configure() {
-DWITH_XC_BROWSER="$(usex browser)"
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
+   -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"
-DWITH_XC_SSHAGENT=ON
-DWITH_XC_UPDATECHECK=OFF



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-06-12 Thread Lars Wendler
commit: ff75ed1a73c8fc68981a4b61215ba55a298771f4
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jun 12 09:49:03 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jun 12 10:34:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff75ed1a

app-admin/keepassxc: Bump to version 2.6.6

Closes: https://bugs.gentoo.org/795462
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.6.6.ebuild | 99 ++
 2 files changed, 100 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index a6baba9d3d9..46a0d186df9 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
 DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B 
ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba
 SHA512 
3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
 DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B 
d51782c65fffc4499d85cfa893a908b1f5964fc018a8b878ee61896684e55c8f3d935f7c14d38ba75f26fda3b59b6e408b77b68e11504b9fb95d82fdcc02bf5a
 SHA512 
a5993170ff7e28cb56fc14fbbb7e93a5821b2edefd6d8cd6ce798f810c8045595913a8508c9a256363028be93aaad6ff2f13904ebc19229309d356e119ed0dce
+DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B 
cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f
 SHA512 
fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7

diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
new file mode 100644
index 000..f6bd89c1df7
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
@@ -0,0 +1,99 @@
+# 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}" !=  ]] ; 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 doc 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 )
+   doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+use test || \
+   sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" !=  ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
+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="$(usex doc)"
+   -DWITH_XC_BROWSER="$(usex browser)"
+   -DWITH_XC_FDOSECRETS=ON
+   -DWITH_XC_KEESHARE="$(usex keeshare)"
+   -DWITH_XC_KEESHARE_SECURE="$(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

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-06-08 Thread Lars Wendler
commit: ebd9cfb6764a6a659448848289dbd41363d8ca73
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jun  8 07:40:09 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jun  8 07:40:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd9cfb6

app-admin/keepassxc: Make sure releases are be seen as releases

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.5.ebuild | 4 
 app-admin/keepassxc/keepassxc-.ebuild  | 4 
 2 files changed, 8 insertions(+)

diff --git a/app-admin/keepassxc/keepassxc-2.6.5.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.5.ebuild
index f5e3ee10af8..4b62059e2dc 100644
--- a/app-admin/keepassxc/keepassxc-2.6.5.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.5.ebuild
@@ -66,6 +66,10 @@ src_prepare() {
 use test || \
sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" !=  ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
 cmake_src_prepare
 }
 

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 0c6789f6495..7eb04e31712 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -66,6 +66,10 @@ src_prepare() {
 use test || \
sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
+   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" !=  ]] && [[ ! -f 
.version ]] ; then
+   printf '%s' "${PV}" > .version || die
+   fi
+
 cmake_src_prepare
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-06-08 Thread Lars Wendler
commit: 0c5909a8300fac0b5a666a07a3c42c2db7f9be08
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jun  8 07:14:51 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jun  8 07:20:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5909a8

app-admin/keepassxc: Bump to version 2.6.5

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.6.5.ebuild | 94 ++
 2 files changed, 95 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index f157db511a8..a6baba9d3d9 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
 DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B 
ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba
 SHA512 
3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
+DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B 
d51782c65fffc4499d85cfa893a908b1f5964fc018a8b878ee61896684e55c8f3d935f7c14d38ba75f26fda3b59b6e408b77b68e11504b9fb95d82fdcc02bf5a
 SHA512 
a5993170ff7e28cb56fc14fbbb7e93a5821b2edefd6d8cd6ce798f810c8045595913a8508c9a256363028be93aaad6ff2f13904ebc19229309d356e119ed0dce

diff --git a/app-admin/keepassxc/keepassxc-2.6.5.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.5.ebuild
new file mode 100644
index 000..f5e3ee10af8
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.5.ebuild
@@ -0,0 +1,94 @@
+# 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}" !=  ]] ; 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 doc 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 )
+   doc? ( dev-ruby/asciidoctor )
+"
+
+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="$(usex doc)"
+   -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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-06-08 Thread Lars Wendler
commit: e9ab15f2d10c9a69c2499a3208933152ec7a0d7e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jun  8 07:20:09 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jun  8 07:20:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ab15f2

app-admin/keepassxc: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index c73aaad39c7..0c6789f6495 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="doc autotype browser ccache keeshare +network test yubikey"
+IUSE="autotype browser ccache doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
@@ -62,8 +62,6 @@ BDEPEND="
doc? ( dev-ruby/asciidoctor )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-quazip1.patch ) # pending upstream PR#5511
-
 src_prepare() {
 use test || \
sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-04-11 Thread Lars Wendler
commit: 3f792fd06d6907e7fd0aff5d8ccbaab1cc0c78a0
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Apr 11 21:30:19 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Apr 11 21:46:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f792fd0

app-admin/keepassxc: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest  |  1 -
 app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild | 90 ---
 2 files changed, 91 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index fb87bbdc9ff..f157db511a8 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1 @@
-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

diff --git a/app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild
deleted file mode 100644
index b91f2ed7a16..000
--- a/app-admin/keepassxc/keepassxc-2.6.3-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}" !=  ]] ; 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
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-04-11 Thread Lars Wendler
commit: 93d123d9606b74c94b6c48744e631c0054551696
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Apr 11 21:45:44 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Apr 11 21:46:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d123d9

app-admin/keepassxc: Add "doc" USE flag

Bug: https://bugs.gentoo.org/782244
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index df01dad6f39..c73aaad39c7 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache keeshare +network test yubikey"
+IUSE="doc autotype browser ccache keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
@@ -59,6 +59,7 @@ DEPEND="
 "
 BDEPEND="
ccache? ( dev-util/ccache )
+   doc? ( dev-ruby/asciidoctor )
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-2.6.4-quazip1.patch ) # pending upstream PR#5511
@@ -79,7 +80,7 @@ src_configure() {
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-   -DWITH_XC_DOCS=OFF
+   -DWITH_XC_DOCS="$(usex doc)"
-DWITH_XC_BROWSER="$(usex browser)"
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-03-08 Thread Sam James
commit: 3284d5e48b0f208ac23ed5b9bb84b655fda06cff
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  8 10:26:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  8 10:26:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3284d5e4

app-admin/keepassxc: Stabilize 2.6.4-r2 x86, #772419

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
index ac01735bde4..e15340b8174 100644
--- a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-03-08 Thread Sam James
commit: bf91d557067ab9a3123eac749dc088a76c96403e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  8 10:25:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  8 10:25:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf91d557

app-admin/keepassxc: Stabilize 2.6.4-r2 amd64, #772419

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
index 6ea4ff699bb..ac01735bde4 100644
--- a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/, app-admin/keepassxc/

2021-02-23 Thread Andreas Sturmlechner
commit: 688026fef945d2f6bd310c363a24f33d0cafaf94
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 18:55:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:29 2021 +
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  gentoo.org>

 .../keepassxc/files/keepassxc-2.6.4-quazip1.patch  | 28 ++
 ...assxc-.ebuild => keepassxc-2.6.4-r2.ebuild} |  6 +++--
 app-admin/keepassxc/keepassxc-.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 000..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 
+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-.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
similarity index 95%
copy from app-admin/keepassxc/keepassxc-.ebuild
copy to app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild
index 10b1cb7ce9d..6ea4ff699bb 100644
--- a/app-admin/keepassxc/keepassxc-.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-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 10b1cb7ce9d..df01dad6f39 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.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 || \



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-23 Thread Andreas Sturmlechner
commit: 17436d9fa66f43028ca1117e23e72218e6b204d7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 18:55:32 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17436d9f

app-admin/keepassxc: Drop 2.6.4-r1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild | 93 ---
 1 file changed, 93 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild
deleted file mode 100644
index 10b1cb7ce9d..000
--- a/app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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}" !=  ]] ; 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() {
-   # 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
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-23 Thread Andreas Sturmlechner
commit: b0c5a4356f5b598dc1139bc56debcb7ef1a81412
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 18:56:05 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c5a435

app-admin/keepassxc: Drop 2.6.2-r1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/keepassxc/Manifest  |  1 -
 app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild | 90 ---
 2 files changed, 91 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index bd4aef71807..fb87bbdc9ff 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1,2 @@
-DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B 
c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f
 SHA512 
b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
 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

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 b91f2ed7a16..000
--- 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}" !=  ]] ; 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
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-14 Thread Sam James
commit: 0a063bda8c6e48e5984078d74d5d28e425783d30
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 15 03:34:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 03:34:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a063bda

app-admin/keepassxc: fix quazip slot dep

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../keepassxc/{keepassxc-2.6.2.ebuild => keepassxc-2.6.2-r1.ebuild} | 2 +-
 .../keepassxc/{keepassxc-2.6.3.ebuild => keepassxc-2.6.3-r1.ebuild} | 2 +-
 .../keepassxc/{keepassxc-2.6.4.ebuild => keepassxc-2.6.4-r1.ebuild} | 2 +-
 app-admin/keepassxc/keepassxc-.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.2.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild
similarity index 98%
rename from app-admin/keepassxc/keepassxc-2.6.2.ebuild
rename to app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild
index 5b51acf9ec3..b91f2ed7a16 100644
--- a/app-admin/keepassxc/keepassxc-2.6.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.2-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
x11-libs/libXi
x11-libs/libXtst
)
-   keeshare? ( dev-libs/quazip )
+   keeshare? ( dev-libs/quazip:0 )
yubikey? ( sys-auth/ykpers )
 "
 

diff --git a/app-admin/keepassxc/keepassxc-2.6.3.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild
similarity index 98%
rename from app-admin/keepassxc/keepassxc-2.6.3.ebuild
rename to app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild
index 5b51acf9ec3..b91f2ed7a16 100644
--- a/app-admin/keepassxc/keepassxc-2.6.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.3-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
x11-libs/libXi
x11-libs/libXtst
)
-   keeshare? ( dev-libs/quazip )
+   keeshare? ( dev-libs/quazip:0 )
yubikey? ( sys-auth/ykpers )
 "
 

diff --git a/app-admin/keepassxc/keepassxc-2.6.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild
similarity index 98%
rename from app-admin/keepassxc/keepassxc-2.6.4.ebuild
rename to app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild
index 8c4efa1bb14..10b1cb7ce9d 100644
--- a/app-admin/keepassxc/keepassxc-2.6.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.4-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
x11-libs/libXi
x11-libs/libXtst
)
-   keeshare? ( dev-libs/quazip )
+   keeshare? ( dev-libs/quazip:0 )
yubikey? ( sys-auth/ykpers )
 "
 

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 8c4efa1bb14..10b1cb7ce9d 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
x11-libs/libXi
x11-libs/libXtst
)
-   keeshare? ( dev-libs/quazip )
+   keeshare? ( dev-libs/quazip:0 )
yubikey? ( sys-auth/ykpers )
 "
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-02 Thread Sam James
commit: 90bf854cecd7d7361fbaa092b0deff6e09b4a127
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb  3 03:11:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  3 03:11:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90bf854c

app-admin/keepassxc: Stabilize 2.6.3 x86, #768192

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.3.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
index 7ab0a8449bd..5b51acf9ec3 100644
--- a/app-admin/keepassxc/keepassxc-2.6.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-02 Thread Sam James
commit: bcd020b7070d7094af13eec9f542b955f8570307
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  2 21:00:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  2 21:00:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd020b7

app-admin/keepassxc: Stabilize 2.6.3 amd64, #768192

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.3.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
index 5fd7f39fa64..7ab0a8449bd 100644
--- a/app-admin/keepassxc/keepassxc-2.6.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-01 Thread Lars Wendler
commit: 711cc62072e957b0a4f29027ded404b19aa9107f
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Feb  1 09:19:36 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb  1 09:19:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711cc620

app-admin/keepassxc: Removed old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 -
 app-admin/keepassxc/keepassxc-2.6.1.ebuild | 90 --
 2 files changed, 91 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 43b5f5b9522..bd4aef71807 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,3 @@
-DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 
5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf
 SHA512 
9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
 DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B 
c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f
 SHA512 
b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
 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

diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
deleted file mode 100644
index d85bd1e36b7..000
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 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}" !=  ]] ; 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 )
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-01 Thread Lars Wendler
commit: b0fb6d5fb0fd3fb3b0724af982794a7902c2fda0
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Feb  1 09:18:15 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb  1 09:19:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0fb6d5f

app-admin/keepassxc: Bump to version 2.6.4

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.6.4.ebuild | 93 ++
 2 files changed, 94 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index b365541c302..43b5f5b9522 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1,4 @@
 DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 
5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf
 SHA512 
9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
 DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B 
c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f
 SHA512 
b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
 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

diff --git a/app-admin/keepassxc/keepassxc-2.6.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.4.ebuild
new file mode 100644
index 000..8c4efa1bb14
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.4.ebuild
@@ -0,0 +1,93 @@
+# 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}" !=  ]] ; 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 )
+   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() {
+   # 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+=( 

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-02-01 Thread Lars Wendler
commit: 21ea2eec045ea5486f54d59c2d62d5adf7c31f66
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Feb  1 09:18:59 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb  1 09:19:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ea2eec

app-admin/keepassxc: Synced live ebuild

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 0511c16e127..8c4efa1bb14 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org;
@@ -69,6 +69,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # https://github.com/keepassxreboot/keepassxc/issues/5801
+   filter-flags -flto*
+
local mycmakeargs=(
-DWITH_CCACHE="$(usex ccache)"
-DWITH_GUI_TESTS=OFF



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-01-13 Thread Sam James
commit: b5833402eeea917f53d586347a258614793450b1
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 13 09:18:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 13 09:18:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5833402

app-admin/keepassxc: Stabilize 2.6.2 x86, #765172

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.2.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
index 7ab0a8449bd..5b51acf9ec3 100644
--- a/app-admin/keepassxc/keepassxc-2.6.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-01-13 Thread Sam James
commit: b7b19cdd0413e0f6b8ef3e511d6a745f59064cef
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 13 09:17:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 13 09:17:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b19cdd

app-admin/keepassxc: Stabilize 2.6.2 amd64, #765172

Signed-off-by: Sam James  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.2.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
index 0511c16e127..7ab0a8449bd 100644
--- a/app-admin/keepassxc/keepassxc-2.6.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2021-01-12 Thread Lars Wendler
commit: addde0302666208f1e01cf7634e0ac6d3eaa6d7c
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 01:27:53 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 01:27:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=addde030

app-admin/keepassxc: Bump to version 2.6.3

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.6.3.ebuild | 90 ++
 2 files changed, 91 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index d0348241f3e..b365541c302 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
 DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 
5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf
 SHA512 
9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
 DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B 
c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f
 SHA512 
b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
+DIST keepassxc-2.6.3-src.tar.xz 7562816 BLAKE2B 
1b33850ed996a2f07b1665309bb4680329a0f858d89e9e89f7ca39a84f27f1a4364bd8526d1907b4fc4d5dd586b3dc48d9d9b6235b78b52edc4db08ca72d79fa
 SHA512 
37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558

diff --git a/app-admin/keepassxc/keepassxc-2.6.3.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
new file mode 100644
index 000..5fd7f39fa64
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
@@ -0,0 +1,90 @@
+# 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}" !=  ]] ; 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 )
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-10-23 Thread Lars Wendler
commit: 97f0645314cd17f26620a9b8420a105b34b803f9
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Oct 23 11:07:03 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Oct 23 11:07:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f06453

app-admin/keepassxc: Removed unused "debug" USE flag

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.1.ebuild | 2 +-
 app-admin/keepassxc/keepassxc-2.6.2.ebuild | 2 +-
 app-admin/keepassxc/keepassxc-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
index 9324b486d59..d85bd1e36b7 100644
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
+IUSE="autotype browser ccache keeshare +network test yubikey"
 
 RDEPEND="
app-crypt/argon2:=

diff --git a/app-admin/keepassxc/keepassxc-2.6.2.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
index e4de2a185bf..0511c16e127 100644
--- a/app-admin/keepassxc/keepassxc-2.6.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
+IUSE="autotype browser ccache keeshare +network test yubikey"
 
 RDEPEND="
app-crypt/argon2:=

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index e4de2a185bf..0511c16e127 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
+IUSE="autotype browser ccache keeshare +network test yubikey"
 
 RDEPEND="
app-crypt/argon2:=



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-10-22 Thread Lars Wendler
commit: a4a843eb4872d3eafdf14e1485dce5350dedcfc2
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct 22 07:01:36 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct 22 07:01:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a843eb

app-admin/keepassxc: Synced live ebuild

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index a6d25729d32..e4de2a185bf 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-10-22 Thread Lars Wendler
commit: 1d59a6daa9df74ddfaca68db3ad6be08f3b1501c
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct 22 07:00:50 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct 22 07:00:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d59a6da

app-admin/keepassxc: Bump to version 2.6.2

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.6.2.ebuild | 90 ++
 2 files changed, 91 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 287cbfae200..fce57717135 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1,4 @@
 DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 
5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd
 SHA512 
8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
 DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 
9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399
 SHA512 
c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17
 DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 
5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf
 SHA512 
9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
+DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B 
c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f
 SHA512 
b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1

diff --git a/app-admin/keepassxc/keepassxc-2.6.2.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
new file mode 100644
index 000..e4de2a185bf
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 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}" !=  ]] ; 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 debug 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 )
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/

2020-10-22 Thread Lars Wendler
commit: 64fe952caa63f4916a5e2f704ebd5306ff00198f
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct 22 07:02:27 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct 22 07:02:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64fe952c

app-admin/keepassxc: Removed old

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  2 -
 .../files/keepassxc-2.5.2-ccache_switch.patch  | 59 -
 app-admin/keepassxc/keepassxc-2.5.4.ebuild | 97 --
 app-admin/keepassxc/keepassxc-2.6.0.ebuild | 90 
 4 files changed, 248 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index fce57717135..d0348241f3e 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,2 @@
-DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 
5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd
 SHA512 
8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
-DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 
9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399
 SHA512 
c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17
 DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 
5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf
 SHA512 
9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
 DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B 
c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f
 SHA512 
b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1

diff --git a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch 
b/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
deleted file mode 100644
index 57d8b3d714c..000
--- a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ae471bea14c8e05bcf368168649399b116a69992 Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Tue, 7 Jan 2020 17:44:08 -0500
-Subject: [PATCH] CMakeLists.txt: Do not unconditionally use ccache
-
-This causes build failures in Gentoo because we don't allow access to ccache 
files if ccache is not enabled for build.
-
-Fix this by adding a WITH_CCACHE cmake option and change behavior so that 
cmake fails if WITH_CCACHE is enabled but ccache program cannot be found.
-
-Gentoo-bug: https://bugs.gentoo.org/704560
-Signed-off-by: Lars Wendler 

- CMakeLists.txt | 19 ---
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2f9b5bfe..1c5746c59 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,13 +27,6 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
- 
--# Use the Compiler Cache (ccache) if it is installed
--# (install with: sudo apt get ccache)
--find_program (CCACHE_FOUND ccache)
--if (CCACHE_FOUND)
--set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
--endif (CCACHE_FOUND)
--
- # Support Visual Studio Code
- include(CMakeToolsHelpers OPTIONAL)
- include(FeatureSummary)
-@@ -48,6 +41,7 @@ option(WITH_DEV_BUILD "Use only for development. 
Disables/warns about deprecated
- option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF)
- option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF)
- option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON)
-+option(WITH_CCACHE "Use ccache for build" OFF)
- 
- set(WITH_XC_ALL OFF CACHE BOOL "Build in all available plugins")
- 
-@@ -65,6 +59,17 @@ if(APPLE)
- option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
- endif()
- 
-+if(WITH_CCACHE)
-+# Use the Compiler Cache (ccache) program
-+# (install with: sudo apt get ccache)
-+find_program (CCACHE_FOUND ccache)
-+if(CCACHE_FOUND)
-+set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-+else()
-+message(FATAL_ERROR "ccache requested but cannot be found.")
-+endif()
-+endif()
-+
- if(WITH_XC_ALL)
- # Enable all options (except update check)
- set(WITH_XC_AUTOTYPE ON)

diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
deleted file mode 100644
index 80d797e0a23..000
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ 

[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-10-14 Thread Agostino Sarubbo
commit: 22681b87dd9951fcd552d032c866816402d887f0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 14 19:22:14 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 14 19:22:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22681b87

app-admin/keepassxc: x86 stable wrt bug #747895

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
index 74c3bf6048f..9324b486d59 100644
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-10-14 Thread Agostino Sarubbo
commit: 18f4c1bfaf3bc64da822367fb9ead63e7c584159
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 14 19:08:08 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 14 19:08:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f4c1bf

app-admin/keepassxc: amd64 stable wrt bug #747895

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
index e4de2a185bf..74c3bf6048f 100644
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-09-07 Thread Sergei Trofimovich
commit: fdae00bc0c87b5eb21bd000f0b8e7e07faf7518a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 07:34:53 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 07:35:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdae00bc

app-admin/keepassxc: keyworded 2.6.1 for ppc64

keyworded wrt bug #737514

Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
index a6d25729d32..e4de2a185bf 100644
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-08-19 Thread Lars Wendler
commit: 1fd6e69f148d7a425615c14fc7630101f71d163b
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug 20 02:41:59 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 20 02:41:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd6e69f

app-admin/keepassxc: Bump to version 2.6.1

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 +
 app-admin/keepassxc/keepassxc-2.6.1.ebuild | 90 ++
 2 files changed, 91 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 4b982f9c4a0..287cbfae200 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
 DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 
5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd
 SHA512 
8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
 DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 
9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399
 SHA512 
c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17
+DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 
5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf
 SHA512 
9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a

diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
new file mode 100644
index 000..a6d25729d32
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 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}" !=  ]] ; 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 ~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 debug 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 )
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-07-08 Thread Lars Wendler
commit: 2fd8ba0d2ba198fe9708a9e61aca542d62bf3920
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul  8 15:06:58 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul  8 15:07:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd8ba0d

app-admin/keepassxc: Drop PDEPEND on x11-misc/xsel

Closes: https://bugs.gentoo.org/707692
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-2.6.0.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-2.6.0.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
index 1f3e19819e7..a6d25729d32 100644
--- a/app-admin/keepassxc/keepassxc-2.6.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
@@ -58,10 +58,6 @@ DEPEND="
 BDEPEND="
ccache? ( dev-util/ccache )
 "
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-   x11-misc/xsel
-"
 
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-07-08 Thread Lars Wendler
commit: 177427af771ebd53993346e2a2b92484b2847283
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul  8 15:07:41 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul  8 15:07:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177427af

app-admin/keepassxc: Synced live ebuild

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 1f3e19819e7..a6d25729d32 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -58,10 +58,6 @@ DEPEND="
 BDEPEND="
ccache? ( dev-util/ccache )
 "
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-   x11-misc/xsel
-"
 
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-07-07 Thread Lars Wendler
commit: 54c9ea4e10b97223d66befbaaced4656a2fb9799
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul  7 07:39:49 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul  7 09:22:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c9ea4e

app-admin/keepassxc: Removed old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   |  1 -
 app-admin/keepassxc/keepassxc-2.5.3.ebuild | 97 --
 2 files changed, 98 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 9bceb1bcd27..4b982f9c4a0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1,2 @@
-DIST keepassxc-2.5.3-src.tar.xz 6839148 BLAKE2B 
b3cc32f9abb42e662edec0c28967fca65a4f3c794f70bfe6c40c39375cad8cbc35eba95431b33119268230a324f83f2e5a53186ee8fc64cd366e20eac1341dc5
 SHA512 
8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6
 DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 
5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd
 SHA512 
8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
 DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 
9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399
 SHA512 
c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17

diff --git a/app-admin/keepassxc/keepassxc-2.5.3.ebuild 
b/app-admin/keepassxc/keepassxc-2.5.3.ebuild
deleted file mode 100644
index fa1a828a2cc..000
--- a/app-admin/keepassxc/keepassxc-2.5.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 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}" !=  ]] ; 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 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 debug 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 )
-   yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-   ${RDEPEND}
-   dev-qt/linguist-tools:5
-   dev-qt/qttest:5
-"
-BDEPEND="
-   ccache? ( dev-util/ccache )
-"
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-   x11-misc/xsel
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.5.2-ccache_switch.patch"
-)
-
-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_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
-}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-07-07 Thread Lars Wendler
commit: e32c08608fb772e2e068e598e7e72f6198b9feea
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul  7 07:37:09 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul  7 09:22:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32c0860

app-admin/keepassxc: Synced live ebuild

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/keepassxc-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-.ebuild 
b/app-admin/keepassxc/keepassxc-.ebuild
index 949cb61dc8a..1f3e19819e7 100644
--- a/app-admin/keepassxc/keepassxc-.ebuild
+++ b/app-admin/keepassxc/keepassxc-.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
fi
 else
inherit git-r3
@@ -78,6 +78,7 @@ src_configure() {
-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)"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-07-07 Thread Lars Wendler
commit: 099f8ee210791b3e583a5019667013fbb0537b0d
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul  7 07:33:58 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul  7 09:22:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099f8ee2

app-admin/keepassxc: Bump to version 2.6.0. Removed old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest   | 2 +-
 .../keepassxc/{keepassxc-2.6.0_beta1.ebuild => keepassxc-2.6.0.ebuild} | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 5ab1642746c..9bceb1bcd27 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1,3 @@
 DIST keepassxc-2.5.3-src.tar.xz 6839148 BLAKE2B 
b3cc32f9abb42e662edec0c28967fca65a4f3c794f70bfe6c40c39375cad8cbc35eba95431b33119268230a324f83f2e5a53186ee8fc64cd366e20eac1341dc5
 SHA512 
8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6
 DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 
5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd
 SHA512 
8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
-DIST keepassxc-2.6.0_beta1.tar.gz 8445948 BLAKE2B 
46c84d547e621b69ba6e609c75584aec3b6347c1ef8f455c8b69c7bc23f3b87eefcd0c53e595a3ef47f49c4b2bf0f550f11639397b3e511ec515958620992fcd
 SHA512 
7d52c3ac8c1803683a8926282e960d08cba18335a0f5f8a08e6950deb48e570a904f8cc23c7f7ab67e1e398b1dafe829cecdf532fc82e60d61ec5c02bf17b498
+DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 
9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399
 SHA512 
c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17

diff --git a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
similarity index 97%
rename from app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild
rename to app-admin/keepassxc/keepassxc-2.6.0.ebuild
index 949cb61dc8a..1f3e19819e7 100644
--- a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
fi
 else
inherit git-r3
@@ -78,6 +78,7 @@ src_configure() {
-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)"



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-06-21 Thread Agostino Sarubbo
commit: 2a6fbfd9ef1af4c3b0ce7e1f02f781398ddbf86e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 21 16:54:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 21 16:54:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6fbfd9

app-admin/keepassxc: amd64 stable wrt bug #728354

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/keepassxc/keepassxc-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
index 769d6af7da7..80d797e0a23 100644
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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 x86"
+   KEYWORDS="amd64 ~arm64 x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-06-20 Thread Thomas Deutschmann
commit: ea93998a3c69109f582983a18684bcd0e241518d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jun 20 15:31:25 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jun 20 15:45:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea93998a

app-admin/keepassxc: x86 stable (bug #728354)

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-admin/keepassxc/keepassxc-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
index 0930d877e6c..769d6af7da7 100644
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
fi
 else
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-06-15 Thread Lars Wendler
commit: 1e82c5b10619b93279b4427d05634c0d2066d049
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jun 15 11:54:38 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jun 15 11:54:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e82c5b1

app-admin/keepassxc: Bump to version 2.6.0_beta1

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/keepassxc/Manifest |  1 +
 app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild | 93 
 2 files changed, 94 insertions(+)

diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 3701a4d91f1..5ab1642746c 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
 DIST keepassxc-2.5.3-src.tar.xz 6839148 BLAKE2B 
b3cc32f9abb42e662edec0c28967fca65a4f3c794f70bfe6c40c39375cad8cbc35eba95431b33119268230a324f83f2e5a53186ee8fc64cd366e20eac1341dc5
 SHA512 
8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6
 DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 
5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd
 SHA512 
8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
+DIST keepassxc-2.6.0_beta1.tar.gz 8445948 BLAKE2B 
46c84d547e621b69ba6e609c75584aec3b6347c1ef8f455c8b69c7bc23f3b87eefcd0c53e595a3ef47f49c4b2bf0f550f11639397b3e511ec515958620992fcd
 SHA512 
7d52c3ac8c1803683a8926282e960d08cba18335a0f5f8a08e6950deb48e570a904f8cc23c7f7ab67e1e398b1dafe829cecdf532fc82e60d61ec5c02bf17b498

diff --git a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild 
b/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild
new file mode 100644
index 000..949cb61dc8a
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 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}" !=  ]] ; 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 ~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 debug 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 )
+   yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+   ${RDEPEND}
+   dev-qt/linguist-tools:5
+   dev-qt/qttest:5
+"
+BDEPEND="
+   ccache? ( dev-util/ccache )
+"
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+   x11-misc/xsel
+"
+
+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_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
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/

2020-05-09 Thread Mart Raudsepp
commit: 5f470cd4bcb0501740f9dde972e9d25e17aef695
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sat May  9 02:46:09 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May  9 08:47:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f470cd4

app-admin/keepassxc: arm64 keyworded (bug #721666)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-admin/keepassxc/keepassxc-2.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild 
b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
index c3a08042f8f..0930d877e6c 100644
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" !=  ]] ; then
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 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
fi
 else
inherit git-r3



  1   2   >