diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-03-29 21:05:38 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-29 21:05:38 +0000 |
commit | a0e2db4fec93fd350d6d3eae210381149c9a5200 (patch) | |
tree | 9952155dd3deadb6d82adaa2103b20b03f757f35 /sys-apps/grep | |
parent | Move libgee to RDEPEND, bug #311985. Update live ebuild. (diff) | |
download | gentoo-2-a0e2db4fec93fd350d6d3eae210381149c9a5200.tar.gz gentoo-2-a0e2db4fec93fd350d6d3eae210381149c9a5200.tar.bz2 gentoo-2-a0e2db4fec93fd350d6d3eae210381149c9a5200.zip |
old
Diffstat (limited to 'sys-apps/grep')
-rw-r--r-- | sys-apps/grep/files/grep-2.6.1-no-french.patch | 30 | ||||
-rw-r--r-- | sys-apps/grep/grep-2.6.1.ebuild | 40 | ||||
-rw-r--r-- | sys-apps/grep/grep-2.6.ebuild | 34 |
3 files changed, 0 insertions, 104 deletions
diff --git a/sys-apps/grep/files/grep-2.6.1-no-french.patch b/sys-apps/grep/files/grep-2.6.1-no-french.patch deleted file mode 100644 index b5ea2ab8c36a..000000000000 --- a/sys-apps/grep/files/grep-2.6.1-no-french.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 189913f75b39f3136c825e317bceafe28618a94d Mon Sep 17 00:00:00 2001 -From: Jim Meyering <meyering@redhat.com> -Date: Fri, 26 Mar 2010 07:24:48 +0100 -Subject: [PATCH] tests: avoid spurious test failure due to lack of a French UTF8 locale - -* tests/init.cfg: New file. If either $LOCALE_FR or $LOCALE_FR_UTF8 -is set to "none", reset it to the empty string. -Reported by Mike Frysinger and Sven Joachim. -* tests/Makefile.am (EXTRA_DIST): Add init.cfg. ---- - THANKS | 2 ++ - tests/Makefile.am | 1 + - tests/init.cfg | 5 +++++ - 3 files changed, 8 insertions(+), 0 deletions(-) - create mode 100644 tests/init.cfg - -diff --git a/tests/init.cfg b/tests/init.cfg -new file mode 100644 -index 0000000..6fec55e ---- /dev/null -+++ tests/init.cfg -@@ -0,0 +1,5 @@ -+# This file is sourced by init.sh, *before* its initialization. -+ -+# Map settings of "none" to the empty string. -+test _"$LOCALE_FR" = _none && LOCALE_FR= -+test _"$LOCALE_FR_UTF8" = _none && LOCALE_FR_UTF8= --- -1.7.0.2 - diff --git a/sys-apps/grep/grep-2.6.1.ebuild b/sys-apps/grep/grep-2.6.1.ebuild deleted file mode 100644 index 8821dbd8cf71..000000000000 --- a/sys-apps/grep/grep-2.6.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.6.1.ebuild,v 1.1 2010/03/27 04:48:51 vapier Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz - mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="nls pcre" - -RDEPEND="nls? ( virtual/libintl ) - pcre? ( >=dev-libs/libpcre-7.8-r1 )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-french.patch -} - -src_configure() { - econf \ - --bindir=/bin \ - $(use_enable nls) \ - $(use_enable pcre perl-regexp) \ - $(use elibc_FreeBSD || echo --without-included-regex) \ - || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO -} diff --git a/sys-apps/grep/grep-2.6.ebuild b/sys-apps/grep/grep-2.6.ebuild deleted file mode 100644 index 60fbc2bc5c31..000000000000 --- a/sys-apps/grep/grep-2.6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.6.ebuild,v 1.1 2010/03/23 21:11:54 vapier Exp $ - -EAPI="2" - -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz - mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="nls pcre" - -RDEPEND="nls? ( virtual/libintl ) - pcre? ( >=dev-libs/libpcre-7.8-r1 )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_configure() { - econf \ - --bindir=/bin \ - $(use_enable nls) \ - $(use_enable pcre perl-regexp) \ - $(use elibc_FreeBSD || echo --without-included-regex) \ - || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO -} |