[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

[Sam James]

commit:     4be9cd309cf4c202d50e2ea5c9142622a9b12181
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 04:43:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
 }