[gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/

["Sam James" <sam@gentoo.org>]

commit:     882ac9b1db71efea7e03c41c12b21278c50461ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 00:54:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 00:57:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882ac9b1

sys-apps/groff: skip broken test w/ diffutils-3.9

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/groff/groff-1.22.4.ebuild     | 9 ++++++++-
 sys-apps/groff/groff-1.23.0_rc2.ebuild | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 958daba55415..81ac61ff2940 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,13 @@ src_prepare() {
 	.ds default-operating-system Gentoo${pfx}/${KERNEL}
 	EOF
 
+	# https://savannah.gnu.org/bugs/?63726
+	sed -i \
+		-e '/TESTS += contrib\/gdiffmk\/tests\/gdiffmk_tests.sh/d' \
+		-e '/\tcontrib\/gdiffmk\/tests\/gdiffmk_tests.sh \\/d' \
+		contrib/gdiffmk/tests/gdiffmk_tests.sh \
+		contrib/gdiffmk/gdiffmk.am || die
+
 	# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
 	# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
 	sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die

diff --git a/sys-apps/groff/groff-1.23.0_rc2.ebuild b/sys-apps/groff/groff-1.23.0_rc2.ebuild
index 0d90fdb18750..7571ab653986 100644
--- a/sys-apps/groff/groff-1.23.0_rc2.ebuild
+++ b/sys-apps/groff/groff-1.23.0_rc2.ebuild
@@ -61,6 +61,13 @@ src_prepare() {
 	.ds default-operating-system Gentoo${pfx}/${KERNEL}
 	EOF
 
+	# https://savannah.gnu.org/bugs/?63726
+	sed -i \
+		-e '/TESTS += contrib\/gdiffmk\/tests\/gdiffmk_tests.sh/d' \
+		-e '/\tcontrib\/gdiffmk\/tests\/gdiffmk_tests.sh \\/d' \
+		contrib/gdiffmk/tests/gdiffmk_tests.sh \
+		contrib/gdiffmk/gdiffmk.am || die
+
 	# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
 	# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
 	sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die