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 7B0E61382C5 for ; Sun, 30 May 2021 15:53:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD160E077D; Sun, 30 May 2021 15:53:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B6FD0E077D for ; Sun, 30 May 2021 15:53:37 +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 E96E2340E30 for ; Sun, 30 May 2021 15:53:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8731159C for ; Sun, 30 May 2021 15:53:35 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1622387077.6affc71a3c6eede0e0a004f1dcf938fb34fe6c5e.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/cglm/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-libs/cglm/cglm-0.8.3.ebuild dev-libs/cglm/cglm-9999.ebuild X-VCS-Directories: dev-libs/cglm/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 6affc71a3c6eede0e0a004f1dcf938fb34fe6c5e X-VCS-Branch: master Date: Sun, 30 May 2021 15:53: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: 33590a8b-d965-4870-92e6-27b935c2876b X-Archives-Hash: 13f1253afd9ed2d1163e4ebe8ad70924 commit: 6affc71a3c6eede0e0a004f1dcf938fb34fe6c5e Author: Oliver Freyermuth googlemail com> AuthorDate: Sun May 30 15:04:37 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun May 30 15:04:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6affc71a dev-libs/cglm: use docs.eclass in most recent versions. Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth googlemail.com> dev-libs/cglm/cglm-0.8.3.ebuild | 27 +++++++++------------------ dev-libs/cglm/cglm-9999.ebuild | 27 +++++++++------------------ 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/dev-libs/cglm/cglm-0.8.3.ebuild b/dev-libs/cglm/cglm-0.8.3.ebuild index 4009cf449..6fbdc797c 100644 --- a/dev-libs/cglm/cglm-0.8.3.ebuild +++ b/dev-libs/cglm/cglm-0.8.3.ebuild @@ -3,7 +3,14 @@ EAPI=7 -inherit meson +DOCS_BUILDER="sphinx" +DOCS_AUTODOC=0 +DOCS_DIR="${S}/docs/source" + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit python-any-r1 +inherit docs meson if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -18,11 +25,6 @@ HOMEPAGE="https://github.com/recp/cglm" LICENSE="MIT" SLOT="0" -IUSE="doc" - -BDEPEND="dev-util/meson - doc? ( dev-python/sphinx )" - src_configure() { local emesonargs=( "-Dwerror=false" @@ -33,16 +35,5 @@ src_configure() { src_compile() { default meson_src_compile - if use doc; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_install() { - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - default - meson_src_install + docs_compile } diff --git a/dev-libs/cglm/cglm-9999.ebuild b/dev-libs/cglm/cglm-9999.ebuild index 4009cf449..6fbdc797c 100644 --- a/dev-libs/cglm/cglm-9999.ebuild +++ b/dev-libs/cglm/cglm-9999.ebuild @@ -3,7 +3,14 @@ EAPI=7 -inherit meson +DOCS_BUILDER="sphinx" +DOCS_AUTODOC=0 +DOCS_DIR="${S}/docs/source" + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit python-any-r1 +inherit docs meson if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -18,11 +25,6 @@ HOMEPAGE="https://github.com/recp/cglm" LICENSE="MIT" SLOT="0" -IUSE="doc" - -BDEPEND="dev-util/meson - doc? ( dev-python/sphinx )" - src_configure() { local emesonargs=( "-Dwerror=false" @@ -33,16 +35,5 @@ src_configure() { src_compile() { default meson_src_compile - if use doc; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_install() { - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - default - meson_src_install + docs_compile }