gentoo resync : 10.11.2017

10 files changed, 12 insertions, 82 deletions

diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 78bb4cd7b01a..6e6800fac201 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,9 +1,7 @@
 AUX airdcpp-webclient-2.1.0-disable-automagic.patch 1106 SHA256 d9e1013899759a8ff2511d6384b54ca56a6a6a018f2420cfebec91b232cfdb4b SHA512 9e16724429869d03138142188b3105e6cd360a6e99595329702fbe5724ce98a951c5c6ae1649df205eeb6203fd99a97957bc82da842234791223690296bbdaac WHIRLPOOL 7814d4b68cf2fba75e6de5e5b50b41a592e7ef7d2fa7d07ac5195d956b35609ef0eacb6dbbd0cf471cc0938fb9efc004f6174efb62a31465e078d023104502d1
 AUX airdcppd.confd 198 SHA256 69890132eb0d7479f76a79903568022bfe4d816d79ec4b79f26ef2c0d45afa72 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e WHIRLPOOL 918159b29016e9a654ec72b2c3f3dd583ae2faf728318c6e65dcd5ef68cd259545cdff351396aaa57ab0610b6eb00180d2b9bc8265249f9cccbce4c69b31c569
-AUX airdcppd.initd 585 SHA256 82e2a41dd546e609c09b4961bef29751401a7b7349f10de770b83875c1151ecc SHA512 054974808c2e457a36d9b916b60ec0fce68fdfff6b0d1055a03729911d29f3c40ea746d7200880f91e49775c142c57ba3b029ab6389986a31510d780dbcea4b9 WHIRLPOOL 56b8a53c41cc6d55c06a959ed6f6771c1ca832023ee9a2719869c5ac0029ead0b51521d44f824aa591ab78782106163886ab5ece291b08e6837693ff7b881a37
-DIST airdcpp-webclient-2.1.0.tar.gz 844435 SHA256 a8d8a33e3974d23009359709da0bee85e8983e3ea1fe78f21a867078f93b81fa SHA512 755555d30183e772ad5d2e38a813f548e3322ca034b759200f289a834ae21b64f56102f57a13832a837e8a11324efe74a860e941a0f28a02d1f843aed92a328f WHIRLPOOL 5a0a61bcf0ad1de1706786fc2080aeba0ae634386957876a20d1ca638d3fc8b724f5c866d59588f4958a6010fc192d474f1cfe7ff04d4403106ba631b800739b
-DIST airdcpp-webclient-2.2.0.tar.gz 844968 SHA256 77cde1acd8730370e87e3546f9895bb993a459ad8f70e1713803ec3ba0a849cb SHA512 a7fc608109ee5823f844bd575d9355d0cbb4094c89e5dcba522018685d969974e82d3dea56bd334591a424010e0b43858f227e2bb66d738c0151c1456175800d WHIRLPOOL 040076d1fd2d7973ccaa6dd0935c0f2b1828c6e4d3bff6de362fd53656d54bf9a9c5733c23fbee35fd6ece897fd5a2ca2b277ceeda51b03c66277f2c81759eb3
-EBUILD airdcpp-webclient-2.1.0.ebuild 1545 SHA256 549d84527e6b153ef95f46da1b87fa9096d70cdadeaea0d7b2f5f4646b59a080 SHA512 19611bc2fd11c3b5fae5ad5000be6109040cd018a81bd9226079f0144eed66df94f14d931e3dcafc6c751d401c20be8cd6a65cba373dd884839267e4667a8e49 WHIRLPOOL 84e699aaad06c8728a7631ea23e2605aedddb15bee62d58458905961c49845209b1041315524ad5b1d032a5e9f22a7e6527b63b887e8ecd70ca3144096a7af49
-EBUILD airdcpp-webclient-2.2.0.ebuild 1431 SHA256 5c52f29d0a3179df26b04b81999017f6e0a86b95581941237c74c0f53ed81425 SHA512 40fd30c487e3ac0eb2cc80ed3fc40bdda23adb9be229499a47b4abb12e2cff73fd95ab1cc2e920ae8f867d6f3b55cbd441ecee3396bd465b0dbfc0678ad1e902 WHIRLPOOL 00a09f942af4450bb63a4feb233902a9436fce84f8fc10d10ffbe90052700c5507d72cd56ddfc2b8ee210be7da73f4d37229bf77bf6e82b2c0d1b8fed6291779
+AUX airdcppd.initd 584 SHA256 8f3e9abf7d713fa4591060aaec77933894dc7685d8f8f68767342238fea3a259 SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721 WHIRLPOOL ffab7c4345e7b2d49e5db04096077374493d2ec9027f26c94c3239f3d3666024a1ded52c58ecaaba18e4f973ed60cb751f32f7146942480e084bd03917b51f12
+DIST airdcpp-webclient-2.2.1.tar.gz 845507 SHA256 19286ab01fab6be27dbb5ccbcbc09bcc9dacc3108fb3b285916803933e36421e SHA512 97c5b32e590b2fc735fe4978c1a173272c55f84fe97212f7cd1e8bd4a279553c1d992573185781aeceafbbe6bb51303ddb2cd164c748fa798993a661f3abfb81 WHIRLPOOL 6aca14b4af57a1138cd98fe68b7eb49c4d13da6bdf4e4e47ce6f26810d17516376d6e7599ca88c9a364208d9ba1d41436816bcc3ec0177875f72ae6c40a1842b
+EBUILD airdcpp-webclient-2.2.1.ebuild 1431 SHA256 5c52f29d0a3179df26b04b81999017f6e0a86b95581941237c74c0f53ed81425 SHA512 40fd30c487e3ac0eb2cc80ed3fc40bdda23adb9be229499a47b4abb12e2cff73fd95ab1cc2e920ae8f867d6f3b55cbd441ecee3396bd465b0dbfc0678ad1e902 WHIRLPOOL 00a09f942af4450bb63a4feb233902a9436fce84f8fc10d10ffbe90052700c5507d72cd56ddfc2b8ee210be7da73f4d37229bf77bf6e82b2c0d1b8fed6291779
 MISC ChangeLog 5774 SHA256 413c74dd7918bb53d1912dd52e6573d4d5cc434e7f4c90a1449d9caa4591498b SHA512 a1cec201ee12d72078c8c74d1430ae7042defb53807d2136deb157db7c970c9be1cdde945b412153dc991af11bfba46d972cd4b94b8ed33018280e016702f63b WHIRLPOOL d4b0d8dccd5dab5fe087197b7a3f7ef3cc0bb44eae8794f72abd680e93a6dbd1a72b597bc49f20f5303d58996857d6dde122b44f9986305e29d866f7df2ceffc
 MISC metadata.xml 928 SHA256 1e43915c6ee247c2f6042a67e85e40a26ee440a6bd357c6f4055fa08132ca5b6 SHA512 ceccd70826faff18052a1cfe3cdcef1a253ed1227565fa94e865fba8c0a5b8a03535844a3b78d98f6bc26e8a9f29202f0bf1e19fa833d4356ace1e6b26e3936e WHIRLPOOL 60fac94dc950612f19a1693460127a8b60357c4fb12fd91ba2dcceb5f06eec33088e83a96daf51b265acc36631c785e957d5809baf2a387f62692bd4e63f7286
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild
deleted file mode 100644
index cee109040c4f..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-
-inherit cmake-utils python-any-r1 user
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="nat-pmp +tbb +webui"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-cpp/websocketpp
-	dev-libs/boost:=
-	dev-libs/geoip
-	dev-libs/leveldb:=
-	dev-libs/openssl:0=[-bindist]
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	virtual/libiconv
-	nat-pmp? ( net-libs/libnatpmp:= )
-	tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-# https://github.com/airdcpp-web/airdcpp-webclient/pull/248
-PATCHES=( "${FILESDIR}/${P}-disable-automagic.patch" )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	enewgroup airdcppd
-	enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_WEB_UI=OFF
-		-DENABLE_NATPMP=$(usex nat-pmp)
-		-DENABLE_TBB=$(usex tbb)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
-	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	keepdir /var/lib/airdcppd
-	fowners airdcppd:airdcppd /var/lib/airdcppd
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Run 'airdcppd --configure' to set up ports and authentication"
-	fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.1.ebuild
index fd8f46fe630b..fd8f46fe630b 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.1.ebuild
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.initd b/net-p2p/airdcpp-webclient/files/airdcppd.initd
index 1cad833d8ae2..ed322b3e35a7 100644
--- a/net-p2p/airdcpp-webclient/files/airdcppd.initd
+++ b/net-p2p/airdcpp-webclient/files/airdcppd.initd
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 AIRDCPPD_USER="${AIRDCPPD_USER:-${RC_SVCNAME}}"
 AIRDCPPD_GROUP="${AIRDCPPD_GROUP:-${RC_SVCNAME}}"
