gentoo resync : 24.12.2018

4 files changed, 59 insertions, 3 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index cb0820025b78..bf050c6ac111 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,7 @@
 DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
-EBUILD grep-3.0.ebuild 1358 BLAKE2B d3dd5e78bf8763f54b30e1447b61248673d0da1151458c6bcd0bfd4dcd4784e45aac6adb71b2cb26cab95762e0c7ec5d54c0ea85ea01df174bc2e0367ba3499e SHA512 3778bc0473f795069196d67b7b806f368994396454d0255c9d37a68b33e35e1b8415c8760373819aa59c12ab2533faf30fb27dad032da40007781ac05fe8cb09
-EBUILD grep-3.1.ebuild 1395 BLAKE2B 03e82ee1da75c7a2cc4f021f851a1f5fed420a3425359059e626a90f2d889fa42cdcc52abdc51e2ec410d16ed3506ae79fb8ca67c1179fbd2158bab8dca445a3 SHA512 5f25a2f668f86f8044d278fc8d8b814dcf3414c3e2ca764568af3a165d742eb180d9a0e9886a17322c9b489c6218de3aed986ff8f728e28011289915047fd016
+DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
+EBUILD grep-3.0-r1.ebuild 1436 BLAKE2B e6d4ff59605768971cc08475ef88cb73aa52cd803ae0c462f2efaa5585b865310f05f949c97e4b2b3792ff25f224ba3197fb9a8ade61329ad499fa8cf6a31645 SHA512 069f2007d0ca2306fcc466b4599d4311e2a50e372c09e42a39a991d98e9a95610d9da3a1c202fdc8a544d45be1ec1c2043eea2ce2c3eaad54107e30199dbaa8e
+EBUILD grep-3.1-r1.ebuild 1476 BLAKE2B f679918789fff486bfd49240a8fda7c825dff751ec116bcebc2f7b26278a17147a73381c20bc9d4da8de1255f78f97b0eacad4412d0c6093fc7afbdae594f940 SHA512 f32990be9465ccc9fc8156e75f6e33ce2b25f39dcc830f99e8d539f191897f2aad73e5cb444e486f57501ee8a60b08ca5b10ea0f60b4f80bffa52c94fde6e7d0
+EBUILD grep-3.3-r1.ebuild 1491 BLAKE2B 58a119e0f12cfe41ff4dbfbda6a7dbab96e3f58f8a8b25799da3cbf94b3ad97762b2057250c0c07053e64c6e6c031c4fb11b8412240513e1908615eb01cc6b7f SHA512 485d2fc1e863e14ff3d2b22918a508a3a46d6b93f30badfe02b37106ee0d0982937e459725ea131098fcb30f95cef41c23461d046ecfb0ab2e665c88023fed21
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.0.ebuild b/sys-apps/grep/grep-3.0-r1.ebuild
index 69114f07cfa0..90ba1b045513 100644
--- a/sys-apps/grep/grep-3.0.ebuild
+++ b/sys-apps/grep/grep-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -34,6 +34,8 @@ src_prepare() {
 
 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)" ''
diff --git a/sys-apps/grep/grep-3.1.ebuild b/sys-apps/grep/grep-3.1-r1.ebuild
index 05ec1d0402d6..bc8dc4beb4fb 100644
--- a/sys-apps/grep/grep-3.1.ebuild
+++ b/sys-apps/grep/grep-3.1-r1.ebuild
@@ -35,6 +35,8 @@ src_prepare() {
 
 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)" ''
diff --git a/sys-apps/grep/grep-3.3-r1.ebuild b/sys-apps/grep/grep-3.3-r1.ebuild
new file mode 100644
index 000000000000..635945feb366
--- /dev/null
+++ b/sys-apps/grep/grep-3.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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}
+	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" \
+		-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)" ''
+	)
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp)
+}