Add back in pcre #141609.

Package-Manager: portage-2.1.1_pre4

6 files changed, 135 insertions, 17 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/Manifest b/sys-apps/grep/Manifest
index 7ee4b3769dc8..33e92f824f74 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,73 +1,100 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4e99c19bddec37c3153197b8e24bfeef ChangeLog 9647
-RMD160 471540fcc0218e1f2a5ba26fd2b6516d6cd6a007 ChangeLog 9647
-SHA256 56a012cea64cc440bbd1b264364f43c5962c09da899aedf7eac38f71162a7cbd ChangeLog 9647
+AUX 2.5.1-tests.patch 1786 RMD160 a95b24ce9b2d8c395e7396bc3ed15ec73b09088c SHA1 3c7bc0ac1993a2b91864df17fa3162cdbd677082 SHA256 c2392469fba6a6c434295b277099d19fa2b7500f69e2383bfb68e06816835f18
 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
+AUX 2.5.1-utf8-case.patch 933 RMD160 1619e4b6710047049e5776a45732b2709b117cfa SHA1 51c9ea9363370041b2c0a9b7dcc83bfd739a4723 SHA256 4f48ab49da2ec948f329dea2a133cc6f0e602e265958cf09efd554510640ae1e
 MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
 RMD160 1619e4b6710047049e5776a45732b2709b117cfa files/2.5.1-utf8-case.patch 933
 SHA256 4f48ab49da2ec948f329dea2a133cc6f0e602e265958cf09efd554510640ae1e files/2.5.1-utf8-case.patch 933
-MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r8 62
-RMD160 80f785359ea28daa64fd6fc9d893b4b6e0b19094 files/digest-grep-2.5.1-r8 62
-SHA256 dd6940081a5bee55798bd6c6c5180801e80ba5f36085a82d3056699fbafd3876 files/digest-grep-2.5.1-r8 62
-MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r9 62
-RMD160 80f785359ea28daa64fd6fc9d893b4b6e0b19094 files/digest-grep-2.5.1-r9 62
-SHA256 dd6940081a5bee55798bd6c6c5180801e80ba5f36085a82d3056699fbafd3876 files/digest-grep-2.5.1-r9 62
-MD5 aa75d543de9cdb9d9a86269a7f2216c8 files/digest-grep-2.5.1a 238
-RMD160 ed247f3fb6af7fd98d06b4cb2228706e4640a22b files/digest-grep-2.5.1a 238
-SHA256 855e142dd76e809d8ae1f95394f7adb8ccb2d8b4c9bb79336d1966ae225f8e84 files/digest-grep-2.5.1a 238
+AUX grep-2.5.1-bracket.patch 339 RMD160 0333e5113b7285ce92b4a68d89d25ff7b81211f0 SHA1 7882dc95b6cb69d64e4c68425c3a44f0c324aa71 SHA256 1a0a64ce2cfaaeef687f5d2131d12358d4c8ae3dfeceb81cf6abf6ccf17d085c
 MD5 f8a3294b57d8e444692a04436b346517 files/grep-2.5.1-bracket.patch 339
 RMD160 0333e5113b7285ce92b4a68d89d25ff7b81211f0 files/grep-2.5.1-bracket.patch 339
 SHA256 1a0a64ce2cfaaeef687f5d2131d12358d4c8ae3dfeceb81cf6abf6ccf17d085c files/grep-2.5.1-bracket.patch 339
+AUX grep-2.5.1-color.patch 313 RMD160 b4c787993fc05065bb8ec4f7b3007778650c8958 SHA1 623c25f3686adc40287ea244dd079c1e50c55c64 SHA256 f628a2a1800c9374eeece94c39b561dffd80b7f8ec587f25d00bd6301b32321d
 MD5 ea125637c880aa0e2e6ae96e5a9a01d6 files/grep-2.5.1-color.patch 313
 RMD160 b4c787993fc05065bb8ec4f7b3007778650c8958 files/grep-2.5.1-color.patch 313
 SHA256 f628a2a1800c9374eeece94c39b561dffd80b7f8ec587f25d00bd6301b32321d files/grep-2.5.1-color.patch 313