-AIRDCPPD_UMASK="${SYNCTHING_UMASK:-007}"
+AIRDCPPD_UMASK="${AIRDCPPD_UMASK:-007}"
 AIRDCPPD_HOME="$(getent passwd "${AIRDCPPD_USER}" | cut -d: -f6)"
 
 command="/usr/bin/airdcppd"
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 65a65cd15431..b4ed9e265394 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -5,7 +5,7 @@ DIST qbittorrent-3.3.12.tar.xz 2989604 SHA256 56528c47f09b316ecf682e3896157c76c1
 DIST qbittorrent-3.3.16.tar.xz 2961420 SHA256 ea08a61872c397258c2627780f6e09fe777189d9a57cc5e02a656da9aeb0be57 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117 WHIRLPOOL dec3eab159c9f930d5c2a2f123b089c6ce84e7bcbd83d84f996c1a0167e4bbbdf468492a136a86485cc73611f044587e940910e34260535f2074e84680369ccb
 EBUILD qbittorrent-3.3.10.ebuild 1143 SHA256 456ebc7325327db1f1d1b038133beec898c92934d64a6b6bbf11995d0dbcca6e SHA512 61cb17043dbce205655b77e1c0012b7666b15cb48427344b57c17ad770fe95225eabcffd1d09fe4043bd9a10a9c448938a8f10802f89453bce8b884ba698fa1e WHIRLPOOL dec4961d20b0d9011ca3813ca853b4b3da782a58b1e94442c08992ea6dbf5804a49f5d6a1234ce90aea7bddb25786097d9dd3cba923f561c7b97d6e811975e21
 EBUILD qbittorrent-3.3.12.ebuild 1271 SHA256 fe043fa87998e4c7c106a98e0d37c59e9b19150cf58cf1324743e2237d048ed7 SHA512 d9c51c941f70188ece4a0eccdcb72520c04fb0e08270aa3dff9cc7d44f7033d0e4bd9ac45d8a0231c6a7287bc26fff6f084b51390de36ef704855e107436ce3f WHIRLPOOL 4cc0bb6e9b890a8c23d06abdcf143a94ef3754343f885795c3f23196615dfc96ebef435873faa79bd14c59a77b1b92f3d8554f7670bd0dfe0c6534e7581c010d
