8 files changed, 60 insertions, 5 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f9e585c663ab..2cbbe8e1445f 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 1de0a577653e..bb19d2411de7 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,6 @@
+AUX cjs-5.6.1-clang15.patch 1712 BLAKE2B b3e78b3e13f34011e45b13f537860cb18329b5e5249d83f987b0803e8429bd4ebf7434d0788d7cdd458bd44e83538eacbd7c491cdbc10e663b07c17eb90f6612 SHA512 b731d86a8f76afe66dae5b49747374947e63437b40e0bccc5654bc28f00b1ea52cb14db734803c1f172bc91cc85fe0683260793407b8e0e6f482d6edd8ee0280
 DIST cjs-5.2.0.tar.gz 601982 BLAKE2B 99fe183add425e5178863aa6b0af6aa0579de0dabee72ad9bcc86e2edf0ad13093ce659ac60ed365edb33ff1eb54d54766a7e0df1a65aa64b7da34e5559297c7 SHA512 0ce5cc07be036fa9af93c7d98a179881789f883578a2034c3c28255ef9da96d32b4203fc39311eaea0bdbe5148f13920d72dd24acb717c4e60302b390097a825
 DIST cjs-5.6.1.tar.gz 794907 BLAKE2B 9ec6d5ffb33a28dca96d640da7b499e81751d5889dd0caec354fdf41de7b42c8d8edd737def68c2506c94af7a69a4d3433c459da2a5884f2668f14eac22163a0 SHA512 35662d78174d428610642198d7777a2c19137cd61dce93de69011fea235b0f461a2072ff219da0f18ef36068c1e3e5c2dc88684493b900a12fc1cd0b32503ae5
 EBUILD cjs-5.2.0.ebuild 1514 BLAKE2B d6e4b74c6144b653c2928d6f2e282e39a326a6457e210b585a097ba53f661431367111679e7d14f579c49218d467664b8f5fddd992f0acc798dc055bebbe696b SHA512 4f7a1d6182ed20eabe062c228e456db1daa5b7d94f1bfc05b1466ff21758c3540e514c8cf9c2e843f9eb363747450883abdb5640ae69f9362e2e03af25ab37fb
