Apply Debian patchset to fix "-o -i" failures.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

3 files changed, 37 insertions, 11 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 62a60c2ea066..718eca0e842f 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/grep
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.74 2007/08/16 06:05:17 vapier Exp $
+# 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 $
+
+  19 Sep 2008; Mike Frysinger <vapier@gentoo.org> grep-2.5.3.ebuild:
+  Apply Debian patchset to fix "-o -i" failures.
 
 *grep-2.5.3 (16 Aug 2007)
 
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 8d96d79e0acb..47563f6788ea 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -12,7 +15,15 @@ AUX grep-2.5.1-restrict_arr.patch 410 RMD160 cfb62007664e37e4a3b193af0452808d0c2
 AUX grep-2.5.1a-nls.patch 1227 RMD160 c49d3604ff65b586ace6fa75a478c367cf6a0c62 SHA1 fdd1ac6d076640489fd11c405c73f490b372c414 SHA256 a92c1e75d95fadee1f4af86e818637cf54bcf9b01ece08653d23e4c31bc7c279
 DIST grep-2.5.1a.tar.bz2 527386 RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb SHA1 2cd082775d30be463c0ac674a00595eb56fda22e SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132
 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.ebuild 1140 RMD160 cb4ccb20e897e65881811aef59def3fa398e76f7 SHA1 895ec01c7413393bcd0410f5d37a6adc86d318d6 SHA256 6fa422f9aa7f294da06171f7d6fc0c800a9db7edcea1abb1bb3ab86cd7126b19
-MISC ChangeLog 10604 RMD160 d8f2b6556fa2d07cfb94d1272799e1c0c6dcb5e7 SHA1 5136e3d49b3c022fa9f3032859c787b105f44676 SHA256 dbda10025528dcaebf24a3038ac8beabe6525da5c1353d860442a0a731f41f0a
+EBUILD grep-2.5.3.ebuild 1393 RMD160 1b2b6d2db6a41dae657575779b71c7e6d565254a SHA1 4a5e577a3b90a1df204f6f393b4bd082f560647f SHA256 c40a71e16d9d5d6894cb68284d0e221d13156b624a8cfba39a76b11358929cb5
+MISC ChangeLog 10723 RMD160 ea1996a7f7cde35405ff000b0def1743302877cb SHA1 acfd61f7eb8e003fcb7a00768f4e6c14ee0dc302 SHA256 6a071c0b659d364e86be5fa66bfde44d1e6024750a763fb75a8cc524e857ad6e
 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.ebuild b/sys-apps/grep/grep-2.5.3.ebuild
index 5d4cf4246f66..6196c69c6920 100644
--- a/sys-apps/grep/grep-2.5.3.ebuild
+++ b/sys-apps/grep/grep-2.5.3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.1 2007/08/16 06:05:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3.ebuild,v 1.2 2008/09/19 21:28:39 vapier Exp $
 
-inherit flag-o-matic
+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://gentoo/${P}.tar.bz2
+	mirror://debian/pool/main/g/grep/grep_${DEB_VER}.diff.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-# too many test failures -- once those get fixed, we'll ~arch
-KEYWORDS="" #~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+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 )"
@@ -20,9 +21,20 @@ DEPEND="${RDEPEND}
 	pcre? ( dev-libs/libpcre )
 	nls? ( sys-devel/gettext )"
 
-src_compile() {
+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) \