-EBUILD qbittorrent-3.3.16.ebuild 1292 SHA256 e0f1ce4ff81aee64819d7db22b41df6ea6f3eafb46126be55a63ee768e038684 SHA512 936e7cdbe423847ae5e738d5a3dd66ecaa88e257d01d8dc6dc80e0a626ca46793fdee459f71045d43fff2341150553368340860a1f03bd708474aba3887364eb WHIRLPOOL 697651d20cd532fede6ff059103001e2a43fcab6ffb4f511f3b18ccb32b9ffbf6f8fd32a99f63f4573784ef7b19b45620b5f12cee096788672a9c83217cee806
+EBUILD qbittorrent-3.3.16.ebuild 1290 SHA256 6cc94c4fff130b586ac0c4ab06396eb5ecf432860c8d9a30a89e0bb846e3c981 SHA512 bea878ee026a52c093a026c355dbcbd113b38370dbe6344f424193549189720b5ef2a9999e35e2ec169e96a2334b764da8a003cafc003c9963d9f6771f0c3663 WHIRLPOOL 9e33075e6699db926f255de6e9f2e694fc18cfc98de4b57fdc057b80d15eca5a7d4b2ea33b575d527a91e1d6174a6f59eba724918f3497d977eaeb917c6af6e1
 EBUILD qbittorrent-9999.ebuild 1119 SHA256 84a1b93ffc45398b59b158ebf1ce4e3e2c9f3029174267942f477d3bea43b8ed SHA512 a52298e91c666f3d16cd730ecd3752c058490bef3ea8c563fabcaa7b2ecec279febdee48ae28a96d0c0d0f997bca777778443ac53716a6f69ce62ad992a9233b WHIRLPOOL d1718b83679df5ac48f7341457705ec07aee445d6f337dbea7c226866359cef6ac44580ee44b29d2e28d94944febbe11a8d861ffa537d2ff91aa2d7b43e05531
 MISC ChangeLog 6485 SHA256 51231493196f2cc40fc1694d37d523c7a0655a5829fe1377166aa664a3a5bca3 SHA512 ba632cc51536c468fe5f8a16359b4b202d8555b12d7cb2fed0c2005f0e96ea540c91e93c29f3efc6ebe546290812fb9b2497b8217d96c070506aa34e61d33bf9 WHIRLPOOL e60ba9887bccd2d4c341436f5239295af7c6995658e128a3e317330b231781af687b6a9e6bdaa699caf0f240b8dbf3ebcb8f0b0a912f562e90747e60407573e4
 MISC ChangeLog-2015 42305 SHA256 8f6966bb488506981770b475e1d8ecd358be38443a5a7aed21a01322cb8ffd8d SHA512 0ccca0b46e2b34918746869484455a4e3216760fde4f959083646633cf22ec40dca153197d4b0a5603aca2b83cc1a8c51a9aaedc5ecac37bd6d285fdf20a8628 WHIRLPOOL b2d3e248049eb72d243b256cfd7a2085520d58b1e16c2259f8861ced04fadc800aebdad6a30763269398b7697be445422f796f83a91ad483be63ad5eb242d76a
diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
index 98163e4f20cf..ddac9c49ab69 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${P/_}
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index a2172efccaf1..3827bd17b191 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -6,7 +6,7 @@ AUX rtorrentd.conf 13 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc63
 AUX rtorrentd.init 702 SHA256 0c5999447341924265eb520ae378b5871949dbf19c70699fbbd34c2c78d18475 SHA512 6ac954e78dfa29a56ccfb53f666a96b7e93ec919b613f609ce16e312d44ab7c3adb849af826695494a92f882fb051f3e7c8a97d1b283ea9ac8673333ef8f8ab6 WHIRLPOOL 41e118f3a2825752f37af32807f4c32c79d4ac4631ceca8afa61798d104e6036aeb631e8ba7842523b4546a5ac41d61cf8b391e2db5bc0e76ba15ae532ac3982
 AUX rtorrentd_at.service 308 SHA256 f3de3506146e3dac6698028378d51a9f62a2fa8957173b250bf607bc6ceb57e8 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615 WHIRLPOOL 8060403740dec4d92c8527c1b5b5d5902fbcdb43f20d2639e3fc644bc7bbd73c890c76d1f85c3bec9ab9e8a7d5fe74e779b8bdaaa3f8a52c234e8ce4de417778
 DIST rtorrent-0.9.6.tar.gz 610845 SHA256 1e69c24f1f26f8f07d58d673480dc392bfc4317818c1115265b08a7813ff5b0e SHA512 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75 WHIRLPOOL df5878014087d894e9796508627ec508ff5d042c78cc09e8d9ae57a7f9556bb549f9900e3995a7296420438ca0edda245907f8ae0c71d5a0ae28c3af7a6f992e
