5 files changed, 92 insertions, 1 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 72c719f65f50..1a7c0bd816f3 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.65 2006/04/18 16:34:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.66 2006/08/01 05:20:25 vapier Exp $
+
+*grep-2.5.1a-r1 (01 Aug 2006)
+
+  01 Aug 2006; Mike Frysinger <vapier@gentoo.org> +grep-2.5.1a-r1.ebuild:
+  Add back in pcre #141609.
 
   18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/grep-2.5.1a-nls.patch, grep-2.5.1a.ebuild:
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r8 b/sys-apps/grep/files/digest-grep-2.5.1-r8
index ef03a032aa20..7fcc231ba042 100644
--- a/sys-apps/grep/files/digest-grep-2.5.1-r8
+++ b/sys-apps/grep/files/digest-grep-2.5.1-r8
@@ -1 +1,3 @@
 MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
+RMD160 96d1fda2297a03a11c7d2fcea16effff55d2cbd0 grep-2.5.1.tar.gz 683093
+SHA256 d2c068701afae914b9a0707f2af6c373556c7b761913169ae0a7afa9fd5b2442 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r9 b/sys-apps/grep/files/digest-grep-2.5.1-r9
index ef03a032aa20..7fcc231ba042 100644
--- a/sys-apps/grep/files/digest-grep-2.5.1-r9
+++ b/sys-apps/grep/files/digest-grep-2.5.1-r9
@@ -1 +1,3 @@
 MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
+RMD160 96d1fda2297a03a11c7d2fcea16effff55d2cbd0 grep-2.5.1.tar.gz 683093
+SHA256 d2c068701afae914b9a0707f2af6c373556c7b761913169ae0a7afa9fd5b2442 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/files/digest-grep-2.5.1a-r1 b/sys-apps/grep/files/digest-grep-2.5.1a-r1
new file mode 100644
index 000000000000..86f3e9144a79
--- /dev/null
+++ b/sys-apps/grep/files/digest-grep-2.5.1a-r1
@@ -0,0 +1,3 @@
+MD5 52202fe462770fa6be1bb667bd6cf30c grep-2.5.1a.tar.bz2 527386
+RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb grep-2.5.1a.tar.bz2 527386
+SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132 grep-2.5.1a.tar.bz2 527386
diff --git a/sys-apps/grep/grep-2.5.1a-r1.ebuild b/sys-apps/grep/grep-2.5.1a-r1.ebuild
new file mode 100644
index 000000000000..3f73e916ca1c
--- /dev/null
+++ b/sys-apps/grep/grep-2.5.1a-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1a-r1.ebuild,v 1.1 2006/08/01 05:20:25 vapier Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 arm hppa ia64 m68k ~mips ppc ~ppc-macos ppc64 s390 sh ~sparc ~x86 ~x86-fbsd"
+IUSE="build nls static"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	pcre? ( dev-libs/libpcre )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# work around a weird sparc32 compiler bug
+	echo "" >> src/dfa.h
+
+	epatch "${FILESDIR}"/${PN}-2.5.1-manpage.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-fgrep.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-color.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-bracket.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-i18n.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-oi.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-restrict_arr.patch
+	epatch "${FILESDIR}"/2.5.1-utf8-case.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-perl-segv.patch #95495
+	epatch "${FILESDIR}"/${PN}-2.5.1-fix-devices-skip.patch #113640
+	epatch "${FILESDIR}"/${P}-nls.patch
+
+	# retarded
+	sed -i 's:__mempcpy:mempcpy:g' lib/*.c || die
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	econf \
+		--bindir=/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp) \
+		|| die "econf failed"
+
+	use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile
+
+	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 -r "${D}"/usr/share
+	else
+		dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	fi
+}
+
+pkg_postinst() {
+	if has pcre ${USE} ; then
+		ewarn "This grep ebuild no longer supports pcre.  If you want this"
+		ewarn "functionality, please use 'pcregrep' from the libpcre package."
+	fi
+}