From 61cd2760c8327648c55d0fee59cf7a96eed1f4ea Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 22 Mar 2022 21:16:08 +0000 Subject: 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 --- app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild | 2 +- app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild | 97 +++++++++++++++++++++++++++ app-admin/keepassxc/keepassxc-2.7.1.ebuild | 97 --------------------------- app-admin/keepassxc/keepassxc-9999.ebuild | 2 +- 4 files changed, 99 insertions(+), 99 deletions(-) create mode 100644 app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild delete mode 100644 app-admin/keepassxc/keepassxc-2.7.1.ebuild 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-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild new file mode 100644 index 000000000000..447eb59eab46 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.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}" != *9999 ]] ; then + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~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" + +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}" != *9999 ]] && [[ ! -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 +} diff --git a/app-admin/keepassxc/keepassxc-2.7.1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1.ebuild deleted file mode 100644 index f2f002f7a9e2..000000000000 --- a/app-admin/keepassxc/keepassxc-2.7.1.ebuild +++ /dev/null @@ -1,97 +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}" != *9999 ]] ; then - if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" - else - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~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" - -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}" != *9999 ]] && [[ ! -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 -} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index fb5899e8a65b..eadf15f62f91 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.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 -- cgit v1.2.3-65-gdbad