commit: c19e18eef2f1591cb3c3a2ff45d50d72c4a1c5aa Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 23 07:49:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 23 07:50:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19e18ee
dev-util/ccache: drop 4.11, 4.11.1 4.11 has a regression that 4.11.2 fixes, and 4.11.1 was Windows-only really (see df286d381d38772c4a97bc5201b233bd631639e8). Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/ccache/Manifest | 4 - dev-util/ccache/ccache-4.11.1.ebuild | 147 ----------------------------------- dev-util/ccache/ccache-4.11.ebuild | 147 ----------------------------------- 3 files changed, 298 deletions(-) diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 57b304d5509f..58db2b14953a 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -2,9 +2,5 @@ DIST ccache-4.10-docs.tar.xz 82900 BLAKE2B 0d0ef988bb21bc05642c2d5ea42bdf9c87c19 DIST ccache-4.10.2.tar.xz 485460 BLAKE2B 7352b8b48ed889e1f251ae59cb7cd9d01d7d3226b58a7823be176907dc074ff22ca5d6a271e2caede7d97a65457b9067b48e9d39ab833bf45fb055eb3bfe7607 SHA512 3815c71d7266c32839acb306763268018acc58b3bbbd9ec79fc101e4217c1720d2ad2f01645bf69168c1c61d27700b6f3bb755cfa82689cca69824f015653f3c DIST ccache-4.10.2.tar.xz.asc 833 BLAKE2B 4a975aa1e8c9c12cf4df60b31cea10023e8e8efb561608dd652ecef2a0e575b41c5f6cfc551b0f3bd860e3b4a59061fcf870a67f5625f6a82cab104045ac2e57 SHA512 4afcc08563f0dfc8ccfd0797ea2cc26227b253415b9b9fe8ed90ef47e5b8d1dbcb8cbdd17ebf95acd6a367260f6a405764d0d0c5432cfbe2dce4d098b2a7a1b9 DIST ccache-4.11-docs.tar.xz 86044 BLAKE2B c357dc3aa328a8201e62dfd92dc9380b2d5bbaf613a390305021a67f84199688e6fd6fb20489ad4ad81c45bbde44c8133fd12dc5f33cd7925fbde795fe5927e0 SHA512 58ffb519f24e33ac4394ce8dd5667ed1be67cab60ebcab7aa3c82adb31f14110992d0e56f8ebf2ef87e43bcfa202e1c05a4a187b5bcfc39a9bf0525d7039a0ce -DIST ccache-4.11.1.tar.xz 500628 BLAKE2B 7a1f866d08232ff74eaa0bac84863bab9fb6a0f4c5c4326be212f1b7e61f10da0afe61d6816ca438afffe2a5be565161086f73c82c84563014f29bfe5e092cf8 SHA512 f7277bbf628e64e19780dd029d7fc0866ade28fa67efd93a72783422586e21beaaa3b0795ba3bfc7ef4403ba6e41823da90cbb6d88c1d5aa412111f3bcb1b7c5 -DIST ccache-4.11.1.tar.xz.asc 833 BLAKE2B 5c005d488f8b30d1e286e22c13a28c3c7e2826193327c56d03bb713d343bc8cd29528973bbc4caa013bdbfecdcf6239910b6992518b66839d2aa6c81287cf497 SHA512 505c3ef267764b02fd998224afded2d7701e0fe8decfd10602da5ae8fea2f38c84ac2abc193e9f3260bd55ecbe7fd8696e0d416a43326ba19c61971f57c2c522 DIST ccache-4.11.2.tar.xz 500800 BLAKE2B 4536cc3089cb8267fe4c01d3f4f6ffe962cec39d498b962d535a347bfbe1dda5e69652deb86e3e302667d1b51ea60e59a5c72c1acf55466174d0459b640167b7 SHA512 6c0f1243097ee93e7d73d5bdcd4609f771fd19e4b52afc5f9b813663b7d195ec503efb990c3b5205d8e9fa6dd16f78c031d93d5cff47223e6d4c1986ac1d6315 DIST ccache-4.11.2.tar.xz.asc 833 BLAKE2B 194770651e233604848a74a724d45ec29988980e28f2e956422e362909abee27b1dc689e104e12d806590b4da2f967bac5f62405c305e970eebed9a212b69f33 SHA512 9471f88497f53a9bbafc907c502f62c8ea9adc08030e6c2dbf7f04d67478f3e3763fdf12f647a13ca5c6dbf0c7e0ba9c0fb5c05a7df4f54b7f44b8e41d1f79c6 -DIST ccache-4.11.tar.xz 500508 BLAKE2B 40a8316e3db0a8a1cc4599d407e6f0bea91dacf21d50675e6f740542ae85deb0137ead368d13d5d5cc3e8f83b2a5f6e8acf0cdae72d1f40661ef145a386ce98c SHA512 38f48663a44750e6340214375445564957f185a4f272426cfd9d26077be5788c6f4e2901773703cc4b660c629c5d31c9c66b901603cb531d3f9787f559872c8e -DIST ccache-4.11.tar.xz.asc 833 BLAKE2B 7bdee25a277a624f624bc20627c12c923e58b03a124ae0d66cb05657135b92d9b32d93658bf558bfdd138d4d8151c1bcab6c9657940d6becb60d00a18dfa353b SHA512 0f1f17fb1464d74654fbfccb686574927d2463fa687044d278a5728f01776f90c52fb3b4cec383bbfccc085fbf9c0ac6a6c58629c15e9969f703fa79ca3f79ba diff --git a/dev-util/ccache/ccache-4.11.1.ebuild b/dev-util/ccache/ccache-4.11.1.ebuild deleted file mode 100644 index 53a111a563e2..000000000000 --- a/dev-util/ccache/ccache-4.11.1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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) -: ${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 -# See bug #784815 -MY_DOCS_USEFLAG="+doc" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc -inherit cmake toolchain-funcs flag-o-matic prefix verify-sig - -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 [[ ${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 - -# https://ccache.dev/license.html -# ccache, blake3, NonstdSpan, tl-expected -LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0" -LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 -IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test" -RESTRICT="!test? ( test )" - -# TODO: package NonstdSpan, TlExpected -DEPEND=" - >=app-arch/zstd-1.3.4:= - !static-c++? ( - >=dev-cpp/cpp-httplib-0.10.6:= - >=dev-libs/libfmt-8.0.0:= - ) - >=dev-libs/blake3-1.4.0:= - >=dev-libs/xxhash-0.8.3 - redis? ( >=dev-libs/hiredis-0.13.3:= ) -" -RDEPEND=" - ${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions -" -# Needed for eselect calls in pkg_* -IDEPEND="dev-util/shadowman" - -# clang-specific tests use dev-libs/elfutils to compare objects for equality. -# Let's pull in the dependency unconditionally. -BDEPEND=" - doc? ( dev-ruby/asciidoctor ) - test? ( - >=dev-cpp/doctest-2.4.6 - dev-libs/elfutils - ) - verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) -" - -DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-nvcc-test.patch - "${FILESDIR}"/${PN}-4.0-objdump.patch - "${FILESDIR}"/${PN}-4.11-avoid-run-user.patch -) - -src_unpack() { - # Avoid aborting on the doc tarball - if use verify-sig ; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} - fi - - default -} - -src_prepare() { - cmake_src_prepare - - cp "${FILESDIR}"/ccache-config-3 ccache-config || die - eprefixify ccache-config -} - -src_configure() { - # Mainly used in tests - tc-export CC OBJDUMP - - local mycmakeargs=( - -DENABLE_DOCUMENTATION=$(usex doc) - -DENABLE_TESTING=$(usex test) - -DDEPS=LOCAL - -DREDIS_STORAGE_BACKEND=$(usex redis) - ) - - # Avoid dependency on libstdc++.so. Useful for cases when - # we would like to use ccache to build older gcc which injects - # into ccache locally built (possibly outdated) libstdc++ - # See bug #761220 for examples. - # - # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. - if use static-c++ ; then - append-ldflags -static-libstdc++ - mycmakeargs+=( - -DDEP_CPPHTTPLIB=BUNDLED - -DDEP_FMT=BUNDLED - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - dobin ccache-config - insinto /usr/share/shadowman/tools - newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8] - fi -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ -z ${ROOT} ]] ; then - eselect compiler-shadow update ccache - fi -} diff --git a/dev-util/ccache/ccache-4.11.ebuild b/dev-util/ccache/ccache-4.11.ebuild deleted file mode 100644 index 53a111a563e2..000000000000 --- a/dev-util/ccache/ccache-4.11.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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) -: ${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 -# See bug #784815 -MY_DOCS_USEFLAG="+doc" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc -inherit cmake toolchain-funcs flag-o-matic prefix verify-sig - -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 [[ ${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 - -# https://ccache.dev/license.html -# ccache, blake3, NonstdSpan, tl-expected -LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0" -LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 -IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test" -RESTRICT="!test? ( test )" - -# TODO: package NonstdSpan, TlExpected -DEPEND=" - >=app-arch/zstd-1.3.4:= - !static-c++? ( - >=dev-cpp/cpp-httplib-0.10.6:= - >=dev-libs/libfmt-8.0.0:= - ) - >=dev-libs/blake3-1.4.0:= - >=dev-libs/xxhash-0.8.3 - redis? ( >=dev-libs/hiredis-0.13.3:= ) -" -RDEPEND=" - ${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions -" -# Needed for eselect calls in pkg_* -IDEPEND="dev-util/shadowman" - -# clang-specific tests use dev-libs/elfutils to compare objects for equality. -# Let's pull in the dependency unconditionally. -BDEPEND=" - doc? ( dev-ruby/asciidoctor ) - test? ( - >=dev-cpp/doctest-2.4.6 - dev-libs/elfutils - ) - verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) -" - -DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-nvcc-test.patch - "${FILESDIR}"/${PN}-4.0-objdump.patch - "${FILESDIR}"/${PN}-4.11-avoid-run-user.patch -) - -src_unpack() { - # Avoid aborting on the doc tarball - if use verify-sig ; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} - fi - - default -} - -src_prepare() { - cmake_src_prepare - - cp "${FILESDIR}"/ccache-config-3 ccache-config || die - eprefixify ccache-config -} - -src_configure() { - # Mainly used in tests - tc-export CC OBJDUMP - - local mycmakeargs=( - -DENABLE_DOCUMENTATION=$(usex doc) - -DENABLE_TESTING=$(usex test) - -DDEPS=LOCAL - -DREDIS_STORAGE_BACKEND=$(usex redis) - ) - - # Avoid dependency on libstdc++.so. Useful for cases when - # we would like to use ccache to build older gcc which injects - # into ccache locally built (possibly outdated) libstdc++ - # See bug #761220 for examples. - # - # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. - if use static-c++ ; then - append-ldflags -static-libstdc++ - mycmakeargs+=( - -DDEP_CPPHTTPLIB=BUNDLED - -DDEP_FMT=BUNDLED - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - dobin ccache-config - insinto /usr/share/shadowman/tools - newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8] - fi -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ -z ${ROOT} ]] ; then - eselect compiler-shadow update ccache - fi -}
