Version bump. Fixes #232041 #269734 #274436 #283574.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 44b8f26f7cd9031504caf561dcfb8156a2f87cfb..5d5c96ead976a31a8773ac6adcf5a5b927b109d4 100644 (file)
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/grep
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.92 2009/10/22 16:32:40 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.93 2010/03/23 21:11:54 vapier Exp $
+
+*grep-2.6 (23 Mar 2010)
+
+  23 Mar 2010; Mike Frysinger <vapier@gentoo.org> +grep-2.6.ebuild:
+  Version bump. Fixes #232041 #269734 #274436 #283574.
 
   22 Oct 2009; Peter Alfredsen <loki_val@gentoo.org> -grep-2.5.1a-r1.ebuild,
   -grep-2.5.3-r1.ebuild, -grep-2.5.4.ebuild:

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 1a9eb27f1b4f85240a944b34ac02080aa7fb5009..b0e5ad8a173e38f322c49e5600fb81949ddef6b0 100644 (file)
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 AUX grep-2.5.3-nls.patch 1339 RMD160 1f395f9bea5097c92a258cf4b06ff186a8a8710b SHA1 c72efe2cc35295acf5611b11369c827489575edf SHA256 fbeab3c37dcea3905aad14b87eddc14d035532af6fa0f3a126c52d0ca709edea
 AUX grep-2.5.3-po-builddir-fix.patch 252 RMD160 e2d58380b32de1ba6ecf47a4d2f93bd25186cbb5 SHA1 0cf165687ae45c3a79f37497a0dc7bf40ed3fa7a SHA256 5475ff7cb45b1b744618b5687ea8e130a4922888bd222f230a6f2856fc0c8b4a
 DIST grep-2.5.4.tar.bz2 723181 RMD160 52abf25681bc6830f372ea7607480da69eaa06fd SHA1 9bbd4f02b18bb264e0fcb17293b6f0445c8694d2 SHA256 0abec64e01458fbd032e33351d8071602a959529ea796965e98338ee83a40020
+DIST grep-2.6.tar.gz 1293258 RMD160 5c5bb6c8c616f5803523ce762285ed34bad34d81 SHA1 ae447c0aec0559e24d7fe5848db943b3ec39a7b0 SHA256 2d0550a1f4578b7778adebadb047f90b2bd62b289e192662b7f2f3ee2ea0d9f2
 EBUILD grep-2.5.4-r1.ebuild 1109 RMD160 05717fd64981f6eaeb7e48bc4f46fdbce3247263 SHA1 007aa4919489ed4f6218b60efd29fd1705b4fb05 SHA256 65dc001df85002132c01ee867b8eb0e5911be811998be9c8cf09ba17d0ad8d14
-MISC ChangeLog 13168 RMD160 96b510ddbeffa9ad9f7f9ad04db10a4489fec4c9 SHA1 6509e6aff3d0af473d93fbf4d456e71c5ec9b8b6 SHA256 8535f54d393dc471951bc2ccc2a88ad54d0a97cd2a868f5e4454cf8b176fa5fb
+EBUILD grep-2.6.ebuild 981 RMD160 2c3996c66595056b33da23b31e0f4ecf2424c296 SHA1 1d7cdff5b16d19e2b7ba6dcc901e1ce3ca1bdbd7 SHA256 726d3e626b8a9a8adbf2dd854858e701056e742db5b1e07ebbaf96a91e5df585
+MISC ChangeLog 13315 RMD160 c05324661cd88923461261e1c45a0064e3e51599 SHA1 1a256dea818fad5ed8db78d57750036f13faff93 SHA256 36f3f0312336aa1e8942986df94f0426a5b280ef50a519bb55811ec4d710de49
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkuReokACgkQTwhj9JtAlp791gEAhkdKD++ihPnxdeulLMQCDckY
-LfjyC3G2yEC9bwrlStMA/2pVGOCHUBa5PwzZnHvod7GDf281Igu+Kv2G6E2gT9gc
-=pKTa
+iF4EAREIAAYFAkupLp8ACgkQTwhj9JtAlp6ltQEAtyE+NoJxRrFrGaK5Q2JM4OvE
+CWMx7PwydIzVUxUd6AkA/ji2WGqTxuCCtyCwbEdLPa1KX4yZx77I3P+tcd7ykH4K
+=VzzG
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/grep/grep-2.6.ebuild b/sys-apps/grep/grep-2.6.ebuild
new file mode 100644 (file)
index 0000000..60fbc2b
--- /dev/null
+++ b/sys-apps/grep/grep-2.6.ebuild
@@ -0,0 +1,34 @@
+# 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
+}