4 files changed, 61 insertions, 13 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index e0527b712333..72c719f65f50 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,12 @@
 # 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.64 2006/04/07 08:08:07 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.65 2006/04/18 16:34:13 flameeyes Exp $
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/grep-2.5.1a-nls.patch, grep-2.5.1a.ebuild:
+  Replace libintl patch on latest version with one that actually disables nls
+  support instead of forcing linking against libintl. Update deps to add
+  virtual/libintl.
 
   07 Apr 2006; Emanuele Giaquinta <exg@gentoo.org> grep-2.5.1a.ebuild:
   Stable on ppc.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index ee924febc8d7..7ee4b3769dc8 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 322ce4fd573e184042fb9471027bdd32 ChangeLog 9365
-RMD160 c5a675c7ebc067aa2a4f0ec6584b666811019985 ChangeLog 9365
-SHA256 d735cfb1e2f75c5e0ac820b561332686f9ce0ea7dff5033bab22b1d909fcc999 ChangeLog 9365
+MD5 4e99c19bddec37c3153197b8e24bfeef ChangeLog 9647
+RMD160 471540fcc0218e1f2a5ba26fd2b6516d6cd6a007 ChangeLog 9647
+SHA256 56a012cea64cc440bbd1b264364f43c5962c09da899aedf7eac38f71162a7cbd ChangeLog 9647
 MD5 16d6cd54c93041d4f4bef59a9e327d04 files/2.5.1-tests.patch 1786
 RMD160 a95b24ce9b2d8c395e7396bc3ed15ec73b09088c files/2.5.1-tests.patch 1786
 SHA256 c2392469fba6a6c434295b277099d19fa2b7500f69e2383bfb68e06816835f18 files/2.5.1-tests.patch 1786
@@ -49,22 +49,25 @@ SHA256 bc7d84e7c6ce9ecfbe3ff9a1d91a6d12183ca7553fe3eebfaa4a7f15157662e4 files/gr
 MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
 RMD160 cfb62007664e37e4a3b193af0452808d0c2eb798 files/grep-2.5.1-restrict_arr.patch 410
 SHA256 458a43f9e069df1ef12e47ca879d0b9db5707b22080ccc7cd31bb8e6bcdc05aa files/grep-2.5.1-restrict_arr.patch 410
+MD5 55251575c3b22b67167f7de065072b8f files/grep-2.5.1a-nls.patch 1227
+RMD160 c49d3604ff65b586ace6fa75a478c367cf6a0c62 files/grep-2.5.1a-nls.patch 1227
+SHA256 a92c1e75d95fadee1f4af86e818637cf54bcf9b01ece08653d23e4c31bc7c279 files/grep-2.5.1a-nls.patch 1227
 MD5 2fc0723f9c553e186987ccbec2add9f5 grep-2.5.1-r8.ebuild 1815
 RMD160 98eae68506fa4b35db93c25718d92f5fbcd579d3 grep-2.5.1-r8.ebuild 1815
 SHA256 d4a8d719abf53a03bb78698ed2bcb38c26c4556293fe346fb3223379d10d22ff grep-2.5.1-r8.ebuild 1815
 MD5 b8b7aba840af8eaea3216251ad076150 grep-2.5.1-r9.ebuild 2148
 RMD160 a7b3c4939e769ef6945b8914c5baf1e5fdd6a05b grep-2.5.1-r9.ebuild 2148
 SHA256 a6b30f5b45d8ef59c1a500ac841e820fcd30a81b87bc6436916c3733d3a178f7 grep-2.5.1-r9.ebuild 2148
-MD5 0b8ec4baa5d9a413770816703cd92fea grep-2.5.1a.ebuild 2139
-RMD160 1c76830645c15e3bbd89afdfc41b8c83a940cd2c grep-2.5.1a.ebuild 2139
-SHA256 352dc5489247c66e3760f248159497a447e1fc61c74abeac62f56fa44d03b2cd grep-2.5.1a.ebuild 2139
+MD5 e11ad77e60d23256ce639aebdcf131f7 grep-2.5.1a.ebuild 2151
+RMD160 2d561c8c8baff550aef5a8e092a2a86523de8033 grep-2.5.1a.ebuild 2151
+SHA256 d1c39c8440bda35d2cbcf24fbf263371fb900dffbc15104cf34a483fed7301ce grep-2.5.1a.ebuild 2151
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFENh2N2iXjgNjfe5sRAqApAJ0QN5VjGTjYDxzZyHxc/swodSRyWACcCM8b
-rXWgHQZ7NS6oZGrjthqCXGQ=
-=eHUs
+iD8DBQFERRRgAiZjviIA2XgRAiCDAKDIUzwfX0n4l73NroZcDEOYTB7rfQCgwypg
+yp6q7oQXBLW84A6UcwDUphM=
+=cLPW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/files/grep-2.5.1a-nls.patch b/sys-apps/grep/files/grep-2.5.1a-nls.patch
new file mode 100644
index 000000000000..91fb49798b3b
--- /dev/null
+++ b/sys-apps/grep/files/grep-2.5.1a-nls.patch
@@ -0,0 +1,39 @@
+Index: grep-2.5.1a/src/dfa.c
+===================================================================
+--- grep-2.5.1a.orig/src/dfa.c
++++ grep-2.5.1a/src/dfa.c
+@@ -102,7 +102,7 @@ extern void free();
+ /* If we (don't) have I18N.  */
+ /* glibc defines _ */
+ #ifndef _
+-# ifdef HAVE_LIBINTL_H
++# if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H)
+ #  include <libintl.h>
+ #  ifndef _
+ #   define _(Str) gettext (Str)
+Index: grep-2.5.1a/lib/obstack.c
+===================================================================
+--- grep-2.5.1a.orig/lib/obstack.c
++++ grep-2.5.1a/lib/obstack.c
+@@ -451,7 +451,7 @@ _obstack_memory_used (h)
+ 
+ /* Define the error handler.  */
+ #ifndef _
+-# ifdef HAVE_LIBINTL_H
++# if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H)
+ #  include <libintl.h>
+ #  ifndef _
+ #   define _(Str) gettext (Str)
+Index: grep-2.5.1a/lib/regex.c
+===================================================================
+--- grep-2.5.1a.orig/lib/regex.c
++++ grep-2.5.1a/lib/regex.c
+@@ -112,7 +112,7 @@
+ #endif
+ 
+ /* This is for other GNU distributions with internationalized messages.  */
+-#if HAVE_LIBINTL_H || defined _LIBC
++#if ENABLE_NLS && (HAVE_LIBINTL_H || defined _LIBC)
+ # include <libintl.h>
+ # ifdef _LIBC
+ #  undef gettext
diff --git a/sys-apps/grep/grep-2.5.1a.ebuild b/sys-apps/grep/grep-2.5.1a.ebuild
index 77b3436c164e..bbb7ba0ad21c 100644
--- a/sys-apps/grep/grep-2.5.1a.ebuild
+++ b/sys-apps/grep/grep-2.5.1a.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.6 2006/04/07 08:08:07 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1a.ebuild,v 1.7 2006/04/18 16:34:13 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ 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=""
+RDEPEND="nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
@@ -34,8 +34,8 @@ src_unpack() {
 	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-libintl.patch #92586
 	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