13 files changed, 75 insertions, 140 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e1e169548744..c182212a056e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 08fdf1b6f04d..44feb8fb4348 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,16 +1,14 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
 AUX ccache-4.8-avoid-run-user.patch 1270 BLAKE2B 2ecdef4b319a2d3c2fd4740667ae22b6134d977b252d9d022acfab723cc9c2cd7f11ea4f2674d5461fba5e3cf5574de39a3df840451670b68689569b819f2cb3 SHA512 898b0d7041af9765ac2a5f26099256e96c881d39452eb0cc90d859f9f64dab2d31d673d6b538958337a6f7848eb2ebf309064e96c37567e271a42e46c948b0ea
-AUX ccache-4.8.2-gcc-ice-workaround.patch 1064 BLAKE2B 4220f9bdbe637ef0cb31764e59b38455cc16c292b03f1345a796f497bfdc0c7b10b79fb405fde1e9b800172c380ef6f71612d1d156fea3a44b12dd77559f81bc SHA512 ad17352b5530e57a8e042b8b7766c5863d712c495c8ca966b994ad709839b70bb8b7acd06cd9f3849530dbc6840bd6aabd9118cba9898330b81f9101745b99e6
+AUX ccache-4.9-avoid-run-user.patch 1274 BLAKE2B 04df088e408ac82390f8f2c83d1a148b067a9c0215f70b0e51c347b4bc0c7221b56ea2608b9035a70ec1e9c4668d50f11db2fa223a2dc21ea0cdde71e2beb548 SHA512 b0faf07c1d3bfeafe8c7b25106e9abaaee47c3439254c8cf92e1140957760d6cfaf25ca1076c935973e5b58730bb2188957902e25f2293b0e8754fb2f13fa625
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f SHA512 48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
-DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908 SHA512 567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
-DIST ccache-4.8.2.tar.xz 560888 BLAKE2B ca907c16b353fabfb8e6479a076aa5cf791e6150f2b16eabf1817d4955d9b5f0200d4b12527ba0493ad9b2d7567adaaf8416bbff858a66fff5a5687328ab7395 SHA512 2edf8da79a9286eb4ed5b6dc2063b55fb97e22a40d1c501c6f17b2f0ce32dfc02e99754afbabbd24fed8312e13e5b8bfc20687d0b5c0cf19fbf64e3adc7bb25b
-DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9 SHA512 6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
 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
-EBUILD ccache-4.7.4.ebuild 2479 BLAKE2B 829ce214d1cae3d43a36edcfcc00a9715e10ad46c1f8da206be588f55a776af7040b632c61d83640126337a53b4008f24f75bf80892e20bfcc8d104c1bd38722 SHA512 565514f1aba17ef8aa513cece8615f322e3c84ad35647fe213ec156aed12d4546bf4a14fe1463e7dba3a4700beb1427ba2aff3c101f95f48bcbd118c41b8f2cd
-EBUILD ccache-4.8.2.ebuild 3680 BLAKE2B 1aeab0da8eb490d0f5b9b59695d2a4807fba6528b3a0d6c0744168c1b01aa5a8a4fa04a7cbe89a2f9cdb5b4e8cc618e1aa353e28b8a74a0da2c7fa4da0a300a0 SHA512 469ac7a2e107d919b3aea9b9acda541552b6bc9af0fe1f903377793bde0422964fcbe309048a4f8f821c76d1f45374056a1860afb9efe555c0d8dd95e7bd8fa1
+DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c SHA512 870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
+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.ebuild 3773 BLAKE2B 3a5de52f2a5fdb574c139f4be3d0e9f7a51c9ea5ccad10b66c4c93f59512627fa5c4fe3bb3f04c6e302261b3196143b69a2762614750342a43139ba9b6107966 SHA512 9d17ae28c90356970613dfaf739f0e42c24ddcb00f6026c5514c5d59016b4fb190de297e833f5488a2bc2838a4cfa745fd3257c658dfa3fc9d34677e1bf712c1
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.7.4.ebuild b/dev-util/ccache/ccache-4.7.4.ebuild
deleted file mode 100644
index 10b421bb1cec..000000000000
--- a/dev-util/ccache/ccache-4.7.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 )"
-
-LICENSE="GPL-3 LGPL-3"
-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="doc 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
-)
-
-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"
-}
-
-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.8.2.ebuild b/dev-util/ccache/ccache-4.9.ebuild
index fbbc909e5d51..68cf3874b664 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,9 +29,11 @@ if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
 	MY_DOCS_USEFLAG="doc"
 fi
 
