gentoo resync : 15.01.2020

3 files changed, 59 insertions, 3 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 2ca6f0bae4ac..2b8e21cd7bff 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,7 @@
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
+DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 EBUILD grep-3.1-r1.ebuild 1460 BLAKE2B b773df4ed27768f62fae2538ae0ed894d3168696bb8aec2dc139a7b6a485fceb09b380344009b6dd3d080a9c1cd967cc8cf2c91965b26af09884d951591f5682 SHA512 ce8e19a2a97dfd0eee7bda1b6ba11f272412fd8b2ab865e82000654e531a993721bfe0e293c1218c8f0df48cb9cb8fdf0c1da92159188bb2fea30dd1f567fff9
-EBUILD grep-3.3-r1.ebuild 1476 BLAKE2B d0a68c23c779268dd8957da570a6a10fb1531280c9d02c111883ce7021fae364e0a6d78036a3f90e924bb481aff12b0a61f708e6e23a4d5e5a87e95ffa6b785c SHA512 e466b7c0afe709318e3be00cd3de06bb5fa4d9c51f61cac70eb07575274857a17c55d7fcd46bbeaf28c9a85f1d1c423b68bd90fa0f4ea5e0504fffb52e3d5a64
+EBUILD grep-3.3-r1.ebuild 1466 BLAKE2B 3d5ec0b7bf29bfbabfc3d666dc0e22668ae9ab935afe8cd06c379b43d03eb6b1bb32456a6937665591ec52bf5dc291c3c46c43edcffefa3fab9200fed48d486d SHA512 fae062a766dac5f974d44058d309668546bfd3db9890674370cce386556620d7857f402ae64f76f47d1e2a738eea551b8228e8f836fb7c53db64930e44842fd6
+EBUILD grep-3.4.ebuild 1526 BLAKE2B 729d08acfe1da73ff627821e2ff50ddb90ccd3828506f7da7937cf3f73677f0b860a6923e731439ec9443e4641f7cfcc99b189ef8c7d8e2832f1598713daf573 SHA512 341197e89816a0a466d92dc078f233cdd2c76b5e998f84ed1b9feac500caf9e9857589c423649f2665e89a7468ab43bcaf31071f50fecaad070b89390adc7db7
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.3-r1.ebuild b/sys-apps/grep/grep-3.3-r1.ebuild
index a623fd4f312f..ba46ad9774f0 100644
--- a/sys-apps/grep/grep-3.3-r1.ebuild
+++ b/sys-apps/grep/grep-3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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(+)] )"
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
new file mode 100644
index 000000000000..db80d522f833
--- /dev/null
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die #523898
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# don't link against libsigsegv even when available
+	export ac_cv_libsigsegv=no
+	# 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)" ''
+	)
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+	econf "${myeconfargs[@]}"
+}