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 810FD15806E for ; Sun, 14 May 2023 04:44:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA30BE086B; Sun, 14 May 2023 04:44:14 +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 A2640E086B for ; Sun, 14 May 2023 04:44:14 +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 C7A81340DD7 for ; Sun, 14 May 2023 04:44:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31A347F5 for ; Sun, 14 May 2023 04:44:12 +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: <1684039444.4be9cd309cf4c202d50e2ea5c9142622a9b12181.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ccache/ccache-4.8-r1.ebuild dev-util/ccache/ccache-4.8.ebuild X-VCS-Directories: dev-util/ccache/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4be9cd309cf4c202d50e2ea5c9142622a9b12181 X-VCS-Branch: master Date: Sun, 14 May 2023 04:44:12 +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: 6a950de4-35b7-44c8-8e49-e66229956fd6 X-Archives-Hash: 112c3d3ecbf00ac36a15ea708a17a84f commit: 4be9cd309cf4c202d50e2ea5c9142622a9b12181 Author: Sam James gentoo org> AuthorDate: Sun May 14 04:43:43 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun May 14 04:44:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be9cd30 dev-util/ccache: fix pre-generated man page installation Portage unsets CCACHE_*. I'll file a bug for that later. Signed-off-by: Sam James gentoo.org> .../{ccache-4.8.ebuild => ccache-4.8-r1.ebuild} | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dev-util/ccache/ccache-4.8.ebuild b/dev-util/ccache/ccache-4.8-r1.ebuild similarity index 82% rename from dev-util/ccache/ccache-4.8.ebuild rename to dev-util/ccache/ccache-4.8-r1.ebuild index f839a350fcda..670205fedd4d 100644 --- a/dev-util/ccache/ccache-4.8.ebuild +++ b/dev-util/ccache/ccache-4.8-r1.ebuild @@ -3,15 +3,19 @@ EAPI=8 +# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu +# because Portage unsets them. Aaaah! +# # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs # Set to 1 if prebuilt, 0 if not # (the construct below is to allow overriding from env for script) -CCACHE_DOCS_PREBUILT=${CCACHE_DOCS_PREBUILT:-1} -CCACHE_DOCS_PREBUILT_DEV=sam -CCACHE_DOCS_VERSION="${PV}" +: ${MY_DOCS_PREBUILT:=1} + +MY_DOCS_PREBUILT_DEV=sam +MY_DOCS_VERSION=$(ver_cut 1-2) # Default to generating docs (inc. man pages) if no prebuilt; overridden later -# bug #830088 -CCACHE_DOC_USEFLAG="+doc" +# See bug #784815 +MY_DOCS_USEFLAG="+doc" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc inherit cmake toolchain-funcs flag-o-matic verify-sig @@ -20,16 +24,16 @@ DESCRIPTION="Fast compiler cache" HOMEPAGE="https://ccache.dev/" SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz" SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )" -if [[ ${CCACHE_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CCACHE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CCACHE_DOCS_VERSION}-docs.tar.xz )" +if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )" + MY_DOCS_USEFLAG="doc" fi LICENSE="GPL-3 LGPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -[[ ${CCACHE_DOCS_PREBUILT} == 1 ]] && CCACHE_DOC_USEFLAG="doc" # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 -IUSE="${CCACHE_DOC_USEFLAG} redis +static-c++ test" +IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test" RESTRICT="!test? ( test )" DEPEND=" @@ -107,8 +111,8 @@ src_install() { newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${CCACHE_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${CCACHE_DOCS_VERSION}-docs/docs/*.[0-8] + if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8] fi }