diff options
Diffstat (limited to 'app-admin/keepassxc')
-rw-r--r-- | app-admin/keepassxc/Manifest | 3 | ||||
-rw-r--r-- | app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch | 13 | ||||
-rw-r--r-- | app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild (renamed from app-admin/keepassxc/keepassxc-2.6.6.ebuild) | 67 | ||||
-rw-r--r-- | app-admin/keepassxc/keepassxc-2.7.8.ebuild | 113 | ||||
-rw-r--r-- | app-admin/keepassxc/keepassxc-9999.ebuild | 78 | ||||
-rw-r--r-- | app-admin/keepassxc/metadata.xml | 43 |
6 files changed, 236 insertions, 81 deletions
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index bdde1c3d9cb6..40112daa3c5b 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1 +1,2 @@ -DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7 +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/files/keepassxc-2.7.4-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch new file mode 100644 index 000000000000..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="$<TARGET_FILE:keepassxc-cli>") +- + if(WITH_GUI_TESTS) + add_subdirectory(gui) + endif(WITH_GUI_TESTS) diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild index af0c59d08079..6d17e534e3b4 100644 --- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild @@ -1,37 +1,40 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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}" != 9999 ]] ; then +if [[ "${PV}" != *9999 ]] ; 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 inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" + [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" fi LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" -IUSE="autotype browser ccache 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:= - dev-libs/libgcrypt:= - >=dev-libs/libsodium-1.0.12:= + dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -41,56 +44,64 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( + sys-libs/zlib:=[minizip] + X? ( dev-qt/qtx11extras:5 + ) + autotype? ( x11-libs/libX11 - x11-libs/libXi x11-libs/libXtst ) - keeshare? ( dev-libs/quazip:0= ) - yubikey? ( sys-auth/ykpers ) + 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 ) + dev-qt/linguist-tools:5 + doc? ( + dev-ruby/asciidoctor + ) " -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die +PATCHES=( + "${FILESDIR}/${PN}-2.7.4-tests.patch" +) - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then +src_prepare() { + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then printf '%s' "${PV}" > .version || die fi - cmake_src_prepare + cmake_src_prepare } src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 - filter-flags -flto* + filter-lto - local mycmakeargs=( - -DWITH_CCACHE="$(usex ccache)" + 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_KEESHARE_SECURE="$(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/_/-}" ) 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 000000000000..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}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.tar.gz" + 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}" != *9999 ]] && [[ ! -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 +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 44ca0b85d8d9..11cc2ac9b84e 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,32 +6,36 @@ 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}" != 9999 ]] ; then +if [[ "${PV}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/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" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" -IUSE="autotype browser ccache 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:= - dev-libs/libgcrypt:= - >=dev-libs/libsodium-1.0.12:= + dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -41,59 +45,69 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( + sys-libs/zlib:=[minizip] + X? ( dev-qt/qtx11extras:5 + ) + autotype? ( x11-libs/libX11 - x11-libs/libXi x11-libs/libXtst ) - keeshare? ( dev-libs/quazip:0= ) - yubikey? ( sys-auth/ykpers ) + 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 ) + dev-qt/linguist-tools:5 + doc? ( + dev-ruby/asciidoctor + ) " -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die +PATCHES=( + "${FILESDIR}/${PN}-2.7.4-tests.patch" +) - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then +src_prepare() { + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then printf '%s' "${PV}" > .version || die fi - cmake_src_prepare + cmake_src_prepare } src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 - filter-flags -flto* + filter-lto - local mycmakeargs=( - -DWITH_CCACHE="$(usex ccache)" + 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_KEESHARE_SECURE="$(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/_/-}" ) + mycmakeargs+=( + -DOVERRIDE_VERSION="${PV/_/-}" + ) fi cmake_src_configure } diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml index f898e9adbc9d..dc74e3197e66 100644 --- a/app-admin/keepassxc/metadata.xml +++ b/app-admin/keepassxc/metadata.xml @@ -1,24 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <use> - <flag name="autotype">Add support to autotype the passwords into other applications</flag> - <flag name="browser">Enables browser plugin support</flag> - <flag name="ccache">Use <pkg>dev-util/ccache</pkg> to build keepassxc</flag> - <flag name="keeshare">Enable KeeShare sharing integration</flag> - <flag name="network">Enable network support</flag> - <flag name="yubikey">Enable database unlocking via YubiKey.</flag> - </use> - <longdescription> - 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. - </longdescription> - <upstream> - <remote-id type="github">keepassxreboot/keepassxc</remote-id> - </upstream> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <use> + <flag name="autotype">Add support to autotype the passwords into other applications</flag> + <flag name="browser">Enables browser plugin support</flag> + <flag name="keeshare">Enable KeeShare sharing integration</flag> + <flag name="network">Enable network support</flag> + <flag name="yubikey">Enable database unlocking via hardware keys supporting YubiKey-style HMAC-SHA1 protocol</flag> + </use> + <longdescription> + 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. + </longdescription> + <upstream> + <remote-id type="github">keepassxreboot/keepassxc</remote-id> + </upstream> </pkgmetadata> |