commit: f4f777ec8fed602312d50a185be63749aa6c6a8a Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Sep 28 17:35:35 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Sep 28 17:48:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f777ec
app-admin/keepassxc: Removed old Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-admin/keepassxc/Manifest | 2 - .../keepassxc/files/keepassxc-2.6.4-quazip1.patch | 28 ------- app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild | 95 --------------------- app-admin/keepassxc/keepassxc-2.6.5.ebuild | 98 ---------------------- 4 files changed, 223 deletions(-) diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 46a0d186df9..bdde1c3d9cb 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,3 +1 @@ -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 diff --git a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch b/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch deleted file mode 100644 index 42f4fe7478b..00000000000 --- a/app-admin/keepassxc/files/keepassxc-2.6.4-quazip1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efbb6fc9da02fed4e5db21858aa7d265081df2c8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <aro...@archlinux.org> -Date: Mon, 5 Oct 2020 21:00:24 +0200 -Subject: [PATCH] Support quazip 1.0 - ---- - cmake/FindQuaZip.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake -index a387e2f81..9fab3e579 100644 ---- a/cmake/FindQuaZip.cmake -+++ b/cmake/FindQuaZip.cmake -@@ -10,12 +10,12 @@ if(MINGW) - find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h) - else() - find_library(QUAZIP_LIBRARIES -- NAMES quazip5 quazip -+ NAMES quazip5 quazip quazip1-qt5 - PATHS /usr/lib /usr/lib64 /usr/local/lib - ) - find_path(QUAZIP_INCLUDE_DIR quazip.h - PATHS /usr/include /usr/local/include -- PATH_SUFFIXES quazip5 quazip -+ PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip - ) - find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) - endif() diff --git a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild b/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild deleted file mode 100644 index e15340b8174..00000000000 --- a/app-admin/keepassxc/keepassxc-2.6.4-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# 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" - -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 ) -" - -PATCHES=( "${FILESDIR}"/${P}-quazip1.patch ) # pending upstream PR#5511 - -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-2.6.5.ebuild b/app-admin/keepassxc/keepassxc-2.6.5.ebuild deleted file mode 100644 index 4b62059e2dc..00000000000 --- a/app-admin/keepassxc/keepassxc-2.6.5.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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 -}
