From 06e58a0fcb900034d35485fe961fee1875f3a6b0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:19:30 +0100 Subject: gentoo resync : 14.07.2018 --- eclass/kde5.eclass | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'eclass/kde5.eclass') diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index d674611dc711..07d6c26a264c 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -49,6 +49,13 @@ fi EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm +# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS +# @DESCRIPTION: +# If set to "false", do nothing. +# For any other value, assume the package is using KDEInstallDirs macro and switch +# KDE_INSTALL_USE_QT_SYS_PATHS to ON. +: ${ECM_KDEINSTALLDIRS:=true} + # @ECLASS-VARIABLE: KDE_AUTODEPS # @DESCRIPTION: # If set to "false", do nothing. @@ -641,8 +648,12 @@ kde5_src_configure() { cmakeargs+=( -DBUILD_QCH=$(usex doc) ) fi - # install mkspecs in the same directory as qt stuff - cmakeargs+=(-DKDE_INSTALL_USE_QT_SYS_PATHS=ON) + if [[ ${ECM_KDEINSTALLDIRS} != false ]] ; then + cmakeargs+=( + # install mkspecs in the same directory as qt stuff + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + ) + fi # allow the ebuild to override what we set here mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}") -- cgit v1.2.3