gentoo resync : 07.04.2018

21 files changed, 217 insertions, 24 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 13463ecf02b8..947b38e30fd1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index ef4ae1ab26a1..1b7161a56093 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,5 +1,5 @@
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
-EBUILD aria2-1.33.1.ebuild 4271 BLAKE2B d7d4dc030160ae62698574f5c72bbc4d119e28d926aa39dc018b8d3ac2dac24c27ddc5951d8ab4f2e08b2141f9e3c36d15ee2ae9d05050bafb60cd54f6a737ba SHA512 92a5b96a718e6ee07c2eb030d28dede399f6fae538bc745508ff79ec601650571e0401b5a7a091e79f80213c08448f92aeea84babe2a81890c144748a9ef631e
+EBUILD aria2-1.33.1.ebuild 4270 BLAKE2B 7859c2f375b50835548cb43e0c0409badfb5c687a0000d2be8eec2f69b064d66fe23b89849b7755c0fc810e1ac7c74fc8eb1237c2a9c5817ba7c1b0c3ecb7aa8 SHA512 15ccecc031ad82024d98e87886d61a8c5340438210a692371b457906bf1611d3b1fedeffac3a6a94b8bdad28207fb1d5a32f1c8d3b7cc65f8e740a1fdb3b5af0
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.33.1.ebuild b/net-misc/aria2/aria2-1.33.1.ebuild
index 0ac749fc2764..2253873519ff 100644
--- a/net-misc/aria2/aria2-1.33.1.ebuild
+++ b/net-misc/aria2/aria2-1.33.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
 
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 3f3b367115c1..916bc5c128cd 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,6 @@
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
-EBUILD bird-1.6.3-r1.ebuild 1274 BLAKE2B b73fbb570a5a579faba135796fa5a65b1e701bab3d4d8869bd65c4b31dd3b8e9d3a128f918267b6dd1df9b7e4c24d166182619e52eabd7021132ef1d937fc125 SHA512 0ca858013e7abff7ec60f2089c9926e5acb6364e042c960f9d33ab232594bb7d2414df798c3e22ea1c2dd464585fbfd8b67d8551289503685d6bd747db1c2080
+EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
 EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.3-r1.ebuild b/net-misc/bird/bird-1.6.3-r1.ebuild
index 3bfce423950f..5b0b890c824c 100644
--- a/net-misc/bird/bird-1.6.3-r1.ebuild
+++ b/net-misc/bird/bird-1.6.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
 IUSE="+client debug ipv6"
 
 RDEPEND="client? ( sys-libs/ncurses )
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3e0b439fe1dd..c75d825a3ff8 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -5,9 +5,9 @@ AUX chronyd.init-r1 1637 BLAKE2B 046896f6eaf0a9311a9b3cb7cc6360f4bffaee95067efde
 AUX chronyd.service-r2 261 BLAKE2B ac29cdd2e717060b5af68608db8a7b3dd8aeb90225edc5b48ea84a8537017d531519a00fb394934c270eb965a615b0b53188bf8bd16edd645074b497ba91fa9e SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe
 DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b4881fbd0e19d966dca86ed6973c31618b1ae56b59cad989144bf59a0206328d50d9eb436fdb058684e74a1661 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427
 DIST chrony-3.2.tar.gz 433882 BLAKE2B 4351cd22efbb2c819f09a562b2e0c1851336f8973b37b3015ec6acc04b925e13c1207262d4561318c187809bf989710d9a8fdf54e93b3d3dac56d0d6df8782df SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4