+AUX grep-2.5.1-fgrep.patch 4994 RMD160 f10371083fe3350e4cc0f79dbf1c83362f444b94 SHA1 1f9adc6363f5a3fafbd12b544bf9f927da27de34 SHA256 cab6300f7c8263fdaa3b5a1d00e46b8237bec42d4c4b6b49a3dbacab80ab9071
 MD5 829ef0ec8616173674ded06d27e12632 files/grep-2.5.1-fgrep.patch 4994
 RMD160 f10371083fe3350e4cc0f79dbf1c83362f444b94 files/grep-2.5.1-fgrep.patch 4994
 SHA256 cab6300f7c8263fdaa3b5a1d00e46b8237bec42d4c4b6b49a3dbacab80ab9071 files/grep-2.5.1-fgrep.patch 4994
+AUX grep-2.5.1-fix-devices-skip.patch 1842 RMD160 c6000aa04f11dc00d37819f2f3f1a9c76bf0aa1e SHA1 0d45ff5971ff8a7ac9e10a3eca5b101fc6a2560f SHA256 9b6809efb0ff05256a77a9a30f295dfb2f212c0eb023638ee72fde31d1d43457
 MD5 26b2ee006a2293540cadc27d9d41267a files/grep-2.5.1-fix-devices-skip.patch 1842
 RMD160 c6000aa04f11dc00d37819f2f3f1a9c76bf0aa1e files/grep-2.5.1-fix-devices-skip.patch 1842
 SHA256 9b6809efb0ff05256a77a9a30f295dfb2f212c0eb023638ee72fde31d1d43457 files/grep-2.5.1-fix-devices-skip.patch 1842
+AUX grep-2.5.1-i18n.patch 8101 RMD160 a73a25a4c089260b26ef73024adc67754ef8a1ba SHA1 2e6150a54822d128e245bfeb467a3dfc6e4ce181 SHA256 cfad5a4e033888a35442fe234f995ebd6e101155e5fdb80be5c4d02afae12ee5
 MD5 d93f52bd287bb18a64178ac3e6077677 files/grep-2.5.1-i18n.patch 8101
 RMD160 a73a25a4c089260b26ef73024adc67754ef8a1ba files/grep-2.5.1-i18n.patch 8101
 SHA256 cfad5a4e033888a35442fe234f995ebd6e101155e5fdb80be5c4d02afae12ee5 files/grep-2.5.1-i18n.patch 8101
+AUX grep-2.5.1-libintl.patch 2662 RMD160 03431703a1d375b0c0bb8a78b3b00951252d0111 SHA1 4131dddf515b04e2b8d424da6d5d9ca8c369b6dc SHA256 919e4f3bbbb07990ecf0f73a9f3eded397b67a14f40e5ec41159ecebef8f0161
 MD5 af3a45582aa7c857f0500c63c823bd52 files/grep-2.5.1-libintl.patch 2662
 RMD160 03431703a1d375b0c0bb8a78b3b00951252d0111 files/grep-2.5.1-libintl.patch 2662
 SHA256 919e4f3bbbb07990ecf0f73a9f3eded397b67a14f40e5ec41159ecebef8f0161 files/grep-2.5.1-libintl.patch 2662
+AUX grep-2.5.1-manpage.patch 612 RMD160 1ba80343c963b6830a8bb258b3317b8e7c3ccfcc SHA1 9a7577e7ad1c62dd44d87c78161599f6712b2f66 SHA256 3af50dc156cceba0605c6862ff5cf9b329fa46592247323e99e06356f696e2de
 MD5 66d2f58ded24ee5351a8a79a2d709cf8 files/grep-2.5.1-manpage.patch 612
 RMD160 1ba80343c963b6830a8bb258b3317b8e7c3ccfcc files/grep-2.5.1-manpage.patch 612
 SHA256 3af50dc156cceba0605c6862ff5cf9b329fa46592247323e99e06356f696e2de files/grep-2.5.1-manpage.patch 612
