fixing manpage reference to --line-buffering

5 files changed, 110 insertions, 1 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index c393ada9d01d..73e45efbc465 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/grep
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.32 2004/08/19 16:24:07 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.33 2004/08/20 08:36:03 taviso Exp $
+
+*grep-2.5.1-r6 (20 Aug 2004)
+
+  20 Aug 2004; Tavis Ormandy <taviso@gentoo.org>
+  +files/2.5.1-manpage-line-buffering.diff, +grep-2.5.1-r6.ebuild:
+  fix manpage reference to --line-buffering
 
 *grep-2.5.1-r5 (19 Aug 2004)
 
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index e267446d35c8..ae2d58062f2c 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,15 +1,18 @@
 MD5 78359f2a17830dcd42e7fc02ed6067fd grep-2.5.1-r4.ebuild 1955
+MD5 bc2a0a36697b2c5786b51ca6b14ec54e grep-2.5.1-r6.ebuild 2320
 MD5 3edd98c66d6cbc590c65aef0a21aa1b1 grep-2.5.1-r1.ebuild 1651
 MD5 7f1900eb085d7122f20e8ef100eae9bb ChangeLog 5174
 MD5 5565200e5b58e4638e73c4ed809da17b grep-2.5.1-r5.ebuild 2144
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 294f8a32ae3036ebbf393610a286d80e files/grep-2.5.1-gofast.patch.bz2 4389
 MD5 f2f8cec983dc49b399880ab8eae882cb files/grep-2.5.1-i18n.patch.bz2 2903
+MD5 0fb1a9dfb2cac7195b12574d85e68901 files/2.5.1-manpage-line-buffering.diff 391
 MD5 b43c763953a7b7d3345fc0dd625f299c files/grep-2.5.1-fgrep.patch.bz2 1678
 MD5 575345b799197d6c79fe93c757664262 files/grep-2.5.1-oi.patch.bz2 831
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r1 62
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r4 62
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r5 62
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r6 62
 MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
 MD5 7fe2377aba625aaed445a12cefa4fb37 files/grep-2.5.1-restrict_arr.patch 495
 MD5 9b382fe04d2e5d86aea020215ceca879 files/gentoo-sparc32-dfa.patch 383
diff --git a/sys-apps/grep/files/2.5.1-manpage-line-buffering.diff b/sys-apps/grep/files/2.5.1-manpage-line-buffering.diff
new file mode 100644
index 000000000000..8b32dd2984d7
--- /dev/null
+++ b/sys-apps/grep/files/2.5.1-manpage-line-buffering.diff
@@ -0,0 +1,11 @@
+--- doc/grep.1.orig	2004-08-20 09:28:45.857442048 +0100
++++ doc/grep.1	2004-08-20 09:27:20.959348520 +0100
+@@ -303,7 +303,7 @@
+ This is especially useful for tools like zgrep, e.g.
+ .B "gzip -cd foo.gz |grep --label=foo something"
+ .TP
+-.BR \-\^\-line-buffering
++.BR \-\^\-line-buffered
+ Use line buffering, it can be a performance penality.
+ .TP
+ .BR \-q ", " \-\^\-quiet ", " \-\^\-silent
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r6 b/sys-apps/grep/files/digest-grep-2.5.1-r6
new file mode 100644
index 000000000000..ef03a032aa20
--- /dev/null
+++ b/sys-apps/grep/files/digest-grep-2.5.1-r6
@@ -0,0 +1 @@
+MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/grep-2.5.1-r6.ebuild b/sys-apps/grep/grep-2.5.1-r6.ebuild
new file mode 100644
index 000000000000..0c5eba177908
--- /dev/null
+++ b/sys-apps/grep/grep-2.5.1-r6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r6.ebuild,v 1.1 2004/08/20 08:36:03 taviso Exp $
+
+inherit gnuconfig flag-o-matic eutils
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
+SRC_URI="http://ftp.club.cc.cmu.edu/pub/gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz
+	mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="build nls pcre static uclibc"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	pcre? (
+		>=sys-apps/sed-4
+		dev-libs/libpcre )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die
+
+	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc" ] ; then
+		epatch "${FILESDIR}/gentoo-sparc32-dfa.patch"
+	fi
+	epatch "${FILESDIR}/${PV}-manpage.patch"
+
+	# man page describes a --line-buffering option, where as
+	# grep recognises --line-buffered.
+	# 	-taviso (20 Aug 2004)
+	epatch ${FILESDIR}/${PV}-manpage-line-buffering.diff
+
+	use uclibc && epatch ${FILESDIR}/grep-2.5.1-restrict_arr.patch
+
+	epatch ${FILESDIR}/${PN}-${PV}-fgrep.patch.bz2
+	epatch ${FILESDIR}/${PN}-${PV}-i18n.patch.bz2
+	epatch ${FILESDIR}/${PN}-${PV}-gofast.patch.bz2
+	epatch ${FILESDIR}/${PN}-${PV}-oi.patch.bz2
+
+	# Fix configure scripts to detect linux-mips
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf="
+		$(use_enable nls)
+		--bindir=/bin"
+
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+
+	if use uclibc ; then
+		myconf="${myconf} --without-included-regex"
+	else
+		myconf="${myconf} $(use_enable pcre perl-regexp)"
+	fi
+
+	econf ${myconf} || die "econf failed"
+
+	if use pcre && ! use uclibc ; then
+		sed -i -e 's:-lpcre:/usr/lib/libpcre.a:g' {lib,src}/Makefile \
+			|| die "sed Makefile failed"
+	fi
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# Override the default shell scripts... grep knows how to act
+	# based on how it's called
+	ln -sfn grep "${D}/bin/egrep" || die "ln egrep failed"
+	ln -sfn grep "${D}/bin/fgrep" || die "ln fgrep failed"
+
+	if use build ; then
+		rm -rf "${D}/usr/share"
+	else
+		dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	fi
+}