gentoo resync : 29.08.2018

46 files changed, 366 insertions, 164 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d82dbfb20334..b481c01a162c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Orange/Manifest b/dev-util/Orange/Manifest
index 2aa51aff64a7..f3a8ffc10f00 100644
--- a/dev-util/Orange/Manifest
+++ b/dev-util/Orange/Manifest
@@ -1,3 +1,5 @@
+DIST Orange-3.14.0.tar.gz 22537651 BLAKE2B 253a9bf69856f9167fdc9cf001310982441450a93f3caaa74ed91ae2afbefb421734fda1561aff9e4aa1e3dd786c82c324ced07fcbd97a507197cad28778e27e SHA512 eed1e50826ea0ca7c96ad302eb8fe65f997810786f8c9ad3b3c90e085dd77f61ca75535294b3f0244a237d6ff7fe7d0b4cd9bdbd5bb5f489e45d7b1549ead55f
 DIST Orange-3.4.5.tar.gz 32999331 BLAKE2B a334da0d55096a8b3a6092cab4b79891c085e6faed8ddc738aa720ff97bf4bc70e215814a0770f284f5d34fe6ce58081b916477262ec62cb28dd246a923b589e SHA512 327c99f17b5c6a83c48c1826cf34624aaf620d84a2f566f22e394cfd0f1b9c7863cecde0ea7344f16b706efb6a4581adad90b59872db9f0be355495971aedd58
-EBUILD Orange-3.4.5-r3.ebuild 1420 BLAKE2B c5b889661340e9b4a62d15e223d7476d226e1ffb5fee9845fd9b49b2dff6cf6823aefc814117bcf8dfcba78b85b5effddbd024cc5a76697f5c7f1f72f3f6c285 SHA512 3e6cf85941c321bcce743d392900bd1b53064372911b81ecb84551ce9c37b383fb887bbbef8e8b8fa91d13d2f66013573cc988a01d61ee486ceed81aab9dcf3d
+EBUILD Orange-3.14.0.ebuild 1741 BLAKE2B b88670da206681d81d10dc055013fd0c029f7c0972fa98daf0f06cf1afb8372ff94870629fba78053332069d9210029e6fd2000732bb2b504f71211273f093e5 SHA512 d39a7cdf3958e278c9c0a73c3770f09bcd9ebe8e0a5cb3c6c93e7942b4994fee695f1d1194560e5d42fd472ea826b4cb9383699ea4fa53b3cedc362534941136
+EBUILD Orange-3.4.5-r3.ebuild 1421 BLAKE2B 665eed5c5520bcdb6ec25eb37de26fd9a5e2f756bd6163690a79b0f580875be91dfaee5c0786e85d8bb5e2ac1e778b4e49ebd23630d25be490a124857af3c9c0 SHA512 19f5394c51a2f05fb60cb85eeeddc8bc51d75b00892b0b27c2ca1c1ed2f35b3b4fa635fa9847d5a8836497c41c03a8b0c4e3a2311c43a0523e6196a9b39863d6
 MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-util/Orange/Orange-3.14.0.ebuild b/dev-util/Orange/Orange-3.14.0.ebuild
