Force egrep/fgrep wrapper scripts to always use /bin/sh #523898 by Ruud Koolen.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 69 insertions, 10 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 561cfe3e3033..d5feeac5bea5 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,12 @@
 # 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.147 2014/06/04 05:16:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.148 2014/10/16 19:33:49 vapier Exp $
+
+*grep-2.20-r1 (16 Oct 2014)
+
+  16 Oct 2014; Mike Frysinger <vapier@gentoo.org> +grep-2.20-r1.ebuild:
+  Force egrep/fgrep wrapper scripts to always use /bin/sh #523898 by Ruud
+  Koolen.
 
   04 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
   -files/grep-2.15-avoid_maintainer_mode.patch,
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 76274937cb47..7e42e0e32416 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -4,17 +4,24 @@ Hash: SHA256
 DIST grep-2.16.tar.xz 1210192 SHA256 16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162 SHA512 6b56aca3c859c28d463e1aa755f4f004087985573a8e012a8371780d6b7cbfa8587d5b0bfd2d37b1ddf6c3a49b9126d1e1408d2cc9255558f6cd5754b395b9f9 WHIRLPOOL 008f8338335fd50867fe08306330b679ba5809ecd64837901651bc90f31ed620be2377da0aba90fd57f099fa89bd2cbaf9fc08c8d18cd9aba229c613671c358f
 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.20-r1.ebuild 1546 SHA256 d8a2ef753972c851cc4a4bead9879023f05b26279b576fea631a146a425950bb SHA512 028dde99d80edb972e4e58588fc66d6f6b0f810ba53314f2917b8148bb77981ae808cfff850fb3cd48627729c183167bd4291e6eb0f950d9a4301ea919512392 WHIRLPOOL a92844a5ab584a4308109970b6f2ef0cbbd74bffe3fee109903c67e4e6bed8d705f9416afa6a6ee7ceabd4ee87b4a32a31760f912352f5b4ae340878e9e8da78
 EBUILD grep-2.20.ebuild 1448 SHA256 bd87b842fc0e6612602e231eed6f5cb24eedefd990a68720d1a9df3b8248df51 SHA512 1f3046f133ea84d990112034618fba3e2ef3540e6cc3e3f89cfdaa210bd7a233fc8879e5cfbe3900c294afd31b2b7f38c8a1f64f62c0ff1e803400e5431f2bd8 WHIRLPOOL 98284ccd0ce6a651a935dfa81bd45eb60c9b1582c52ab3d48537f8e90e482fb54389b206dfa60cd4884a9c8a7ec171a4d9bc8940fb212c96c5d9c52b1bc83d3f
-MISC ChangeLog 20000 SHA256 d66b0f0742748d83c734cad46efcd9f3137731c724587cd07f0ff7ebe9db3b5e SHA512 2442bf339349723b8e64968078ae190c0b99f4c2eaaf1c7526cf7259b4c6606fcb3e9e330542b63893f996ffad226cd9f892ce2b3148af5386030e2fb71814b0 WHIRLPOOL e672f6e2bc29a9569fb93e024b95bdbbfd276115aad67cc68d65d073429f61329dde0519d873241cca3e8629bc377dd9639074a2a9c7f1eebe3c44568acebf4a
+MISC ChangeLog 20183 SHA256 e9ac93243da97be9307ba17f360e86de5782fd16809833c65eeaef484933cf1c SHA512 0378f0a580b55f1aee48cf01b121a02c21c8440c240f9feff4b14973a3ab998bd5d747d095b63a55b2bbbb43d2e92c66d9d95698802d1d639adde493c39ea4ce WHIRLPOOL e91cd8450a4a962e05bb23155a7021ad033d94f2658007e4897a59dc5ff58fd522c884d93a8659980b60935dd1919f20e1dfacaf90f988308c176179b175e993
 MISC metadata.xml 239 SHA256 81e2263e85947bfea9b25bba8e5e5ee4c8926035903d4a603b0b89a9727eb754 SHA512 63460f39b4c7c948542e78143e0a2965b0915d4e6312a18799a6c8120c97625ee926f18f62e70caf2748a2136ce5848de387b537a12ed882fdca1aab326f0111 WHIRLPOOL 2e280afad5417d07550f36f74114cee1a02df44540ee65d7bfd1028d571dd35d5d6358f792ffc79f172f161ac4f17f38093963e5148c315b35b49bec0bc8397d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTjqsiAAoJEEdUh39IaPFN9yIIAIX5iWvFdH27EwExrXcxvgkX
-YFkRwn3esi2+IKaxJ+Uw6a04ZaTTYwg9KBhzSEm8xkBnSJLyaknzqnmmO9nO2MIn
-gUshwkFuYt7iWVEajd9ltSmXlGnFWul6a/pspohGtQv0SphomgXAIjCWtuMVxRQr
-fiVg1i3p8RoxL2/sm+ttgenJ22//DPQuyO1ufgyfGT2FfxRkzq9SCEkUGa/DQARG
-0m3mkS7HZLIK52ibPy8/2qomt4IjZuw0IfLEMNWF1NU5yuxdqQK4T5ZCdSAMIk9I
-HZ2kMPjZuXbdckD67zehrw4sALAwbQlz9lqQ1mlptTL0gWj+4CRCgJ1Yyd5kKAo=
-=9yqL
+iQIcBAEBCAAGBQJUQB2eAAoJEPGu1DbS6WIACLQP/i+NC+KdKFHr9yPP1IVnh3MK
+Eu/29J26nVsXOEU/qVPpJr7hL71eUe0i9/IF4Fe9x1f0n4bxU1ofASaosR8NFOW5
+Hs7JvGsW0uDICmsmI/tyFVCJ4iyvrmqSXnWMUfnPzwl4jIyRL8Jrps8f997iGJpi
+458/qysY+hXjDHyCgiCPU8oxBIXKNA2h/Ro6HcDVBhonvfOBrJWwOB+QQMqnEy+y
+BTu/mY26j/VihzXQPlB1ktJRMa3WXrLyKe9+cd/rT8lhGA8RJEbSr2BzV6Xub3J9
+ESso8Cb9suY1VTLB5WPv6dVsvoUrf6kA3L97cZK5sopa8hjz2Eaq9UvFt/oXR/8F
+TWsQ8G9OrWUXi7sNU01JJ5lH3VUXamCnl2KvVVDTfpCMr1254Si8StNnvZ2R0HMW
+j8eNMb0uiS7cuDfhHV3ikYWEXwwtRUGxVFJVRsRLNwges0poa9ZpcOZalMRuh5L3
+8IrrK1YIlaaTrDqTiuAC8LIkwcEW12xMdhdRXbMSogzxsqnc7tXeNGPp3p3jBb+C
+UHMhP004aBd1yGxJ9dqabGrePKKj0986xh6yeIYZgtR9aYNTlpSpSm5Eh6pu5hwv
+XnBJNoXlQShZh0Zn2qsm2WEyJt4WJq0VxW134lXZbEigygrBovHjN8oeteAX6Isj
+pheNEiVrXSw4j1CH7gcd
+=6HDc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.20-r1.ebuild b/sys-apps/grep/grep-2.20-r1.ebuild
new file mode 100644
index 000000000000..a6d5b7599937
--- /dev/null
+++ b/sys-apps/grep/grep-2.20-r1.ebuild
@@ -0,0 +1,46 @@
+# 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-r1.ebuild,v 1.1 2014/10/16 19:33:49 vapier 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_prepare() {
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		src/egrep.sh || die #523898
+}
+
+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)
+}