+AUX grep-2.5.1-oi.patch 1715 RMD160 af03849546ee0122883fb7efe2e45960f1636673 SHA1 8cde3d2ef33d88a24ea8bf0dee9c27b7a1b91d03 SHA256 c6c35e6b6b6ebe8f198240b85ec2acd6154e95fdc3a314dec10614fca2e3399d
 MD5 626d4c9efc866039f6893735b6f4940e files/grep-2.5.1-oi.patch 1715
 RMD160 af03849546ee0122883fb7efe2e45960f1636673 files/grep-2.5.1-oi.patch 1715
 SHA256 c6c35e6b6b6ebe8f198240b85ec2acd6154e95fdc3a314dec10614fca2e3399d files/grep-2.5.1-oi.patch 1715
+AUX grep-2.5.1-perl-segv.patch 410 RMD160 e5310adbd2befa5d30001f634f7142366cc20d00 SHA1 6a1d5bfaec46180fa56bb1c42f0fd86ea7b52509 SHA256 bc7d84e7c6ce9ecfbe3ff9a1d91a6d12183ca7553fe3eebfaa4a7f15157662e4
 MD5 b6da5288895ddd97074deb10f48b4364 files/grep-2.5.1-perl-segv.patch 410
 RMD160 e5310adbd2befa5d30001f634f7142366cc20d00 files/grep-2.5.1-perl-segv.patch 410
 SHA256 bc7d84e7c6ce9ecfbe3ff9a1d91a6d12183ca7553fe3eebfaa4a7f15157662e4 files/grep-2.5.1-perl-segv.patch 410
+AUX grep-2.5.1-restrict_arr.patch 410 RMD160 cfb62007664e37e4a3b193af0452808d0c2eb798 SHA1 ff2f1c38b487e30d958aab29033b4568116267b8 SHA256 458a43f9e069df1ef12e47ca879d0b9db5707b22080ccc7cd31bb8e6bcdc05aa
 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
+AUX grep-2.5.1a-nls.patch 1227 RMD160 c49d3604ff65b586ace6fa75a478c367cf6a0c62 SHA1 fdd1ac6d076640489fd11c405c73f490b372c414 SHA256 a92c1e75d95fadee1f4af86e818637cf54bcf9b01ece08653d23e4c31bc7c279
 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
+DIST grep-2.5.1.tar.gz 683093 RMD160 96d1fda2297a03a11c7d2fcea16effff55d2cbd0 SHA1 834c7f39b35dbaf7c9074c14a8765d6a3a58bf30 SHA256 d2c068701afae914b9a0707f2af6c373556c7b761913169ae0a7afa9fd5b2442
+DIST grep-2.5.1a.tar.bz2 527386 RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb SHA1 2cd082775d30be463c0ac674a00595eb56fda22e SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132
+EBUILD grep-2.5.1-r8.ebuild 1815 RMD160 98eae68506fa4b35db93c25718d92f5fbcd579d3 SHA1 7ff213c25ab8d7bd92874b5ff02d56bd6777c303 SHA256 d4a8d719abf53a03bb78698ed2bcb38c26c4556293fe346fb3223379d10d22ff
 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
+EBUILD grep-2.5.1-r9.ebuild 2148 RMD160 a7b3c4939e769ef6945b8914c5baf1e5fdd6a05b SHA1 aaa5fc45335c60fa5a908a88fd1a8f987ba0cd53 SHA256 a6b30f5b45d8ef59c1a500ac841e820fcd30a81b87bc6436916c3733d3a178f7
 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
