4 files changed, 84 insertions, 5 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 5d5c96ead976..4029b796fc0a 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.93 2010/03/23 21:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.94 2010/03/27 04:48:51 vapier Exp $
+
+*grep-2.6.1 (27 Mar 2010)
+
+  27 Mar 2010; Mike Frysinger <vapier@gentoo.org> +grep-2.6.1.ebuild,
+  +files/grep-2.6.1-no-french.patch:
+  Version bump.
 
 *grep-2.6 (23 Mar 2010)
 
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index b0e5ad8a173e..856b6beeb2ba 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -3,16 +3,19 @@ Hash: SHA256
 
 AUX grep-2.5.3-nls.patch 1339 RMD160 1f395f9bea5097c92a258cf4b06ff186a8a8710b SHA1 c72efe2cc35295acf5611b11369c827489575edf SHA256 fbeab3c37dcea3905aad14b87eddc14d035532af6fa0f3a126c52d0ca709edea
 AUX grep-2.5.3-po-builddir-fix.patch 252 RMD160 e2d58380b32de1ba6ecf47a4d2f93bd25186cbb5 SHA1 0cf165687ae45c3a79f37497a0dc7bf40ed3fa7a SHA256 5475ff7cb45b1b744618b5687ea8e130a4922888bd222f230a6f2856fc0c8b4a
+AUX grep-2.6.1-no-french.patch 987 RMD160 d8ab8783879dbb97ec7f88c41b36d9f902b7ca5b SHA1 031f95b7cbf0140f8e5432e1ed258d3af36a69de SHA256 ef963e8842958fbdf63fbad71760b508a85022ad6e3d8b4dffcc774a486fb865
 DIST grep-2.5.4.tar.bz2 723181 RMD160 52abf25681bc6830f372ea7607480da69eaa06fd SHA1 9bbd4f02b18bb264e0fcb17293b6f0445c8694d2 SHA256 0abec64e01458fbd032e33351d8071602a959529ea796965e98338ee83a40020
+DIST grep-2.6.1.tar.gz 1304809 RMD160 2b2eb774f843f9e59533a5052da071eae5fb2509 SHA1 c42abdaed72545615a70bd8530c59fe125eaee8a SHA256 2d0d29431c4fdaa62fc1d9b9bfac65d7ba7a559077d35d7cef12fb9be3d80d78
 DIST grep-2.6.tar.gz 1293258 RMD160 5c5bb6c8c616f5803523ce762285ed34bad34d81 SHA1 ae447c0aec0559e24d7fe5848db943b3ec39a7b0 SHA256 2d0550a1f4578b7778adebadb047f90b2bd62b289e192662b7f2f3ee2ea0d9f2
 EBUILD grep-2.5.4-r1.ebuild 1109 RMD160 05717fd64981f6eaeb7e48bc4f46fdbce3247263 SHA1 007aa4919489ed4f6218b60efd29fd1705b4fb05 SHA256 65dc001df85002132c01ee867b8eb0e5911be811998be9c8cf09ba17d0ad8d14
+EBUILD grep-2.6.1.ebuild 1061 RMD160 76a952f65c2b32ffe2745a703310545262121c68 SHA1 48a194c1a88dd20618265295ef614ba4526b5d25 SHA256 8c87c7568d49932d1e7a3f6e0ff30d27830dff10f8759f67e621a726b96df932
 EBUILD grep-2.6.ebuild 981 RMD160 2c3996c66595056b33da23b31e0f4ecf2424c296 SHA1 1d7cdff5b16d19e2b7ba6dcc901e1ce3ca1bdbd7 SHA256 726d3e626b8a9a8adbf2dd854858e701056e742db5b1e07ebbaf96a91e5df585
-MISC ChangeLog 13315 RMD160 c05324661cd88923461261e1c45a0064e3e51599 SHA1 1a256dea818fad5ed8db78d57750036f13faff93 SHA256 36f3f0312336aa1e8942986df94f0426a5b280ef50a519bb55811ec4d710de49
+MISC ChangeLog 13466 RMD160 492b95ec4036a00b87cf7544da048a36b2ccd4f7 SHA1 0e61cfe293023bcc69a23e01673ed95530b839db SHA256 6c670f7320310a9510d0d2beb17db3d637b234c2d9cad5730858248970f6688b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkupLp8ACgkQTwhj9JtAlp6ltQEAtyE+NoJxRrFrGaK5Q2JM4OvE
-CWMx7PwydIzVUxUd6AkA/ji2WGqTxuCCtyCwbEdLPa1KX4yZx77I3P+tcd7ykH4K
-=VzzG
+iF4EAREIAAYFAkutjjQACgkQTwhj9JtAlp5U/gD/UBbYI6m8muKd6SytLT5/Cq7y
+O/pc5ibevj0tTUL218oBAMje6p5YFI7holjjqxWnIzlAzZPGsPo94a2PRRqFp/ld
+=k369
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/files/grep-2.6.1-no-french.patch b/sys-apps/grep/files/grep-2.6.1-no-french.patch
new file mode 100644
index 000000000000..b5ea2ab8c36a
--- /dev/null
+++ b/sys-apps/grep/files/grep-2.6.1-no-french.patch
@@ -0,0 +1,30 @@
+From 189913f75b39f3136c825e317bceafe28618a94d Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Fri, 26 Mar 2010 07:24:48 +0100
+Subject: [PATCH] tests: avoid spurious test failure due to lack of a French UTF8 locale
+
+* tests/init.cfg: New file.  If either $LOCALE_FR or $LOCALE_FR_UTF8
+is set to "none", reset it to the empty string.
+Reported by Mike Frysinger and Sven Joachim.
+* tests/Makefile.am (EXTRA_DIST): Add init.cfg.
+---
+ THANKS            |    2 ++
+ tests/Makefile.am |    1 +
+ tests/init.cfg    |    5 +++++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 tests/init.cfg
+
+diff --git a/tests/init.cfg b/tests/init.cfg
+new file mode 100644
+index 0000000..6fec55e
+--- /dev/null
++++ tests/init.cfg
+@@ -0,0 +1,5 @@
++# This file is sourced by init.sh, *before* its initialization.
++
++# Map settings of "none" to the empty string.
++test _"$LOCALE_FR" = _none && LOCALE_FR=
++test _"$LOCALE_FR_UTF8" = _none && LOCALE_FR_UTF8=
+-- 
+1.7.0.2
+
diff --git a/sys-apps/grep/grep-2.6.1.ebuild b/sys-apps/grep/grep-2.6.1.ebuild
new file mode 100644
index 000000000000..8821dbd8cf71
--- /dev/null
+++ b/sys-apps/grep/grep-2.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.6.1.ebuild,v 1.1 2010/03/27 04:48:51 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="nls pcre"
+
+RDEPEND="nls? ( virtual/libintl )
+	pcre? ( >=dev-libs/libpcre-7.8-r1 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-french.patch
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp) \
+		$(use elibc_FreeBSD || echo --without-included-regex) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}