-EBUILD rtorrent-0.9.6-r1.ebuild 1664 SHA256 95ed6f8522cb26a9a8538bc73067e935e01e12b92bba6ab1ff079b5c741eb6fb SHA512 0fcf4ff972bb7da89137be847cb33f479cd7d95ec55b2d946b2deb2e82e0036b13e187cf6d90685e4bdc7a1db05937fa7ca4af7a58f6048bdc4a4a231b2935c4 WHIRLPOOL f00d077e5cacfec880854310e93258c7ba6dfd34b0293cce95a921b4318e788df8e35b6b4f37ac72d673a214e05e905a16bef7bfa9e608c4ba79b6d0dbca11f6
+EBUILD rtorrent-0.9.6-r1.ebuild 1663 SHA256 0ee57d142c2f0b2c599b04410def220f32b9527f78e640dd475b545c86a8bab7 SHA512 7fc8f8a91ee3c7a4ea4bd422cd139e8ba02e6925b21bb21127e36e013c4625d60b666bff713a00ed6f1d74697e9e256b0f14ca787e723a596739d5b8df1fffee WHIRLPOOL bd5c5231cfcec41035f6db5e2d75fa8a64a7780834491be14b21614e0e0dd3d264d7508550bc6d26a51f3f236e4aefce3bb4e91a9b86de3c388321a262679ea4
 EBUILD rtorrent-0.9.6.ebuild 1607 SHA256 65df8be3e41caa2916f752792b10c9e9cbe138a4ada3a31d8b65566339fcea43 SHA512 8fe7ab26bd876073b09ae926e979a32d926374a411a70753b7133731f5a381ec2577df095689fa9fc7d759792e62dae7734324e24446b3c01f4f97322f17f04b WHIRLPOOL a34343707fbf59286e33d087b23b4452106cab797a8c2371ea9c3e15de5a93a10537b7a983941db9c09c054b6e46c29c065c3840985fa723d9b2e204fa11c8b7
 MISC ChangeLog 4603 SHA256 4f54e944391ea3138ded299645d00aec5e37d4ac53d000259c72b7a66fd15e04 SHA512 7468aca2ff09fe11064213d6fd25b2946b2dcdf7fcad7cbcaa23ecbcdd2e670d83aceb80e48dcec0bfbf9c904cce3f58f88c4632a4e09458b67760927acb035c WHIRLPOOL c90988ac796a33ee5e35a81172fa8cddc1614fd2a89401c9b594dddb81efa0c75ab6919d8f8682fe6ffa531c6b98a057d1e3a9ed7644f8a3d9bb75f3e5964e7b
 MISC ChangeLog-2015 30299 SHA256 56a50fc40703456a109c21b62c768a999c8baf18684ff35658fda55e08cc2790 SHA512 661d2db8b47ec1f7463e62e412f2a9d67b01536d4401eafa77521af7805c4d3caf61249de9cee8585d0555c32dc65dd8a21127eeef8251caef3f93b8c5199785 WHIRLPOOL d6e32052df092c0ba95955c7f07f7bfb4fd39d5fbad593949c0ca69d9aa85cf676ec728c5d4745b0443fb799b1bcb2743fcda2cfc574603856f4e0b864fb8e27
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
index 049115416efa..89ba8019daab 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug ipv6 selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index dc02b83b2425..1d5a2b1f2ee3 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -4,9 +4,9 @@ AUX strelaysrv.logrotate 102 SHA256 4fcaa1822d338c8e571156cf00de28daf1801f8b6159
 AUX syncthing.confd 549 SHA256 eaa8062872bae4cc451392ef6d05e093b5c18f7589bd4e6e289737a55bc7d22d SHA512 a231c526c2e03caf06a8aeba790ca764477f738633e1d2d8ca82766be143705b1062c957822ac19406e0e6ac97c6af47cb7179639980492e112dd116d624c029 WHIRLPOOL 555e7622f7124a0b5d8ae018482688760d651522d7420d773dcbe3d86b03e010aa39d46f125a9c2c5e4d9f54270d559bc7ed320d95f7e897a4fc1dc5c9bc41f0
 AUX syncthing.initd 1195 SHA256 66a0007b26f7be9faa4f52a97b11561b58201d5e443e88c6d21b76a936ba48cd SHA512 2e327a0f09523da2e746ec559c82ddb5667d98aff0c967b9d2d27c678163f80bdb0b19487ce7b7f1664c52754c92e5f6a5f78496a8b3cb1f450e2159ba68c1ae WHIRLPOOL c886c4c73453bf44c7da5cbe8d37ff8a4ed7c10ec1041a1da62b80516096bb9cdce1f795daaac0f4dcee09995bfc3809d151ef9852687208f3c3c8b2140441bf
 AUX syncthing.logrotate 101 SHA256 2a0932721a2e7b0393318e686cfd91de70a693cecb900b3914d43694316105f9 SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67 WHIRLPOOL 7f6183440cc84b051389a6f2a36617c7774555d3ea3c3d87b2cfc98e6e247d1a7fa4c1efccf6ddb95198700953e56bb47e3c03ff53203fb5d2623fe1c3b97215
-DIST syncthing-0.14.35.tar.gz 8235883 SHA256 58509294a150d137fbd005b5629d2859cce661d25e8063505813c4e7faa62fae SHA512 2a3de76e7118be6e91b8bc6bc69b10e250755836b378fa762e0feaed280bb2206d2e4552f09fd230d51e246633108fd8cff343ac355742ebb1bd06c2145fe086 WHIRLPOOL bdc971896378fe04576273cab23432f3dfdd96f77d464c0ea0bc8143771a40a15520d20ce2e76ccd790e78c04421f92e31ce1af04f66760a4f101b8b67b6c852
 DIST syncthing-0.14.38.tar.gz 8246629 SHA256 76c1dab5873d6f3b9799ad3e5dcab4c17fb0f5a699fe845bd081f162d96f4477 SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5 WHIRLPOOL c71799207eaa6dfac7839ead25dd551c76f00823f70d9bfc1bc72409ef410dbdb28cf9df3742a97a56f12cf0c705262299eec164313a027118be177ce6b5458f