-LICENSE="GPL-3 LGPL-3"
+# 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"
+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 )"
@@ -61,8 +63,7 @@ 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.8-avoid-run-user.patch
-	"${FILESDIR}"/${P}-gcc-ice-workaround.patch
+	"${FILESDIR}"/${PN}-4.9-avoid-run-user.patch
 )
 
 src_unpack() {
diff --git a/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch b/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch
deleted file mode 100644
index a638930ad6ad..000000000000
--- a/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/906310
-https://bugs.gentoo.org/906942
-https://github.com/ccache/ccache/issues/1289
-https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5
-
-From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001
-From: Joel Rosdahl <joel@rosdahl.net>
-Date: Tue, 1 Aug 2023 12:30:12 +0200
-Subject: [PATCH] fix: Work around GCC 12.3 bug 109241
-
-See also #1289.
---- a/src/storage/local/LocalStorage.cpp
-+++ b/src/storage/local/LocalStorage.cpp
-@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional<int8_t> level,
-           auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index);
-           l2_content_lock.make_long_lived(lock_manager);
-           if (!l2_content_lock.acquire()) {
--            LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index);
-+            // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241
-+            LOG_RAW(fmt::format(
-+              "Failed to acquire content lock for {}/{}", l1_index, l2_index));
-             return;
-           }
- 
-
diff --git a/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch
new file mode 100644
index 000000000000..ccce18b9d573
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.9-avoid-run-user.patch
@@ -0,0 +1,34 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+And see https://github.com/ccache/ccache/discussions/1086#discussioncomment-3327565.
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+https://bugs.gentoo.org/883799 and https://bugs.gentoo.org/887019 fo 4.8 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1194,17 +1194,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir() const
+ {
+-  static const std::string run_user_tmp_dir = [] {
+-#ifndef _WIN32
+-    const char* const xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
+-    if (xdg_runtime_dir && DirEntry(xdg_runtime_dir).is_directory()) {
+-      auto dir = FMT("{}/ccache-tmp", xdg_runtime_dir);
+-      if (fs::create_directories(dir) && access(dir.c_str(), W_OK) == 0) {
+-        return dir;
+-      }
+-    }
+-#endif
+-    return std::string();
+-  }();
+-  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : m_cache_dir + "/tmp";
++  return m_cache_dir + "/tmp";
+ }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 31e9e0a3240d..64ca1855fb19 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -30,7 +30,7 @@ EBUILD meson-1.2.2-r1.ebuild 3298 BLAKE2B df141e7d10d26fdb41e298cdf856fe46e632ad
 EBUILD meson-1.2.2.ebuild 3285 BLAKE2B 1b38a024705bc9a5046a19ed80f2ba126ff984112a5761283778207d1cce3e33ea39260cc3e6ce864b3f5d07ceaf7a0431f56638830491814da0455cfd2a7e7a SHA512 c581592f28a3a39834afa3369af14ddc267a1e3c2f35e2c41674354da560828fd2037550a6314f0063700528414b0bdfa42aecc82ea86340384985db8aee0fc3
 EBUILD meson-1.2.3.ebuild 3277 BLAKE2B 8a19cba268c31b8adc4f4852eca184639f0d6344934c321279a7dd48f5e3de02ce63bd4f3cff5814d8e42beff6733c9cf52c3742c254b051fa1d7a07d1885c33 SHA512 7fa82018c0f7d0179e1ccd5df33651e0e59561d2a35ccb189a32f7dc298cbe25bdfe4fd5db0eaf314a22b181ed111b74d957e240ab77cad62e2de9b3be9be512
 EBUILD meson-1.3.0-r1.ebuild 3402 BLAKE2B 86c1be84d1a2a95ef3a2c325754d773502fc38e0e689f8eb449c4a26e1498148383f608612d3f82fe223402b6d09b58a7f38f52c24211e1285512c7f134b9fa0 SHA512 28e238d500cfcd0afc8b01f1bb22c957fc86c0d85b3c17814861e2ffc4dee2024a022cb08b991dd73d32e0fef1c01ab411a2db6df6595851bbf70e1211e51aa0