new file mode 100644
index 000000000000..39ffafd703eb
--- /dev/null
+++ b/dev-util/Orange/Orange-3.14.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Open source data visualization and analysis for novice and experts."
+HOMEPAGE="https://orange.biolab.si/"
+SRC_URI="https://github.com/biolab/orange3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc postgres"
+
+RDEPEND="
+	>=dev-python/anyqt-0.0.8[${PYTHON_USEDEP}]
+	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/keyrings_alt[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/pyqtgraph-0.10.0[${PYTHON_USEDEP}]
+	dev-python/PyQt5[webengine,svg,testlib,${PYTHON_USEDEP}]
+	dev-python/radon[${PYTHON_USEDEP}]
+	dev-python/serverfiles[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-0.9.2[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.16.1[${PYTHON_USEDEP}]
+	>=sci-libs/scikits_learn-0.18.1[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-36.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}] )
+	postgres? (	dev-python/psycopg:2[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/orange3-${PV}"
+
+QA_PREBUILT="/usr/lib*/python*/site-packages/Orange/tests/binary-blob.tab"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-util/Orange/Orange-3.4.5-r3.ebuild b/dev-util/Orange/Orange-3.4.5-r3.ebuild
index a6e1066b6a6a..f34690624e02 100644
--- a/dev-util/Orange/Orange-3.4.5-r3.ebuild
+++ b/dev-util/Orange/Orange-3.4.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ DESCRIPTION="Open source data visualization and analysis for novice and experts.
 HOMEPAGE="https://orange.biolab.si/"
 SRC_URI="https://github.com/biolab/orange3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
index f6eb4b4eb6fb..17d84ca190a2 100644
--- a/dev-util/android-ndk/Manifest
+++ b/dev-util/android-ndk/Manifest
@@ -29,9 +29,9 @@ DIST android-ndk64-r10b-linux-x86_64.tar.bz2 358835298 BLAKE2B 79ac6c56c24eb642b
 EBUILD android-ndk-10.ebuild 1803 BLAKE2B 5ad88577a7b11adef940e76e18b00ebff26406c8f455982ada23fcae596fea36cc34d478d5037bcc7540357f67f78da235778dd73c80685c252975f3dfbc9dee SHA512 97915f453de3d42d5b933ee2a442b858de0ccac744797f680dd7abb12c6bee8a8c27aaa26ef21009a6ba7f298d59119a8ab1ddc5d0479e51c0b2f3ce3639e0c3
 EBUILD android-ndk-10b.ebuild 1803 BLAKE2B 5ad88577a7b11adef940e76e18b00ebff26406c8f455982ada23fcae596fea36cc34d478d5037bcc7540357f67f78da235778dd73c80685c252975f3dfbc9dee SHA512 97915f453de3d42d5b933ee2a442b858de0ccac744797f680dd7abb12c6bee8a8c27aaa26ef21009a6ba7f298d59119a8ab1ddc5d0479e51c0b2f3ce3639e0c3
 EBUILD android-ndk-10d.ebuild 1615 BLAKE2B e297ee050ec362c2db5ce9e3ea082b6ec88740528d39250c350a367c2156f44bb30e678b0ed823d1142b5b1864940b2158adcc0c5bffe36735465fc835e5cb34 SHA512 0d2d21d1361f616029bd8e2e5fe40b1ea54123ab13b5d7aace6096be09aeb39310307bd3f81f21fa82692d0c57df89fea72d85ea9c0489e4dc2949d457d54ba6
-EBUILD android-ndk-10e.ebuild 1798 BLAKE2B 5f569d9eb79a4fe6ea4fd28e114bbccf9ecaaec6ebb9a46d12b00ca4c70b841e662324f825f7a3e77af5e8def6525755ce3aa7046fa3ca93349902de04e343c7 SHA512 805abf5fcee1cdf95dc39a2cdaa4d85723ce55c41e6ac4597f305d4ddba99727dad27496245aa6515b06fc1783c38d6cab55748f3b8b0c2c4d010784513cd637
+EBUILD android-ndk-10e.ebuild 1765 BLAKE2B 572c0f54b300a24d52a7f874221e8190c958773fd87746262f435e8d3ff7abf3fff82a221bfdd2b1d019e18fd0f14bc28d0c168032aa531374ba7845086a0870 SHA512 418d37d2318bfedc09b884d28759996ac424d75169e5d812af3afcecceff3ca69ade11a77e2d9212708affffa5058e80fb1960bbbc1a41f091409bbc45f65ac8
 EBUILD android-ndk-11c-r1.ebuild 1657 BLAKE2B 5897883bba07fef24f7955dd96e3733a98d0ae5936b6caf82ed5a3829a2e13ffb3716a118d2c7d2d3cdcadf84763eb200078359e0b2f19223f3a8767474cb29b SHA512 b7391a8201943fbcecb8a061e136214d30ab7a842ae5977550f3ef3723937cc17f7e79f537ef51a302edae7204b949d5f0ec1da19f89efa147649746c6539319
-EBUILD android-ndk-11c.ebuild 1643 BLAKE2B f530d2bc7c158147db0c5c33db2177da866c963255db3c999eb5b1c3d0b166dd8b2beab7f0fd008e6950ac9ffa6ad989a65317fc51ea2c7f5d1580277ae14906 SHA512 cde70bc40cb22ea02f5c953fbafa3ffc636d5bb72ff41bc9f7c4cb5c486865fefe18c94a1f4e52d344cb015fa300f02378a818680711c23028b32fd9b07f812b
+EBUILD android-ndk-11c.ebuild 1610 BLAKE2B da4cb032c6655574f208d999a2fa4820abbebcac089ceb2a7647b4e541f0a5b519ae73e6a93b48d7337136113f2188f654c288a263195ad07e3059cd2bd88c80 SHA512 49b2d3e47cbd008e7a9f2460af7467a3dfa1858eae326a1e7c8e913ee6fcca36e5e9c49cf321434aeb4283f73fe7574cf83c51b06b4d7aae6a86050557e837d0
 EBUILD android-ndk-13b.ebuild 1657 BLAKE2B 5897883bba07fef24f7955dd96e3733a98d0ae5936b6caf82ed5a3829a2e13ffb3716a118d2c7d2d3cdcadf84763eb200078359e0b2f19223f3a8767474cb29b SHA512 b7391a8201943fbcecb8a061e136214d30ab7a842ae5977550f3ef3723937cc17f7e79f537ef51a302edae7204b949d5f0ec1da19f89efa147649746c6539319
 EBUILD android-ndk-14b.ebuild 1626 BLAKE2B 629a4ae59e8f07d97ebb50c8ae47076253bd7965bb6ba7d77e94a0b3bd67479a2b224689d3f98d9d4f87a7c789edc0ca18d97daf754da3edda4a0bb8e8ab3022 SHA512 b2519362c364bc5a406301c12a87480f25eb23d4a492c715fa514ae9797dd17729a739afd6766fa30e35a96b8f38d06f8094766a1321c4fe79db65cc286ed066
 EBUILD android-ndk-16b.ebuild 1626 BLAKE2B 83960ba8eb48f0833b4ae9c6035bdd9bd317d9d2bac1447cd9423a35708e653c01634957891d9b01754b1803022bf8281738233fb08ccb6ffcf1de061d05227e SHA512 5793f1f26df9e6a9e4da5b44c7047dbc5270669aea32b8a7ad663333cf6fc5dcf48c37c7601db1b5e9475333564c4f761cfcf2bb116b818f5aa6fd8d0a92b444
diff --git a/dev-util/android-ndk/android-ndk-10e.ebuild b/dev-util/android-ndk/android-ndk-10e.ebuild
index 5abb2ebaafe9..e0282121b440 100644
--- a/dev-util/android-ndk/android-ndk-10e.ebuild
+++ b/dev-util/android-ndk/android-ndk-10e.ebuild
@@ -20,10 +20,7 @@ RESTRICT="mirror strip installsources test"
 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5
-		sys-libs/ncurses:5/5
-	)"
+	sys-libs/ncurses:5/5"
 
 S="${WORKDIR}/${PN}-r${PV}"
 
diff --git a/dev-util/android-ndk/android-ndk-11c.ebuild b/dev-util/android-ndk/android-ndk-11c.ebuild
index ae39d95ef377..70f673d8e818 100644
--- a/dev-util/android-ndk/android-ndk-11c.ebuild
+++ b/dev-util/android-ndk/android-ndk-11c.ebuild
@@ -19,10 +19,7 @@ RESTRICT="mirror strip installsources test"
 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
-	|| (
-		sys-libs/ncurses:0/5
-		sys-libs/ncurses:5/5
-	)"
+	sys-libs/ncurses:5/5"
 
 S="${WORKDIR}/${PN}-r${PV}"
 
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index c12c8e76761e..80a15cbc79ef 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -14,17 +14,17 @@ DIST android-sdk_r23-linux.tgz 137880977 BLAKE2B 3a0e0d321bf89bddd4f4e3ed4e6b6ef
 DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
 EBUILD android-sdk-update-manager-21.1.ebuild 2942 BLAKE2B 820b6e694097d46d0e28ab459cbb48afcd7b0d27b6d1e635592c1f052a9e72dc6c1aec925ad978506f33b5256b1cb92c82c3eb9f2a0d5298c732c2921b4857e8 SHA512 89ac1e255b9b100fb54d62b7b92c91a498771abb31e41f4c5db6c9811f84c042bc128791ebbb6ed1438f6e07027faa629ddd8b0f5338e47953643b6bef291904
 EBUILD android-sdk-update-manager-21.ebuild 2957 BLAKE2B 352bab8594bad1837ea79ae669dfc94285f6a6a5136d939421615e067d97390768c6666b6a9ce9d62576cc099d7966cf04be6ebd4a11673c72791b18ee2163ff SHA512 22d1559c207806c8d984298ae280d6e256dccc1ad04675369f68869b878305ec47874ff9de22592a703e90358d8a6c57bf60d34d7ac96b375d316d058f273636
-EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3159 BLAKE2B 9ab9d163dca307496ff084e2c94a63383f5c27f96edbc5f29eb805cd8e6a9406cdf85837116a6177f4cfcb0bf9bd46ad1d662f7cc9c08bec6bd9e38108590fa7 SHA512 74d2a9c7aabf500fd9b4282c65782b44f9888c7b294ee9b5090bb4823aab73225ac0c1d0e9b0825d2f27cc8789620447df45f84e62776beeda1731a3c1583ad4
+EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3128 BLAKE2B 2c8b57429ce744a9904b418a9a7b71600cfe9d862e4ab49359fe9de788b80b1d5956860267e1623ab438021f230e8e2c1d2dea7cbcd1e38f5c28aceecb7ec3e3 SHA512 1c1cee2d30f591edf7843288914e8b8cfd3c002419370a9ac7181496ef0f7cff33c57a93e44adfb5935691738f84f04d0f21c0d513bf2416fe7501142dd2528e
 EBUILD android-sdk-update-manager-22.0.1.ebuild 3132 BLAKE2B 33f2bdadbb39382f6ffdf251717569b40e3993518dff6936cb95a1b592a0f83b27b6a490a34826e9939727481ab0d8d6e1abaa5b27812c8d7e828ab0a2df025e SHA512 0af64a571ffd05756a88f40b0fd1c8424877b658ff7d6b8e47d5cef0c1b7a2f514ad944f8c1214383561af0824e80786d2920ecd5b07eeba718a7a117929f8d8
-EBUILD android-sdk-update-manager-22.0.4.ebuild 3159 BLAKE2B 9ab9d163dca307496ff084e2c94a63383f5c27f96edbc5f29eb805cd8e6a9406cdf85837116a6177f4cfcb0bf9bd46ad1d662f7cc9c08bec6bd9e38108590fa7 SHA512 74d2a9c7aabf500fd9b4282c65782b44f9888c7b294ee9b5090bb4823aab73225ac0c1d0e9b0825d2f27cc8789620447df45f84e62776beeda1731a3c1583ad4
-EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3238 BLAKE2B 074b920536e66c12460be69f4461ae0757019ff60f081c18e6e672de3f013ce2da0fdafd2d999bd2851c2c700e06b1e4a68d0f15b39bb5cee6dc3cd3dfc3533e SHA512 8b9544106151ba64e00971af1d528a66d8c3868741f719caec5f434969a78072fe0fbbd3d6ac16d165ca45fe20de46b84295550af96bebc13c93f3c1618aa201
-EBUILD android-sdk-update-manager-22.0.5.ebuild 3159 BLAKE2B 9ab9d163dca307496ff084e2c94a63383f5c27f96edbc5f29eb805cd8e6a9406cdf85837116a6177f4cfcb0bf9bd46ad1d662f7cc9c08bec6bd9e38108590fa7 SHA512 74d2a9c7aabf500fd9b4282c65782b44f9888c7b294ee9b5090bb4823aab73225ac0c1d0e9b0825d2f27cc8789620447df45f84e62776beeda1731a3c1583ad4
-EBUILD android-sdk-update-manager-22.2.1.ebuild 3238 BLAKE2B 074b920536e66c12460be69f4461ae0757019ff60f081c18e6e672de3f013ce2da0fdafd2d999bd2851c2c700e06b1e4a68d0f15b39bb5cee6dc3cd3dfc3533e SHA512 8b9544106151ba64e00971af1d528a66d8c3868741f719caec5f434969a78072fe0fbbd3d6ac16d165ca45fe20de46b84295550af96bebc13c93f3c1618aa201
-EBUILD android-sdk-update-manager-22.3.ebuild 3352 BLAKE2B 0e6a4fd9790dca01b341e3fedb338654ec9cf4a20f6046382c16396d85dd3f97323308456d3774a162afe860b333e684c5f8ca2f53e15c2bdc4e7de6186ef545 SHA512 bcb18e63267296856f6e8e872e83d1f76d155351400bd1df21c65c3051e0f9e9b580996d55b74b7f3474ee9cbbe89cec2cbf2b7fa969be5ac1d7b38457d8a904
-EBUILD android-sdk-update-manager-22.6.1.ebuild 3352 BLAKE2B 0e6a4fd9790dca01b341e3fedb338654ec9cf4a20f6046382c16396d85dd3f97323308456d3774a162afe860b333e684c5f8ca2f53e15c2bdc4e7de6186ef545 SHA512 bcb18e63267296856f6e8e872e83d1f76d155351400bd1df21c65c3051e0f9e9b580996d55b74b7f3474ee9cbbe89cec2cbf2b7fa969be5ac1d7b38457d8a904
-EBUILD android-sdk-update-manager-22.6.ebuild 3352 BLAKE2B 0e6a4fd9790dca01b341e3fedb338654ec9cf4a20f6046382c16396d85dd3f97323308456d3774a162afe860b333e684c5f8ca2f53e15c2bdc4e7de6186ef545 SHA512 bcb18e63267296856f6e8e872e83d1f76d155351400bd1df21c65c3051e0f9e9b580996d55b74b7f3474ee9cbbe89cec2cbf2b7fa969be5ac1d7b38457d8a904
+EBUILD android-sdk-update-manager-22.0.4.ebuild 3128 BLAKE2B 2c8b57429ce744a9904b418a9a7b71600cfe9d862e4ab49359fe9de788b80b1d5956860267e1623ab438021f230e8e2c1d2dea7cbcd1e38f5c28aceecb7ec3e3 SHA512 1c1cee2d30f591edf7843288914e8b8cfd3c002419370a9ac7181496ef0f7cff33c57a93e44adfb5935691738f84f04d0f21c0d513bf2416fe7501142dd2528e
+EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3207 BLAKE2B 850840be8d22d5f9a74ff1f9922e8c852934a8f41b6e310e40ab1349023b8b08e5d3e1b390387fcf28501b4d99411407acbd8059a361e2fe5146cc798fe7f52f SHA512 da6e00187953f257226845f06692b4599e96de75f2a8f20def8fc259343f526ff6b1a248cd6c5e93cb7e732148fd50d32def29ff87478ae7ff9b50b9c550d17f
+EBUILD android-sdk-update-manager-22.0.5.ebuild 3128 BLAKE2B 2c8b57429ce744a9904b418a9a7b71600cfe9d862e4ab49359fe9de788b80b1d5956860267e1623ab438021f230e8e2c1d2dea7cbcd1e38f5c28aceecb7ec3e3 SHA512 1c1cee2d30f591edf7843288914e8b8cfd3c002419370a9ac7181496ef0f7cff33c57a93e44adfb5935691738f84f04d0f21c0d513bf2416fe7501142dd2528e
+EBUILD android-sdk-update-manager-22.2.1.ebuild 3207 BLAKE2B 850840be8d22d5f9a74ff1f9922e8c852934a8f41b6e310e40ab1349023b8b08e5d3e1b390387fcf28501b4d99411407acbd8059a361e2fe5146cc798fe7f52f SHA512 da6e00187953f257226845f06692b4599e96de75f2a8f20def8fc259343f526ff6b1a248cd6c5e93cb7e732148fd50d32def29ff87478ae7ff9b50b9c550d17f
+EBUILD android-sdk-update-manager-22.3.ebuild 3321 BLAKE2B 066ed641d3dc8a4c2fece16fd48c804f0849cf17da30df3f483fa5f71b269106d21c751f30784386224a0b1868d18e3d47cd69ecd48e1620dde6e05e1068d274 SHA512 6ccb035f3cdc1a036b91063097319336a73a6b8f025be2edc90436b56a63d4f31901c9dfe94d973ea57935d76da6df8d600100ef7e1860639c92f843c43eda03
+EBUILD android-sdk-update-manager-22.6.1.ebuild 3321 BLAKE2B 066ed641d3dc8a4c2fece16fd48c804f0849cf17da30df3f483fa5f71b269106d21c751f30784386224a0b1868d18e3d47cd69ecd48e1620dde6e05e1068d274 SHA512 6ccb035f3cdc1a036b91063097319336a73a6b8f025be2edc90436b56a63d4f31901c9dfe94d973ea57935d76da6df8d600100ef7e1860639c92f843c43eda03
+EBUILD android-sdk-update-manager-22.6.ebuild 3321 BLAKE2B 066ed641d3dc8a4c2fece16fd48c804f0849cf17da30df3f483fa5f71b269106d21c751f30784386224a0b1868d18e3d47cd69ecd48e1620dde6e05e1068d274 SHA512 6ccb035f3cdc1a036b91063097319336a73a6b8f025be2edc90436b56a63d4f31901c9dfe94d973ea57935d76da6df8d600100ef7e1860639c92f843c43eda03
 EBUILD android-sdk-update-manager-22.ebuild 3132 BLAKE2B 33f2bdadbb39382f6ffdf251717569b40e3993518dff6936cb95a1b592a0f83b27b6a490a34826e9939727481ab0d8d6e1abaa5b27812c8d7e828ab0a2df025e SHA512 0af64a571ffd05756a88f40b0fd1c8424877b658ff7d6b8e47d5cef0c1b7a2f514ad944f8c1214383561af0824e80786d2920ecd5b07eeba718a7a117929f8d8
-EBUILD android-sdk-update-manager-23-r1.ebuild 3343 BLAKE2B 841a1f84bcd734bc483c44f2be45fd5329063e2e68e9f9b4d9413309e3926dea1bfef5a4b600292e96f360fa030393caa804ea3fad643cde5ab89bf9a664cfe3 SHA512 efb7660073bc65dd201144abf823c8a53a5afffd59bb1b97d2157a12a4f2e0e5ab60f1d6e109578c06265c8edd07b7940b7cdd623064212843a7196d3bde8391
-EBUILD android-sdk-update-manager-23.ebuild 3337 BLAKE2B 74e0a1c8369337da880f72f875bb0ad57e7966c85c4533630b3edfbfe2213f6838d35693c1db2d13e457900d4d25de5dfe367cf2a4d72388c4dfdcb2dde0bf0a SHA512 4f4d8ba928d5f5bc5ad27fea644a4e4222b1261cf9f4baa4cb771d97ff05a9487c4540e667e65e966a3c41196b61700a7443419e8722a803e370f0ec171f002d
-EBUILD android-sdk-update-manager-24.4.1.ebuild 3343 BLAKE2B 841a1f84bcd734bc483c44f2be45fd5329063e2e68e9f9b4d9413309e3926dea1bfef5a4b600292e96f360fa030393caa804ea3fad643cde5ab89bf9a664cfe3 SHA512 efb7660073bc65dd201144abf823c8a53a5afffd59bb1b97d2157a12a4f2e0e5ab60f1d6e109578c06265c8edd07b7940b7cdd623064212843a7196d3bde8391
+EBUILD android-sdk-update-manager-23-r1.ebuild 3312 BLAKE2B 0ee7c0692219c073561cc02bf16f3317352c79b275dc07886a436b172a7d003fdb715af3412c795be391f86098b89ba957d30d01e451cb89d198e714b91b210a SHA512 e48a29a6a1cef96e6c11b2dcf8ee3ee2fa76e2445241610b6932f17a0401969f41399a74df2d4a5a791ace70b17bf1d2a70d79a3d74f593b8a792520058d4a3c
+EBUILD android-sdk-update-manager-23.ebuild 3306 BLAKE2B 186a814856c843f7c85d3fe1d60c271ea16602a03eb0e2ca985a2aa4fefdb2b5bc090ee5d80d4c88e3264fdb6b0023f94eb7756c37a0ebfdfbdb2193be3a51d2 SHA512 a869b3366da7ecd4191a0ed47f5f86f85ca1f35ec2b3d6e6645298aff96e068e1074326dcddd3921d8415fe84b83c7d1b2238fb47f75c4ba55cda37b18d833f0
+EBUILD android-sdk-update-manager-24.4.1.ebuild 3312 BLAKE2B 0ee7c0692219c073561cc02bf16f3317352c79b275dc07886a436b172a7d003fdb715af3412c795be391f86098b89ba957d30d01e451cb89d198e714b91b210a SHA512 e48a29a6a1cef96e6c11b2dcf8ee3ee2fa76e2445241610b6932f17a0401969f41399a74df2d4a5a791ace70b17bf1d2a70d79a3d74f593b8a792520058d4a3c
 MISC metadata.xml 214 BLAKE2B 48fe26dc32218c5f83cecefd288be1d07314b03aa871c0c322ff125643f0a42598d39b0bf2fb46daf63f3f39df78b869dd4398ab4671dd0f57d62060ce148a2c SHA512 2d699278683037614d2dc6595d6ae71ca4eb3a5b22506ccb0926d932f00bde85c1759caf8c0b1729cd949e652fca33c8ced0e7ac6e65af144f0f66eb064ceed3
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
index f812d83f4ede..35615393b478 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
index f812d83f4ede..35615393b478 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
index 173fd895298f..86465a22ddbd 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
index f812d83f4ede..35615393b478 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
index 173fd895298f..86465a22ddbd 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
index 56e4c80f1379..6db415054941 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
index 56e4c80f1379..6db415054941 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
index 56e4c80f1379..6db415054941 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
index 5178faa3931e..8593117128e6 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
index 20463eb949fa..92937bbca47a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
index 5178faa3931e..8593117128e6 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/tar
 		app-arch/gzip"
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
-	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	dev-java/swt:3.7[cairo]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index c74ba1948c42..c37f3f049840 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -7,5 +7,5 @@ EBUILD dwarves-1.10_p20140618.ebuild 1038 BLAKE2B 4b7554e6e3430285a0ee841ae2468a
 EBUILD dwarves-1.10_p20160519.ebuild 1038 BLAKE2B 810faad7bd8ef2a477a44afd3fdce7f28b4ee152ccd2b254ce16ed4a3aea048d319c00e4dc49efe5d1c9633dac6521a024c6b59af5bdab5816f53ed721038b62 SHA512 b639ba81e22f559b1547e78ca1ec945471b946050f6a61892321403c4e283388067a4870835bf8a8fccc0b0367f2e14c192642ff210530604945662c91840f26
 EBUILD dwarves-1.10_p20160630.ebuild 1038 BLAKE2B 810faad7bd8ef2a477a44afd3fdce7f28b4ee152ccd2b254ce16ed4a3aea048d319c00e4dc49efe5d1c9633dac6521a024c6b59af5bdab5816f53ed721038b62 SHA512 b639ba81e22f559b1547e78ca1ec945471b946050f6a61892321403c4e283388067a4870835bf8a8fccc0b0367f2e14c192642ff210530604945662c91840f26
 EBUILD dwarves-1.12.ebuild 1038 BLAKE2B 9cb69f3108df21db6c39c359129df606083374ba7a9dff0b8338dcaf9ca96bc1b85be0c135d7c2e8b76a60e1b391ed6c4abcd9eeacfc75fc6eb8526f0a2dc803 SHA512 9ba86d1966a769c43202fa8152617e6af65a0f967433aedfe69461857607485c26d1d51fb8dc5c5b2e48a55d9c8d1c67c54d0d64f3b837a9438531e1d2ffe51e
-EBUILD dwarves-9999.ebuild 926 BLAKE2B 6f6bff98a7f3e0463f5a89a27cec543122f9857468ab263e5027a8a4fafa5f4a9c46eedd53da7b9c0bfabfc788538ff738acdb748c1045a33ba6a024be6d24ef SHA512 dbed04e6cf4e2c5f0aed91ba35c299ad88f1a3bbf95f278ce48c4ee1b34751f6246f73d6fabc207fc83d6d4b28918c549634bffd1e621da2cb7e8a26d9f58ab9
+EBUILD dwarves-9999.ebuild 929 BLAKE2B 5531cdc3c1f3fc899cc16b34202a204b345af50d00eb14120e25da00a724599f9395df68e96e2fe8364ed826380e9afe014d8bc56bd92fc0c59b40c87a875519 SHA512 8a44218bb5e96127336e692040626ccb9414a7b53e53df85ff01b6580129b13f8325540e9b9247039a4c92971a9818bde1ec99842c65920a7b40e74f4f4d851b
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
index a82314e5ae50..247fa2819744 100644
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ b/dev-util/dwarves/dwarves-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
 
 PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils git-2 python-single-r1
+inherit multilib cmake-utils git-r3 python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 900b2c435d60..fd8f125088ba 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,6 @@
 DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
 DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
 EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
-EBUILD edb-debugger-1.0.0.ebuild 1096 BLAKE2B 3f73167ba37b9d4bc277fbf53fddc96bfb98b9f301be40cc322accc063437ef5d7001732b5868d6fb57ad469a460b220c486ec1e1322af4b3008dada35d7c86a SHA512 460c78cf689eea5eeef7811bd609bf950b68aff1151ad562477c039ab8317407a826dd5e28e036acbb7cf43e8dfc00f1f17d709c9daedc2a8d47133eaef7d852
-EBUILD edb-debugger-9999.ebuild 787 BLAKE2B be915dd9ce1d585bf4852a928f262bd37d03df3d61f9aa237bfb11f359b3f2a464d12ced3b24dd908c8ce38aae78a2b19469ab911a1d1811dfe6ff88062eb0c4 SHA512 ca50d50f061e1373c7b5177cef7cea6c5878f449b7877324ef963b37d3e93d97ed4f9ff9f7fbfc235bc339b4beebafbed796838b04d234e87a1f6714be7c542f
+EBUILD edb-debugger-1.0.0-r1.ebuild 1091 BLAKE2B abc8c06cd5065641477c68905691ef7b27433ab4b9413ebf1b74827d5208ae0151d599af68f3ab499f517ad513bf25bf6377f7286ac94b81f4b937a62018679f SHA512 f28807d04a91ef0c377c9b5ac9a8ba20a4360bb278933bab22602a6ffe3f654c7c88492a009ce83b8a0593cc7f298baf2650a37c504b2d93289576707fb73d5a
+EBUILD edb-debugger-9999.ebuild 803 BLAKE2B 11b5077573164b44b551a8b13ef0fb1df95f15454b16dac7c40a70b5d19e89f56c84818ad37fe45ac95398db5420fec6639004ef464f5cb195e64e093c01668a SHA512 69940c4623a86fa8b4b345b2d067a354c29a155a969a2a0bed002da0669faa009f0d407b294cc7361ebedd4df304373811308070074a5ceb7c2e3d041c154e98
 MISC metadata.xml 601 BLAKE2B d91cda94777a8c5d1332e28b7cb643c59271d2442b3aef592b4ba097bd953693107e32803f23a5f2666a6cacf142ca87c0881cfc00a99f70b5a043755a14935b SHA512 76dd4c92c4a5463273ae8c8f9568e1ca330f709900a16247a7e8dc1035e3530c358c2573953d75845b442f63e965b3584ca7fa9f2fb75b55aa4985e13d3cbede
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r1.ebuild
index 19371dd7bdb6..d94498796626 100644
--- a/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r1.ebuild
@@ -14,18 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="graphviz"
 
-S="${WORKDIR}/${P}"
-
 RDEPEND="
 	dev-libs/capstone
-	graphviz? ( media-gfx/graphviz )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
+	graphviz? ( media-gfx/graphviz )
 "
 
 DEPEND="
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index 43268a0bddf5..dc0094a1afe8 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -16,14 +16,15 @@ IUSE="graphviz"
 
 RDEPEND="
 	dev-libs/capstone
-	graphviz? ( media-gfx/graphviz )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
+	graphviz? ( media-gfx/graphviz )
 "
 
 DEPEND="
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index dfec8b299d66..d609d0ca8e70 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2577 BLAKE2B 110bf184a66013282cfaa51032a161eb9ae5ccf19acf42024de136c20921475e6e439fa5c5ac0750e86b6b40d4ac0b70dc09a7b9a2a5bedcf7038a236c14734e SHA512 668b64a119f6895c8f03940155a01ce0fc95e1fc8c7504eb7b2b459b8b29dde8b2696ae619005214a0c29c5ce1dbb4a614cc7a5137553e37ff5d98e9e1ebbb43
+EBUILD gtk-doc-1.25-r1.ebuild 2692 BLAKE2B 2884c13bfd715e12d6793671957d68b723d1fe3b381ffc6a1a9e4e1c449534f43571196cea008037de6f6f89a7a1dfb0f300455ba9f1309ff319420353c07f86 SHA512 fe3ec211a1e0ffe06952e11d21d4e63b758c585345f9c3578bc58f160dbc872755c708ba7132c23fe9c9dcecedcb7cb59ec6c840ad29d28ad4920fda68975e0f
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index 155f1f6a02f9..f696a066e7f7 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
@@ -50,6 +50,10 @@ src_prepare() {
 	# Remove global Emacs keybindings, bug #184588
 	eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
 
+	# Apply upstream commit 1baf9a6, bug #646850
+	sed -e '1,/exit 1/s/exit 1/exit $1/' \
+		-i gtkdoc-mkpdf.in || die
+
 	gnome2_src_prepare
 }
 
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 95f7f0f65a2e..99cc940b5815 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,12 +2,8 @@ AUX jenkins-bin-r1.logrotate 483 BLAKE2B 1fac7c0973a5e2210db1bb5296980456ece0c01
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
-DIST jenkins-bin-2.121.2.war 74736956 BLAKE2B d63f49bad61bad216d06318c373951e99c46ff98bc0c9311fc123c9045d235131623436e3636db63bea0e95bf467040c755d0086612d69ea45b016e9dd39095a SHA512 b62b8cbb76997ded9442311204f7e43acfef57ed9949db19c05c382cb2171042ac41332d6372a45a7a5f46f295b21a6fd0533bd71e800fec7b0bf6b3e2998c8e
 DIST jenkins-bin-2.121.3.war 74764818 BLAKE2B a738a48fa944f6b27c1c36afde46d957bfa7134fce54b6799ef4ee7bc16b68c2c8819a907e54ad90f7713dad9b1df7dc59f4e1751e9c843172f59ab2b2c9e27f SHA512 93460c7623090e55b38da8a009ade40c44943683c64fa5a0528fab3813ffc592b3419856c8b2f175b16455a21db71f6f2e509ab97d793c94e0727f3c73525c41
-DIST jenkins-bin-2.133.war 75341772 BLAKE2B 2e9ca1ba4cce14eb32157c0b3853b103b02d02c4ba7ab3cdc7308e1fe7b6210e70552ef52a1b92d107149d9c261de5ed8b74cbf044a6e8f09ca48b9ae7388d5c SHA512 f1fcbaa40e554d854efc59d8ebc03b9c9626ca065e79bb18fd671c0f25db5b0e1cf1e4341459eea1e4ece9f978da53f5b46425bd125453f8a7c7abc5551ad000
 DIST jenkins-bin-2.138.war 75704621 BLAKE2B b9411bcec408eb5b17fb3d1dfbf2b82be2516be07b53b182af543a4c59504a49adbac154caa5f2e67f26268464c5e47da5d3caf7f2a19945600d9f4e31402da9 SHA512 69e0873e265de35d09af26ecc53bda012c486b4b7ad43eefea67ca819e6c38dd3a61f189a94a79a60e6fa5b3279baf3228d41691e26417aceb4db12fd36a5325
-EBUILD jenkins-bin-2.121.2.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
 EBUILD jenkins-bin-2.121.3.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
-EBUILD jenkins-bin-2.133.ebuild 1100 BLAKE2B d2dcdb83fff9aa62fa385b7c9540e5d3ed3f9758fcbda8ef90818f09c6b2033b0527a7eaf2377f3aeae6d73015544640e81474aa2fa78a7cab3bb9da071d1c90 SHA512 4cf21957d3803b439f7b13b612f86ff823435f46112bd9fedf5c225db03a98309dd6361ca9da7a789bbad718de009cba4fc819c0fffae807ac70e3cbb47470b2
 EBUILD jenkins-bin-2.138.ebuild 1100 BLAKE2B d2dcdb83fff9aa62fa385b7c9540e5d3ed3f9758fcbda8ef90818f09c6b2033b0527a7eaf2377f3aeae6d73015544640e81474aa2fa78a7cab3bb9da071d1c90 SHA512 4cf21957d3803b439f7b13b612f86ff823435f46112bd9fedf5c225db03a98309dd6361ca9da7a789bbad718de009cba4fc819c0fffae807ac70e3cbb47470b2
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.2.ebuild
deleted file mode 100644
index 3b701c29b1b9..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.121.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.133.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.133.ebuild
deleted file mode 100644
index bd24b8ebc145..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.133.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 3732ff3e1860..f5f832cce1d4 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,9 +1,12 @@
 DIST lldb-5.0.2.src.tar.xz 19220632 BLAKE2B 7ab97a4e96a2faf6593f5584a5455bc793a50a51370bd32d1595958e5fba9d121832675e6f31cb18a3b77b472eefa8040443b77af3e29c5aa455e2a0dcdb7cdc SHA512 66eaaead60cc908ac061bedb4fac9cb96cecb7f4e5a79a51b6fa080e8f61f718b14e5f3581ead832b495bf10f055d4253d199236a0947dd22395ec80bf2afcf4
 DIST lldb-6.0.1.src.tar.xz 19292420 BLAKE2B 9ec3304aa370781dcbc7c30e47f7becbd99b50f32d9eea36fefbf0e3608bdfe10796ecc14807ee17795de430409315a5dfad02db0fd3ec1a0ad51e9e240e4b40 SHA512 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721
+DIST lldb-7.0.0rc2.src.tar.xz 19403564 BLAKE2B 6feb27e48ca8f8aa1423fcfb890b589207c8d15e1cb586f1c173d48bd5f93640ffe86c3f0e6cfc2d7871032027ebec57506838a26a932b4c7cd10aa984697cb0 SHA512 d848eacf1b628feba0b54a51b2db9cf85bff0e363d989d437acf31bf6b4671f3b9a8e6a40fa21355d526db8d9b15515003af4a4d09dd4c106f31910d3d9aec0d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
+DIST llvm-7.0.0rc2.src.tar.xz 28320756 BLAKE2B 92707da30fe73a6dec2614acceada06560332d3b54edeae5047543f23808cf13b24aecc9c853ccbc3341951e1fbceff85509465aa6207275fc54c75f94baff55 SHA512 4211fdbd2278ed325d3f6a1f1fa706351e768e2cd1445abf6664bed39b7b5d0c5e04514711d627f9ae1e271300f410635bb54ba004a5bece0d68450d3a1b52e4
 EBUILD lldb-5.0.2.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
 EBUILD lldb-6.0.1.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
+EBUILD lldb-7.0.0_rc2.ebuild 3001 BLAKE2B e1fb09182c4e6cff1cd7451fbd64643c9aa3f3c2c869340eeded322dfaa7d764472093484b3b884de7a675f314c87f62a93b4b8bc3cfe2280a17dcd78518107a SHA512 aea3200fbd380bc96b1f16794dc546f41ed13ead893d6448371f5111007b7e5d8100dffcce6389c1d44880f4d9f56712013af0b6825ba900426063770fb1229d
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-7.0.0_rc2.ebuild b/dev-util/lldb/lldb-7.0.0_rc2.ebuild
new file mode 100644
index 000000000000..4511b5951522
--- /dev/null
+++ b/dev-util/lldb/lldb-7.0.0_rc2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit ncurses python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 43d578beee35..f17fdf82bba5 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -7,5 +7,5 @@ EBUILD lttng-ust-2.10.1.ebuild 682 BLAKE2B 2aad3681948a4f92d4ed100ec22eabe662cef
 EBUILD lttng-ust-2.6.5.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
 EBUILD lttng-ust-2.7.1.ebuild 632 BLAKE2B f7a3577e36025dd620dc9a29f8e35f90a4d4baa3fd3d214013a81987c73c366fe6f8e0c8fd764a3614706a5bf9c64f77920e72f8f6d0868cea1093d4e0142fe6 SHA512 7848f28030dd7ede00ed14d0924af46d589d549dbd73d5afb83b0a06fd2600ddd01c2e32eebe5ed7aa243225d63fbc1648e2d66f38794c0f85a4e6e9fdadabe7
 EBUILD lttng-ust-2.7.4.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
-EBUILD lttng-ust-2.8.1.ebuild 647 BLAKE2B 6d361ffa352b8deddcfd1269b2289bf89dd56b657c39f3e20422fe707d60abdfddc329c940f5012104d6d7e1758b58bb1a08828508b7382ec33e9ab362f2ba8e SHA512 f805a0e19c98088d55700c62aaf8576f26850d760521a9f21f9b28abf0c3158f12358dd2d4e575ddde92c466b958f45a9ab93ec5819227d792e7b7f7a368fad8
+EBUILD lttng-ust-2.8.1.ebuild 654 BLAKE2B 393b99838aaaf1e4a1167ed9134fe9495baed769acf8635eccd1bbc1f27e7194898bd7ffa65d9ff1e52400402d57c76a3a17e2ad78e9cfca8780f3c33d4b6cad SHA512 eb547d731bb9d44c1a5a825338de23020b596b3baa34c08dcfa6f613f76defade60612ed0f76bff2d17a27dbdf7191796415eed860dbe2d76a65ff2d53888434
 MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index 281408c771c8..91e4fc222950 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu"
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index aa18392fc3c7..8f07a21802b3 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,5 +1,6 @@
 AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
+AUX mdds-1.4.1-buildsystem.patch 898 BLAKE2B 716559741402b82537d91698ebe78815c26e47ecb844bed37f0c188efbfa5c9fd7bd9be501afb4d3653840961fa7ace17d215eb035ec9a028bf775589f9dadf8 SHA512 0e5b735232b8409194f6d9fc1b1b171dc333d6388ab858cb79be4908ff1cbdcee276146365b3c6c70b192559489896ba50384b5d78a22fc8c1fa78d683d89b7e
 DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
 EBUILD mdds-1.3.1.ebuild 981 BLAKE2B d56dee445b3d1c55fa2d2eb6c742c45574db99784ea41e26d0b24eb12ef439eb6522385f1c9b1e539373d5b88a7361f412cc192b2b7a297fb689d576c06bd3ad SHA512 9564ee7663255f1757c86325bc80b78c6b05375a5a35a9a46b4567c7a307b8c3cc0d7e4e86349fa7074d65bb321bde88e9a625ed2ecb668f0574899d80e48c88
-EBUILD mdds-9999.ebuild 996 BLAKE2B e1ca3357c730601129ef9e698d6d200152dc29e99b1198e4e9b5de556e228e741829c0e8c25abbecc5bf8cb7fbf2b10e0d25a24ab6b25c0dcd2b88f42821daf9 SHA512 39a037513bffeeac8931380b00f46a151b930c50dedc81b5d27c960a0448e123505ae50d5e399bd514ac695af0187a4b93d826bc766bb608b53013e3b5291185
+EBUILD mdds-9999.ebuild 996 BLAKE2B 9c0e219edb41aa5a8aa9d7f0fe38182d0a45322c614932ff0fda9d6888c9e89eb75208b4c6d77b1ac3a082015a81f77d6dd2ab96f312eb69d14c13ff3f3e1278 SHA512 d2b7462575b484f8dd4002addfb075189419495b1e744a4c818f7e87be3768ca39284a3d9579a64ef450b19468952d865c8e2019cdbb5602ed1f99d8f15c8f43
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch b/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
new file mode 100644
index 000000000000..212587e9dacd
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
@@ -0,0 +1,37 @@
+We want to install (not all of) those files manually.
+
+--- a/Makefile.am	2018-08-29 13:23:49.434860594 +0200
++++ b/Makefile.am	2018-08-29 13:25:52.125789186 +0200
+@@ -4,8 +4,6 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+-dist_doc_DATA = AUTHORS README.md
+-nodist_doc_DATA = VERSION
+ nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
+ 
+ DISTCLEANFILES = \
+@@ -15,8 +13,6 @@
+ 
+ EXTRA_DIST = \
+ 	autogen.sh \
+-	CHANGELOG \
+-	LICENSE \
+ 	doc/conf.py \
+ 	doc/doxygen.conf \
+ 	doc/flat_segment_tree.rst \
+@@ -164,14 +160,6 @@
+ 	rtree_test_bulkload_mem.mem
+ endif
+ 
+-install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(docdir)
+-	$(INSTALL_DATA) $(top_srcdir)/LICENSE $(DESTDIR)$(docdir)/COPYING
+-	$(INSTALL_DATA) $(top_srcdir)/CHANGELOG $(DESTDIR)$(docdir)/NEWS
+-
+-uninstall-local:
+-	rm -f $(DESTDIR)$(docdir)/COPYING $(DESTDIR)$(docdir)/NEWS
+-
+ if BUILD_DOCS
+ html-local:
+ 	(cd doc && $(DOXYGEN) doxygen.conf)
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 8059254bb67f..65b5df3e9c0e 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
 
 src_prepare(){
 	default
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 2549bba9cc3b..3c225e0ad302 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,11 +1,14 @@
+AUX re2c-1.1-dash-V.patch 1311 BLAKE2B 470b6ff918a8aec8acec58c90271fb2e7e0f0e2edc331f5195a869c9fbec798e1e96235cbf96d055c62464f57efd3423a33aa78c3f9d6e8f924763b84aa02f53 SHA512 704ae4cae512d38319cddfe2de342b635422c2ca2dec460689406eb4de436f971abd3d2530df25ee69d4d2a1e1f9b1ae5ed166538e300a10d79eb374a576cae7
 DIST re2c-0.13.5.tar.gz 782725 BLAKE2B 569ded397a2139c76e1c97c73f52628e6723c5c8e2dc9fd46ddda6fb30c9dae8454460b5e457c4a5319ccf4e2fd0f45a7ebc28406881d9d44dc45bed106769c9 SHA512 56101bf01aea6f0c082b85382be34acada51d70036252581cd76ac4b2bdbc144633b97c63a94bfdba434ffb80884e11299a38853e2d805dc7ce6cf9d452c81c8
 DIST re2c-0.16.tar.gz 4892417 BLAKE2B e1160d3f6ebd63d42a22c112d83a31fcd7bb0d5ab239b7be569f603752794048685776602aae754d8b4e47cb6ae3540ce0977b0824e6bf3104e58a8fb0428f9b SHA512 d4fb8078d9566a1fa177331b649cac79e2e45cc9558a22a2212503f6c77c9e6b4238aa01c85c66b86fa4831cdc669cedf8b430d395be6a0c6cfabfb7c61cf8a3
 DIST re2c-1.0.1.tar.gz 5758988 BLAKE2B e02d8ce5f82441d33ec055d582e797d33a4b1a5244d37477b5c93117c735790a6a24e1b9e1456a6d4182c3282b59955838b625216cf47abfcc8c4fb5eacc953e SHA512 ab3b652d8f97b0d1be4c7561ce65e28870ab8976f8a31d74a6629b43d2057bfa608c7f393d5e5d59d26f991552a60e6274f554ef58752bdfcfeba330578f1299
 DIST re2c-1.0.2.tar.gz 5805526 BLAKE2B 931e7b00f57cf8c3e49e540496906208e5a5b73f87427c095e9f5744594007b5d536bf8a2920c3fb509f57bc0ba608ca80a6780ae8af033fdfe7bb3c26292007 SHA512 9d85933ae874cb9240175ce7210d3808173bafe246c67b9c333578846239b7bcef074287f26040b5a048bcd98db8d0393035c417918b80db1f74098695a77176
 DIST re2c-1.0.3.tar.gz 5806555 BLAKE2B 98664998a52e9f3198ac6d19e8c8af8db716414e42aa89b05750cb8a2054d53d0b13fa499ca004eecc294cef2756554c3e08c8167055d38d266be86f0684b83d SHA512 7b2a43828da872a957af88fb0a226e1936a45c8a1020ba1f6544b588aaa61dff8df40e84f9053c30ac8e17c41164e70627d57f5d3721a34b2aba7b1dbf25b6ae
+DIST re2c-1.1.tar.gz 5901198 BLAKE2B eacfbd19a6b32c1779d0d0bf45ed7b4159e0ebb000817911ac3daf4595a841efb2fe7810aaede404e95a85af9df66568be1845f96e229d66e381d0ff6f1e2d89 SHA512 a39a42977f271cbd4f245c5252cba52636519c052d61e080c607556f778e0a35709f832466c2be0467af09b1623faab25616ffc957e90c0f1f6af78decb97209
 EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d8f8df2ee8d1a81671e4a2d05739863f5f9c32e42f61912b5cdcbfb17f29c0b3dcb3d667c2815c0dcec3b3b353 SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86
 EBUILD re2c-0.16.ebuild 754 BLAKE2B 28913bde66f2630596b289eab49f003eb727f7beb56e45cdbea3ee664b210f0df9aeeda19119d6bd6155e6488fb4dab84e120cd56038dbcf57753169c9bd7950 SHA512 a869252b8c140ead837f6c3eb2fd6b46ef199480ed2e67acf684b9bc1d5fb858e2bed875d8d6eee7b246c3f0e73fa5522a53b11983af98b374b31cc55c8d539b
 EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
 EBUILD re2c-1.0.3.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
+EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/files/re2c-1.1-dash-V.patch b/dev-util/re2c/files/re2c-1.1-dash-V.patch
new file mode 100644
index 000000000000..77c3d80dd123
--- /dev/null
+++ b/dev-util/re2c/files/re2c-1.1-dash-V.patch
@@ -0,0 +1,49 @@
+From 84a7bf8585c500572a8ad19f9458f31d34abbcdc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 28 Aug 2018 12:01:07 -0400
+Subject: [PATCH] Rewrite vernum function
+
+Fixes: https://github.com/skvadrik/re2c/issues/211
+---
+ re2c/src/conf/msg.cc | 27 +++++++++++++--------------
+ 1 file changed, 13 insertions(+), 14 deletions(-)
+
+--- a/src/conf/msg.cc
++++ b/src/conf/msg.cc
+@@ -102,23 +102,22 @@ void usage()
+ void vernum ()
+ {
+     std::string vernum (PACKAGE_VERSION);
+-    if (vernum[1] == '.')
+-    {
+-        vernum.insert(0, "0");
+-    }
+-    vernum.erase(2, 1);
+-    if (vernum[3] == '.')
+-    {
+-        vernum.insert(2, "0");
+-    }
+-    vernum.erase(4, 1);
+-    if (vernum.length() < 6 || vernum[5] < '0' || vernum[5] > '9')
++    std::string parts[3];
++    unsigned p = 0;
++
++    for (unsigned i = 0; p < 3 && i < vernum.length (); i++)
+     {
+-        vernum.insert(4, "0");
++        if (vernum[i] == '.')
++            p++;
++        else
++            parts[p].push_back (vernum[i]);
+     }
+-    vernum.resize(6, '0');
+ 
+-    printf ("%s\n", vernum.c_str ());
++    for (p = 0; p < 3; p++)
++        while (parts[p].length () < 2)
++            parts[p].insert (0, 1, '0');
++
++    printf ("%s%s%s\n", parts[0].c_str (), parts[1].c_str (), parts[2].c_str ());
+ }
+ 
+ void version ()
diff --git a/dev-util/re2c/re2c-1.1-r1.ebuild b/dev-util/re2c/re2c-1.1-r1.ebuild
new file mode 100644
index 000000000000..0599306ecfcf
--- /dev/null
+++ b/dev-util/re2c/re2c-1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dash-V.patch
+)
+
+src_prepare() {
+	default
+	export ac_cv_path_BISON="no"
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/{examples,paper}
+	dodoc -r README CHANGELOG examples
+	docinto paper
+	dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
+}
diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest
index 001446f097ac..2a1f3e604890 100644
--- a/dev-util/sgb/Manifest
+++ b/dev-util/sgb/Manifest
@@ -1,5 +1,5 @@
 AUX sgb-20030623-destdir.patch 2315 BLAKE2B e902a3c7e0d9a3863f02443ef33840a7a318b1fd278d7226fd7e7812fe1ceb190829599a9b06e588ab1b05ac13bb2d829f667ad0b0556dc0fd5dea3be1643d2f SHA512 0e821be0bdeac661c229958a9227b315810f66ae420f10b720b2fe0a09f9a20510d97f47aa6cc69a9c79904925ac842771743d694bd82ca9621f4fc8f1b46f04
 AUX sgb-20030623-parallel-make-fix.patch 947 BLAKE2B 7996934e520cfbfd30c2e281786714ac4f728875df2635eb7e7c1e63a1edfcfd6eac4fc9289ef7fdbeeb71fed4691ac49ff562eb5f07c7530e596d158efc1969 SHA512 d86c32c5f0a1ec9e09a70bc8dc0581654986ada562bd37f77c3d28e16856f72f6d42eae23e1cffc35973b2701718ea1e03bd0addee61a94901efbb5af0bcbd50
 DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874
-EBUILD sgb-20030623.ebuild 1343 BLAKE2B fa642ca84965a56c37ee84f86cef7c1f3719607aa9ba41ab9f52825b13127251c29b914a826654a00ddc1fa0f8b5332947354008d0f9b7332c896e46046b5c0a SHA512 98b88390b12a1f2093aef615cc2e01f9fe77994d8ce55776926ce758a3b8b2696fcc2b67d117ac0222409ebe0ddc6b8f60dc27bb88862df09a89dda959663c64
+EBUILD sgb-20030623.ebuild 1315 BLAKE2B 75864561428c4c30773c75f4faa4a31ccddb306c38525b132cb20565232f4d882e6b62f6b03bf532c6cbe2d01743bd2760fa33a9c49a3b03955b64084f55c315 SHA512 8b3cce18500ed666949f650c6f361f197e09c9de6cc16a05f83e0e5301e1df37fbbfd825d301e37c8e37b3ed49154758e15cc133ba2dba817047a90a98a9264d
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/sgb/sgb-20030623.ebuild b/dev-util/sgb/sgb-20030623.ebuild
index eac1bb81a891..9c6726cd8d9c 100644
--- a/dev-util/sgb/sgb-20030623.ebuild
+++ b/dev-util/sgb/sgb-20030623.ebuild
@@ -12,7 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
-DEPEND="|| ( >=dev-util/cweb-3.00 virtual/tex-base )"
+DEPEND="virtual/tex-base"
 S="${WORKDIR}"
 
 src_unpack() {
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 1ccbe17b57af..952168e89d5a 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -3,5 +3,5 @@ DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429
 DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
-EBUILD shellcheck-0.5.0-r1.ebuild 928 BLAKE2B 514b7de6cc381054ce51df81ccad2d5cf6a81394b08e6669f64bcb44483facb5b2ac6b1e7e76c75a79a7b5bc309b3a9aa0a7def1a7c214c4ace15b1fb5eecc21 SHA512 341a72ecba74ff426b476f273f34d070eae99b5bb08fb770831cee05f34fb1a3869808c6bc2f8e99e1b9591d353d6d46cd2e963e3e6c3778d56063ce59db027e
+EBUILD shellcheck-0.5.0-r1.ebuild 927 BLAKE2B 4e5db22c897b8628936f52afbfb75afdcd0edc5e086ea0dd5ad4bb8501d8cf22ea0c2ea5a625d9a20fc75a163128691dae0c8b651401afcec45ef9577d492761 SHA512 2876aede3abc1575b557bdfc35aaa5c765b096037ab2fea0ef9dd3627bb36fcafa08933ea8ffd9772220490261d33d52d9f7295b5464ae9cd12c46f40c47955e
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
index 7731bf5be612..24d151f97a70 100644
--- a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 911300042526..d7e748752a9a 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725
-EBUILD vulkan-tools-1.1.77.0-r1.ebuild 2403 BLAKE2B 4016b284324e8daaa6a92fc3b4d5dcda0a533d8c87b470b12523d66fcd43c73be07fdcb3beb5129d64caf06599bf14cc3ced8524d03ac30de190fbda6e892a9d SHA512 fd47ca341d96649a5506f1d7a3bd8bca61f7e08ba75b3a8829563ce0dcfd23b6ec4510256aa5f61d16c1bbd770a04fea30967b0c5af5d1226ffc4bdd416c4278
-EBUILD vulkan-tools-9999.ebuild 2403 BLAKE2B 4016b284324e8daaa6a92fc3b4d5dcda0a533d8c87b470b12523d66fcd43c73be07fdcb3beb5129d64caf06599bf14cc3ced8524d03ac30de190fbda6e892a9d SHA512 fd47ca341d96649a5506f1d7a3bd8bca61f7e08ba75b3a8829563ce0dcfd23b6ec4510256aa5f61d16c1bbd770a04fea30967b0c5af5d1226ffc4bdd416c4278
+EBUILD vulkan-tools-1.1.77.0-r1.ebuild 2419 BLAKE2B c9c634e4d3af512986c20b1c8e871c7f811f35b2fbb41244cb9bf52d57a16babfb07eebca75c281f54d95bad665df02c85baf2e0d9821c77e4571efeac7b5eef SHA512 e859d13744108b459b2e1434c57e2de8c0838e1eea46978f4afee607c3f9d601b49f0b09df27abcfce580ea08e19760b54f696d8299abef450b27c4d064e885d
+EBUILD vulkan-tools-9999.ebuild 2419 BLAKE2B c9c634e4d3af512986c20b1c8e871c7f811f35b2fbb41244cb9bf52d57a16babfb07eebca75c281f54d95bad665df02c85baf2e0d9821c77e4571efeac7b5eef SHA512 e859d13744108b459b2e1434c57e2de8c0838e1eea46978f4afee607c3f9d601b49f0b09df27abcfce580ea08e19760b54f696d8299abef450b27c4d064e885d
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
index 043d52de1fec..6fa37cabcccd 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
@@ -75,7 +75,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 
 	if use cube; then
 		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 043d52de1fec..6fa37cabcccd 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -75,7 +75,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 
 	if use cube; then
 		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die