[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     da2f96d0b25ce88035f1442c965ac64c95994bd8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 19:05:54 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 10:47:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2f96d0

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 558ff3a1ef9..e64502b3b9b 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