-EBUILD meson-1.3.0-r2.ebuild 3565 BLAKE2B b88c922ff1d15321edb90011528ca0ba2464bdc2b665d7ded1d9f9d39cf62482bd60c8753713c9536bda0515f2e832750839cb85d4ed27e3f531fb7e8332eddb SHA512 6e215fe8b4a40ecd73b866e0735812fa6a80e55d01e90f2b4d91aaf0ccc05d0dea3f78014e8462683dbc5b3faa0c0210a783e5f76d5355964746156bb6f5f5b6
+EBUILD meson-1.3.0-r2.ebuild 3560 BLAKE2B d9de2564ccd2ff2bdb4bfb313852ae2de0b2068ac7fc9666eb79b5494091ea689550aed971f184c5645c023f86eee3dd4559b77e061bee40c57b2d62825fe4b5 SHA512 74df7aa1a41950ff05da696f1ead22bd0e4a1c9e77eba0029416535ef801e9aa4b1b8315207d28bd29ffe97f76cd281c40b8c998b15f74e2c0d5bc27f99b2733
 EBUILD meson-1.3.1.ebuild 3580 BLAKE2B 1dd390f3ca0606952cf5bd2c10ccbed5f1b1c69fe179ecd70dffd73d8e9b7a81f8d5002129c4fc365af9554c848df17099e6c45559f85f6f155d6d8de55e38bc SHA512 cc92c6aa97b7005dc5f3865b74b1e432391a43e114e28239e7b36d5ac7ec1852dc75fdd10cbdca2e0d494b4e50e759b48da7def6d7f2357939a205176241d5b2
 EBUILD meson-9999.ebuild 3227 BLAKE2B 8c8e99032af1d188ca7a8a227c992a4f53676523bcbdb5d7a0b44e254f897f6c2ed597bc6bd8472ddcf67f27e0d9117129fe93ebb452b80603dddf2d1664023e SHA512 a483a7433c22951f9da4d82c13eaff36f94b3772324641483129a4d7a138438382d6b349079808579d4fee22d59631f00a20759a8ac01f73a506c73f7e077218
 MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5
diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild b/dev-util/meson/meson-1.3.0-r2.ebuild
index af208ef34bdc..731af5e71112 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/meson/meson-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		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"
 	fi
 fi
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 043ed56a7565..296d004eef27 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -6,5 +6,5 @@ DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a3743
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 EBUILD perf-6.3.ebuild 7844 BLAKE2B 30bc7a2ee9db31f89553228baf7330780ec6e03a8dc9b4bfc5b8306e5a40ffb10d6e49a425b7580bb1d0df32d6016dd041b0d998543216771a4ec19525210b57 SHA512 ac316d6316f5f8b21ccb0fcd8d7f104b3b8d254d20dfd869980f4262fa9e1c22a4bf8c890bb7f5174a3cd5bf172fd89f6e9ff1d6544ceee5fd87fb8116eb448b
 EBUILD perf-6.5.ebuild 8574 BLAKE2B 05dd5c04b78c41982410cd39e1fe6ce9deb0c80086b95cdfb34b969e84b371e90f66fb4ad03520aea708fe7c5caddef5d090a43464967ba3079e410ab8422960 SHA512 f4e2a3743ce488e81cfba612c8d81acbbba119fa3b9ec275f756d2e6e41c2d62fed6ac5dcfdd22ec8b1f0981f077a0c306d569565efc102d49eeacaf24946725
