sys-apps/groff: Sync with Gentoo upstream

Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
2026-05-11 15:16:21 +02:00 · 2023-05-04 17:08:09 +05:30 · 2023-05-04 17:08:09 +05:30 · b4d2ccc5f4
commit b4d2ccc5f4
parent 0c2d63101e
6 changed files with 274 additions and 10 deletions
--- a/sdk_container/src/third_party/portage-stable/sys-apps/groff/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/groff/Manifest
@ -1 +1,3 @@
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
+DIST groff-1.23.0.rc3.tar.gz 7347387 BLAKE2B d61ccf18450816abb2436799c3ffac0ce0bc827ad4f262c94e172b0dbaae18593b7562576067e0380ff96cbc40b4fe63382082867659fbc6971cadc81e8dc36d SHA512 bfdc6761e02b698b7d7dac059c14c1f3de94057cda4952aca2fa41da3bd9657daef86bdddc46a392397ccb761f627d1652ce5f4a38890c480fbdb89f9926b662
+DIST groff-1.23.0.rc4.tar.gz 7363288 BLAKE2B 3873cecf16f0ec474a1272396da95fd59437d3886b46e4dce8975f608251a8b23035a059650c0f05f7debbf13922a862be4c5168c25536111448e6c54b7ae987 SHA512 a65cae5d383fdbd7ac72f9bf6087cc290f2f8133b7040c5749d4dfee4427369643065ba4c6eedda1402cd3b9861440fcd6cb954cf3061beae140b18426162428
--- a/sdk_container/src/third_party/portage-stable/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch
@ -0,0 +1,38 @@
+https://savannah.gnu.org/bugs/?63726
+https://git.savannah.gnu.org/cgit/groff.git/commit/?id=10274fb69e517b2c4b10fcd0ba3347e5bd0eefd7
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -4195,8 +4195,7 @@ SUFFIXES = .roff .in .ps .mom .pdf .me .ms .ps .html .txt .texi .dvi \
+ 
+ # tests launched by make check
+ check_SCRIPTS = 
+-TESTS = contrib/gdiffmk/tests/gdiffmk_tests.sh $(am__append_5) \
+-	$(am__append_8)
+TESTS = $(am__append_5) $(am__append_8)
+ AM_TESTS_ENVIRONMENT = \
+   abs_top_srcdir=$(abs_top_srcdir) \
+   abs_top_builddir=$(abs_top_builddir) \
+@@ -9570,13 +9569,6 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
+ 	        am__force_recheck=am--force-recheck \
+ 	        TEST_LOGS="$$log_list"; \
+ 	exit $$?
+-contrib/gdiffmk/tests/gdiffmk_tests.sh.log: contrib/gdiffmk/tests/gdiffmk_tests.sh
+-	@p='contrib/gdiffmk/tests/gdiffmk_tests.sh'; \
+-	b='contrib/gdiffmk/tests/gdiffmk_tests.sh'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ contrib/hdtbl/examples/test-hdtbl.sh.log: contrib/hdtbl/examples/test-hdtbl.sh
+ 	@p='contrib/hdtbl/examples/test-hdtbl.sh'; \
+ 	b='contrib/hdtbl/examples/test-hdtbl.sh'; \
+--- a/contrib/gdiffmk/gdiffmk.am
+++ b/contrib/gdiffmk/gdiffmk.am
+@@ -26,7 +26,6 @@
+ ########################################################################
+ gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk
+ bin_SCRIPTS += gdiffmk
+-TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh
+ man1_MANS += contrib/gdiffmk/gdiffmk.1
+ EXTRA_DIST += \
+   contrib/gdiffmk/gdiffmk.1.man \
--- a/sdk_container/src/third_party/portage-stable/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/groff/groff-1.22.4.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs

 MY_P="${P/_/.}"

@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples uchardet X"

 RDEPEND="
