gentoo resync : 14.07.2019

13 files changed, 187 insertions, 16 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a6ecf8de7bba..d42e892ee474 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 93430a19a370..f8babf26f48e 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,7 +1,9 @@
 DIST bolt-0.4.tar.gz 113525 BLAKE2B 4d6b25b60a35bbeee724e4549a49709ff19d99457c8a35c02c66026cdca999359220d09812f8e9f44586b5e3cf3dda2e3ff30f35a4f37ed6d815535e62af39f3 SHA512 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317
 DIST bolt-0.5.tar.gz 149665 BLAKE2B ca7f937d4b7f4911cba93f8619e52af37f18a6542bc76aaee388a9122ea38d11ba0a21f4afb45bd6109e12ada4662783cb8f7aebec0d58751ace6c18c49ace88 SHA512 d36f2e39ac53b131fb9607055231a5a205c368547c0db2c3a7537b6e60b156c8b0663d1e5b09c825e1e1a63fbe21087746d0bafde1bd474eb90f1d0cff991246
 DIST bolt-0.7.tar.gz 188158 BLAKE2B c51588ed746fd2aef15c79c278efe73e78ed8a029d2234b7a6ce717a6a3287ad0e9db82f93661c552a6a35c76a0e16a2712681f45e53f876b3b4f5bd839005b3 SHA512 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135
+DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
 EBUILD bolt-0.4.ebuild 811 BLAKE2B e28db1546f449f68019161dd5b85ad5a48355df464c9faf29d4197570538d030d9af840c46fcdc8c56291d4be83942fe3bc9f61486ab9571b4ea61164748489f SHA512 8951b1d10ddd4c7102c1047630d9b3cacd5563d1c1d494e306abcde839b85ea31c762e1d16b0caa5e103e66a3faf1b251526c0ef6ee4d340318e44873b19155e
 EBUILD bolt-0.5.ebuild 908 BLAKE2B bba91781931c9be0cfd2f21ebe5fb8fa12eb5d7079deca835856bbdf77d4a5e0941326fab01ae38e817d6503a46dd3cd4a6b2a304c0a6c0fbe04ec2f8ced7d9d SHA512 72ef83615267edac04824a4a7059c5203236d9f43eebb27c51f07da75b1ebcae8f6c03a551ce0b5f7fdf1d4e8263a4ff954279349262a5b2220a73e1a800c8eb
 EBUILD bolt-0.7.ebuild 908 BLAKE2B fb4535d186c3aa48a7caf760bf56ef767748c054275aeaf69b3e2ef482f1de9679786395948057ae2239bb69de2ebbacd4947e2ef6f00e5d7984277b8003437e SHA512 4f32f424fb48ea8189183d668cd9bca8759b58621282251b4dd4f86808131baf6ee8b311ec4ad5da3eb50533e99b824b2c281226b608092e24dd5d765302721a
