gentoo resync : 18.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-18 04:54:42 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-18 04:54:42 +0000
commit: 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (patch)
tree: c968fff3108e2b4d88e4e564a56bfd066f170573 /dev-util
parent: 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (diff)
131 files changed, 461 insertions, 1766 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0e250bd16bf7..328c99c0ecbd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index e04300eb22ed..665c4ff32182 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -13,6 +13,6 @@ DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
 EBUILD boost-build-1.62.0-r1.ebuild 3916 BLAKE2B 613816f7df3ca77952d7428e1669a06e49dad9652c0d26de99d3d37a7216c91259df10b7639161216428b31eaeabd8619053756e978de612c3891991b02b59ef SHA512 56673f5714aa82b4ad00be76b7937d332814c6ac3d4e2824861ffc1565aee1d7f79050a8e4201d8f6144acd1be08f5081c997b1453724c266fcae337894178e1
 EBUILD boost-build-1.63.0.ebuild 3840 BLAKE2B cd4eeb5466dfe8127366f099be3faf36eaab4dc0e5ae430cc13585dbabd8d990a1978931aa1e7dd0536b6cb7dd106f8736de142f62d6206f261a2ccd7f4b6694 SHA512 00ef860e6513847a1b8f55bd3416c9ead3b5df26d28e4a228c5aa72eaf20fa232c107fffa3fc55a3000576f89c8aaf89d61c5ace57e6ee324d7569de6531d167
-EBUILD boost-build-1.65.0.ebuild 3842 BLAKE2B de14a2f4f19c644d665fab5bcd361d01621ab36f1fe14d888af04d03a1883958fbdb618f4cfaea836f129103ede15d05af5694ff8450dd645a4ee1b3f4c34e1c SHA512 bfa21f6ff9361b81f3497765b9a2a84818785630081aa4f83f65f107c3ea7e43109b8614b345d1d70138da0b79fddec0fa969592d67ab1d64df8a97e9d4ad55c
+EBUILD boost-build-1.65.0.ebuild 3840 BLAKE2B 571751732ff1d5c4dbadbc77385e86f687647f4f77beab57194176fbef4b9d1d41141d4bf16e556e783acb3f4f9e20bfc46d58fc68b25d431ace0904e7c2898b SHA512 202ac229e873d44115e9b19359b6fb5490d6fe148b3d8d46516d6e0c701233c091c0739823a004b3fe4817006ccf483edb35d48bc524db5f5b7a80fa3cfccb70
 EBUILD boost-build-1.66.0.ebuild 3909 BLAKE2B 91f52109013c96b36f583afa3b6aabd2d7979b35ab3958a1a7b848595b10eeaf2ecb063aa63120fc1aab7eaa7d3d84f7623562b5168b4efe204f7b3a078ef460 SHA512 aaf2bcadea08dec33b4a1cd201c81794625c9eb20be26035ce528ba342a552cda0b26d31f207a0e30455b2a8eb920f9cd32a2e4465eefd1e35a7c5d055f34ecb
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index 2a734ea15054..c89c7e048e81 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 9b8c2f4a00a3..0ff2096ad837 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,11 +1,9 @@
-DIST buildbot-console-view-0.9.10.tar.gz 640908 BLAKE2B 04862718c7d635c98795b7b746d47c89941020b74d121d5923515ae9823602598bc954d796f24e1bd2569f2aeec14b18de0e24c7afd45d9cc034f0929e15212d SHA512 a7ad6289a314f096e6375646d17e2f6b595ecae040e9d135334ac46e810d24f6903318e5ef34f015d923b795d01d8e4011dca00b9b6adeb8c91734350f5d1982
-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
+DIST buildbot-console-view-1.1.0.tar.gz 640524 BLAKE2B 038412232299b9dcf5b38c0dcc646bce0f02c817b319bc796268e0bdcd10db0a82dbeb692850ad252246a2a0b48ceca23fd5ac900d46774b64ea19839673f607 SHA512 c45962f73d8e8214518c09fc3163d20f93ac4f55ed547dc90f4116906b94a01384bdc28e52d1b850ba34077c4cd30cd3e1f2dae23c01e233e5745de181e2dc6c
 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
+EBUILD buildbot-console-view-1.1.0.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.11.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.11.ebuild
deleted file mode 100644
index e40d00b64c60..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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-console-view/buildbot-console-view-0.9.10.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
index e40d00b64c60..5f6501c2a710 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.10.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 576287fdb5b2..11760431fd51 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,9 +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
+DIST buildbot-grid-view-1.1.0.tar.gz 638856 BLAKE2B ff6d055d6f0426dba6c8652da3f4dcd66dc98d6d85db19eda87e48c8107a06164ab7d6978d2aae9e76dbc3212a78d94e93598937d72e55728aae6b0bf53c50bd SHA512 64b2c3f1e45232d7dae10b4505f4aaf9ad5b72dd22ad5be4aa5c4265a6a315ae65f72b7a8006a6b0ee887e5d30b2d28fe5085afa683efeda2ede8a7c310bb750
 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
+EBUILD buildbot-grid-view-1.1.0.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.11.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
index c52caef75095..384073a7a830 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.11.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
@@ -32,8 +32,8 @@ RDEPEND=""
 
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	=dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	=dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 4e4a139383d6..49f3f1961c15 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,12 +1,10 @@
 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
+DIST buildbot-pkg-1.1.0.tar.gz 4855 BLAKE2B 29dddb28f8d5b3bbb82b24959077597e0832b2b85308132e2bdef03a28e84dcef400715b4d7faa33c42b3ec4085c10d825a50dc0b0d55aa23a13e1e02b0ca3c5 SHA512 e48d8086170d9c7fd8270a2401ee5f0980dcd2a4554218fd9ac1159d9f08f4a82fc03a2bbea27d169e9f0e4219d9ae8331a522cbf52bdd2e51bb13527f4dbd8d
 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
+EBUILD buildbot-pkg-1.1.0.ebuild 1163 BLAKE2B 40217b825dc667e609a54f1a4d5e58544901b6e605b787f95d502d5c8ffb70f469c28ea5e79357c59783b8dabfeaacc6b88b907dcc3ef7ef28e7fe13b4f034e5 SHA512 6ea5530cbb5adeaa7c572dc477c59f8e7b1a80e890fb4eb3ccecc0db67f8b11a19e7065c4ae67365b55d46aad84c36c4c0a62d479e3be70b419e3a766461ba6e
 MISC metadata.xml 1309 BLAKE2B f2c7d28ec175efb170fc4f556b4f0d8beb8e6ca809240739ade425d6258d6617ed97a6cd5abd9a0f9a54e07a520113ad65dd2b912497adb89ef2cafa74038a56 SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.10.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.10.ebuild
deleted file mode 100644
index dd96a049c7cf..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.11.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
index dd96a049c7cf..bfd79f328450 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.11.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
+)
+
 python_install_all() {
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/buildbot-prometheus/Manifest b/dev-util/buildbot-prometheus/Manifest
index 0019b631b011..ddd34bdf7416 100644
--- a/dev-util/buildbot-prometheus/Manifest
+++ b/dev-util/buildbot-prometheus/Manifest
@@ -1,4 +1,6 @@
+AUX buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch 2407 BLAKE2B 90bfa4d0892a2bcafaace817ddc1076ca02ae7fa12aefa67cd622f902b1e21b0c23b2112a9a522cb7076d414dd98d665271b9adf41ceaa6f1567151bfa23a67a SHA512 d08ba36d3a28d14f15b1cd3f0545855e15d6d3345166ca0c27aa4470c14663ce7b3ab154ffbdbc80efc8f8225afabb0bd336e623108483be4d6c2760a11c0114
 DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
-EBUILD buildbot-prometheus-17.7.2-r1.ebuild 786 BLAKE2B eb065d7e22a00eca5d57658a0e26e6600dd3ba40dcb6b0dd27cd41230903103f7f5f472977e6152b7e9842c01389645d342153afeecc5c2619d84e2e3e928da8 SHA512 bcfed633ffe3aaef5e30f638fafbae2a6c716b269efc0ac7e52b3f1ffa9c61b69531c576b10f5d1226a8018792010a7bae759f2c6144f407fdfd0bc8f9740fa4
+EBUILD buildbot-prometheus-17.7.2-r1.ebuild 891 BLAKE2B 05ca697284b2afcb56dfcbed7d568f434a4f0cf93fa9ab797f100b85db6656ce26a4728465529cc47ac9ce9f147fe8a8e235037293a10f970b635cba3f75e250 SHA512 c3fac2396d1097623cef5a060c329d25bbc681968e0aa05764528b51923804561c894297d1ee6b94430dafc1b039b93e7cef66a4d4c64f0616aeb755724a3300
+EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1122 BLAKE2B 4ed47d8f6f252be8866c997639f7380d0ecf33f7813c1c08b7f6fd83837b216dac116cc78bdd3e5d892ba8a8952f65564919b59286d1375b2b09f42b36065f51 SHA512 b72291f2d007542bd510e3f2f2b0bd42439d3c70583909a742a02a209e9f8507850597512222acfb99f355b4dcedb51777b7f1c67177fccd5bd2a1373b9e3d2e
 EBUILD buildbot-prometheus-17.7.2.ebuild 786 BLAKE2B eb065d7e22a00eca5d57658a0e26e6600dd3ba40dcb6b0dd27cd41230903103f7f5f472977e6152b7e9842c01389645d342153afeecc5c2619d84e2e3e928da8 SHA512 bcfed633ffe3aaef5e30f638fafbae2a6c716b269efc0ac7e52b3f1ffa9c61b69531c576b10f5d1226a8018792010a7bae759f2c6144f407fdfd0bc8f9740fa4
-MISC metadata.xml 392 BLAKE2B 2a2acde2274ca75c4477314c27d5bdc2f02ffd3f207a000ae928cf30b258e15d345cb27dd22254181ffc488e01354225f297ad56ce9d2b3575ef4a68199b7e0e SHA512 3d0a5ff260e9606e29ec0eabd8b87fc7f338f35b86dba44024dedf2029fd8d4e04e4f895812f75821dd21703ecf6c57ae25e27ca92dfbb8e817c49c1d404bbb0
+MISC metadata.xml 498 BLAKE2B e2cfffddc7ee5bcf879529fea9c97b2c5f93134c16b57dcac5a9f445cba4097f001f973668d82a9a619a524e03da6d79f8910a76637ed1070beb742ad25599c1 SHA512 6a99e044eef36810ef2dee8b090e852ec9518fb8cc8a019257543e77200aae69faf0e0e89f54d562be701dd8f5ebae9d90af860e3bdc3c54fa079e669af16202
diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
index a930624175f3..f6c6bd792ce5 100644
--- a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild
@@ -20,6 +20,10 @@ RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${RDEPEND}"
 
+PATCHES=(
+	"$FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch"
+)
+
 python_prepare_all() {
 	sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
 	distutils-r1_python_prepare_all
diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
new file mode 100644
index 000000000000..67323d1dbeff
--- /dev/null
+++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A Prometheus metrics exporter for Buildbot"
+HOMEPAGE="https://github.com/claws/buildbot-prometheus"
+SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-util/buildbot-0.9.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch"
+)
+
+python_prepare_all() {
+	sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	einfo "This version has been patched to be compatible with the current buildbot releases >=0.9.0"
+	einfo "For older buildbot-0.8* releases, please use dev-python/buildbot-prometheus-17.7.2-r1 version"
+}
diff --git a/dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch b/dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
new file mode 100644
index 000000000000..0ba69478ac7a
--- /dev/null
+++ b/dev-util/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
@@ -0,0 +1,52 @@
+From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001
+From: �RӨ < _�>
+Date: Tue, 6 Mar 2018 02:30:56 +0000
+Subject: [PATCH] Migrate duration calculations to >=buildbot-0.9
+
+---
+ buildbot_prometheus/prometheus.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/buildbot_prometheus/prometheus.py b/buildbot_prometheus/prometheus.py
+index a766f41..ebf41a1 100644
+--- a/buildbot_prometheus/prometheus.py
++++ b/buildbot_prometheus/prometheus.py
+@@ -302,7 +302,7 @@ class Prometheus(service.BuildbotService):
+             build_started = msg['started_at']
+             build_finished = msg['complete_at']
+             build_duration = build_finished - build_started
+-            duration_seconds = build_duration.total_seconds()
++            duration_seconds = build_duration
+             self.g_builds_duration.labels(**labels).set(duration_seconds)
+ 
+             build_status = resolve_results_status(msg['results'])
+@@ -401,7 +401,7 @@ class Prometheus(service.BuildbotService):
+             buildset_started = msg['submitted_at']
+             buildset_finished = msg['complete_at']
+             buildset_duration = buildset_finished - buildset_started
+-            duration_seconds = buildset_duration.total_seconds()
++            duration_seconds = buildset_duration
+             self.g_buildsets_duration.labels(**labels).set(duration_seconds)
+ 
+             bs_success = resolve_results_status(msg['results'])
+@@ -444,7 +444,7 @@ class Prometheus(service.BuildbotService):
+             br_started = msg['submitted_at']
+             br_finished = msg['complete_at']
+             br_duration = br_finished - br_started
+-            duration_seconds = br_duration.total_seconds()
++            duration_seconds = br_duration
+             self.g_build_requests_duration.labels(**labels).set(duration_seconds)
+ 
+             br_success = resolve_results_status(msg['results'])
+@@ -491,7 +491,7 @@ class Prometheus(service.BuildbotService):
+             step_started = msg['started_at']
+             step_finished = msg['complete_at']
+             step_duration = step_finished - step_started
+-            duration_seconds = step_duration.total_seconds()
++            duration_seconds = step_duration
+             self.g_steps_duration.labels(**labels).set(duration_seconds)
+ 
+             step_success = resolve_results_status(msg['results'])
+--
+libgit2 0.24.6
+
diff --git a/dev-util/buildbot-prometheus/metadata.xml b/dev-util/buildbot-prometheus/metadata.xml
index 688a3484930f..81ebfb154a13 100644
--- a/dev-util/buildbot-prometheus/metadata.xml
+++ b/dev-util/buildbot-prometheus/metadata.xml
@@ -5,6 +5,10 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">buildbot-prometheus</remote-id>
 		<remote-id type="github">claws/buildbot-prometheus</remote-id>
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 4b018e9824e5..35d56a30c894 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,11 +1,9 @@
-DIST buildbot-waterfall-view-0.9.10.tar.gz 714260 BLAKE2B 861c9b327e0f0a179156fd80d32ddbeb1df957a95616eae1efb795f477c7276e57ed347a25cc18d1c78fe8a08861bf2f32e17e0467a43f829b15be8715e059e7 SHA512 e57a680fb3be7072f1dd6a757787932d9640f1442370048411987d3521f6c600c1f1adedb439ed439cf7928110a6191c8cc4207bf7cd7ebc8e6d1ac5a36f4a1e
-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
+DIST buildbot-waterfall-view-1.1.0.tar.gz 713901 BLAKE2B 73366eac6a7e0c9e758209b64e2f086148612e9db3459a5babeb272f515d0aef2bf7bd3dddac6d57955a0ebb3e065fdd3eaee31196cf5bcb9afac269d154c4ce SHA512 f6151aab01b680aa77b17c6863e3d33557c2436a2ffe35db0b75416a1d7facd3927437c8bd659d8fbda339e4f77412ba6df605500e6b31559770fa3a3c0eca59
 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
+EBUILD buildbot-waterfall-view-1.1.0.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.10.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.10.ebuild
deleted file mode 100644
index a2fb58771439..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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-waterfall-view/buildbot-waterfall-view-0.9.11.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
index a2fb58771439..ac8298f1ae1f 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.11.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 893cac6ba922..3e3ed47b272f 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,17 +1,13 @@
 AUX buildbot.tac.sample 1809 BLAKE2B 57b907edf44579b9f380d528d47fbf3616248d106190f700313e050bd439909f6522a20ce2bf91e6e18205b52ca79f9f6ecdb98d8018e67059c0a74c00d56483 SHA512 0cfe04d4587b9befef451d2fb47125643d84bbf12eec99a84622c21f06d7a8e10eb0ceb67c9491b61639b6634b2942ebc42d2ffa8253afbec688dc4e03d70158
-AUX buildbot_worker.confd 222 BLAKE2B 54c18448ab0b4b9b056aa45d2c1a02608f942428708933290338f46e16b19a3a6d02d4e8ecfe3c85960441c43ae4bcd8b50b8b9ac970ba33be2e4c1f5c2f27b2 SHA512 ccea785a073ba3a159f25c42d02722311eae3bdcafa4fe011e80d626f8b1aa74d3fe5118bf0c7831c7ceefdd896feab58667534e47e6814f5c62dd2b6bb0c550
 AUX buildbot_worker.confd2 367 BLAKE2B 51ea7eacb99bec3e8fe31ef9933ddeebc4ae6afad1880f4acb76b0460b16336f00b1868b980315b09ba591be9dab9379466cfa6eda5b6d7a999a5e4eaa1b76be SHA512 d46ca9656ba3f4fa58208954ba80d0c8e3a2a6a1eb14a92128653e56915811ac1f1e0a4aba0755fe4844aa0d85907eef6c657236035d139faf030b5d6940b820
-AUX buildbot_worker.initd 1139 BLAKE2B 8b4159313aca170c1aba90aa4315e877d5d7fb375bb70068505d6daa08400ab1270b2ec72aabbaf711aa5b700ff377c10b8d813090518d541f3cda306086cbaf SHA512 51a8f21f84849eaa8e26abdb8b7bfaa3be4f1af813485fbb294ac09bef5ea003de32ae07566267fb1d52177fedf2541805af60204a8793645ea4909388e39c10
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
-DIST buildbot-worker-0.9.10.tar.gz 99028 BLAKE2B 8cbbcceceb60afa6194c1e1c8f7382eb92a6e7517aa94477656f81c0c3eed38d39d85f1e98a37481fde39d24726c1dce73a6e8b9f2615faa2592f16900a4efd3 SHA512 0f515610d9c788657b10ba6624745841241fe554b472e53abdda221a678eb73d7a21a6529eb0769450de3a79b43bb6e51f4208247a4d8ef25c3d36b6ced6ec89
-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
+DIST buildbot-worker-1.1.0.tar.gz 102142 BLAKE2B 144587edf2adc9d99837dc549b4d0696761f6cb3c959d4c133a5136606934ce03836cd1fcb019e7bb8ec473526c2ac07146c4820ef4d8b17ed9d843acd6c06b4 SHA512 77c46b3c9a16847eaf72de1dafa871a3242b66235c94ce8109f953db39aa4b74de2a03ca7ff06e91f8ea0751ed57e6ec1f39336912d56346f1bed171f597f6ed
 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-0.9.15_p1.ebuild 4818 BLAKE2B 9d0374a566c51b986135184ca776f51f4a2a424448de147e39fbb03694773216671c734ddc737ed14d0278ca9edcdea8c37317d7d641357bc50a95784d478ed4 SHA512 a4e08dffc7ddcde1b885361ed815daed61720ea579e29303fc563e632ffeb129298f62763baea99735417e48ef7cfd1b55267174474d4c04a8e9bc1396c1da9a
+EBUILD buildbot-worker-1.1.0.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.10-r2.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild
deleted file mode 100644
index 419fd619809a..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo 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_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-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.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}/slave
-
-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-0.9.11.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
index 0697e9a2ce0d..bfcad9dc970b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.11.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_5 )
+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 user distutils-r1
+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"
 
@@ -26,7 +26,7 @@ fi
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-0.9.7
 "
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 "
 
 S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
