Add support for the -P (perl regex) option (bug #51215); tidy

5 files changed, 86 insertions, 5 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 144e022c6bf6..4689bb2bbcbd 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/grep
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.22 2004/04/27 21:09:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.23 2004/06/11 00:08:22 mr_bones_ Exp $
+
+*grep-2.5.1-r2 (10 Jun 2004)
+
+  10 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r2.ebuild:
+  Add support for the -P (perl regex) option (bug #51215) For bootstrap,
+  using -perl should work fine.  For people with /bin and /usr on different
+  partitions USE="static" works fine. (see bug #1638 for discussion)
+  Fixed the formatting for the -P option in the man page.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r1.ebuild:
   Add inherit eutils
@@ -86,7 +94,7 @@
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
+  updated in any way. This changelog is targeted to users. This means that the
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 49bb7201c567..f5d13828809b 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,7 @@
-MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r1 62
-MD5 9b382fe04d2e5d86aea020215ceca879 files/gentoo-sparc32-dfa.patch 383
 MD5 7e516d54b7d0fb6c5df84a6d078199e6 ChangeLog 3434
-MD5 3bf235a73d20d2b8fcee58e44bd275e3 grep-2.5.1-r1.ebuild 1523
+MD5 3e56378adb5662b815f5785cb02c6c9c grep-2.5.1-r1.ebuild 1522
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 34b07f629afc49efc266523b78e21a5e grep-2.5.1-r2.ebuild 1564
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r1 62
+MD5 9b382fe04d2e5d86aea020215ceca879 files/gentoo-sparc32-dfa.patch 383
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r2 62
diff --git a/sys-apps/grep/files/2.5.1-manpage.patch b/sys-apps/grep/files/2.5.1-manpage.patch
new file mode 100644
index 000000000000..b653fe432184
--- /dev/null
+++ b/sys-apps/grep/files/2.5.1-manpage.patch
@@ -0,0 +1,10 @@
+--- doc/grep.1.orig	2004-06-10 16:59:31.000000000 -0700
++++ doc/grep.1	2004-06-10 16:59:56.000000000 -0700
+@@ -191,6 +191,7 @@
+ .I PATTERN
+ as a list of fixed strings, separated by newlines,
+ any of which is to be matched.
++.TP
+ .BR \-P ", " \-\^\-perl-regexp
+ Interpret
+ .I PATTERN
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r2 b/sys-apps/grep/files/digest-grep-2.5.1-r2
new file mode 100644
index 000000000000..ef03a032aa20
--- /dev/null
+++ b/sys-apps/grep/files/digest-grep-2.5.1-r2
@@ -0,0 +1 @@
+MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/grep-2.5.1-r2.ebuild b/sys-apps/grep/grep-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..ddfbe400d437
--- /dev/null
+++ b/sys-apps/grep/grep-2.5.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r2.ebuild,v 1.1 2004/06/11 00:08:22 mr_bones_ 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 perl static"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	perl? ( dev-libs/libpcre )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc" ] ; then
+		epatch "${FILESDIR}/gentoo-sparc32-dfa.patch"
+	fi
+	epatch "${FILESDIR}/${PV}-manpage.patch"
+	# Fix configure scripts to detect linux-mips
+	gnuconfig_update
+}
+
+src_compile() {
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+	econf \
+		$(use_enable nls) \
+		$(use_enable perl perl-regexp) \
+		--bindir=/bin \
+		|| die "econf failed"
+	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
+}