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 B8682138334 for ; Fri, 13 Jul 2018 20:18:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC773E0819; 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 AC98CE0819 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 37744335C95 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 6E427372 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: <1531512577.16496a605e81e56500375918a02ca4b8f1c6fedf.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: 16496a605e81e56500375918a02ca4b8f1c6fedf 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: deb10bb8-858b-42db-8867-6aaf50e50bef X-Archives-Hash: f270944f8f47b04e4b67279879ca3d9d commit: 16496a605e81e56500375918a02ca4b8f1c6fedf Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jul 13 20:01:37 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jul 13 20:09:37 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=16496a60 kde5.eclass: Fix KDE_INSTALL_LIBEXECDIR for EAPI-7 ebuilds Reported-by: GinoM protonmail.com> eclass/kde5.eclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index bc2bba2173..a3c86fee22 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -51,7 +51,8 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_ # @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. +# KDE_INSTALL_USE_QT_SYS_PATHS to ON. For EAPI-7 and above, fix KDE_INSTALL_LIBEXECDIR +# to use the correct location. : ${ECM_KDEINSTALLDIRS:=true} # @ECLASS-VARIABLE: KDE_AUTODEPS @@ -647,6 +648,12 @@ kde5_src_configure() { # install mkspecs in the same directory as qt stuff -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ) + if [[ ${EAPI} != 6 ]] ; then + cmakeargs+=( + # install to correct libexec location + -DKDE_INSTALL_LIBEXECDIR=${EPREFIX}/usr/libexec + ) + fi fi # allow the ebuild to override what we set here