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 21FA1138335 for ; Fri, 13 Jul 2018 20:18:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5AFEE0827; Fri, 13 Jul 2018 20:18:35 +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 AF6F4E0827 for ; Fri, 13 Jul 2018 20:18:35 +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 3326C335C7A for ; Fri, 13 Jul 2018 20:18:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 468112E5 for ; Fri, 13 Jul 2018 20:18:32 +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: <1531511129.8d6a36a6266dcf43e147b28b813493a8b504b6ee.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8d6a36a6266dcf43e147b28b813493a8b504b6ee X-VCS-Branch: master Date: Fri, 13 Jul 2018 20:18:32 +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-Archives-Salt: 09ff844d-2265-454b-b857-2f72fd148be0 X-Archives-Hash: 4cb3c8d97f8e9928ac6b3b991f27415b commit: 8d6a36a6266dcf43e147b28b813493a8b504b6ee Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jul 13 19:45:29 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jul 13 19:45:29 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d6a36a6 kde5.eclass: Add ECM_KDEINSTALLDIRS eclass/kde5.eclass | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 454e3364eb..bc2bba2173 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -47,6 +47,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. @@ -635,8 +642,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[@]}")