+[[ ${PV} == *9999 ]] && S=${S}/worker
 
 pkg_setup() {
 	enewuser buildbot
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd b/dev-util/buildbot-worker/files/buildbot_worker.confd
deleted file mode 100644
index 7e77999cf0c8..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Path to the build slave's basedir.
-BASEDIR="/var/lib/buildbot_worker"
-
-# User account for the buildslave.
-# The basedir should be owned by this user.
-USERNAME="buildbot"
-
-# Extra options passed to twistd.
-TWISTD_OPTS=""
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.initd b/dev-util/buildbot-worker/files/buildbot_worker.initd
deleted file mode 100644
index 8b13460491e4..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${BASEDIR}" ]; then
-		eerror "BASEDIR not set"
-		return 1
-	fi
-	if [ -z "${USERNAME}" ]; then
-		eerror "USERNAME not set"
-		return 1
-	fi
-	if [ ! -d "${BASEDIR}" ]; then
-		eerror "${BASEDIR} is not a directory"
-		return 1
-	fi
-	if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
-		eerror "${BASEDIR} does not contain buildbot.tac"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting buildslave in ${BASEDIR}"
-	# We set HOME here to make something valid show up in the env of child
-	# processes spawned by the buildslave.
-	start-stop-daemon --start -u "${USERNAME}" \
-		--pidfile "${BASEDIR}/buildbot_worker.pid" \
-		--env HOME="${BASEDIR}" \
-		--exec /usr/bin/twistd -- \
-		--no_save \
-		--logfile="${BASEDIR}/twistd.log" \
-		--pidfile="${BASEDIR}/buildbot_worker.pid" \
-		--python="${BASEDIR}/buildbot.tac"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping buildslave in ${BASEDIR}"
-	start-stop-daemon --stop --pidfile "${BASEDIR}/buildbot_worker.pid"
-	eend $?
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index e583a738848d..ffe0103a9b37 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,9 +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
+DIST buildbot-wsgi-dashboards-1.1.0.tar.gz 626836 BLAKE2B f7323073f644e6b6b89595aa052ae1bc25d14b439c3d1d0f3601eb4a62b07563ef12a97bde8997495fe6260e31de55a29b220f48c0b794761e077de77ccd0246 SHA512 799c2a28bd874c864264247fa0d030b3335d63bec88cfc7637b8456615c0c299de4df91557178e5d3358450fea89ed0ddb82ae27bbf8304dc3b7f9711ce69e94
 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
+EBUILD buildbot-wsgi-dashboards-1.1.0.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.11.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
index cf9810a5d1c1..6251d77f951d 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.11.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index e795cc3b6283..b4af8fd78506 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,11 +1,9 @@
-DIST buildbot-www-0.9.10.tar.gz 693452 BLAKE2B 4f66046bf2ef7d016c020a6f3582dca39e1cdde0258f72fb94bef1a1f90da70ccd4064b15fdf7a507d7fed59243556da1d4e1b62f98d72acab2243c8394b132b SHA512 9ff91de09ceff6dc53619ddd7b8a233f9206b91d75f508cb82fa948451eff8146aa112bada5f1f261f3c25870867046c40a41b85a4acd3b98c00ddab76580780
-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
+DIST buildbot-www-1.1.0.tar.gz 718666 BLAKE2B 86bc329eb80aacf44c5bd01eaaf6b8f0631cb808080fe17f667f54746f841f9d88aa7b699e6083546b6e2dfb1171333ee173c484c9fdea285bdd5769d90a6528 SHA512 8e95a4faf393a81fccab225cf33ee13947cb72e441e2cfde833843838686a888cff24e45c6085d4ac431dec177d696441cb21014d172ae23b61ef70164fccb31
 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
+EBUILD buildbot-www-1.1.0.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.11.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.11.ebuild
deleted file mode 100644
index e248b15e6f78..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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-www/buildbot-www-0.9.10.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
index e248b15e6f78..d14a3d992e00 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.10.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index a6b47f51f9eb..b843bdf73680 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -5,17 +5,17 @@ AUX buildmaster.initd 1573 BLAKE2B bfd18d13345ab7dacc367867da3d0d70317250a3bec0d
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
+AUX disable-test_userpass_wait.patch 891 BLAKE2B e88d77dc41a6b5e6e7dd925433a1fdcd459cd4baa457207f0922ff640cd12533f435ba4abc9f5ccdeee5402a28bd7171212e227f1d70250f077c37d1c3e91608 SHA512 33701567ee7cba18e05ccf55400fccfdd64e54ed1f79c8d7ebe3781999f709b47246bf01b49ea0056f4a33996c6e9818ca84f222c611a9e386291e802d4d2488
 DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556ab1c0fa1433bbe76475513a7482619b05c28038e956e8724b99a806aec371961302914567fd36caccfe342daa6aaa SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645
-DIST buildbot-0.9.10.tar.gz 3112750 BLAKE2B f09b1e38a2920ae34f45d946e8d88bc525093f3da703b78d859ec5c612c14f110b5c565a2e8bd9e4885fae22d42e57080272d674725bdc873132225b84e69c8d SHA512 95b489d5f7d0bc00ae5f71cd056b36fe689c4dc9408a7a0e4b1b45e036c9074832c8e3755981520a8c85a791b50f7f40765962c12a71887198dc0bbd0140d0e0
-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
+DIST buildbot-1.1.0.docs.tar.xz 23932 BLAKE2B 81da8b86bb269efd2cd3f9146f3d9b41d64b28fdd0c878708c323d040a7e773cd277a18c82b1ef3cb07759ba8aedbc604e1de84f6477205b1708c28b6e86831e SHA512 511d244ffd205989047b4514b164e194b30fe4e0513d3bda776fb4d7a1a5bf42d8b7f00540b88e427838ab43f45686a83e556687ab75ce55eae6b834426a8ef7
+DIST buildbot-1.1.0.tar.gz 3098781 BLAKE2B 5a4ba8b641765fd58c3b5e788fc20aa1fb6195655ce2d82929f0f62ff48d20672f21efe0c413387e583d095c3ffcee1055a287016fe87ec1f3eb6b0ccdefdccb SHA512 f850ba2cd93d54a8abc97503719f93f69dfdc3d03b519e2d05c02bdc11893529eb51d74b6584555689281aedb71c3aa6c23141cf5fbc68ae97e09f1c89b2c94c
 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-0.9.15_p1.ebuild 7241 BLAKE2B e05e65c5afbcdc3490de4fa4881357dd7918e8d9c05820bada644df52a3b8fd6dee5507072685fe77905e3481941452dbacdc9054432b20402df55ee7e2856c5 SHA512 e62ca4c6c81b7d616228b59856d52bbdcad5a566f9894325db70e78027a9de5c997c80555fd1747996968e576be1349d0cc137ee13dada7394d533889557d079
-EBUILD buildbot-9999.ebuild 7175 BLAKE2B 7178b2dda29636fa499dcc1888792caa87daf6400c8b7908c9de201d0a498a21da37d7c92a131bd1cd92aceeef0aeddda31d80677e39d7a54f91cbe7b2a8ba74 SHA512 6744edc12c7ce59a045de84aa51cec75393585a5f5b41d640641a37f0ef9725aacd4ef4fe9faec160f78d509ab2e18bbae79379988f2e2e139c4d9382afc9a30
+EBUILD buildbot-1.1.0.ebuild 7355 BLAKE2B 64bdfdc519bd0771239375120e132ebf9af93aa953ef11da58b5701ac70883ffb40a11ee78fde1aa09f3d7bdcae77bf0a236b51d7fec269044525931cc09bb31 SHA512 bd5164a4f851ad5321d846de61f6b3d33c36dd43360d392ece5be4070c0391e63cac20a528000250ca5a9df8b49f78489998a31966905cbe32bb3bcdf810f1fc
+EBUILD buildbot-9999.ebuild 7182 BLAKE2B 4be27ebae4be2ef515435a10a8056fb115cfbfcdfed21802307ba83347c0eb430a9e81361891b2b23ad0e3c4a3a5d9ed37c516f6f45e6505f2576c4df4b02056 SHA512 2371f652abe32d7e783a926998ad34bef4aafa269daa8d15142b8458f1dd52fd203d3e690c722848d5d899bf9b66beb87c2421c1629072779b3d0e03ca2ec359
 MISC metadata.xml 1616 BLAKE2B cf5a0b7f346e9077dccbd4a9f1b9e95255f874cc8ebfdaec0a067f44c7c2b8015362cf590cb927f8ec87ca497ef38973a6acf5117968904c8762a84ef751cb70 SHA512 efb2ec3027be76f7d9d07bb19616ae4692acd07eefe79412f5983281db51095ad2f900155a26efafeeead403edfeb7fc0e570672f6b254bca83d5263c645d5a4
diff --git a/dev-util/buildbot/buildbot-0.9.11.ebuild b/dev-util/buildbot/buildbot-0.9.11.ebuild
deleted file mode 100644
index e0acf382b491..000000000000
--- a/dev-util/buildbot/buildbot-0.9.11.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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_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 examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.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.5.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}]
-	)
-"
-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}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-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-0.9.10.ebuild b/dev-util/buildbot/buildbot-1.1.0.ebuild
index ec293dba8932..8c8f64302bd1 100644
--- a/dev-util/buildbot/buildbot-0.9.10.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
@@ -15,7 +15,10 @@ 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"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,16 +28,22 @@ 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}]
-	>=dev-python/twisted-17.5.0[${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.5.0[${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}]
@@ -42,12 +51,9 @@ RDEPEND="
 	irc? (
 		dev-python/txrequests[${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}]
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+	)
 "
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
@@ -59,14 +65,12 @@ DEPEND="${RDEPEND}
 		>=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}]
@@ -74,11 +78,23 @@ 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}
 [[ ${PV} == *9999 ]] && S=${S}/master
 
