7 files changed, 39 insertions, 4 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 03b14f22cc3b..08ad179da088 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/remake/Manifest b/dev-build/remake/Manifest
index 232d3a4dd439..e0fb1f98805b 100644
--- a/dev-build/remake/Manifest
+++ b/dev-build/remake/Manifest
@@ -1,7 +1,8 @@
 AUX remake-4.3.1.1.5-fno-common.patch 2988 BLAKE2B c9d6a4adef35cc51a82b5e625771bede0a13cbca4dfe40483497a9a2bfa6ac0f66c47023ec2d75075cd7c7abde7ccf1bb5eba315bad052ab3d7ac6c263c6ac09 SHA512 509096e2cfa1daefc1a7fd9b69355f21c6fcaf2adf4572bd6742ebb61b5d7ac65c0d8bbc0576c6bb2b3e895bac97d51f1da3008ae15b50e487aa09fe118d8b7a
+AUX remake-4.3.1.1.6-configure.patch 730 BLAKE2B 36bd4bfda1b458c877319d67c4bc2a6061ea4c93da55f3e7c24affe75bc14befdced52df14ab13ab878674b8de0fdeb72c44667bb6dbf329bf4826283758ad76 SHA512 033862daf372ea726a365883c2dfd972573ceb961198438460615f263f64798b8e3222f200a6fb5f3f15cdbcebe0d5fddf79d8a35df515e45250583154d6e1aa
 DIST remake-4.3+dbg-1.5.tar.gz 2546056 BLAKE2B c5c1b254d0533e0d9787d408f79e8aba93cab5185de76519dabef7ddca5c9d2021671099f9ff80df345732552f859ce31d1131b89cd56fb185bae4cee676b412 SHA512 90aa9674ed5d88b72fda5a99a103d0b1a643d10b18c1de1186478b026f6b4da73628bff75a180df880157b5cbfff1bfd782f4ee81880e0635d79113fcc0f7497
 DIST remake-4.3+dbg-1.6.tar.gz 2596911 BLAKE2B 4d4e90bc9b6e0c36eea3b8b2c419ea1af8e37b3dc575969fe853f683da983e0ea73a0a3668adf448dfdf4b2dffc079f197fcb66139cac382df551cf34ea4d813 SHA512 d4f0ed0afa0bebf49e0cf6ef3fcfb0915fd457477424b6ffb5f06c6d2faf8d79bbdc9119a736c24c0787b23ceaeccf072e03a654dc01d05c08c88e030ae33539
 EBUILD remake-4.3.1.1.5.ebuild 1078 BLAKE2B e057c03f63ab0a2592bf1d93028b0816ff1c3e630e22913a878000569af6883e702a1b3f15b7b9c18ce27d63836dda13f0114c36a1d5ab642eb32ed057f37ae7 SHA512 85fc4f7ba72007ddac00aa6708a14c9315cbbbb1e361121887eb520fd6c0a92c60eedc0a758fd0f724b0b4e77b280b89d556b6806d3be5783ab7bdf969da8760
-EBUILD remake-4.3.1.1.6-r100.ebuild 1322 BLAKE2B 71240cf95cff72322a3fdd1a64c70ea6b062995cb8349a856b876f27e8691cee8c5f73d13ac89dffbf2f6c741efe1a9dfc370cb1e6989f076f2a3c4435590179 SHA512 f2280104077415b8acf1a22d27969197b8eeb8244e839b33935e7cce726573b944f94184fbd696ca37f1d3dbcbb4e73ae7a2973bd2edb93f5e274a06cf844ef9
-EBUILD remake-4.3.1.1.6.ebuild 1136 BLAKE2B 6ebbcb5acf0f6f3f14de6daa56235caac9b310f3555f48fde69fb628ca65031b2bc987a1c9cfeac08d0a8b073df4660bd337a7b46ea59cf77e6bb7b166b9dacd SHA512 8630448c01245689d606007305ecf713c35fc67057f5b726f06c029bdb454483366019e9ce5752775b6a63a3a0e096469d7e5b6e735a72b560c2fcde1845e3e6
+EBUILD remake-4.3.1.1.6-r100.ebuild 1370 BLAKE2B 67a5120d3447a2fe5af3476eca7fe630047bf532d1bfe52882586d0bca7c1a08f78a31eb3bd382af91ab6aec238c67f92b3b2cec84557582f51b8b03f22b2d3e SHA512 d7bcee49e1bf79881afe56d4f3a3e08b8fcffc736a2a7764a2940bbb8ac6c3350f850bd2e21a4f18559bf89262bfe51b574a0510f16dd83dabf2b7eb68e08001
+EBUILD remake-4.3.1.1.6.ebuild 1184 BLAKE2B 13d5ce7df3a8bfa5133c6271f9f03c0db227ebcd511cb8efa5a5e9627a392af05c50cbff4d2e77cd0138055b402688ce44a376307354a5aef8a2e929e193cc74 SHA512 bbd93c9625419292b3818e7b9c75eaadeb0be5d2c86c96fe265a59d0a8b9d7d679390d177f26a72b529aa6e70d3da72e26ab768638e80d5dbfe8d41a806e6b64
 MISC metadata.xml 296 BLAKE2B e3146e98a4240740fa3d3089a7e15fa9833e60ec13e6f158b5db2d5ac6f59f98bd5d1c34554d87759eabf4d42376bc3cbfeaab9c5f6e8faed40520cb1e82804d SHA512 e5d3192b7c2ec0bd9e81b3c83449addd1e6cf240637c0ac2dbacadb0d0896d46691b55ad4337a90f35b79649366db012698932b71b0bfd2670eac50d84066d89
