Version bump; fixing regression introduced in 2.19.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 56 insertions, 15 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 5b0868858357..b9739ff6b201 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.145 2014/05/23 07:53:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.146 2014/06/04 05:15:09 ssuominen Exp $
+
+*grep-2.20 (04 Jun 2014)
+
+  04 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> +grep-2.20.ebuild:
+  Version bump; fixing regression introduced in 2.19.
 
 *grep-2.19 (23 May 2014)
 
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index ace530ee0785..529c81c7b8e9 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -7,25 +7,21 @@ AUX grep-2.15-fix_pcre_abort_regression.patch 4194 SHA256 cd2aa132e0726aa51aa957
 DIST grep-2.16.tar.xz 1210192 SHA256 16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162 SHA512 6b56aca3c859c28d463e1aa755f4f004087985573a8e012a8371780d6b7cbfa8587d5b0bfd2d37b1ddf6c3a49b9126d1e1408d2cc9255558f6cd5754b395b9f9 WHIRLPOOL 008f8338335fd50867fe08306330b679ba5809ecd64837901651bc90f31ed620be2377da0aba90fd57f099fa89bd2cbaf9fc08c8d18cd9aba229c613671c358f
 DIST grep-2.18.tar.xz 1213220 SHA256 e6436e5077fa1497feccc8feaabd3f507b172369bf120fbc9e4874bba81be720 SHA512 2d0e6cf9dc47a49d72ecb3e2c3b7bd8dd4d9cdef7bcec002af2c41e6cc57c26520b115188477ba7bfdf7c67fea86d1105450227f9df2900aac16ea6bb7783263 WHIRLPOOL 3bf001360c72f2dac05af609960b6a05f56a3d8f6906a616064ad990c9a3a048cfb1641d2db4d5b8a5385e99d62dbc991c074a0d10e175f19ec6023e3727c5a5
 DIST grep-2.19.tar.xz 1234676 SHA256 6388295be48cfcaf7665d9cd3914e6625ea000e9414132bfefd45cf1d8eec34d SHA512 1672ffc64dcb6085d18ac829b8af30d74fbc84d895869a0f152f103bc44c40a7db43c69cf0ee9e3f923cc1eddd68803220f041cc919663efcbdd697a3d4ef15e WHIRLPOOL 09b6ec74b8dfd52003946e0a3f75896edb305106d2811a1840ebd4300cbd120fc33471294716eb409fadcb77d2ecad8cc3f15c71992b6666cc68bbb0764cd9da
+DIST grep-2.20.tar.xz 1237196 SHA256 f0af452bc0d09464b6d089b6d56a0a3c16672e9ed9118fbe37b0b6aeaf069a65 SHA512 97e0a92a84727eb590099ffdd44f296eff2232d1f3d508a9391e8a9976993da2b49ea80381d9b711609cb86d889a2d5903aaf2f14d79ad10b2bea1027a8a498e WHIRLPOOL 79cd992bf1c631442186cf19d1f7770fd986fef9c4d852c756f95c93639c82c1aff79a43cf37febf29152b07bf1c0c0bcffa7d9ad66442edc2cbd252c8540a1e
 EBUILD grep-2.16.ebuild 1430 SHA256 ea8ff2e9633f76015b4a9cafedfefdd9712ab04745685b1f177065aa0e434ce6 SHA512 33f8982aa2d607aa5309c24688beda0c5b1e4baf9c2d61739e8367f61c10ab910d4992175b82d0a19924099bd3350991fb0dac5ab8095b0b8763750891a30898 WHIRLPOOL a53df626b3ca0b79764231b1dc59ec8194cf564e76f0b8a526c02691b718897c3f69711675515d7d632e16f3ba17d54a2766893eae72fc7d4569054716dddfe4
 EBUILD grep-2.18.ebuild 1451 SHA256 919151dc7ac801119427836b8bc828fb71618cb6f2710be66801814253946c7f SHA512 ecba46cf3a3efdfa355efaef7c1cbdf33159188b36c7053ec302aeb39b6e367923ee321189bff492113e92db8c5652e933fe406852223b97d6053a4a32ca545a WHIRLPOOL 91020b0fd3c0ee83d8b896bdc9066d7f7e71d8ddf2646443318f45b504c36de284418ac655a1420caa407717ceb05e9f13eecb37d22e34aecaf5c470ff71ac28
 EBUILD grep-2.19.ebuild 1451 SHA256 39b1d67b099a4c0d171816b39ce170117446899247f960a8ab021e2a69e0f523 SHA512 d3efb75f8aec8dff1426f6850a22b25513ad3dcee4d883202e66e4719dd53893ddf99b373137c2cd1f93c3ed508a5bef10f16f9ba38e7e2c6a12075a122e330e WHIRLPOOL f52c5aa0fe67c1e4704588952e583c7f7f124532252fc2fef8a8bd14ad82aa3d693d96c6d112be333084ee60d3596ff857ff6ac52fdc80dfbf34df06baffc408
