gentoo resync : 24.12.2018

2 files changed, 68 insertions, 0 deletions

diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index fe5d1b202627..cfbe2bbd44cd 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,3 +1,5 @@
 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
+DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb
 EBUILD sed-4.5.ebuild 1772 BLAKE2B c37f0dce76f72965fea3842bb71c67ec085136ae2b887c7de08575dad80ee01f2f4059de9a30c4d46f9a738c5608a55bc00caf6544da8b6420228c8ad7852d8d SHA512 ad512028213e8149960346b3493cb173ea989986c52946a6c2a8d65bc7127a00f7f0f61ab611979ec00b4f08766812dc1bbab42f9be83d67c839fd63f8454c1b
+EBUILD sed-4.7.ebuild 1782 BLAKE2B ce9a67e4b897233eb4016a741627b19097f6b68ab0875fb26bc0938d70d5c04af6a9c51d46f2d151a9ea20224eefe033ad87c865ab0c321dbca25723374beca1 SHA512 062d1910248f9a69759c7d76365bb02838ab3c4c780dcaed759a81eac80bd5b64044a2a5c674a1b645842b970f83d19697703a26146f1fe7a4cf32c699e7dc1e
 MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
new file mode 100644
index 000000000000..d9ed95034e28
--- /dev/null
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -0,0 +1,66 @@
+# 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="Super-useful stream editor"
+HOMEPAGE="http://sed.sourceforge.net/"
+SRC_URI="mirror://gnu/sed/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl forced-sandbox nls selinux static"
+
+RDEPEND="acl? ( virtual/acl )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_bootstrap_sed() {
+	# make sure system-sed works #40786 #650052
+	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
+	fi
+}
+
+src_prepare() {
+	# Don't use sed before bootstrap if we have to recover a broken host sed.
+	src_bootstrap_sed
+
+	default
+
+	if use forced-sandbox ; then
+		# Upstream doesn't want to add a configure flag for this.
+		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
+		sed -i \
+			-e '/^bool sandbox = false;/s:false:true:' \
+			sed/sed.c || die
+		# Make sure the sed took.
+		grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
+	fi
+}
+
+src_configure() {
+	local myconf=()
+	if use userland_GNU; then
+		myconf+=( --exec-prefix="${EPREFIX}" )
+	else
+		myconf+=( --program-prefix=g )
+	fi
+
+	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
+	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
+	use static && append-ldflags -static
+	myconf+=(
+		$(use_enable acl)
+		$(use_enable nls)
+	)
+	econf "${myconf[@]}"
+}