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 F073913835A for ; Sat, 8 Aug 2020 09:04:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27A9AE0B58; Sat, 8 Aug 2020 09:04:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0BF13E0B58 for ; Sat, 8 Aug 2020 09:04:39 +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 86CBA34F52C for ; Sat, 8 Aug 2020 09:04:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0515A310 for ; Sat, 8 Aug 2020 09:04:35 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1596877444.6313bdad058b1afedd73ce8cf137eb4876c43fb0.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/json-c/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/json-c/json-c-9999.ebuild X-VCS-Directories: dev-libs/json-c/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 6313bdad058b1afedd73ce8cf137eb4876c43fb0 X-VCS-Branch: master Date: Sat, 8 Aug 2020 09:04:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 021c5574-9ab1-4c12-aca2-25d465407e35 X-Archives-Hash: 85772c990a04b53ed3bf4166705a6ecb commit: 6313bdad058b1afedd73ce8cf137eb4876c43fb0 Author: Jakov Smolic sartura hr> AuthorDate: Mon Jul 27 07:58:40 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Aug 8 09:04:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6313bdad dev-libs/json-c: update live ebuild Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Jakov Smolic sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/16848 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/json-c/json-c-9999.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild index b39b8ba779c..effac5b4d6c 100644 --- a/dev-libs/json-c/json-c-9999.ebuild +++ b/dev-libs/json-c/json-c-9999.ebuild @@ -14,6 +14,8 @@ LICENSE="MIT" SLOT="0/5" IUSE="cpu_flags_x86_rdrand doc static-libs threads" +BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )" + MULTILIB_WRAPPED_HEADERS=( /usr/include/json-c/config.h ) @@ -24,7 +26,6 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(multilib_native_usex doc) -DDISABLE_WERROR=ON -DENABLE_THREADING=$(usex threads) -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand) @@ -36,6 +37,7 @@ multilib_src_configure() { multilib_src_compile() { cmake_src_compile + use doc && doxygen doc/Doxyfile } multilib_src_test() { @@ -43,6 +45,6 @@ multilib_src_test() { } multilib_src_install_all() { - use doc && HTML_DOCS=( "${S}"/doc/html/. ) + use doc && HTML_DOCS=( "${BUILD_DIR}-abi_x86_64.amd64"/doc/html/. ) einstalldocs }