gentoo resync : 16.01.2018

20 files changed, 86 insertions, 23 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 50778a16a909..86f5fa626e37 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index a035f5e85e20..203da61e001e 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -6,7 +6,7 @@ DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a
 DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
 DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
 EBUILD catalyst-2.0.18-r1.ebuild 3119 BLAKE2B 2c5c658caeea4d1f6fa8436273b9da86fdf9fe3cdfb1b94633c320c1a415c39ad52b98809ed5020ad0cc240e1f3ecb383a30ff9b139a6090f6fe8a15a1991bf7 SHA512 b7c088b0d52a1ff3805727379ece6ee9077e2e7359454d81f4d0dff0013322b50b9049d5d19ca0fd655e5bac2f5f1b74047d26d7a6fbec681a977557022c8b1d
-EBUILD catalyst-2.0.18-r4.ebuild 3287 BLAKE2B 36a68bce5a1bd41473ee67804d6d99223eb774b7ce89e88f6588cf2f57d70652f52727c512e4724bb2eeb958bf6e94c6f49121ff13204f9ee20c7a35fe63cb1b SHA512 6f091b4d783281c48daacd65dcdc88f791f76250760a9bffa33f8086a25ba5866c4e6b3ba14a8c610accb924019435c4b851aeb6383335d9ce58acf6000094f6
+EBUILD catalyst-2.0.18-r4.ebuild 3280 BLAKE2B 4c639f7b4029d603330e9dff0d1b236f3776f634d664124c2411ef5e75eb9136535fe9287fda6ccc912c62a6798410334c987a67f42421c3ae9e6a86b1b7e66e SHA512 14f5b4cac65d683b5395720d722ac8ee870776ff3f1e2a5dac31720bb499f4da20ff084989122341609b7fecf9a508a5c11d2712da71759cba75512753c528ac
 EBUILD catalyst-2.0.9999.ebuild 2920 BLAKE2B 3d64ad52708a6107176d17824c0e0672aeeec1eee8a6070d1a75162861ca91b89db93fd920a07f3d1e5e11a176051653f2fc1108a54ac1f7093481f22723547c SHA512 8b034a56f52a4c10edc696689c480ed5737f59bd23f5f84ac7535a78d82bc488dacedc62b406a2895ef0b450c02027522dcac8dedcd4677cd6123ecd795172e5
 EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index d82b44c26066..3cf2b1bb66e7 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -14,7 +14,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index b9d68f782094..7ec92cb21ddf 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_10.10.9.tar.xz 431480 BLAKE2B 579a88a45aa74dd8097984bcfba16efb523f8ef5fb7cef8d43433cecddafafabbcb717439aedb847940c382da4f86d7448dbddecd66cbe9a567a9e389476c512 SHA512 45c1357c0e34083f6bad070973d58bdc5388cf7dc71152fce684e38158674baeb436e2d7577d3b5e43918e0788d80968ca6e6e1ee303ea4d3b79be3d55f32e9b
+DIST debhelper_11.1.2.tar.xz 448676 BLAKE2B 52e79349449c387f48cacedfae334c241b8e0187071aec1ec571a7fc04a4bfd2a9ea9c54f7cfa75ec96a01ef5d2f859caeac317f53b72479664d4f2670d44a22 SHA512 26cd04eef4cb634b1424b7d08bcc61fdae9b18a96753680658ed412e51c9124b33295e79f3aabbb40579a9d4bb059b526428b97c151d9f34ae93b615b64291bb
 DIST debhelper_11.tar.xz 439268 BLAKE2B 45c1eeb046a6fbc59b814f696c7320b344ba3cf1ba47b02e9aafd38f88e72943eaba0c0625115fc35cdce9cec0f01232278956644f02b632beda2e2d052ca1aa SHA512 12eabb2f02df24a2c1d8db8e1d88ecec2fce1547c21e99f99bf89f5a44ebd71d09ebbb7e19e0e30ca7e2f17b252769c79968d81989ab7330f870b7ee42e13521
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-10.10.9.ebuild 1517 BLAKE2B 22ec088254e5d2c13ef506b03422444c3a8b3089d9a857730455fb447a247d22528267528685350cedfbd23af6d9fb807072727202818a50c748e6d0c67c5794 SHA512 f9534629a2c227b4475838be880ec3bad65f6d8a7c0701a7942c2b6bfc1f61572a4c169b89db181ca144fb577b242a4b355e9bbd6a61e21b0739efda61a9d22c
+EBUILD debhelper-11.1.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-11.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-10.10.9.ebuild b/dev-util/debhelper/debhelper-11.1.2.ebuild
index f485cb5d4c27..eb7e5fa626c2 100644
--- a/dev-util/debhelper/debhelper-10.10.9.ebuild
+++ b/dev-util/debhelper/debhelper-11.1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://packages.qa.debian.org/d/debhelper.html"
+HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
 SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 870434b3a151..ad94108ce279 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 EBUILD gdbus-codegen-2.50.3.ebuild 1317 BLAKE2B 97698b5d0b339ec65e2eb11f6e641b75df60569659cac119417a427043603d0331b7f84df47c68c422d4b1182952b5fc877be41d8ccbae56517e17aca5a6802d SHA512 360162724e4d55bb05c4d048fc42c761b42fee345973f1f11e5d4df86c2f48c6e7028e7f0b83e8128e426b95e2a5c652843bc02ea5fbb6a06a22a940612b5982