-EBUILD syncthing-0.14.35.ebuild 3607 SHA256 6901ccf02eca84c69a72ade9ec1b3bd4ce4135a992f933b04c1f97ade6f5ab2b SHA512 b284114b05f85bdc2849588726c637229fe4cdefe1706bc37bc6def80e77d4d3cda68d6e268f0dc5da915b241d157e8a7f21bab2708f305b86de5706aaa78baa WHIRLPOOL ea5aaa0a7f25733d8a52b68b4b18ecb6109111de1e126755cefdf9870d26de2e8293e5d8a33cf65e3866905f288760bbb114aa4a8994515b112c16ff69809bfd
+DIST syncthing-0.14.40.tar.gz 8300965 SHA256 b9820dceb472531f20ebd18ab53a66876970c9d78d22c93ff53c3c879363d6be SHA512 3e79b034d71d1c862d21433f897dc774d3e421628804ed9c8304d4ed0dccb90fa8ec738aef476bf074ba70d4c9947114c5b6a8326faa5d6b6e5dcc03dacabecb WHIRLPOOL cad84ccdd6ed94cf2ea664f13c77b53a51cfa1928723e898134654a7cff9e05748438cc05620c9bae6f147a173f4ed4d564a1c48ccdb73b87c7d3f7a39089494
 EBUILD syncthing-0.14.38.ebuild 3606 SHA256 a739a992e9ddab3286b9894b7a63c6564f9355f34e1d4064014e4483c8f1646e SHA512 938ed70df23ac18d3c96ca48fd27670c9c1d386877e3012ef9267582247bc7f2ebe8b036e0f913906d721b89fe8941177d931e8a7ee06fd12ab841e81f2d4cfd WHIRLPOOL 6a4b3519e3a927b110368b2814b2feddcee1a77510a8dcd0cb783558397af44a3af5a83bb928e8f5659f4e7620eb6f545d001ede17884a425c10ed0f5bb23b5e
+EBUILD syncthing-0.14.40.ebuild 3607 SHA256 7ae1c0ae790554adf30806a6fb40d2b5a0eb312559068286a4dc65e109ec7c6d SHA512 054d1d9ba8f0a9a74cf0f2211012ba206068a00b8d750df6a9d12d591ce5e9b558cf4fa03a9376e016a2c08fe37b3678f6c54f2e086a8556a0168a83e31bb90a WHIRLPOOL 6a7de842b4073bebcff8b70e9617fee8d0e65c09fc3698410aefbc5f258002413b2c27c236f2537c4f55dced0bd5e4e910d354cfe571dbc83efaf2e78441ba54
 MISC ChangeLog 13264 SHA256 2e3ae89570dc2f95fa7d62fd713ec4d56cadf71bfe4d8b77fc68f96843b21da6 SHA512 451d42e235ab534be4fc93c84f632b2b861bcbcb111679f22b7bc279e08e72f2475d4f54d987dbc0466a9357b5ac1f0058330e1fbd464a25aa3755a6505db24b WHIRLPOOL 6b0051bb5d8dde5bbf8d62c3237e57bf2a7b9fb80e29b7c9fa45f57ae67b20687f85b6d54ca3aa864ba03c8a923a752c7fa7f87bf7a607508ae648486d666f5d
 MISC metadata.xml 869 SHA256 7f7c7164638ec1ce450031fd3a99efc7c8d16749bea972365d43b11e336ee457 SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238 WHIRLPOOL 0f5a6475810b8aa47fb7696ff4f20b9954552143a4612d292b7c6b3f764d63112eb71796e9d4e21266c67e49bccf8a07e145f6f0c1705179bdb0c108435bef8b
diff --git a/net-p2p/syncthing/syncthing-0.14.35.ebuild b/net-p2p/syncthing/syncthing-0.14.40.ebuild
index 27a867b3abad..d86360de0e77 100644
--- a/net-p2p/syncthing/syncthing-0.14.35.ebuild
+++ b/net-p2p/syncthing/syncthing-0.14.40.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="selinux tools"
 
 RDEPEND="selinux? ( sec-policy/selinux-syncthing )"