From 6371dca10b4767737fe3926b25215fc99e734b68 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 21 Feb 2023 00:29:36 +0000 Subject: sys-apps/groff: add 1.23.0_rc3, drop 1.23.0_rc2 Signed-off-by: Sam James --- sys-apps/groff/Manifest | 2 +- ...off-1.23.0_rc2-skip-broken-diffutils-test.patch | 38 ------- sys-apps/groff/groff-1.23.0_rc2.ebuild | 109 --------------------- sys-apps/groff/groff-1.23.0_rc3.ebuild | 108 ++++++++++++++++++++ 4 files changed, 109 insertions(+), 148 deletions(-) delete mode 100644 sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch delete mode 100644 sys-apps/groff/groff-1.23.0_rc2.ebuild create mode 100644 sys-apps/groff/groff-1.23.0_rc3.ebuild diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest index 0c2d3d45c64e..6b3da3030a5b 100644 --- a/sys-apps/groff/Manifest +++ b/sys-apps/groff/Manifest @@ -1,2 +1,2 @@ DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d -DIST groff-1.23.0.rc2.tar.gz 7330614 BLAKE2B 5f9ffd19a6742fae0162c956e8c736bd5f72df5ef2a53a274957bd6caa40b40d73783acee319ff7bcb12942fae2c420d2f7a267bb0cdcb0bc2527b28cd17f9fd SHA512 dfa3c9fa6a76a6bd1496e9e0e4145b7d694383fd3b339a065b7aa63c9507aea331ef90e1ef98cf3eae81b24cb177ee7a9a8be2c91e30296ffe4da0c68aa3e793 +DIST groff-1.23.0.rc3.tar.gz 7347387 BLAKE2B d61ccf18450816abb2436799c3ffac0ce0bc827ad4f262c94e172b0dbaae18593b7562576067e0380ff96cbc40b4fe63382082867659fbc6971cadc81e8dc36d SHA512 bfdc6761e02b698b7d7dac059c14c1f3de94057cda4952aca2fa41da3bd9657daef86bdddc46a392397ccb761f627d1652ce5f4a38890c480fbdb89f9926b662 diff --git a/sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch b/sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch deleted file mode 100644 index f11bc56382b2..000000000000 --- a/sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://savannah.gnu.org/bugs/?63726 -https://git.savannah.gnu.org/cgit/groff.git/commit/?id=10274fb69e517b2c4b10fcd0ba3347e5bd0eefd7 ---- a/Makefile.in -+++ b/Makefile.in -@@ -4449,8 +4449,7 @@ SUFFIXES = .roff .in .ps .mom .pdf .me.in .me .man - - # tests launched by make check - check_SCRIPTS = --TESTS = contrib/gdiffmk/tests/gdiffmk_tests.sh $(hdtbl_TESTS) \ -- $(mm_TESTS) $(am__append_14) $(rfc1345_TESTS) \ -+TESTS = $(hdtbl_TESTS) $(mm_TESTS) $(am__append_14) $(rfc1345_TESTS) \ - $(font_devpdf_TESTS) $(grotty_TESTS) $(eqn_TESTS) \ - $(preconv_TESTS) $(refer_TESTS) $(tbl_TESTS) $(groff_TESTS) \ - $(nroff_TESTS) $(grog_TESTS) $(tmac_TESTS) -@@ -10558,13 +10557,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 -@@ -22,7 +22,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 \ diff --git a/sys-apps/groff/groff-1.23.0_rc2.ebuild b/sys-apps/groff/groff-1.23.0_rc2.ebuild deleted file mode 100644 index ac8ba6b2371f..000000000000 --- a/sys-apps/groff/groff-1.23.0_rc2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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 ~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 - "${FILESDIR}"/${PN}-1.23.0_rc2-skip-broken-diffutils-test.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 -} diff --git a/sys-apps/groff/groff-1.23.0_rc3.ebuild b/sys-apps/groff/groff-1.23.0_rc3.ebuild new file mode 100644 index 000000000000..0d90fdb18750 --- /dev/null +++ b/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 ~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 +} -- cgit v1.2.3-65-gdbad