gentoo resync : 19.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-19 20:11:46 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-19 20:11:46 +0000
commit: 5b5df25227111ef465caf5c52bcfb66dac3219cd (patch)
tree: 31b713cac6188358125cbb66b8804030328740f0 /dev-util
parent: 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (diff)
46 files changed, 866 insertions, 168 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 86f5fa626e37..519e06075224 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 389d6ac7d696..d71b798de1e0 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -10,5 +10,4 @@ EBUILD bitcoin-tx-0.13.0.ebuild 528 BLAKE2B 60a0d9c8a7f9e3fb5d8133bbc3901d66c926
 EBUILD bitcoin-tx-0.13.1.ebuild 528 BLAKE2B 6bafef6268bc694a82b9876d4ea579e21bbdb22d468b914c96782256ecf9279c77ccfc94a0a8f61aa5ebe272126586023e908e2e0a2a790bc15e05ea17340a00 SHA512 023bcfe09bd579348696e3ff8633ec7632154fbb1e6e7f00cc95fb3dba78c010bffc94df563bada1a5261d409fcc1c373d60a078d4421db1d0c0974a07f1df98
 EBUILD bitcoin-tx-0.13.2.ebuild 530 BLAKE2B c888139f668f5ebc58b08e868d14d5678532d0bf099921625651a7bdf61028883717f14e457eeab996352e435485e8c67c4a8acf2666b4897b132b6b6f773906 SHA512 ce2ecc28c077fdd95022ac4783deea341a756cfc7061923ad3046cc620699b42407e57a350c4faa7b52c8818eea0bb2a9cb834920961987edf5e83123748344a
 EBUILD bitcoin-tx-0.15.1.ebuild 2469 BLAKE2B 7ad5eb31dac6a0d63e5f42d4a6dc87136f82dd586a90ce36df0e8320d01328a277f18a7cabae659594248ca679b8bd15809a0ca5a1214d1cf39b67be886624dd SHA512 d103ec9b73e80796e71c074c9b68dc602711fbd18c2f992c09c1efe23ebbf80c20bf730dc5d3cf6512b85e5fd0b06d29edde33c95b625dc3ab611531bd43e0ef
-EBUILD bitcoin-tx-9999.ebuild 369 BLAKE2B a9febe58f8b0dd30021c3c36fec19bd6c0e5a0281fd58fc9e879815a235dd416419eae0e9ae35ad2ccbea9c4fec635d7e7f32dfe7508ae255db9da41c0283b71 SHA512 d45dd15def027bb94ba98512b76be42317098f5ac76b704f8754ef757d7f72b7ba1b4612037d2efd6f1fcd37ab58a5008a5aca3ac87f1a764b180d0f193b10f8
 MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
deleted file mode 100644
index 51d37bc8c3d3..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2010-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BITCOINCORE_IUSE=""
-BITCOINCORE_NEED_LIBSECP256K1=1
-BITCOINCORE_NO_DEPEND="libevent"
-inherit bitcoincore
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-src_configure() {
-	bitcoincore_conf \
-		--enable-util-tx
-}
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index a07931d6c116..9b8c2f4a00a3 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-console-view-0.9.10.tar.gz 640908 BLAKE2B 04862718c7d635c98795b7b7
 DIST buildbot-console-view-0.9.11.tar.gz 640623 BLAKE2B b364c99609696d4264faab85c22c885febaca1ced62123b5b917685bee6113065bc170b103bc1cd0f9333b3f3657dd8d30c1f73f5abb94f38664ee76bc593e97 SHA512 24a7915713665aeefe0389fa2aae1cdbde2b0dea0041b4a00410b77956b76897a9a427658303bf976916c5a0e3bb373a4a21339f4ded0b716d80ec380ad16cb4
 DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e73260d826633553ed10ede6d66d112dfa8bcdc4f1bd376695ee0ee4a715f1fa3705329033044d9358731c0b807c54b40b4e32a04f565 SHA512 4a73994c29fe1f78c4432bdb42fe14106b8d7887bb35f2835b203f4818844d3e8d2ea308fc4fb2bd562de302bd7cf6612fe047476512feac068eca3891a49522
 DIST buildbot-console-view-0.9.13.tar.gz 640969 BLAKE2B e0c6449c8208a34e568ed632be61fda0ae6ef0b183cd53e2288e1b89e03df6a874ec363f3cfdfa15005bc2913084eaf8640e86abf1ad2d19609e7b4c818f7b77 SHA512 16a3186a97112473fa1f7e811ceffe9f829d6181544e62290172b97b898ddb189fe8e67e223a3e02c936e61fc857a05e0b353dda7e5d4a3ce782f74a32515d2f
+DIST buildbot-console-view-0.9.15.post1.tar.gz 640548 BLAKE2B d28d3fbe40a8ceeaf574d2e8a9a6938664659dc6221a9e7e288c98b771cf7601a8db125dfb3cd71c500aee470a2b476a9daa0d5ec55a83758a96e97e14441def SHA512 42ad7d9dfdf0b3b0cda8d8dcd3fb2bd6734a775755fdc4ebe79d562f5ffb45d0e25d3ece15dec4a7542dd29e45a721e683bec416582901dbfa519c8da76cfa78
 EBUILD buildbot-console-view-0.9.10.ebuild 1140 BLAKE2B 975d6b8cef5be2e2f23ce955bfef5a04ce43abc08b004f93db2c3a5c24ffd9ceae2f89f00f81f5f1ade81f08675a10b8e517debb767c8875740564e7d7423f9c SHA512 a808734e64edd70fb3e664e58558006e31c18be5b31e1d15f03fe8f4048b6677d8023fa2efdf2b95d3dd6cf10eb67b3c3d0d0b939d755b0719e6d671a3f6a725
 EBUILD buildbot-console-view-0.9.11.ebuild 1140 BLAKE2B 975d6b8cef5be2e2f23ce955bfef5a04ce43abc08b004f93db2c3a5c24ffd9ceae2f89f00f81f5f1ade81f08675a10b8e517debb767c8875740564e7d7423f9c SHA512 a808734e64edd70fb3e664e58558006e31c18be5b31e1d15f03fe8f4048b6677d8023fa2efdf2b95d3dd6cf10eb67b3c3d0d0b939d755b0719e6d671a3f6a725
 EBUILD buildbot-console-view-0.9.12.ebuild 1140 BLAKE2B 1f12f6d21abfe5b8f75dc98d6171f80e6481290e12972b10db56348a4511651d1282f0f9d427f4501fcd3278eccb799d4351cf3daf266e6d507bb9f393bb6950 SHA512 bba9abd918950d3259b2ca4eef20c640ed433bdefa7a39c4b89a2cb49da1980ccec8169394af5c2560972840dd513f293bb96417735e1a509330834e64c2f143
 EBUILD buildbot-console-view-0.9.13.ebuild 1146 BLAKE2B 2114590ad52c309c556dda90ce11684777f77d638e33168fa8a13273db521a9dd5483539324bc05c0e66b45806b8487adf7eb9d826f5f8c8e8089b02cc6edddc SHA512 212483ed028b77234a920e7a669db45b0b520406c81fc9506cfc3f7e988a9c693291d5b7e77ddf1a5074160a58712e7a7a9fb60eed9ce4a28b09636e3bb76803
+EBUILD buildbot-console-view-0.9.15_p1.ebuild 1146 BLAKE2B 01342a6a2a2651e5bfa5a51c35212a84eae66871cf54e5f445195953c0e90baffc38303fca531e7c90a82ef5ca8c18fc52d6065846d80d2d101419518aa1440c SHA512 a7f444609586228699461f43dbd39c6958fa555d81fa77c2eb5845a592d3e91c3a878ec3709bfa353b3f4f33da4e9d5cb4fcb20de3762a6bed127ef5866f0f26
 MISC metadata.xml 771 BLAKE2B ad890754ce96954df2723ffe6302a5eee847230b91df1dd3658ada80aea2d6bd92fdfe65cf21d5aff257d8e736635410642deb48fe7769a5651a5073f6ac42e4 SHA512 a8edc15d355234948b35fe2d563ddc7d27b82195f706eb935fd8145836a41b1ddf2adc40c402a806334b30a2ba0c156b89f5c355a53126f3ea69130b214bc66f
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..5f6501c2a710
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 6e368304900c..576287fdb5b2 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,7 +1,9 @@
 DIST buildbot-grid-view-0.9.11.tar.gz 638818 BLAKE2B 532f13d53440f436252968cde78275aed1cbb4b4e6348c59be8e9d14780f9cdc8bce2655b77a563847b7a7275ec9749b67072f34923f17d2c702be466eb020a2 SHA512 4da052b284452557a1de080afd31064b8ae950f1a1fbe2f2418a130e1150b84fc25a119866ccc5889a38dfe94a5f1f8d3b4ff7f3f7dd6cdb485eea90adda3f2a
 DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23abaddc414713c46e5544915d5564641a0534dfa9862f71d689c5df27a5f2a6ecbaa33c29ece5bc85e1c2d1f0a10b0f19273364699748f SHA512 3bc90dcee10781afa90a44d0ff57629f2fe8620fb1133a489282b3a69b884d33a7ad3cbf6e38f688755fcc2153c9ae1c0d48cd2797e33070f66a9093887179c6
 DIST buildbot-grid-view-0.9.13.tar.gz 639145 BLAKE2B 31194a53bdb60958178371e10fd2ed0ca05d112d9a3510147d965811bb31788bd432ad1ed1c4690f190070ec5dc683cc43ed8a187b26eec5b80b7f23663e7418 SHA512 2ae54f27cafdf1e4d5c283bbe60db8bcc38d3ec133069114bfa952ae2f49306c7a83d57fd4749eb923567e22fdb0577311532ef45eb8630fe01a7c3fea6e2cef