+PATCHES=(
+	"${FILESDIR}/Remove-distro-version-test.patch"
+	"${FILESDIR}/disable-test_userpass_wait.patch"
+)
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${MY_P}
+	unpack buildbot-1.1.0.docs.tar.xz
+}
+
 pkg_setup() {
 	enewuser buildbot
 
@@ -88,15 +104,6 @@ pkg_setup() {
 		The scripts can	run as a different user if desired."
 }
 
-python_prepare_all() {
-	# Disable distribution version test.
-	sed \
-		-e 's/self.assertNotIn("unknown", distro\[1\])//' \
-		-i buildbot/test/unit/test_buildbot_net_usage_data.py || die
-
-	distutils-r1_python_prepare_all
-}
-
 src_compile() {
 	distutils-r1_src_compile
 
@@ -135,7 +142,7 @@ src_install() {
 
 python_test() {
 	distutils_install_for_testing
-
+	export DISABLE_TEST=true
 	esetup.py test || die "Tests failed under ${EPYTHON}"
 }
 
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 4d20f12a6a23..41609b453600 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -62,14 +62,12 @@ DEPEND="${RDEPEND}
 		>=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}]
@@ -83,6 +81,12 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 [[ ${PV} == *9999 ]] && S=${S}/master
 
+if [[ ${PV} != *9999 ]]; then
+	PATCHES=(
+		"${FILESDIR}/Remove-distro-version-test.patch"
+	)
+fi
+
 pkg_setup() {
 	enewuser buildbot
 
diff --git a/dev-util/buildbot/files/disable-test_userpass_wait.patch b/dev-util/buildbot/files/disable-test_userpass_wait.patch
new file mode 100644
index 000000000000..e7b9d0a59e36
--- /dev/null
+++ b/dev-util/buildbot/files/disable-test_userpass_wait.patch
@@ -0,0 +1,24 @@
+From e24640e1043fe8914a2b86842645604a3d9e9698 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <brian.dolbec@sony.com>
+Date: Tue, 13 Mar 2018 19:59:13 +0000
+Subject: [PATCH] disable test-userpass-wait
+
+---
+ master/buildbot/test/integration/test_try_client.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/buildbot/test/integration/test_try_client.py b/buildbot/test/integration/test_try_client.py
+index 9bdc7a63a..48fcb1573 100644
+--- a/buildbot/test/integration/test_try_client.py
++++ b/buildbot/test/integration/test_try_client.py
+@@ -142,6 +142,8 @@ class Schedulers(RunMasterBase, www.RequiresWwwMixin):
+ 
+     @defer.inlineCallbacks
+     def test_userpass_wait(self):
++        if os.environ.get("DISABLE_TEST", False):
++            return
+         yield self.startMaster(
+             trysched.Try_Userpass('try', ['a'], 0, [('u', b'p')]))
+         yield self.runClient({
+-- 
+2.13.6
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5040d4d00300..2b7aee82246b 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -10,6 +10,6 @@ EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3
 EBUILD ccache-3.2.5.ebuild 2087 BLAKE2B d821a440198a055654f6961d9624d63a1c8cf854f7392232807120b52a74ba3665770cb53924e816e689def5ea9d85c8112678a71807b87a67252cfeb748208b SHA512 82ba23cf1be894ad9232069fadeee4fc8f64607e673eb7bd1edbe560e9ae5ec3feed5d009ee3061a605f4460dbf75a6af375f9e42af8b932b4270f6f8a2323f4
 EBUILD ccache-3.2.7.ebuild 2087 BLAKE2B d821a440198a055654f6961d9624d63a1c8cf854f7392232807120b52a74ba3665770cb53924e816e689def5ea9d85c8112678a71807b87a67252cfeb748208b SHA512 82ba23cf1be894ad9232069fadeee4fc8f64607e673eb7bd1edbe560e9ae5ec3feed5d009ee3061a605f4460dbf75a6af375f9e42af8b932b4270f6f8a2323f4
 EBUILD ccache-3.3.3.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
-EBUILD ccache-3.3.4-r1.ebuild 1874 BLAKE2B a411ed50a7c5da31a7ecc73da2ef2f628c3b52569c8de6d8dd709e79a8fdfa88c0cda8bc252261a6176357d6e259a4705e9d9508e6be49879010a60aedb4fe35 SHA512 02bf29ef2c982d35271e94bbea00dbf79e3fcac8db609e957088ed3d713b878965d7a68ec553d2c63b6b72ec29499adf9acb5e496f1105732f8c5f3f81b53f30
+EBUILD ccache-3.3.4-r1.ebuild 1898 BLAKE2B 618912ceed8c51c661131e4aee65ddda6ecd67646e65bd6a085453f68829e6e772295b011428e5c833e9e4ab813972f5ff40388d30f1422daec9f02b4576185d SHA512 1ec0363f8c54f4745a158302711cce10ac0a12da67e04fd1e96ff5fa48e6efdd56bf666f98aa6f963c86ef80ec6896cebd7a0fa87cddc96c7205d4fe6dfc66c1
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
 MISC metadata.xml 524 BLAKE2B 1c34a58dde9b1d3b231260ec8bb2a29d7a40450ee8b6318f21ada5b06a28084eeb9487ad6ec89bc2c66a6b4b55b14fd25b95082c57e8f8c7dab87f6c9d230443 SHA512 e26bbf57cf488e7d750f9f1e14b2f22b60df8c3b2a0eef6973fb0e8e6a2ef358cdf1aca10b5716c260c31adfe0c0a630d218253e998fb70ef6eea272853465da
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index 54a44acd180a..383a16a45f6d 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 6f9a5013bc59..82943d4b18fe 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,8 +1,6 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
-DIST devscripts_2.17.10.tar.xz 706396 BLAKE2B 711a991bc958782e0003fd32b947dee8df829d5a3e24268160d1a507b39dea34d9e4ead3999103850c4388f2e4185f655c09c8d5f25d422107bef18eee9d0498 SHA512 eb2bcd29237696e0e768d2513fa895891cb2b368c41c6d611ad7db815400b22317324b8326d4e71b1ab511a8a7abafdf0a2f2641da955034ae58b3d4aad3fc77
-DIST devscripts_2.17.11.tar.xz 708508 BLAKE2B 54f9fccf54a760da1ce9619117040033510a48da815380f0e05beb4fb44a5d8ab9b959328fea11665b66ea36ce56a7810ac52a4010768a8ccf9753c4337c0703 SHA512 bcce427b551ba1ee19b794e4a8243ae6c8efdf7fb6f108b7cd0e43a93ce9a12bee99800fc40c2b8a2bbf6451adceaeadf6042752fa2e404cad2d014ff03474bf
 DIST devscripts_2.17.12.tar.xz 712676 BLAKE2B a0d04f042d5337ab89e5cdb7f16b4de306052e1f7517ed05ff7fab447d8425b44a37941e7672c69f36ce93b3c73c06d706bb6c0e8c0932d626789b0d141193f1 SHA512 21de10d8742c3f2c3c83fc2660ccb7aed112e78c7a7857de62c0fa1b84d7c03a9e488b60a291e5529e3c5632c3f5d206dc11e88ac133a7e84632e1885041e3c5
-EBUILD checkbashisms-2.17.10.ebuild 893 BLAKE2B b193886aa15f2deff05f513dd624bd72c00b8bcdb859ebb035abcc15ea711d034c06105d160bb851602c3ce0729ef30940aa1fdc7ec89d88d25be3141b806f7d SHA512 e4b7e855f6968adf3408c2ac96325833100c63c5ca51e9b81c0d4f679fa8e0a5e53a1ecb13b6f9dc643356ae8591da336d7fbb1bbdaca68809db9f63e8880e2f
-EBUILD checkbashisms-2.17.11.ebuild 895 BLAKE2B c2edf098e6795cfe7a59a2b73c74446886a1f120450a35469d85337c18bc6e6575c23ad52dd69f9e3cec2e0fb1d2d5184bee14de0d18d2720142829af48ad4c2 SHA512 6ae231efbf1bae391b85ca23bf231c66205bd4349014ececb8d22691882d6dc6593787745a79eb686238df10f4921daa41b65b7fc3438cfbd975f0a39ee0f986
-EBUILD checkbashisms-2.17.12.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
+DIST devscripts_2.18.1.tar.xz 720156 BLAKE2B f6e7667b46796b395a3d46b1ae6cacc9d4cf59c698f5ccb695c030b3ce99a9dde86c14aef385707b5a8d8ce688981bbe882ff97ffc81237f5cc7029e9293a73f SHA512 d2043b1e399cc0eece2eb9023b9b93480cc0bf270fc7dae45d1ba7eae0744e74cf0dce286787f7a30b4aafbe85e7ff282ea71f29f3cc011c9ef05e626cf03b22
+EBUILD checkbashisms-2.17.12.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
+EBUILD checkbashisms-2.18.1.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild
deleted file mode 100644
index 61b10af9c25e..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.17.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
index be58ae776f20..bc30ea8cdf00 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.11.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.1.ebuild
index 8524418c7c9a..be58ae776f20 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.11.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.18.1.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/clinfo/Manifest b/dev-util/clinfo/Manifest
index f18f648abfd5..4e3023066778 100644
--- a/dev-util/clinfo/Manifest
+++ b/dev-util/clinfo/Manifest
@@ -1,4 +1,6 @@
 DIST clinfo-2.2.17.10.25.tar.gz 32992 BLAKE2B aedc6c48e557ca1222caa207a1e916f3d8e2d3666379c25dc8f28bfdbc74fee0d0918d0e5a84fd830a99cb5f09cbe452ed9329d44706783277d70600dcdd5c76 SHA512 9b035fb9ee052a8cff517032db70d16c796c3a2b82fefded5805dd7b012472b1226fc634d8b9e890be604f26f959a2a7438966158e2ccfc9e27af1fc03971c46
+DIST clinfo-2.2.18.03.15.tar.gz 35465 BLAKE2B f6a713b8e1af7ad048335409996143697f7bfea742bab979a7999a02fbbdb83f744dd4fc636877d083028177210a9b13012af0c8b47fc676b7711fb5d3d1e7dd SHA512 fb0a38d14c9416dd82df4f44e6f66ded7156211f0ad65c9ac141df8d0d1e80bc003e5ee9a2206925a40b89fe278a1c6bd2880805dac745947f0ef324d5edb885
 EBUILD clinfo-2.2.17.10.25.ebuild 615 BLAKE2B e581a78d4ac248773a072ab3e762c807722aa98057e1ab6783ea0a47d56b4775e8ddf0c85fb7aa6bf88d5414330ead6415d6b4b86823da6f7f5299ebed29348d SHA512 5ad16119e7b770fd14e0497e8e847b4acad38fab5f866bcbaf4c6457aff1f93e056f7a1e128f71683a6d6cbe30b1c91f4a69c0d0ad60f7098fa2d5ede4da066a
+EBUILD clinfo-2.2.18.03.15.ebuild 615 BLAKE2B e9cc4a1c1140492cfea9b7cb101bf3f691bc30a6d9cd2929b9d0bae9e77977c493b5f0355c93c3ebeafde8aadcb53dda048aec68a44714982291cd560caccb52 SHA512 2d177e18523275a27c0bc31390a354376948d57368302e9d3b3bd44c50ddb5fceeafd40f7004f905ffa4c9cb175dddd2c0116dda98d2fbce1f2d0c715eb1ac19
 EBUILD clinfo-9999.ebuild 615 BLAKE2B e581a78d4ac248773a072ab3e762c807722aa98057e1ab6783ea0a47d56b4775e8ddf0c85fb7aa6bf88d5414330ead6415d6b4b86823da6f7f5299ebed29348d SHA512 5ad16119e7b770fd14e0497e8e847b4acad38fab5f866bcbaf4c6457aff1f93e056f7a1e128f71683a6d6cbe30b1c91f4a69c0d0ad60f7098fa2d5ede4da066a
 MISC metadata.xml 327 BLAKE2B 92f019eb0500214ac6f345ee38aeb8df84ebf69a503fcb9dc3284e23d9badc20fbd985aa9f60df6b4d9f515027a4e973b2439c568b0a63f5acac2be97de04dfc SHA512 20261dabbadf6a93f4b4a7d65c917872de7b81f689e111a3ea0076a066201eba82b2061cf5ae9956c00f5d6208bd4dcc922c72a3feb2643aedfa2dc998c0bf21
diff --git a/dev-util/clinfo/clinfo-2.2.18.03.15.ebuild b/dev-util/clinfo/clinfo-2.2.18.03.15.ebuild
new file mode 100644
index 000000000000..7a1b5ce68d4d
--- /dev/null
+++ b/dev-util/clinfo/clinfo-2.2.18.03.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
+HOMEPAGE="https://github.com/Oblomov/clinfo"
+LICENSE="CC0-1.0"
+SLOT="0"
+
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 07a632e578ed..a94ddfb404d4 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,10 +1,7 @@
 AUX 50cmake-gentoo.el 244 BLAKE2B 1a6c7919b020b3e590a67a9a37f5afd7a56e9970274987cc785f5d5ca78e702a4387684441a68d111a2836eaa76be8ab111b03d81784acbc701b8ccc726f9a2a SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb
 AUX cmake-2.8.10.2-FindPythonLibs.patch 990 BLAKE2B af80335e802c198287315da4ebce193d81ceec00a1e13ec084b80bc3f3df5fb9158765c3bc02d4ed9f6972b77e66c712dd8292c12aa4aca78d178e96943639ee SHA512 c2027439ef5f53991f99db4c60f62e0164641ffce58bfbe0dd9a0b4f93f8b96f6f6e30715a3ab57a47ea7a85d7d784ad602ca74ce88b5bca1a08c538dcc9676f
-AUX cmake-2.8.12.1-FindImageMagick.patch 1704 BLAKE2B 6ca77ae11d4ace3cc7177f4dcd6f78d4071ab3b13fab6e57b2f46030f009ec6c6dcdefeacaa550f340f77e307f8f43ad3b5df99ac2cf57606aacbe2a7aa4882e SHA512 d27d80a64a19f428cbc50e4c82330ed841e41787669a3f58565e7ade1e208938a35b35e14788b45bfca22aa2fa151655c9bc1bed9c3b20fedf7f71df45083408
 AUX cmake-3.0.0-FindBLAS.patch 1581 BLAKE2B 62493ac0ed23748be1913a919d88937c929e29a587a880335caa895c3e9046577f7978c6d85d3ed37762932b812aca407339679c4b917cceb85323130d07e79c SHA512 c73533071df93975a2dc9ba1e17fb16bd396ec816ec9b2b4b714923ea6db606baea82c378bb50d7bb9d918e54c661489265e1032b24d03b2ba924489d01510f7
-AUX cmake-3.0.0-prefix-dirs.patch 4279 BLAKE2B 86f5b3a0f79c4126aa105eb27887b7bc4721360af596b2f0487510bb14454e4618e3230158373f836be6bdd388e4df8fb073558ae1f0fc6b373ea84eddae4cf5 SHA512 f90b2114aa84509fe3763d5c2d29460c84334aedc48f1856e646d7118a80ece72b57084f9ee7e8669ce59d61337d967e8d01f6a68b7d3580f2230a804a0ab2ee
 AUX cmake-3.0.2-FindLAPACK.patch 1369 BLAKE2B dea4b1299253ae61a24794de0168e869b7ae2f97392229905f47974deab148ba77eac04a6f77574be8a161eb673fd88b28187597bb9d47efd772a3b3177eafad SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577
-AUX cmake-3.1.0-FindPythonInterp.patch 1045 BLAKE2B 5421ea6600f6b47a654d7dbd5571d284eb2b2c505cb57c0d5862c859f9e6d61fa39ccd19467dffdf8f7200b469ec9e058e0e5bd8d608ff98dc02cedc18f5f85e SHA512 ec89a5589b70427c5d8d7a7b23ee87e3b437973081595f6387b5e7d902014b089f85b3634a906c5aa688726ff0f7588c7fb06161009e044813553c03409cabc0
 AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f0136312dcd0fec065ba76fa0b6a9f1f3e4ae0139af700494951d999bdf2eee57a5c22db5516b8b8276f4d8be4395f2c4cb675 SHA512 0cbb55f8f5458e72b1e465577809287dcc270636aef192f039eb1e48ef78b933a7290f81c6fefb0dd1f5eb8f9d209766687ffcb4f37c702b8317f8d2e36236ad
 AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
@@ -15,11 +12,11 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 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.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
+DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
 DIST cmake-3.11.0-rc3.tar.gz 7947100 BLAKE2B e68b44e574e9033dcd9e3bd82f10047f10a228ebeea18a8220d5fbf14c0a36417fd92787eb442b49eb056ba14c7a402f895b99338ef0c20afb66c0602386953f SHA512 6678b2ec8f574b198e8b056292b2bea8996703ed5e22060c737fa5a4c43f48c1ef961e9e128add5960fdc4a4f616c4dc90102a981e63296e0deca2fc0750b936
-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.2.ebuild 5914 BLAKE2B 7320e10ee6fb27623f18227a688e87f17b909fdc75e43e30c5ce49f13378c27f5241a030c6caca6b773150f41a1340fe1053337447a98da6610f303e0596d08b SHA512 38914325ded6bb2885220e61f77b1e79a26b5fc8ceec6a972109c8d2a1db907cfdb62f48c5fdcfbeea045720c9ef85124bff794b6c61604b35f5c8260f5a4582
-EBUILD cmake-3.11.0_rc3.ebuild 5866 BLAKE2B b61aa9026eb480958f596807bb6188e0c9e20b20a4b2c0be004935042513fc8435981c0cf88100506375fe84f4efbbcd255c6b1d4fd7058be7e4265029a87bb2 SHA512 5e55b4f5b769ef7ba618eec99300345549dc99c55f324c399a625bfac726b0d064fab2bad231c3e0c0b71c4f39d445d73f2d7f67dcca19fed232d1a0d98a613f
-EBUILD cmake-3.8.2.ebuild 5702 BLAKE2B 41a2b56a1666d4f2375b7e0d2ba473b889c215340b57ef5ca4297eb10f71870bc83db16d803a85eea0204f2d931901af2484fbd19269ccd52d2b07b436a04981 SHA512 ffe83e85988895e7bacdad4db796f112a1f8888a7f9df580c1c0fce6c8b959dd568079b73dbe8f9ff605388f64de9c4a9a1e61950876f7d5b7ea3444bc6ce62f
-EBUILD cmake-3.9.6.ebuild 5954 BLAKE2B 76911fe74142a6dc7e8b87df126539cfb791ceea4ff4329bc24e8a029d54e16d339f8868256a92ee1a88f3b51f890aaf4548fbfc904f011711e1a003eaf2b2cb SHA512 c79d7dad475664c8cbe7760c03a9bb694d844ecf77e0cbbc00ebf1a6ca65f9a79535fd34867f23f7c46359520caff164e21e1c80aa16a0780267a5ca28c3c90a
+EBUILD cmake-3.10.2.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
+EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
+EBUILD cmake-3.11.0_rc3.ebuild 5813 BLAKE2B 0f9583119be7a3553911236e15fa75a66f5137855c3dc4bf6dabe36f106bd701a05dd8fcf17bc7c7bb60a3665a1907379804ea53a84a57e9e10dcbe11dcd7a15 SHA512 6ae0d21a4f8f0e52133c708b0ff2c5a8d832a729a1ca29fce2e373dec9fb3985df94ff57b01d372458b7cf3bb010005f2f86c2660d062d905d7cd3391bdf92cf
+EBUILD cmake-3.9.6.ebuild 5953 BLAKE2B db46745391e5a79484ba90e2dfa02e9dc69de0d84996b21166b53fe427555e57dbef2f37c927afcbcea9df113917bb1548fa6be15a2cce4f881678fef86ba2fa SHA512 f8f54d756d27df0d80bb2d0280af137dd41753fe999b6598fbef1a1f47fbab5e918ec4a828d7fe909ebf355dbe0956b0c746a0eee576a02df14e0fcc1c6d4acc
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.10.2.ebuild b/dev-util/cmake/cmake-3.10.2.ebuild
index af381f00bde4..843a7d270713 100644
--- a/dev-util/cmake/cmake-3.10.2.ebuild
+++ b/dev-util/cmake/cmake-3.10.2.ebuild
@@ -17,7 +17,7 @@ LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs server system-jsoncpp ncurses qt5"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
 	app-crypt/rhash
@@ -150,7 +150,6 @@ src_configure() {
 		-DSPHINX_MAN=$(usex doc)
 		-DSPHINX_HTML=$(usex doc)
 		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DCMake_ENABLE_SERVER_MODE="$(usex server)"
 	)
 
 	if use qt5 ; then
diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.10.3.ebuild
index 6e3fe9a84c80..843a7d270713 100644
--- a/dev-util/cmake/cmake-3.8.2.ebuild
+++ b/dev-util/cmake/cmake-3.10.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
 
 MY_P="${P/_/-}"
 
@@ -16,13 +16,14 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs server system-jsoncpp ncurses qt5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
 	app-crypt/rhash
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.0.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
@@ -33,7 +34,6 @@ RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	server? ( >=dev-libs/libuv-1.0.0:= )
 	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 "
 DEPEND="${RDEPEND}
@@ -47,11 +47,11 @@ SITEFILE="50${PN}-gentoo.el"
 PATCHES=(
 	# prefix
 	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
 	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
 	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
 	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
 	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
@@ -59,7 +59,7 @@ PATCHES=(
 
 	# respect python eclasses
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
 	# upstream fixes (can usually be removed with a version bump)
 )
@@ -150,8 +150,6 @@ src_configure() {
 		-DSPHINX_MAN=$(usex doc)
 		-DSPHINX_HTML=$(usex doc)
 		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DCMake_ENABLE_SERVER_MODE="$(usex server)"
-		-DCMAKE_USE_LIBUV="$(usex server)"
 	)
 
 	if use qt5 ; then
@@ -197,8 +195,18 @@ src_install() {
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }
diff --git a/dev-util/cmake/cmake-3.11.0_rc3.ebuild b/dev-util/cmake/cmake-3.11.0_rc3.ebuild
index 61e5d0065112..243428612cd0 100644
--- a/dev-util/cmake/cmake-3.11.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.11.0_rc3.ebuild
@@ -17,7 +17,7 @@ LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs server system-jsoncpp ncurses qt5"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
 	app-crypt/rhash
@@ -149,7 +149,6 @@ src_configure() {
 		-DSPHINX_MAN=$(usex doc)
 		-DSPHINX_HTML=$(usex doc)
 		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DCMake_ENABLE_SERVER_MODE="$(usex server)"
 	)
 
 	if use qt5 ; then
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
index 3f7c3c8b3dc9..5debbd53be5c 100644
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ b/dev-util/cmake/cmake-3.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
deleted file mode 100644
index 0c42303955af..000000000000
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Modules/FindImageMagick.cmake
-+++ b/Modules/FindImageMagick.cmake
-@@ -147,17 +147,17 @@
-     )
-   if(component STREQUAL "Magick++")
-     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
--      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
-+      Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
-   elseif(component STREQUAL "MagickWand")
-     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
--      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
-+      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
-   elseif(component STREQUAL "MagickCore")
-     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
--      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
-+      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
-   else()
diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
deleted file mode 100644
index decfb91260aa..000000000000
--- a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 19 Jun 2014 00:08:13 +1000
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
-Updated by Chris Reffett (cmake-2.8.11)
-Updated by Michael Palimaka (cmake-3.0.0)
----
- Modules/Platform/Darwin.cmake    | 12 +++++++----
- Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
- 2 files changed, 29 insertions(+), 26 deletions(-)
-
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index e25df1e..9b22a6a 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
- 
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
--  set(CMAKE_FIND_FRAMEWORK FIRST)
-+  set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
- 
- # Older OS X linkers do not report their framework search path
-@@ -156,6 +156,8 @@ endif()
- 
- # set up the default search directories for frameworks
- set(CMAKE_SYSTEM_FRAMEWORK_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Frameworks
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-   ~/Library/Frameworks
-   )
- if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
-   endif()
- endif()
- 
--# default to searching for application bundles first
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
--  set(CMAKE_FIND_APPBUNDLE FIRST)
-+  set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # set up the default search directories for application bundles
- set(_apps_paths)
- foreach(_path
-+  @GENTOO_PORTAGE_EPREFIX@Applications
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-   "~/Applications"
-   "/Applications"
-   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 20ee1d1..3481ca8 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
-+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
-   /usr/local /usr /
- 
-   # CMake install location
-@@ -53,43 +54,41 @@ endif()
- 
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # Windows API on Cygwin
--  /usr/include/w32api
--
--  # X11
--  /usr/X11R6/include /usr/include/X11
--
--  # Other
--  /usr/pkg/include
--  /opt/csw/include /opt/include
--  /usr/openwin/include
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   )
- 
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # Windows API on Cygwin
--  /usr/lib/w32api
--
--  # X11
--  /usr/X11R6/lib /usr/lib/X11
--
--  # Other
--  /usr/pkg/lib
--  /opt/csw/lib /opt/lib
--  /usr/openwin/lib
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-   )
- 
- list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
--  /usr/pkg/bin
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-+  @GENTOO_PORTAGE_EPREFIX@bin
-   )
- 
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
-   )
- 
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+  GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- 
--- 
-1.8.5.5
-
diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
deleted file mode 100644
index bb3ca9580ad9..000000000000
--- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -75,6 +75,11 @@
- else()
-     set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
- endif()
-+
-+if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+    set(_Python_NAMES python)
-+endif()
-+
- find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
- 
- # Set up the versions we know about, in the order we will search. Always add
-@@ -99,12 +104,13 @@
- unset(_PYTHON3_VERSIONS)
- 
- # Search for newest python version if python executable isn't found
--if(NOT PYTHON_EXECUTABLE)
-+if(NOT PYTHON_EXECUTABLE AND NOT (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo))
-     foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
-       set(_Python_NAMES python${_CURRENT_VERSION})
-       if(WIN32)
-         list(APPEND _Python_NAMES python)
-       endif()
-+
-       find_program(PYTHON_EXECUTABLE
-         NAMES ${_Python_NAMES}
-         PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 95e2d20b5e21..ef653f170ebc 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 1305 BLAKE2B 5aecff45e4829b32d3404c81f664620a54a2127bf066ef3af51e9be9ec3b70d4f5b18c674bec23d1b061f32af4d4346bef508ec0cf9111c94ebb7f2c7b01cd0d SHA512 cb018c694e4639888ff696c72b9df895de46946a0849668b3ccce9d6dcdae8193bc84cbf7ff2a0ccdd75108c8b4358d76cfe547dc8849cfa22c69ee42f8d3223
-EBUILD gdbus-codegen-2.52.3.ebuild 1315 BLAKE2B a6c171127ff6988c957ed5307fb7c15820fc838d45a07bcfcb3dd09c6b0bd92990375dcf7349f3a9b0f0510bb72bbd8cae01a98feb22912b91efb97e0a63b131 SHA512 213feed28fb6a189349dd22695e8aa8b760f29125a6da255f984ed6c7d611cf430d2e257c3a7d6aeae933cda3af53c4cf4bec0185d1625e2a4cdd339ba56332e
+EBUILD gdbus-codegen-2.52.3.ebuild 1313 BLAKE2B feea720780058dd1f086d7142cbcbf8ffbbd40ede7667a8f1e95f9a17ffdc4ce75acd524d269d9dfa4b6649d9f49d48e21501107745a227eea1311041fd68e12 SHA512 6a135d73e6a2d02ae545f617b3d227c6e86737374b4611034c4d9868c3cd266038c413a1281ff6fcb3dfa65813a389ee0428f740741c8d77e970f414f535fdc3
 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 c8f5dfb5a11b..11a5b9640c4b 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 ~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 ~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 0431060bfa0e..3b82e78ce884 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
-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 2392 BLAKE2B 44f4c14c8f2bfa60c25ce891f658f9b4810d4c24edcc710764bb1a7f2de60ba5bf4130223bd7da38dd1c2f44345180af4c080bc522864bb21119611d9deae6ea SHA512 8ea6d247226ebe663a42e8839f03b5f9c796b9ff62c0f437b4d14f764584695d4bba7bdcfd583644b01eb159d2f8fa58b85ff8418dadb866b474c66d03265f57
+EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.0.ebuild b/dev-util/glade/glade-3.20.0.ebuild
deleted file mode 100644
index d2a03c7b833d..000000000000
--- a/dev-util/glade/glade-3.20.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-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"
-
-IUSE="debug +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
index 15cb62ee2014..fcb9aec14d78 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/gyp/Manifest b/dev-util/gyp/Manifest
index e32492cdba80..dd17b82640f3 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
-EBUILD gyp-20170904022846.ebuild 901 BLAKE2B 93336b86c9b5cd4db2d9321111015b90066d8aba2db41465e10d1d78d63113b5cdeec7dd3c4943eb262fe7a3f7070cbc0f6f2a176cfb2a0d0aec043d96bdf1d7 SHA512 b7c05f33d2dee45a28f26addd3264e5971250ffcc17888be2dc6484fdc85bace46cfdc73ea847ba3da824e33a6e111ba1a10801ac04910b0c940867d9b16ff53
+EBUILD gyp-20170904022846.ebuild 908 BLAKE2B de2be8153c0b4b133f18027a44b203f5e1e9e7ece1737df0afb506f58f53366593e80b99d916436de25543484023a69896a42342f06bfc7ed7df06edbb327400 SHA512 a3051093de1d80548199710fbdd8e9858ea06d094ebfabfcd0542f219a758264afe392226240ac9378822ee31a1649cb7c5a82831483a9920dc580916b80a4ee
 EBUILD gyp-99999999999999.ebuild 892 BLAKE2B bc7cd85cf2fe9f1f6262bd7d1e064853dff7a4f97b9fcf1d9cda47e6caed487117ea389eb26ed5d25af0c6aa4d51b2db4ede47343906ca6c0ed4ef77b2dcb0a5 SHA512 7df9e1d53c73e3e256b4abf9ae71f91ac9105102e41a8f5bec5ef2921f96b4f88c0a2264a7727a55d4de95ea81d84150ecd0aa456cfef02200703fa3392ac6c6
 MISC metadata.xml 273 BLAKE2B 287fddc66f0f3a2547c1d7892ca0ca381ca3f90c0a24935119d1cf30b0a2be976d20ce00b92f720fb58cec08d6b1147dee207bee998d17c80638c8a6a95d7a63 SHA512 52d2bba092d7ed694e06c90dd9cfca1a0003e34fffc0bebb25fc4262f5b6b2ae8903454f7d406aff28d40c9ffca5157fe021701cd60ac1fbf7a7b24215578341
diff --git a/dev-util/gyp/gyp-20170904022846.ebuild b/dev-util/gyp/gyp-20170904022846.ebuild
index b1cf14a58db5..d5f888d0b40b 100644
--- a/dev-util/gyp/gyp-20170904022846.ebuild
+++ b/dev-util/gyp/gyp-20170904022846.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index d0d33c21a354..277e5c607970 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1,2 +1,2 @@
-EBUILD heaptrack-9999.ebuild 1037 BLAKE2B 78faedabf8b7b103d3bbdf1bdc35d5bf5a2849586211fc2d73c981b0a08d26f9c313edcabb367542a3db51ebb62f6008dde30b7e6fa5227efcbe2dc2139b8535 SHA512 f59d81d5e274e524c26be069ba4b7945ccb7939d851a7b929b3c9566c132e6ad04d0295074ab9c10461e29226c62835e2c1199e4a217354db1fc02c9326fc915
-MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
+EBUILD heaptrack-9999.ebuild 1113 BLAKE2B c686273439df3c958822a2f8e324080d9df31fc3dbcb7a92f85708d1f3066e7ca315062f0c04176b7b9f5098bbc166d6160ff4cb978d9abc93362bf47c39038b SHA512 769ff6ff8ada4f22d4dea0d63d543f83fe56c8a00b9e09362c69591f09e2073924fa817a1a05b55449529260d51a3cc21526c5ca8493b90592744c1154696ff9
+MISC metadata.xml 362 BLAKE2B b810739db5ac019dac18f6bf1bcc5f1cc2a26ef076545b96572a3c9c304f115bfa3250293596aaabe56719cafcb1693e63e95dc70caadd9306d64f134fee864a SHA512 0b6416c3084a693617745c2faaa8af4f72540de549d52e719413ae90e467a95912044099705d6bd39517abb56a569870b4ea92201a98dc76d25da013e3774c27
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
index 45bb021ef3ac..cfcb4fc58229 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-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
@@ -13,7 +13,7 @@ HOMEPAGE="http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+qt5"
+IUSE="+qt5 zstd"
 
 COMMON_DEPEND="
 	dev-libs/boost:=
@@ -33,6 +33,7 @@ COMMON_DEPEND="
 		$(add_qt_dep qtwidgets)
 		dev-libs/kdiagram:5
 	)
+	zstd? ( app-arch/zstd:= )
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep extra-cmake-modules)
@@ -44,6 +45,7 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DHEAPTRACK_BUILD_GUI=$(usex qt5)
+		$(cmake-utils_use_find_package zstd Zstd)
 	)
 
 	kde5_src_configure