diff --git a/dev-build/remake/files/remake-4.3.1.1.6-configure.patch b/dev-build/remake/files/remake-4.3.1.1.6-configure.patch
new file mode 100644
index 000000000000..4aa0927a9b68
--- /dev/null
+++ b/dev-build/remake/files/remake-4.3.1.1.6-configure.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/926824
+Patch from upstream, configure regenerated
+
+commit 371ed0ac8bf3c1d25775c8b025229f490363f4ab
+Author: rocky <rocky@gnu.org>
+Date:   Sun, 26 Mar 2023 14:35:39 -0400
+
+    Fix some small typos
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -434,7 +434,7 @@ AC_ARG_WITH([profiler_resolution],
+   [prof_res="1000"])
+ 
+ AS_IF([test "x$prof_res" = "xno"],
+-      [],_
++      [],
+       [AC_DEFINE_UNQUOTED([PROFILER_MIN_RES],
+                           [$prof_res],
+                           [Minimum profiler resolution in nanoseconds])])
+--- a/configure
++++ b/configure
+@@ -18444,7 +18444,6 @@
+ if test "x$prof_res" = "xno"; then :
+ 
+ else
+-  _
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PROFILER_MIN_RES $prof_res
diff --git a/dev-build/remake/remake-4.3.1.1.6-r100.ebuild b/dev-build/remake/remake-4.3.1.1.6-r100.ebuild
index 7a08d41b8542..498d47dd04a8 100644
--- a/dev-build/remake/remake-4.3.1.1.6-r100.ebuild
+++ b/dev-build/remake/remake-4.3.1.1.6-r100.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-configure.patch )
+
 pkg_setup() {
 	use guile && guile-single_pkg_setup
 }
diff --git a/dev-build/remake/remake-4.3.1.1.6.ebuild b/dev-build/remake/remake-4.3.1.1.6.ebuild
index 02fba9e7b74b..667d085e5cbf 100644
--- a/dev-build/remake/remake-4.3.1.1.6.ebuild
+++ b/dev-build/remake/remake-4.3.1.1.6.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
 "
 BDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
 
+PATCHES=( "${FILESDIR}"/${P}-configure.patch )
+
 src_configure() {
 	# Fixed in upstream make/gnulib, just not yet propagated into remake (bug #863827)
 	filter-lto
diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index c5f6b860e9bd..1ad918b38d7e 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -14,5 +14,5 @@ DIST scons-4.8.1-user.pdf 3093300 BLAKE2B 84752a76fba302ab6ae1bbd6c960680e94144f
 DIST scons-4.8.1.gh.tar.gz 5931602 BLAKE2B 702252622bc9dd97417cb3db09caebd8732cabe3627e8539475f2177a15bf9cfa8dae9863c462796a6ebf079db2c1609089f1a6d1a0e0ffa220cc69f905beff1 SHA512 b9f39634b36876fa15e2db968a38693745ce3f0f14e838e97f69e2a6762d8f78c04e52843e2ce50900000833854c90ee2bd9d3d84bb48d9acfbf41f94af02775
 EBUILD scons-4.7.0.ebuild 4577 BLAKE2B 7e1f4a4d77a918d3a098f403a3b94b593aab0f384cc5a3db5cfbc628ce387ed251f5510f2dd5c91b9dddbe29cb01c56a9cb6217606ad8aa7b1aea5fcf1e27802 SHA512 42c883e2ed245889f33e0634fe4e0e298a48927449404ab27b7c9bab54dca8362408fed96f44fcf8633d38ebda3e8990dc4ea608cc6747f14daf88480ee0c382
 EBUILD scons-4.8.0.ebuild 4551 BLAKE2B 495129a048b8b00cfe87172ebc77c9bf45de5dd871056175859f08f5d2c321434630165a74637e49b45e218339bab408dd0679a09a5be7aee3d59657bdc8fc3e SHA512 da81cb492f946738f45d6f6c9aaf72838c0c2cafadca50a475b9a9f8d58678593c513aab13dc743c42719f771426bba9fa7c28b2e699c82148b4e2095515b0f7
-EBUILD scons-4.8.1.ebuild 4557 BLAKE2B 41ffe4b64505b5a7c35e111db917485bc9032153f730eadb33408482699fab9213e52f4c224cd02182f67a242c33b6f8f4d159f14a5c659ebb3b52469b642f29 SHA512 486f84ac02815f6255e042b54569bf4c450e4bbb3b2280056efe3d2f317529d2e72d4a17548906274eb63a938d4204e8d79deacb42171e7e93d4a8b80fc62bc5
+EBUILD scons-4.8.1.ebuild 4551 BLAKE2B 77931d5b04375f8cc21413dd7fdb00b5bb403788fddfc5030f3a27792cbf34ec66cc2ae19972fb1eb6cdf5a5bfafbb82d993c389e5a14fffbf3a41f971f7f4c2 SHA512 a8ad520b92619dc5f921ddc62d8e89c247a6202389e4e52661f728129b5c1ffbca744ccc2db3fabfec1779dfafca260aff7563efda79ce4446f4dffd568295d2
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-build/scons/scons-4.8.1.ebuild b/dev-build/scons/scons-4.8.1.ebuild
index 8c74501b41aa..0beb8550794a 100644
--- a/dev-build/scons/scons-4.8.1.ebuild
+++ b/dev-build/scons/scons-4.8.1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"