Fix bug #238235. This is a very important upgrade for anybody using the 2.5.3-r0, which breaks grep -i in UTF-8 environments.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 62 insertions, 12 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 718eca0e842f..dd5bd8d4e53d 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.75 2008/09/19 21:28:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.76 2008/10/07 09:01:39 robbat2 Exp $
+
+*grep-2.5.3-r1 (07 Oct 2008)
+
+  07 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> +grep-2.5.3-r1.ebuild:
+  Fix bug #238235. This is a very important upgrade for anybody using the
+  2.5.3-r0, which breaks grep -i in UTF-8 environments.
 
   19 Sep 2008; Mike Frysinger <vapier@gentoo.org> grep-2.5.3.ebuild:
   Apply Debian patchset to fix "-o -i" failures.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 47563f6788ea..4cbaefdbbeb3 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.5.1-utf8-case.patch 933 RMD160 1619e4b6710047049e5776a45732b2709b117cfa SHA1 51c9ea9363370041b2c0a9b7dcc83bfd739a4723 SHA256 4f48ab49da2ec948f329dea2a133cc6f0e602e265958cf09efd554510640ae1e
 AUX grep-2.5.1-bracket.patch 339 RMD160 0333e5113b7285ce92b4a68d89d25ff7b81211f0 SHA1 7882dc95b6cb69d64e4c68425c3a44f0c324aa71 SHA256 1a0a64ce2cfaaeef687f5d2131d12358d4c8ae3dfeceb81cf6abf6ccf17d085c
 AUX grep-2.5.1-color.patch 313 RMD160 b4c787993fc05065bb8ec4f7b3007778650c8958 SHA1 623c25f3686adc40287ea244dd079c1e50c55c64 SHA256 f628a2a1800c9374eeece94c39b561dffd80b7f8ec587f25d00bd6301b32321d
@@ -17,13 +14,7 @@ DIST grep-2.5.1a.tar.bz2 527386 RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb
 DIST grep-2.5.3.tar.bz2 618184 RMD160 dafa692fd67dfcd1c94115e9831d291b29fa7729 SHA1 53227ca9a01d5548448372f9b2e9111adf159f3b SHA256 d22dd8d626e557271aa555e7a06884a0114968845400ce1e7ab6f82b1f44b8fd
 DIST grep_2.5.3~dfsg-6.diff.gz 17449 RMD160 88e13b03b661924b5a85bb783f9e936a3a5cfeab SHA1 d700ecdc27d45ba195e2c2d05c25365920788f71 SHA256 cd1253d672bcda0b530a0ac0ece8c4953353018a8a9d4dd0395333fc30a12cd9
 EBUILD grep-2.5.1a-r1.ebuild 1987 RMD160 1cfee753db688fb73ec637c3130cc0ee95e786d1 SHA1 f9f924b92d8f5e6fa9a654320d19626e0c7f2a43 SHA256 189e58f579c4bb4a689b650c352eb022cdc9df1d66355d9590ba5b570658cc11
+EBUILD grep-2.5.3-r1.ebuild 1426 RMD160 be2fb9d99b5c30f6b5fd574cc9600cc31f1e29f9 SHA1 f4f3057ab8533c5c63431c96a8ea1faae9df5761 SHA256 0fa57e46385bda0bd2fabc5bbdfa52dc2eb71338cf5d72e6e95d790b5bc00699
 EBUILD grep-2.5.3.ebuild 1393 RMD160 1b2b6d2db6a41dae657575779b71c7e6d565254a SHA1 4a5e577a3b90a1df204f6f393b4bd082f560647f SHA256 c40a71e16d9d5d6894cb68284d0e221d13156b624a8cfba39a76b11358929cb5
-MISC ChangeLog 10723 RMD160 ea1996a7f7cde35405ff000b0def1743302877cb SHA1 acfd61f7eb8e003fcb7a00768f4e6c14ee0dc302 SHA256 6a071c0b659d364e86be5fa66bfde44d1e6024750a763fb75a8cc524e857ad6e
+MISC ChangeLog 10961 RMD160 8754ab4216f48fc126780fc30eb5bfa7c58211af SHA1 90f5a986fa11bf259a48422d03d5db10fde9af51 SHA256 9a904f23003bcf29ab20f24d9c4b6a74dba8a773d395ed8e9ced5e7481b794e3
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjUGY0ACgkQ67wieSYcaxcqhwCdHFCyHJi9QS6Q7DDJRCJoCFMq
-CA8AniMeil6x0E2fJqWtgKRxE+laaJys
-=dMpa
------END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.5.3-r1.ebuild b/sys-apps/grep/grep-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..61e68a9087ec
--- /dev/null
+++ b/sys-apps/grep/grep-2.5.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3-r1.ebuild,v 1.1 2008/10/07 09:01:39 robbat2 Exp $
+
+inherit flag-o-matic eutils
+
+DEB_VER="${PV}~dfsg-6"
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2
+	mirror://debian/pool/main/g/grep/grep_${DEB_VER}.diff.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls pcre static"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	pcre? ( dev-libs/libpcre )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}"/grep_${DEB_VER}.diff
+	EPATCH_FORCE="yes" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_MULTI_MSG="Applying Debian patchset (${DEB_VER}) ..." \
+	epatch ${P}~dfsg/debian/patches/
+
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	econf \
+		--bindir=/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp) \
+		--without-included-regex \
+		|| die "econf failed"
+
+	use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}