diff --git a/dev-util/heaptrack/metadata.xml b/dev-util/heaptrack/metadata.xml
index c6bc2d94015a..afa56cb84284 100644
--- a/dev-util/heaptrack/metadata.xml
+++ b/dev-util/heaptrack/metadata.xml
@@ -5,4 +5,7 @@
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
+	<use>
+		<flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
index 7416edf97cf8..8951808bfa66 100644
--- a/dev-util/hxtools/Manifest
+++ b/dev-util/hxtools/Manifest
@@ -1,3 +1,3 @@
 DIST hxtools-20121125.tar.xz 287716 BLAKE2B 66c125e4db14b6a6adb49e0d45944969f6c4a4a238d58a03a2d678eda3e5f8bec002c3fa401c1c9458b4840816a0cc3c357e9e5c8c5ed6a062309785c51ec1a7 SHA512 fa15331d8c961b0a3b1a99f592e2b4f9b0531ac294a2fef0f9a5067b5e427ca57e0c62798b1048a1d6005c9655af45136636255f684a129bc997864e8c7c4915
 EBUILD hxtools-20121125-r1.ebuild 565 BLAKE2B 62d9727f59390c97157e8685cd9be53d1883d52739bdd76a5c171fe4c3c7af3ffdef772700ec45922cc10f1b9b5d8d1eb3cfd658eaca84ea679afe484f25789b SHA512 4f886b9deb4741ce55c83ebeadadf0225444f8809fb3d07ede72e9125d4e840506a0798cce98e8bf1cad55f68673c8a8cbd57da868c71f871706b22847683f91
-MISC metadata.xml 232 BLAKE2B c631433a9b129e3e3b7cd485e9ec345264bf2f22f7f64193d5955987c5b44339d36356c8e17c2ded1c8f771774a0811ee41f12ca699a947bf2faf183805c4c1b SHA512 23824ca618f16dec558197c0c853f3ebf5c0f1b034635242282bd40f01beea59cbac3b416e86f2eb4337942d9db945a2e1fd4fe52c88762b65749855762769fa
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
index c78052713743..097975e3adc2 100644
--- a/dev-util/hxtools/metadata.xml
+++ b/dev-util/hxtools/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-util/icemon/Manifest b/dev-util/icemon/Manifest
index b246365cda60..226646c48cf8 100644
--- a/dev-util/icemon/Manifest
+++ b/dev-util/icemon/Manifest
@@ -1,3 +1,3 @@
 DIST icemon-3.1.0.tar.gz 111139 BLAKE2B b37f17a34237e76cd3f7aaad88de903d1a3ac4aec9478613dbfbaab950eac36af33f49b97330a7c7d0ca06ab9bc56d25960142f7149a198acc2c5d35b32faf09 SHA512 43b5c959cd66fa65cac25994e5b8f26646b49b57405bd80d6ddb12cc7ed5bfeb5f91f5816900883078075685c25159f5a19b3198594027b3a1b8b0c489237b39
 EBUILD icemon-3.1.0.ebuild 683 BLAKE2B 049ad4d9b302a93263225cf8d7ce177fa821bd146e64a82d4d59792c4f3ec7af539b74c7be976e9ae9cacd9ac22005ccfbb72a331aae2632ba6490891b24873d SHA512 dd6c787bf92df7fb1028478882e2c3ca6603fae7dbce35bd3a952122e155607f1928f106b88c4d4398df2432b91df664086b01c56aabc8013aebab79d1f0d934
-MISC metadata.xml 346 BLAKE2B b9e87b91a519f00f46720e33811faacfb461ab9a3fb8e570c508976f78d1cc054bd83a919cda29a977b99bdcf2f586760d20a127fa2063ed2729151ebec8b6de SHA512 a5ddba80d3f325a9ad2855b0cea1af495e8e0e8b6aba731bb8765f7b3c54bd49dd5130d6860c620f56fa00b736c6298b5392db0f30d589edd807207eaafe0e7a
+MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/dev-util/icemon/metadata.xml b/dev-util/icemon/metadata.xml
index f0b707735d33..4a09d7ba8d61 100644
--- a/dev-util/icemon/metadata.xml
+++ b/dev-util/icemon/metadata.xml
@@ -5,8 +5,4 @@
 	<email>cluster@gentoo.org</email>
 	<name>Gentoo Cluster Project</name>
 </maintainer>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 90989193804e..26dad8db5103 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -8,7 +8,7 @@ DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
 EBUILD lldb-5.0.1.ebuild 3015 BLAKE2B 24c75d15e2898cd209df43f137b3e4fcad6ebbaaa0e66c9611d5a6cdd8666d5935c834ef3fd1fa02303c33a73e33f189b8bee25158dd5149222048f987f7f3bc SHA512 1773bab52a4794dc412ac3ac76eea3fdf1dcd2515009ba77b560c5972c44d0275a300206457cea89f4de08fc0103afd9a988404873d1d75b765e0460481c5436
-EBUILD lldb-6.0.0.ebuild 3106 BLAKE2B 92fdddba2d38d5678354fd831667a750a1ea11f071721a631d5b21a714149a6176e7e5dbb59e7cf4dbcff4d91b432ece3cafa204beb8812400eb43ff31b95672 SHA512 dbd52ae429f3176f542480466f5ebceb4bfb1efd81d2437a27e7f47aac4b28ee9660c0aa57b4d354b86567e74e6a26c95832f2c6ac7064b1d8345f027bc56cb4
+EBUILD lldb-6.0.0.ebuild 3113 BLAKE2B b5890afb5e652596b59ff558e5860869312f56e86f32c90f7f116300acea3717fe5522ec2d17c99ee90d74a5023cf98f5d3aa903b1ac2dbfe3a0060d85785ea6 SHA512 f50a83530a3fc71796b1ba92a72ea9ac2c50851fdbbd3f10b4736612079c91de7e1d689c4cd12650a73e3d07763952c87e9cdfd98d566f2e690d4de6830d5785
 EBUILD lldb-6.0.9999.ebuild 3063 BLAKE2B f0f2d6ba27ca4a94fcc5b63fbce6fe4cbba7e1ce98a56328af202c2bed290060986a9ad67934a3c24bf7085d6f058c10a594ea01c43b8ee6a1f1f66877381491 SHA512 15d0d4ba65c4a8c5eaf75087156eb4120c3552f5431e2de1c6da4767fb22e341aa0e4cf8ffeb309245cf2e088992828c9e3dff75fedf3e5b983563c3a811e135
 EBUILD lldb-9999.ebuild 3014 BLAKE2B cc865e54b690f663feced5456902d5037ac9549892116b6cb04e1fbda0f230769eb9c458ac080c37ff1bac248a9eda830b17baba50a211a6944a4c6d50820435 SHA512 60ea6864990a66c40fc9c537decca2d723684eb88aae248b7643a1c523b70b5207b34cc1c1e70cebf9680707b50b953d5e4b2f43438a0d356282679c98778c3d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-6.0.0.ebuild b/dev-util/lldb/lldb-6.0.0.ebuild
index 09ffbedd6974..d3ebcd4abd0e 100644
--- a/dev-util/lldb/lldb-6.0.0.ebuild
+++ b/dev-util/lldb/lldb-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libedit ncurses python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 57fde51991e8..38632de9b4b3 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
 DIST meson-0.45.0.tar.gz 1161584 BLAKE2B 4344d2eaa9f6242c69fa94603b948a43bb32143791aa9ebcb1e8ec4504af76696bca5b6da903551b4511ab498c4b5a8df4d231c965b304396224c646323d18f9 SHA512 9bc08655e113dc09857a71fe17bb3101d7aea625b65ae73054b0119069af71028d3b46ceee9f3a4eba02f5d21dbfab533c7c113c416881f213fdf01d452037e3
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.0.ebuild 931 BLAKE2B 032ee5fd18aa26026d4bd29ccb774a296fba40758563ffdc93f33640889aafa2513ee199e34a1e26e5876e3c415bf1849f367d62b8dafacfbbe0e980bcae75fc SHA512 e07343baf2ba70b4e566f0ac9b6b7cbbf71465568f3a81dc2c38b4ac224d7832e06983fa092139bb2f2fcecdc0af14f19757ea92bae2cc16573a96afbb439fbe
-EBUILD meson-9999.ebuild 931 BLAKE2B 032ee5fd18aa26026d4bd29ccb774a296fba40758563ffdc93f33640889aafa2513ee199e34a1e26e5876e3c415bf1849f367d62b8dafacfbbe0e980bcae75fc SHA512 e07343baf2ba70b4e566f0ac9b6b7cbbf71465568f3a81dc2c38b4ac224d7832e06983fa092139bb2f2fcecdc0af14f19757ea92bae2cc16573a96afbb439fbe
-MISC metadata.xml 443 BLAKE2B df3275dde920dd96d5a078c34d08793d7e377a64910b30b6620a4365a61005d63ba2dfd630191765c47b52e9b309d95dad18d86a10276308f4253c5faca078cf SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826
+EBUILD meson-0.45.0-r1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
+EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
+MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.45.0.ebuild b/dev-util/meson/meson-0.45.0-r1.ebuild
index 07877ea87db0..37aab5a3b433 100644
--- a/dev-util/meson/meson-0.45.0.ebuild
+++ b/dev-util/meson/meson-0.45.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 07877ea87db0..37aab5a3b433 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
diff --git a/dev-util/meson/metadata.xml b/dev-util/meson/metadata.xml
index 8f23b803b042..301e400a3dec 100644
--- a/dev-util/meson/metadata.xml
+++ b/dev-util/meson/metadata.xml
@@ -5,9 +5,9 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>gstreamer@gentoo.org</email>
-		<name>GStreamer package maintainers</name>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">meson</remote-id>
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
index 3fa29d9dd077..0fa9a020d6b1 100644
--- a/dev-util/mingw-runtime/Manifest
+++ b/dev-util/mingw-runtime/Manifest
@@ -4,8 +4,8 @@ DIST mingwrt-3.18-mingw32-src.tar.gz 391939 BLAKE2B 9d0164f9292d29937bf01d7110d1
 DIST mingwrt-3.20-2-mingw32-src.tar.lzma 302072 BLAKE2B 93f5efff918e48829fe75018da53d34de1d0eeb782466e4a022740213433d634a41512f44a90676e4bbf8476e81e74ec1785ce127a2c217c755fcb9d6e9f8e72 SHA512 ffb8e3d46a4646b236b67df0d9d21571a0ee8b78125989d506c176e03922e520201770a03093f27789f0e4373bf64f69d41e377d861ddd008b5e29da65fb1d55
 DIST mingwrt-3.20-mingw32-src.tar.gz 393946 BLAKE2B 1efe539aac86ea9fb7b0e258d086a52421d0d23b18670728703ad9153fadd84b9ef50b6d1367839a3dbdfbecfe66ef431d512ca91ca6d6e6ff4b7ed865afd07e SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c
 DIST mingwrt-4.0.3-1-mingw32-src.tar.lzma 1341612 BLAKE2B 4251c5737af3c209ea0fa22b604c24ffb6b67c6ab83d13e67ffc5750334f668005f321965a3d9cdf10e93e801730758c29cf64c10541a9e192e0a3355e2abd3f SHA512 2aa429f939038c86441ccfd32b4ddd40347582557f9427df92ea7454eb5bf743b8e1aafbb627b527be755976be807f415aad3920f700d93aa86d07bf40f12bde
-EBUILD mingw-runtime-3.18.ebuild 1745 BLAKE2B d48831a39438b1b1b67e170d4c3efd97b0d1318dbd82f317cd9c58d5300bd913b057d254abeeb8d3692585766d9e0bc4aa512c88d74281d4fdba26d6d281c46c SHA512 8a772692c4fd85283de7ef0611e25789bcd3d7cf98f76c6a0e045f65b154bc3809b02960e1b80b5bf8e52ab6c5f15fd4f4c6d5b03c54e0fb77fac7e69100ed68
-EBUILD mingw-runtime-3.20.2.ebuild 1897 BLAKE2B f058efb67b87c981a45e8028bba20a1868e2fe125caadeafcd54abc5e857995cfca303e3f5d233186081c188cbffad2d515954aa23501558b7a40b7dfe27ee40 SHA512 edf4ebb0785d83557fe50c7431e254c698e14941189327a5d74d78dbded8c8923fa9e457f031b196822bb4f17f7fc1730d6eb91df04c6da24a51063fb79609cb
-EBUILD mingw-runtime-3.20.ebuild 1825 BLAKE2B 7e6225ddd64235592f791e2da942d8a817686c59d20d146756fce127d33a32f21c45cdc3975a1186cd4651e9601f6eb444ddde887ed6dfa7ab2aa9bee9dce493 SHA512 a450b93e20df831f1ca1df19f9b6205305545ad23ec11aab5aec6172e8ee57a10b31aca5d685acb91bf794045b037de349d29b3e9dfd0b3bab31825cb358a7ec
+EBUILD mingw-runtime-3.18.ebuild 1733 BLAKE2B 1ec96e91a904cffed95dbaeaeb9dac4a6a724b2f32aa709de2f1f6e3ca87187d136c431e371c488822a6721f0d1a1db2665c2b630fe5e004b837d90ef98c9581 SHA512 e5412183abd36af48adf1c873f0baf347b65dc6b618e2b17ad5807ffb07e9815562254699f9d7e0f85ff657f76c349b172fd98e44e54569e415a38817335ccf4
+EBUILD mingw-runtime-3.20.2.ebuild 1885 BLAKE2B 23c4e547442cd5fb45f4d20ed983fe1cdb47227f441bbd33fc5cf1889d63cb46ab43792e401b337f9fbfceac0c690e2338fbf29dba0d835d717098e5b110596d SHA512 acf010d890cdac866ecbc41336de4151ab1301755b64226afbdf9039f77b93d3799c33375c49ea2186bb37d46249a8ee4217b69bb297156c132b22668ca937be
+EBUILD mingw-runtime-3.20.ebuild 1813 BLAKE2B 87d775ccbfefcdfd6aadae32ba938ffda4a5ff771bf427b1cc192f42aa6aefbf7abce52259e30ebadb56d5848f753afcf8a92f87152e0869d79c10ad0c9d5645 SHA512 12ced00fc0e1ebd1837bc9105b5dd93158894301abde6e0db77e17316b48004ec4b577b9cb6af7052858824b915293f38b5985bc6e1832ab4836209b9eb19236
 EBUILD mingw-runtime-4.0.3.1.ebuild 1886 BLAKE2B 386b09ddab89cfd318edd224ccc827bb6a77a371b4186d5e39ec7a5a67ebc46f324810c0701d6e04a6c008afc6d9eb99945a12a1dedbf8870c00ae093fa38db5 SHA512 e0d87ea7eba4fa833c2b5bde35360dfd73aa6fa10140468a4654966e6e351ebe6c21b6c69dab94660544fde168239a76fa45905e286205c972a0b6668d9d74c6
 MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
index 9a9542756fcb..dce79b05cb37 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 x86"
 IUSE="headers-only"
 RESTRICT="strip"
 
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
index 42f4f713402d..cd21a8f2e9f8 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="headers-only"
 RESTRICT="strip"
 
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
index 469eac6b9ff4..e75340a8d33d 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="headers-only"
 RESTRICT="strip"
 
diff --git a/dev-util/obs-service-cpanspec/Manifest b/dev-util/obs-service-cpanspec/Manifest
index 3d24c71a1923..a5115758e92b 100644
--- a/dev-util/obs-service-cpanspec/Manifest
+++ b/dev-util/obs-service-cpanspec/Manifest
@@ -1,4 +1,4 @@
 DIST cpanspec-20130318 2228 BLAKE2B f0a2ccc51fa083a93590ca18714dc1ae5b7e32130713cc02c0bdf5328a6f8505442dcea91d32f517a8f065c61ac6654b157267239e2e8c34e4fd4aa45941dafd SHA512 a3150811f12af16d62f4635833a92827de8bd2260ae5e43cecf65b066d7beb2aeb1323c428e379e4a53168d3c99dd9ce988b4f41ad58026a267ab9e809df7eef
 DIST cpanspec-20130318.service 986 BLAKE2B 6479dec1b4073b3bcddd124263424af076c2cf6afe500c40743eb62f82b281cdd5cdc2ef074e790a7d752ed36d3176115a972a8f966f3cd0217d787f4f1565bf SHA512 c4191060a576cb63986dc9a115e397d4f8870a6bb10ddaf642310eb6acaf0b0c3b8d803c239e401ff85058f8ca1455058c246757ab4b53a26b884cb7f4525c3c
 EBUILD obs-service-cpanspec-20130318.ebuild 197 BLAKE2B 3b0d7e84c7430cb5d26a617a405773f64d4ad4dd878d806712813ca103f96f3b409443d20837e4cb25e23d99a279e7267738cefcf6b1c7740e38680d80eaa14f SHA512 fcf4225d5a1d6fedc5b70a8d4dfd01559a8e77d55428150699d2a24a1fb8ced695e8dc6fa972f11d3b0d9c6aab4797362dcf3cce519fdea6730f35b71f28b9b2