@ -39,6 +39,7 @@ S="${WORKDIR}/${MY_P}"

 PATCHES=(
 	"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
+	"${FILESDIR}"/${PN}-1.22.4-skip-broken-diffutils-test.patch
 )

 src_prepare() {
@ -70,6 +71,9 @@ src_configure() {
 		export gl_cv_func_signbit_gcc=yes
 	fi

+	# Drop in release after 1.22.4! bug #894154
+	append-cxxflags -std=gnu++11
+
 	local myeconfargs=(
 		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
 		$(use_with uchardet)
--- a/sdk_container/src/third_party/portage-stable/sys-apps/groff/groff-1.23.0_rc3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/groff/groff-1.23.0_rc3.ebuild
@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="${P/_/.}"
+DESCRIPTION="Text formatter used for man pages"
+HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
+
+if [[ ${PV} == *_rc* ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples uchardet X"
+
+RDEPEND="
+	uchardet? ( app-i18n/uchardet )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/texinfo
+"
+
+DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
+
+PATCHES=(
+	# bug #16108, bug #17580, bug #121502
+	"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch
+)
+
+src_prepare() {
+	default
+
+	# Honor Gentoo's docdir
+	sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \
+		Makefile.in \
+		|| die "failed to modify Makefile.in"
+
+	local pfx=$(usex prefix ' Prefix' '')
+	cat <<-EOF >> tmac/mdoc.local || die
+	.ds volume-operating-system Gentoo${pfx}
+	.ds operating-system Gentoo${pfx}/${KERNEL}
+	.ds default-operating-system Gentoo${pfx}/${KERNEL}
+	EOF
+
+	# 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
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-appdefdir="${EPREFIX}"/usr/share/X11/app-defaults
+		$(use_with uchardet)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	local -a CROSS_ARGS
+	tc-is-cross-compiler && CROSS_ARGS+=(
+		GROFFBIN="$(type -P groff)"
+		TROFFBIN="$(type -P troff)"
+		GROFF_BIN_DIR=
+		GROFF_BIN_PATH=
+	)
+
+	emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}"
+}
+
+src_install() {
+	default
+
+	# The following links are required for man, bug #123674
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+
+	if ! use examples ; then
+		# The pdf files might not be generated if ghostscript is unavailable, bug #602020
+		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
+		if [[ -e ${pdf} ]] ; then
+			# Keep mom-pdf.pdf since it's more of a manual than an example
+			# bug #454196 and bug #516732
+			mv "${pdf}" "${ED}/usr/share/doc/${PF}/pdf/" || die
+		fi
+		rm -rf "${ED}/usr/share/doc/${PF}/examples"
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/sys-apps/groff/groff-1.23.0_rc4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/groff/groff-1.23.0_rc4.ebuild
@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="${P/_/.}"
+DESCRIPTION="Text formatter used for man pages"
+HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
+
+if [[ ${PV} == *_rc* ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples uchardet X"
+
+RDEPEND="
+	uchardet? ( app-i18n/uchardet )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/texinfo
+"
+
+DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
+
+PATCHES=(
+	# bug #16108, bug #17580, bug #121502
+	"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch
+)
+
+src_prepare() {
+	default
+
+	# Honor Gentoo's docdir
+	sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \
+		Makefile.in \
+		|| die "failed to modify Makefile.in"
+
+	local pfx=$(usex prefix ' Prefix' '')
+	cat <<-EOF >> tmac/mdoc.local || die
+	.ds volume-operating-system Gentoo${pfx}
+	.ds operating-system Gentoo${pfx}/${KERNEL}
+	.ds default-operating-system Gentoo${pfx}/${KERNEL}
+	EOF
+
+	# 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
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-appdefdir="${EPREFIX}"/usr/share/X11/app-defaults
+		$(use_with uchardet)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	local -a CROSS_ARGS
+	tc-is-cross-compiler && CROSS_ARGS+=(
+		GROFFBIN="$(type -P groff)"
+		TROFFBIN="$(type -P troff)"
+		GROFF_BIN_DIR=
+		GROFF_BIN_PATH=
+	)
+
+	emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}"
+}
+
+src_install() {
+	default
+
+	# The following links are required for man, bug #123674
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+
+	if ! use examples ; then
+		# The pdf files might not be generated if ghostscript is unavailable, bug #602020
+		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
+		if [[ -e ${pdf} ]] ; then
+			# Keep mom-pdf.pdf since it's more of a manual than an example
+			# bug #454196 and bug #516732
+			mv "${pdf}" "${ED}/usr/share/doc/${PF}/pdf/" || die
+		fi
+		rm -rf "${ED}/usr/share/doc/${PF}/examples"
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/sys-apps/groff/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/groff/metadata.xml
@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
-</use>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <use>
+    <flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnu:groff</remote-id>
+    <remote-id type="savannah">groff</remote-id>
+  </upstream>
 </pkgmetadata>