gentoo resync : 16.06.2019

16 files changed, 141 insertions, 24 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 829b78e41e5c..0242b0ad7913 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 5f4c46bc4566..6669eb372bab 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -15,5 +15,5 @@ EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5453 BLAKE2B b643f95efc78b4aaa3ab4f05
 EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5401 BLAKE2B 7e4069b74c630e33f5f7045764f8ad5f510fd4c03014e6274d8ba4430406d1e507ce9fc9198c64f923a3df15545f143cdeb696c9b2e74b5250c557d5a8be295b SHA512 1853c25f8b8fcd21f7f37044dfd96d6bed076324d067cbb6d14711e6e65ffe7aa7b76a3b6665acf04051ea688a08eca0bd66da47476c1cc3e969cc6ce346f0f5
 EBUILD compiler-rt-sanitizers-8.0.0.ebuild 5137 BLAKE2B f155a3b8d1ea7c1ec3bd598784a0600c7c0050a7e25a17895d919a5d7d0b05b28548e42fce9ee66a7fbb9b328b5cc7f1a998cb110f1e20a1d0b55c564f33d91e SHA512 4ebfa01e7d110bee738b63c7b9129cfaff13aaa90e38f8e08bec256b7fa098eb79f8b92dacd21c0af3b717005207b0eb4c8c4ebec92da805b53c0052759f03e2
 EBUILD compiler-rt-sanitizers-8.0.9999.ebuild 5081 BLAKE2B be4564f17225c9d907a48b650af00ea76528508558ceb0272f490ccdfeca7ab7f7809499afa3b7a2640b02d6493402edc9af933b50722f87ed9532187e4215c1 SHA512 4e50aa28b004dcfc2ba5b848cb7bbe10dba5208d0db870a74c3f02fc442d6395e3937673b66252c35b92753890b2427ba2a870d299a64b283815bd9e568943f8
-EBUILD compiler-rt-sanitizers-9999.ebuild 5091 BLAKE2B f35cedca80bba2ae052b97e85aea586ee3f954d2ee56ed3148a33f5c857eaf7e95545cf2b840a70142b926f989c9b69640484f9d7762dae7c20495e46ea32541 SHA512 93da3755f7ae0b0993deb14f2b2e48dec5eae67d2d4121e12aa8e04738b9617394c3d6741b6bae2cd6174f8fb48b3fa0b9b5cba9df570c412727970c0f5406e6
+EBUILD compiler-rt-sanitizers-9999.ebuild 5103 BLAKE2B ef0a05b6884bc7bbceff714aa88c61c3b0e02b38d40d129cfbe78ebf9074ef71dc169bedf8663d298b9eefee85f5c58c740da8ad46f600e188f587b7b74b50df SHA512 c593f39d336fb4f53ad9acc37dc4beda2b534afdc04559f06a9d4646c565c671d26dd6fbeee3bfe3922bd2aae04439bbc8422b92332db1ac71aadc6e135ea49c
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index 61271f31abe4..395528b7e428 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit check-reqs cmake-utils flag-o-matic git-r3 llvm \
 	multiprocessing python-any-r1
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 9fe1b8b3f472..51fcd84fc816 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,5 +7,5 @@ EBUILD compiler-rt-6.0.1.ebuild 2911 BLAKE2B 9ee423b460c62366af5525ab3b32cd2980a
 EBUILD compiler-rt-7.1.0.ebuild 2913 BLAKE2B 86f05a0f2604f7df55ecec3906f380f6838f9deb66f76f952c9dfb89d8b3738aafd7468c1cfc2c6e19e1301fc4dacdb74a4f8436cdf7daf98bebb82ee1284590 SHA512 ddb15119c6dc09816ecf15ca61c548d786c16c8380284323e27a37229dd81808fae98b2451b5bfe98b2f1ce3b0bb620acf792ba1a66e5aa67acb40a33dd64744
 EBUILD compiler-rt-8.0.0.ebuild 2916 BLAKE2B cb63ba2b0e7a3f913fe58f2e53fb5deaa827c0fa7b10a89891a7da7fcf658fb6d9ab0fd50e501d35a788c9f53b3c267c85a03dbbb9722f4a3294aec4a1c0e4b8 SHA512 d11deefc294f5d99e4b92384a154dfebcb9ab5a7549aaefefbe791bf5cc319c1ea547eb076bb416702d8812d967e4721f7d51f18ec9d741a0347cd79b8172ad1
 EBUILD compiler-rt-8.0.9999.ebuild 2946 BLAKE2B a77052a7f0365fcc3c9426147ee2af5a89b4f9d4de01f6ca2bd42b88b886cd85bdb89652edf68c5b201025a02154db57cdca922c60d8081be7adf9730fc85ee8 SHA512 36c8990d9fe14953c3cc94fcd41699191a6ce41f297806ab401670aba24e126310d36ce02fbc49a8ff39772636b72d4f3214a44bad7c4af84d6e57f17f9d622a