+DIST buildbot-grid-view-0.9.15.post1.tar.gz 638877 BLAKE2B 7ef5a309bebb1fed0ff1b0efd016c9d895b44a03d0c3743690d6fc04ab669d6409af93be62ffa1ef0cac9465ef7940b48984ab423a22023800211514335d8011 SHA512 741dc6ef728f291d44663bb6f031fd0895b67bb770db053695bf276ae3a6a0f2e6e73eae7c595befec2f917e766b13913486331297cb048f000a124916ff6405
 EBUILD buildbot-grid-view-0.9.11.ebuild 1105 BLAKE2B 6b0cbbc96d2ab09f2c07d6fb4faa438ed74ad8b7dfefc4c1a4edf48394511471826b48ca8df52d80b94f392a605a8e2462561d6beaaf49a1da910f1073c10de7 SHA512 9555429dc5cdbcea15fc89d576f4e981c79f096d0e1793392497af8ee0b405f7e9ac97cbc908b80faa9ad8bf4ced34b7beb48c8db45c4fe278d22c910a6f1d0c
 EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1109 BLAKE2B 09f41ba4653b41cf6d7a40c9f6791720f5c0280ceb400495e2a95b0801f91bae20bed7e054b27ee6c04a8400756c1fce6f59be2ea00cf71a61a0b4c0fb50472d SHA512 9d2fed5d500165ec18d319e81dde7d0af2cf303611044e0774b14acfd9f6472c0389dd673d516e4627b96e73c93c4ca5c1b2be4ff25adb80e80d84358a7a2a4b
 EBUILD buildbot-grid-view-0.9.13.ebuild 1111 BLAKE2B 89bd94b9ec2173d7df63be3a1ba254560a691e7f16a84223bdb6d7f451c99281e10b414bb3ceb9e7798253316bd5b810604e95d90ee0f8ee5ebcda8813feabaa SHA512 7b48e77c57c025799e29ef67d7d8bd593194c107a679ec4a691345d0253b7a1e47d8970771ad4ce977cc9a854585d49ebdf0a5e79dc0ac85c9b6f3e5544da5bb
+EBUILD buildbot-grid-view-0.9.15_p1.ebuild 1111 BLAKE2B 59de593ebb10014f02314e36a3b0153b45e024e8d1019ed75c935ed03c78aac3fb2d1f11cac1b7157cdb010f74e9f60ed00408a4ce8a626aeb8d80cb1322687d SHA512 d8cb01ef13373fdcfa072ff6425a82dd8d1ec85eeabe26c35387d8c5cc75d68299194bf3afc20119ffb571869850f72fc501f5d169e9c1bf5c2baec66ede5cbb
 MISC metadata.xml 750 BLAKE2B 8f279073c8c3a1f6a12ab347198a6ed24692d1ab0271bfdbe479da28aaee5c51843218a93b18ab901bbf78a2c36af5940cd2bef9273c9402076b88bb46a5a104 SHA512 8ae01c42d25b7e2d957968dcbe8c89e6b1efc9005b5021a7190c585cf586f37ce9b6168b29b58844149a8e869de9374cb611df6668476152fcaf393e55577fb3
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..384073a7a830
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-grid-view"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	=dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	=dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index f42cb17ee3c9..4e4a139383d6 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,9 +1,12 @@
+AUX buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch 959 BLAKE2B c3b72b0a2c1a5afeb69d76b14d91292a45e827d28c82a7975d4a4e73fdcab66a87445aaa621593f98bdd34eb99dd564b9fdf015655906cf53b8f581a00377f97 SHA512 3d2d0e0d4049f623deca4ba050d873761f63fa4cb24cf4c83c52dd7c0f3eec483b6e76353a72b1ee3b0e3a64c54d8174620a3ff93ccdd1474d746d6309b5ae6a
 DIST buildbot-pkg-0.9.10.tar.gz 4422 BLAKE2B bf32d23fa2c2aeb7dab9af84fd095f48a3561522fdb537c8043d46cd520657e6d71028a07448e70a69c5abc4c24370ef9d1ad1da901b9c198778ee8043b64e11 SHA512 d31ef269ddbd042a9064daea526f289f2ec3ffa58dc8f43a8e40ae81b03cfa026f219bcce2ccb83addca0b1da0a8a2d3bc894a400edb9c45f4c0cde7691b5e4d
 DIST buildbot-pkg-0.9.11.tar.gz 4420 BLAKE2B 1930f7416d8037e35603ee2fa7fb739ded5c9a42dcc5f3a4c5b49d49e29932374a369558af9d2c4ef259fe2d016e7c9ee5a31f1a9e520d3c1c77ff5281b14f30 SHA512 63f75f4df2a725caa48d98c09037580c7b6a16609e4063e7aaab8a0e4b7bda4c74da8bf524b7d9a0cf9e909146522af5ffe8f1a5a8617c5f67658cc723f61b2e
 DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
 DIST buildbot-pkg-0.9.13.tar.gz 4448 BLAKE2B ea270faafa4a271e11ea1e64191dac0aaf9b6bc08e4d70e71746f9e70eadbe9d70555677bf7e9b264ac9146db0cb1cc639d86194b5280ad53fbe29bf073ee718 SHA512 1cf3ea6237062a0d8c3955ae75b76dd1193ed28c32528f341b242fe6dcc50f4300366474dcdce27246166b35cc1ca31df556b5e6481f5027d073122f1c00362d
+DIST buildbot-pkg-0.9.15.post1.tar.gz 4916 BLAKE2B 17f38dd7c0d70a7d07fde7c53128901dee24bda0d6503bea1dacfbf6f14bba17b645f5067e0932a5f03660330c20f647fe6d4c2125fdbf714a5828de314881bf SHA512 1951de2df02d50ba1d7c3bc6db9084acf65f88a9f9f73bf26715c7d14521403580a26efd8294aa5f2de40b986032dd78fe52230e58ad3d298f39d229481fc286
 EBUILD buildbot-pkg-0.9.10.ebuild 1067 BLAKE2B 9d94fd537541931318bc7cf2e6cf386d9ba798955f60dc8331a8b31f3930c7a9636e09460883f8d5a1945a38049278c0cd3673b29c6a5c97ecdfc97d055acf48 SHA512 4efe52a0999ed6ecbe2ab002f2bff90f365b78e8c47272c952211128b94f93b8070925c6784fc1c5655802c8ede02300781670b60d604569c40bdfa855a8ab7f
 EBUILD buildbot-pkg-0.9.11.ebuild 1067 BLAKE2B 9d94fd537541931318bc7cf2e6cf386d9ba798955f60dc8331a8b31f3930c7a9636e09460883f8d5a1945a38049278c0cd3673b29c6a5c97ecdfc97d055acf48 SHA512 4efe52a0999ed6ecbe2ab002f2bff90f365b78e8c47272c952211128b94f93b8070925c6784fc1c5655802c8ede02300781670b60d604569c40bdfa855a8ab7f
 EBUILD buildbot-pkg-0.9.12.ebuild 1067 BLAKE2B 294d93ff6004f532845e7d0351e966d49ee1f0352324475c427c2b1bcc9b429bc94b9632d7c39c325b34ef99f1ba255398082c95a0bb12133ac219f56292c307 SHA512 4182c2166ce82bc5909a6297b35aa443b5960829717f48eb1cc187c12d8b519b6d158e8e06ffc2946893c9d415a833bf1ead4bd36300c124912fe132870ce1a3
 EBUILD buildbot-pkg-0.9.13.ebuild 1073 BLAKE2B e1521bbee6b5ea441388b0343fea8e70a1658c0c4d0b2f9773e1e5281c895eb330928f4da0c0684e3dc4d5cd288eafe321865fbeabb6922b965de425599a2da2 SHA512 b06e0af0cc87c3953438474323481de1cf4731c0878ea20471758ee9733c574365cbdd6ba58977b3129c504c60be83260bf97e3b11c6332595a17bbaebc5308f
+EBUILD buildbot-pkg-0.9.15_p1.ebuild 1152 BLAKE2B 407347193ca18710fac91e872eefd3b04053e1d0fb2a02c82e1317bc4cb5d54a43365fcb4b7c74712f95497abe65354c29c77b868e07df711e3c3b0a0f2a57a8 SHA512 b0d9371df5f876fbac6c92d590697770ae33fa0a4938ce1db0498231bdb62d25b5ff7ecac11bde530a15db5dd2a45f3dab330469a59b9750ed981899d18a5bef
 MISC metadata.xml 1309 BLAKE2B f2c7d28ec175efb170fc4f556b4f0d8beb8e6ca809240739ade425d6258d6617ed97a6cd5abd9a0f9a54e07a520113ad65dd2b912497adb89ef2cafa74038a56 SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..42d65473d684
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-Removedevelopmentvirtualenvironmenthack.patch"
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch b/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch
new file mode 100644
index 000000000000..ac17539c4e0d
--- /dev/null
+++ b/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch
@@ -0,0 +1,36 @@
+From 6d9f81ec15b7b18f8791981a0d65dc4f266022ca Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Mon, 15 Jan 2018 16:27:54 -0800
+Subject: [PATCH] pkg/buildbot_pkg.py: Remove development virtualenvironment
+ hack
+
+This hack is not needed/nor works reliably in non-virtualenv installs.
+---
+ pkg/buildbot_pkg.py | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/buildbot_pkg.py b/buildbot_pkg.py
+index 89847b040..7788e12d6 100644
+--- a/buildbot_pkg.py
++++ b/buildbot_pkg.py
+@@ -33,17 +33,6 @@ import setuptools.command.build_py
+ import setuptools.command.egg_info
+ from setuptools import setup
+ 
+-old_listdir = os.listdir
+-
+-
+-def listdir(path):
+-    # patch listdir to avoid looking into node_modules
+-    l = old_listdir(path)
+-    if "node_modules" in l:
+-        l.remove("node_modules")
+-    return l
+-os.listdir = listdir
+-
+ 
+ def check_output(cmd):
+     """Version of check_output which does not throw error"""
+-- 
+2.15.1
+
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index a05cc3d5b20b..4b018e9824e5 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-waterfall-view-0.9.10.tar.gz 714260 BLAKE2B 861c9b327e0f0a179156fd
 DIST buildbot-waterfall-view-0.9.11.tar.gz 713915 BLAKE2B 9300df8cd7d2855a5dbc942d6872bf020682b13a445a35f2321e786f0979afea71b2ade86abf087537694dc591a35a33d80998c392d5a546cfc09c4bc7536052 SHA512 aec554156ac6d430f62a090d61896732cca7a0f9ebeaa33c929113f9fcf07c4383d9aae7e544d3dbeb83e7f267327810c10c04ba3ec1f7f9c7192a03b4cd47f6
 DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149fe7f4a1f03f2c2593b89908fb0a8d748c32779b01b8d87327ec9a54e02561a40d273f03f46a8581cf224c333f1bbb3e14ba22a56ef SHA512 76abc01783c02980bc2d6e878536416aa046dce3259c65fa5c2f15d3f66d1b9b5e0bed2d4f6b9d6c338300637c6b91e9bdee3fca3e47022d2ea9b75ffa69eb99
 DIST buildbot-waterfall-view-0.9.13.tar.gz 714287 BLAKE2B addb1cbda2f751192533b7074bd5fcdd36f4d328ad555cba9c821b0648ceceb5ad63d2db85dbac9cc813d6665dad8f5725e5bb37123b6bbce8310740a3597d1f SHA512 448b1e0b63aaa1d33a7595262901373a4c9cd30e544bdc8bd2d672f8aebfb4d90aebb31ce4d78d59725bfdcba019c3643e9f6d66d1493fcb8c77fb8acbadfbf6
