diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-apps/groff | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'sys-apps/groff')
-rw-r--r-- | sys-apps/groff/Manifest | 9 | ||||
-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 | ||||
-rw-r--r-- | sys-apps/groff/groff-1.22.4.ebuild | 2 |
6 files changed, 2 insertions, 297 deletions
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest index 2874c71c601d..fa3fd7be1ee1 100644 --- a/sys-apps/groff/Manifest +++ b/sys-apps/groff/Manifest @@ -1,11 +1,4 @@ AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97 -AUX groff-1.22.2-parallel-mom.patch 3903 BLAKE2B ae706b988d0236f32d981239749aeaf27fd0353173e54566f481492dd93c583d75123a26132fdad54fa09ca2ed035ae28df4eb6cd3e9bccd8d8f348a6cbcd28f SHA512 314fe3d619dc7dd373f1d9ea75d4d8cb365fc7278a958a3dec09e95ba3bf75180edb5f4ec3d43b4791b0252b733f9916e6189794b098b09171f45eb65bee713f -AUX groff-1.22.3-parallel-mom.patch 378 BLAKE2B 46d38a599ec073bddd24a31562960ed86c764679090c72ffe64024944c03d7c556313397c3244adf1d15dc79b75a900a5f627276e28435bff4dea5788b1a9d18 SHA512 29330641fcdcc052cc1760dd69c523f2cfaf4264110b7471ac3dfc00e12a371fa69f3a6902221a575da3b89fb7acc5b161234c95e5a4c4d105bf46d7ffd5d038 -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 -EBUILD groff-1.22.2.ebuild 2792 BLAKE2B 0319d0b38341ca672e408b4c5ff2d92e71c2d6adcd0f282a1e128328e3af485f74737ca7b7d5b48ab227a04911bbabe153671dd548e3af2dd84924bc77aa0cdb SHA512 8903afe4bbc5ddbce88b85f3098c2d0172aee6b2da98196b7bf913eedcde939720b2fb0d16276817097bc3d1da6d350e38599bb452d0f9d1165539a76ecb9d33 -EBUILD groff-1.22.3.ebuild 2506 BLAKE2B c72c5bbfb1fc6b733be04ca30862c42367b67417547b602f955807e5ad1ea5af8535bdf8188b68949d7f1a59e07427ff17011b8a45454f3fe9fc50436f97f996 SHA512 b79e10a91f4a4af83bb24f39a7265dd72a986d3a1aa400e2829b7a5b4fc4beca1b9dcf9099f5c263260ef15da006eaa7f5e2b0ecf91dd94a004c24ee24fcc550 -EBUILD groff-1.22.4.ebuild 2555 BLAKE2B a5697a196faf1923d3e14e0a6ceb8df48926972296895cb483b091d97f8429b6bdd23c2c94c1cd691f7c7eddf4c0c900f0d10ffca606da6e0fbe2f4b00aa830e SHA512 209f5592785df2a50c21196f49e4ce87859e718f864aa715df5bd07129aec40a6257d2fe3ee1480032bdf5af04f60e55c0a68518cc32909028aa24e462f195e3 +EBUILD groff-1.22.4.ebuild 2554 BLAKE2B b23c96acb3a55f7fb564e63c9fe3a3c3cf6dff46d53801f7a030df8749f08bc71bec43e9ad99044b4384644f2cbfd7420146f6dfed9d48c363a05d1a34f03098 SHA512 de9d128515e920c41450583ecea715cf79dc358c26213adf27fc875c92cdc3d3178b619e185923073b0720c500fbe65babdab6096571f99cd06ab0b710fb484b MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 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 -} diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild index f97de5f3c1ba..78724e949eac 100644 --- a/sys-apps/groff/groff-1.22.4.ebuild +++ b/sys-apps/groff/groff-1.22.4.ebuild @@ -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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 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=" |