-MISC metadata.xml 367 BLAKE2B 00ee155956ade1fc63f202b092eec05a5c27de5c71b9d652a6e5c0730f27b1179b4adead2c0260d737e5714b093d7ae9fae69887fbb8ff67dd49a3433ae4fe0c SHA512 6829a44be3d6bbb3da7533cb264206573be85362446618293441e6d9f30451932668318e2d74c47c586643463ffb9f4f2822995731df25ee187dcaa3d612164a
+MISC metadata.xml 274 BLAKE2B 49fb40acb09cdebdc2ca44050ebf3d34bb4f8c6636518c4093531f472c8f60ff951e68df44da6bdff15e4113869a2834c67411024ad04db3ee3112879e1afa60 SHA512 81e084453c2d5cd4d60d3c9d0a506f335428f4ce54dea4fba4376e3cbfee3c6ef7dca5d8f68955b55ad0ca98f9b3aa5d5d9b0975ae5ad5aeb26fe9f8ce53dd78
diff --git a/dev-util/obs-service-cpanspec/metadata.xml b/dev-util/obs-service-cpanspec/metadata.xml
index 0a8ff0aac5da..5367c1e31d21 100644
--- a/dev-util/obs-service-cpanspec/metadata.xml
+++ b/dev-util/obs-service-cpanspec/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. It's a wrapper around cpanspec script.
 </longdescription>
diff --git a/dev-util/obs-service-download_files/Manifest b/dev-util/obs-service-download_files/Manifest
index 1687b2cfe9df..31435943506e 100644
--- a/dev-util/obs-service-download_files/Manifest
+++ b/dev-util/obs-service-download_files/Manifest
@@ -1,4 +1,4 @@
 DIST download_files-20130716 6333 BLAKE2B 92daea2092ae14960b875610a3c86f6e4b733ce2d136c315df25f297795e1098f4be348374ac573393186d79b8a4210d39d2d43a7edddb20d8fd26413e290484 SHA512 2df185d535043c4652c09f8404a67d6b6e27436d01187378c21b2309bd4ea4928162dbe93a980ffc5aa212f83195facf90c602adf7984b0af7b3c14875a904e5
 DIST download_files-20130716.service 1070 BLAKE2B b6f60323ea9a82eb573a518a3b1ade41b013c2ebdca4331864f661e1dc12b65704f8d2b2428af0dee0736cd6dfd5c64ced95f9ef7183431a8cb913094623947e SHA512 3c19bc317bf4d9559d61ea388bdbb9a04fd8f3749102a52579737af9809f9dcfe045ce39feefbf08c42b52f7ca5a3d598b85609a0fb8fcefc55a7f846f13dbb2
 EBUILD obs-service-download_files-20130716.ebuild 213 BLAKE2B 435509368ee312d1b675394d53cd5f1764baed5f48b90d2e9b05d570c9533db3ecbf09dd40830cac5bcd994a444a2144938693dc8d9f44ab9dbfe85c19629c30 SHA512 db1c8f84ef118517977870295f715f662cd836b49a4a01af5a2a8e02f9fbfa297d2b9ec1feb1cbbe733bae5cc34390511b72f1b800aec4769997b31053616ada
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-download_files/metadata.xml b/dev-util/obs-service-download_files/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-download_files/metadata.xml
+++ b/dev-util/obs-service-download_files/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-download_src_package/Manifest b/dev-util/obs-service-download_src_package/Manifest
index 16f083a8e72e..2b1db83f65bc 100644
--- a/dev-util/obs-service-download_src_package/Manifest
+++ b/dev-util/obs-service-download_src_package/Manifest
@@ -1,4 +1,4 @@
 DIST download_src_package-20130318 1454 BLAKE2B 2f042931421087e12de0cefdcce1ae3fd1f5837e8f08e9d588a3d67568f026a2e0aee71e4c74915ae21a11eafd53e030ae943d8e6a6520caa971d0d02d729039 SHA512 47c83be8f97bebd9920e7ad115c5f1ef52281c2f0b11f62b31426349d9139b8a236530a7617473535dd160326de15d1f4a629017c8e47f5e8ec09e111b179500
 DIST download_src_package-20130318.service 1054 BLAKE2B 3722422eea433519a065caa4e1534a9501435e1d796910635c89b5ae8b5b9565a6077c1fb75993e658635048846d65b4cc8181c324edb2034e7fcebd23886d52 SHA512 b2f97f32ccd28e148f7317c4213523cc87adfc19ebb85ab5277ec62fa75ef603b6b4d65bd69e44f168c374ad890e28e69250735b1c9476f09a8dac89b3682f5f
 EBUILD obs-service-download_src_package-20130318.ebuild 213 BLAKE2B 435509368ee312d1b675394d53cd5f1764baed5f48b90d2e9b05d570c9533db3ecbf09dd40830cac5bcd994a444a2144938693dc8d9f44ab9dbfe85c19629c30 SHA512 db1c8f84ef118517977870295f715f662cd836b49a4a01af5a2a8e02f9fbfa297d2b9ec1feb1cbbe733bae5cc34390511b72f1b800aec4769997b31053616ada
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-download_src_package/metadata.xml b/dev-util/obs-service-download_src_package/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-download_src_package/metadata.xml
+++ b/dev-util/obs-service-download_src_package/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-download_url/Manifest b/dev-util/obs-service-download_url/Manifest
index 5f0cae415fff..d10c6a36651f 100644
--- a/dev-util/obs-service-download_url/Manifest
+++ b/dev-util/obs-service-download_url/Manifest
@@ -1,4 +1,4 @@
 DIST download_url-20130318 2225 BLAKE2B 7795c3fa273d551ff7012d4e36f8fd80868bb0da5bdd7591e78521fe455eac205559eab49e020c3e9fb013a383c53c6e80557093969682a463e8e5d6bb206d3d SHA512 70aa703d36d7e43a8533a8b6ea15fa92e01653759a86d187184a9bae272ea10fdbf25e4a6c6a70ad59d39be88e30293fb8d8b65720b80b4e2e8f739839259cb0
 DIST download_url-20130318.service 849 BLAKE2B 099876c196c1f2ff3c297bcd7f52962c931293cbb48dc976934bab36eabe6f44ada8109a95905ea0038a6f5a95992f3a2111813047878970c12cf3b4d563c4ae SHA512 b32d87e490e04e561013d9d0981674be8fc63c07575bf7a2fd7282c423fe755615547e5ef19ba7fa058b2a3803714a32cbee618aa4bedcad2fe4b9c54a7172e4
 EBUILD obs-service-download_url-20130318.ebuild 213 BLAKE2B 435509368ee312d1b675394d53cd5f1764baed5f48b90d2e9b05d570c9533db3ecbf09dd40830cac5bcd994a444a2144938693dc8d9f44ab9dbfe85c19629c30 SHA512 db1c8f84ef118517977870295f715f662cd836b49a4a01af5a2a8e02f9fbfa297d2b9ec1feb1cbbe733bae5cc34390511b72f1b800aec4769997b31053616ada
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-download_url/metadata.xml b/dev-util/obs-service-download_url/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-download_url/metadata.xml
+++ b/dev-util/obs-service-download_url/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-extract_file/Manifest b/dev-util/obs-service-extract_file/Manifest
index 39585fb9eac3..83a453ee5dc6 100644
--- a/dev-util/obs-service-extract_file/Manifest
+++ b/dev-util/obs-service-extract_file/Manifest
@@ -1,4 +1,4 @@
 DIST extract_file-20130318 1828 BLAKE2B 11fcf5be2a634c403674b02c0b174b8f6324282164f7af8f0f2b604eb114705dd542daf519c231722a9d6beb5870d9701aa56f1a62cf3730def730c457ddb6ac SHA512 ceb09d0c7f86a04ddc7389e97ba94105249488be267c998ab601add03cd6ec6e7fd26baf463b18d9422f3360b69ea73000ccbb331807b19ae7df95e468d8aba1
 DIST extract_file-20130318.service 615 BLAKE2B e5c25bc39b5a3ba247ba96e0a780b7a3b1e58a001fc84f677ce4565852900680c99f3e2ee4a50b8a5256ca8d315c89bbb5a3dfc3513792c165e857a803f35994 SHA512 e647787b83bc1f45e9104bb210d3807481f2ab7ddcc7dd4eb3c522a9dc6f94580b60a92ad5ff73a634c025438d2ccaa655ea005c26e1f214532e69f67510d7c6
 EBUILD obs-service-extract_file-20130318.ebuild 278 BLAKE2B ab7f73b178a1c6013bedbd26968ebf30b939ced6401a48b7a3c3dc78d48b9222b2ac4a6acd8f552ba3cdd5797437a0dda47e26c8147e83a87fd5e88f16cdc6ce SHA512 5790e7402588e6c9605e321809ad9bb31ac13673b591f8122c82e1295f41ebd5e5a9c20fd83646d26904915011eb7aaca4afdf707bb9b82dbe4824610acae356
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-extract_file/metadata.xml b/dev-util/obs-service-extract_file/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-extract_file/metadata.xml
+++ b/dev-util/obs-service-extract_file/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-format_spec_file/Manifest b/dev-util/obs-service-format_spec_file/Manifest
index 27baf8874356..00e51d27ed4a 100644
--- a/dev-util/obs-service-format_spec_file/Manifest
+++ b/dev-util/obs-service-format_spec_file/Manifest
@@ -4,4 +4,4 @@ DIST licenses_changes.txt-20130618 24641 BLAKE2B f117143a815446e94c49438d75d5e58
 DIST patch_license-20130618 14873 BLAKE2B 38c7b71cd06a952ed3f6a91af6d80edc8f132ef1a2249d7b2d6728254af62bf9242bfadf65a7cb84f2a2b5175e159698f80d6d0e8d2508ec833885e3ed9a0be6 SHA512 b3eaa1a99d3035ce1fc36da702f563896a16328ad0bd01da62a36e7973558749724203fcd5d24a7e3dc2118ab1f9099daa71b3c33fa46f2926f072d4227c81bf
 DIST prepare_spec-20130618 19929 BLAKE2B 8e450d5159e67e01c8cb5788fde94106a370917d46926bfd5e0eb52ad69be31a34e15cb21923053159ad84eebb78f172512cad300298d5fb9b5ad687d815db2a SHA512 51826979c2ca8f5c9adf5d51c3d2c0a6422785cf690d044798a439e532a90eb399f776d0d7fdbc8673779a988a71629ba6dcbd3a572198a4cd4aef4dd1fedc7f
 EBUILD obs-service-format_spec_file-20130618.ebuild 309 BLAKE2B 0879ac539587d25c665812cee5972842f6932414aa15be58063974d25cb383e319d81c2f9fdc4c2cd4ea26df4839c14fd1eb1c60867d860d22a8cc51d29cdfc1 SHA512 603b74b3867e168dd6e1d31edeb8f9894e690974bbdbfb9ee243a21a5dbc56d5de8a85b094ed43bc44b6edea600330197d58c68f52004551362c97bb448feb64
-MISC metadata.xml 603 BLAKE2B 0a51fc7663aa31edf4debd2051d1b72d0463d8b28a7532e93e51847d13fa107f52a43a0afd1b59e20e0121dfe80f765392db066ecf729c2ac06f751bc169b5d9 SHA512 d329c319faf527d459c062b12767d26a3085a8e944b3570cd4b09a3547319158c84d5f2ac15cfcedfb3326acb197ab470817f2fe6bc3010b2bca428cef11ebf5
+MISC metadata.xml 510 BLAKE2B 91006cc6c61ef5b146d634bd9da4c872683d593c150dcde0161492b9bc09774bed0721462c6c3a572e942fd93010e4614eba9516e806cd55cb13058fb9a9f2f8 SHA512 a7d004495a6cca14ab2bdd63fa8541b513b71f139985407f693b01cf74281a90f87bb25b0585088c6c83cfe55f01c32e03d12d28056801b9e4ba26b406b54dc5
diff --git a/dev-util/obs-service-format_spec_file/metadata.xml b/dev-util/obs-service-format_spec_file/metadata.xml
index ee9110e7992e..64b4157a6127 100644
--- a/dev-util/obs-service-format_spec_file/metadata.xml
+++ b/dev-util/obs-service-format_spec_file/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for openSUSE Build Service.
 
diff --git a/dev-util/obs-service-generator_driver_update_disk/Manifest b/dev-util/obs-service-generator_driver_update_disk/Manifest
index 691b1cef2cd9..574068f3c38a 100644
--- a/dev-util/obs-service-generator_driver_update_disk/Manifest
+++ b/dev-util/obs-service-generator_driver_update_disk/Manifest
@@ -2,4 +2,4 @@ DIST BSKiwiXML-20130318.pm 7295 BLAKE2B b5e2220c8b23e1ac7a733b90eb9f7703a90bf771
 DIST generator_driver_update_disk-20130318 11776 BLAKE2B 77f075dc976b2c66cb2081b3705636355b4dd3ebb742222cbe1a8727dcae375acc0df99ae02e621b9b244bf0eca2334b7a2ded6846e5e1b61255b05869344c31 SHA512 155924d561e7256cd9ea0c862a538310c96014527f461c9256c2b6e11c8a820e8df38c111c3f7662c3f2ff73845450189970364f28904afebe2abc6366328213
 DIST generator_driver_update_disk-20130318.service 838 BLAKE2B f52f618db1429ddc60195ea49ddfb719b179ed587005e99c04215ce471265f2451ea269d57e23fdf59a9efed06cac3a8e137bc59fabff57a219cf41dad107424 SHA512 85ebeef1d79a37e81c5e8558a078f9b929e5f9b5b8960b7930bab7812846eda911210f9cdacff82686298c9b58f62560f99ed76a33d346f3c65be0738f9ff374
 EBUILD obs-service-generator_driver_update_disk-20130318.ebuild 391 BLAKE2B 162c3d12fd6957835dd73a0629ec63715a0abfc1f2650b80b6ef3059e03934283c2e680cf95d9658f0dca423a1148abf3e40346ae1d416cca3c026f8be6c6e1e SHA512 28b844bad72f840c41df9d53e6c3e241e52e725f859ad22f2a3099267d38338d161e243893c4e88dd364989972d2bf8fc86c6a76fbd2a0e94b1194d4756e6371
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-generator_driver_update_disk/metadata.xml b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-generator_driver_update_disk/metadata.xml
+++ b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-git_tarballs/Manifest b/dev-util/obs-service-git_tarballs/Manifest
index cfea986f2fae..74d3d9538a6f 100644
--- a/dev-util/obs-service-git_tarballs/Manifest
+++ b/dev-util/obs-service-git_tarballs/Manifest
@@ -1,3 +1,3 @@
 DIST obs-service-git_tarballs-0.1.7+git.1375261502.72b5224.tar.gz 11006 BLAKE2B 7aa73395add210cc770756f4a13c49c882a5e33e43988d531a5f49a353285fdf6c2e667a898c2020d51eeec383446f8ef4e14bbb25b48a6502f20dcddeca0a62 SHA512 4c8557aa0139a6b65a7993b5ebd5b3cbf3a9f9bbd7da50d56619ed6dc54bdba6e098af92163cf4819acc42e5d4106b6056f120c6f4d0cc38e67daf5c92cc0e6a
 EBUILD obs-service-git_tarballs-0.1.7.ebuild 535 BLAKE2B b4c1c82af0e45702e5b86710b45ba6bf17d29ca0588dad2a32ab49dd8df3a82f784a5ff886e76a2f03466cbedebd2c6ce426f18cee26fbc50d893b25c75d9c77 SHA512 1c25ddea7c6e623dcc58a2a7384e2206f43f5efa9f0093e6854dca829917ec732fa3b57333cd3a181ed3349853dc2d4e258918c012e63295a4a25daa5287959a
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-git_tarballs/metadata.xml b/dev-util/obs-service-git_tarballs/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-git_tarballs/metadata.xml
+++ b/dev-util/obs-service-git_tarballs/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-github_tarballs/Manifest b/dev-util/obs-service-github_tarballs/Manifest
index 4f2fdf156512..b432f7a596d7 100644
--- a/dev-util/obs-service-github_tarballs/Manifest
+++ b/dev-util/obs-service-github_tarballs/Manifest
@@ -1,3 +1,3 @@
 DIST obs-service-github_tarballs-0.2.1.tar.gz 8837 BLAKE2B 829fb5e607016a4254b846d45444a1eda3328835f2ecb9666b6926360c311741f46dfba4dd00650703449d2261a5dfce54c319bd5d2a331970fbbb1c818153f9 SHA512 7e4d2b9bc5f27448d7c6f11e05307fdb5860ccfff285fc486a4b17ce475716db73fe026c5019674a7dea02dd3e892045eae735c8060735fd1384e2b672995599
 EBUILD obs-service-github_tarballs-0.2.1.ebuild 662 BLAKE2B 7137b4d32e4dcc98188bbffabe9bcda2231b25712a65e086d3e9289e02a5572d79768083fdf2fc8aec18463a6d703a4e87780c2321bd78953350f2eae205128f SHA512 914eb965c952cc97dafb1287777c934f522a7e388f51b564d080a640d3aad4348832f6e067e04bcdbf12ee67580ee9ccf2d53a4505c7aa290456243f54646c62
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-github_tarballs/metadata.xml b/dev-util/obs-service-github_tarballs/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-github_tarballs/metadata.xml
+++ b/dev-util/obs-service-github_tarballs/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-meta/Manifest b/dev-util/obs-service-meta/Manifest
index ac3e12ba5643..3c5be576cec8 100644
--- a/dev-util/obs-service-meta/Manifest
+++ b/dev-util/obs-service-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD obs-service-meta-1.ebuild 962 BLAKE2B 4077ece14262b50049e24bc6f07f1b5240c5346d1fb1b397cba662f1e797850a4aa6b9249dd0c7c9b9050c5793d83f301e1495ef632c3644bb365b38b2724cc9 SHA512 bf62281d590f8ae898d768e4e17b95d02dc88eea838f0223f1b27d9b289b9dba6450460c705f447af6a6d1921ecdd8e37f3a9eea3a5cac581f6efae55522188e
 EBUILD obs-service-meta-2.ebuild 1105 BLAKE2B a81536911f3b6556e477ce986e61d84823e0c1b5aa359a589330f3fc6140d75797ffecbd74b4603a0ab9ed35a52037eff0e33a930511252779e8ce0f2b41b334 SHA512 c273c3b47355120c7b829885db2dbe07d9719d748eed913f17f7305fec23c566bfa19deddcc3d8719394eaf9e383213c85ed9f4aa405e0464fc7ebbdf8fcc54e
-MISC metadata.xml 523 BLAKE2B 6518353f39c559896b2cc9b71984d94cff2e417fada8bdf1219f963e57db38439870fab01c911b53ed46bf85afb614531fbc969b55afce01fad166b2383a2e62 SHA512 b5abcca76da449c17761381a01547986b83fe19eac292e322e9fc21d5eefb8d38975b88f9ebb51ff72a843773d931f30dcce21f352808ac1573cb9c37d2312cb
+MISC metadata.xml 430 BLAKE2B 35bbe8e34562680edf5a62049fb63dacf82cca405e0ff782189d43f6ee3b5f138c21185383ddc652abf4451dff5db5c3f7910d4f7712157cfb1cb4219079a42b SHA512 02ec9efc9cc663b49d26135f1651abdb732b2850a2bf311fa16bc137364a15cd8762391a14e46c38f005dec215b9392026ad8ac085ba21e57be52d5406df2333
diff --git a/dev-util/obs-service-meta/metadata.xml b/dev-util/obs-service-meta/metadata.xml
index 96cb567641fc..05828e15c8a8 100644
--- a/dev-util/obs-service-meta/metadata.xml
+++ b/dev-util/obs-service-meta/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
 </longdescription>