+DIST buildbot-waterfall-view-0.9.15.post1.tar.gz 713929 BLAKE2B 4940cf9224a1924bcb63ea7078d606ec919c0602e1c6c5d3cb53318a91e285add2a75b05ad46599857f2b73cea501754ac71e54d3ba6941a18685eb3c05e9d39 SHA512 841186372b8ada370c28bf07b2df9ad91d298913202c937e6d459dfede24293f9aef1d330ee07a6c97a91bf75b4ceae9f87b494f173082ceca1fb2c5f04abe79
 EBUILD buildbot-waterfall-view-0.9.10.ebuild 1144 BLAKE2B 11bb0de2538e7ffe6baa05cd1c0e3209e483b1be01e76fc52a5b5d3c09707ac99e4763979d5ebbf0f763a62c23fa44f3657e3889391e7546425e8c0501032651 SHA512 d499cf5938765934703baf981973ab2899b368cae040367557caecc79d0dc39be3a92dbf068b7d04f957d55f82fa9e89816e1c5b9d1b65e6484e22d26300e689
 EBUILD buildbot-waterfall-view-0.9.11.ebuild 1144 BLAKE2B 11bb0de2538e7ffe6baa05cd1c0e3209e483b1be01e76fc52a5b5d3c09707ac99e4763979d5ebbf0f763a62c23fa44f3657e3889391e7546425e8c0501032651 SHA512 d499cf5938765934703baf981973ab2899b368cae040367557caecc79d0dc39be3a92dbf068b7d04f957d55f82fa9e89816e1c5b9d1b65e6484e22d26300e689
 EBUILD buildbot-waterfall-view-0.9.12.ebuild 1144 BLAKE2B 9eec125d322f93c45d52d361ec1ca8bc17c4650fda825c4cdb1d88f83a1092a571de56a90de51bc3f3075a1ef94b96701badd661a39b5f6852e1f5120d79eb77 SHA512 f687c6c40dae5e82694f10e75e42b8a94fbd1b7b95827acd6400c78c2cef34555a3be9bca3c213bd79340e6099336ffe02b43e485b9f04c619939244aa4f985e
 EBUILD buildbot-waterfall-view-0.9.13.ebuild 1150 BLAKE2B 10d0da70b2aa294495410cf1c6f44d196c3bcc168f8965351291a337981fa33dac4cbfdc0a5480802a66f3861c9444160bc4d5ce0dc3229de59e935be894b4c4 SHA512 94e111b16fc0af42df910eeb868a43769b20a2691e85b57454bdd3cff2b651c436e8ef3eba106dc4dca64d248da940a79f823ccd5c00ec2ff5f6487d7f21c2c4
+EBUILD buildbot-waterfall-view-0.9.15_p1.ebuild 1150 BLAKE2B 92b0fe62c9944400740f86ba82e7356bbf521a455f526af52388d9f3688e0cb0a44eab78667b8d4092e24e7fa2d0d8ed6396316efc38c2f9a338664561492eec SHA512 d912fa843152ea3e605fe07b42e820f7b7629b28b1a2bea7c19bef374f1e4e25cdc50d05103cb6eab5501276979f3b00a9392b075824dac9c47f189db21eb18b
 MISC metadata.xml 791 BLAKE2B 4e469a57580b4fda1bcbbde4580bdfd8e19769784a1760ddbd08b9c79ebdacab273be9871d87afe32f21f12efc2697f53f02367672660932faddb230fb8981de SHA512 0a5df49353620d0c31e66181179c213e7add694cdc141715635650a1a7962cfd96f5a965e42ca8f860d6d24ad9be08001e4a9b2ca49ef31f529f9aec0878cc13
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..ac8298f1ae1f
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 6f672ce5b801..893cac6ba922 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -7,9 +7,11 @@ DIST buildbot-worker-0.9.10.tar.gz 99028 BLAKE2B 8cbbcceceb60afa6194c1e1c8f7382e
 DIST buildbot-worker-0.9.11.tar.gz 100746 BLAKE2B ad8111100ee565cb70a7234e1527b5145e40d791341f16e4b415fc0d2dbd33cdc226b462ebb4de370ba3731df0d81217d797691e1c8cb1fcbf73c199674968ce SHA512 c7209c3fff8c43a23de71fa61709c9f02a5bdd9c8c8980ac5d205f720abdaa9bdb78d0d4e40fe9f915c8d5cf253b9e3c63401712ee121ac085909b0244d82897
 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
 DIST buildbot-worker-0.9.13.tar.gz 102710 BLAKE2B ab60bc2607a706ecc760c2439655bca3f328d773fbb07e73c994f079356341a251ca23c573a71cce92dbf71ba62ceaa70210f8925fd4d1cdfac335b2a485ee9f SHA512 920f76d70c88a660b1d4c15683847a144b8dfaa01b91742ff2fedbe013ab030d3c5f07b6308f8bfb3f7bf3c2f805f7735d007e67257ca5233d2b585518f79e40
+DIST buildbot-worker-0.9.15.post1.tar.gz 100901 BLAKE2B 5e4744fcd69e2920e0ca9ba0b1aa77ea5f62ed4aecc9f00df17953dc813e1f8d61a859ab0aacc26f88f51d281574a8089b849fe063d55c8649c4a53b528d8ba8 SHA512 6ee23f1dd52672646f28978cec3fa9e29b64cae84f524bbcb6f2614a4a56e49e8363975b89cd3508e78c9779233a27403e46fc098be0808d6cfc1e6aa6b8499f
 EBUILD buildbot-worker-0.9.10-r2.ebuild 4810 BLAKE2B 8e4432a39c33377a58d78fdb442d9cdd7a343dec1cd22435288fef4b12fe28757090c27c1914fc0a6cc0366fd78ab712c2472617c711911327cc13afdceece4d SHA512 c330f345c67d69ac7c276462104942061ffd9fa5b55173222a8b5b927576ac218ec97a11c09c9fd4eca56beccbbc45f8080d771dd5c1ebde7eef7cff43ca4a2a
 EBUILD buildbot-worker-0.9.11.ebuild 4804 BLAKE2B 9bffadc0e2237049223801828898588e028ed3d6caa95d434149c01d3d2772263ae8e5843405d15efe10613ab288011e1e92e77d52fef59f059e278e21cac916 SHA512 999648a81ebd40ffc7cba11a718374e558d7026f0cc67cec1b7117e6b81f571043037e98ac3e5e0ef8751ae9a426be5fa5e675764223091c789c725ae99a1b7c
 EBUILD buildbot-worker-0.9.12.ebuild 4807 BLAKE2B ca781f207c2ad6f5aa0028a4bcded57a7875c969642489791827ca94556e2710bedaa3142e18275431838a173c504a66d471d205705f54bc0c99a7aad8f9016e SHA512 a6e244e3971f9015652bdac9702932475da8fce610ab5a92fcde9c01e43ea6a0f18efbbb8f1589fd0babe3dc8975e3becebffc034105536442c090958cfd748d
 EBUILD buildbot-worker-0.9.13.ebuild 4814 BLAKE2B f84a2610fee9092d86a4f1acc2e7c07aff137d0f9f38c702a0f829a03186b5a644be47474966ce1c935c9881439c92830a6363066648776f9a1b1c0e8ef6c462 SHA512 eb66e9ba14a47d46d5bea97ce47d049664580ebf8f4748584b0fa26cc643a854ba1cdd1809e7255324f718053f0e8b0c9a8dc54cf59928d1a6cf0071355766ba