-DIST chrony-3.3-pre1.tar.gz 442045 BLAKE2B 122a36e46b5d5a3eb3e2d5e20ad2a5b4f419e496b9cd341e4895e6a4121f0c613860dba0375592ad169e3dbfdbdaf812f07124e6f3b005eba6b3296a663f601d SHA512 39bb4788d362d9aaf30b84c59eaf3421110c3776d57eb955f12d8fdd6013f8ffa91a6ff1e8b0018113f63d660570b1aa70d96f7c31faca29d5b720c2f3f1d625
+DIST chrony-3.3.tar.gz 443571 BLAKE2B cc35f55b8d63eed85495f88b71c9285c68867a28b27c6c5e7d4475a77857ce4a09fbe561906757d66fee13b19d9ee750d41518050048776b2c0ef600407632e9 SHA512 36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.2.ebuild 2912 BLAKE2B de9d8eda478642e023ac95abc3009930644354ce75e145d989a003a61c1273ddb17e2a29255cab98199cc74c07553f866a85355b9255ed26a276abdbbaa08b34 SHA512 846d29b2b4fb9ff2c250a0d07a5b31ddba0e0c8e08ec625535ae7143f271f6f751a155768ddc91f474f75b677bf158709304b38c43e904a51220ca6f2b2bc612
-EBUILD chrony-3.3_pre1.ebuild 2912 BLAKE2B 44df07e01650a66bac1b2c0e88975f7c7ebde7ab58156ecc0dc46cf0d3189931b53552b2342da55ac6091b1a426809e5733bc38c0528f8d0f000e2d32cbf584d SHA512 8bb57308a4c506e46a101111584ab8fa9a01e0ee86333e2661a33a70d5ae73cf92b5dfc8868f588551b9a4d6f892cf7c5b951556b777bc7c936cb44ebf157966
+EBUILD chrony-3.3.ebuild 2912 BLAKE2B 44df07e01650a66bac1b2c0e88975f7c7ebde7ab58156ecc0dc46cf0d3189931b53552b2342da55ac6091b1a426809e5733bc38c0528f8d0f000e2d32cbf584d SHA512 8bb57308a4c506e46a101111584ab8fa9a01e0ee86333e2661a33a70d5ae73cf92b5dfc8868f588551b9a4d6f892cf7c5b951556b777bc7c936cb44ebf157966
 EBUILD chrony-9999.ebuild 2796 BLAKE2B 24f9468445a0b1bd820740c97d7d764825bdda4ce7e271a6e18ef48b05f5d692ead4d6f248dfbc5ab22373a6b06e106722faba7c8c1c42bd61e2d726b2c46997 SHA512 9d662c832a48613a7de249e4444cd0fc6f4440826e4d2cd0c6630927e8a1b179a21f341931899bb970addfb3c5b380738ac76f443dab665909d09925c5315f2a
 MISC metadata.xml 1566 BLAKE2B 94f800f032197823ff746e93dcb8955a273a0712add991415852d5192c09b465aad40aca121f959442b83fd225becacb063f4ac28b8a7bd035ca65aab2ed3ecb SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84
diff --git a/net-misc/chrony/chrony-3.3_pre1.ebuild b/net-misc/chrony/chrony-3.3.ebuild
index c3aed38aa99e..c3aed38aa99e 100644
--- a/net-misc/chrony/chrony-3.3_pre1.ebuild
+++ b/net-misc/chrony/chrony-3.3.ebuild
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 94ac93edf52c..a4740e254fa3 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,10 +5,12 @@ DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6
 DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
 DIST dhcpcd-7.0.2.tar.xz 208736 BLAKE2B 958118a7acdb6d55e06b88ec8b1fe342600e49caefc7e0e6745a20aafb9588f1c83af171c47e7b6ba1faa664290b052530271f5dd588f82db5933af315b8eea7 SHA512 f5b1407199163fb994519bc1b5a70ad043f00f263e3b254da5d519d1c6b689a4a5a8bcef3bf42401826984e273c2ead38249fcfe99129b87034f90de2fc46ecd
+DIST dhcpcd-7.0.3.tar.xz 208856 BLAKE2B d11f1845cae74470cd9982f5957911ac5fd7cc284b455254fef5c462e516018d94d56f970d758e81cd86a7f918e5cf0d3bd6d2087bda701b299436c4253220f4 SHA512 a2d4e8ea6a310090c2795c596c80a76f0e42dc6654ba50d2900e2af4239dbc542e857d20b2983ea97675903b85cdbd0e9212424390a62081837821bbdaf7ce83
 EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
 EBUILD dhcpcd-6.11.5.ebuild 3281 BLAKE2B 6d98c09002122c9044e10aaaefe442f941db4686227d6e7a052c96dfaab68c276f9fc6b3230d3ec0bc9fa4f6fb0ea5933b574d23fd8860cf1e33c3a4eb10121b SHA512 94b13653b8202a4c402f1f52618a9f5bc414cb92ab1376098dc70e12dc5fb963ebb83ba517b100eaea0cd2cc248152b038115ef14e588abb0ae78c024c13316a
 EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
