grep: upgraded package to upstream
Upgraded sys-apps/grep to version 3.4 on amd64
BUG=chromium:1117638
TEST=cros_run_unit_tests --board=hatch,arm-generic
Change-Id: I6707769bb4b8da7fb86ffd5e468ded4ef175bc2e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2405365
Reviewed-by: Benjamin Gordon <bmgordon@chromium.org>
Tested-by: Kyra Moed <kmoed@google.com>
Commit-Queue: Kyra Moed <kmoed@google.com>
diff --git a/metadata/md5-cache/sys-apps/grep-3.3-r1 b/metadata/md5-cache/sys-apps/grep-3.4
similarity index 65%
rename from metadata/md5-cache/sys-apps/grep-3.3-r1
rename to metadata/md5-cache/sys-apps/grep-3.4
index 429e07a..db8d85a 100644
--- a/metadata/md5-cache/sys-apps/grep-3.3-r1
+++ b/metadata/md5-cache/sys-apps/grep-3.4
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
DEFINED_PHASES=configure prepare
-DEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv virtual/pkgconfig nls? ( sys-devel/gettext ) static? ( pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] ) )
+DEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] ) )
DESCRIPTION=GNU regular expression matcher
-EAPI=6
+EAPI=7
HOMEPAGE=https://www.gnu.org/software/grep/
IUSE=nls pcre static
KEYWORDS=*
LICENSE=GPL-3
RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
SLOT=0
-SRC_URI=mirror://gnu/grep/grep-3.3.tar.xz mirror://gentoo/grep-3.3.tar.xz
+SRC_URI=mirror://gnu/grep/grep-3.4.tar.xz mirror://gentoo/grep-3.4.tar.xz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=62a37a0c2095531e8a143e3ce0debd36
+_md5_=884f90830a81b486fa5982bc32d02ece
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index ee53fd5..504397f 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1 +1 @@
-DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
+DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
diff --git a/sys-apps/grep/grep-3.3-r1.ebuild b/sys-apps/grep/grep-3.4.ebuild
similarity index 90%
rename from sys-apps/grep/grep-3.3-r1.ebuild
rename to sys-apps/grep/grep-3.4.ebuild
index 05032ad..23692ba 100644
--- a/sys-apps/grep/grep-3.3-r1.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
@@ -20,9 +20,11 @@
nls? ( virtual/libintl )
virtual/libiconv"
DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
- static? ( ${LIB_DEPEND} )"
+"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
@@ -43,8 +45,10 @@
export ac_cv_search_pcre_compile=$(
usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
)
- econf \
- --bindir="${EPREFIX}"/bin \
- $(use_enable nls) \
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/bin
+ $(use_enable nls)
$(use_enable pcre perl-regexp)
+ )
+ econf "${myeconfargs[@]}"
}