-EBUILD gdbus-codegen-2.52.3.ebuild 1334 BLAKE2B 676c03fd97e098d6014c2c4f58178a6f810a205a5fa9610e73a9ad3e86ad986e41eca881f72ebdd7adc20f2b97aa0087444c28608f8cdf7f82f1112adb641128 SHA512 0bea85dee8a9d9c968acfe379f0ba504e3970869b35a74c831e983d96be2f69d7b9c82e3ceb1e4b0fcae523258b2b5f296de2aa235acc7590121a8ab8ed1f70e
+EBUILD gdbus-codegen-2.52.3.ebuild 1333 BLAKE2B c7acedd4eba007272ae7ca0d4b64c36d00adf8ed089983c14aa1c1ae25586561daa15944f9527946f48ea1c422beaa35c4bc1161e7702935fef9e0f382cb9cd1 SHA512 413ab486d6654017ac3898ddeea9481b93c8e0bedefcaddf5e87f24acb9a6883b883ad33d3fc49c6e65d2bd0e2569f8481b0cf4ee606dd6017fce25b4e35d97f
 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 4735e85999b8..d84ebc1d1712 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.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="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 4d90b85607a5..49b2b1116db3 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.0.tar.xz 3492928 BLAKE2B bab8682ec83a98f7f405a667e9fc9ad4b0fa334e0f1f3b1ba5bd8e17af1c61c65031ebe2fe56b8321df142f5a4d8dec348793bba0fc3c195c6722d635d52a291 SHA512 58c8da3522c75470f5b42492bddd83f61d828fa2a3fb8a78d15813f6d1f1df22bd808f25ae7228bf2e821bacdcc5665b889bac3ea8364c4dac288f95e817e98a
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 EBUILD glade-3.20.0.ebuild 2390 BLAKE2B 22cd5f2417192d963cbb2ff1376d9fa4b5eb44aba78f53c233dc5fd159fb93fa2c03096d71a35cd89321dd2d1f28092a503a4fd0f5cc8883da76854d9a470292 SHA512 98673ca19010e2a63c5c7c9c79dbfdb65939324004c7be6d8b846684411af444ef1fc499234296bfff24d5f8e03842781378d6099356af8b6dc236e757bdf047
-EBUILD glade-3.20.2.ebuild 2398 BLAKE2B e647eac6105adaaf6f8831b200e1f5095cedb7ec7129a8c1fefd7992c42747bc0f9f939d72f907838b5cf33ff7d3ce53a02bd305d2f67d62b380363794882045 SHA512 0743e8e2f3216d4f2c79d520ae58d8d521f59b60fa5093568c8714a8eb39e54e1533a2f106cd1e34baf5bc87eb53b1bec9dc7c5c0a18cb4d80e5b1e6bd4f0105
+EBUILD glade-3.20.2.ebuild 2397 BLAKE2B 46ea62a8620bdfbef63ffe8621a1ef46a183aff3ccd3d5c49a8b2d50cd069f463e0b17c79b7fb3673a57f2acb409840680d54fa7980f2441e30c4ca0c4d1ea44 SHA512 beaa99674cc7063d278e69309fb1956fa278234e61efb7a0f8df83b4e2d2ab5ba7a0685630fbaf0a8d97722f47bf1fb7b471659aa9fb1f001746c8c288242828
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
index 2f8c73bbc2ca..2f11faca6166 100644
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ b/dev-util/glade/glade-3.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/goland/Manifest b/dev-util/goland/Manifest
index 5ddc7a976443..ace2cf421347 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,5 +1,5 @@
-DIST goland-173.3531.21.tar.gz 213040527 BLAKE2B 57fbc0820fb09aa23ebad45c9f6477469f71f84d3abb9e77eba45a90c89695754a7800ff768b63b815b48a1aa35631af0332a0a9af10b3e6dc6d22c587aef30c SHA512 db2deb4e52fb4135e3fb27c63a181c34acddf61dd2bedf81e50144a85b3e9bcb1a7490532b6841815e2b888c660aa26bc8c3176f83bb30bcf20ec568cdfeb65b
+DIST goland-2017.3.1.tar.gz 213951052 BLAKE2B 019ebf772443dd9f5e81cfb3717f5e4cb19ec3c8a67eb20037b6b72c97bf3e382e073660021aac22c3e6dbef9b71c4642acd026e10f27e09a5c60002cc2fc84e SHA512 b4d0251ede2a80b1cabf6b29e362a1679929d4f24530a88f6bc80482bb8fbd36d0d619d94b0cce45ca2c92142335a84141aa6e54fb42154ac09097e8b7318a16
 DIST goland-2017.3.tar.gz 213261483 BLAKE2B 4c84d073265fc701dc0f34571850c2fab05e2e07479d9dc886af660a097a361a5532cf9078569e9dc8cee0322f92544683e9c05689d025bb39de925a10e05c2d SHA512 5fa8d61850e31c1db82e32d9ccccaad71fc00db85a31bc423384b443819d9dc6f3ba11399c580d8eb9c3fe698b437c13072fc49126359bd405b7d57e12c92328
