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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2386913997D for ; Mon, 11 Nov 2019 00:19:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64D73E0A89; Mon, 11 Nov 2019 00:19:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49D73E0A89 for ; Mon, 11 Nov 2019 00:19:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38C3A34CB68 for ; Mon, 11 Nov 2019 00:19:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B9968B2 for ; Mon, 11 Nov 2019 00:19:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1573431375.e087e4096479c828dd37a49da1e78cd21b1bce8e.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e087e4096479c828dd37a49da1e78cd21b1bce8e X-VCS-Branch: master Date: Mon, 11 Nov 2019 00:19:20 +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: fc654eb1-c5cc-44e7-82a0-ca2cd4e64067 X-Archives-Hash: 3702273c00056b7058ba5f85296d691c commit: e087e4096479c828dd37a49da1e78cd21b1bce8e Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 11 00:16:15 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 11 00:16:15 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e087e409 ecm.eclass: Inherit xdg only if ECM_NONGUI=false xdg phase functions were already only called based on this var. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 816feed721..06c2e9f83e 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -37,7 +37,23 @@ _ECM_UTILS_ECLASS=1 # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} -inherit cmake-utils flag-o-matic toolchain-funcs virtualx xdg +# @ECLASS-VARIABLE: ECM_NONGUI +# @DEFAULT_UNSET +# @DESCRIPTION: +# By default, for all CATEGORIES except kde-frameworks, assume we are building +# a GUI application. Add dependency on kde-frameworks/breeze-icons or +# kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst, +# pkg_postinst and pkg_postrm. If set to "true", do nothing. +if [[ ${CATEGORY} = kde-frameworks ]] ; then + : ${ECM_NONGUI:=true} +fi +: ${ECM_NONGUI:=false} + +inherit cmake-utils flag-o-matic toolchain-funcs virtualx + +if [[ ${ECM_NONGUI} = false ]] ; then + inherit xdg +fi case ${EAPI} in 7) ;; @@ -56,18 +72,6 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_po # KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing. : ${ECM_KDEINSTALLDIRS:=true} -# @ECLASS-VARIABLE: ECM_NONGUI -# @DEFAULT_UNSET -# @DESCRIPTION: -# By default, for all CATEGORIES except kde-frameworks, assume we are building -# a GUI application. Add dependency on kde-frameworks/breeze-icons or -# kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst, -# pkg_postinst and pkg_postrm. If set to "true", do nothing. -if [[ ${CATEGORY} = kde-frameworks ]]; then - : ${ECM_NONGUI:=true} -fi -: ${ECM_NONGUI:=false} - # @ECLASS-VARIABLE: ECM_DEBUG # @DESCRIPTION: # Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake-utils_src_configure)