From aa3411e241a201d53a2689766fe419f2756819f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:22:19 +0000 Subject: gentoo resync : 24.03.2019 --- app-admin/keepassxc/Manifest | 7 +- .../files/keepassxc-2.4.0-build_fix.patch | 38 ++++++++ app-admin/keepassxc/keepassxc-2.4.0.ebuild | 100 +++++++++++++++++++++ app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild | 98 -------------------- app-admin/keepassxc/keepassxc-9999.ebuild | 5 +- 5 files changed, 145 insertions(+), 103 deletions(-) create mode 100644 app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch create mode 100644 app-admin/keepassxc/keepassxc-2.4.0.ebuild delete mode 100644 app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild (limited to 'app-admin/keepassxc') diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 74db5c3b08e0..9290cfac3dfe 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,8 +1,9 @@ AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9 +AUX keepassxc-2.4.0-build_fix.patch 1419 BLAKE2B b5661c75008c9031598ee704b21e0581a6e3859addb9b4e642cca415b06f26cb7e6a984fb942f648f7d4082c17e198644230ddf711696971df6754cf4c6eb119 SHA512 3e659b5048089528c2055f9481119e66f655b2531a4347d4ca6e439bcc82566f2e658bdf4442e6c678d19811ca494533e7ce08e14dab3148c841084f2f5ab898 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.0_beta2.tar.gz 4740311 BLAKE2B 071edbf9d985671d70c381bd4863a704af6ad172a22fcf23ee0e12c8ea2a723029626669ed37e2e2739e3a66106b00b4c73cdbaa8e43496d950363422d6df8cc SHA512 5db8eb11a6aa42632bf2642af121063cb0df32fa1cda1beaea7c18e07c65049d3fa9a1a76643bd97ded80b7e5b2d403e9cd414c808faffdf2cb7e75c7f0578b1 +DIST keepassxc-2.4.0.tar.gz 4790634 BLAKE2B 5298baf80c48f27da16274f815dc6d83031586e3fec20356569c4d7eb652ed68f22b849595c837e736b7b3adb7636bf1f50c89626a093eecf236e3a94d89f33b SHA512 a50e90389bb53ffca28d322958c01db09472bf5e3d21075ab09db7cc1ed2e8aa0ac9ff310d79c06da4f429aef0427e3706931ce5d4d02b54a52b0209ba5ab853 EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f -EBUILD keepassxc-2.4.0_beta2.ebuild 2034 BLAKE2B 490e10dc028abf7611b4b6d40a785883547d3c79bc6c7e4c12b228764f18fe6b1c3f6f5060318aad1f14a9b24f78dca6e7b3ebc37e0143697a404e3697b1b09a SHA512 200892601ad3c51c8b29aff2970dbc2e922e4a246e3e7176d2d5ef0ca52dc8fd650dc1809b666b31837081652f30e56493dc0087588bb42308659fa07956b1b2 -EBUILD keepassxc-9999.ebuild 1978 BLAKE2B 12c28125986700c0e190b07d689d48da7846d6106fb5866e49196902edb52d5fb94736bee4ce867994d3865fecbe6f5895359b0daf50337f719fb1cd9b08037d SHA512 6b05af40e41c9a73b99448a425071ec1bf013a3b1568b0ad744c16baddad15adb56e7fa243442200839d853d4b7762920b92f69c4cfcad95b7f63740d6b2dc4b +EBUILD keepassxc-2.4.0.ebuild 2084 BLAKE2B 5054cd4e8ca4a263f67d504fbf75b8d1df998429952eb24f4b781b126ee70ed0bfce438274ce002a6ebd59b0136377c1ae9475feba94c6f940273df57e0b0473 SHA512 9b9e6e551498727e95b803431fcff20a5fecbb795ba7f6b5df9ae9b886e9f1139a8e4174ed0cb888c294cdf176e6dda0ba7f7fa5403de1f6961da30a03ee2fc6 +EBUILD keepassxc-9999.ebuild 1992 BLAKE2B 1936e110232387cf0f6a69354f4cc65f44c9e40d98b2a5cb81809ca45d11d733777dfa0c471142a53f16f1e32bd08d3c29b3259f81bfb2d1de01fffaeef54a78 SHA512 d38eefbc708f7bb1edc3310eea0998e22d91fcc0fd3bdce5fc6fa06a812dfa2fa939cd77a5dde81f8b87b835c2c8b2a30f56af4bb6cb7b627a327f3fd982ffd6 MISC metadata.xml 891 BLAKE2B 0c279d26b8f00d816d92a8fdd428629cf92a0ee7c0789ac60c9b5ea9b491dbd495a09815785fa99427ae8f5701dff0da8a06065059b1a6f05f1cdadbdde88192 SHA512 ec6fe12b1b508784947b55bb562a9e99632481ce06289b4dd7325f0834789fa4df99a15792ab7e91bab169c89a0a5a4c99ccd3372f1a2ff84cece49c4acd1779 diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch new file mode 100644 index 000000000000..486c8e2dd9a3 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch @@ -0,0 +1,38 @@ +From ff43f3ff8a8a1630d10e7117c45048623d215616 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Wed, 20 Mar 2019 11:53:21 +0100 +Subject: [PATCH] src/gui/DatabaseWidget.cpp: Build fails without + WITH_XC_KEESHARE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp: In member function ‘void DatabaseWidget::search(const QString&)’: +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: error: ‘m_shareLabel’ was not declared in this scope + m_shareLabel->setVisible(false); + ^~~~~~~~~~~~ +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: note: suggested alternative: ‘m_searchingLabel’ + m_shareLabel->setVisible(false); + ^~~~~~~~~~~~ + m_searchingLabel +--- + src/gui/DatabaseWidget.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp +index 8728c331..e4196734 100644 +--- a/src/gui/DatabaseWidget.cpp ++++ b/src/gui/DatabaseWidget.cpp +@@ -1112,7 +1112,9 @@ void DatabaseWidget::search(const QString& searchtext) + } + + m_searchingLabel->setVisible(true); ++#ifdef WITH_XC_KEESHARE + m_shareLabel->setVisible(false); ++#endif + + emit searchModeActivated(); + } +-- +2.21.0 + diff --git a/app-admin/keepassxc/keepassxc-2.4.0.ebuild b/app-admin/keepassxc/keepassxc-2.4.0.ebuild new file mode 100644 index 000000000000..7330e781cb78 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.4.0.ebuild @@ -0,0 +1,100 @@ +# 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 + 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 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/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/qrencode:= + 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}-dont_call_mandb.patch" + "${FILESDIR}/${P}-build_fix.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_NETWORKING="$(usex network)" + -DWITH_XC_SSHAGENT=ON + -DWITH_XC_YUBIKEY="$(usex yubikey)" + ) + if [[ "${PV}" != 9999 ]] ; then + mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + fi + 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.0_beta2.ebuild b/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild deleted file mode 100644 index 4d05c7804c81..000000000000 --- a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild +++ /dev/null @@ -1,98 +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 - 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 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}-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)" - ) - if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) - fi - 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-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index b59c1684db72..cc894dcf5bd4 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -33,7 +33,9 @@ RDEPEND=" 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/zlib autotype? ( dev-qt/qtx11extras:5 @@ -70,12 +72,11 @@ src_configure() { -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)" ) - if [[ "${PV}" == *_beta* ]] ; then + if [[ "${PV}" != 9999 ]] ; then mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) fi cmake-utils_src_configure -- cgit v1.2.3