-EBUILD goland-173.3531.21.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
+EBUILD goland-2017.3.1.ebuild 1043 BLAKE2B da6f4c5156e10afe541dce7dd6f3221488cc5cc893a5ce198c0a77ec4de7b40e9ace46a3675221dc52ede0c5243ae884fe5f682d4fbed018f29719a7991d025f SHA512 0b15d7f4eef60f271ba5df45d9dadb704b8bb5eee596b3826d871f533c6efe6b1fb4ea90148346caf3d684ec485684cd0c995388487506cbc0cca0f3cbdecf0e
 EBUILD goland-2017.3.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-173.3531.21.ebuild b/dev-util/goland/goland-2017.3.1.ebuild
index 3698daaba68c..94765715499f 100644
--- a/dev-util/goland/goland-173.3531.21.ebuild
+++ b/dev-util/goland/goland-2017.3.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
@@ -17,7 +17,7 @@ LICENSE="IDEA
 
 QA_PREBUILT="opt/${P}/*"
 
-S=${WORKDIR}/GoLand-${PV}
+S=${WORKDIR}/GoLand-${PV%.*}
 
 RDEPEND="dev-lang/go"
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index f0b93e4e3094..8c21833d3562 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -7,6 +7,6 @@ EBUILD meson-0.41.2.ebuild 797 BLAKE2B 8d070beaa894b2a3c4c96fa1dd538ec6e32bf6291
 EBUILD meson-0.42.0.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
 EBUILD meson-0.42.1.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
 EBUILD meson-0.43.0.ebuild 798 BLAKE2B 2696dae59c445e29d0538d6a8cb9656647f3931f8047fe95e6af1c06ea8797ebbe22748fe2ffffc31dbdeb7e152dde1c87bdd4ebd6f49bcbc3c7b02953ae8562 SHA512 89385f25f16ac8d9b289618eb313c9a4d6e44c11ed71ce5e9da2d2f0b160accd02991ce33d412367c3597c153950ee206a5420362b295971ee2e685cf417bc05