+EBUILD bolt-0.8.ebuild 908 BLAKE2B fb4535d186c3aa48a7caf760bf56ef767748c054275aeaf69b3e2ef482f1de9679786395948057ae2239bb69de2ebbacd4947e2ef6f00e5d7984277b8003437e SHA512 4f32f424fb48ea8189183d668cd9bca8759b58621282251b4dd4f86808131baf6ee8b311ec4ad5da3eb50533e99b824b2c281226b608092e24dd5d765302721a
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.8.ebuild b/sys-apps/bolt/bolt-0.8.ebuild
new file mode 100644
index 000000000000..28823c01d33e
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3."
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0:2
+	dev-util/glib-utils
+	virtual/libudev
+	virtual/udev
+	dev-util/umockdev
+	sys-auth/polkit[introspection]
+	systemd? ( sys-apps/systemd:0= )
+	doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dman=$(usex doc true false)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+		-Dsystemd=$(usex systemd true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 22e655dfeb01..c65228417e53 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,8 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
 DIST debianutils_4.8.6.1.tar.xz 156604 BLAKE2B 100bc458609273eb94da46e267395fe4ea16e499805b0d5a29f6144b8b7d2198ccb47b2048cdb6d311014c7b0ac373283cf6034a773ddbd95121856eb0dcbf83 SHA512 158f024311b3de292bd20df966c0f61285c748597101cee61e81883e0032c1e6a4baccb5c231b28f00ce3afc58a4aaedd64a65641351974c37fdb5f4952b0d2a
-DIST debianutils_4.8.6.tar.xz 156532 BLAKE2B 2add390a0e38aa3d7103e09b3b65fa2b88c3965ca411c5789409454519791bccdb12d89b1bea4d07417f733d23d0662d4f510750ab404d7a4e8f20c2bd3d7ef4 SHA512 5913729cc3c56962e8939b71803258952df0d7204df8090a7504fbefc7f5d1da8e749d606fe23148ea3294909ef172bc1f4f821690169e861729caab70921a2f
+DIST debianutils_4.8.6.2.tar.xz 156704 BLAKE2B 9ab9625042e8167daa988fb161db0dad56327ce8acb29b774a771e988c2e49ed17fe7ef3ce594b9fab3ffdc0518864b83c9dead91603b92d6c297fe79529b8c4 SHA512 1110d0f42870848a8a29b7b52d304ed39ae7d08156da09268dada7464ae45abc1f35320a12f218f8ba9bb2f1d323737136c143ef17141feef1275056842789a2
 EBUILD debianutils-4.8.3.ebuild 935 BLAKE2B 19d3779d81f7e10dd3a034ff3e1f4a4c1b15210c923796afa0535a062d7006418e4ef69d5a46577a916605979c15124607bfc68569b7e1bfe137612c3b20098b SHA512 24cbab98f62055e1298a3dfa1f6de6e9f766e593713f496fae07b2351bac6f70aed1643c1c0bcf07747d034d35538c4ca324bd41efef2bc97dcafc6f795dd4ba
 EBUILD debianutils-4.8.6.1.ebuild 954 BLAKE2B d09f7b26f0e59a5e6eaf28d8dbbdd7a9b70ec42272a53a2f59aecce5e9dd21e6c1ea708ff78101a92fe57af09f328968daa6394101c0930f2e674f46b9ec4e06 SHA512 2eed10752bfb7b4a9b6b2ed83723e8f1e15fad826d00ece581a9ab7027579af668f6bb0ee7b14e25b46aa16ffffa68425697904d8cf9d89e6adf40c1f378d943
-EBUILD debianutils-4.8.6.ebuild 930 BLAKE2B bd761c4be9ae3d008d661935c3343c3272ee77ebebd9b614b17fe4142f1f090f5148b40ccce5da437a7daf1b23be4c9882467e8f98ef1c49c0599d57ce71a247 SHA512 61a2f7e81b6a0262744a131a9aeb74e1f6e520658743f076eb73d048d553492d9b144b1c73a0f36cec80554f3371f1cfc9ad396297f603eb47b0eafc67dda3a4
+EBUILD debianutils-4.8.6.2.ebuild 932 BLAKE2B c6e10818583aa4d62e14a21f7b0092cb0354b15a71cde9bd323bf13c3df87e9234c176ec33e4592edbb261cad08d4e1b08051a16cacd2d761ca12168f32c558d SHA512 19ae964bd4539dfecc182174312c9a10b47596386adf9632dd67aa3e16fab1a5704443496f75b2de91c99b6cae07a3054527b0246f8bfe8f4bb0c998fa3aaadb
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.6.ebuild b/sys-apps/debianutils/debianutils-4.8.6.2.ebuild
index 789bd904848c..2b96aa353477 100644
--- a/sys-apps/debianutils/debianutils-4.8.6.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.6.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+installkernel static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index b9aea849f7dd..c95df9bd46e6 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -10,9 +10,10 @@ AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629
 DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
 DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683 SHA512 a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
 DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0 SHA512 68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
+DIST kexec-tools-2.0.20-rc1.tar.xz 296624 BLAKE2B bb30a4179f1884848c5fc04a376dae570eb18a20a4e5fb87f339c2270c1ded13e7c73436ba9869c8bd93eff158560f9f5625d533819a243bda328ca916ec6cb8 SHA512 ffb518fd51cc7b38e72d45a7b14aaf8cf5b8743968c654c4f6fb6123f3d0b5643657f1ada565d69aacdc292e4deac2afeeb4513e91bde8fb81c96ae1f4365f02
 EBUILD kexec-tools-2.0.17-r1.ebuild 1881 BLAKE2B 458a2767140a75c145ce95b8fd8eb1f3eb2a7edc0dee7a268153147a056582c7f7eba7bb7d2cc1ecefebe96fc065c1537280383ab88b6d3a2d169f33db8375f4 SHA512 59f734eb8c42cc73b40c6736845903d74d87cc8a124f0b90b8bebf8345a5518b7d77eb7a7919dbde95997aba88efe079ddd6d817531732e1f43f106076a64c6d
 EBUILD kexec-tools-2.0.18.ebuild 1803 BLAKE2B 5b881f3c12d4492773f44f9d0ddff1288c5492d4dc554b848e8d7c7a5acd7f308dd96297f251a0ae2164153b6b4892bf78fd5d72c7f325f1e9f9d5c7e761b779 SHA512 ac037d307873e0662b1551a89fd5e2e2bfcd09ce3266cfb25970466b6179495a3c89be14afda22f64dc62424376334963b7d5aca4f77ee53dd28fdcbee5de9f6
 EBUILD kexec-tools-2.0.19-r1.ebuild 1810 BLAKE2B c6b96d35aa23c19ed30fc7fd1e2845d0b8be4cdeaef788048efe3db5ca4d18a7bdd6a7b757fcad40bd1be2e095af91f6ec64a87a214f114a58b8863a2bd52d3c SHA512 b546f22894a881f87aff2ccc561e1d90f3e7c6422bde5979b70f14f2a318e5938c5a61de0b79f03ed08d05a6c5e2965777d6ff4eef754dd80cc54bb54ac2c2ab
-EBUILD kexec-tools-2.0.19.ebuild 1803 BLAKE2B a5e20d74b3dd81fe0ce0f8998271a4f1682f1b9d9347ed044a17ca7a9580527c3461a7bece4bda7ebc7092465d7574904cb88ebdd35ea280b1c918f83543f38a SHA512 b76b7fe09faf6412dd2e55a22011af24ffd054df362bc802fd7f6bf713346374b34ea2c949d65d73357f5592251e302c34ec1cd66b9e51965e3c1279da6323aa
-EBUILD kexec-tools-9999.ebuild 1810 BLAKE2B c6b96d35aa23c19ed30fc7fd1e2845d0b8be4cdeaef788048efe3db5ca4d18a7bdd6a7b757fcad40bd1be2e095af91f6ec64a87a214f114a58b8863a2bd52d3c SHA512 b546f22894a881f87aff2ccc561e1d90f3e7c6422bde5979b70f14f2a318e5938c5a61de0b79f03ed08d05a6c5e2965777d6ff4eef754dd80cc54bb54ac2c2ab
+EBUILD kexec-tools-2.0.20_rc1.ebuild 1868 BLAKE2B b76891440d69841779920615658bcc72455f8a9357b5245c92aecbfaa991c48322750435ffcdf74688ff22eeada8dbe08d0794ced868c71254c43ae5baa51b10 SHA512 50aa9cda1ce454d3f1bb970009a217ecc3f2d8dbbec7bcd1d40471adb41464c3329c65a17b9cc393b5a3d5a53b9080d0b2b9f5f9985ffd760e8b1bf7fe49a4ce
+EBUILD kexec-tools-9999.ebuild 1868 BLAKE2B b76891440d69841779920615658bcc72455f8a9357b5245c92aecbfaa991c48322750435ffcdf74688ff22eeada8dbe08d0794ced868c71254c43ae5baa51b10 SHA512 50aa9cda1ce454d3f1bb970009a217ecc3f2d8dbbec7bcd1d40471adb41464c3329c65a17b9cc393b5a3d5a53b9080d0b2b9f5f9985ffd760e8b1bf7fe49a4ce
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild
index b2fcd90aca6c..a96230eff795 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool linux-info systemd
 
@@ -9,8 +9,9 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 else
-	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
@@ -27,6 +28,8 @@ DEPEND="
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${P/_/-}"
+
 CONFIG_CHECK="~KEXEC"
 
 PATCHES=(
@@ -41,7 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ "${PV}" == 9999 ]] ; then
 		eautoreconf
 	else
 		elibtoolize
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index d9c36c6dcf7b..a96230eff795 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool linux-info systemd
 
