gentoo auto-resync : 06:02:2024 - 11:42:15

5 files changed, 137 insertions, 2 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f12f6b061fd9..ce9b28e1ce17 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 44feb8fb4348..afe0c5197008 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -7,8 +7,11 @@ DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa524
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f SHA512 e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726 SHA512 2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586
 DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c SHA512 870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
+DIST ccache-4.9.1.tar.xz 583764 BLAKE2B 9ebaf335fda54666e4bfc8f2c402f2b908b3922f3898b6a739b0256481256c6121546021b80fd2dbc93f3aea254db63a8624b97b2820b88e73e502a243bf2562 SHA512 5ae4537a7e546b779c80f5adadce1349a84da3a47b255bda06cb2678ee5403307f013c08c8541a21f6f1fb36a0b64bdbcf785fbd2fcfe3009150117250e75b0b
+DIST ccache-4.9.1.tar.xz.asc 833 BLAKE2B a157b0c2c0777732d9a51fb7519f561fac098bbac9ba33fe453b210a6e9a34372b5d00b0fa940d2b783ab0eb48e7bc98707de884b191d83120d9ad8239c9fb76 SHA512 43605eca0f9a62565486c6c7ff622fc4d18a400518aa9c9e3c9d865a99c40c63a6a09d42ccd3428d28575c4de8a69be89c93830d26261d3479792e67179d0839
 DIST ccache-4.9.tar.xz 583744 BLAKE2B 682b491d061452d77d988d7e9e661ed4ce729a40a58370af55e1f24c5e973e4808d7211b4f8b8ab7f9328ecc651c032fa2efd37675566308197c22fd9a776675 SHA512 04200e5ceab56fc119f4376189f45fe811409a8022f08e82cd3089e252f350d604d777a237a57651fcd0c20f8ba0f27e4f3cc330a5970d455a696a977408d563
 DIST ccache-4.9.tar.xz.asc 833 BLAKE2B ad91919ab45f98d334c9b2d273b8139a2fb64b28a3fdb2a2042beaaa32905978113cd08ff95a009891c6159505431e4c1e0203adca94032feb2a4cee9bd089e2 SHA512 2f51d11d00756d099a64a9e5698591385d2c822438123f1c9e753c66e35f4ea9706db3414d7049cb6604defebc72927b6772c4e8a2271e03fb80f815659f90fa
 EBUILD ccache-4.8.3.ebuild 3765 BLAKE2B bf2ac6528f1338f2e719e4f44d4ab3d61d1566c2c0dbab37827f3f311f6fce8b2393da3d70c610a6baa9e1695ef881c2620a211d9b3ee54a9b1c1cbdabaec755 SHA512 3074b59000a0bf747f36bfe393eaf354b7adbed4ac688991119237adb683d21b7e8b020d578b1904b6c9031cec13dd430db4783bbf2af94f7fc8ce17292be117
+EBUILD ccache-4.9.1.ebuild 3766 BLAKE2B cb2d716bf41cb0be410044ca4b2d3b87efd1546d12e6293402beee66e04af11d4e7f394a36f0956bdbebb6624390e25f31bdb1c22c80085bac6b7ff15e266cb9 SHA512 f0298a5134cfc075e146d51e9727a3b70225cb37e76b972785854fdc4ac7fd49e409abe6557374b043bd848d4a6eaf119d938d0988dc58b903ebf07bfbd12eda
 EBUILD ccache-4.9.ebuild 3773 BLAKE2B 3a5de52f2a5fdb574c139f4be3d0e9f7a51c9ea5ccad10b66c4c93f59512627fa5c4fe3bb3f04c6e302261b3196143b69a2762614750342a43139ba9b6107966 SHA512 9d17ae28c90356970613dfaf739f0e42c24ddcb00f6026c5514c5d59016b4fb190de297e833f5488a2bc2838a4cfa745fd3257c658dfa3fc9d34677e1bf712c1
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.9.1.ebuild b/dev-util/ccache/ccache-4.9.1.ebuild
new file mode 100644
index 000000000000..108c29bbdd7a
--- /dev/null
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 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 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
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 )"
+
+DEPEND="
+	app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )
+"
+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.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+	doc? ( dev-ruby/asciidoctor )
+	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.9-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
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	# 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.
+	use static-c++ && append-ldflags -static-libstdc++
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DZSTD_FROM_INTERNET=OFF
+		-DHIREDIS_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	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/gperf/Manifest b/dev-util/gperf/Manifest
index e284dad4c627..8db87ad3c905 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -3,5 +3,5 @@ AUX gperf-3.1-parallel-tests.patch 1323 BLAKE2B fcbbd6e26fec78a9325b616e093ff760
 AUX gperf-3.1-strncmp-decl-mismatch.patch 819 BLAKE2B 627af81f91b5fdfd1bd3978adeed9a0d00a5d6b3f8aae54fe0ce21cfaf9384734a61a5986723f72f4c55efdccbed90ec651008d6df651a10322c04b4099431bf SHA512 167823f5908951c79e9ec5b77106a1acbc011bc34636a845d50f55689cf9a7a1f4652a628dc786a29d1dd764e94d1055e32eea1f8c3852d9622e14816969c7f4
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
 EBUILD gperf-3.1-r1.ebuild 751 BLAKE2B d35fe2c21e0d0abe91959e4c6b243e682d3bf2130e1ade012263dd3d0a0fdb86c7711bd7e4f4283c168edb44fa8612f17b14d7f768e50389671fd8ccb84bee47 SHA512 d77340398aec5398d52df3c0b1aaedd4d461b712a8a8bdba7470c419679d872f1f50698e93071770e22291b7d4ed43f959507252a51a3b07162b5fe821f813d1
-EBUILD gperf-3.1-r2.ebuild 865 BLAKE2B b495d6e4bd218df46d3afc69a38dc6d75f6e451131b57ef1e82d7250640f95e0d401848d64361d6932aa44e0158e192a114d827f7069b7d3b39a6cf8978aafbc SHA512 904d76fce20a57534ef2eab8972c2587b08a4037968d45ea986fe6401148eac9c1e5356cf71ee0c777bc42b5244071807c65761991737b0b85610dcd380a0ef6
+EBUILD gperf-3.1-r2.ebuild 858 BLAKE2B d26e35adb7765930d93f6569bec89d36dcb499d578cf0fc381a6490347f6ea2d824d5f68911f1fbefb792c2e757cb77abb9109fc2ebeb0af794f10711377ee82 SHA512 f5a3f7e98b2d1e73bf936abd1919cedbf8d2022b7f0b38b6f46be64f0731bf89a5bc3ec548b513932efb986e572a2f5f4c815e73d5e684e4e90f2053d3324593
 MISC metadata.xml 340 BLAKE2B 50b364949bb779503aa29072024bb8d13a2195fc05911da90071b08742d63cc6bfcad152fdbd149c90eede93fb01165c95b46359a9b20bb3d32a87a1f19d4333 SHA512 19b11707d3d714c5ee69a1f17eac7cff18ccca9fefccc2d1d68305b3c86f4992db90529365340cb7f6ee07bfc01f3b690360d07f858da916c1136853172155d6
diff --git a/dev-util/gperf/gperf-3.1-r2.ebuild b/dev-util/gperf/gperf-3.1-r2.ebuild
index f5fd37924abf..b2df43d8c9ae 100644
--- a/dev-util/gperf/gperf-3.1-r2.ebuild
+++ b/dev-util/gperf/gperf-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch