From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29CDB15810D for ; Fri, 19 May 2023 08:37:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18F6EE087C; Fri, 19 May 2023 08:37:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBDDEE087C for ; Fri, 19 May 2023 08:37:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAAD5340DF6 for ; Fri, 19 May 2023 08:37:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50FDCA73 for ; Fri, 19 May 2023 08:37:51 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1684485457.eb259e50e626af6d16074b749efe0d54291f0b22.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepassxc/Manifest app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild app-admin/keepassxc/keepassxc-2.7.3.ebuild X-VCS-Directories: app-admin/keepassxc/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: eb259e50e626af6d16074b749efe0d54291f0b22 X-VCS-Branch: master Date: Fri, 19 May 2023 08:37:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c02398e-97bd-4528-8121-7f321cdb2420 X-Archives-Hash: 5a8e5c2fb8d6ead576da32057db17f30 commit: eb259e50e626af6d16074b749efe0d54291f0b22 Author: Marek Szuba gentoo org> AuthorDate: Fri May 19 07:59:11 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri May 19 08:37:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb259e50 app-admin/keepassxc: drop 2.7.1-r1, 2.7.3 Signed-off-by: Marek Szuba gentoo.org> app-admin/keepassxc/Manifest | 2 - app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild | 96 ------------------------ app-admin/keepassxc/keepassxc-2.7.3.ebuild | 101 -------------------------- 3 files changed, 199 deletions(-) diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 40e3c23e67d0..67aa48a88ca0 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,3 +1 @@ -DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9 -DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842 DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild deleted file mode 100644 index bf2430003375..000000000000 --- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 ~riscv x86" - fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype browser doc keeshare +network test yubikey" - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/botan:2= - 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 - dev-qt/qtx11extras:5 - media-gfx/qrencode:= - sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( - x11-libs/libX11 - x11-libs/libXtst - ) - keeshare? ( sys-libs/zlib:=[minizip] ) - yubikey? ( - dev-libs/libusb:1 - sys-apps/pcsc-lite - ) -" -DEPEND="${RDEPEND} - dev-qt/qttest:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) -" - -src_prepare() { - 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=( - # Gentoo users enable ccache via e.g. FEATURES=ccache or - # other means. We don't want the build system to enable it for us. - -DWITH_CCACHE=OFF - -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.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.3.ebuild deleted file mode 100644 index fe3795ec295f..000000000000 --- a/app-admin/keepassxc/keepassxc-2.7.3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org/ - https://github.com/keepassxreboot/keepassxc/" - -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 ~riscv ~x86" - fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="X autotype browser doc keeshare +network test yubikey" - -RESTRICT="!test? ( test )" -REQUIRED_USE="autotype? ( X )" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/botan:2= - 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:= - X? ( dev-qt/qtx11extras:5 ) - autotype? ( - x11-libs/libX11 - x11-libs/libXtst - ) - keeshare? ( sys-libs/zlib:=[minizip] ) - yubikey? ( - dev-libs/libusb:1 - sys-apps/pcsc-lite - ) -" -DEPEND="${RDEPEND} - dev-qt/qttest:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) -" - -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) - -src_prepare() { - 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=( - # Gentoo users enable ccache via e.g. FEATURES=ccache or - # other means. We don't want the build system to enable it for us. - -DWITH_CCACHE=OFF - -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)" - -DWITH_XC_X11="$(usex X)" - ) - if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) - fi - cmake_src_configure -}