-EBUILD buildbot-worker-9999.ebuild 4814 BLAKE2B f84a2610fee9092d86a4f1acc2e7c07aff137d0f9f38c702a0f829a03186b5a644be47474966ce1c935c9881439c92830a6363066648776f9a1b1c0e8ef6c462 SHA512 eb66e9ba14a47d46d5bea97ce47d049664580ebf8f4748584b0fa26cc643a854ba1cdd1809e7255324f718053f0e8b0c9a8dc54cf59928d1a6cf0071355766ba
+EBUILD buildbot-worker-0.9.15_p1.ebuild 4818 BLAKE2B 9d0374a566c51b986135184ca776f51f4a2a424448de147e39fbb03694773216671c734ddc737ed14d0278ca9edcdea8c37317d7d641357bc50a95784d478ed4 SHA512 a4e08dffc7ddcde1b885361ed815daed61720ea579e29303fc563e632ffeb129298f62763baea99735417e48ef7cfd1b55267174474d4c04a8e9bc1396c1da9a
+EBUILD buildbot-worker-9999.ebuild 4818 BLAKE2B 9d0374a566c51b986135184ca776f51f4a2a424448de147e39fbb03694773216671c734ddc737ed14d0278ca9edcdea8c37317d7d641357bc50a95784d478ed4 SHA512 a4e08dffc7ddcde1b885361ed815daed61720ea579e29303fc563e632ffeb129298f62763baea99735417e48ef7cfd1b55267174474d4c04a8e9bc1396c1da9a
 MISC metadata.xml 591 BLAKE2B e5b06e8136a2adbab54c70e416a7117fccf3ae0a33bab129e1b5db13096cdb8716ca09606fd67a9c82088a0e40e0ae8bc3137262086c8ebb45bbc6993c14984a SHA512 d3273df1c8e6284b75ab5cd15cc5092d10db8ab8c0126e5eb21425bf3f2cab0f582a4e1bdf1e96881cc580a13047ac9fc72e09474f03dd788f85cd7962be6257
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..bfcad9dc970b
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-0.9.7
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+[[ ${PV} == *9999 ]] && S=${S}/worker
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+		to support starting buildbot_worker through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		Set up your build worker following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
+		The scripts can	run as a different user if desired."
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index a9abdbc71ee4..bfcad9dc970b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-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"
@@ -12,7 +12,7 @@ inherit readme.gentoo-r1 user distutils-r1
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
 
-MY_V="${PV/_p/p}"
+MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 910e1e3c75e8..e583a738848d 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,7 +1,9 @@
 DIST buildbot-wsgi-dashboards-0.9.11.tar.gz 627215 BLAKE2B 627d9e6eff6a9e5091ab1073ee9701ee537c406b47e5a66a9c7d6424c046e00cc51a01db9b7c2f051746c18852a5554ae70ca50560834fc5573a6786e61df2c5 SHA512 6f829d5ead05cb91f5b85f128874f1df01288e87938df9f8dd1cca1552ccfb7cae35be4eb077ea97d5ca4f44b236947649131b9aed2bdc9142920c2ee1439f4b
 DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13c07958c203440ef875bc4a79be6b894d0cf4dc457423528b7ea34c830511a5ef5d7f645fde2f71ac08578e1de32687c8b1ae2864491 SHA512 113c1616b08feb64fd3d94c1186e3d7dd7ea93e563a96ddb802e6ff8135e194014464ef09a23004518451626584bc531fc17419188ebbdd388e9363541b80c3d
 DIST buildbot-wsgi-dashboards-0.9.13.tar.gz 627272 BLAKE2B 1b4b8b6a0eed9572923a0dba24a9194557074e84640cf57141014a92294c56f22330566ae995bfa5e6be63640549e42e5aae01911df6989dbe4861b7ca5544f8 SHA512 08eedef62e85d71cbfde0f57727974a2bc1a9d33fc3821aaeb3a003df3b212c2b1ce00afa986dad062415b0bf8d8a9c0c328810e9d3fc994cdcbb82de2037366
+DIST buildbot-wsgi-dashboards-0.9.15.post1.tar.gz 626856 BLAKE2B 13104173594f1f5326221cac1839b44e792212c772730f0632f8528e55f5249d61b72c97cce7e51b6b3a82b2490a7654b7deea04ba61da13158e6d40e0021429 SHA512 5bd089d38a87e1e1dd03343b96824dc227e35268971b9b541e761c289042412b7dd0bc42df2fc9c28da5933a995c5bdf7af7bc7aafff999ce2f9431881bbd58e
 EBUILD buildbot-wsgi-dashboards-0.9.11.ebuild 1149 BLAKE2B 3e6abde75528b617b976323a661cf0579a06016c502a56b3380032057ac692a537c6aa84372e0c4af2c33d25aec297953e6073f3f90c567e6eb55d15a98067bd SHA512 c79a8319c6d3496cf1b9e7e2b5314e8fa58ef8322e0b4e6d1b3e45f90076063c5a0812a86ce76a0fa97345605474dad51c60670b0e9c0d5110cbf4764840bf1e
 EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1149 BLAKE2B 3e6abde75528b617b976323a661cf0579a06016c502a56b3380032057ac692a537c6aa84372e0c4af2c33d25aec297953e6073f3f90c567e6eb55d15a98067bd SHA512 c79a8319c6d3496cf1b9e7e2b5314e8fa58ef8322e0b4e6d1b3e45f90076063c5a0812a86ce76a0fa97345605474dad51c60670b0e9c0d5110cbf4764840bf1e
 EBUILD buildbot-wsgi-dashboards-0.9.13.ebuild 1155 BLAKE2B a2252d2cd9a296ea0d95566e5090e2ae8720eda4b81e29e4fd6342297f5ee8c4bfa495503386f5d73380796f518a8e7cf328307edf4398a260699156cf2cad00 SHA512 98a8b55a74ce9ef2d27606121b36a2b75e0cf244ffae0219e2b705dc12baa23a54f7e889d43166b2bb5c6dc8158be544a3ae42840128f7570d42239b634d7613
+EBUILD buildbot-wsgi-dashboards-0.9.15_p1.ebuild 1155 BLAKE2B 8b90d620a9d5c8a77274440818d9dd9b0c8eebff9e899662fcb6881da6fce91f88643f5215fe592465264f0ed0a48b3803f156756d5030ee9179ae70fefb0e98 SHA512 3d60ee7a6b0880b2962dd7b6bbf03482373165d70efd338048004a2d933ec2c287ffdc5c36393454d5a9721badc722b5dbc944fe31b00cf141ec4d5644f08e15
 MISC metadata.xml 790 BLAKE2B 5441af355527235e9e12079b22918db4beca4cb79b2d479436ba050039e9d9de6971ccca8365b4fb7010408b00601b1a8095b3d8c23639cf0612a9baacd89dec SHA512 15928eff7b660deca2fa007e8924a8c878f4694880a3e0d2092a63b9fc745fbe91f77ae4af65d1ecd1f593519dcfd6b4f495cbef16704680826b00bfc5b4cf4b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..6251d77f951d
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-wsgi-dashboards"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 83d664c77ca5..e795cc3b6283 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-www-0.9.10.tar.gz 693452 BLAKE2B 4f66046bf2ef7d016c020a6f3582dca39
 DIST buildbot-www-0.9.11.tar.gz 687664 BLAKE2B 0e7ef9532acf827620b1b720f3709a708c9a24ee29f7edef7695af73a4202d7ddf02f0b6cc5e23507365496f4b6b565b84648770e3a36aa849b0b21d4d139cfd SHA512 5a4ecde7a79bace65fbaeedb9153ccfc8094e0fdccd19bf656a1aee1cb5eb84dd28ffb0279aaa0f75a2365278276f5a16d7015eab732e2642a3344d2b28ff441
 DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1e295898c432da5c8915e36156f2f934fd065c8075dd55f68da7bc29a567c1ef276bc415df38911aff7c33de46fa7942 SHA512 6c525d32407be24aa728a0bd9c9a09c64bb4bef092ef9e5285475527f7fcbd89d516ea376d90b22aa24af384d73125bc886360cf992dfe3d01471838193f351a
 DIST buildbot-www-0.9.13.tar.gz 691556 BLAKE2B cd3fe546c88308debc6dd621e8979c400816a11235b67c23e539bb3525746a864d76df2c4f8e04f63ba4459d2186094543115ab51bdc35f56b20c8c1a0ed5a68 SHA512 b092014e490ed46f2551ddeeaef5364c85b048cdda298af11acdf664d799fc52ef6f8daa17cf7a98d588c59abcbdfebb666345b44d551859d3db9b4fa358adb9
+DIST buildbot-www-0.9.15.post1.tar.gz 718007 BLAKE2B af64eb2e0fabea2af3c02c294d50c924211755358187bd0d52f43821fddcd6d566f8aad1136da3ca69f924aee3bce52cde1e48af3c3f0419c23d6c1be25c17ee SHA512 749fd6e763580bb0fd27f7ce1576ee193ccf9cb42616c3b393a0bfac9469d9a42372069d087ceae3557e72540a3e0cc37087ba4b7901cbb67877f17f27422a47
 EBUILD buildbot-www-0.9.10.ebuild 1181 BLAKE2B 0b55bfa6cf53486f2fc01c07944731ba020def091659aa0d85e3ea61d7788b6449d3ac1106d6d87598c16d5bdd9d522cf1e3ef6c860e0e267fc38753691abde1 SHA512 770bddc301920a0a6e8abeaac1c231794c824f9d8d991be9213aecca68621b56b8ab1118a6e3641841375682e1d3c54cf784a11e93164404804f840083985c35
 EBUILD buildbot-www-0.9.11.ebuild 1181 BLAKE2B 0b55bfa6cf53486f2fc01c07944731ba020def091659aa0d85e3ea61d7788b6449d3ac1106d6d87598c16d5bdd9d522cf1e3ef6c860e0e267fc38753691abde1 SHA512 770bddc301920a0a6e8abeaac1c231794c824f9d8d991be9213aecca68621b56b8ab1118a6e3641841375682e1d3c54cf784a11e93164404804f840083985c35
 EBUILD buildbot-www-0.9.12.ebuild 1181 BLAKE2B 68904b210b1284fe3145e307570bfaa67c7394914d3b6f76417b39c4fa17f91bf40da06a57df49d2e8dce56de23cb176f3346711cb38f409d8f5e636e402b26d SHA512 55413cee7848b2026b0ed6ca5d5c94e4c563f270dc49dc9b323da75c268888d97155c808150e2e4d40482842f0fd4dd3fde4ca692112e42a8aab9c911644d02b
 EBUILD buildbot-www-0.9.13.ebuild 1187 BLAKE2B 272a777f77a089bba5d80b7f517b0a1390d22e0eabf2e7dd9d53352ded0e49e473b54d57696f0439e7222265c0716678b09bbc641c4cd198fc3efd547da205af SHA512 430cffc7380c431ebd6321157d03818fac8b313512f9c09bf0dfca0efdf7141db4238dbc47b62156106410e3721d5436255c0e479899b3c5a7445a765a7ca437
