From 2b0eeebd18e1c1998a32ad72c0d83d6abd9b8b19 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 22 Mar 2022 21:18:19 +0000 Subject: [PATCH 2/2] app-admin/keepassxc: remove USE=ccache Gentoo users enable ccache via FEATURES=ccache (or if they wish, manual means). Most packages don't have USE=ccache for this reason. Remove it from keepassxc as an outlier. Signed-off-by: Sam James --- app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild | 7 ++++--- app-admin/keepassxc/keepassxc-9999.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild index 7e361326ccd8..19fe34eaf921 100644 --- a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild +++ b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild @@ -25,7 +25,7 @@ fi LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" -IUSE="autotype browser ccache doc keeshare +network test yubikey" +IUSE="autotype browser doc keeshare +network test yubikey" RESTRICT="!test? ( test )" @@ -61,7 +61,6 @@ DEPEND=" dev-qt/qttest:5 " BDEPEND=" - ccache? ( dev-util/ccache ) doc? ( dev-ruby/asciidoctor ) " @@ -78,7 +77,9 @@ src_configure() { filter-flags -flto* local mycmakeargs=( - -DWITH_CCACHE="$(usex ccache)" + # 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)" diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 7e361326ccd8..19fe34eaf921 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -25,7 +25,7 @@ fi LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" -IUSE="autotype browser ccache doc keeshare +network test yubikey" +IUSE="autotype browser doc keeshare +network test yubikey" RESTRICT="!test? ( test )" @@ -61,7 +61,6 @@ DEPEND=" dev-qt/qttest:5 " BDEPEND=" - ccache? ( dev-util/ccache ) doc? ( dev-ruby/asciidoctor ) " @@ -78,7 +77,9 @@ src_configure() { filter-flags -flto* local mycmakeargs=( - -DWITH_CCACHE="$(usex ccache)" + # 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)" -- 2.35.1