@@ -9,7 +9,8 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 else
-	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+	[[ "${PV}" == *_rc* ]] || \
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
@@ -27,6 +28,8 @@ DEPEND="
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${P/_/-}"
+
 CONFIG_CHECK="~KEXEC"
 
 PATCHES=(
@@ -41,7 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ "${PV}" == 9999 ]] ; then
 		eautoreconf
 	else
 		elibtoolize
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b3972c9b24e3..25c061cb8f35 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,12 +2,12 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a7
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.62.tar.bz2 1021442 BLAKE2B 37d5dab0e678ced78e0ff4dc9907af3d20370a4b0f52cea9118be3d06bb14e24fe6597d86c9bbd9d3ed2fc51f9e031d4e9ba84f354b945f7a399da3cbb95d74a SHA512 d4eca7e70573aae07a0522b4bf361191fded00fa02c5e6d8f70cf72c19c4dcfa9be7169a267afdc58cdd0a8ee333774a7779ac08dee3490aa8e8a1ebd39deb49
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
-DIST portage-2.3.67.tar.bz2 1025172 BLAKE2B 4557f11eca511766532214630b948f884149a6cae2e7110813a2a3700be448c057500c1708daeca5419e4bcdfcdf4a26e8002a2437f5c0a7731e20d201124021 SHA512 921b8647bd6cb879320b5ca3edf42cbff1e64bdb13a922a4fc2be6e2868dc94966734c1c2b508c75552b95f7e9b970a2ec8f93d02602ce6c351bd700613392d9
 DIST portage-2.3.68.tar.bz2 1025806 BLAKE2B 70d5011548a11f3f8859fba407603c34162274698d5a4351e7ed10addf6cf5df88261ab3a1aed73dd7600d9038aa0cf3bb67705e78a51103a5e355c7fa615d8b SHA512 4dc9ac1e03c267b280c932fbcde14f74cac1fb111fe75f21521d156696ab9a7aab2ca175a35615375b097196ad998ae774e8535a6c6205398b10596fb9d1a859
+DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
 EBUILD portage-2.3.62-r2.ebuild 8240 BLAKE2B 929e062620f7e1e6f6fbd33940341e81eef5c18b18898cc8d5ecc942b15e97b77833118a63fbc146d486f2d3e4a6a273d1998f145e0603380489d895f7d35470 SHA512 2875ecf940c0b413ab50daefeb04e74a7436a0d519a1746f0fe58c4e69dfcbfc7bb803435cff8418c38491e154a56335bc8833670548c05fc90157518a44df19
 EBUILD portage-2.3.66-r1.ebuild 8236 BLAKE2B 267d95be18d526d497840eee77dbd566150791a46927aba5a0ae56d3024999a54c57d47248bcafaab919d0571dfef866757bba0ad9ef3cebae78f86da7224291 SHA512 c81b1b8c7cf3d6a0ed0705e75aa876bef05f6c0161adcbd33bd26c76909c74375138bb2c15265c8d6030b594e73ed74fb873fb81dd455ef5bb8424f8184f6381
-EBUILD portage-2.3.67.ebuild 8050 BLAKE2B 599ed6a44c6fb522b30a439610bc210df555065d7ba080683bc54ae86662385fb637e20e71d2142d1e45fe48e68216d74afc24da46e77d6ad6e3004636f2e6d8 SHA512 4edabd7c51886fe033a5cda8096c664e9712e624710d72029064223ab228ccb8a4021f52f20f4d436da8702edf5234d40d1d92f04593cb2e2f6f171f1a7541f7
 EBUILD portage-2.3.68-r1.ebuild 8197 BLAKE2B be6d79355fd3c68c83dba8b4476f3efd912e91034977b630a96e13f17d7d475d008faf9983be873efc4d79bdbae224cb67e49edca6a1a46f4ceed5bef7c6d72e SHA512 76d7ab3e4c1d49ea232ba2edb4c590d9faa39bd9837c5c0d21c5dbb99d35fc01cd2c4e22860af27a81e7f9bbcb8484ba322b3be18a747936fb41c6952dd3e64c