diff --git a/dev-util/obs-service-rearchive/Manifest b/dev-util/obs-service-rearchive/Manifest
index 2104d57fcd73..922f28e0058e 100644
--- a/dev-util/obs-service-rearchive/Manifest
+++ b/dev-util/obs-service-rearchive/Manifest
@@ -1,4 +1,4 @@
 DIST rearchive-20130802 2182 BLAKE2B d5b653ee39f5dd027434aa13eac6a17ae9b534c394dfedd7dbb463f7dd98361cf65828039b6da020a99679de6fc3a93bfa88db5235b7c96c60d852e8ec7f8070 SHA512 7266f142cdfcbcf9b96b36ed70d80e3640ec8897b98619abd885b892ffd6b86980bb337957879871b7b268bf72cc12e2b4bf8c1e0ecb9a45cf95a6f535ca0279
 DIST rearchive-20130802.service 544 BLAKE2B a8e86bd47a7afa0e6f92f987cdb8b0117f7e34a1395da4bd7fded6805487cc759d472556626f227209f315c993d0234c672cf9724cc518b7b7353905be170537 SHA512 a228f780b5494d19565c190f4e97389a9e2fb6926ee939220df8862082f0cc881e5bdbaeac2db9085fcb57f47e4e43eb504c49929fc55a7954786e57d2a9925f
 EBUILD obs-service-rearchive-20130802.ebuild 247 BLAKE2B fbe07876074370163b77d93d7f3c907676a3f239d2a10081684ca37eac4ef898ef2fab30dfe030c714ada705b89bc647fd902c30dd436b6ca6472a1c7f1e3cf3 SHA512 dd7d850126cea03cd680fa94626ee8fac698ae154bf1c2c73124466182673fae24611e60ec3c37b29c81fd42364dc27e110945dde907f677d0d550cfc07da6ac
-MISC metadata.xml 367 BLAKE2B 00ee155956ade1fc63f202b092eec05a5c27de5c71b9d652a6e5c0730f27b1179b4adead2c0260d737e5714b093d7ae9fae69887fbb8ff67dd49a3433ae4fe0c SHA512 6829a44be3d6bbb3da7533cb264206573be85362446618293441e6d9f30451932668318e2d74c47c586643463ffb9f4f2822995731df25ee187dcaa3d612164a
+MISC metadata.xml 274 BLAKE2B 49fb40acb09cdebdc2ca44050ebf3d34bb4f8c6636518c4093531f472c8f60ff951e68df44da6bdff15e4113869a2834c67411024ad04db3ee3112879e1afa60 SHA512 81e084453c2d5cd4d60d3c9d0a506f335428f4ce54dea4fba4376e3cbfee3c6ef7dca5d8f68955b55ad0ca98f9b3aa5d5d9b0975ae5ad5aeb26fe9f8ce53dd78
diff --git a/dev-util/obs-service-rearchive/metadata.xml b/dev-util/obs-service-rearchive/metadata.xml
index 0a8ff0aac5da..5367c1e31d21 100644
--- a/dev-util/obs-service-rearchive/metadata.xml
+++ b/dev-util/obs-service-rearchive/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. It's a wrapper around cpanspec script.
 </longdescription>
diff --git a/dev-util/obs-service-recompress/Manifest b/dev-util/obs-service-recompress/Manifest
index 98b56e1665d4..fd2f33d5ecbc 100644
--- a/dev-util/obs-service-recompress/Manifest
+++ b/dev-util/obs-service-recompress/Manifest
@@ -1,3 +1,3 @@
 DIST obs-service-recompress-0.2.tar.gz 1593 BLAKE2B 62525fe7951744663adf5cbc1aaf1f4324583f383036249e92d06f1457cdc0d167f9f95f6499ede5db312a50354202ba0ae4e60e9963993f3d61304dafda4d1c SHA512 085a6b47ca2a2930a41a6edcdbec85960c0d3c092e5d4e643c90c5bbc97f01ddbf35c73edad9293ffc0ff3254270a3f7ae2d6c500708bd4f41e355b5549a2585
 EBUILD obs-service-recompress-0.2.ebuild 697 BLAKE2B 5bff3b2177960160943f6ea8b7eddd498ca9482deed55ae1c86cf3f44d2c19ec2dc49e8f8c3934ae64eb4f7b6713bc2cb99ff8b0cd65bad2e9ceaaca00692e94 SHA512 fb2881f11270eb819b41b5665ebeb69f760e43437686a9d459089dbb24b3ff5cf93c06c605818f8d62113b1f150df08d3a077b79e31238191620b36e39020e44
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-recompress/metadata.xml b/dev-util/obs-service-recompress/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-recompress/metadata.xml
+++ b/dev-util/obs-service-recompress/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-set_version/Manifest b/dev-util/obs-service-set_version/Manifest
index bff6580e1e9d..f747516062de 100644
--- a/dev-util/obs-service-set_version/Manifest
+++ b/dev-util/obs-service-set_version/Manifest
@@ -1,3 +1,3 @@
 DIST obs-service-set_version-0.3.tar.gz 1993 BLAKE2B 5cbb674455088c3034bc1592a82f71919c90e96d07fa5fa50ba5f0f21edb8b8a1560f1f8634123ebf4dbfeda55589e6842be530bb9b7f0e9007b3b66ac801dbc SHA512 a053c869199441aec54af3e170258297584c018a2d7b6a0f48119762ac2386f74b0a15132280d3428c948454cd4d0c8dadc65eb68d9439df40d55ba4f9e5da7a
 EBUILD obs-service-set_version-0.3.ebuild 647 BLAKE2B 697da430963daaa4724c5f790d972706909d6bf848881bbf0e11fbc1df46aad142803449fceeec67f90135c1fd6c86fb7ee4887b0229d87d83d38e5dd140540a SHA512 6bebaa5504442f27349bf9ef6c402e633c459642d7177fc8239ec370342fc937c6f174034d60612003bcf816632556f0f6b08c35827bacb38ee603260166aa13
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-set_version/metadata.xml b/dev-util/obs-service-set_version/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-set_version/metadata.xml
+++ b/dev-util/obs-service-set_version/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-source_validator/Manifest b/dev-util/obs-service-source_validator/Manifest
index 0fde1cd155a3..5cab8caf2b9d 100644
--- a/dev-util/obs-service-source_validator/Manifest
+++ b/dev-util/obs-service-source_validator/Manifest
@@ -1,3 +1,3 @@
 DIST obs-service-source_validator-0.3.tar.bz2 18472 BLAKE2B 4f98b9d073da43c60b0d548f484497534105b9a3da843b15e7489dd2224c64ca7e44082b9981177651c0fbba44b377a0a94c989af10c1c38b503ebdc7ba72d21 SHA512 129d69a896bbd157b781f6d9014420fa7a9717f6a48b677bbe99d5d92a242ff25be470108d6f6da00a170b3133b9fceaf8d7447f356e9ddc1090ba7f7d79c164
 EBUILD obs-service-source_validator-0.3.ebuild 655 BLAKE2B 262b8006267afe6142325d3e892bdaa3f49138ff8f3d48137494d47d16e7f16972e627420f62fbdc39d33215bf6056a09f51c2e5ba592695e3242139770854f6 SHA512 8e93e5089f00c2021ff712a866b5cd8f0067b1e446df61b3f17994c929fee7a4dded124b08a2ecf401848dbe7a934d9aa602ae924526812d091f42c775960855
-MISC metadata.xml 523 BLAKE2B 6518353f39c559896b2cc9b71984d94cff2e417fada8bdf1219f963e57db38439870fab01c911b53ed46bf85afb614531fbc969b55afce01fad166b2383a2e62 SHA512 b5abcca76da449c17761381a01547986b83fe19eac292e322e9fc21d5eefb8d38975b88f9ebb51ff72a843773d931f30dcce21f352808ac1573cb9c37d2312cb
+MISC metadata.xml 430 BLAKE2B 35bbe8e34562680edf5a62049fb63dacf82cca405e0ff782189d43f6ee3b5f138c21185383ddc652abf4451dff5db5c3f7910d4f7712157cfb1cb4219079a42b SHA512 02ec9efc9cc663b49d26135f1651abdb732b2850a2bf311fa16bc137364a15cd8762391a14e46c38f005dec215b9392026ad8ac085ba21e57be52d5406df2333
diff --git a/dev-util/obs-service-source_validator/metadata.xml b/dev-util/obs-service-source_validator/metadata.xml
index 96cb567641fc..05828e15c8a8 100644
--- a/dev-util/obs-service-source_validator/metadata.xml
+++ b/dev-util/obs-service-source_validator/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
 </longdescription>
diff --git a/dev-util/obs-service-tar_scm/Manifest b/dev-util/obs-service-tar_scm/Manifest
index 312e477d9711..b2d57b0f0363 100644
--- a/dev-util/obs-service-tar_scm/Manifest
+++ b/dev-util/obs-service-tar_scm/Manifest
@@ -1,3 +1,3 @@
 DIST obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz 18252 BLAKE2B c12934dd07ee884214f9643395623f1d3d7b806c16076d2342ea3d961358025029ac1f0660842b778b2522fef350466efef8f40bf06287dbd6501f38f0f0fbb9 SHA512 c150e6a0867befacfbd029726e997b3e64307646e2887d00e6ad7493ac2bd9200afd7bfb9057255549ff87cc5280161edc7c96f31c7fcfa572ab4b96ba74cfbe
 EBUILD obs-service-tar_scm-0.3.1.ebuild 660 BLAKE2B 80a502aa184472874e1caf7a8924e7f3833b077807814428bbd25d9bc93242f658789dfb5d7313d2c00982f95f744a48b5b596d8633748a63e295246e4c6adee SHA512 692ce8d5dd5d609d0da701260534bfbd52cac70768b30095e6a7895ebeed68d6f956581055bff2522e46353cd4efd62f13205efe40d6dc3bbdcadc53d1292972
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-tar_scm/metadata.xml b/dev-util/obs-service-tar_scm/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-tar_scm/metadata.xml
+++ b/dev-util/obs-service-tar_scm/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/obs-service-update_source/Manifest b/dev-util/obs-service-update_source/Manifest
index 03ac7fd90ebd..2884b2d00e90 100644
--- a/dev-util/obs-service-update_source/Manifest
+++ b/dev-util/obs-service-update_source/Manifest
@@ -1,4 +1,4 @@
 DIST update_source-20130802 4081 BLAKE2B e27cce2be12f1cf82235ad2b43cf7c92b5d624936e9805a3581b2c686266a6a95bb4cdabd3da3f0d6034ddacd37d320c6417918a476a6d931a0a57639666ab41 SHA512 24a28c9f487b9ecc247988dcffc3ab612fa11b33824f9b3f1537548722186143dfeefe5208444383a918baa599fc57994dc6a7ae7049aea8108c087fd49f6e17
 DIST update_source-20130802.service 486 BLAKE2B a3c7c8ff5689ff3979e54f4e890dd5898c62c4a940b6998ec89811de6290e808c65966226eac8ff549c9fb4561d70268f230d4f82481eeaa839d0081e729429a SHA512 3cfb25566f2806c145bca0817976e7129436334706c2f0022fe7e94be62ce11b8e2420c2e97c24999bcda1de88850a589e5b6a0de633a27cdce52b4253965818
 EBUILD obs-service-update_source-20130802.ebuild 235 BLAKE2B f582aa916933f53b29a96a6859d42cb04829d7d514d37ab300398aea9b5defca5d4d8f7958e0d676bd3a4b878f29b14e290b33fbd5e5b0dbfd2ffcc98524435d SHA512 5b2512a4c45a0259432f35b1e48dfdf5f9a2290740d5cafe60855af329edbd4619b9209ef8d8fa0f405749a6b1b601aea706fe95ef14ee660fa857cc11e77013
-MISC metadata.xml 367 BLAKE2B 00ee155956ade1fc63f202b092eec05a5c27de5c71b9d652a6e5c0730f27b1179b4adead2c0260d737e5714b093d7ae9fae69887fbb8ff67dd49a3433ae4fe0c SHA512 6829a44be3d6bbb3da7533cb264206573be85362446618293441e6d9f30451932668318e2d74c47c586643463ffb9f4f2822995731df25ee187dcaa3d612164a
+MISC metadata.xml 274 BLAKE2B 49fb40acb09cdebdc2ca44050ebf3d34bb4f8c6636518c4093531f472c8f60ff951e68df44da6bdff15e4113869a2834c67411024ad04db3ee3112879e1afa60 SHA512 81e084453c2d5cd4d60d3c9d0a506f335428f4ce54dea4fba4376e3cbfee3c6ef7dca5d8f68955b55ad0ca98f9b3aa5d5d9b0975ae5ad5aeb26fe9f8ce53dd78
diff --git a/dev-util/obs-service-update_source/metadata.xml b/dev-util/obs-service-update_source/metadata.xml
index 0a8ff0aac5da..5367c1e31d21 100644
--- a/dev-util/obs-service-update_source/metadata.xml
+++ b/dev-util/obs-service-update_source/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. It's a wrapper around cpanspec script.
 </longdescription>
diff --git a/dev-util/obs-service-verify_file/Manifest b/dev-util/obs-service-verify_file/Manifest
index fb3770e7d2b7..13656a06b6aa 100644
--- a/dev-util/obs-service-verify_file/Manifest
+++ b/dev-util/obs-service-verify_file/Manifest
@@ -1,4 +1,4 @@
 DIST verify_file-20130403 1279 BLAKE2B 49e755a19bb57672ccc84a7f187d3d3c5cdb856e0273e76c60a5c851453d0fbe5d93d08754f29bb387e574a9f58bc708206cea68111de194f48c93657d7b0300 SHA512 8fd6771c6c93766429d58620750132a6139df34041009f890792458c2f6de4efd8548c1f9f96aba051563d32a60294bae7e14d6c5523db345787c609e1a0a5dc
 DIST verify_file-20130403.service 513 BLAKE2B ec01c4c7ea656677695934fcea832162f84d206aeb0a1fb57a5c59c25fe998d460894a800614744893de6de32c7a047f25cbacf2edf33e85011e84a703637700 SHA512 3ad6b31fc5599ebf3389f32b909c8859b78a2134079692e2891aa03cca1b9fea420f6796d762fbceb431c6216610427fb33fb2d58859a521ff34639cab38a63c
 EBUILD obs-service-verify_file-20130403.ebuild 227 BLAKE2B b6c61a81fdfc935f36d4c5fea4ae8e2a824e1353531ca285e6689f7d99e810b0a640ee8556ddbb95fd8564bb1e1bf076814bfb727c627efa7fd34176962e4791 SHA512 d967efea3eed4ca6245ad248cc6e40162581a43945c0016afe7b149332fc93faa60a3053d6cabec417202e94c69ec9984f8d5e6704994303b55e3f850066e29e
-MISC metadata.xml 448 BLAKE2B 6f9a6a0cba2d6413bd11f67eff8df41d6ba3ac857bdea0d8f4afae2376468bb452914a8e09afebe1c42254eb758455bb997f5163ed45474fcf20814af7bd0ece SHA512 f544445cb83288650c17bff5a3b472644ea2af586ccc2022e1dfa7a6865ac49b774b50bc63c894c55fea86dd4cc053a88062a0f83fa6fead0b5691698ea8f7e8
+MISC metadata.xml 355 BLAKE2B f44aa36b1cfef6eca6272811e2b9b0b69bd658f6f91cc1614d7d93382aca6eb969005eb41204debdefcd7ffa8c0c01c96f4824087056e5d9b9ff94e09b347815 SHA512 fcae8f4988bca52476af03394f9a829968d58e5fb82e3013499d14079f85fd18809d7218a23ff0295aed66ec9c61ed7186cf1da4df44ebb47520f66b06aa0141
diff --git a/dev-util/obs-service-verify_file/metadata.xml b/dev-util/obs-service-verify_file/metadata.xml
index b2d1711cfd56..8eed9fddc78e 100644
--- a/dev-util/obs-service-verify_file/metadata.xml
+++ b/dev-util/obs-service-verify_file/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
 </longdescription>
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 66d8a42d83b8..1b1b904784e0 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -1,9 +1,7 @@
 AUX osc-0.139.2-out-of-tree-build.patch 708 BLAKE2B 88cece6103f3f6690ba2897127ff75e63e2395727dd991c359b14b180b44cbd43ad4cf18730b8c1b286ccedd0f4f191c7925bd515a5de43685c2d89ab341237e SHA512 5663497e5a2685a48407d4eece16b64c33275808252b29f05ff507274951b0a8d9fc77e0d3f9a2412089d683ac1eb547ebd16ef2491ac55944fcc6f40fc8c166
-DIST osc-0.148.2.tar.gz 6818939 BLAKE2B ab96a5da3375610c96c34ccb8ee116d57c9496d47d623694aefead1f7560510b7588796a201395500dfe7d1f06bfce4a1c4c46532b011f436c14c63d4cf8fd51 SHA512 4e17c8fb8f78a3f9a279f27e3c52fa1a4d6ee62825e06a5943b144ff39a3c53650d31c1b8033ee78cf6f3d4e85c140b2fc0c7f86b3d134cea59fc8da24e3fd16
 DIST osc-0.152.0.tar.gz 331512 BLAKE2B 19605f2cba7befca160ed213ab13ddd337726602adf01b72e857133ecd97b221dad5b6fb48f6c4be1af4987d5da5e837ef1edeed13299df68f0d60d0a0506611 SHA512 273bad36565d4f90b1a1f9af965367728559e5d0d8060689b1086f1df12fd3ef575900064973888cba1c06fb2d7c0e998161d65c04581a040750ef34281f035a
 DIST osc-0.154.0.tar.gz 341789 BLAKE2B 69fdaea439c7d82efba7568c318f076b5b267ea4ffb319ca95c81b85305aa4daba43f53d6b9979c6d76c0b0c0bef124e25d3fa4cdb2ac74a044c12b7bd3ea06b SHA512 1240bc9cc9079115342fc0bff1e522ca8fbff0a22b15fc2bfa90817241fd42e2350dd9344e5d6e3e0b5842be3f010398d108c7f9c7d474bde5c2300f7bf6bfb7
-EBUILD osc-0.148.2.ebuild 1518 BLAKE2B ddfeabd0ea75849e4f4a93351c5fb66284df289b66a6152aa776738249b699f0c72a54ed3c786e2e016021df56af936df45d5ffb20dd5db2233f4f05d37bb58e SHA512 1ee27f8833e560aa25d3e1f747c45a32d0cd33100b7cbceef29e632abc30a01f6c3b5107804d15de474d090e0cc6edf20b63e722bc6ffd3f0173a103b3fde64f
 EBUILD osc-0.152.0.ebuild 1520 BLAKE2B ca46aeaa8904653bd3cf496bce9ba0147bb8a000ed39d9fee9fd75a791b48885996ff7cf73bd027b8d601b40d514f61539af0b0d1e0b70821d359f760f6d544b SHA512 d9147c1a3c9269a46095e72cd2bfb7d09b1a8bbcd51ee76ea2f7134cf154509cf92d1440fecb42c0b91a99fa2502fecf7d32eea2ed0f391a983284ee2799f1ea
 EBUILD osc-0.154.0.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
 EBUILD osc-9999.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
-MISC metadata.xml 498 BLAKE2B fcd22c8910662bbbcad53af88bbfdbb1a02eb09f1eb1ac7d0630c148833cc5cc8d847bba11334e13b7b1a63e91c27c431dda7efcee261d1975f3352e16dee255 SHA512 670b8bad9b8be7908537e369e9b6de78b21672f88f8e47025c4b1f8e054834a62e563f2b1dd063bc8bd1c40cea88541440170d4275e4ef2391542a4e499fffdb
+MISC metadata.xml 405 BLAKE2B 45335bfe58f22878457bf3bc2f4ac87be41f72b04c308e9032def5064bdfbd8ea3110694deb7357e053ba770a9a7c5dc7dfcac1acac427290383dd2a81fd0254 SHA512 69c9e248a7d927ca17816ac1f6679427c576b860ecfeb2407326393044ef4344197b04b6b2301ffa01ed2c738592dd904b09837e30972b15abc2c947298e6698
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 3e0165c6d2fe..24f0a4d2bee3 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 <longdescription lang="en">
 Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
 </longdescription>
