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 B6C35138334 for ; Sat, 2 Jun 2018 15:25:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F94FE0864; Sat, 2 Jun 2018 15:25:47 +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 2DDDEE0864 for ; Sat, 2 Jun 2018 15:25:47 +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 65D74335C76 for ; Sat, 2 Jun 2018 15:25:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FF362B4 for ; Sat, 2 Jun 2018 15:25:43 +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: <1527953043.11ddbefe34d0cdbda28e58c67eec255eb20b8094.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 11ddbefe34d0cdbda28e58c67eec255eb20b8094 X-VCS-Branch: master Date: Sat, 2 Jun 2018 15:25:43 +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: 68cee824-c3ad-48fa-b5f8-303737e83816 X-Archives-Hash: ec2d8d4d65e0f7c7b9ba06375e1f7564 commit: 11ddbefe34d0cdbda28e58c67eec255eb20b8094 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 29 19:05:54 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 2 15:24:03 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=11ddbefe cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7 Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7. We do not need add it retroactively to avoid breaking something accidentally. eclass/cmake-utils.eclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 4dc7c4456f..6541f2af0f 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -614,6 +614,12 @@ cmake-utils_src_configure() { _EOF_ [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" + if [[ ${EAPI} != [56] ]]; then + cat >> "${common_config}" <<- _EOF_ || die + SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") + _EOF_ + fi + # Wipe the default optimization flags out of CMake if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then cat >> ${common_config} <<- _EOF_ || die