+EBUILD portage-2.3.69.ebuild 8103 BLAKE2B 723d9adcf8cb245ca54980ed5a6d78f693fcd7faeb9437bc4fc88e69f33f5f1461c346a1dd335a1e7c737832214d4f0bdc539e7d642d0c28221c00911ac03b4e SHA512 5f36ae535ea3900c121050dd12f17211587fc372ea843cdc1a4a11885f2c804f3810565921f12501f8d6bb263394baa19e54cda1806b38f4ab153a5a8c035029
 EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.67.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
index 841947dcfff7..16ea5c71efb9 100644
--- a/sys-apps/portage/portage-2.3.67.ebuild
+++ b/sys-apps/portage/portage-2.3.69.ebuild
@@ -133,6 +133,7 @@ python_prepare_all() {
 
 	if use build || ! use rsync-verify; then
 		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
 			-i cnf/repos.conf || die "sed failed"
 	fi
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 4f6f8c95d03c..73b6245dd794 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,12 +1,15 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
+AUX musl.patch 1497 BLAKE2B 677d35a52cde1f4f1806888d145c76676e6674188c338162602d097a4571696489a14dcea07cf10abbbcfd394a7adda8256e53a2bb5766b37fda1b8b8e74ed55 SHA512 397be258d722413d8e4392bb9124802e02d9e10139ec77cdfc252717386d6bd60bbacbb59d23f838318b1e1452ad2a36fdd2530c5a8859494ddcbd77862e07f9
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 DIST sandbox-2.14.tar.xz 426992 BLAKE2B a30984f613b773cb5e53b2b0297ada32d11797699418aebf3014e11f3ec2b69a1c4b4e22ce96c28b1df022617cab6787cfe61f84b37ed61e966ac425eae1c7eb SHA512 b84584cffc54678646798bc58d8b60cdc10a0a58c9f1a49276dcac205a06dd7a2e664d2a9c40c78b48eae8ac36e3ac498ba35674f10e6e06c3c2bab777e05ced
 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
 EBUILD sandbox-2.12.ebuild 1922 BLAKE2B f3a63b14db2fddd2ad914481e76bdaa7116db993b00eb901aa033ebeef57042607169427cd6ccca9df5d2a4fea3fd420aaba08e28ca9eb04d17eb902fc200222 SHA512 7a7c10066eb2d05ee1090bf1d01d001d32d9fa12d01eb825d25bf5469b5eef3d0fc9779952c78e5509bdb7b347750174452880095b9649c10490e1d9c057120f
 EBUILD sandbox-2.13.ebuild 1919 BLAKE2B 3dafabc7d19ba0b4bfa327761fcf9dc51814ef3fc64b0e90f6c396673af04312b800724b29ac786b0bc7b293267c9ba375e83280a52170bcaa657043426c3827 SHA512 5bbcb60d15ddb8e179689668fd0ec1e923f5374e22caf8e4a180e2f7569babca5098993e884414299bc7032678f53b2017c1f2d1565b512b3189e77b92af0e47
 EBUILD sandbox-2.14.ebuild 1932 BLAKE2B ccf40b2fc278a09bee5445b339456ef2532a8b95862d70843a2f543dc75363e0554eb99ee6e33eb77b39763de0cde70ac59ce81fd6d31b1208ef5cfa0269aa96 SHA512 afb04d1b36ccb5c542c9f6b5aa69f19a5eb4dcb4f045126f19352cde5c14e64f5efcfb14bc17e7caa3a59cb22be1ce9830440454ac16775fc6bd94515f658f1c
 EBUILD sandbox-2.15.ebuild 1932 BLAKE2B ccf40b2fc278a09bee5445b339456ef2532a8b95862d70843a2f543dc75363e0554eb99ee6e33eb77b39763de0cde70ac59ce81fd6d31b1208ef5cfa0269aa96 SHA512 afb04d1b36ccb5c542c9f6b5aa69f19a5eb4dcb4f045126f19352cde5c14e64f5efcfb14bc17e7caa3a59cb22be1ce9830440454ac16775fc6bd94515f658f1c
 EBUILD sandbox-2.17.ebuild 1838 BLAKE2B 4c01e2be81405877a9864614afb99cd88c4ff39445e965e863b846617b0ce7f7f248d1a5c7bdbb9acc9edac0d2bb2c9526cc6978049b1e45d1354478a7de1672 SHA512 9a52dc34a47ea94d28be05e20448543ee0aeb9188a4fcc83f1aec501ad5f44990a09eee0ea1bb69b3b7cc0051efc419595a9a36952167ddc9750ebba459908bf
+EBUILD sandbox-2.18.ebuild 1917 BLAKE2B be7f09adcd4d36a131f2908063c2389a89a7a5ff31ccba51df08e31a84feb14236f0827c1e9f016f051beafd5c044132a9f4a2fcd3d1ab708a2c020a8147aebe SHA512 0cb24bac889981cd9e537e120fc32f2300c3f52ead422348532ad7ba285abcd82fd69e5d69a91d0f3ffde0752b0de780737439e8c3166a095dd7d6ce47886e37
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/files/musl.patch b/sys-apps/sandbox/files/musl.patch
new file mode 100644
index 000000000000..419d067f2a29
--- /dev/null
+++ b/sys-apps/sandbox/files/musl.patch
@@ -0,0 +1,42 @@
+--- a/libsandbox/trace.c
++++ b/libsandbox/trace.c
+@@ -10,7 +10,16 @@
+ #include "sb_nr.h"
+ 
+ static long do_peekdata(long offset);
+-static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data);
++/* Note on _do_ptrace argument types:
++   glibc defines ptrace as:
++     long ptrace(enum __ptrace_request request, pid_t pid, void *addr, void *data);
++   musl defines ptrace as:
++     long ptrace(int, ...);
++
++   Let's clobber to 'int' lowest common denominator.
++ */
++typedef int sb_ptrace_req_t;
++static long _do_ptrace(sb_ptrace_req_t request, const char *srequest, void *addr, void *data);
+ #define do_ptrace(request, addr, data) _do_ptrace(request, #request, addr, data)
+ #define _trace_possible(data) true
+ 
+@@ -44,7 +53,7 @@ static void trace_exit(int status)
+ 	_exit(status);
+ }
+ 
+-static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data)
++static long _do_ptrace(sb_ptrace_req_t request, const char *srequest, void *addr, void *data)
+ {
+ 	long ret;
+  try_again:
+--- a/scripts/gen_symbol_header.awk
++++ b/scripts/gen_symbol_header.awk
+@@ -117,6 +117,10 @@ END {
+ 				gsub(/@|\./, "_", sym_real_name);
+ 			}
+ 
++			# Avoid libc's symbol rename via #define. musl defines aliases as:
++			# #define mkstemp64 mkstemp
++			# #define mkstemps64 mkstemps
++			printf("#undef %s\n", sym_index);
+ 			printf("#define symname_%s \"%s\"\n", sym_real_name, sym_index);
+ 
+ 			# We handle non-versioned libc's by setting symver_*
diff --git a/sys-apps/sandbox/sandbox-2.18.ebuild b/sys-apps/sandbox/sandbox-2.18.ebuild
new file mode 100644
index 000000000000..179163388c4e
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.18.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
+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 ~sh ~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 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
+}