-EBUILD meson-0.44.0.ebuild 883 BLAKE2B 6ff58ab085b6fb618685bcd7a9baee45a9d42b66a3353bb6905fb1a64e1ef8fa2fe746e1963005b2fe5be4d8f24edbc5a0517466a8111dba56fa08831ed9d0da SHA512 28dd2ac2ed97fec08b0463c32c489cb6467599715aa91b8aaa5316aa5d3b7047c5055b140c59f4a20e6d00d55b4112f73dfd614299e0d634899e952cedc2fc19
-EBUILD meson-9999.ebuild 792 BLAKE2B 05d42a8f579b200ad6f230c6b02fa3c4ce0d216bc6e676f7873d179e69057e5d09f52f54402df6d8a8fa65de194259a0f1669cefda2d2b0e3df66dea1cce169c SHA512 1f7ab26089b79546881d031a44b57a98715163bb973e7aae9c25ee10caab24a75fbf4bc8ec1bf0ea561e41ca547090dc22e1026ac027730df6d0a8bab8b7d180
+EBUILD meson-0.44.0.ebuild 899 BLAKE2B 2065872eed39e54e84cb74dbf28f2e8f9e7230f8ce34bd23a6da35a863859510757416bc0dd422de8d69b34a90e72bfa7a18da7d65ae411519242f115a8740d5 SHA512 024e8b698cb4198edea6d18e93e764f74e7f83a4cf908ac23fc2fe688998325d64c08188e493602beeb31bfa04043f3ea04d837b10e23c2e347cfe9d0f24b7c6
+EBUILD meson-9999.ebuild 814 BLAKE2B 1e7439398a08e8059c0fcd046b136b44ee5f2a1c074914592b052737583ea1d9eea130df41ca9c917c0732a6c451fddcf24a86919e1c8bb78356553450141317 SHA512 e987956ed667d35465300d0db312ce05b2c398dc10a731e9ea416d9645c0f1b9dbcfa74196490f2aa8e595488c16702439992ac49871a1fea397a4e6d0d686d8
 MISC metadata.xml 443 BLAKE2B df3275dde920dd96d5a078c34d08793d7e377a64910b30b6620a4365a61005d63ba2dfd630191765c47b52e9b309d95dad18d86a10276308f4253c5faca078cf SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826
diff --git a/dev-util/meson/meson-0.44.0.ebuild b/dev-util/meson/meson-0.44.0.ebuild
index c9d0ed682e2b..4932f997995e 100644
--- a/dev-util/meson/meson-0.44.0.ebuild
+++ b/dev-util/meson/meson-0.44.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index bd996e33f689..5cacad33d492 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 3a7cb83ffc37..509d70653edf 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2
 DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 EBUILD ninja-1.7.2.ebuild 2654 BLAKE2B 6d06ebc1142aa72cc51f6ef11c42b9798adf36c98c778ea660ec88595c6b558458f3b2d4b988cea5c27b9daa717c78334da132eb40fd18ef50b6a70d0050e123 SHA512 715d1473f7515354f0c3f3d8c7017abbf45509c477b1d66f6c4e7cd3d2dac0d85fe68a35feed89c77be4d1d10540039a9966abe35c453d3bb6965709686e0cd3
-EBUILD ninja-1.8.2.ebuild 2614 BLAKE2B c8c1a78c7e6144b59fdfa8b55217205c97400ff3d8d9d8d05c26c9372411602dd4140d78c6f516b2561c25b2cb5ea8a030831ef4956b7912103f6ca830977592 SHA512 d62ed1c6428be682b5afdec9d154255474be55ddfa4bf224133e4978ca80bf2128f447013f623df176a165a53e68c5aabe261ad2f24094024bb805d1b1b0b242
+EBUILD ninja-1.8.2.ebuild 2610 BLAKE2B 96dcba452cd3f358a75a73d1ef3422055833aef0f08497cf48bcf20a4e2e8b9d2e871b272202f9d0814d56e0be009962c428e0561600469d91818e8bc6a49bdd SHA512 b82f91e3faf70dd5b345725b1a5e9de68f1929ed3aaccaf4cbce909cbf00bbe068862604fca732f81a6e94ac46e8cd3420470ade28c24196928c664e8f578742
 EBUILD ninja-9999.ebuild 2617 BLAKE2B b39d201c06de2faed1e66931a03a5e3aa7a09e12a12cd2d618b7cb3537054205cc9e137fdc811f6fae3f0cbae1ec75a4a0c69dd880ba1cd9dcf15d27bec790f2 SHA512 510034c91bc8be87f2e267e3d38ef86f0fe27dc8d2ca634e302b47a1752cd7caa379055f91c493d248693ae5c472ca4987870f0f126b41be0507dd0872ebcce8
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index a98527082e3a..f956707544f1 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index 88b73f81ccac..410580dd35ca 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,5 +1,5 @@
 DIST vbindiff-3.0_beta4.tar.gz 121538 BLAKE2B 2d9d548461497d27eeb26a96135ff0c9e60e069b8bea8f640ae526267bb53d0da3550b8b251cd922b131d1bf499d6c2c0c6353a9e75a94af61256340944afb5a SHA512 6437f107fe58e8343ccd8cb65b3c562d5cb25445fcce284c7ce73fe4a2ed7191100595b9cd0c88d5a630a176f4c4bd374625c97c109a6ee14f1f56ca136d23da
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
 EBUILD vbindiff-3.0_beta4-r1.ebuild 512 BLAKE2B 0b23603fd9d90585ab62bea8e128b206fb877b221fdef67aa2a266098755ebb9aa3ebd870d0c3f53fb5c48853153823240a79a9f5cd046893a7ab372a7204fbd SHA512 cccc8ba05665680717ee48ff6f38eeaa12ac8e7eaab1c88f969b0667a027aa10f5c55fa37cd8cf2a0dfe3e8fb6b0e4c300ee022e1ea5d322239d31988ee385db