diff --git a/dev-util/osc/osc-0.148.2.ebuild b/dev-util/osc/osc-0.148.2.ebuild
deleted file mode 100644
index ff92ebd5d75d..000000000000
--- a/dev-util/osc/osc-0.148.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/osc.git"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="https://en.opensuse.org/openSUSE:OSC"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	app-arch/rpm[python,${PYTHON_USEDEP}]
-	dev-python/m2crypto[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-PDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-util/obs-service-meta
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.139.2-out-of-tree-build.patch
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dosym osc-wrapper.py /usr/bin/osc
-	keepdir /usr/lib/osc/source_validators
-	cd "${ED}"/usr/
-	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
-	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
-	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
-}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 7e59384636ce..6392e2e36ed2 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -15,5 +15,5 @@ EBUILD perf-3.13.1-r1.ebuild 5128 BLAKE2B e34cc28ba57866db83fcf9ab639e95306582c6
 EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f02cf9201e78a5d6bcb4c18d645ae4bc8e584237ab738a1739f971a2ae62faf950d8bbe9845f02ad878aab84 SHA512 9a56717e87b9bf6bfa27f3d953e41af18c55e92020fbcc14fd01f43835e542bf1c7adb195387400c955706f5ca8a69090e41d6edfb728717910cd19b801d6dfc
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
-EBUILD perf-4.9.13.ebuild 4905 BLAKE2B b2e028a4aff3dd75b695e64435fd6773238959a5dbb2ba0de2eb6c8b952e3322fc25aa2608c149ec00d711f5ab19275a81f58456b9e5d416c3e97f08883bb67d SHA512 669d0b564ed5a4ef27fef27c37fd6d32a2ba2f202eb29ac77b89f16865284b492b195b06f1a7cb435005f8608e78158838090fe5532a74f0c03cc5ad9d963405
+EBUILD perf-4.9.13.ebuild 4912 BLAKE2B e0453c9d46ad881fdc62db5c08d2266e7bb5d4e42920a80ee6992e6be7361a39a3312d3f3a423b50fcb30f0b857b47147f10f73f92deb2237fa0c4aca2200eb6 SHA512 3679e5f282a83b158b774705c852d564540b05440920015a604e186559fea7ee36961b74f8010004cf1710699d70c8950abd80a2719722f1c6545c422f6523a7
 MISC metadata.xml 1093 BLAKE2B c10db12ae6c05c68b06dba1112b3c899dd40d2d35f8ff8f2bc840c38e712571256b1ac49d90983b4df6af5806fc93b59bbb86e6d851d197539e776d60da0d7da SHA512 5c83c9c871c23eda63760d4b33b549849236d1f79edf4a69bbf2803987cd6db9c3f5dd8abdd216abacce91c93a589a9487e911d9ee1f57a9fec761f7e39beeef
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index f63b51115804..fd50602fb581 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/pmd/Manifest b/dev-util/pmd/Manifest
index f527962567c9..d22f8632033d 100644
--- a/dev-util/pmd/Manifest
+++ b/dev-util/pmd/Manifest
@@ -1,5 +1,5 @@
 AUX pmd-4.2.5-build.xml.patch 2313 BLAKE2B 421317e680142370c00fcf326397f7a8411cd3a591c45bd0f3b78822cb3a5631e95a7ec0007f20eda47cff5ff9f798e1ff8a8b37a4c0a77a23169c8d916707b6 SHA512 ee0851e642013a59698043fd2aa120b804c5e8ddbdcaa462d8196a8f1e63011b90396c921b4881f1d21687d58e11352a269554420e74718b5d059e1b4b7bdecf
 AUX pmd-4.2.5-launcher-pre-commands 171 BLAKE2B 2c276edcd8b9ec0d2803737cb12523279577f6546b70479a610f12e7a9b3c455ecba2acdb124c7239184f4c3ccab8611e15026e241990a45b5669853f2975f5e SHA512 9d36998cee64096d5d71562cc255ae951a11ad6d67057359b2a16cb860b8d542b121c1482fb9bd1458d93a4bc69e3b4720080e8153bc01930b8927e653fe5c75
 DIST pmd-src-4.2.5.zip 10801078 BLAKE2B c80acf1f723aaeff4b4af68a666eff747845ed13f941b46299c37dfe8a5fc910d662a526e5d7723faee6d647705ac6d7fefb53c53bd3bbd196db1faa5266f5c7 SHA512 f515445126d0b3ad11adac491df94d4e1e806764b2601b4ad9974a090d8542cfc4992d4aaf5ef61470459ecaf4c75db0865e257a1f7ea065b3d248b53387e93e
-EBUILD pmd-4.2.5.ebuild 1721 BLAKE2B d11e45685a06db1a8aea317c25052cc544d1e6c23475040a4e3687174bc0dd00eeff6512abb56acc177ef5d7ca758427a2c3bd21e6ca4a5788ad85ae86c459bf SHA512 54c79caf491a7b2cfe928576c02347b56add3d26725049696747e5b4c2d130b5aa37e99156cbfd5b84aaad7e9f34aef422f9e8fc2dc3cab104068f6f098cb0b7
+EBUILD pmd-4.2.5.ebuild 1701 BLAKE2B 08f81a35818ba5e929ce9bef0e03d3aef8ce0663b66a216135169d7db230f487e71965baba6b421cc82969afec2159bbffa656677852aef2959a35c9d83d82bd SHA512 bf9d1248854b1863c8c78de70340681b3ea45b1c8bd98f11ee9378de7ae8e79fc7650a9acd0cc0fdb61689a2f8f53878ad3c563772edc26beb8877917b187f03
 MISC metadata.xml 309 BLAKE2B 4fcf5ec1f65debacf01e4fc765fb620d6b4c0e44d163f07bd77062e9c206adde9ec583e8d3be8647e8339eebf9d6914911f2044a10aaddb52aff972a1f157efd SHA512 516024e7c481f53034f039bb417ac691aaac3b2650349ef7744badd450a073f3388de60c616e869ad8697b66b57b5241f0e3077363db51a82c579d5cc8347bc2
diff --git a/dev-util/pmd/pmd-4.2.5.ebuild b/dev-util/pmd/pmd-4.2.5.ebuild
index 2974d1385e44..71b3b7ebd19f 100644
--- a/dev-util/pmd/pmd-4.2.5.ebuild
+++ b/dev-util/pmd/pmd-4.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -27,7 +27,6 @@ DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	test? (
 		dev-java/ant-junit4
-		dev-java/ant-trax
 	)
 	${COMMON_DEPEND}"
 