-EBUILD dhcpcd-7.0.1.ebuild 4442 BLAKE2B 24b800510b5c594528a1b4436c16bfc0058e2105737ab51a2cb9daf81cddb3a798a3c25abe25f7e6a6234b9492ae493f08ff026d4338ace86d75fc70e221583e SHA512 507ce6c0b2011b1ee862692ff43460d54f5dd099dcf43e635def893e2e9d370d1369344c2e0d093563dc195ef23dfe62d9eb730d65325fae0a0e5f55f18b7331
+EBUILD dhcpcd-7.0.1.ebuild 4440 BLAKE2B b88f219d63bbe67e60f5a229f4fd0996fae96ad9411204ac734a55d7cd10dc106672b83e5ed869f710535aaf5001f2215fdb248fea26de01749eebba8eea8185 SHA512 9c1b7c8a444926924db016ae97ecf050e0f97c59486cf125ca770c0b6dbddc7e7184561c1c52f4a19e3e6de11fb28c3d942af0eb82e76698b82aeb28ac5ae8e1
 EBUILD dhcpcd-7.0.2.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+EBUILD dhcpcd-7.0.3.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
 EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
index 6672bdcb8c6b..2f54cf9351db 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
new file mode 100644
index 000000000000..3d93853bedc3
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
@@ -0,0 +1,149 @@
+# 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="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 769d4f88bf4f..5704e652a7c6 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -4,5 +4,5 @@ AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
 DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
 EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
-EBUILD gerbera-9999.ebuild 2508 BLAKE2B e283d466b40434f1613ff0677ea80de1c80b000812a02c8cda6a879b2a8df61f5dbec72527a72383c92e03756adfaf7f60b8ec347b514d53b571b26bdaeb63f5 SHA512 053d702146225c24421d8d83466121996997917a7bd2dd462304ad6fbe488b6fd03a609712dd46e9bd8a4ec803702323ae0e3fc508b84a71757bfe6966ff7963
-MISC metadata.xml 1154 BLAKE2B 460042ab99add3291902174f2e8623505be246a191cec1792afed2c385ea47c2ba42c5bf3dd01aca0ee9d73c192bff5e501b8f7c46652e2378ae4f1574750f27 SHA512 3048a14a5414888be83baade4f1961161cd07097aa9574cd60225d54001d35df4bac8855c10ca529595baa82fd6137b310f64aff79af3057495b16fcd6cfd558
+EBUILD gerbera-9999.ebuild 2546 BLAKE2B e4aa8ba229f02ce99a5919efa5067b2949f46c2d1bc3550283d705789c1556746373a67650c68aec53726161d3bc8148833451cb40bb9fc5cda8d5965a311684 SHA512 40ec0a3190befc41b40a92a45971d9ced41cb76ea51719118a63ad7b557c5cc6c80e4d532b7198edcbc2a8d6aae75b780d6aabb70e43efe60bb04ee188ea8f26
+MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 7f6f95dd5c36..50806deadb0c 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-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
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/gerbera/gerbera"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
 
 DEPEND="
 	!!net-misc/mediatomb
