diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/groff | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/groff')
-rw-r--r-- | sys-apps/groff/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch | 24 | ||||
-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 | 90 | ||||
-rw-r--r-- | sys-apps/groff/groff-1.22.3.ebuild | 78 | ||||
-rw-r--r-- | sys-apps/groff/metadata.xml | 5 |
7 files changed, 307 insertions, 0 deletions
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest new file mode 100644 index 000000000000..05932d310e8d --- /dev/null +++ b/sys-apps/groff/Manifest @@ -0,0 +1,3 @@ +DIST groff-1.22.1-japanese.patch.bz2 52968 SHA256 cbdfdd7981f4e4e99839218bb4a6bc1b981cc23e946b6959fef15644d29c9f47 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef WHIRLPOOL e59bee5ddd2136e98b1881e695915e9da91db17fba68fc8508e2bd477a462499f2dfa6f569729a56620301b97e532a8585f9eacdc92ac92cdb87316b4c7687a0 +DIST groff-1.22.2.tar.gz 4019913 SHA256 380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80 WHIRLPOOL 61f24635140f388672761822c696fb051fc26050da6d7d771a73af112f477cd65d934129786794cd39bc3dcb69a88c8dcb7e4739b980a73d68ec518f54aed861 +DIST groff-1.22.3.tar.gz 4188772 SHA256 3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c WHIRLPOOL 671b8f9641d5969d995616b7e7aaa5928cab9658b3017e1d87c39c507e32724350ab81f73475fc159bae0f305d106d944e490f1d7b53b8715a5367dc11140fdb 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 new file mode 100644 index 000000000000..d85a8330d274 --- /dev/null +++ b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch @@ -0,0 +1,24 @@ +format dashes as dashes so as to not confuse people + +http://bugs.gentoo.org/16108 +http://bugs.gentoo.org/17580 +http://bugs.gentoo.org/121502 + +--- tmac/man.local ++++ tmac/man.local +@@ -1,2 +1,6 @@ + .\" This file is loaded after an-old.tmac. + .\" Put any local modifications to an-old.tmac here. ++.if '\*[.T]'utf8' \{\ ++. char \- \N'45' ++. char - \N'45' ++.\} +--- tmac/mdoc.local ++++ tmac/mdoc.local +@@ -1,2 +1,6 @@ + .\" This file is loaded after doc.tmac. + .\" Put any local modifications to doc.tmac here. ++.if '\*[.T]'utf8' \{\ ++. char \- \N'45' ++. char - \N'45' ++.\} 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 new file mode 100644 index 000000000000..7cf3c22295d5 --- /dev/null +++ b/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch @@ -0,0 +1,96 @@ +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 new file mode 100644 index 000000000000..10661ac27f2c --- /dev/null +++ b/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..b35c761cca5b --- /dev/null +++ b/sys-apps/groff/groff-1.22.2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit autotools eutils toolchain-funcs + +DESCRIPTION="Text formatter used for man pages" +HOMEPAGE="http://www.gnu.org/software/groff/groff.html" +SRC_URI="mirror://gnu/groff/${P}.tar.gz + linguas_ja? ( http://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 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples X linguas_ja" + +RDEPEND=">=sys-apps/texinfo-4.7-r1 + X? ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXmu + x11-libs/libXaw + x11-libs/libSM + x11-libs/libICE + )" +DEPEND="${RDEPEND} + linguas_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 linguas_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 linguas_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 + rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -f "${ED}"/usr/share/doc/${PF}/pdf/mom-pdf.pdf + fi +} diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild new file mode 100644 index 000000000000..752dbe7f1e12 --- /dev/null +++ b/sys-apps/groff/groff-1.22.3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils toolchain-funcs + +DESCRIPTION="Text formatter used for man pages" +HOMEPAGE="http://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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples X" + +RDEPEND=">=sys-apps/texinfo-4.7-r1 + X? ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXmu + x11-libs/libXaw + x11-libs/libSM + x11-libs/libICE + )" +DEPEND="${RDEPEND}" + +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 + + use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples +} diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml new file mode 100644 index 000000000000..96a2d586367d --- /dev/null +++ b/sys-apps/groff/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>base-system</herd> +</pkgmetadata> |