-EBUILD cjs-5.6.1.ebuild 2287 BLAKE2B 17cb9a403b5278cd5dba205208df5a0c0c39e58a9e1fb19edaab9a2406ccdff8d1eea8761e1428f658e29167341022447505ceadc24d2e0728d58e3a402786e6 SHA512 d89f8f2340e835bad467eff7de92529759ca89b7a26e1fdc4a7ae739e38c4df63c1d652a47aedbeccf60d768491ed68492af124edeb7ab8878a12eca7ae4b0e0
+EBUILD cjs-5.6.1.ebuild 2341 BLAKE2B 4e70e52c2aa8cdc54490a73493587ffe9be727cf7b03c06324d4f975e00879d3e415e0d79a7c5db645b7d086cedffce35d1bc0884b172b4c7a72ffb727c644f7 SHA512 a4969fdc1da52051a9a7aa6c49e7b579e091f08c4c84e5d4c0cd596478e242981045c054eb3a3380c59df254616d912ed4d6c67820fcf616ff49bcf19e3938f2
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-5.6.1.ebuild b/gnome-extra/cjs/cjs-5.6.1.ebuild
index e30a52266004..25a3e01843cd 100644
--- a/gnome-extra/cjs/cjs-5.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-5.6.1.ebuild
@@ -38,6 +38,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.1-clang15.patch
+)
+
 src_prepare() {
 	default
 	python_fix_shebang build
diff --git a/gnome-extra/cjs/files/cjs-5.6.1-clang15.patch b/gnome-extra/cjs/files/cjs-5.6.1-clang15.patch
new file mode 100644
index 000000000000..43439e6f2c2a
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.6.1-clang15.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/905430
+https://github.com/linuxmint/cjs/issues/115
+https://gitlab.gnome.org/GNOME/gjs/-/issues/514
+https://gitlab.gnome.org/GNOME/gjs/-/commit/9b11ed0ba70718a8b1983126563cea58658a808f
+
+From f93880c356108cfdbc8f9ebe318d18f256d7128d Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sat, 5 Nov 2022 18:01:36 -0700
+Subject: [PATCH] tests: Avoid using char type in uniform_int_distribution<T>
+ template
+
+This is undefined behaviour. GCC and pre-15.x Clang accept it, so we
+didn't notice it before.
+
+Closes: #514
+--- a/test/gjs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -55,12 +55,30 @@ static unsigned cpp_random_seed = 0;
+ 
+ using Gjs::Test::assert_equal;
+ 
++template <typename T>
++struct is_char_helper : public std::false_type {};
++template <>
++struct is_char_helper<char> : public std::true_type {};
++template <>
++struct is_char_helper<wchar_t> : public std::true_type {};
++template <>
++struct is_char_helper<char16_t> : public std::true_type {};
++template <>
++struct is_char_helper<char32_t> : public std::true_type {};
++template <typename T>
++struct is_char : public is_char_helper<std::remove_cv_t<T>>::type {};
++template <typename T>
++inline constexpr bool is_char_v = is_char<T>::value;
++
+ template <typename T>
+ T get_random_number() {
+     std::mt19937_64 gen(cpp_random_seed);
+ 
+     if constexpr (std::is_same_v<T, bool>) {
+         return g_random_boolean();
++    } else if constexpr (is_char_v<T>) {
++        return std::char_traits<T>::to_char_type(
++            get_random_number<typename std::char_traits<T>::int_type>());
+     } else if constexpr (std::is_integral_v<T>) {
+         T lowest_value = std::numeric_limits<T>::lowest();
+ 
+-- 
+GitLab
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 1aa20b669608..234480b28e35 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -5,5 +5,5 @@ DIST evolution-data-server-3.48.0.tar.xz 4898148 BLAKE2B 62138001a30534d154469c5
 DIST evolution-data-server-3.48.1.tar.xz 4905072 BLAKE2B 171b8bafd7994adfc99193fb5f80dbad49bf4e41a3f4089d93a6ec5629a0d75730cd443b3371ce2c13f6f02099e1114d8a5848215bd0e030cb1652451bc70374 SHA512 bcf59f398684aa2d78340025bc06e54a98a266f05472f8eb085d8f7fc87cb9ebdd6b4f9eae7e5ac2c14e45d69c471fdb89e6c5f7b22dff870287294b573b65f6
 EBUILD evolution-data-server-3.46.4.ebuild 4206 BLAKE2B ea67b0cda2ce81131b3798d1d1712a24959bd7725ddd57c492aaa48347575ca590dddd56bb8689b6b91a0e2aa03014c879a499cf266efc2efd143c62271b3598 SHA512 0eb4bb3d0908cc9c792d22eefeab1365a15dfe16976a29d2758a1eb9af303c99198a27fdfe1e0aba8f6248fb1baddfd543c31341ab15046bdc57bae52265f90d
 EBUILD evolution-data-server-3.48.0.ebuild 4210 BLAKE2B ee027675199fdac3158bfe8ebf4e6d5ebb2fd4cec3b843d0473e7013ee8c47a8e7dce9ffb39ad01df065c48507cfe687561f72ad282e157e8db3f99fcb96090d SHA512 dd149672304aacbd873fbe33ea94a561a7dc82290ab43f55c46e20c31c498b673ebe63eba320f634d1c4967dd4b860ec2bf515a5d5964969aba22873f323baa4
-EBUILD evolution-data-server-3.48.1.ebuild 4210 BLAKE2B ee027675199fdac3158bfe8ebf4e6d5ebb2fd4cec3b843d0473e7013ee8c47a8e7dce9ffb39ad01df065c48507cfe687561f72ad282e157e8db3f99fcb96090d SHA512 dd149672304aacbd873fbe33ea94a561a7dc82290ab43f55c46e20c31c498b673ebe63eba320f634d1c4967dd4b860ec2bf515a5d5964969aba22873f323baa4
+EBUILD evolution-data-server-3.48.1.ebuild 4207 BLAKE2B 71d9eda63120f155bcb1666c50f1a5dc5d34eb380a037cfbe1eeec3b299b97d7f589eecd251f3c8a5c22081246580a300b3e616223c619ddfdfdab318ade694e SHA512 2d55125653761bd3feaae502a411e0e719fe1ba218d978390cd40bbff75828d6ec9c4513cc046b041f649fbefc63fe6a6c92c909c502ae9f8c8bc4e340d8fc19
 MISC metadata.xml 962 BLAKE2B 212d69424f3276f40cbd92843968374de95e0cf3b5263a0fe815628aa5fa9a3618c7104abbc0e4bb2f0a9ab6b36a674fffa36c6d020ae7ffb6fe34c6f3c035f0 SHA512 49350cc9ee65c76c248a99fb7adbfefcea02eb1c43673bb8e010af1fa78767dd2d99beb625a0164b2a2b8e8b366478b4dc1309c2044b77feb017f4bdeffa2d92
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.48.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.48.1.ebuild
index 549b8a90d521..e9d4090db289 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.48.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.48.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
 # glib-2.70 for build-time optional GPowerProfileMonitor
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 8340e497a40d..891cd391e330 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-system-monitor-42.0.tar.xz 978208 BLAKE2B ba52048e643eef1dd556dc833fc5ebdf6a07559551c5e28dc46c3d143676571f7704667263f9974d87d6ed3679c15c955178a02e9ed5f69b4bc25c78d9b32e4e SHA512 880093fd75a87993ff8def1db9f6f090edaad43c6dc08564f61b9dbfa8c10df5e6d6a9a9072737d802503b34ba70de7bf7ef5aab2bf055ea68e795ec11a48bdd
 DIST gnome-system-monitor-44.0.tar.xz 1012688 BLAKE2B b9e537ac865c31e0aa05958f067181bf3ef73e4997e818ec4d5d61da65954e910c908901ed55cceac447798d092944a01999fc37f38c7ce51590efedf7f12a85 SHA512 052dcdc927ad53ea601f1f3da6a921fe21b04f69aaa8b75a5096fdcdac5706391180c476b5c87a98012fa7b5dc6c5c43b8c88c30a38b12868c4188020e8ec3b8
 EBUILD gnome-system-monitor-42.0.ebuild 1218 BLAKE2B 0b4d68985ed1f90aa1a73e5cb97835de80700d2b3ae97391a5d4d5e3951cb36a954f12499b98a14206c0a777de93c6967eb6cac5e0a94b18e683dc960d5a8e77 SHA512 1c0de5dd10e5e3bdf794397d9475df7a07fe3cc62462d19cf04358793e55d6d95b7c5785c7a9c681a00318c81676c719085c9b2d139e4bbbadc8af9052d53097
-EBUILD gnome-system-monitor-44.0.ebuild 1219 BLAKE2B 31fc4e52bc4f5ae7b0fc7df5c90129585f654fce70f134e88e88ed501e74867e33d858b90dd3f13eeff48c47e9479ca2ee7b245b3a4d8811f4900e3d75a83ee6 SHA512 1e65438c028b5d2c7cdfaa77fc0bcb507caa0a250576c3c5f1f23696d5f148f7f278f220740ae6119097ca9e353089f51bb03415039616f5e5bce71c193f7b0b
+EBUILD gnome-system-monitor-44.0.ebuild 1218 BLAKE2B f2b717015368e5868d53f5af66f6079c848f282394e4de8c297b0a8b746d2cf3158b61978d81a2ee7acc182c7b390fc4f92e8da9b3be0d0eb3c531b000747bb2 SHA512 54e33b5fc6d27ea37acbc6308b1fedda2dd4cb276bf556e47ecfa785f0608c0240fc2b1ecc3d760297fd40b82f165f9230ca33d7ab855c0ffee77fe08fbe7c16
 MISC metadata.xml 495 BLAKE2B 56ac029a06b0bc1f2b240c372426b6002c411005109f12c166227f3689bf0470326f810bdcfa62d5e34077710156e085d7f933bdcb1b26acbb8670cb46362d94 SHA512 0936f40a28b66e92a2468c926b05000aefb7e55cd724ec24f69e9c5ff517aa4604bbb03899fe104600218617e881e45f72bd0ab9c668313b6545cc931fd6b981
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-44.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-44.0.ebuild
index 559024e0f362..ec9e0206c5ac 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-44.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-44.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46:2