-EBUILD perf-6.6.ebuild 8290 BLAKE2B bcb711e8a3e6d3cb6e40fd6691d49f873c48b1ddd06a3239178f088d2f41eb6ffa68438d9821bc076a108e001bf6ef48f760b9e18c8080f6e843cc2adf84cbb6 SHA512 82e67d5409a086911d1275cd6c9cd24f20b6cbdee180e063d9c411908f5e2d0cabc8792c3e376f340c3dbe16ad3bfb0834d2d2cf5b634347c394162ca85dc3e1
+EBUILD perf-6.6.ebuild 8983 BLAKE2B 9059ffe059fd345ff04f5b618ea114ae23f594be938f83b3a52c6af80dad5fd56fb74573304c79aad655051eea4788eb5bd81d6e1c869c0f406ffc99df918b5b SHA512 4d08c2203943f445d24f2a813e8db2b4d5137872238050b127cb622724836580fd304b46d8db2a2ff410ab8ba996ba55a989ccbf4865068b8dac5e16e585d27e
 MISC metadata.xml 1642 BLAKE2B 648d70e60d8f8661c475da2be7ce7d120d1d96d505b2a9cacf92f5922c3c1266c0e0d3f8731c00a443cd7b05e317e874675038e709f0045d3e2f8e47ce4ffd6c SHA512 7da28e8493f318cd8b8a5e4f03f6f0deffc6b42ff9a4b9f304ccf684ea30dc85e0525804cd851ba1597f49d3500681d76c7fd7b6de08c1e479f1fdf4f91d0cae
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
index 5f93ba5de347..206b06714a2f 100644
--- a/dev-util/perf/perf-6.6.ebuild
+++ b/dev-util/perf/perf-6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -223,11 +223,29 @@ perf_make() {
 		disable_libdw=1
 	fi
 
+	# perf directly invokes LD for linking without going through CC, on mips
+	# it is required to specify the emulation.  port of below buildroot patch
+	# https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+	local linker="$(tc-getLD)"
+	if use mips
+	then
+		if use big-endian
+		then
+			use abi_mips_n64 && linker+=" -m elf64btsmip"
+			use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+			use abi_mips_o32 && linker+=" -m elf32btsmip"
+		else
+			use abi_mips_n64 && linker+=" -m elf64ltsmip"
+			use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+			use abi_mips_o32 && linker+=" -m elf32ltsmip"
+		fi
+	fi
+
 	# FIXME: NO_CORESIGHT
 	local emakeargs=(
 		V=1 VF=1
 		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)"
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		prefix="${EPREFIX}/usr" bindir_relative="bin"
 		tipdir="share/doc/${PF}"
diff --git a/dev-util/rgbds/Manifest b/dev-util/rgbds/Manifest
index c0aa117042f4..524abd1dc765 100644
--- a/dev-util/rgbds/Manifest
+++ b/dev-util/rgbds/Manifest
@@ -1,4 +1,4 @@
 DIST rgbds-0.6.1.tar.gz 8041890 BLAKE2B cd5483e6fa5e2ca3bc9a6e3de44fdf7dc92289d558ac72d8922c0cf21b9dc576b878bfd7610cb41f791ad16cc415e446c925ee0dbc77ec4370d6ef4549935681 SHA512 b4a111e3d98a190d3c9b500dc59585fe68a8e6febc79b6716b406b96714e401bac427336388409ae456ee0f1e5a2c285bfe7b4bfa10e0d148ffc161adefe435b
-EBUILD rgbds-0.6.1.ebuild 792 BLAKE2B dae2e925bf668c141a303ae3d3e38bdbf9c6c48849a5e8b1d8a47f346869f34986e798794f0e69d63b67b053aea51ee36b638c42fd0da4f34e780c618875f9b2 SHA512 371fadfd3ae62b85b894de6c4c2f37407006d121e4a231a87d0f2cdeb1bdad97e234b955eb4b5d50dfaafa46bae946561a565f003eb0caa17a17524b25862925
-EBUILD rgbds-9999.ebuild 763 BLAKE2B 582760a267fe0e18ce45e66621816e54ba63ad9f0884c951da6a93adb30d84aa0933c67abe36ff6948dd30e6a0d2642a9e8a6fcd8c1e970eb09fe62d477083cc SHA512 1e009705c83e017bf11280ddb2ce07e11292258d2feb18924f01a69af37c27d5a4b45650b126971dfd436c3faebb9af54919047a6d52f641b286914020dca869
+EBUILD rgbds-0.6.1.ebuild 791 BLAKE2B ed28cdd029ad3cde71016c779d9d1af6052aaddabc7fd6d1f0f6b90265f10013d44bf71e1c41dd04c6b02f1b3721925798d00f5e9437985fd666caeb184f1493 SHA512 4fdfe4bc8bad551c3acbac74268948d0e7fa728ded7342a3536b44a1ec0c5513878d593b424c36e551620dfc3864f43bdbb0bb4e2f78dc4a2a27ec95cfa1c074
+EBUILD rgbds-9999.ebuild 767 BLAKE2B 5a22dd27268463c4ecdb56fac9826fed59909852fd624b588703b1f1f67c761d73d590c2b69db245fc1eac2d5b48f8a8fb7bd5caaa6e2ffbd47ccafca7d2c36f SHA512 28684aa9b13af2bdb27855a91dd56806c1e9568942f5043e6be8a6ad32dbcfe7eb48463c9795e1c4af149733590af482ea59aab34e6a71a7c6ae6b3234f5f21d
 MISC metadata.xml 665 BLAKE2B e9e96801e1a7c94a7c3645f6ea5f1354d13faf4bb98fb001d32a8f3e10f660c2d525a9e9e27b7b62b5f929c567461072f892a6a23978e7812262c49dcd35a0e2 SHA512 9035ff9ace1fcecafff7dbcd0c7f34247a94a366f8c6b0ca6a92b62b5e402f9cf97ceae675381d332758fa9969e16a7b790bc9ce9a0e2d65a4e4378faaf02fbf
diff --git a/dev-util/rgbds/rgbds-0.6.1.ebuild b/dev-util/rgbds/rgbds-0.6.1.ebuild
index dbaaeda14a40..8a643cb45801 100644
--- a/dev-util/rgbds/rgbds-0.6.1.ebuild
+++ b/dev-util/rgbds/rgbds-0.6.1.ebuild
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
-LICENSE="ZLIB"
+LICENSE="MIT"
 SLOT="0"
 
 DEPEND="media-libs/libpng"
diff --git a/dev-util/rgbds/rgbds-9999.ebuild b/dev-util/rgbds/rgbds-9999.ebuild
index 9245f4deb4f2..51e115fe3583 100644
--- a/dev-util/rgbds/rgbds-9999.ebuild
+++ b/dev-util/rgbds/rgbds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="ZLIB"
+LICENSE="MIT"
 SLOT="0"
 
 DEPEND="media-libs/libpng"