-EBUILD compiler-rt-9999.ebuild 2921 BLAKE2B ab782d0000a7bbcfd022ea522694f6cab46320ebc1f64fd028990dce3fc6ba54efb816d2023118b730d84e1b6ec3ba44fafdf0410157d088e966e01125ba63b3 SHA512 32e3c1355f663c8301b5d9f9f2616f0679a3b7eb51f763973d1d4c62d2adecba0ea20b01608d34820dd2a2ba490acef85e2b6e50af3169c992ffbc3c315d7170
+EBUILD compiler-rt-9999.ebuild 2933 BLAKE2B cbb1565d270a349f9b165fdc33d18e759720fe1994fd093fe9a5829bbe2c0abb43c5fe1f497b89dc047620ae408b5903f9fee4ad6dc80f0d0d67a8cdba719ba5 SHA512 dd2ab7d141de915074e7d833b778470deac4ab1e1b1677d7aeed71d8e6a4a73d9eaf623a01638a756eb0cd1434ca8dbf499e4b765c960bdaaad37040d5b55aa4
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
index 75c4024449f6..7d24d1c68fca 100644
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils flag-o-matic git-r3 llvm multiprocessing \
 	python-any-r1 toolchain-funcs
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 4edffb388834..fcf7f11da8ec 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,6 +1,8 @@
 DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1c18da81d4f148b220d7e4101535f245612f0c82c96c6c3bc3e4c0631ada153c59c4587a86efdc5669a0b9f69e764be SHA512 4cb6b18d5de63461f35e0b6f6896599aa41da2c995839c2e88661dacdf07522842b612820fb1d83edbde72092cc62295d5411e8607f52c611db7f02aa16c9ab3
 DIST libblockdev-2.21-1.tar.gz 342121 BLAKE2B a0a1958303d38760a49eb2aca11ee84dfc16ebecac37d0b8322f88e078931737695e4a600efef42511bad4e027799ca38d0e3b42527a0b9189035f7a02a10f35 SHA512 9991e5b776b4fe62b7f703753630e8ec4769c043047452d63de08d93f823b778179e4568b8b78c3963daf6219422afc9eb82bcc5b07b7f0a422162037b569e41
+DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a33369aa22a6ae5d141076d52fbd82d17504a97f1a0091773d9a65b25b976edecebe3a76ba91ee8e6032fd034298fa4a SHA512 69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45
 EBUILD libblockdev-2.20-r2.ebuild 1993 BLAKE2B 379104c3a7fa7e3d01cb7906ee0928db4cd6c3d03a062c25c25a1c869f18bbd8ba77be3c2ae084a9018b2b42a2a96151bd697453c5d1c6aecebeb56a36b796f2 SHA512 fba4a4dfd56f6708bc08c9f6276353a48e07284ccfe762a15e54ee7984beb74e52561062cd5b7686578d5bfd8bdeefadda35643a33c58aaf155f1a677bb61084
 EBUILD libblockdev-2.21.ebuild 2029 BLAKE2B 52b4450eee896acef06c19b4ce5565739139ded79438b9a3ebbbe4c9e4d6cc37d02410b0d1c39533ff81427479efbdddb97855550a13e5aa8a5437163be3ad8b SHA512 d2b6dd2c454a83be8b2733ee215a24b4d21f200ef4c65aeb7bca293d47b92eb0ca4a69b520b623c1165b18287fefd5d9afdc37bebf75e0b994d91903285df4d8