@@ -33,6 +33,7 @@ DEPEND="
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
 	ffmpeg? (
 		libav? ( >=media-video/libav-10:0= )
 		!libav? ( >=media-video/ffmpeg-2.2:0= )
@@ -58,9 +59,9 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_CURL="$(usex curl)" \
-		-DWITH_LOGGING=1 \
-		-DWITH_DEBUG_LOGGING="$(usex debug)" \
+		-DWITH_DEBUG="$(usex debug)" \
 		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
 		-DWITH_AVCODEC="$(usex ffmpeg)" \
 		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
 		-DWITH_JS="$(usex javascript)" \
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index 1c5747db8ebf..22d6ba3fd3c0 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -7,15 +7,16 @@
   </maintainer>
   <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
   <use>
-    <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+    <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag>
+    <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag>
     <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
     <flag name="lastfm">Enable last.fm support</flag>
     <flag name="magic">Use libmagic to determine file types</flag>
     <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
     <flag name="protocol-extensions">Enable partial DLNA support</flag>
-    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
+    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag>
   </use>
   <upstream>
-    <remote-id type="github">v00d00/gerbera</remote-id>
+    <remote-id type="github">gerbera/gerbera</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index dcc9651828bf..02fb3facd47a 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -11,5 +11,5 @@ EBUILD iperf-2.0.10.ebuild 701 BLAKE2B 6ae19ec54c963ebe5609c22370a80662e13db46e7
 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e
 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999
 EBUILD iperf-3.4.ebuild 913 BLAKE2B 5d5b1ef155bf1c151151c29c9ba50cd22ed4b93e06cbbe80363dedbee5c2a285af6e3c1285f57d605db95c3d6efa0f15d504e1218d0a9a8269eabb175b03cfcf SHA512 94835496e5f04604516a2671cbc0e2cc986074db45ded727109afc75c4489abde68d7a7a63566c0cc2d98bc2c94f9b4b6dd058f1a9ca39197c98c25488b94e51
-EBUILD iperf-3.5.ebuild 913 BLAKE2B 5d5b1ef155bf1c151151c29c9ba50cd22ed4b93e06cbbe80363dedbee5c2a285af6e3c1285f57d605db95c3d6efa0f15d504e1218d0a9a8269eabb175b03cfcf SHA512 94835496e5f04604516a2671cbc0e2cc986074db45ded727109afc75c4489abde68d7a7a63566c0cc2d98bc2c94f9b4b6dd058f1a9ca39197c98c25488b94e51
+EBUILD iperf-3.5.ebuild 924 BLAKE2B 8c75107d844f00d4ddd50c4bff0c85748db724b54e0ffd273f6faf4f509b733a7ca014390ca0755f7ef65c1a3ddfb62f1681629bc7e20722feb892bbf4359d36 SHA512 ec4a8c4d8d77a3e0343e87cd430a53169a5892c729effb88ad2f4acf8bfa1a66cb65dd1aec8970a4c7b89c911f48563e297e094acedad045b061150123e81feb
 MISC metadata.xml 406 BLAKE2B a76547cb9d2885900ccabe6c2549039abba6b7a4a0febd58038a088957817634e7340393f0f5c0b4cb655bf54f4ecb33232040aacd0bca3070d6ea48146f70ec SHA512 98d8685483b308d70c56e436291e0229f53982bb78a953b13455eeddaba53ec4ad1d860fc1be4b9340cb89a06471d1caee938bc6213355179147923e0d7eaa17
diff --git a/net-misc/iperf/iperf-3.5.ebuild b/net-misc/iperf/iperf-3.5.ebuild
index 5943f9805db6..3eb759c70f2d 100644
--- a/net-misc/iperf/iperf-3.5.ebuild
+++ b/net-misc/iperf/iperf-3.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE="sctp static-libs"
 
 DEPEND="sctp? ( net-misc/lksctp-tools )"
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index acd770ec0182..5128bbee94fb 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -10,5 +10,5 @@ EBUILD ndisc6-0.9.9-r2.ebuild 667 BLAKE2B ef911a647c757ae40bcb64a646d6b041a57261
 EBUILD ndisc6-0.9.9.ebuild 649 BLAKE2B 62a5146d43c94e87ca0c38bfdcb03e11b451b7468b370495c14f852176e7a8e286c5f1bcdb6bb665d7247161489a5fb9869d3e1255d02456eb76e50cbb7937b4 SHA512 3346e9d0f757fcff94c44ba4569dd29d334eb846d727595aec905add6e2ca11d35f43da4e4b9951894fd8f95688f0543663f489f73f8d76f1527c833bb057ded
 EBUILD ndisc6-1.0.2-r1.ebuild 735 BLAKE2B 5a264a8254d70b53d11c3aa86058fa97462dced7c05495d03db24c48b968d16b9b796f2fe8a21e7dfe0cc2530b4163d0d4c201a423af4f6cc676731d38df7063 SHA512 1511b39b23aed938f4ba939a6a0152e47960c8abb9202752734f70a1d72c58230c4a1f7adc10ef86cf3b6ef287e9f65d5115cf22482231a846a205024c1799e5
 EBUILD ndisc6-1.0.2.ebuild 667 BLAKE2B d020743bf8cb4296c2f5c49c6eddff6c8ed7055d6b769ef1ae07121805689721dda449439105a9d36158a0902443aff19b3dc424190a27be12502f37a3831d97 SHA512 a3be14a15b6b4cc4ee13f506fc8e7acfc4a60eb5a51f0f9998994a866d9788496176f42efbe409e225ab90ba1b98065764640f3d45e44c89d5256a23825d5423
-EBUILD ndisc6-1.0.3.ebuild 735 BLAKE2B 5a264a8254d70b53d11c3aa86058fa97462dced7c05495d03db24c48b968d16b9b796f2fe8a21e7dfe0cc2530b4163d0d4c201a423af4f6cc676731d38df7063 SHA512 1511b39b23aed938f4ba939a6a0152e47960c8abb9202752734f70a1d72c58230c4a1f7adc10ef86cf3b6ef287e9f65d5115cf22482231a846a205024c1799e5
+EBUILD ndisc6-1.0.3.ebuild 746 BLAKE2B 38578126d1afed547f883fc872300545f9f3a84d9571e26ca153031e7237549dda78141a056f9ce58e1dd99dc57a06f4d63d6e4b3e309b5871c12a8be81943b8 SHA512 2fc5d63ee9a56a56b0b69f48e5a42ab13393397be9426f36347f2de6ca9a5c1c54fc6ec4a7525dec564c4d15e6216c88cc67f7419c1d2b751a41a3472cbc80b9
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index 1b789b871e42..c4e9e39d3a7f 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.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=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND="dev-lang/perl
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 0c92c1c5810d..5e800687a6fd 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -11,5 +11,5 @@ DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef9
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
 EBUILD openvswitch-2.7.2-r1.ebuild 4432 BLAKE2B 1013c7650e66c49ebf697f5d9626b7dc78abe0d12c998b4d7996971ad80b04e10cf77ba41d065dcdc7705148b766471f11303d824e381d2a61cc8a562d803496 SHA512 0a635ac3e3838c451fb9772ea19d8eeb04a5ba108532fcd4759c8333a5628364dd3f702a5ccd777b851fe288b1306a151892b5db0ee74e3d163e86134fa7e73a
 EBUILD openvswitch-2.7.2.ebuild 4379 BLAKE2B 659d30e5bbed8f81b35428720f10cd9c08490080589d3f16a48f526a31e0576236b9d06f622faba8b331dba3ee5e65cca45d234bd52c84afea6ff4916d25b973 SHA512 0e4a4d7a2e636cb485407697d74fc2c1032faef99206d61a0466c4387d1726077f092d67ca1e2f8333132f5ba5ced80d32bc1e2a6308d06297d3e593706107fe
-EBUILD openvswitch-2.8.1.ebuild 4438 BLAKE2B e0706397a4d9edaa9f3c06adf27603e86c5feb337484a6ab23163317eecf285a7ab7614bb730e62e183f4361533ea49e98bd72ba655565c8b811cf7b11a9557d SHA512 fd5ab9f9fc719ab7ff61bd67b02b3a85b80377e9dab260b5cb2ff260f0889bb755599d14c13859068ba19aff077563331ec6f7bbb95dea55e6b3820babb6db5c
+EBUILD openvswitch-2.8.1.ebuild 4437 BLAKE2B 38cc815545bc7e1e02056b60462822947fbffd1b6021b768349ffcffcfd4b9082616d2ecd61b7a9c0d9fca5370e8109c40cd3f84111e2301d48746445e659aa2 SHA512 7ac21f50d16cabe2e6a18093786af5ef773450a3462a3c843c31bec62a7dc480b8a902a718d6400efd933899174788c552a5a02b7a8c145e8cd638d0823c8cfe
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
index f118e96631a6..e5269337cd7e 100644
--- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index c0864f302af1..e7d111636232 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,4 +1,6 @@
 DIST rclone-1.39.tar.gz 38015559 BLAKE2B 534bd0be87e7c8291bfe3acdaff12e9acfddeb42f08067d413184a688b5c0cdfcde78abff3551d81cd2e692a020386116f03842c8390852b2137c2f8342e43f2 SHA512 6e5e5f5e06510f36185d165986cbd3ed994d3cbf97055b4dea37c78af932f89ab8c89249006b829aad38ba43c77ff46f254ba56bcfbae7deca1ebcea555ad884
+DIST rclone-1.40.tar.gz 46067393 BLAKE2B 56bc172965f7f601c8f5c9c72a03ca44b1b41cf280497f7473d318b6667f00df4dac2d104f6fe7daf1529ebedd4d6f4ca5899944e82d68b8fd1b66226264e82f SHA512 ce46393097122f2ae9669310767487218f74ee8fab607cb6355df33329325fe626d17b36565b7864e6b4ca1de75714e29356d7abeb3cc42038d3ab0677408973
 EBUILD rclone-1.39.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
+EBUILD rclone-1.40.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
 EBUILD rclone-9999.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.40.ebuild b/net-misc/rclone/rclone-1.40.ebuild
new file mode 100644
index 000000000000..2c530609ee7b
--- /dev/null
+++ b/net-misc/rclone/rclone-1.40.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}