commit: 63a1814fab5b2461ebb75c6f6c65f2579d15c4df Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> AuthorDate: Sun Jan 3 14:10:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 4 09:30:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a1814f
dev-libs/msgpack: fix build with USE=doc and USE="doc -cxx" Closes: https://bugs.gentoo.org/763264 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/msgpack/msgpack-3.2.0.ebuild | 6 ++++-- dev-libs/msgpack/msgpack-3.3.0.ebuild | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-libs/msgpack/msgpack-3.2.0.ebuild b/dev-libs/msgpack/msgpack-3.2.0.ebuild index 2857a09fb02..eea2ed4f100 100644 --- a/dev-libs/msgpack/msgpack-3.2.0.ebuild +++ b/dev-libs/msgpack/msgpack-3.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -59,7 +59,9 @@ multilib_src_install() { mkdir docs || die mv doc_c/html docs/c || die - use cxx && mv doc_cpp/html docs/cpp || die + if use cxx; then + mv doc_cpp/html docs/cpp || die + fi fi if use examples; then diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild index 532685cbd1c..8d8ed36de2c 100644 --- a/dev-libs/msgpack/msgpack-3.3.0.ebuild +++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -50,7 +50,7 @@ multilib_src_compile() { cmake_src_compile if multilib_is_native_abi && use doc; then - emake doxygen + cmake_build doxygen fi } @@ -62,7 +62,9 @@ multilib_src_install() { mkdir docs || die mv doc_c/html docs/c || die - use cxx && mv doc_cpp/html docs/cpp || die + if use cxx; then + mv doc_cpp/html docs/cpp || die + fi fi if use examples; then
