6 files changed, 42 insertions, 5 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 248863f8b31b..979051bdfbc6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index f95b5d4e464e..8432aa2e43b2 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,4 @@
+AUX diffutils-3.9-make-4.4-test-color.patch 1021 BLAKE2B 54ab07967f48c230292590cfd668ea4f6e6ea0a53850705e6dd9c62da626d5a905946314dfcbbd18c6a34b16b564113cd0c2cd0a3e84e652d8cf1037030df2f3 SHA512 9d6e3463dd29684b58bdd8e2585c0ea597a66cb60f8068f1c06ca7c676b12a51a4d691aa7d31afcedeb9612038560eca40cdf6bd6715e7789e5efd9e72b0c5f3
 AUX loong-fix-build.patch 859 BLAKE2B 11e48762d8112d3c56947d0f9db196d84c142775d5abab0dc1a6593a4f0eeecbf7cbf72d589a0db1623d3a4f85559bc95f17260b94041d6eb625401e784852c3 SHA512 1d87a407196ebbfd22b1b14504a5ec61eff9cc8a4d11a4f7d15c1a7aea1ff338c9bc18e6298ea6e29898a0753201cda6bb90023a5dda817e78a0980e846a68d3
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
@@ -5,5 +6,5 @@ DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c1
 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
 DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed
 EBUILD diffutils-3.8.ebuild 1673 BLAKE2B e1af83d87e166a3d60f87ed13870240f9216ff72ffb99508780c7020fa466da05b2e3b8eeaaf8dbf244ee873059a004273bfb2e2ab6ddb4cf4f0e16542497f3b SHA512 17925dde918dc25fde6a42891b45c7a8f242aa5a81bf67974b01d03785f16251496912fb5ccfe0927cde4908432cf36532341d7b11f16b2ae5033169f466018f
-EBUILD diffutils-3.9.ebuild 1676 BLAKE2B be338eac3966c65685d30be4362ac021c1fbae4a52d8af01d9cdb301cb0e8f7b624ec6f98fdeff74e4e2ea5f37daae272f16aa43b2bbd2002c97fa576e08bbaa SHA512 75cafd5405be701646b5c9e6156d8bb3360c4fe37d6497b0171b7e41079c20e494aed21a0295561c019da173a6203734983d5b2d491385ffcdb811db778361a7
+EBUILD diffutils-3.9.ebuild 1738 BLAKE2B e77e1914a52c8ea0ba462abd13483525008028f8db677d0fa054c563e115900f7fcd6b4736927aa9d8192b15ed65e43bcd183651e373cbc469afa327d8bccaa9 SHA512 62ed34d6e9c18ba2e0831ad05cc48df9f0c787cf7e111a61b6ef5b781faa776645f53356d0b8c89a10df7a6c91e0fb95b467b8a5fc09d890080e8f7dc7ada194
 MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25
diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild b/sys-apps/diffutils/diffutils-3.9.ebuild
index ebbd0424d186..acce50bad293 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -27,8 +27,14 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls static"
 
-BDEPEND="nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-diffutils )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-diffutils )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make-4.4-test-color.patch
+)
 
 src_configure() {
 	use static && append-ldflags -static
diff --git a/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch b/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch
new file mode 100644
index 000000000000..01f6aeedc956
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/879891
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59905
+https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=89f3daeaaf021a77177daec8666bcd80ec476833
+
+From 89f3daeaaf021a77177daec8666bcd80ec476833 Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@fb.com>
+Date: Mon, 16 Jan 2023 15:48:10 -0800
+Subject: tests: accommodate newer GNU make's SIGPIPE-ignore
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* tests/colors: Allow an exit code of not just 141 (SIGPIPE),
+but also "error": 2.
+Reported by Tomasz Kłoczko in http://bugs.gnu.org/59905.
+--- a/tests/colors
++++ b/tests/colors
+@@ -128,6 +128,9 @@ printf '%1000000s-a' > a
+ printf '%1000000s-b' > b
+ head -c 10 < fifo > /dev/null &
+ diff --color=always ---presume-output-tty a b > fifo
+-test $? = 141 || fail=1
++
++# Depending on version of GNU make (4.3.92-4.4 set SIGPIPE to "ignore"),
++# either of these is acceptable.
++case $? in 2|141) ;; *) fail=1 ;; esac
+ 
+ Exit $fail
+-- 
+cgit v1.1
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index fa26f2b5081c..d15a6f59a042 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -7,6 +7,6 @@ DIST grep-3.8.11-908f.tar.xz.sig 833 BLAKE2B 460e7eb98f803995de43e919cae2d01e261
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
 EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
-EBUILD grep-3.8-r1.ebuild 2864 BLAKE2B 73886083ae0bd870df99d4ff7352e6cd46746910efb52b6dc7e76fe7d11ca3c7c91f31da396caef5d24c370b3e37c5dff0d2d352d0380d01aa61519ba71dad6a SHA512 48bdeeac5adae34b260d8e5203e56c0750980327b099197c496c8734d4038fb9826d7a805e11b3537e1ccfbbd4abf45d12fac3ecb7136856bf7cdde7bcca5db9
+EBUILD grep-3.8-r1.ebuild 2863 BLAKE2B bd8defb445ed2291840d1511648c1fc9c0d3a76c43d4a9a433baa063ec4b841f5f901293e7a48556728750fb99d74f118e9dce858f1c1d71da13555e853a5301 SHA512 0ab0ccf314cbb3b2fd7b2e877e8ce9afdd4e7ff4dd50d45df42ea79823c17a1bab83b59a055d4e477ab1b64a69f1686eebf312f814677e347378b638b1484851
 EBUILD grep-3.8_p20221230.ebuild 2870 BLAKE2B 95027ad8262acaf8a2771f3ea0644cbc65380d511e3a00015b1f026747a3926812cf55000c30e6ab7f3a55d5ba6ae4cb88da66456cd88575fe8f58e8b35625cd SHA512 5bd00afd540781a082c77bf8758a3a5ec6a98fc6dead8bc062257955e3df4b2dd8ec85d5a8e6d6b1530b0dc821e331463079245411b97e06f06b1579bbec54a5
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.8-r1.ebuild b/sys-apps/grep/grep-3.8-r1.ebuild
index 478a7ab38aff..6544ccdddfb0 100644
--- a/sys-apps/grep/grep-3.8-r1.ebuild
+++ b/sys-apps/grep/grep-3.8-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"