-EBUILD libblockdev-9999.ebuild 2322 BLAKE2B 200f9a8add28b684a6ac4d8548da5e8887ea827d07bcf8ba3860bfdb2fbcd1ea7eaef1ad3d69b4265a06b051cd061515fef970330bdd3012b02a5aedc7697452 SHA512 27110783c35352612e9d26802ea5113a250ab11425e553099689351278fdd435a7ca22bdcd20423f791326c952ee34e4802e7924eeee1ab15d159c9c4ba4f849
+EBUILD libblockdev-2.22.ebuild 2330 BLAKE2B 1014f10ca9efd8b52c4be54e4b2c5b8c1d35d46dc12ca86fd240f627691e51f872c5e081c9cf4fb876b312ca2f75c451ed5a6b4fb2a643c2d1b407b2560c6cf4 SHA512 2872c9eef0989a1898fa0ddf3da2122f8f5c1298db947449897b728b0ac342f985c75549f3573fa1e7b2e02a4f90f6505d7ba651f9dedeb753bebf9a3a588883
+EBUILD libblockdev-9999.ebuild 2330 BLAKE2B 1014f10ca9efd8b52c4be54e4b2c5b8c1d35d46dc12ca86fd240f627691e51f872c5e081c9cf4fb876b312ca2f75c451ed5a6b4fb2a643c2d1b407b2560c6cf4 SHA512 2872c9eef0989a1898fa0ddf3da2122f8f5c1298db947449897b728b0ac342f985c75549f3573fa1e7b2e02a4f90f6505d7ba651f9dedeb753bebf9a3a588883
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.22.ebuild b/sys-libs/libblockdev/libblockdev-2.22.ebuild
new file mode 100644
index 000000000000..fe1a9b0b4e7a
--- /dev/null
+++ b/sys-libs/libblockdev/libblockdev-2.22.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="A library for manipulating block devices"
+HOMEPAGE="https://github.com/storaged-project/libblockdev"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
+	BDEPEND="
+		sys-devel/autoconf-archive
+		gtk-doc? ( dev-util/gtk-doc )
+	"
+else
+	MY_PV="${PV}-1"
+	#MY_P="${PN}-${MY_PV}"
+	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	#S="${WORKDIR}/${MY_P}"
+fi
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc lvm kbd test +tools vdo"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.2
+	dev-libs/libbytesize
+	>=sys-apps/kmod-19
+	>=sys-apps/util-linux-2.27
+	>=sys-block/parted-3.1
+	cryptsetup? (
+		escrow? (
+			>=dev-libs/nss-3.18.0
+			dev-libs/volume_key
+		)
+		>=sys-fs/cryptsetup-1.6.7:=
+	)
+	device-mapper? ( sys-fs/lvm2 )
+	dmraid? (
+		sys-fs/dmraid
+		sys-fs/lvm2
+	)
+	lvm? (
+		sys-fs/lvm2
+		virtual/udev
+	)
+	vdo? ( dev-libs/libyaml )
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND+="
+	>=dev-libs/gobject-introspection-1.3.0
+	dev-util/gtk-doc-am
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		escrow? ( cryptsetup )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset #623992
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-btrfs
+		--with-fs
+		--with-part
+		--without-mpath
+		--without-nvdimm
+		$(use_enable test tests)
+		$(use_with bcache)
+		$(use_with cryptsetup crypto)
+		$(use_with device-mapper dm)
+		$(use_with dmraid)
+		$(use_with escrow)
+		$(use_with gtk-doc)
+		$(use_with kbd)
+		$(use_with lvm lvm)
+		$(use_with lvm lvm-dbus)
+		$(use_with tools)
+		$(use_with vdo)
+	)
+	if python_is_python3 ; then
+		myeconfargs+=(
+			--without-python2
+			--with-python3
+		)
+	else
+		myeconfargs+=(
+			--with-python2
+			--without-python3
+		)
+	fi
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 007d840b53e8..fe1a9b0b4e7a 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -111,5 +111,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index b61c53d70523..5bc4307da37c 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -8,5 +8,5 @@ EBUILD libcxxabi-6.0.1.ebuild 3172 BLAKE2B 0078aa6ca753285439a17dea5af0c66a991a1
 EBUILD libcxxabi-7.1.0.ebuild 3173 BLAKE2B 48dda73d243e18c4591910d0f8900b0fc75eacf229f1eb11b9c402897f46a03e89bae5330daffe80a994d526fc612db237d104d9a3c69cef2c910bfb705069cc SHA512 a028cb4cd4381fea4cd487fa44a33bdbd604badfbe8c7e8452c4b19255ef672d11a415ddc4cf087ce19235cea0eac4e479bfb3d3e5d764aa431677d31683a37d
 EBUILD libcxxabi-8.0.0.ebuild 3176 BLAKE2B 709c55c2aedd2490ef6a982f41fa0b3977c1109ef480aba56cbfd248c40027349daa0dd477adefd5c37b8dbac8485cb8ab3c470e440b4be050ff52c0815bd59c SHA512 76237682c5e3d09cd259a03184fc35def96a90ac2bf42efe869be7d2f2ebdde05dca1e9f2efb5a08a41e7b461d4bbcb5dacd2d1ff8d3128ae65a1dfb2683f92f
 EBUILD libcxxabi-8.0.9999.ebuild 3285 BLAKE2B 3b5ee2037761fcb1a9c90ca11f7e4d371622ec95e468b0fba6545df8c6eb6482f5ca2c5a8d46671ee7219fd99c2a729e0667939170f26ee5f4735cdf59010b66 SHA512 c45db120d7713fe9763da17cdaf2401da3c7d639bb2041fe9b5802667ae240e444c971b9914712be5eff740729b47d65b8d8f7079e4d12ec98eb8a0203220a05