@@ -50,7 +49,7 @@ EANT_BUILD_XML="bin/build.xml"
 src_test() {
 	# junit does not like collisions
 	rm lib/ant.jar
-	ANT_TASKS="ant-junit4 ant-trax" eant -f bin/build.xml test -DoutputTestResultsToFile=true
+	ANT_TASKS="ant-junit4 ant-core" eant -f bin/build.xml test -DoutputTestResultsToFile=true
 }
 
 src_install() {
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index c8ab4089c8fd..5283ba214780 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,7 @@
 DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25 SHA512 a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618
+DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
 DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21 SHA512 6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd
 EBUILD qbs-1.10.0.ebuild 2975 BLAKE2B 53d92b0f1a40adf3d8bbebf98353589fee3c8dbbd16b62d01a4fe9f76efb1e81a8dcc17c6ad42e467233fed37144809ed5682af722604af6f5987efece017f0f SHA512 f587fbc48e2ea72b76ec0c3a2b2ba3239f51d066c8d21d7540078ca3e589e297b8b63f7d1c8ecff69722db8e17639de0626887cef72708c1e0299d593f5620ae
+EBUILD qbs-1.10.1.ebuild 3012 BLAKE2B 349e583003f8f8e54fe97b311965487413e7520f9384b098227425c772be2317e07ab9bb09eb5c7931b7dda4a0ff0abc005a1b60c42bd2e7b948a0eceb3f39c0 SHA512 3cfbead7109404dddee730e6bec48c22d95ed3862c0245a9647a7f9389f78cef8f8ac156f1db79ce951fe12f7872231dcb8ee3a57cd20940baac5dd690271b9b
 EBUILD qbs-1.9.1.ebuild 2865 BLAKE2B a090c3f484cce5bc105d5e7078975f3f79af9264cf68abe8c3ff79d73741f7c8e9156b21770a87d3ffe9372834598e3444d9bbff1b592dc1ff5b5093cdd1a6ad SHA512 28df0a53335da532fcdc0585587d642abdf66207d74815421f60e1d04381ef2b6e2d64af6f425590ee928ff47c80ddfbb8039193c5895493b090d62baa0b3d9e
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.10.1.ebuild
new file mode 100644
index 000000000000..6f49fe08ac2e
--- /dev/null
+++ b/dev-util/qbs/qbs-1.10.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# don't add /usr/include to INCLUDEPATH
+	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
+	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	if use test; then
+		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+	else
+		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+	fi
+
+	# since 1.10, TestApi is either broken or requires more configuration
+	sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die
+
+	# skip several tests that fail and/or have additional deps
+	sed -i \
+		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
+		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
+		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
+		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+
+	# requires jdk, fails, bug 585398
+	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${WORKDIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc -r changelogs
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/qbs/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index 330433f630d0..b393df7014ae 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 643 BLAKE2B f761ea1b29966c584e0adf96bb0c032f0a712f515be7abdc9f7705786a1e59939a8b46fabd15e728e4ea96a6c7c1f8cdb8cf250495f76287de77cb2b1e040788 SHA512 a8acc57ea80f80e8b7fd52b42de4b09e68d381b0cf5c9a42091120cfdf06a81353421a2ec46661cd5b4b2d53a3e18ff6db1b375e832f12f5f8c59303271ffe0b
+EBUILD shadowman-2.ebuild 662 BLAKE2B d16a81f70d94b724668464b5711f2f6e68c700d2b185609474cbfe93d505fef1ba6c687abbcfb8f252d22c4228fb6db4dc5469f804c99790e871919d970be1e3 SHA512 fe15ff36ecbd69470832147bdbf737d05bd603a953ccc2e22b2e7f2b5ca671bb267e545e0fc17be7af1f49dca414bea2266b0eb6de100a7713fa3bbfeedd9f4f
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index 908bd63e9cbd..4767de0a739b 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index f48f817e7eed..1b08af325847 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -1,4 +1,4 @@
 DIST spec-cleaner-0.8.9.tar.gz 100949 BLAKE2B da95f336d05677350018c4e48c61023b35b8b97d731a08fe90ae147b32c374cf55a904e1f0559cc7c42b50acfe3b7a8c5b4cf25e596dce387b58417657fab8c5 SHA512 9e89c2760b429baa38be2ce2149fbd323b38a4c6159421192b07e612e359666810dc6077b2befd8a6d91b03aabc78bd4f81bb0e5cf5b4a274061b0aae0ab66f8
 EBUILD spec-cleaner-0.8.9.ebuild 878 BLAKE2B 609953e91f2aafa9071ed914ff9d442836aa2fdc32aeb0306f05f219ad45178381f1b6579045e542222ba64ba6c3ac5dcc9971c3623f41f6a09bea6ebce244b9 SHA512 18f047622b1b235f424b24e98809697e96d9217df6c1a29010ed23c4a031d17ad7b7fdd7d4b4c5e18f9f40e7cd0d5870e2058669f5d72fac89a1746350c8ca87
 EBUILD spec-cleaner-9999.ebuild 878 BLAKE2B 609953e91f2aafa9071ed914ff9d442836aa2fdc32aeb0306f05f219ad45178381f1b6579045e542222ba64ba6c3ac5dcc9971c3623f41f6a09bea6ebce244b9 SHA512 18f047622b1b235f424b24e98809697e96d9217df6c1a29010ed23c4a031d17ad7b7fdd7d4b4c5e18f9f40e7cd0d5870e2058669f5d72fac89a1746350c8ca87
-MISC metadata.xml 322 BLAKE2B e112abe0e18bef454b315ae5b0ce4d5f2d8e5337ecdf4af75352704393eec2a9760dfe360c9d0e655c50b44d8705df1cf371b9847ff7936b0bcb518e80dd56e4 SHA512 8a8ca164fa41039adace3aaa14fe39f27fca78bbc64211dc28561e45e75e9bd208d81f3f911dcb09c77d5c28614999132248454eb0431b2324b8a55f9ae69bf0
+MISC metadata.xml 225 BLAKE2B 827d485e6a34bee26949a1779a852bbb87ea60d437e2345921bbc01a4f9d5e7e29b63ad56d7ade75954faa8feba95e129054b33b2dc2c6ed6fdd0245efe6ce3a SHA512 b2a0be2871dbfe8122f8868dfbee024f38fd9e3d1652909ad4c3f270623f8be84cd4605200792af0c412bda171ca20c4132d6228cad28a4eaeec615f8df8ae61
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
index b6e676944948..1f5d6f413c44 100644
--- a/dev-util/spec-cleaner/metadata.xml
+++ b/dev-util/spec-cleaner/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>suse@gentoo.org</email>
-		<name>SUSE</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">openSUSE/spec-cleaner</remote-id>
 	</upstream>
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
index cb15d76e4ef4..313197ab3f0e 100644
--- a/dev-util/suse-build/Manifest
+++ b/dev-util/suse-build/Manifest
@@ -1,7 +1,4 @@
-AUX suse-build-2014.09.18-libexec-paths.patch 14173 BLAKE2B 49029e91ca931ca457a0c53b1c01a3706d472059024248f0605271a9ce242f3b12df00afc731fef6b36562230cad917eded943a72ac0c0accc6eae5d4437816d SHA512 e808c32eeb0c29c9b7db97129634c9fc35a5bb7fc376601051329cd2508aad2a0342404cffb299dde515f4792d26c4be460c738bea90574d113241821339fe69
-DIST obs-build-20140918.tar.gz 192320 BLAKE2B 7599208100a361246315c032164492a7f2084579ab85623932ef3401c01998de08b5b2842148800f77c3c50749797f96694e110d003daae0035b7ba893bd8517 SHA512 3eddb6d131cbc405200add39c681365abc704965adb39f52a03936653dd9439d479f6ad8ee7492248399bb015f101c0e41396b70a205bde2cceea2c6646f7c51
 DIST obs-build-20151105.tar.gz 231249 BLAKE2B 76a61f986123644e97d5242a0280640d897cc94d1a4e459a422f4e86d0d09406d11d91cd9b848f6d53ede03a9d9ffeeffb45b340b4573fad998efae16b5df2bb SHA512 7b6be4a0d6cd82501c05e41e2a08fa2ad30fe28f28ed72d06b2e4acfdb4d5d6759254291510e8797d214e6330d5c186a85d0f104454d0cde2221d94451bbfb23
-EBUILD suse-build-2014.09.18.ebuild 1457 BLAKE2B d2c776658e304574717d1b6f8dd291c3d6d9bb3e1133eb0dcd170062851c0f6a34dd02744450db7e8b37254fc79e82b9531c88d13abf9fbad58dfee2b7460713 SHA512 256f57f73173d20d9e988ac5ceec3b621373e402acd744494b78ff80fa3df6ef4e475ba3936c3290d74abfa68c098a1c72894132c8a5a119caf2e55450e06fce
 EBUILD suse-build-2015.11.05.ebuild 1469 BLAKE2B 1f8ae0633d828132e824abb493813409f756d0393b136da3198e1ab8386184675bdb602dbba0f735acc0ce3662770a466197ec09d9eeca735ad7ed7792f46cd1 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34
 EBUILD suse-build-9999.ebuild 1469 BLAKE2B 1f8ae0633d828132e824abb493813409f756d0393b136da3198e1ab8386184675bdb602dbba0f735acc0ce3662770a466197ec09d9eeca735ad7ed7792f46cd1 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34
-MISC metadata.xml 501 BLAKE2B 13d67d2642056b273329e5258bd0f23b613b7e21748629121c810db7146fda61b6ed294ea85d15461f432d7d5ca28f44ddfd8ffb1f4299d4410156af3d147799 SHA512 1c56251b6dc033aa6fa01e196dbb0a6050a2542504ef5f415c9e758f21ff05b9886ce73826778ed1e49e44af5ea53d594868adb885e86e6a61c9640485dc5f81
+MISC metadata.xml 398 BLAKE2B 5481a9444149a57b4119bf1d6097e3a76de447c0840f6c86d4195019af8c45b7db945126c3caacdac15ee5127d54a5f2461abcaecdf26b981046e62c680a066f SHA512 fc31096f9dddf4cd61a22b7b37fe9ccb7a853a8a77ca6cc1e0459ceabc9f1f9b5754b5ea68dc071b969f6cdf0206d21013ed5fb2b0fc3db42f76a4c1573bf87c
diff --git a/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch b/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch
deleted file mode 100644
index 92bce8090858..000000000000
--- a/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch
+++ /dev/null
@@ -1,449 +0,0 @@
- build                  | 18 +++++++++---------
- build-recipe-kiwi      |  4 ++--
- build-recipe-livebuild |  4 ++--
- build-recipe-spec      |  8 ++++----
- changelog2spec         |  2 +-
- createarchdeps         |  2 +-
- createrepomddeps       |  2 +-
- createrpmdeps          |  2 +-
- createyastdeps         |  2 +-
- createzyppdeps         |  2 +-
- download               |  2 +-
- expanddeps             |  4 ++--
- getbinaryid            |  2 +-
- init_buildsystem       |  2 +-
- initvm.c               | 13 +++++++++----
- mkdrpms                |  2 +-
- order                  |  4 ++--
- queryconfig            |  4 ++--
- spectool               |  2 +-
- substitutedeps         |  4 ++--
- test/common            |  2 +-
- 21 files changed, 46 insertions(+), 41 deletions(-)
-
-diff --git a/build b/build
-old mode 100755
-new mode 100644
-index 9f9fb72..fcfec70
---- a/build
-+++ b/build
-@@ -13,7 +13,7 @@ if test "$0" = /sbin/init ; then
- fi
- 
- test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build
--test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
-+test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build
- test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
- test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
- 
-@@ -493,8 +493,8 @@ create_baselibs() {
- 	if test -e $BUILD_ROOT$TOPDIR/SOURCES/baselibs.conf ; then
- 	    BASELIBS_CFG="-c $TOPDIR/SOURCES/baselibs.conf"
- 	fi
--	if test -e $BUILD_ROOT/usr/lib/build/baselibs_global.conf; then
--	    BASELIBS_GLOBAL="-c /usr/lib/build/baselibs_global.conf"
-+	if test -e $BUILD_ROOT/usr/libexec/suse-build/baselibs_global.conf; then
-+	    BASELIBS_GLOBAL="-c /usr/libexec/suse-build/baselibs_global.conf"
- 	fi
- 	pkgs=($RPMS)
-     fi
-@@ -503,14 +503,14 @@ create_baselibs() {
-     # don't use -R as extracted sources, build root etc might be below $TOPDIR
-     chown "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"/* "$BUILD_ROOT$TOPDIR"/RPMS/* || true
- 
--    local mkbaselibs="/usr/lib/build/mkbaselibs"
-+    local mkbaselibs="/usr/libexec/suse-build/mkbaselibs"
-     local whichone=''
-     # $BUILD_DIR is set to /.build when using a vm. So we need to
--    # hardcode /usr/lib/build instead of $BUILD_DIR to prefer
-+    # hardcode /usr/libexec/suse-build instead of $BUILD_DIR to prefer
-     # mkbaselibs from the distro.
-     if test -f $BUILD_ROOT$mkbaselibs; then
--	if test -z "$BASELIBS_CFG" -a -e $BUILD_ROOT/usr/lib/build/baselibs.conf ; then
--	    BASELIBS_CFG="-c /usr/lib/build/baselibs.conf"
-+	if test -z "$BASELIBS_CFG" -a -e $BUILD_ROOT/usr/libexec/suse-build/baselibs.conf ; then
-+	    BASELIBS_CFG="-c /usr/libexec/suse-build/baselibs.conf"
- 	fi
-     else
- 	if test "$CREATE_BASELIBS" = 'internal'; then
-@@ -1274,7 +1274,7 @@ if test -n "$RPMS" -a -n "$BUILD_USER_ABUILD_USED" ; then
-     recipe_check_file_owners
- fi
- 
--if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/lib/build/checks" ; then
-+if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/libexec/suse-build/checks" ; then
-     export DO_RPM_REMOVE=true
-     # find package name
-     export PNAME=
-@@ -1282,7 +1282,7 @@ if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/lib/build/checks" ; then
- 	test -f "$SRPM" && PNAME=`rpm --nodigest --nosignature -qp --qf "%{NAME}" $SRPM`
-     done
-     mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
--    for CHECKSCRIPT in $BUILD_ROOT/usr/lib/build/checks/* ; do
-+    for CHECKSCRIPT in $BUILD_ROOT/usr/libexec/suse-build/checks/* ; do
- 	echo "... running ${CHECKSCRIPT##*/}"
- 	$CHECKSCRIPT || cleanup_and_exit 1
-     done
-diff --git a/build-recipe-kiwi b/build-recipe-kiwi
-index 95afd3f..23cafb7 100644
---- a/build-recipe-kiwi
-+++ b/build-recipe-kiwi
-@@ -459,8 +459,8 @@ recipe_build_kiwi() {
-     fi
- 
-     # Hook for running post kiwi build scripts like QA scripts if installed
--    if test -x $BUILD_ROOT/usr/lib/build/kiwi_post_run ; then
--	chroot $BUILD_ROOT su -c /usr/lib/build/kiwi_post_run || cleanup_and_exit 1
-+    if test -x $BUILD_ROOT/usr/libexec/suse-build/kiwi_post_run ; then
-+	chroot $BUILD_ROOT su -c /usr/libexec/suse-build/kiwi_post_run || cleanup_and_exit 1
-     fi
- }
- 
-diff --git a/build-recipe-livebuild b/build-recipe-livebuild
-index 6ae7046..c426ea0 100644
---- a/build-recipe-livebuild
-+++ b/build-recipe-livebuild
-@@ -172,9 +172,9 @@ recipe_build_livebuild() {
-     # TODO: Add the repository public key
-     # cp ... $BUILD_ROOT/$TOPDIR/$LIVEBUILD_ROOT/config/archives/debian.key
- 
--    if [ -x $BUILD_ROOT/usr/lib/build/livebuild_pre_run ] ; then
-+    if [ -x $BUILD_ROOT/usr/libexec/suse-build/livebuild_pre_run ] ; then
- 	echo "Running OBS build livebuild_pre_run hook"
--	chroot $BUILD_ROOT su -c "/usr/lib/build/livebuild_pre_run" - root \
-+	chroot $BUILD_ROOT su -c "/usr/libexec/suse-build/livebuild_pre_run" - root \
- 	    < /dev/null || cleanup_and_exit 1
-     fi
- 
-diff --git a/build-recipe-spec b/build-recipe-spec
-index b120f02..7a0b424 100644
---- a/build-recipe-spec
-+++ b/build-recipe-spec
-@@ -194,10 +194,10 @@ recipe_run_rpmlint() {
- }
- 
- recipe_compare_oldpackages() {
--    if test -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then 
-+    if test -x "$BUILD_ROOT/usr/libexec/suse-build/same-build-result.sh" ; then 
- 	echo "... comparing built packages with the former built"
- 	mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
--	if chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then 
-+	if chroot $BUILD_ROOT /usr/libexec/suse-build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then 
- 	    chroot $BUILD_ROOT touch /.build/.same_result_marker
- 	    # XXX: dirty build service hack. fix bs_worker. Search for
- 	    # 'same_result_marker' for traces of a first try to get rid of this
-@@ -210,9 +210,9 @@ recipe_compare_oldpackages() {
- }
- 
- recipe_create_deltarpms() {
--    if test -x "$BUILD_ROOT/usr/bin/makedeltarpm" -a -x $BUILD_ROOT/usr/lib/build/mkdrpms ; then
-+    if test -x "$BUILD_ROOT/usr/bin/makedeltarpm" -a -x $BUILD_ROOT/usr/libexec/suse-build/mkdrpms ; then
- 	echo "... creating delta rpms"
- 	ds=("$BUILD_ROOT/$TOPDIR"/RPMS/* "$BUILD_ROOT$TOPDIR/SRPMS")
--	chroot $BUILD_ROOT /usr/lib/build/mkdrpms /.build.oldpackages "${ds[@]#$BUILD_ROOT}"
-+	chroot $BUILD_ROOT /usr/libexec/suse-build/mkdrpms /.build.oldpackages "${ds[@]#$BUILD_ROOT}"
-     fi
- }
-diff --git a/changelog2spec b/changelog2spec
-old mode 100755
-new mode 100644
-index 4b94798..b87f4e1
---- a/changelog2spec
-+++ b/changelog2spec
-@@ -5,7 +5,7 @@
- #
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Date::Parse;
-diff --git a/createarchdeps b/createarchdeps
-old mode 100755
-new mode 100644
-index 94efdb1..5e6795c
---- a/createarchdeps
-+++ b/createarchdeps
-@@ -3,7 +3,7 @@
- # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@gmail.com>
- 
- BEGIN {
--  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build");
-+  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build");
- }
- 
- use strict;
-diff --git a/createrepomddeps b/createrepomddeps
-old mode 100755
-new mode 100644
-index fad84e5..f2292a6
---- a/createrepomddeps
-+++ b/createrepomddeps
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-diff --git a/createrpmdeps b/createrpmdeps
-old mode 100755
-new mode 100644
-index c8c796d..c890df1
---- a/createrpmdeps
-+++ b/createrpmdeps
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-diff --git a/createyastdeps b/createyastdeps
-old mode 100755
-new mode 100644
-index 43c83e7..094c532
---- a/createyastdeps
-+++ b/createyastdeps
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-diff --git a/createzyppdeps b/createzyppdeps
-index 9abf693..e78937c 100755
---- a/createzyppdeps
-+++ b/createzyppdeps
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-diff --git a/download b/download
-old mode 100755
-new mode 100644
-index b0a7c1f..d08770f
---- a/download
-+++ b/download
-@@ -3,7 +3,7 @@
- use Net::SSL ();
- BEGIN {
-   $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0,
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use LWP::UserAgent;
-diff --git a/expanddeps b/expanddeps
-old mode 100755
-new mode 100644
-index 48116d8..04b9c20
---- a/expanddeps
-+++ b/expanddeps
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-@@ -10,7 +10,7 @@ use Build;
- 
- my ($dist, $rpmdeps, $archs, $configdir, $useusedforbuild, $installonly, $noinstall);
- 
--$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
-+$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
- 
- while (@ARGV)  {
-   if ($ARGV[0] eq '--dist') {
-diff --git a/getbinaryid b/getbinaryid
-old mode 100755
-new mode 100644
-index 55c57f6..8f06579
---- a/getbinaryid
-+++ b/getbinaryid
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-diff --git a/init_buildsystem b/init_buildsystem
-old mode 100755
-new mode 100644
-index 9fec7aa..21c5d4f
---- a/init_buildsystem
-+++ b/init_buildsystem
-@@ -13,7 +13,7 @@
- # needed globals variables
- #
- export SRC
--export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
-+export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
- 
- export YAST_IS_RUNNING=instsys
- 
-diff --git a/initvm.c b/initvm.c
-index 55686ea..f922eb4 100644
---- a/initvm.c
-+++ b/initvm.c
-@@ -54,9 +54,10 @@ const int n_fields = 8;
- #define SYSFS_BINFMT_MISC_REG	"/proc/sys/fs/binfmt_misc/register"
- #define SYSFS_BINFMT_MISC_STAT	"/proc/sys/fs/binfmt_misc/status"
- 
--/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */
-+/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */
- #define BINFMT_REGF_0		"/.build/qemu-reg"
--#define BINFMT_REGF_1		"/usr/lib/build/qemu-reg"
-+#define BINFMT_REGF_1		"/usr/libexec/suse-build/qemu-reg"
-+#define BINFMT_REGF_2		"/usr/libexec/suse-build/qemu-reg"
- #define BUILD			"/.build/build"
- 
- /* useful constant arrays */
-@@ -324,9 +325,13 @@ int main(int argc, char* argv[], char* env[])
- 			fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
- 				BINFMT_REGF_0);
- 			if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
--				fprintf(stderr, "%s: binfmt registration failed\n",
-+				fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
- 					BINFMT_REGF_1);
--				exit(1);
-+				if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) {
-+					fprintf(stderr, "%s: binfmt registration failed\n",
-+						BINFMT_REGF_2);
-+					exit(1);
-+				}
- 			}
- 		}
- 	}
-diff --git a/mkdrpms b/mkdrpms
-old mode 100755
-new mode 100644
-index b3c13b3..11b929c
---- a/mkdrpms
-+++ b/mkdrpms
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, '/usr/lib/build';
-+  unshift @INC, '/usr/libexec/suse-build';
-   unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'};
- }
- 
-diff --git a/order b/order
-old mode 100755
-new mode 100644
-index 2236b46..246b9fd
---- a/order
-+++ b/order
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use Build;
-@@ -9,7 +9,7 @@ use strict;
- 
- my ($dist, $archs, $configdir, $manifest);
- 
--$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
-+$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
- 
- while (@ARGV)  {
-   if ($ARGV[0] eq '--dist') {
-diff --git a/queryconfig b/queryconfig
-index f4d383c..bb1e018 100755
---- a/queryconfig
-+++ b/queryconfig
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-@@ -10,7 +10,7 @@ use Build;
- 
- my ($dist, $archs, $configdir, $debug, $type, $argument);
- 
--$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
-+$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
- 
- while (@ARGV)  {
-   if ($ARGV[0] eq '--dist') {
-diff --git a/spectool b/spectool
-old mode 100755
-new mode 100644
-index ef05859..24bd500
---- a/spectool
-+++ b/spectool
-@@ -116,7 +116,7 @@ the algorithm is prepended with colon to the check sum.
- my $builddir;
- 
- BEGIN {
--  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
-   unshift @INC, $builddir;
- }
- 
-diff --git a/substitutedeps b/substitutedeps
-old mode 100755
-new mode 100644
-index 54e540c..d327c42
---- a/substitutedeps
-+++ b/substitutedeps
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- 
- BEGIN {
--  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
- 
- use strict;
-@@ -19,7 +19,7 @@ sub expand {
- 
- my ($dist, $buildroot, $rpmdeps, $archs, $configdir, $release, $changelog);
- 
--$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
-+$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
- 
- while (@ARGV)  {
-   if ($ARGV[0] eq '--root') {
-diff --git a/test/common b/test/common
-index 45c0da2..86a062b 100644
---- a/test/common
-+++ b/test/common
-@@ -22,7 +22,7 @@ if [ -e ${0%/*}/config.local ]; then
- 	. ${0%/*}/config.local
- fi
- 
--: ${BUILD_DIR:=/usr/lib/build}
-+: ${BUILD_DIR:=/usr/libexec/suse-build}
- 
- #if [ ! -e "$build_vm_img" ]; then
- #	sudo dd if=/dev/zero of="$build_vm_img" bs=512 count=0 seek=$((build_vm_image_size*2*1024))
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
index 8b87c4da4729..91f6a21b19a0 100644
--- a/dev-util/suse-build/metadata.xml
+++ b/dev-util/suse-build/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>suse@gentoo.org</email>
-    <name>SUSE</name>
-  </maintainer>
   <use>
     <flag name="symlink">Provide compatibility symlinks with original openSUSE package (might clash with other packages)</flag>
   </use>
diff --git a/dev-util/suse-build/suse-build-2014.09.18.ebuild b/dev-util/suse-build/suse-build-2014.09.18.ebuild
deleted file mode 100644
index 8861aedd9072..000000000000
--- a/dev-util/suse-build/suse-build-2014.09.18.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/obs-build.git"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PACKAGE="build"
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="symlink"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/cpio
-	app-arch/rpm
-"
-
-S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libexec-paths.patch
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
-	done
-
-	# create symlink for default build config
-	dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
-}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index eed2d380f79b..3756620e120c 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,6 +4,6 @@ DIST systemtap-2.9.tar.gz 3258026 BLAKE2B 92f4fcafcc3f4d517a631950593fc53e31ca25
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
 EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
 EBUILD systemtap-2.9.ebuild 2012 BLAKE2B 851defa24b90f2dcd2dd75317197b2d90933e1170d10fb51354091c204bdfaaab629fc889af8c79f9559e1eeba3f3f8432722e8d7adbe39bd814beed5a6cdf66 SHA512 dee651564fb1894dde6b900532a7d3c6c554161ebf573bd38dea24f9f54aba78b5cf2150c782105da59394bb5cb2b8d1daca8ba2f1698f0a3a7e82c917773a32
-EBUILD systemtap-3.1-r1.ebuild 2134 BLAKE2B d778cfcd3217bca2323f8a76940f3ec4e8a01e4cbb43de782cd76ff924bcb85661cd6138467a6cc3085f81e5f8b513e11e6914431883dba6508432e6c98ae8c3 SHA512 7079b8ae6946c4cc996cee06bb9f4be6c90cc7afa3147f75c1f1569e157f5450f73b779e0ad77b3859a462cd0c0bde93ff964d3050c17922b13ef5e7c0f03c8c
+EBUILD systemtap-3.1-r1.ebuild 2133 BLAKE2B e0faa3ec62add0cc424260265a7b3959ec209881378922e9b50efcda05e86985c8700656a1a6571a15b0ca66f084d2ca131865e2611bfe809ca74643db016f48 SHA512 7b3ee194c450b249a1e959e65e94a7020ef612218c84a426763d79b1b5d5f27e48c754200ca0a9fad1c42d0a8c4c418eddb402173761f7dabd3111b1edd23e23
 EBUILD systemtap-3.1.ebuild 2008 BLAKE2B 70a2c35653fe2e580de58e4d662f8124271444dfae7359eaa1d21430f66c2bb4d5398c989decfb4cbb76f8e1857a1dcaa3dc16f2d8a60cc8d14c05118fcd6dc4 SHA512 3becae4fb0226da05ae87e60151550c4b50d93948d0f699b6aff8d2680152e1c58aae944d5c7bb75f410f54bfe6d37dec3630e7824c2747da4d1c13b1b9fa2e3
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index 85bfd0a65f41..4ce0669c102a 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.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 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 34026320e5d0..54c72501add1 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -7,6 +7,6 @@ DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f52
 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457
 EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e
 EBUILD valgrind-3.13.0-r2.ebuild 3475 BLAKE2B da04e4c84813d8775ae853024231b92ce3bb79db45118d32fb9e343fa32dcebf42d50f024faf938bdf8c0ff239e66aa2003fb8f72b0a60307fbc8db2ea1a46d8 SHA512 1ea3b52700f077c2eef7d5d5f79ea47c8f6cc7d41b6a3ec803cb0034dabb0beea77cf5c601c3eccf65e30838febe9feec271504dc2152c1c7452f73f0746811e
-EBUILD valgrind-3.13.0.ebuild 2855 BLAKE2B d0a2dab76a64046f4fab77db0c0ed98a247a84af822557d474cb2169fc9c35f0f6a4045924e5acd86b31bf1c85d8c6ca7a373a0e2014312e549f00d31bd0e7e7 SHA512 736df64c4de217aaf198a7f3a7d3d61a7304e40ca952fdc4d7a2563e2c61b9fbe3173f1e91681f754a191e67cd20225f8a64ba5bbe3ed84616811b0073549da9
+EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
 EBUILD valgrind-9999.ebuild 3284 BLAKE2B c033cc3d26adfdb05375ca7713ad2487a5db84153649e85d2ad445e0c884ecb44952d9c3a36810403f9293936a8307221033b938d02ac706a156b923b6e5969b SHA512 5b8f4e022237703cf9f93c2c9e2e6af366890ac4ccf737af6b1dc9bd1a4949392c7e25b37dfbe41e8dabf04efe9a80bd90114cc90138662042247780e773e705
 MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846
diff --git a/dev-util/valgrind/valgrind-3.13.0.ebuild b/dev-util/valgrind/valgrind-3.13.0.ebuild
index 6e84e64882f1..14799cb92f5c 100644
--- a/dev-util/valgrind/valgrind-3.13.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.13.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"
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="mpi"
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
index b47779bd2e50..d3ed9a2d3dc3 100644
--- a/dev-util/w32api/Manifest
+++ b/dev-util/w32api/Manifest
@@ -1,5 +1,5 @@
 DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 BLAKE2B 9dec25676f57dd7886f83871fee2186e3f9750eba620492aa43e7eeb58e402506c7d30bbd71c26c59c0d2c97b2aff25ffade00df8a3cc7b8835b803da8172045 SHA512 4fc8f319ab895366fb3757713e2724f8f4c90593687f1ccfdbfa6a52881ddc430167326e782117ae937c7e456e029132b971c3a041889bcfb876a84741475a1f
 DIST w32api-4.0.3-1-mingw32-src.tar.lzma 1341804 BLAKE2B cd7811b1291775926b15128b5c5f126ab09b9f7e824d7cf24210473c09563cfc06b3aaea40459502869e4df45d2b5af311b8d14b2bdaf793be483a5c80571fe7 SHA512 9295b7e803b1551dfefbf527e98fa315d60c70f6b63b4565942f7bc3d6032483d5ec4f76265b376fc6776c5ecfd1ad47fd912764c390b0b6917b1ad382250977
-EBUILD w32api-3.17.2.ebuild 1502 BLAKE2B 684e294b1998a671d373849fbd20620b92c86ca7e56e4e7730f9016bf678c3a2105f66f7d996ba974b944d8df889ff5967e9822ef4a1a9f409eb1048be95fe15 SHA512 84f663819d1f8aa0c5848b23e28e54e71494a3bff72f0cd8ae8a4f170a1fb87b5087c240d4b2a9566152d82bc395c1765a2683f7833ae4de5a86e8eff3858729
+EBUILD w32api-3.17.2.ebuild 1490 BLAKE2B 1486f8906ba313a96e49d08ea2f8e82cf04409527a514592882a34e0a8664fa0307d150bd24440148e37851462d5003a0de5510ffe7a45c6f74a91946cf32de3 SHA512 7fe7bd81e1c611404448a40ce29611da10325f12586a9a750aa17b4e7b6da4a759fd43f3732a2097b844d3e4b1a91c9ce989d1a03fd0aa37453005d57b32347b
 EBUILD w32api-4.0.3.1.ebuild 1598 BLAKE2B a7039078b084d49eb8438bcd3f3f4df18ded5e0ef8ae10cb976ad9e20b5a50b36bf2303d4d0e0b28fb2ff89fcb7d6b34a1e330aee81e5b451b451371dcd0a212 SHA512 02c252e36293780ff567cfc59dffb93f8ef914bd2eb396e4f40d7880d515ee77a2b5a007baf6e2167715c86c3482f6ba656e2f81bb6b5acc0745335c27e0e622
 MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
index e718e475f226..5af7f88285c9 100644
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ b/dev-util/w32api/w32api-3.17.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 x86"
 IUSE="headers-only"
 RESTRICT="strip"
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-18 04:54:42 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-18 04:54:42 +0000
commit	5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (patch)
tree	c968fff3108e2b4d88e4e564a56bfd066f170573 /dev-util
parent	1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (diff)