+EBUILD grep-2.5.1a-r1.ebuild 2243 RMD160 522d8f3f08da42f32a8c10ba2b3f97409495b645 SHA1 a9492b6f372aef8ed87221ab9dc3fb1cf87244c4 SHA256 3ea853c3c9b624cafc984371f0a3a9e7838facddddb8bc16dd795bbb2ac8f668
+MD5 33deead5187401c03ae1c11ebc742c92 grep-2.5.1a-r1.ebuild 2243
+RMD160 522d8f3f08da42f32a8c10ba2b3f97409495b645 grep-2.5.1a-r1.ebuild 2243
+SHA256 3ea853c3c9b624cafc984371f0a3a9e7838facddddb8bc16dd795bbb2ac8f668 grep-2.5.1a-r1.ebuild 2243
+EBUILD grep-2.5.1a.ebuild 2151 RMD160 2d561c8c8baff550aef5a8e092a2a86523de8033 SHA1 126d7fe90d3d554cc76c491982712f46d947be02 SHA256 d1c39c8440bda35d2cbcf24fbf263371fb900dffbc15104cf34a483fed7301ce
 MD5 e11ad77e60d23256ce639aebdcf131f7 grep-2.5.1a.ebuild 2151
 RMD160 2d561c8c8baff550aef5a8e092a2a86523de8033 grep-2.5.1a.ebuild 2151
 SHA256 d1c39c8440bda35d2cbcf24fbf263371fb900dffbc15104cf34a483fed7301ce grep-2.5.1a.ebuild 2151
+MISC ChangeLog 9778 RMD160 8a9b3bbb3e8156ceab33a18a048bcbd19eab4ab0 SHA1 15ef1fb7e64b8c7008f8e321f5df2c3b1c431fb1 SHA256 294a29f9ce432393bc3b1a2605c1e3f25de6eb9fb1ea38973c23ae4019b4079a
+MD5 e0088e770b3b34fe7da8baff8deab7d9 ChangeLog 9778
+RMD160 8a9b3bbb3e8156ceab33a18a048bcbd19eab4ab0 ChangeLog 9778
+SHA256 294a29f9ce432393bc3b1a2605c1e3f25de6eb9fb1ea38973c23ae4019b4079a ChangeLog 9778
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 8fba87fee8863fb0773b216df92991de files/digest-grep-2.5.1-r8 232
+RMD160 dd0ab1f596f3dcaafa351f04efe2e26956bea8fb files/digest-grep-2.5.1-r8 232
+SHA256 a6b51c7512e058afae3a1d86dd203d5c403cad194569f044b025484d5df797be files/digest-grep-2.5.1-r8 232
+MD5 8fba87fee8863fb0773b216df92991de files/digest-grep-2.5.1-r9 232
+RMD160 dd0ab1f596f3dcaafa351f04efe2e26956bea8fb files/digest-grep-2.5.1-r9 232
+SHA256 a6b51c7512e058afae3a1d86dd203d5c403cad194569f044b025484d5df797be files/digest-grep-2.5.1-r9 232
+MD5 aa75d543de9cdb9d9a86269a7f2216c8 files/digest-grep-2.5.1a 238
+RMD160 ed247f3fb6af7fd98d06b4cb2228706e4640a22b files/digest-grep-2.5.1a 238
+SHA256 855e142dd76e809d8ae1f95394f7adb8ccb2d8b4c9bb79336d1966ae225f8e84 files/digest-grep-2.5.1a 238
+MD5 aa75d543de9cdb9d9a86269a7f2216c8 files/digest-grep-2.5.1a-r1 238
+RMD160 ed247f3fb6af7fd98d06b4cb2228706e4640a22b files/digest-grep-2.5.1a-r1 238
+SHA256 855e142dd76e809d8ae1f95394f7adb8ccb2d8b4c9bb79336d1966ae225f8e84 files/digest-grep-2.5.1a-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFERRRgAiZjviIA2XgRAiCDAKDIUzwfX0n4l73NroZcDEOYTB7rfQCgwypg
-yp6q7oQXBLW84A6UcwDUphM=
-=cLPW
+iD8DBQFEzuSiamhnQswr0vIRAn1EAKCXgO0CWGGVOQ6ycohESMGh0tdaGQCfRWmI
+2nbU01ZlmJ7cSq1qkzc7j54=
+=WGdS
 -----END PGP SIGNATURE-----
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
+}