-EBUILD libcxxabi-9999.ebuild 3263 BLAKE2B 26e1877ef423b0f869b6033601c584599c00f6f46b7296ba213ff080bb060c81995a2be2693b16b73e94c979c46fa5632b0fcf110ba2bc86c1b8f30bb548f74d SHA512 28ee56c5c823aa82e02e7fa680455e425d2ec5c4ae4c98c82a18f7afa1d0a663d22f4a85299fb44c3c10d5367bf33637f68a70516b02c6c206293038a65e22ef
+EBUILD libcxxabi-9999.ebuild 3272 BLAKE2B 885650bd3fbe87762916e5c0ad14c3f7cf28c3ef75b77e601f5e589c89176ac4610c3905085b8cf68349dd4f22ca48ed828f48b2d73f553cf76cbc90f80341f9 SHA512 8808d7a48f8a231ad438eac44cb3599ae7f6f294c12100891442b7cc46c37257c5d2b6407440236fd9620c40f25439b085f7cc5ed1622f2b7d9fefadda66c44f
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
index a5db8cc56c06..9f28d04485ed 100644
--- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1
 
@@ -92,8 +92,8 @@ build_libcxx() {
 	local BUILD_DIR=${BUILD_DIR}/libcxx
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
 		-DLIBCXX_CXX_ABI=libcxxabi
 		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index 158fa4f6a846..539a0a047348 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -3,5 +3,5 @@ AUX Makefile.test 172 BLAKE2B 75bf612ce08664303e4e28d7003e111a28e5ac931940f61768
 AUX prepare_snapshot.sh 428 BLAKE2B 5fab8d5ccc8aafbb4c5e9f729dad99b87d45c9973be777d4a77d5fddba280731186ec5075fe79526130ed26396e621e955ee28f1cbc0293b1e19e109b54f363e SHA512 2fc1391df1178a1f6e2e29243731a0630e43718e7e525f95f8dcea3c9909905e86cba1cd9063c396be0a076965b6c3c1cfaac899ba6e30c9cf4f90e237fb5b25
 DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
 EBUILD libcxxrt-0.0_p20180311.ebuild 2337 BLAKE2B f932dfa42c7111ef4a64a135907b0751770593a715b0cce951b0e3992de218a400e7f5b69cf9321bb03932a5833ebf2c085a6b391570ccf639edf99a7d50b3a2 SHA512 90342be338bae58ff578bd060ea6bd9bb9994998c0fcbb79d71e3c5c384362648b3d5154232c9962f2d602197d63f0b3ad19a9945f60863471565ed54bcc19a6
-EBUILD libcxxrt-9999.ebuild 2318 BLAKE2B fd2c349bf8a84f19a3c76c0523623897797291d85062d2d9a58a9d105c32c65ff9e66a795b657693584256f9f292a4f1fb22c74403870c5fbf54ed0fbcbb5bd5 SHA512 7550563363686af25f2c9c81a795a972fe9b5599e5d2fc7462940b1be463fdddf32faba7e86e8c2d3bd60a6adaf20f400cf5bad3dcf8d814bb2f8feffc9b2c3f
+EBUILD libcxxrt-9999.ebuild 2316 BLAKE2B 60537b315c08e248497b17ac7be02d848c9af872c7ae714975aa25eba9ebff82fb66ee04dff742777a9659c1e537b35e29805dce2884a87719c6f6a2b2395319 SHA512 9eb5cc5444cea423ffac96060c464959e4908da46f09478b62a8d6adccb830904f3ddb8c2599b05a850dfc3fa8b1651c8fc90162a19344527ab722cabc36d894
 MISC metadata.xml 772 BLAKE2B 918a0b6a0d5d7c07b86a8157e08d66f1df42d38e74099c3c38a5dcb2757d55637426df7e0b61d893afde5cd15eb9d4ab78920ccde846a781c5e7ee285161f0c1 SHA512 2740f5561f530ec9053c2e3cc1c32af9b11b61d6b9b1e1babc39d135132bd7fbc0670bcdef274408126c9444e93c9e6f964f7c51316cac06b4a64e177263be7a
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index df8c353bc556..a2c88adfba60 100644
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 EGIT_REPO_URI="https://github.com/pathscale/libcxxrt.git"
 
-[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
+[ "${PV%9999}" != "${PV}" ] && SCM="git-r3" || SCM=""
 
 inherit flag-o-matic toolchain-funcs portability ${SCM} multilib-minimal
 
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index e98c1eb9c289..fd3f3255b5f4 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -11,5 +11,5 @@ EBUILD llvm-libunwind-6.0.1.ebuild 3738 BLAKE2B 5c58eb49bac3d30643ea2d82f5e59add
 EBUILD llvm-libunwind-7.1.0.ebuild 3739 BLAKE2B 160c33fd885e26e19ad02304ee792cb26868e92bcce527246e726e5415c63c071cc72858d35bf4d03111d0e85756b744e00f4f0ec89523232e088d3342f61adb SHA512 260d39e26ae10d62261c2cd348ec487cdc8950997c04b73b3773482fb8f54cc5518dfff58943727892fb7ba57752e1bfe785b2b621c4f00f3bdcdd909ab266c8
 EBUILD llvm-libunwind-8.0.0.ebuild 3742 BLAKE2B 2284e1919e3a6dfacafc424dd0c7cf43f1eb5810ca061096801867397b40989989c4ededb3aa60261046313df3064cece909a2f9343d2225e9e7e273c7a693e9 SHA512 69d4b2bcc157f2851a1b88ac0db3a18391b1e1bc8867f7725804133fd8b91cd128299c182c7d718c98cfb062d456d14181f9fd2885cb2c32e32bb3b96843728d
 EBUILD llvm-libunwind-8.0.9999.ebuild 3878 BLAKE2B 1bb015cb550d1f63792424ff5e95d7d1ebd56063fa33bf959b6be28ccacc6cd04e3a18c503abd907c155c025c6456feffc946c64287df0b7f8003114e7cad788 SHA512 016df29600c1e700add6affa95c803e1dc2dbd2ba4cb086b3ae84251be82e3611251fc8d917c666ab43618b40a3a8424aea319a452481af6965745d3b37b3b86
-EBUILD llvm-libunwind-9999.ebuild 3856 BLAKE2B d2bd4acbb1c9dcd2a775a7b72f1ee482dbadf940d7bd0e17de246b4de549b40fa05aa16d03997f9417206b2ae92306fb32c105f1f896b504d7af4d4a70fe5d71 SHA512 b2c8cb47c5ff85424b9e27bbc9075e357e585df6a767e4ccee53dc8921064a88f529a19305f81c40d6183c481e01ccbcff651b2bc02a34752b5780f028e0a971
+EBUILD llvm-libunwind-9999.ebuild 3856 BLAKE2B 68108179f0b27d90240c709b84f1769058749bbe10833bf7e9509c8919ddfc6d83b13f2a95001e58e18b73da2ca37b3cd598261986134f7932b6086894d7e271 SHA512 723f0e5d75bbfc74453129b85d2e5cb077b728a4e6f02dec8f3de09796f3cbb097d38cb114405ab8771b0ee932a3ab5c4215cce8d01478a300d3600d9f9bbdf0
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
index 213561afe7ce..a5c5c542e433 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
@@ -92,8 +92,8 @@ build_libcxxabi() {
 	local BUILD_DIR=${BUILD_DIR}/libcxxabi
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=OFF
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXXABI_INCLUDE_TESTS=OFF
 
@@ -111,8 +111,8 @@ build_libcxx() {
 	local BUILD_DIR=${BUILD_DIR}/libcxx
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXX_CXX_ABI=libcxxabi
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index d77c030fd645..b086bd8ac7c8 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -17,5 +17,5 @@ DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f6249
 EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3
 EBUILD ncurses-6.1-r2.ebuild 8777 BLAKE2B e4cb86ecb57a121cb0af85ba7c736c6d85cc50f81923533b8121328b30a6b133b96fcf64cfef117addade32ab0df4a3309a154e5b5bfb6f9075bfd11a41b54cd SHA512 2845c4ad480898405305a2a83565c6f153c719098eabcb2c8d59b8a190a91b50434d0038c47f80c1815e746714b0fc6accb1a0efbc5e5ddcfac4356a56903686
 EBUILD ncurses-6.1-r3.ebuild 9194 BLAKE2B ac2478fa113132d40ad6bab70dea47e5c2854a71efd512f7c2457affcc9bfab9805494357c4f609946470c9745b407ed1f53ebbabe3ca59edc084649311b1cce SHA512 a2a118d5539240bf3944be85c0f9aeac9421362461fe14b77f3b10d7402717a0573df5b2a11cdbcb2215badb36936da95bd57704e906b1b639553aaebfa9398d
-EBUILD ncurses-6.1_p20181020.ebuild 9289 BLAKE2B 60627748a592fe658e7c0a73f7ded6cda4af8d133cf8d9a276adc087f780323f01f5590e7fbe70bbccc91f1566e1c02c118f34af2fa8f5ca11847e3aa3e8e24e SHA512 1833bb8b4274f44fdcbab152b6505258514c4e8a80b40473b882f292d3f2bc3a4186249f1e02f89e3af206dcbed206d7f1ed2dd0598b523db0f4567951b19c7d
+EBUILD ncurses-6.1_p20181020.ebuild 9281 BLAKE2B 7376f73e7483e386701b6797c4b2462eef15bb65afa929ea028007cdcb5eb8a8ab4fcde3fc1c4739407a4475d5e0cfcc9e7d712b337a5e5dfe9d416019e01acf SHA512 08b1b7d2377848400a420209fd1b532be9e43ed991b14b9588c87325dd2e1a84cef9b0ef9ab02a877b472762c020ae864bc221a88a39430cd6a77443cd162d06
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
index c96c376e5c8e..ba84afddf044 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
@@ -70,7 +70,7 @@ src_configure() {
 	# This comes up when cross-compiling, doing multilib builds, upgrading,
 	# or installing for the first time.  Build a local copy of tic whenever
 	# the host version isn't available. #249363 #557598
-	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+	if ! has_version -b "~sys-libs/${P}:0" ; then
 		local lbuildflags="-static"
 
 		# some toolchains don't quite support static linking
@@ -192,7 +192,7 @@ do_configure() {
 
 src_compile() {
 	# See comments in src_configure.
-	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+	if ! has_version -b "~sys-libs/${P}:0" ; then
 		BUILD_DIR="${WORKDIR}" \
 		do_compile cross -C progs tic
 	fi