commit:     56cde5cfef6dfaeed1eb8a76a0d06a176f913c49
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 13:31:46 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 13:32:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cde5cf

sys-apps/grep: Bump to version 2.22

Package-Manager: portage-2.2.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/grep/Manifest         |  1 +
 sys-apps/grep/grep-2.22.ebuild | 46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 9bd956a..416d1e37 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,2 +1,3 @@
 DIST grep-2.21-heap_buffer_overrun.patch 3302 SHA256 
4bc7e744fd34b268a798daf6a5aa85f55c141747149fa7b015eefbf9318ed478 SHA512 
eaea33238f179b17dd152ed27a07c211646d9572be250eb7997c25ea0c8de232d21d8bc1b1e865b26545e6817e5c116e18d9115fb497d39426ac8212839f0f82
 WHIRLPOOL 
5ead7c22c8fe98289322a03685e9fc04e834a01144c55c9ea3b1970fa61b400ce669e6947cb3564fbbba5c7ddf079fd30e66352e4f6eed888e8fe883e369e601
 DIST grep-2.21.tar.xz 1261548 SHA256 
5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de SHA512 
bc894325f89d37413c773d4812cb24180560037ccc8d72c015462043ef3479ea7eefd62557e3a9d191d6d94c68262563d3c68e634acd4e77ba56e96c92805dfd
 WHIRLPOOL 
2272286c10695a51eecafcc5ca8986adb5486d4494b284904f588717c6fb06de37933faa5f62eabf0ecc856334b3a1179b864dedc06f223047471168d2d86bb0
+DIST grep-2.22.tar.xz 1297864 SHA256 
ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb SHA512 
c0756e4aa360cc29b3123384eef654743df108cc606372142c79893a09a0c8053b03d048768e972221e0ed96f378b8564f848f9acc180fca499f0494fbe9113c
 WHIRLPOOL 
612c72fd61605a4f4e6052980db72ff2e6dfa6d0a975186ebd8f9101ab4b62caf31c5a634318156df6407e44456edf74ea1070d489da0625fee1dc029b978404

diff --git a/sys-apps/grep/grep-2.22.ebuild b/sys-apps/grep/grep-2.22.ebuild
new file mode 100644
index 0000000..c1392f6
--- /dev/null
+++ b/sys-apps/grep/grep-2.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://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)
+}

Reply via email to