* [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/
@ 2018-09-27 13:51 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-09-27 13:51 UTC (permalink / raw
To: gentoo-commits
commit: 37267a0171bfbc04b8abf2334bd7d203bbc301fc
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 13:51:35 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 13:51:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37267a01
sys-apps/groff: Bump to version 1.22.4_rc2
Package-Manager: Portage-2.3.50, Repoman-2.3.11
sys-apps/groff/Manifest | 1 +
.../files/groff-1.19.2-man-unicode-dashes.patch | 8 +-
sys-apps/groff/groff-1.22.4_rc2.ebuild | 97 ++++++++++++++++++++++
3 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index bd92f6278b4..f650e00c674 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,3 +1,4 @@
DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
+DIST groff-1.22.4.rc2.tar.gz 4118558 BLAKE2B db7b9a667a85eeea34bfa4cf53de77f3ca6bbc541c8130701b011c66b93df4d4f16e23d5e0dae18470daeb0393c980f0e0fc22fd3bb9d00ebf77b2c3ba9a1dd7 SHA512 831a3ab55e8f37626b3f51d0cd5f461449b977a4ec64a93f2485aff5ab97947781dfbdd7830439d139c5f2c46455534d733d722047290f76eedf2d29d4f70138
diff --git a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
index d85a8330d27..276460f10b6 100644
--- a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
+++ b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
@@ -4,8 +4,8 @@ http://bugs.gentoo.org/16108
http://bugs.gentoo.org/17580
http://bugs.gentoo.org/121502
---- tmac/man.local
-+++ tmac/man.local
+--- a/tmac/man.local
++++ b/tmac/man.local
@@ -1,2 +1,6 @@
.\" This file is loaded after an-old.tmac.
.\" Put any local modifications to an-old.tmac here.
@@ -13,8 +13,8 @@ http://bugs.gentoo.org/121502
+. char \- \N'45'
+. char - \N'45'
+.\}
---- tmac/mdoc.local
-+++ tmac/mdoc.local
+--- a/tmac/mdoc.local
++++ b/tmac/mdoc.local
@@ -1,2 +1,6 @@
.\" This file is loaded after doc.tmac.
.\" Put any local modifications to doc.tmac here.
diff --git a/sys-apps/groff/groff-1.22.4_rc2.ebuild b/sys-apps/groff/groff-1.22.4_rc2.ebuild
new file mode 100644
index 00000000000..ad57e91b4b4
--- /dev/null
+++ b/sys-apps/groff/groff-1.22.4_rc2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${P/_/.}"
+
+DESCRIPTION="Text formatter used for man pages"
+HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
+SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
+ mirror://gnu-alpha/groff/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples X"
+
+RDEPEND="
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXaw
+ x11-libs/libSM
+ x11-libs/libICE
+ )"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
+)
+
+src_prepare() {
+ default
+
+ # Make sure we can cross-compile this puppy
+ if tc-is-cross-compiler ; then
+ sed -i \
+ -e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
+ -e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
+ -e '/^GROFF_BIN_PATH=/s:=.*:=:' \
+ -e '/^GROFF_BIN_DIR=/s:=.*:=:' \
+ contrib/*/Makefile.sub \
+ doc/Makefile.in \
+ doc/Makefile.sub || die "cross-compile sed failed"
+ fi
+
+ local pfx=$(usex prefix ' Prefix' '')
+ cat <<-EOF >> tmac/mdoc.local
+ .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-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_with X x)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ # The following links are required for man #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. #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. #454196 #516732
+ mv "${pdf}" "${ED%/}"/usr/share/doc/${PF}/pdf/ || die
+ fi
+ rm -rf "${ED%/}"/usr/share/doc/${PF}/examples
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/
@ 2020-07-21 7:10 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-07-21 7:10 UTC (permalink / raw
To: gentoo-commits
commit: f5a6ef618eb3e803f6355fb02948389fc977f843
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 18:34:59 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 07:09:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a6ef61
sys-apps/groff: Drop 1.22.2 and 1.22.3
Closes: https://bugs.gentoo.org/704420
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-apps/groff/Manifest | 3 -
.../groff/files/groff-1.22.2-parallel-mom.patch | 96 ----------------------
.../groff/files/groff-1.22.3-parallel-mom.patch | 11 ---
sys-apps/groff/groff-1.22.2.ebuild | 95 ---------------------
sys-apps/groff/groff-1.22.3.ebuild | 86 -------------------
5 files changed, 291 deletions(-)
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 548076ad202..67a1953b5d4 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1 @@
-DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
-DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
-DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
diff --git a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch
deleted file mode 100644
index 7cf3c22295d..00000000000
--- a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 9f3af719383ab525c86ee0f514e268ef8494330a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 6 Dec 2013 20:40:10 -0500
-Subject: [PATCH] fix parallel build w/gropdf and mom examples
-
-The contrib/mom/examples/ directory uses the helper script from
-src/devices/gropdf/. Currently though, parallel builds might fail
-like so:
-
-...
-make[2]: Entering directory `.../groff-1.22.2/contrib/mom'
-GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/letter.mom >examples/letter.pdf
-GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/mom-pdf.mom >examples/mom-pdf.pdf
-/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory
-make[2]: *** [examples/letter.pdf] Error 127
-/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory
-make[2]: *** [examples/mom-pdf.pdf] Error 127
-make[2]: Leaving directory `.../groff-1.22.2/contrib/mom'
-make[1]: *** [contrib/mom] Error 2
-...
-make[2]: Entering directory `.../groff-1.22.2/src/devices/gropdf'
-sed -f .../groff-1.22.2/arch/misc/shdeps.sed \
- -e "s|@VERSION@|1.22.2|" \
- -e "s|@PERLPATH@|/usr/bin/perl|" ./pdfmom.pl >pdfmom
-
-The top level makefile tries to account for this in general with OTHERDIRS,
-but looks like src/devices/gropdf/ was added to this variable (which holds
-contrib/mom/ too) because gropdf installs a shell script, and the other
-prog vars require it to be a dir of things to compile.
-
-Declare a new prog var for holding shell scripts.
-
-URL: http://crbug.com/324116
-URL: https://bugs.gentoo.org/487276
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-2013-12-06 Mike Frysinger <vapier@gentoo.org>
-
- * Makefile.in (SHPROGDIRS): Declare.
- (PROGDIRS): Add $(SHPROGDIRS).
- (OTHERDIRS): Delete src/devices/gropdf.
- ($(SHPROGDIRS):): Add to existing rule.
- ($(OTHERDIRS):): Depend on $(SHPROGDIRS).
----
- Makefile.in | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index a794de7..8e478af 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -602,12 +602,15 @@ CCPROGDIRS=\
- src/utils/addftinfo
- CPROGDIRS=\
- src/utils/pfbtops
-+SHPROGDIRS=\
-+ src/devices/gropdf
- PROGDEPDIRS=\
- arch/misc
- PROGDIRS=\
- $(PROGDEPDIRS) \
- $(CCPROGDIRS) \
- $(CPROGDIRS) \
-+ $(SHPROGDIRS) \
- $(XPROGDIRS)
- DEVDIRS=\
- font/devps \
-@@ -637,7 +640,6 @@ OTHERDIRS=\
- contrib/glilypond \
- contrib/hdtbl \
- contrib/pdfmark \
-- src/devices/gropdf \
- font/devpdf \
- contrib/mom \
- contrib/gdiffmk
-@@ -778,7 +780,7 @@ $(CCPROGDIRS): FORCE $(LIBDIRS)
- -f $(top_srcdir)/Makefile.ccpg \
- -f Makefile.dep $(do)
-
--$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
-+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
- @$(ENVSETUP); \
- if test $(srcdir) = .; then \
- srcdir=.; \
-@@ -809,7 +811,7 @@ $(GNULIBDIRS): FORCE
- $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
- esac
-
--$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
-+$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS)
-
- $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
- @$(ENVSETUP); \
---
-1.8.4.3
-
diff --git a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch
deleted file mode 100644
index 10661ac27f2..00000000000
--- a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- groff-1.22.3/Makefile.in
-+++ groff-1.22.3/Makefile.in
-@@ -864,7 +864,7 @@
- -f $(top_srcdir)/Makefile.ccpg \
- -f Makefile.dep $(do)
-
--$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE \
-+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE \
- $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
- @$(ENVSETUP); \
- if test $(srcdir) = .; then \
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
deleted file mode 100644
index e3b6ed2c806..00000000000
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Text formatter used for man pages"
-HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
-SRC_URI="mirror://gnu/groff/${P}.tar.gz
- l10n_ja? ( https://dev.gentoo.org/~naota/patch/${PN}-1.22.1-japanese.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples X l10n_ja"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXmu
- x11-libs/libXaw
- x11-libs/libSM
- x11-libs/libICE
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- l10n_ja? ( virtual/yacc )"
-
-DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION TODO VERSION )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
- epatch "${FILESDIR}"/${PN}-1.22.2-parallel-mom.patch #487276
-
- # Make sure we can cross-compile this puppy
- if tc-is-cross-compiler ; then
- sed -i \
- -e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
- -e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
- -e '/^GROFF_BIN_PATH=/s:=.*:=:' \
- -e '/^GROFF_BIN_DIR=/s:=.*:=:' \
- contrib/*/Makefile.sub \
- doc/Makefile.in \
- doc/Makefile.sub || die "cross-compile sed failed"
- fi
-
- local pfx=$(usex prefix ' Prefix' '')
- cat <<-EOF >> tmac/mdoc.local
- .ds volume-operating-system Gentoo${pfx}
- .ds operating-system Gentoo${pfx}/${KERNEL}
- .ds default-operating-system Gentoo${pfx}/${KERNEL}
- EOF
-
- if use l10n_ja ; then
- epatch "${WORKDIR}"/${PN}-1.22.1-japanese.patch #255292 #350534 #450796
- eautoconf
- eautoheader
- fi
-
- # 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() {
- econf \
- --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_with X x) \
- $(usex l10n_ja '--enable-japanese' '')
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- # The following links are required for man #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. #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. #454196 #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.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
deleted file mode 100644
index 0e33f70c4c4..00000000000
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Text formatter used for man pages"
-HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
-SRC_URI="mirror://gnu/groff/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples X"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXmu
- x11-libs/libXaw
- x11-libs/libSM
- x11-libs/libICE
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION TODO VERSION )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
- epatch "${FILESDIR}"/${PN}-1.22.3-parallel-mom.patch #487276
-
- # Make sure we can cross-compile this puppy
- if tc-is-cross-compiler ; then
- sed -i \
- -e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
- -e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
- -e '/^GROFF_BIN_PATH=/s:=.*:=:' \
- -e '/^GROFF_BIN_DIR=/s:=.*:=:' \
- contrib/*/Makefile.sub \
- doc/Makefile.in \
- doc/Makefile.sub || die "cross-compile sed failed"
- fi
-
- local pfx=$(usex prefix ' Prefix' '')
- cat <<-EOF >> tmac/mdoc.local
- .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() {
- econf \
- --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_with X x)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- # The following links are required for man #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. #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. #454196 #516732
- mv "${pdf}" "${ED}"/usr/share/doc/${PF}/pdf/ || die
- fi
- rm -rf "${ED}"/usr/share/doc/${PF}/examples
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/
@ 2023-02-09 18:07 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-02-09 18:07 UTC (permalink / raw
To: gentoo-commits
commit: 2e23a14c7fb085f1004612e39cec7cbac96d2119
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 18:05:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 18:07:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e23a14c
sys-apps/groff: use patch for disabling broken diffutils tests
Avoid maintainer mode.
Fixes: 882ac9b1db71efea7e03c41c12b21278c50461ea
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../groff-1.22.4-skip-broken-diffutils-test.patch | 37 ++++++++++++++++++++++
...off-1.23.0_rc2-skip-broken-diffutils-test.patch | 37 ++++++++++++++++++++++
sys-apps/groff/groff-1.22.4.ebuild | 8 +----
sys-apps/groff/groff-1.23.0_rc2.ebuild | 8 +----
4 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch b/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch
new file mode 100644
index 000000000000..c767aa828930
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.22.4-skip-broken-diffutils-test.patch
@@ -0,0 +1,37 @@
+https://savannah.gnu.org/bugs/?63726
+--- 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 \
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
new file mode 100644
index 000000000000..171e99608337
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.23.0_rc2-skip-broken-diffutils-test.patch
@@ -0,0 +1,37 @@
+https://savannah.gnu.org/bugs/?63726
+--- 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.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 81ac61ff2940..94a0763ca900 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -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() {
@@ -56,13 +57,6 @@ 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 7571ab653986..ac8ba6b2371f 100644
--- a/sys-apps/groff/groff-1.23.0_rc2.ebuild
+++ b/sys-apps/groff/groff-1.23.0_rc2.ebuild
@@ -44,6 +44,7 @@ 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() {
@@ -61,13 +62,6 @@ 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/
@ 2023-02-21 0:31 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-02-21 0:31 UTC (permalink / raw
To: gentoo-commits
commit: 6371dca10b4767737fe3926b25215fc99e734b68
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 00:29:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 00:30:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6371dca1
sys-apps/groff: add 1.23.0_rc3, drop 1.23.0_rc2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/groff/Manifest | 2 +-
...off-1.23.0_rc2-skip-broken-diffutils-test.patch | 38 ----------------------
...f-1.23.0_rc2.ebuild => groff-1.23.0_rc3.ebuild} | 1 -
3 files changed, 1 insertion(+), 40 deletions(-)
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_rc3.ebuild
similarity index 97%
rename from sys-apps/groff/groff-1.23.0_rc2.ebuild
rename to sys-apps/groff/groff-1.23.0_rc3.ebuild
index ac8ba6b2371f..0d90fdb18750 100644
--- a/sys-apps/groff/groff-1.23.0_rc2.ebuild
+++ b/sys-apps/groff/groff-1.23.0_rc3.ebuild
@@ -44,7 +44,6 @@ 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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-21 0:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-27 13:51 [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/files/, sys-apps/groff/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2020-07-21 7:10 Andreas Sturmlechner
2023-02-09 18:07 Sam James
2023-02-21 0:31 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox