From 948d557b4a61dc14722668b6b11a4cf3cee07b01 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:56:30 +0100 Subject: gentoo resync : 13.09.2019 --- app-admin/keepassxc/Manifest | 6 +- ...-2.3.3-qt-5.11-edit-entry-widget-includes.patch | 10 --- .../files/keepassxc-dont_call_mandb.patch | 25 ------ app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild | 91 ---------------------- app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild | 2 +- 5 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch delete mode 100644 app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch delete mode 100644 app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild (limited to 'app-admin/keepassxc') diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index ea877c540c63..a70afd15e96a 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,8 +1,4 @@ -AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9 -AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4 -DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d -EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f -EBUILD keepassxc-2.4.3-r1.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09 +EBUILD keepassxc-2.4.3-r1.ebuild 2135 BLAKE2B 499b397116dcde99805b4afa4b38b4c25a8b3121e4cd8fe473cb584e295a77ad6ab36a47cfaf447cf09bfb0d12f45bd649e7cb4e90c031ab4dd68b9b04565787 SHA512 9f2651697c320325e7dc9aba2cbb9cc6c01173a2c82072b9df13b9a8292e841bbcd059ef95c21b52ffec1c0155b3c9787cd303512139a9db38b00274edaa9c36 EBUILD keepassxc-9999.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404 diff --git a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch deleted file mode 100644 index c382db5873fc..000000000000 --- a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/gui/entry/EditEntryWidget.cpp -+++ b/src/gui/entry/EditEntryWidget.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include "autotype/AutoType.h" - #include "core/Config.h" diff --git a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch deleted file mode 100644 index a3ff5f7244d8..000000000000 --- a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7789bed0f29e0067eca7a40f604262d18611cdb0 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Fri, 8 Mar 2019 14:48:13 +0100 -Subject: [PATCH] Don't call mandb - -There are other man implementations beside man-db so it is not even sure -that the "mandb" binary even exists on all unices. Other than that, usually -there's a cron job running "mandb" on a daily basis. ---- - src/cli/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt -index e59a911a..c3f97a2c 100644 ---- a/src/cli/CMakeLists.txt -+++ b/src/cli/CMakeLists.txt -@@ -94,5 +94,4 @@ endif() - - if(APPLE OR UNIX) - install(FILES keepassxc-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/) -- execute_process(COMMAND mandb -q) - endif() --- -2.21.0 - diff --git a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild deleted file mode 100644 index 742ca5d1e1b0..000000000000 --- a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org" - -if [[ "${PV}" != 9999 ]] ; then - #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" -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 debug network test yubikey" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/libgcrypt:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - browser? ( >=dev-libs/libsodium-1.0.12 ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - dev-qt/qtconcurrent:5 -" - -# Not a runtime dependency but still needed (see bug #667092) -PDEPEND=" - x11-misc/xsel -" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.3-qt-5.11-edit-entry-widget-includes.patch" #655844 - "${FILESDIR}/${PN}-dont_call_mandb.patch" -) - -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_GUI_TESTS=OFF - -DWITH_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_HTTP=OFF - -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_SSHAGENT=ON - -DWITH_XC_YUBIKEY="$(usex yubikey)" - ) - cmake-utils_src_configure -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild index 20cd5799cdeb..b6dd4fd2a017 100644 --- a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild +++ b/app-admin/keepassxc/keepassxc-2.4.3-r1.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 x86" fi else inherit git-r3 -- cgit v1.2.3