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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9AF38158094 for ; Sat, 1 Oct 2022 21:34:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9D89E092F; Sat, 1 Oct 2022 21:34:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2375E092F for ; Sat, 1 Oct 2022 21:34:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01BD3340DCA for ; Sat, 1 Oct 2022 21:34:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AAF15E0 for ; Sat, 1 Oct 2022 21:34:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664660090.3b58c05c00f7ebc1b9cb3d431cec220ba4dcc91d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/libabigail/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/libabigail/Manifest dev-util/libabigail/libabigail-2.1-r1.ebuild dev-util/libabigail/libabigail-2.1.ebuild X-VCS-Directories: dev-util/libabigail/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3b58c05c00f7ebc1b9cb3d431cec220ba4dcc91d X-VCS-Branch: master Date: Sat, 1 Oct 2022 21:34:56 +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: 11d94aa6-5431-4ca0-8753-6b9fed928c9a X-Archives-Hash: 31a67b783afc995371b7b12edb2ab1b0 commit: 3b58c05c00f7ebc1b9cb3d431cec220ba4dcc91d Author: Sam James gentoo org> AuthorDate: Sat Oct 1 21:33:54 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 1 21:34:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b58c05c dev-util/libabigail: pre-generate man pages Signed-off-by: Sam James gentoo.org> dev-util/libabigail/Manifest | 1 + ...babigail-2.1.ebuild => libabigail-2.1-r1.ebuild} | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest index ceb1e13b4493..dace968e0fba 100644 --- a/dev-util/libabigail/Manifest +++ b/dev-util/libabigail/Manifest @@ -1,2 +1,3 @@ DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180 +DIST libabigail-2.1-docs.tar.xz 28220 BLAKE2B cd2966bbe6d18c5575601a190bac6d6bf56ef13a31845caf15e2de41ce6e649f074b194635ad5801324d0e8bac182da50cec9a70ec6b59ea1a860db0e7b20b54 SHA512 c90fe4c3a92fc13d29087585b22b2a7cb41a2670eeafaaac147f9c0693616d1b4da2c2e840a3d7ebc87748380995b0d030c3dae56d8cc61b7efbda3911fdb175 DIST libabigail-2.1.tar.gz 405861148 BLAKE2B 28c8c7cfc33b5002d10b94e2eb9e16ef403dcce73c1404b8af011d8bf71b142b62a5079154af078a479b4528f8464c420322b814e75bb3127a09992e7ca8f84f SHA512 4fe1d3323f078a76a7529c15a809d0c0d3ac43cabd5ab4bb5c2d03992cbbb61bae3ec858e40796bf9f65029cbc779d258ae4559455178fb95cb8b53bf92bcc9a diff --git a/dev-util/libabigail/libabigail-2.1.ebuild b/dev-util/libabigail/libabigail-2.1-r1.ebuild similarity index 64% rename from dev-util/libabigail/libabigail-2.1.ebuild rename to dev-util/libabigail/libabigail-2.1-r1.ebuild index 470bcde9663b..2d640070f62d 100644 --- a/dev-util/libabigail/libabigail-2.1.ebuild +++ b/dev-util/libabigail/libabigail-2.1-r1.ebuild @@ -3,6 +3,16 @@ EAPI=8 +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libabigail-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +LIBABIGAIL_DOCS_PREBUILT=${LIBABIGAIL_DOCS_PREBUILT:=1} +LIBABIGAIL_DOCS_PREBUILT_DEV=sam +LIBABIGAIL_DOCS_VERSION="${PV}" +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# bug #830088 +LIBABIGAIL_DOCS_USEFLAG="+doc" + PYTHON_COMPAT=( python3_{8..11} ) inherit autotools bash-completion-r1 python-any-r1 out-of-source @@ -10,11 +20,15 @@ inherit autotools bash-completion-r1 python-any-r1 out-of-source DESCRIPTION="Suite of tools for checking ABI differences between ELF objects" HOMEPAGE="https://sourceware.org/libabigail/" SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz" +if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBABIGAIL_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs.tar.xz )" + LIBABIGAIL_DOCS_USEFLAG="doc" +fi LICENSE="Apache-2.0-with-LLVM-exceptions" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" -IUSE="doc test" +IUSE="${LIBABIGAIL_DOCS_USEFLAG} test" RESTRICT="!test? ( test )" RDEPEND=" @@ -59,7 +73,10 @@ my_src_compile() { my_src_install() { emake DESTDIR="${D}" install - if use doc; then + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs/docs/*.[0-8] + elif use doc; then doman doc/manuals/man/* doinfo doc/manuals/texinfo/abigail.info