rev bump to get use perl fix

4 files changed, 70 insertions, 2 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 9479cdfbd439..a0bd2327d627 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2004/06/11 23:29:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.25 2004/06/11 23:35:04 mr_bones_ Exp $
+
+*grep-2.5.1-r3 (11 Jun 2004)
+
+  11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r3.ebuild:
+  rev bump to get use perl fix
 
   11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r2.ebuild:
   compile statically if use perl to address bug #53627
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 71eb562390d5..d61dcf1db2de 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,8 +1,10 @@
-MD5 ee1a76b351f832367132dcd040476fd8 ChangeLog 3950
+MD5 6e6ef101980874b565586c33ea530541 ChangeLog 4089
 MD5 3e56378adb5662b815f5785cb02c6c9c grep-2.5.1-r1.ebuild 1522
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 18b4dae3b78004536aa909c6c762e671 grep-2.5.1-r2.ebuild 1619
+MD5 486e939fb4e94d3026094587387c0ed3 grep-2.5.1-r3.ebuild 1619
 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
 MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r3 62
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r3 b/sys-apps/grep/files/digest-grep-2.5.1-r3
new file mode 100644
index 000000000000..ef03a032aa20
--- /dev/null
+++ b/sys-apps/grep/files/digest-grep-2.5.1-r3
@@ -0,0 +1 @@
+MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/grep-2.5.1-r3.ebuild b/sys-apps/grep/grep-2.5.1-r3.ebuild
new file mode 100644
index 000000000000..832ff54ce3ad
--- /dev/null
+++ b/sys-apps/grep/grep-2.5.1-r3.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-r3.ebuild,v 1.1 2004/06/11 23:35:04 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 || use perl ; 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
+}