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 <asturm@gentoo.org>

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 816feed7219ea79c4a846ba957ba7cae2589d334..06c2e9f83ea919c786a60d6eab9f27d9c28c417a 100644 (file)
--- 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)