From: Mamoru Komachi Date: Sat, 29 Oct 2005 02:07:38 +0000 (+0000) Subject: Version bumped. Thanks to Atsushi Kobayashi ; bug #109769 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e98fd592b2a5da067199a890c5b13adff38d4fe;p=gentoo.git Version bumped. Thanks to Atsushi Kobayashi ; bug #109769 Package-Manager: portage-2.0.52-r1 --- diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog index f85d0a0e5360..9380bcbf3cf5 100644 --- a/sys-apps/groff/ChangeLog +++ b/sys-apps/groff/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/groff # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.58 2005/09/29 07:57:59 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.59 2005/10/29 02:07:38 usata Exp $ + +*groff-1.18.1.1 (29 Oct 2005) + + 29 Oct 2005; Mamoru KOMACHI + +files/groff_1.18.1.1-10-fix.patch, +groff-1.18.1.1.ebuild: + Version bumped. Thanks to Atsushi Kobayashi ; + bug #109769. 29 Sep 2005; Mamoru KOMACHI groff-1.19.1-r2.ebuild: Block man-pages-ja for groff-1.19 since groff-1.19 doesn't support m17n; diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest index d9411127d1aa..f16621a093ad 100644 --- a/sys-apps/groff/Manifest +++ b/sys-apps/groff/Manifest @@ -1,8 +1,10 @@ -MD5 1ae06b3821e4b32fe5e000130d8539eb ChangeLog 8146 +MD5 e60e4077abb6cd2503a02609163edce7 ChangeLog 8374 MD5 032db38ca66c2fbc5929992a4f313944 groff-1.18.1-r4.ebuild 3142 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 dee06c655e952d21181ff84957b4cc8b groff-1.18.1.1.ebuild 3155 MD5 f5848d8ffad604e64ae98341f898ba2c groff-1.19.1-r2.ebuild 3191 MD5 b887e99fa5e1252f1bf827af9892a238 files/digest-groff-1.18.1-r4 132 +MD5 5ad2fe2219d24cfa7f9513e0671c0643 files/digest-groff-1.18.1.1 137 MD5 b70471bdc7015ddf030d176b3a0f2d5f files/groff-1.19.1-stack.patch 3659 MD5 b79e74dab8ceadf74f153032ad30eea3 files/digest-groff-1.19.1-r2 65 MD5 8f3336cc924f20e480ac76ee94f0611e files/groff-1.19.1-tmpfile.patch 710 @@ -12,3 +14,4 @@ MD5 790ff4a99ab0dd200eb710d925058fb6 files/groff-1.18-no-netpbm-depend.patch 920 MD5 98060417290f3c427f5a3406b21f8da9 files/groff-1.18.1-no-color-segfault.patch 896 MD5 e0ea59264695cc68dc9947e4611dde5d files/groff-man-UTF-8.diff 391 MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1-7-fix.patch 551 +MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1.1-10-fix.patch 551 diff --git a/sys-apps/groff/files/digest-groff-1.18.1.1 b/sys-apps/groff/files/digest-groff-1.18.1.1 new file mode 100644 index 000000000000..f0c43598a0cc --- /dev/null +++ b/sys-apps/groff/files/digest-groff-1.18.1.1 @@ -0,0 +1,2 @@ +MD5 511dbd64b67548c99805f1521f82cc5e groff-1.18.1.1.tar.gz 2260623 +MD5 e4ddab0e8fe7bee80d70dd117ec3f230 groff_1.18.1.1-10.diff.gz 131002 diff --git a/sys-apps/groff/files/groff_1.18.1.1-10-fix.patch b/sys-apps/groff/files/groff_1.18.1.1-10-fix.patch new file mode 100644 index 000000000000..b063603c2a19 --- /dev/null +++ b/sys-apps/groff/files/groff_1.18.1.1-10-fix.patch @@ -0,0 +1,20 @@ +diff -urN groff-1.18.1-orig/tmac/docj.tmac groff-1.18.1/tmac/docj.tmac +--- groff-1.18.1.orig/tmac/docj.tmac 2003-02-20 12:31:28.000000000 +0900 ++++ groff-1.18.1/tmac/docj.tmac 2003-02-20 12:34:30.000000000 +0900 +@@ -49,14 +49,14 @@ + .de sO + .mso mdoc/\\$1 + .. ++.sO doc-doc-common ++.sO doc-doc-syms + .if t \{\ + . sO docj-ditroff + .\} + .if n \{\ + . sO docj-nroff + .\} +-.sO doc-common +-.sO doc-syms + .\" NS Db macro - start/stop DEBUG MODE + .\" NS Db register DEBUG MODE + .\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default)) diff --git a/sys-apps/groff/groff-1.18.1.1.ebuild b/sys-apps/groff/groff-1.18.1.1.ebuild new file mode 100644 index 000000000000..d06e4b2a01c7 --- /dev/null +++ b/sys-apps/groff/groff-1.18.1.1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1.1.ebuild,v 1.1 2005/10/29 02:07:38 usata Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +MB_PATCH="${P/-/_}-10" +DESCRIPTION="Text formatter used for man pages" +HOMEPAGE="http://www.gnu.org/software/groff/groff.html" +SRC_URI="mirror://gnu/groff/${P}.tar.gz + cjk? ( mirror://debian/pool/main/g/groff/${MB_PATCH}.diff.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="X cjk" + +DEPEND=">=sys-apps/texinfo-4.0" +PDEPEND=">=sys-apps/man-1.5k-r1" + +src_unpack() { + unpack ${A} + cd ${S} + + if use cjk; then + # multibyte patch contains no-color-segfault + epatch ${WORKDIR}/${MB_PATCH}.diff + epatch ${FILESDIR}/${MB_PATCH}-fix.patch + else + # Do not segfault if no color is defined in input, bug #14329 + # (08 Feb 2003) + epatch ${FILESDIR}/${P}-no-color-segfault.patch + fi + + # Fix the info pages to have .info extensions, + # else they do not get gzipped. + epatch ${FILESDIR}/groff-1.18-infoext.patch + + # Do not generate example files that require us to + # depend on netpbm. + epatch ${FILESDIR}/groff-1.18-no-netpbm-depend.patch + + # Make dashes the same as minus on the keyboard so that you + # can search for it. Fixes #17580 and #16108 + # Thanks to James Cloos + epatch ${FILESDIR}/${PN}-man-UTF-8.diff + + # Fix syntax error in pic2graph. Closes #32300. + sed -i -e "s:groffpic_opts=\"-U\":groffpic_opts=\"-U\";;:" contrib/pic2graph/pic2graph.sh +} + +src_compile() { + local myconf="" + + # Fix problems with not finding g++ + export CC="$(tc-getCC)" + export CXX="$(tc-getCXX)" + + case ${ARCH} in + alpha) + # -Os causes segfaults, -O is probably a fine replacement + # (fixes bug 36008, 06 Jan 2004 agriffis) + replace-flags -Os -O + ;; + hppa) + # -march=2.0 makes groff unable to finish the compile process + export CFLAGS="${CFLAGS/-march=2.0/}" + export CXXFLAGS="${CXXFLAGS/-march=2.0/}" + ;; + esac + + myconf="${myconf} `use_enable cjk multibyte`" + + ./configure --host=${CHOST} \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=\${inforoot} \ + ${myconf} || die + + # parallel build doesn't work + emake -j1 || die + + # Only build X stuff if we have X installed, but do + # not depend on it, else we get circular deps. + if use X && [[ -n $(type -p xmkmf) ]] ; then + cd ${S}/src/xditview + xmkmf || die + make depend all || die + fi +} + +src_install() { + dodir /usr /usr/share/doc/${PF}/{examples,html} + make prefix=${D}/usr \ + manroot=${D}/usr/share/man \ + inforoot=${D}/usr/share/info \ + docdir=${D}/usr/share/doc/${PF} \ + install || die + + if use X && [[ -n $(type -p xmkmf) ]] ; then + cd ${S}/src/xditview + make DESTDIR=${D} \ + BINDIR=/usr/bin \ + MANPATH=/usr/share/man \ + install \ + install.man || die + fi + + #the following links are required for xman + dosym eqn /usr/bin/geqn + dosym tbl /usr/bin/gtbl + dosym soelim /usr/bin/zsoelim + + cd ${S} + dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \ + PROBLEMS PROJECTS README REVISION TODO VERSION +}