diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-14 10:00:59 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-14 10:00:59 +0100 |
| commit | 3fa8418e7778f51be61ca1c9114059c73a477459 (patch) | |
| tree | 31553752ae6fa751517d9947b637b152a2ed3540 /dev-util | |
| parent | a64517889ae341f6c77a299cd3aecdcfcf1694f6 (diff) | |
gentoo auto-resync : 14:05:2023 - 10:00:59
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/Manifest.gz | bin | 68457 -> 68453 bytes | |||
| -rw-r--r-- | dev-util/ccache/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/ccache/ccache-4.8-r1.ebuild (renamed from dev-util/ccache/ccache-4.8.ebuild) | 26 |
3 files changed, 16 insertions, 12 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex bc24f8002559..c57ff2c9ffb0 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index c3aa2c466b75..fe31626d9c77 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -14,5 +14,5 @@ DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 4a646db5b7a220a21ad93a02ea4bad23a666ad116 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba EBUILD ccache-4.6.3.ebuild 2575 BLAKE2B c8b4113239bf1ea5d2b394f68e0f2dc623a602bf082c72cb4e5c38640b83e9909e69324a894a9a79bd88610a36451cee2ea35ddfce7060794b52fb8923b8fa95 SHA512 37fb4a65048e332d928279eccb5bcebeb20ab61379898aa548eb5ced5a858b680cd844f2f679d4ea528af54f21ca663614112dc45b937b8da38b1718fa919f2e EBUILD ccache-4.7.4.ebuild 2489 BLAKE2B c96ba952f7f90c54812fcc1ead1bc4adf7b036937b2d80a05c0bebc54cdf3cdaac456e8918b6f4905cb38c19aa98d9c912624d22bfd76c0ae35d32e8c7cea6dd SHA512 90802b6ff902bb7cced6947824d38ea90bf8da66b48dec9cc7f1584193f4fb3f4d50217685306e1504118a55a46c6680f27b6a59368c835058171ef33f772e4b -EBUILD ccache-4.8.ebuild 3568 BLAKE2B b7cbcfd12398afdc1921155a19dea92506f1eb3388ff919cea9f154c9ccb369f3088769586d531c8911f7e615c3d2416edefcca77fc4fcb8d697e7710b3e1bb9 SHA512 d33365bdcdc749bd0548355b9299b6b00092b3d24f85e274e392aa9a356b3af03669e3f0e8d02eabfe7bf03c3741997ae0705f7f477e1e1bea689a9d6334acfb +EBUILD ccache-4.8-r1.ebuild 3607 BLAKE2B 591692c06da7e031ce7811e057ea8d638252bd9f6577074230dfb31d7da1977a2d9da8ae3f5eb8665bc48d9ca13cb54fd7952185817482bb4139828fc9167690 SHA512 f2d6a6745589b6a7fbc6998a6c9e296da3f01e05a61ead453315166d7cda335cf0028b1db7fee3814e5b62c0e1312ebde1eb587fba395270793b5c1a5473724c MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1 diff --git a/dev-util/ccache/ccache-4.8.ebuild b/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 } |