+EBUILD buildbot-www-0.9.15_p1.ebuild 1187 BLAKE2B 0306b72e69397aba43404de49b3a01cc13667513dd387c859cdd87ac8283b9c2750c94864e2a4fa3e4a7218d7a7fbe6674c6f680efb4329dcba0c5c8007c8b1d SHA512 5f2c42f50e3bbcce153ebebf11d1bd762ea63029e034043559d614343519f008d0ed2440b3730cdadee1f2117d4c1e31d4c1493606c8b838c5a0d5f43ed4c7f8
 MISC metadata.xml 777 BLAKE2B 07ead3ebaabaa62d3d09fbe84329649742eb92d194eff89c94f422f14934e92130401daa97799e038152943e0055a3a4bef74815175a533d2821a07645c64bb4 SHA512 9cace9b96d46b5cf2775d4a1d328c5cfdf3448758f293c0b12855bca7f65244e34529bd51e019201f9d397cfefbeb503f6dc1e2cdc9fe1f5e456dce1dcb2a5c6
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..d14a3d992e00
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index f5f073231877..a6b47f51f9eb 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,4 +1,5 @@
 AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe
+AUX buildbot-0.9.15_p1-buildbotworkerdocker.py.patch 947 BLAKE2B d0e4e1e97ac30d63d1167c64e6505b18573abb3183b970e24dd7cbd22db06094cb7a14be97f3fd3a4ac9ef6bb6bc37050613e83ddb4bb6dd2d61e88769336069 SHA512 1b92cde0a585521d4ce33fa4cc19b9322c64e004f58a4c8570a6ce34a551d77431dd761f59ac41553968a89459c9cb5ea49212e2ce7b2838adbd51b922edee81
 AUX buildmaster.confd 218 BLAKE2B b921db1ea03c73d4a9c9eddc79c5831dcc755a51d31a334e8b35ec0abacb76dee28185030aeaf5f70f2f660139ce1d5707c43c083d6966790ad136c2c1251860 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840
 AUX buildmaster.initd 1573 BLAKE2B bfd18d13345ab7dacc367867da3d0d70317250a3bec0d772caf40cdb16b0684eafcff6b3858608e2d317b48fb9e72b742dba5c3b0276a4183fc70d3b5aff693e SHA512 22d58baa3500de63ca3d278c2ed44c78694c8f022a9916b0f35344485dbbbe46b054ba9b0cc9a8c56948ea8726e419cb7e1177036124fc3fc5acc957d56f168c
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
@@ -9,10 +10,12 @@ DIST buildbot-0.9.10.tar.gz 3112750 BLAKE2B f09b1e38a2920ae34f45d946e8d88bc52509
 DIST buildbot-0.9.11.tar.gz 3096455 BLAKE2B 2582fd27e89fc684911926c272630bfdb3fb84e7c18dadff9e66f609a2976d2a70ba0f566af0a7805fe5a7a370e4215ce2ceca4187d418eaa7075414e6974106 SHA512 c68a657213b0f878d8c2b4e6ebe18cfc9b3e19a4eecaf085fd3e5631bbb78dc9bd14e6b3d4b576e78eb1631329c86331371200a350d33696204fb76e7beae81c
 DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
 DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b080725f6b01258921175b8036daeef23dfd3bf2a71fe838d43b9d7777e3a3141ff9cec0e1c7e609f21c53f51b91d SHA512 b1cf176d01e04bc219be8ffa787a857aec7bcfb930c3e9cabe0410fca60d826c35e74d277cd5764fcd3c6183ea5f19bae195c09ad401cdd948bda500789f2ade
+DIST buildbot-0.9.15.post1.tar.gz 3088947 BLAKE2B c9a0265d3df2a9ac01872fc7106b5b787334bd899a43fcdb6ad06aab5e0e8f1ddb4374bf5211f251f26985c3b11a0b981bdd23fb668ac1717af36443831648e6 SHA512 c5c72132fd8446fbb14467851063d192dbb817506163eacc3022d563698453c66706a895613ca1c17502dd25957b31f6409996497d2e7646ab2fdbb3fb55c31d
 EBUILD buildbot-0.8.12-r3.ebuild 5490 BLAKE2B fc7f5f839c189a627e44fe9420e33cd20b3755a3be1826cc8e68fc4f942c4cd83a444c936e9570230984ecaac43baf1dcecf4fff5808be5c4d6182fb0f2137d2 SHA512 16e5f6ba87559ed9788f4cb7451020cfd0e3b2efe22f5126aca23d0b6e20b9ed6050e4dada0e9e595b28f8ddf4e5446c1217c2e77adfd44dc307fc0b8b5b654a
 EBUILD buildbot-0.9.10.ebuild 7272 BLAKE2B 4a74378e4f13517d44bf5440b3b0c17fcfb271d79e156e09eefb4eb7e80d99440ab333d097566a1862c6c6b8727a6f3f3197adeac9033eb4905720e3edd2f4d5 SHA512 173da10076a2a58772abf009cce729a8ea1e7e85a5f5e5ecf46f6220ef60cafc8252c88ab8129479c41e0e3606454921d6da79d925ef6e64cce575db043ae730
 EBUILD buildbot-0.9.11.ebuild 7046 BLAKE2B 3f6a809c4d84ec67a7746dcadcbc8b7c2971fe3b98b92dad93eae3bf8b264068128521ff6d5fb7ed8839ac7fe0a9bc7e045fc3505939f0ff6b17b0f094495d7f SHA512 72223002dc2774a5316623a5e7bc17ba780311af0dcad7766534c4728ab339b87620e0e6285be9aa87cdd076e5f77dba4ba9b66b1395881fc60341140a1ab6d9
 EBUILD buildbot-0.9.12.ebuild 7107 BLAKE2B 5b702fa552877ff6297f8c260c7e912c8a8bd48144094381444037a0a5b29447a129530acaea08b3b7bd5e6a0ec37d4be7fd175c091520e2818b28b70e14a157 SHA512 0dfd907b7cb5e07ce59ab22664ea535c3010c20602503ff9dddd9c54c2031cde0eef89a5c22fd053fd89e4e3581f174ae21789ffaac45d646442f51e0aa2523f
 EBUILD buildbot-0.9.13.ebuild 7052 BLAKE2B 495c97bdfe984741eb1533611045c9c6fbc3b0ecde65a527fd4ccfa2a4a1085ab87ca7a1273e453a344f76b35b835dac0439ca9a4cff6682bc9c9af971b034cc SHA512 45908483653c3ae43df933378ba3bba4171b314b8808fc0d1188129302ecb45bb35a7cf50a5986ea7e43b7076cd07024bc36ffae572e9d81a9940b8fb12cbb73
