From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- app-admin/keepassxc/Manifest | 8 +-- app-admin/keepassxc/keepassxc-2.6.1.ebuild | 90 ----------------------------- app-admin/keepassxc/keepassxc-2.6.3.ebuild | 2 +- app-admin/keepassxc/keepassxc-2.6.4.ebuild | 93 ++++++++++++++++++++++++++++++ app-admin/keepassxc/keepassxc-9999.ebuild | 7 ++- 5 files changed, 103 insertions(+), 97 deletions(-) delete mode 100644 app-admin/keepassxc/keepassxc-2.6.1.ebuild create mode 100644 app-admin/keepassxc/keepassxc-2.6.4.ebuild (limited to 'app-admin/keepassxc') diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 08eebb1e702f..617d9e2b2ad0 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,8 +1,8 @@ -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 -EBUILD keepassxc-2.6.1.ebuild 2063 BLAKE2B a42e9515621416fe81b1724db430fa5d601fedd7de2830acf9d9993c9486206bd76d13c5f10c3040e7fd37b518f543ea03173cc2a64c36eab10bce13c0d628dc SHA512 c699ed6e099a04e8a3748ecf6b586ffc4ba1f46dcf5644bb89fb3ad37b8506e47cc1e41fd7d98a0689fbaa80fb6c08ecde1db2cffc868199b124a8ba76a307fe +DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb EBUILD keepassxc-2.6.2.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b -EBUILD keepassxc-2.6.3.ebuild 2065 BLAKE2B 9acee41f6a44dfab875466c68104c75395c878c51746dfcb2d4109fea79f46d8828b9856ee370e612abacaec1a3cfbd8779cec0b072d82ea8d9de0fab562536a SHA512 fbf3880f1a66356f1700a89dbf3d33814862a4cfdb2b8a51c7182afde6e405a88960a1a7aec987ee54531d718faf02a111afe5088f386a28f160e9f16a18a4e1 -EBUILD keepassxc-9999.ebuild 2065 BLAKE2B 80d76cb75cead9572075d8068567f280dc5dd6f940654b121e57379aac666a1513ba8026de0583f9a0a14f12a30394c488c803280154e3ad05d0a5b0d880091e SHA512 0d250a23c3c98683a6592ce9f39a9cb200e2053ee8852fabe1e11c04df9c14618c27b7d7fc589f2983c2bf198a0c8c435f932f330c532c936a433bd9e8ce8245 +EBUILD keepassxc-2.6.3.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b +EBUILD keepassxc-2.6.4.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d +EBUILD keepassxc-9999.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e 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 d85bd1e36b75..000000000000 --- 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}" != 9999 ]] ; then - if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" - else - #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" - fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype browser ccache keeshare +network test yubikey" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/libgcrypt:= - >=dev-libs/libsodium-1.0.12:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-gfx/qrencode:= - sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - keeshare? ( dev-libs/quazip ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 -" -BDEPEND=" - ccache? ( dev-util/ccache ) -" - -RESTRICT="!test? ( test )" - -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_CCACHE="$(usex ccache)" - -DWITH_GUI_TESTS=OFF - -DWITH_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_DOCS=OFF - -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_FDOSECRETS=ON - -DWITH_XC_KEESHARE="$(usex keeshare)" - -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_SSHAGENT=ON - -DWITH_XC_UPDATECHECK=OFF - -DWITH_XC_YUBIKEY="$(usex yubikey)" - ) - if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) - fi - cmake_src_configure -} diff --git a/app-admin/keepassxc/keepassxc-2.6.3.ebuild b/app-admin/keepassxc/keepassxc-2.6.3.ebuild index 5fd7f39fa640..5b51acf9ec34 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}" != 9999 ]] ; 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 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 000000000000..8c4efa1bb14e --- /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}" != 9999 ]] ; then + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + fi +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="autotype browser ccache keeshare +network test yubikey" + +RDEPEND=" + app-crypt/argon2:= + dev-libs/libgcrypt:= + >=dev-libs/libsodium-1.0.12:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/qrencode:= + sys-libs/readline:0= + sys-libs/zlib:= + autotype? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXtst + ) + keeshare? ( dev-libs/quazip ) + 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 +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 0511c16e1277..8c4efa1bb14e 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.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 -- cgit v1.2.3