-EBUILD vbindiff-3.0_beta5.ebuild 414 BLAKE2B 6879b68121afa05dc92827923a0debf7f2234d68a884582002f68394f057f15bafed549877defca598a3504aee2585b853cf9d6e21646a3ecbaf14c073efa275 SHA512 c8e55b4e303fd62a1e286088844978aca56ac3c264cce45bc75742766046df43d172b7d5ad677837057bfa87e1a68ca206b9ad85da652f1ee5a1c05c56a40cfb
+EBUILD vbindiff-3.0_beta5.ebuild 413 BLAKE2B 85e0cb9171cc9594fedfe932ab14ffd3f80a60f33c23ae66a43794a056fa02ab7fc4a3ff0b3d04659614d97ff6d29dbe8e734879ead4987c38752af13166c167 SHA512 a8e14ce4315ab9ebff4df273c347eb3bceb9c20212395b29423dca42f8d7313cc6f38d7fd73f650e39ae5d6c2ece986051686548da83b35adbd5c552f9ec848e
 MISC metadata.xml 331 BLAKE2B e1827fc3619bfde5ed89a9eebb60943e22419a20e89d6ff3441f30195bb05fdafff6549cf09985e43a58712cf5846f9eec82a792dd66505cded6525c1c5235a2 SHA512 32b9763a0137fc5fb36751a38c9476a6f813ff118f4cc0a491dcae75439fb7ce40f934d6d0cffb0397ad11b85373859791622884c194ddddd3bd5bb03427001f
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
index 791b2b611b80..755647dd488a 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mrdudz/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index dcde5918d169..adaa9e2cf272 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,5 +1,7 @@
 AUX prefix2.patch 1031 BLAKE2B 489bc334d6119f1175bf4ea671644ae1878a680b237c424f73ae99ebc20e398d070716bce1df2fa554da382882385693ead202b19af1aaf979b4eff3639dc5b5 SHA512 747b973ec84a31213de84fc15f40d4d9dce854a32602b3dffaac088992578a07f48047358bf7c38b6ca597c251232f48432404836cb2304f5423db4ddf2f9345
 DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
+DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
 EBUILD wstool-0.1.13.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
+EBUILD wstool-0.1.17.ebuild 1455 BLAKE2B 074eb1dcbe01cab0a3ae86279207642ba5051603c19077ed0ea52ae0cfa9003623dcd8562458bba60ce1a16be996eaf0433840856a2011c7c66602a790e444e0 SHA512 f59f23d2669288f3234f5e69421c4d496258d5e8264a9731741698791c3fadfd6e3f44280fcbb4d1bf1f48d3b4ba209f2b679cf2fabe82cafc5115bbd5ad7815
 EBUILD wstool-9999.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
new file mode 100644
index 000000000000..5615dbd2b241
--- /dev/null
+++ b/dev-util/wstool/wstool-0.1.17.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/wstool"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Commands to manage several local SCM repositories for ROS"
+HOMEPAGE="http://wiki.ros.org/wstool"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+PATCHES=( "${FILESDIR}/prefix2.patch" )
+DISTUTILS_IN_SOURCE_BUILD="yes"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	# command to run tests
+	nosetests --with-coverage --cover-package=wstool || die
+}