-EBUILD buildbot-9999.ebuild 7052 BLAKE2B 495c97bdfe984741eb1533611045c9c6fbc3b0ecde65a527fd4ccfa2a4a1085ab87ca7a1273e453a344f76b35b835dac0439ca9a4cff6682bc9c9af971b034cc SHA512 45908483653c3ae43df933378ba3bba4171b314b8808fc0d1188129302ecb45bb35a7cf50a5986ea7e43b7076cd07024bc36ffae572e9d81a9940b8fb12cbb73
-MISC metadata.xml 1543 BLAKE2B f455fc2a6337f44a232fc27e2c0696c10ab3ae88615c1f1f6390344c780fadbf95fc859439723e577a314a4db152f2f727e618a0c444604e1ac340cb25cbb48e SHA512 a5bd8e8b9fe253e2a4bb43c536dc9b0fdccca675d5381ba7f488d1127c73805838ce881b691f8c638f774706c4b025cd5b70145b10d6c3578b68399e1fcb628d
+EBUILD buildbot-0.9.15_p1.ebuild 7241 BLAKE2B e05e65c5afbcdc3490de4fa4881357dd7918e8d9c05820bada644df52a3b8fd6dee5507072685fe77905e3481941452dbacdc9054432b20402df55ee7e2856c5 SHA512 e62ca4c6c81b7d616228b59856d52bbdcad5a566f9894325db70e78027a9de5c997c80555fd1747996968e576be1349d0cc137ee13dada7394d533889557d079
+EBUILD buildbot-9999.ebuild 7175 BLAKE2B 7178b2dda29636fa499dcc1888792caa87daf6400c8b7908c9de201d0a498a21da37d7c92a131bd1cd92aceeef0aeddda31d80677e39d7a54f91cbe7b2a8ba74 SHA512 6744edc12c7ce59a045de84aa51cec75393585a5f5b41d640641a37f0ef9725aacd4ef4fe9faec160f78d509ab2e18bbae79379988f2e2e139c4d9382afc9a30
+MISC metadata.xml 1616 BLAKE2B cf5a0b7f346e9077dccbd4a9f1b9e95255f874cc8ebfdaec0a067f44c7c2b8015362cf590cb927f8ec87ca497ef38973a6acf5117968904c8762a84ef751cb70 SHA512 efb2ec3027be76f7d9d07bb19616ae4692acd07eefe79412f5983281db51095ad2f900155a26efafeeead403edfeb7fc0e570672f6b254bca83d5263c645d5a4
diff --git a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..48d59be0032c
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="crypt doc docker examples irc test"
+
+RDEPEND="
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
+		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/ramlfications[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/ramlfications[${PYTHON_USEDEP}]
+		dev-python/pyjade[${PYTHON_USEDEP}]
+		dev-python/txgithub[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+[[ ${PV} == *9999 ]] && S=${S}/master
+
+#PATCHES=(
+#	"${FILESDIR}/${P}-buildbotworkerdocker.py.patch"
+#)
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index a9a9d7adf5f6..4d20f12a6a23 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-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"
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 [[ ${PV} == *9999 ]] && inherit git-r3
 inherit readme.gentoo-r1 user systemd distutils-r1
 
-MY_PV="${PV/_p/p}"
+MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
@@ -25,7 +25,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="crypt doc examples irc test"
+IUSE="crypt doc docker examples irc test"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
@@ -48,6 +48,9 @@ RDEPEND="
 	irc? (
 		dev-python/txrequests[${PYTHON_USEDEP}]
 	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+	)
 "
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
@@ -74,6 +77,7 @@ DEPEND="${RDEPEND}
 		dev-python/treq[${PYTHON_USEDEP}]
 		dev-python/setuptools_trial[${PYTHON_USEDEP}]
 		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
 	)"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
new file mode 100644
index 000000000000..db08d7a45dd3
--- /dev/null
+++ b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
@@ -0,0 +1,32 @@
+From 7051ebdac8c8a9054e8a37ab7dd8fb6f0ac1affb Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Mon, 15 Jan 2018 13:50:36 -0800
+Subject: [PATCH] master/buildbot/worker/docker.py: Fix test fail when docker
+ is not installed
+
+This fixes numerous tracebacks (note, only partial traceback):
+
+  File "/usr/lib64/python3.6/site-packages/buildbot/worker/docker.py", line 259, in _thd_start_instance
+    if docker_py_version >= 2.2:
+builtins.NameError: name 'docker_py_version' is not defined
+
+With this patch, the tests pass.
+---
+ master/buildbot/worker/docker.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/buildbot/worker/docker.py b/master/buildbot/worker/docker.py
+index 62e30785f..e558d69ff 100644
+--- a/buildbot/worker/docker.py
++++ b/buildbot/worker/docker.py
+@@ -41,6 +41,7 @@ try:
+ except ImportError:
+     docker = None
+     client = None
++    docker_py_version = 0.0
+ 
+ 
+ def _handle_stream_line(line):
+-- 
+2.15.1
+
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index dc8748343ec6..a40eac4867f1 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -24,6 +24,7 @@
 		* released under the GPL
 	</longdescription>
 	<use>
+		<flag name="docker">Add support for worker docker command steps</flag>
 		<flag name="irc">Add support for status delivery through an ircbot.</flag>
 		<flag name="mail">Add support for watching a maildir for commits.</flag>
 		<flag name="manhole">Add support for manhole (debug over ssh)</flag>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 6500c174bf2a..68d9c6c06e35 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -13,12 +13,12 @@ AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 BLAKE2B e9390cac784eef6d3b83b88f9
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.10.0.tar.gz 7822668 BLAKE2B 8d649924281b68add8120c8f8a4871e0a0671316ce51cc9dcc557d06e696e6f08cf90c253c3edaa902fabc7a9b121ce095e9eaf37478feac1a1cf25555dbc503 SHA512 0bf05f5aacb17007d5beb0909263e31717102b685701eef45c20408895cc9dfd54c96ebc8eee148845c8ffb1d3db687e68a58d4e08395425e14ca0413ee84765
 DIST cmake-3.10.1.tar.gz 7824043 BLAKE2B 004149841b128288845c2a3987b38e6d90b3dcc5ccb2002bc2915f9d8f30496ebf43d9a70fa6e26c7b64c0f41d85c753bd1bac8c1b5d7148b1d592dc98de189a SHA512 14e9a7f01747b369cad3c4e4e83bc777c0c98ce69209456f60d086d2471302f66dc1c1d22fd04e11dcb64de4bfc7dacd9aca70ee0e5f006abd1df79ef642eeed
+DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
-EBUILD cmake-3.10.0.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc
 EBUILD cmake-3.10.1.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc
+EBUILD cmake-3.10.2.ebuild 5926 BLAKE2B 89c3b1211c68dbdbeb1030ffe6df27538d52358679c709fa2261b94d0ed8a2a6fea7b00f83b35815671600ad75dcdfe4ad2c13d5cdc9d46c6e6121a05af94941 SHA512 d4c674e3879d3df39f8b36da433bb31a587a741eb3b2ec7c43eea8b0e1cdd67e7a3772d7d029acc7ca6ecaf4e3289f5825f944daeacd5fb019cfa2a749c3b907
 EBUILD cmake-3.8.2.ebuild 5714 BLAKE2B 3043b071ed597f37a7a07d9613e5010031d64be5849443dec86ba96892d7afd96c6c8b6a210964fa909da360e1ada9bdef47d82f61ac62ac7812455785af1bee SHA512 951eb5e34e58de94697a01c91f45b43f8d1045cef4eb3d9fa3fa9c8a0c36ce66f4f8656cc2e16b3d62d56cf59d4e59af17ab6972ddca87c9e14821b2703fde4c
 EBUILD cmake-3.9.6.ebuild 5968 BLAKE2B c5ac770df5d5d85600e6d3c953f96715ad82984cd6a2b35e0b065fa5173a3b4c00c36a0b4ee3e1324f5b17d030b9691e2ed8fac38bbd7b1e8f43404d5a80f8f3 SHA512 d81890c84e0c37a0b6b8fd28bcccb38815acf35590324a0066ee92f5707a1a034caf16c7d53bfb8080419b76340862b51639ae9b15ab1e5365cb9cf7625b516f
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.10.0.ebuild b/dev-util/cmake/cmake-3.10.2.ebuild
index 95dda9d73a6e..40e98fab968c 100644
--- a/dev-util/cmake/cmake-3.10.0.ebuild
+++ b/dev-util/cmake/cmake-3.10.2.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
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 2a16e004679a..070b75a42dc2 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -3,6 +3,6 @@ DIST cppunit-1.13.2.tar.gz 953596 BLAKE2B 205a631dde2cdd2b543be3e39c66331499f7f7
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 EBUILD cppunit-1.13.1.ebuild 1519 BLAKE2B b947d09d79ae72338dcd884cea61ebfd4540f2cb8cdba41b116b6d73f4c28982b29676ac8904628ff75da8a4b1c9aff5d4e58190c4da05d90087e81040b03005 SHA512 828a553548f581e0de5c161e1c113943a87b4ce7a53389e6d0bdee808ac4acf75acef2c393a41cf142aaeccef1732f618a99500a91dc400a9c00f43f2b1362b5
 EBUILD cppunit-1.13.2-r2.ebuild 1727 BLAKE2B 9b1ae6e1f7c4390c8af78bd81fb59f0356453785613075f58c7ca707a0013e6878c74374b6525645c449e077603810164e4991627c4c8a628d5a69de483b1032 SHA512 1bff7dfb467e8cbd8b3ab440cfd0755cc7ca99824acfc729f579a3eb528947acb9cffcd7d9429853e3b8974cc5c9614da9edb5f7dd7826c7b8f09769d2036780
-EBUILD cppunit-1.14.0.ebuild 1729 BLAKE2B bc3bc8f449c7431ba9d86e6e42f4778f884f4a1c0b9bee4945808359a16146b45da88485a9830b6e552e6b38abe7e7765c7fb1aff606e11c95a4c74a042585ba SHA512 642b1b94148f6bcb96d948756ec347e6b66840e45765ef2f9b4d50b72e9fea4e151f0557d50900fd8274d7a8b04dfc828e9a1115a4882816cf65f4360a5f25cf
+EBUILD cppunit-1.14.0.ebuild 1728 BLAKE2B f5d58f6af81383be090f36be4bd8ba0238f79199a8daaf03351c273a8074ce7e87a472f025003af7b3895dc7b8a68481e95580e9c05a8744332510be6b253c68 SHA512 7f63953dd598ccfbb678a66b5bf452b52ea89f2d7e91f5de58108db0f869f3fccbd58e4eac11987ba6f0380b551c70e1df5350b8fa7cdeae124b2d8e27d06960
 EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
 MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 051ba36a2a72..147300b392ba 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.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
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 1b981b1c3923..40e407e1b7c1 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,5 @@
 DIST devhelp-3.22.0.tar.xz 491908 BLAKE2B ef10aa5030aeac01458e4762694bb7e9d51d2ca1b086de52a4c62b604a437c67eafab63f3b336fc8f0102b4eb0806a31f0bc0a48a4e70f06b15eb95576e881e5 SHA512 16d9853c4514d7b28381e3755e34682a2e9d64d666bb7d39094289d4990eb981efac041b7bf7f8beef5a018cab71c461ecd4e7b7a099fbc132f5b8f7b79749dc
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
 EBUILD devhelp-3.22.0.ebuild 1455 BLAKE2B 9e2e0eb968f08fdcc02a739f59a9c860d834d3a3a1494f37c77a77edb31a73b80d3ed2f48527605283b644250a092b6865cc626c1ecd406b8e03fa9f1517c264 SHA512 3f5d630349d6eaadb41b14b3069dca5d87ac480758624844f56ff30a62172f37e6baf2dac562fea76aaf3a1b88fbc9d6249e997378894a8404c655533617a7ed
-EBUILD devhelp-3.24.0.ebuild 1622 BLAKE2B ce41b1149b030dc28f4be1fd33b466bfe47b5ac1c9a57ee437bf9983db35d897ebf7d92c7eba6ab8b0ff2ab131c71757c8c6c06468499971b9b10c123f398e3f SHA512 66c4539696a05540a9f06d3a12160f56bb71d54d7c1cf72c34e4f962a5e4e73986b9e5ccc4dcf95b6cb9948a976ea16a349ebf3336e25f0043f656fafa266246
+EBUILD devhelp-3.24.0.ebuild 1621 BLAKE2B fe2152f1f9433b4b6cb4edc1c09b7d56d012a5308f80e1f504ac237c3f10a592a7869c4f5bf8fc4d1fde282dc4b6da262d5741ae34c5199d3c11c4c892cbcfe9 SHA512 71e806fa0afce6c15ccf06eb67be10e2d5fba99b9b3da6bec84415a34f97d3cca883dc0831341461136d4b79988795124f10e953e1ec47cf620123c6e09db4d8
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.24.0.ebuild b/dev-util/devhelp/devhelp-3.24.0.ebuild
index a22c80a3b51b..26458feb0dca 100644
--- a/dev-util/devhelp/devhelp-3.24.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.24.0.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-2+"
 SLOT="0/3-3" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gedit +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ad94108ce279..dfa69804bcc9 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 EBUILD gdbus-codegen-2.50.3.ebuild 1317 BLAKE2B 97698b5d0b339ec65e2eb11f6e641b75df60569659cac119417a427043603d0331b7f84df47c68c422d4b1182952b5fc877be41d8ccbae56517e17aca5a6802d SHA512 360162724e4d55bb05c4d048fc42c761b42fee345973f1f11e5d4df86c2f48c6e7028e7f0b83e8128e426b95e2a5c652843bc02ea5fbb6a06a22a940612b5982
-EBUILD gdbus-codegen-2.52.3.ebuild 1333 BLAKE2B c7acedd4eba007272ae7ca0d4b64c36d00adf8ed089983c14aa1c1ae25586561daa15944f9527946f48ea1c422beaa35c4bc1161e7702935fef9e0f382cb9cd1 SHA512 413ab486d6654017ac3898ddeea9481b93c8e0bedefcaddf5e87f24acb9a6883b883ad33d3fc49c6e65d2bd0e2569f8481b0cf4ee606dd6017fce25b4e35d97f
+EBUILD gdbus-codegen-2.52.3.ebuild 1332 BLAKE2B 90405bf7dcf98361e516072d755d1b4243b0a57d7b62f12232b467dfe9c0831ec008dd2e97e28fd77ed59a309ae704715bd5a7ddeca86aaf83885b185ae16188 SHA512 2649c3aeb596e35954a2d5153538d9cf1075230e4f16486b8313ae014d023cd68da55790f39c75654ff5bfd6ebb7e78a86ccb81f7eedf955b70e178739b562db
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
index d84ebc1d1712..253853d9ce63 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 49b2b1116db3..39fdc9b2faea 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.0.tar.xz 3492928 BLAKE2B bab8682ec83a98f7f405a667e9fc9ad4b0fa334e0f1f3b1ba5bd8e17af1c61c65031ebe2fe56b8321df142f5a4d8dec348793bba0fc3c195c6722d635d52a291 SHA512 58c8da3522c75470f5b42492bddd83f61d828fa2a3fb8a78d15813f6d1f1df22bd808f25ae7228bf2e821bacdcc5665b889bac3ea8364c4dac288f95e817e98a
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 EBUILD glade-3.20.0.ebuild 2390 BLAKE2B 22cd5f2417192d963cbb2ff1376d9fa4b5eb44aba78f53c233dc5fd159fb93fa2c03096d71a35cd89321dd2d1f28092a503a4fd0f5cc8883da76854d9a470292 SHA512 98673ca19010e2a63c5c7c9c79dbfdb65939324004c7be6d8b846684411af444ef1fc499234296bfff24d5f8e03842781378d6099356af8b6dc236e757bdf047
-EBUILD glade-3.20.2.ebuild 2397 BLAKE2B 46ea62a8620bdfbef63ffe8621a1ef46a183aff3ccd3d5c49a8b2d50cd069f463e0b17c79b7fb3673a57f2acb409840680d54fa7980f2441e30c4ca0c4d1ea44 SHA512 beaa99674cc7063d278e69309fb1956fa278234e61efb7a0f8df83b4e2d2ab5ba7a0685630fbaf0a8d97722f47bf1fb7b471659aa9fb1f001746c8c288242828
+EBUILD glade-3.20.2.ebuild 2396 BLAKE2B 237aaf54a619ab8e545ad4c56be27561c21b4c8e9cb1204a56b1a751cb1700b33a2859c36b5d5697240b13c3ad0861f37f9cf82f525a934f4c4542d5a9315adf SHA512 4876debc51b547a7076d2e9fd2f34d5719537ba1807257be46e11691d5485a4108cb5bbe0a65ecb23fa472ed8be8cee01cecdddc2d8175c4ee2001b15ca14736
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
index 2f11faca6166..d99a8af28dc4 100644
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ b/dev-util/glade/glade-3.20.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index e0478d1efe2d..6d572f95fa3f 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,6 +1,6 @@
 DIST include-what-you-use-3.9.src.tar.gz 446773 BLAKE2B 6b8e66e7ace440ff793c07fb3a4c3db95418f213c629b119fff315559bb581a04b864f5a8cf2eed2221dca84af23fb7ae0c3b3a2c4a59af88bf1e656951f5e8e SHA512 dd7990fa4112ddb0434807efd9dcf0f77bbecaa61eab51be24428f8e45b9321c7647a979278f3f1266ba9be05c6f1de536fc084613d38638b795248001ce4b44
 DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
 EBUILD include-what-you-use-3.9.ebuild 973 BLAKE2B 61940f05ffd32b4012be4d1710d69adfbfa5147151fd328be078d5663d73abf19ab3bec49ecf30d4a9a7ec91712162f30ecb53d796a38ef433282c8cb928aeb9 SHA512 954ea8edd222088d445c7330a6ac0069e0130729dbcb1068c889af9737cde2b31f06761216970a1cf009d39dc75b0c4f884335aeff0a844cab556bea411b6364
-EBUILD include-what-you-use-4.0-r1.ebuild 1258 BLAKE2B a44e5f49c3ae36b8c3e95a5404518dbb3131bf9375c98cd4f5f7ed0a9c752a78a1906f2ed82b89569ea693529e48a76bb8745d67b062f2d6325aed44f3dc06c3 SHA512 26ac2113d1076093a6849e929d9f0d9d94740e20362cc3f066adb982c357e9ee180f84b204ddcbf8f6bd0b52436300abce0d5157620a9ae444fcaa45718d0536
+EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
 EBUILD include-what-you-use-4.0.ebuild 909 BLAKE2B ef96edb28020f98a91316a4cf7e05a385f3dddd1224e326b6d42e7fc67c4a7521973cf4dc47111e9ae15440b20b16ad046417b9af7f17d61cb7cc74d336e81c6 SHA512 e99495f5a7b6c59727920370b3fe63b031841693eae43bdf33b3130dac0b9794140952390f29aec0f52421c59a084a457e375caf1d697f5d015342febd519931
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild
index 5b23f35f1cb1..f278652a524e 100644
--- a/dev-util/include-what-you-use/include-what-you-use-4.0-r1.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.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
@@ -15,8 +15,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="sys-devel/llvm:4
-	sys-devel/clang:4
+LLVM_MAX_SLOT=4
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
 	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -46,7 +48,7 @@ src_configure() {
 		# 'clang' binary itself. See bug #625972
 		# Thus as a hack we install it to the same directory
 		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 8ecac99af15e..6a0993343565 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,13 +1,10 @@
 AUX 4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch 4415 BLAKE2B bad1c63cbd39941311ffd2a297e18cab62787a6596309a17e85638574cafc952a0f193a8d0d1ae6c71e4bbf22d44f8e59cd387524e489e393e843cf6032bb162 SHA512 9aa4a9618696d97b523e758725619a6cb6d4ca74058147185383b32ddc7db348bada379ad8c567a66a4bebd982c4e039aaae14ba44336408340378735c0b069c
 AUX 4.0.1/0002-Fix-bug-28898.patch 3526 BLAKE2B d13f4e866c00763061347bc24908306e4f7fb6d0701d10d272475556d4213dd19a13abefaa660199a9c1369264a84fa2da23c09095f4e3b6e30b356b99b90dea SHA512 8a9167ba1b17bb6d373fd41755ce4436b199fb48a47e303bff4020a79f90c547ae3ca86525345c55536bdc03b9c3853baaebdf914df04ae92901a073ae5658aa
 DIST lldb-4.0.1.src.tar.xz 19088212 BLAKE2B 0fcc76de5777c0724a207330bc5e027065fa55628506fe8cbd4f4e7ab397fc3802ae9580a8e41e14c1b3448453c1f735725100fb69c3048a44bd9e5748ab3cfa SHA512 1d94d7dfcc0614b16d0ef83436bbe814b39e34ba18394361bb9f13ad408ae9b29affa9a5d58c50c8dcd83765a39ae4d59ffabb7d8cd1358fd2fbd198b2de2ab6
-DIST lldb-5.0.0.src.tar.xz 19203772 BLAKE2B fee83470d32a5325861da009df76bc64ccc0fabf390afb74630b53904fc11c74d309cdd016cc27c15d0a0ccd8390fc60b9799e6317d0fcf02557b3946e5689ea SHA512 bc70953c7f6b3f0bc797461fb53d9c60c5ab36c0b9aae815a3c37fc597a61c7220695ee3b60a9682486d2e4713c5f78ea85e853e13c587e356510a1c99a62ba9
 DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512ce92c39e4ea0d9a830bf53a343c233aa528ffc3512072017ea2ffc7e6e57d1f13f9bac84a9446e41fb29f35a9da3 SHA512 ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
-DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
-EBUILD lldb-5.0.0.ebuild 2811 BLAKE2B f8a5c12fe179486993f4ed0da5f4b6abb4e282c4c5702277af7853cb71b4cacd1fa998346d07373fdc0e5f051155c373e2c5cfc30131afbf08660a782ac7b81d SHA512 e4b38ef25db0a8b764bc7b1540190024557ddafcae6613d3c55fb98b67ca72a922b5224b8f65144050cc3055418bbde6769ae30bd90cb5d30083c018e1fee8f4
 EBUILD lldb-5.0.1.ebuild 3067 BLAKE2B 790a43c29244d006a3bf9ac3c8548f9348a2d18b96aecc156cef76d3145dbc34d22aa6534d8338d23e79113bf1a6d87c00464427aae5ee6b1c513d8fd2985e54 SHA512 41807a680175c6c836ef852b58f4306c32a21111da4b78c6584696a68e9424cb2de27bd2394164ac1cc91bcdf759a5fd0112d137bed9c9714ff60e66af9bd29d
 EBUILD lldb-6.0.9999.ebuild 3086 BLAKE2B a569f675b0a1da11c6cc663de56e2227a2c0a38ff01e69b0eb258655d6a7a1ed2d15ff5da9274f0fc3750a9ec3e07b8a6be4a8c07fbe004b36682944637a43f2 SHA512 ade71218d5aabd59cc5fdd7f8f39b69af49ee5be79abe7105c74b23d3abdb1c9a3c15fc09735111e31dfcf50013f00b985ebff89487c11e99129fa7cd81c8d7b
 EBUILD lldb-9999.ebuild 3061 BLAKE2B fc4cdb38222831d0e0f9fe93b44306160b56eeb1b23d1015dbfc5761fdfbd22f0deed91d420870469dc0e9fd777be8cf9ade79e3eb90f275a3e0e18205aa97f4 SHA512 facc16f2f3ab686f2247d833c9f4a12ab6c0ad2e70d72452d6d96234a5f6f66106ccd16175065dd6e6405ed014ef9e687494a877fe7eeaa3a64ac9cdaa292fb5
diff --git a/dev-util/lldb/lldb-5.0.0.ebuild b/dev-util/lldb/lldb-5.0.0.ebuild
deleted file mode 100644
index ac6f0f6cadc5..000000000000
--- a/dev-util/lldb/lldb-5.0.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 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 python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python 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"
-# swig-3.0.9+ generates invalid wrappers, #598708
-# upstream: https://github.com/swig/swig/issues/769
-DEPEND="${RDEPEND}
-	python? ( <dev-lang/swig-3.0.9 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use test; then
-		mv llvm-* llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		# 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_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	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 bundled six module
-		rm "${D}$(python_get_sitedir)/six.py" || die
-
-		# 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/meld/Manifest b/dev-util/meld/Manifest
index a980fa6f2dfe..9ede11077da6 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,3 @@
 DIST meld-3.18.0.tar.xz 553772 BLAKE2B 9a481f18147a767e65cb6d58bd4770232e9d2f8e10261f8fe19d305ab44c19b8728dd5f7e7b77e4607fcdc4e6b47a0464ba5dbb4491ddc9d91ae8c1a10c1e409 SHA512 1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
-EBUILD meld-3.18.0.ebuild 902 BLAKE2B 0436a714b7f6d678b53e033737c22ce1a84a8a750877ac8f579789f7d81cb8e99c3e469ffb7f16c2bc459ec12ab126072ca27710d974871d822142b524aee51d SHA512 3fb9ba1148b138eb3d0d9818b2f613cf1864a4c9add6a9f97ed507f0e736026223694cfa383a64b876ef58d3c0a3da584585b1738352f06b2ea37143c728e5c8
+EBUILD meld-3.18.0.ebuild 860 BLAKE2B 02dd86bf5d95762f40dc79bcd04d1fee260b0fb20526745a129ff5a32a12e416b25ac8d9fd2249f4429614b0bcb8860d5917255d4c1461b6e2096c8e6dd90073 SHA512 5d4541c603a549fc1073e754f1b87c06d4deda1c4e7cf99b302f720639f32d4b411dbeb7009f3a7d433b83978ab3bd3d945776e61499903d9d56746dbba08541
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.18.0.ebuild b/dev-util/meld/meld-3.18.0.ebuild
index 04e721a6f802..4ca57bfc5884 100644
--- a/dev-util/meld/meld-3.18.0.ebuild
+++ b/dev-util/meld/meld-3.18.0.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"
@@ -18,7 +18,6 @@ IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2[dbus]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/gtk+-3.14:3[introspection]
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index a18156b61be9..6d650ba932f4 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -6,6 +6,6 @@ DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4c
 EBUILD pkgconfig-0.28-r2.ebuild 2929 BLAKE2B 54a5e014cbf551281018890b95f7c6ba84e9476406618a81fc575e52e0c4dd22a193c6beec6b522751707b9d65c38ddf28d836d0fcf76b6fa7f428d00bc96385 SHA512 1f0d9a52c45f9796c4844e95f29f621fbeab39c8a1e473b8a130a3873f98919e23b166776ee75d552d0bb58182181f04c6b4d948f76bb5583fcb92f22f05eabe
 EBUILD pkgconfig-0.28-r3.ebuild 3452 BLAKE2B 5af07393e80c8cddc75933ef34a89cb359a547bff5526f012d37ffcb32c91a696e96547c22c62245be19c9eeec19fb30251a853887404db5672d1c68f9b261cf SHA512 9555d23c8b5c0b5251b7b1a509fcd5c29e047f8871fb903420ab6e50a17fb5d387d0f36100660bb24f206ed9d3979a091e3f927fc886803a97ef23dd00c4962d
 EBUILD pkgconfig-0.29.1.ebuild 3816 BLAKE2B 8d62d7448d60d34c80f3a68b4061fc227b1315ac7ec9960b83088b41d9ea1211581b0953ec572c2b3815550d0c1f1daf6dbe5f53fef5c4e12350f7a68eecc1dd SHA512 4fe303367076ead07d7abeac8c21eb29cc5a65c5f962f7294fdc0cc42c10bd715774d4d9e7a0c91536f01619ddbe27677aae40283a9686f9a8deba110726a7a0
-EBUILD pkgconfig-0.29.2.ebuild 3807 BLAKE2B 55084d4f310470e0dad4f4d8b0babd77d540035758ba14da1e81cbac5cd7c70bde9069ad76507d21b4be82906fbdb2feef9c40e51003970ebaf8672ff1fb1a6b SHA512 372e2d4646942927118b065354e8ad3d78c98040ed54bbde067514c38fbb46ec6f6a1972fc6e75a4915302c5057fdabd7bbe88eca48cb990a29cdf7e1267c9c5
+EBUILD pkgconfig-0.29.2.ebuild 3803 BLAKE2B 53f655d2db283ea553df839b1192b216d28b7961e1f648b0a8919fb88be97ebdc19fedd6d7f77d20e2b176684f705e97a3013c6b5af60d384cc86c61311e6320 SHA512 07f0617d4e5ee9b4a67c9979baaf5ed2eed998b7f386e265f6dc527192cdfad01597c725fb860d1d51247d3c87ed9bc5bc3225368e4dca5dbc962ca32cf60756
 EBUILD pkgconfig-9999.ebuild 3816 BLAKE2B 8d62d7448d60d34c80f3a68b4061fc227b1315ac7ec9960b83088b41d9ea1211581b0953ec572c2b3815550d0c1f1daf6dbe5f53fef5c4e12350f7a68eecc1dd SHA512 4fe303367076ead07d7abeac8c21eb29cc5a65c5f962f7294fdc0cc42c10bd715774d4d9e7a0c91536f01619ddbe27677aae40283a9686f9a8deba110726a7a0
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 5d435fe1fc85..d3d9c4909cf9 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 5ea23841ecee..8c52575c69e6 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,6 +1,6 @@
 DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf
-EBUILD strace-4.20.ebuild 1965 BLAKE2B 6b3c17a6cb24b22b63e8288d217d937bfabb2bf76fa7ca25dd019377dcb140a57d30e99214cde5f23f158d4b758697fc6e4677263e5caf39ec8c5acf9869af8f SHA512 7800713c8be7d36703bd867f2c8bae93a1a13a315cab10c7b0d022e5cbfd9f18fccda967cdaffd31af608952c0aac92abb6b9a931feb2b6510e578e7e55b983b
+EBUILD strace-4.20.ebuild 1961 BLAKE2B 006da14fc1836ad595377beedd5ae0ce544a716c76f7c4f72f8317e6ef9c0eb7e881e9c96b8c5f5f4be18f5adeec9fdd0dbf3ad36c87b603f7539055f948a200 SHA512 5d193754d0a06784432dba5af3e8632662a638fc265da6af605fdf4612bcb33599f94bb01ff0eb12e61c59f4ec57a70194d8eeda5364651e2de1feead73a0907
 EBUILD strace-9999.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
index 1dcd63e3210a..a514ce7c580e 100644
--- a/dev-util/strace/strace-4.20.ebuild
+++ b/dev-util/strace/strace-4.20.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index f05c6ff42ce7..1236055b7a87 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1,5 @@
 DIST sysdig-0.19.1.tar.gz 742149 BLAKE2B 413c03816573b35c35c9a5fc305e8103c118feabe6555b83e029acd5683ad4a361eec07624ea0b0bb8d081fdb62ce0b455ff2fa2ebdc0420546a848af284e25c SHA512 a3947ecd2019af75d787d956b3931dc1aac593279256a92fc02ff0d7e0a85f23786ab821da9bf3ec55430e4da56f70c8583d1b5d24782b426f7deb6f1fca69eb
+DIST sysdig-0.20.0.tar.gz 750798 BLAKE2B 9e5c57abf81531f6643c661e539b06b33bda352eb3072e1ed686da3dc68550d90c94a4273554c2dd4752c73357f0bfe52bcbd10ad8551d8a2876552acf31292a SHA512 2549c8e2d0db0abd95e31272837fe5072c4c26926b2d17348bd8d73177bc024bab0a8503aa427f9134d8ca0a0bbc05fe97495933c3b8236db5fcb74df7c1efb2
 EBUILD sysdig-0.19.1.ebuild 1881 BLAKE2B 5f434002259e8bda39b4662fa04ff1fab2d5856a9577012dec92cea062003c07fd286ceb91b686c9dbf709b4095dbd4d24cfd35acc5bddb97293bae79b7d4c31 SHA512 1481f78d1b106f64f4610b3240b2276748820485503782d4ba5df22e756a2b16a5b44a0839aa79df3a0e1c09d1725f0f1b95942b167fa49248aa8ac3c11ab55f
+EBUILD sysdig-0.20.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.20.0.ebuild b/dev-util/sysdig/sysdig-0.20.0.ebuild
new file mode 100644
index 000000000000..e366e6626308
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.20.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="all"
+
+	if use modules; then
+		cmake-utils_src_make configure_driver
+
+		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED%/}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED%/}"/usr/etc || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-19 20:11:46 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-19 20:11:46 +0000
commit	5b5df25227111ef465caf5c52bcfb66dac3219cd (patch)
tree	31b713cac6188358125cbb66b8804030328740f0 /dev-util
parent	02e2208f46f4e2c00fb9743cbc47350bdd233bfa (diff)