diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-07-19 20:34:59 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-07-21 09:09:06 +0200 |
commit | f5a6ef618eb3e803f6355fb02948389fc977f843 (patch) | |
tree | 44c9076b1781b80188bf01831c0a5ecf8913a6c2 /sys-apps/groff | |
parent | sys-apps/ipmitool: Drop 1.8.17-r1 (diff) | |
download | gentoo-f5a6ef618eb3e803f6355fb02948389fc977f843.tar.gz gentoo-f5a6ef618eb3e803f6355fb02948389fc977f843.tar.bz2 gentoo-f5a6ef618eb3e803f6355fb02948389fc977f843.zip |
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@gentoo.org>
Diffstat (limited to 'sys-apps/groff')
-rw-r--r-- | sys-apps/groff/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/groff/files/groff-1.22.2-parallel-mom.patch | 96 | ||||
-rw-r--r-- | sys-apps/groff/files/groff-1.22.3-parallel-mom.patch | 11 | ||||
-rw-r--r-- | sys-apps/groff/groff-1.22.2.ebuild | 95 | ||||
-rw-r--r-- | sys-apps/groff/groff-1.22.3.ebuild | 86 |
5 files changed, 0 insertions, 291 deletions
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest index 548076ad2021..67a1953b5d4d 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 7cf3c22295d5..000000000000 --- 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 10661ac27f2c..000000000000 --- 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 e3b6ed2c8069..000000000000 --- 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 0e33f70c4c41..000000000000 --- 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 -} |