From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- app-admin/keepassxc/Manifest | 6 +- app-admin/keepassxc/keepassxc-2.6.5.ebuild | 98 +++++++++++++++++++++++++++++ app-admin/keepassxc/keepassxc-2.6.6.ebuild | 99 ++++++++++++++++++++++++++++++ app-admin/keepassxc/keepassxc-9999.ebuild | 9 ++- 4 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 app-admin/keepassxc/keepassxc-2.6.5.ebuild create mode 100644 app-admin/keepassxc/keepassxc-2.6.6.ebuild (limited to 'app-admin/keepassxc') diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 551553e00bab..0e71290f6049 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,5 +1,9 @@ AUX keepassxc-2.6.4-quazip1.patch 952 BLAKE2B f4e402dc5bacb7cfbff683d43a7f494cdc7874500e53058f79dbdeae861b57ac01d11362ae66c65fb1aa15450335003a66fcef3cc1d45007ab5c1cf5c903ffe9 SHA512 df6ca3594452dfa6ada95c3a24a225f1788fdb3f9e9c61043e8a0eebd05944e76041848a04f5e8ada1cc979b0444ee439ab259358e8bb0fa6aeb568ed220e979 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 EBUILD keepassxc-2.6.4-r2.ebuild 2233 BLAKE2B 53fa2d144f16bf30f5068fcdc231756418fcc84b0d7410bcbedb4c5502846de645918bb69d4df8015ba2c98224327dbc5a669679a06e064f55f40941cd47c24c SHA512 2e71956c1bf0cc4e77f03a02621c1b38e183a14f47be9945953b454265449b385f1146f7bbefc7e274c2116b12008318fa81954442082c59f50eb4b2a80f2fdc -EBUILD keepassxc-9999.ebuild 2287 BLAKE2B bcd6dd1aff711dc54f5590b8a85a6caad694fdfd1999eefdcf8d3f24496ad992a2eac9accdb0adcc897e14d692dadbd1726b31e78cb56e7178b5dfac6dde3896 SHA512 628165fb6b8b9d4d4b94f1c1dee875a39ac5d0f7f263366ea562d122f7a16c5b4b52a5a108d490df829a2107b5aba40fb7e20853faa088133a6e15fcc6efa70d +EBUILD keepassxc-2.6.5.ebuild 2336 BLAKE2B 263676014991a0cdcd9a3bf10eae75033b1b9f6429a852f3ae761038ae150340390e6dafb2b094f5477d1ab405517ce6910fbc4ee2eef57702a081f099bb74a7 SHA512 5268dceef5a921ef191acbe703762fed1bf846eaaeabdd37bcaf17f9e14e0413e1adcba32a9b92d6d1bf6ba9d7ec1b1fc3f69a1dc304554bcd792bad87a39b27 +EBUILD keepassxc-2.6.6.ebuild 2383 BLAKE2B 7841f87cab95d61fa2dc474989995214593166c5425d219c0ea62b9f370474d87678ca26153e1244ecb85806b7cd18be15ca6503e85c7edf8fc8a2b1f03cdc3a SHA512 282ce6aa44d55afd78a1d61506b1fe730ad3aa00210486032f048edfaabebbbb31bc8d12296b1780de0f20cf4f05adf358cb82a8f3da5217021c447b6a427e18 +EBUILD keepassxc-9999.ebuild 2383 BLAKE2B fa4dffbc4af69468ead77d7e9e380e391cef1319bb61f3d9e1fd78ea521f24a9aa991f2209db4da2e7f70dab38b6165d11ee5d766be6fd96d05c4149f92afcc7 SHA512 1aeda66e8167df7d5245c2f1361b6b473d7f598fe308f43e2ccd6badff83aad178122f0396555607e89485e851fe3e4be25923e9c0c225d3baf8ce6762250252 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e 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 000000000000..4b62059e2dca --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.6.5.ebuild @@ -0,0 +1,98 @@ +# 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 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}" != 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.6.6.ebuild b/app-admin/keepassxc/keepassxc-2.6.6.ebuild new file mode 100644 index 000000000000..f6bd89c1df74 --- /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}" != 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 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}" != 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_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 +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index c73aaad39c78..377737479d9c 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.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,12 +62,14 @@ 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 + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then + printf '%s' "${PV}" > .version || die + fi + cmake_src_prepare } @@ -84,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 -- cgit v1.2.3