-MISC ChangeLog 19601 SHA256 e63aca00a33466f63fb4c30359698d1ea6513c3c3a8d7a6f926d89c0039f3103 SHA512 eb6a21d2a47187e4aedd1bdfe2b153b0b99d555cc284146c042550692287492d84d01b80794f3ed67111f5d8b12c2a706f454897fa384f9c663ae2b4618a7287 WHIRLPOOL a6e8295bb8e3f55b8dff3952e3d0c2fbacfbf2e08f44f92dc83de624dda0e1299647e80506213296ad7a1c516fcf66e767326e7141050199818415233ceb62ac
+EBUILD grep-2.20.ebuild 1448 SHA256 bd87b842fc0e6612602e231eed6f5cb24eedefd990a68720d1a9df3b8248df51 SHA512 1f3046f133ea84d990112034618fba3e2ef3540e6cc3e3f89cfdaa210bd7a233fc8879e5cfbe3900c294afd31b2b7f38c8a1f64f62c0ff1e803400e5431f2bd8 WHIRLPOOL 98284ccd0ce6a651a935dfa81bd45eb60c9b1582c52ab3d48537f8e90e482fb54389b206dfa60cd4884a9c8a7ec171a4d9bc8940fb212c96c5d9c52b1bc83d3f
+MISC ChangeLog 19752 SHA256 d9c268e8f996c4b11c4e6bb5b363403f3a03ba7da42c63ba8d3662d8641af354 SHA512 accbf3f929ae0c17e61ba259d9613d01f1b51da7e8a625e022a3ce909be9229aeae3ddb7fd42543c50678e885b14e74ad08281f51b47a128c2041654cf906449 WHIRLPOOL b9dbf8551a32f0c679a3a49dda9f3e0a4317f2c12d5bfe739540c13e4ebfc7e9b29c72221de960f0c76d2972d31359f1a3dd8369d60703267e5412fd3e85da77
 MISC metadata.xml 239 SHA256 81e2263e85947bfea9b25bba8e5e5ee4c8926035903d4a603b0b89a9727eb754 SHA512 63460f39b4c7c948542e78143e0a2965b0915d4e6312a18799a6c8120c97625ee926f18f62e70caf2748a2136ce5848de387b537a12ed882fdca1aab326f0111 WHIRLPOOL 2e280afad5417d07550f36f74114cee1a02df44540ee65d7bfd1028d571dd35d5d6358f792ffc79f172f161ac4f17f38093963e5148c315b35b49bec0bc8397d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTfv5eAAoJEPiazRVxLXTFMtMQAN1qaFYZKSIIKTZA/lYgOwiO
-TzSusRay6v+YTpNoIi7GK1KU7CJ6EYY6xa4rY/mOBs08Hrlye5gdrc/M2nr9m2Uh
-WZeGOAKw5ywztM1uPKszmF7kZlYTAcJhU8/P5TUZ/M8YKNpHXuxavVsbJRT+7TQw
-qhPlHYs8qOd0hCLspZJe2ygLG8KeUykNDEH+Xo8IYgkdBtWXr32TpEY/akrJSnOY
-kMM6VecYbiTyNC7bZ5EE5gRyVXJjRGxto3FaH19XvWP9VgOKsqGzoOur3pgG1o3x
-dVyszSPGxjsFtIA8DZ76QP5tAG5DOCBBuxMdnOFX/liKvJetmiv4FVopvEMjcrTV
-XooHYIOvf/208bvgnVaj0qjLwADY+K2iFdMXNriK0Gm8WTDvMYKFDX7EzGKFiDEP
-v0bE25kwKjt4GNwOgH5xjIxdgfXgdHR8EDm3m+FSEnhxRtfkQCzqxByhqLBIEEnu
-qIdMjDa+cZ++aGl8bcfKcmabo/Ez+ITc7GvTyAccZ23s5bEkCYb6R7dH9c5O94rC
-celt6ZpS/o9v5Go2oM3N8o3nRycrbqK/NH5gSJp39I8yOJCvTmDk5zSknTEgOYKU
-OD03PEJfE1j3xmhjynnIzOE9Qi/Mtd8sF2QlISi9NpHXXTCdZ7WhTLczTVpE22BK
-RxDvn8eXFwEqGTd+rpVX
-=BGgH
+iQEcBAEBCAAGBQJTjqrSAAoJEEdUh39IaPFNie8H/A+l4Uzws9/aB7PQHWXIs1/C
+nEiXEr80kUNoObvUY2ubmMz269/87j2YxI0YEq3sgwbC6fb/nLuFMwi7gPjtWvBY
+RYDgQQHwmBM1EQgP1zTvtBqvnCvHeGJGbT0QpptLrs4piKtdkOyKCJ86yiUpQB1Q
+GcKOmTGXHYYwciNDGsm5Q01KorgujdIT9aG2ySGoHAnonTrrhq47vD2vpil3ZuJs
+XSUcv0ihLM16LzRgJ0imjlL1TLNjgZBQpybDp6YHdlqRA0axIBC5q6xoLaEXv69G
+D5/0qtUd/mroRga/wV68WHJZ9f6gOstupYh/VhyNJLY1vRmnMhGCzoDs3jfTtjk=
+=IMCL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.20.ebuild b/sys-apps/grep/grep-2.20.ebuild
new file mode 100644
index 000000000000..1732657b2628
--- /dev/null
+++ b/sys-apps/grep/grep-2.20.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.20.ebuild,v 1.1 2014/06/04 05:15:09 ssuominen Exp $
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls pcre static"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	static? ( ${LIB_DEPEND} )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_configure() {
+	use static && append-ldflags -static
+	# Always use pkg-config to get lib info for pcre.
+	export ac_cv_search_pcre_compile=$(
+		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
+	)
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp)
+}