From: Jeroen Roovers Date: Fri, 18 Jun 2010 14:37:50 +0000 (+0000) Subject: Support more compression algorithms thanks to Martin Väth (bug #269862). Display... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e45bed41832c8da74df09589a51f99145d42f1de;p=gentoo.git Support more compression algorithms thanks to Martin Väth (bug #269862). Display man pages without terminal escape characters thanks to Aniruddha Shankar (bug #322459). Fix version in info file. Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- diff --git a/app-text/pinfo/ChangeLog b/app-text/pinfo/ChangeLog index 7ded57c2af14..58b57795736f 100644 --- a/app-text/pinfo/ChangeLog +++ b/app-text/pinfo/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-text/pinfo -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.40 2007/10/09 08:27:07 jer Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.41 2010/06/18 14:37:50 jer Exp $ + +*pinfo-0.6.9-r1 (18 Jun 2010) + + 18 Jun 2010; Jeroen Roovers +pinfo-0.6.9-r1.ebuild, + +files/pinfo-0.6.9-GROFF_NO_SGR.patch, +files/pinfo-0.6.9-lzma-xz.patch, + +files/pinfo-0.6.9-version.patch: + Support more compression algorithms thanks to Martin Väth (bug #269862). + Display man pages without terminal escape characters thanks to Aniruddha + Shankar (bug #322459). Fix version in info file. 09 Oct 2007; Jeroen Roovers pinfo-0.6.9.ebuild: Fix quoting issues caught by latest repoman. diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest index c6acd8a1bc3c..e4f51be38201 100644 --- a/app-text/pinfo/Manifest +++ b/app-text/pinfo/Manifest @@ -1,6 +1,10 @@ AUX pinfo-0.6.9-FTPVIEWER.patch 298 RMD160 00e28a844ef4a829487a3cca8f343aeb84b4fd7b SHA1 8312639f7fce642528c4702a0179a3c2f63c226a SHA256 bfc15e7f62f79ce6cebc541354c3260d28cf98678dd2ce599d9cfb821a0a88c2 +AUX pinfo-0.6.9-GROFF_NO_SGR.patch 260 RMD160 468e5c3244223ab7938344bc15fad24647802012 SHA1 ad2743c02ceee4ba13a41a4bc3ac92e7ac2465b0 SHA256 1b962a4a1a319009feb1331710fc24fbdcf1d8cd0852b07e5f5e3e656532dc1c AUX pinfo-0.6.9-as-needed.patch 534 RMD160 3e69e705111fa6355716222ff99605c39b6b63b6 SHA1 25eb180f28a7856ba56c4f040c10f9a96fbd1d7a SHA256 ff74358048ad59946f906484fd0d9c9f67a936b851bc50ee2248f2d27c17e425 +AUX pinfo-0.6.9-lzma-xz.patch 610 RMD160 8763552e912f4d6bc4297a00603b3f304c66f3fa SHA1 565269e430a296e67beaa3d1f5120e035ed3dfc2 SHA256 c934b7c17a719675ec79135e91721787d60c188863cd21246668815d5e15bfe5 +AUX pinfo-0.6.9-version.patch 1034 RMD160 2cf168bb5d4d35a383f33350378980dff60ea6b5 SHA1 fa576f84535b8a056c172b4ae320493289b3f0ba SHA256 4b180bdb5b646249f051817a2d8bac5a9a7a43e61a8f5e045170edd35e542b7c DIST pinfo-0.6.9.tar.bz2 448469 RMD160 e67582e0839d431c48b9849c477a2cd6917e568e SHA1 3ecee057169c1cffb328b861641e30fdff18b06c SHA256 03037330e7626932adb31c54d6c5e71b667bcde4854fd75357e67b7b7cf87ae5 +EBUILD pinfo-0.6.9-r1.ebuild 1096 RMD160 a5d149858e828056e836200148f4110543edbe39 SHA1 c6fa25915097a2ef0008d018149151a994d3c3ca SHA256 536b39c252659707bcaf549a9060a3d857cec69a5d2287a89573fab94a102d63 EBUILD pinfo-0.6.9.ebuild 995 RMD160 47f1ec36540395a60594174e56d43804662fd6db SHA1 56759560a72c92c8505de0b08bbcb5d410012c4f SHA256 1dc1593335726b3eb026ca6a2f6db78769e7529f8a713c03e82a24576369be2b -MISC ChangeLog 5113 RMD160 e961d93374202da067d5eaf7d47ad13dd8e36a92 SHA1 30326ec9881abfd39496719aa23039fc47b500e9 SHA256 b23b25529346c3b334cb1ace59520470a7f9cfe610aeb544ef5f8b41f883cf5f +MISC ChangeLog 5529 RMD160 2439e07b42332824aeae7e41eb3b35c16e545f64 SHA1 10215dbbc6009009cd49272925a5d7376cd31e8a SHA256 d37597119ea87031220b8ae053699eede5a408202a8b615752f0abec63cb4861 MISC metadata.xml 217 RMD160 0d94a6fc560097772d4c2e86e653554bd05c25d4 SHA1 0d2cb1ef66cc2caa1b1e6905019402cddb355105 SHA256 6dc63d55b31ccafd1b88efc0808f669d4df575f9115872c574ffc1596851a4f8 diff --git a/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch new file mode 100644 index 000000000000..7aa7b3e87b33 --- /dev/null +++ b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch @@ -0,0 +1,10 @@ +--- src/manual.c.orig 2006-03-16 15:14:30.000000000 +0100 ++++ src/manual.c 2010-06-03 19:47:11.000000000 +0200 +@@ -261,6 +261,7 @@ + xfree(tmpfilename1); + } + tmpfilename1 = make_tempfile(); ++ putenv("GROFF_NO_SGR=true"); + + #ifdef getmaxyx + init_curses(); diff --git a/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch new file mode 100644 index 000000000000..3e738c888205 --- /dev/null +++ b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch @@ -0,0 +1,21 @@ +--- src/filehandling_functions.c ++++ src/filehandling_functions.c +@@ -41,14 +41,16 @@ + * you dump the file through `gunzip -d -c', etc. * + ******************************************************************************/ + +-#define SuffixesNumber 4 ++#define SuffixesNumber 6 + + Suffixes suffixes[SuffixesNumber] = + { + {"", "cat"}, + {".gz", "gzip -d -q -c"}, + {".Z", "gzip -d -q -c"}, +- {".bz2", "bzip2 -d -c"} ++ {".bz2", "bzip2 -d -c"}, ++ {".lzma", "lzma -d -c"}, ++ {".xz", "xz -d -c"} + }; + + /*****************************************************************************/ diff --git a/app-text/pinfo/files/pinfo-0.6.9-version.patch b/app-text/pinfo/files/pinfo-0.6.9-version.patch new file mode 100644 index 000000000000..a2960e780338 --- /dev/null +++ b/app-text/pinfo/files/pinfo-0.6.9-version.patch @@ -0,0 +1,30 @@ +--- doc/pinfo.info.orig 2006-03-16 17:28:00.000000000 +0100 ++++ doc/pinfo.info 2010-06-18 16:20:24.000000000 +0200 +@@ -1,6 +1,6 @@ + This is pinfo.info, produced by makeinfo version 4.8 from pinfo.texi. + +- This is documentation for `pinfo', version 0.6.4. Edition 0.2.1, ++ This is documentation for `pinfo', version 0.6.9. Edition 0.2.1, + date 1 Dec 2001. + + Copyright 2000 (C) Przemek Borys +@@ -15,7 +15,7 @@ +  + File: pinfo.info, Node: Top, Next: Invoking, Prev: (dir), Up: (dir) + +- This documentation is for `pinfo', version 0.6.4. ++ This documentation is for `pinfo', version 0.6.9. + + Original manpage written on 21 Mar 1999 by Przemek Borys, + , `http://zeus.polsl.gliwice.pl/~pborys/'. +--- doc/pinfo.texi.orig 2006-03-16 16:40:41.000000000 +0100 ++++ doc/pinfo.texi 2010-06-18 16:20:24.000000000 +0200 +@@ -5,7 +5,7 @@ + @c %**end of header + + @set EDITION 0.2.1 +-@set VERSION 0.6.4 ++@set VERSION 0.6.9 + @set DATE 1 Dec 2001 + @set DATEMAN 21 Mar 1999 + diff --git a/app-text/pinfo/pinfo-0.6.9-r1.ebuild b/app-text/pinfo/pinfo-0.6.9-r1.ebuild new file mode 100644 index 000000000000..0fd526fbf748 --- /dev/null +++ b/app-text/pinfo/pinfo-0.6.9-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/pinfo-0.6.9-r1.ebuild,v 1.1 2010/06/18 14:37:50 jer Exp $ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="Hypertext info and man viewer based on (n)curses" +HOMEPAGE="http://pinfo.alioth.debian.org/" +SRC_URI="http://alioth.debian.org/download.php/1498/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="nls readline" + +RDEPEND="sys-libs/ncurses + nls? ( virtual/libintl )" + +DEPEND="${RDEPEND} + sys-devel/bison + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-FTPVIEWER.patch \ + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-GROFF_NO_SGR.patch \ + "${FILESDIR}"/${P}-lzma-xz.patch \ + "${FILESDIR}"/${P}-version.patch + AT_M4DIR="${S}/macros" eautoreconf +} + +src_configure() { + econf \ + $(use_with readline) \ + $(use_enable nls) \ + || die "econf failed" +} + +src_install() { + make DESTDIR="${D}" sysconfdir=/etc install || die +}