diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-09-19 21:28:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-09-19 21:28:39 +0000 |
| commit | 10a703bb5054f169ff702150040f3185f7e16a80 (patch) | |
| tree | d04052d64b763bfc8086a09456892b06d5a3093e /sys-apps/grep | |
| parent | Fix description to clarify which version of gtksourceview these bindings are for (diff) | |
| download | gentoo-2-10a703bb5054f169ff702150040f3185f7e16a80.tar.gz gentoo-2-10a703bb5054f169ff702150040f3185f7e16a80.tar.bz2 gentoo-2-10a703bb5054f169ff702150040f3185f7e16a80.zip | |
Apply Debian patchset to fix "-o -i" failures.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.2 x86_64)
Diffstat (limited to 'sys-apps/grep')
| -rw-r--r-- | sys-apps/grep/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.3.ebuild | 26 |
2 files changed, 24 insertions, 9 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/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) \ |