gentoo resync : 13.06.2020

3 files changed, 79 insertions, 3 deletions

diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 5fcb17d67962..68856aa55093 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -5,10 +5,12 @@ DIST sandbox-2.14.tar.xz 426992 BLAKE2B a30984f613b773cb5e53b2b0297ada32d1179769
 DIST sandbox-2.15.tar.xz 426948 BLAKE2B e40bb728192ef3793a9129bc88a63878516b0977a19effd5b02ded644ec6fe1627fab34786b22024957d96725fc5c53f488f7b09119be7b7ca91692dcee985dc SHA512 7249b594864267311ce8e2c04275df49c6d8e8e811dde5780f7f676cb43928728b9abed77beb8f5ee32061efcdb03753cce44d5bf1827bd519d6be8fa54912e6
 DIST sandbox-2.17.tar.xz 431700 BLAKE2B 461404f5b98ac83d9e5bc63fc7251cdfbb04a0ccedb340a7a5b8595b68ab34034a56c0a0cfa8478961c9282f6450de89ef5b512b13d427a7f63c17a4141cbcbf SHA512 b5d7a76d894471f6610b41aa05f007d257c69ae5c90f8db455d626e0d1209b9d276678c36e90d2e4214d15074512be182b4f5f905ed2b7e236ff714cbf51958f
 DIST sandbox-2.18.tar.xz 427760 BLAKE2B 26199ff8f919dcecdfdb74d508e0802e2e929a003ff1caddc54c1ea0f7887938c4f69065e585d61f7e96b29be26a34a1cdb62b397309e993511097ecaebe0620 SHA512 1775d4d6f80d414ab94eafae73966c12c4dd80857e21f0849703a3230ddb80501d8e574b14296e554932766cd71aa7b48a802fc388aaab43ba882ee7d005a60d
+DIST sandbox-2.20.tar.xz 428400 BLAKE2B 11761631ce8e2e495adb41508f308bce875d416ec978e3eb3cb491d3d3a464d7653b8b81d4dcc7e5cd31e8a55069aafa263b85008651ee1d7318f32407fa4615 SHA512 06db36fc85bacf9a3a094c434b73277d8cdde986f2fad7676c42e8f84b3b8b653a1f4b1ec4af9fa1ff5484177419e18f5621275f56a8fbf3973ece524dd6d208
 EBUILD sandbox-2.12.ebuild 1920 BLAKE2B a534856a86127a1e0ecdce10336db7d075ace4e9d410a2e0aba81fec762526c49c77555775c2bb9f21e4694d36e4c51ed61a72134580036c82bc3eb20a9fe555 SHA512 abdc9fde72bf47ff334a450dca9cb2e30f212e8aeffbd96596435f81b309484dc6523a424dbcdbc51d56c88b6ae2a7cd4134d3f7ec703a1f848015603ae0b489
 EBUILD sandbox-2.13.ebuild 1919 BLAKE2B ff46af1821181445d07942d9a81455d688c35ba32d394fccbc2389e7fa7c00d1d11366cc633af73654201c0d59e63ee52abc35944d51f22170ed8c03b6b27f04 SHA512 1c8bff5d1fc55df638e7862d8756191972a958e074951c60f4cfbe960dc3f8ee9d6320cd983a7c7da0d85b6b970a83e024821de77f729ee0f35381d7a7a7ab7a
 EBUILD sandbox-2.14.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74
 EBUILD sandbox-2.15.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74
 EBUILD sandbox-2.17.ebuild 1834 BLAKE2B e486e836e8f9d90c55f4ab48d500d8f93d813cf7eb123ffaac678b112a16b13703d5ca92bf48f700942a26f7f983033d705fd42d996eab4d6cbb7e393ea6e112 SHA512 d9d772320c17221627e73c689a2f6acb6a064c7d8a5b69727755e7910753e22359284abc78d414a75539d4fd3d95b2d5db5b8ada642492d3abb3ab8a55528a4d
-EBUILD sandbox-2.18.ebuild 1913 BLAKE2B 034761e9b7d7a1c3d157ceaafc61ac8c669aaeaf8e9e27ba2cbb80b2ace2fd075df9ab2b4e686ae7f1db85416a2bf5c85a4900c73837cb4bfc3643ccc53c9a86 SHA512 7d6c15bfb6ac75c5c59c04dea7a622b95fbe41ffbbffc9a745a072e2ffd4a0b68cc93b535823d088f6421d3f58199b703de429ad432013bb3defc1b900e7c84e
+EBUILD sandbox-2.18.ebuild 1908 BLAKE2B 5dd4a0ec6662dc5704d630c2b769801d619979b48525b90718edd9b5564e912c881db4002d6e61f6d2a99bd3eb70877139112297c043c3e3798c9000dbea4e0e SHA512 1a0e7ff6ce6e87fffdcf7b1e581fda7fec4e6d7a9e7548b292d642446a8722d8413e804d3db4658245564b6e3aa3867039fa637bfad41a67e42951714ed5c8b9
+EBUILD sandbox-2.20.ebuild 1895 BLAKE2B 2dfe78648105da59a1a5db165a4451b4f7c17c83b2bd94935c86abf85077f8284ed242d84c5055b1e98951022f89af0230aac7181c085a61ff6dfc4816ed2409 SHA512 7d3efcbfb9d14d4d7de162175de9eb9f99ab6519e0c471ab9dfdc39fcbe51070c74e6ed5138ac8c26b49fb1a5512743b9fed5ff2dd41332a6e3fb84c2772390e
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.18.ebuild b/sys-apps/sandbox/sandbox-2.18.ebuild
index b8d0959d8eae..b89397c16d44 100644
--- a/sys-apps/sandbox/sandbox-2.18.ebuild
+++ b/sys-apps/sandbox/sandbox-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
@@ -33,7 +33,7 @@ multilib_src_configure() {
 
 multilib_src_test() {
 	# Default sandbox build will run with --jobs set to # cpus.
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/sandbox/sandbox-2.20.ebuild b/sys-apps/sandbox/sandbox-2.20.ebuild
new file mode 100644
index 000000000000..ce7ae03aa90f
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.20.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage "${ED}"/var/log/sandbox
+	chmod 0770 "${ED}"/var/log/sandbox
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		# 1.x was removed from ::gentoo in 2016
+		if [[ ${v} == 1.* ]] ; then
+			local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+			if [[ -n ${old} ]] ; then
+				elog "Removing old sandbox libraries for you:"
+				find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		# 1.x was removed from ::gentoo in 2016
+		if [[ ${v} == 1.* ]] ; then
+			chmod 0755 "${EROOT}"/etc/sandbox.d #265376
+		fi
+	done
+}