From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-admin/keepassxc/Manifest | 10 +-- app-admin/keepassxc/keepassxc-2.5.3.ebuild | 97 ------------------------ app-admin/keepassxc/keepassxc-2.6.0.ebuild | 90 ++++++++++++++++++++++ app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild | 93 ----------------------- app-admin/keepassxc/keepassxc-2.6.1.ebuild | 90 ++++++++++++++++++++++ app-admin/keepassxc/keepassxc-9999.ebuild | 7 +- 6 files changed, 187 insertions(+), 200 deletions(-) delete mode 100644 app-admin/keepassxc/keepassxc-2.5.3.ebuild create mode 100644 app-admin/keepassxc/keepassxc-2.6.0.ebuild delete mode 100644 app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild create mode 100644 app-admin/keepassxc/keepassxc-2.6.1.ebuild (limited to 'app-admin/keepassxc') diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 1c5998827b55..5b9dc132ce78 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,9 +1,9 @@ AUX keepassxc-2.5.2-ccache_switch.patch 2274 BLAKE2B 640bd0bdbd56aa93a3f7d70b4827b50639bcf6cea1cb0339ec78b91cbd4ab7c364bd36353ccc02e88b438566ecbad6545124bf5fd89c2c8e766c723e278ba1c9 SHA512 5b43fe2e5dea3ff3626ae4b75faa8aa4666a2703d08a30c4a18fd2b1079a73ad033d8788f05e28b860f51ef42e9f1a65253319b9d8fe0c34ec058b9ffb59dfea -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 -EBUILD keepassxc-2.5.3.ebuild 2183 BLAKE2B 68019fba5936cecc2f48e3c3ea5fb8f24e3385d5cc80f36fde0d7bea796d01c823d338c8d08600cd291cea880c57e78d3b7d20bfc32021598a05c32cb3a212e6 SHA512 b8c4efb3e662085c87357e65355a9b1957bdf06c265668d84cf071ed024f1f4d9f8083cf62f1f8882ef7ce5d44411764895d78e20c2f32c0ab44929f2662c80b +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 EBUILD keepassxc-2.5.4.ebuild 2190 BLAKE2B 4e23b212cf03f1a5c8bc18dc63313ea5224bf76efc29f360cf013af90e9fc745b04754170f5e88bacf4bc5c4600203dc9b706a2412d07e4e21b172f96822319a SHA512 9080c0202fd22e83ab38741edc4ab3061e4a24d2a3735ce03c4194faa8588ea719221296e663079a007f3f49e757ef7efcd7e206341e542054d937f3908d73ab -EBUILD keepassxc-2.6.0_beta1.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70 -EBUILD keepassxc-9999.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70 +EBUILD keepassxc-2.6.0.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323 +EBUILD keepassxc-2.6.1.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323 +EBUILD keepassxc-9999.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e 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 fa1a828a2cc5..000000000000 --- 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}" != 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 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 -} diff --git a/app-admin/keepassxc/keepassxc-2.6.0.ebuild b/app-admin/keepassxc/keepassxc-2.6.0.ebuild new file mode 100644 index 000000000000..a6d25729d322 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.6.0.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}" != 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 ~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 +} diff --git a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild b/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild deleted file mode 100644 index 949cb61dc8aa..000000000000 --- a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild +++ /dev/null @@ -1,93 +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 ~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 -} 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 000000000000..a6d25729d322 --- /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}" != 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 ~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 +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 949cb61dc8aa..a6d25729d322 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.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 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi else inherit git-r3 @@ -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 )" @@ -78,6 +74,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)" -- cgit v1.2.3