gentoo resync : 30.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-30 11:19:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-30 11:19:18 +0100
commit: 62f67115b5c46134c34f88f4b1cbdacc19384c0a (patch)
tree: 0a76b14de203a4c23040e5665e39df8de9867745 /net-misc
parent: 265dbe5dbc14c199299496c6db8fce3f76647015 (diff)
54 files changed, 484 insertions, 1090 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 24573c97d23c..10076a9af9d5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/calico-cni-plugin/Manifest b/net-misc/calico-cni-plugin/Manifest
index 907269cf5025..4c7c516b70a9 100644
--- a/net-misc/calico-cni-plugin/Manifest
+++ b/net-misc/calico-cni-plugin/Manifest
@@ -87,4 +87,4 @@ DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.g
 EBUILD calico-cni-plugin-2.0.1.ebuild 6365 BLAKE2B 26d3e32b88c6bc5236b42452eb80d034766188d5fe974be16f360209b7c02fded5ec2e0989aff8d8055a02eff236c7ef0fadadede52e684ca5d9807d3d1c55a7 SHA512 3edca428c969bc535592ce4cd6112945744e02b9e534490714112a9e08d276fd73ac8ab258242fd9c5db92c2b656f2abc44e7a91052edcfba1d1008519b93f46
 EBUILD calico-cni-plugin-3.1.0.ebuild 6365 BLAKE2B 03939f254629d3fdd82f2085665d1613ca650c0331654a7820f827e5d2045466a47169df41e7da6e2a29381d947f33d20ba5734b76bbbe6da5dec2b38c871608 SHA512 1c608f4b9e91bb64343c6c96300d760c8140fb3f6dd068d46f787b32e119eba97b209fe61aa28e88301a8211f47c762e11f38764ca36887f978ca162ca451965
 EBUILD calico-cni-plugin-3.1.3.ebuild 6365 BLAKE2B c562508cd4955695469bc41512377a8d1ed9105173929ea84d65e34ac0f30bd0bebabd8a08b30099a73bb24dd2b6e0d5f33521c58ded979a4bd8d5a3d5ef37d9 SHA512 fb7d14bf2625b002da53a52d475f5e32e9b005adbab272e8927ca4f7a6faed83187fafef70d42c63237669662b06a1146a81ac7e3f8679800aaafdd5f9692c9e
-MISC metadata.xml 344 BLAKE2B 69c43717917cd8c416f5b320124027b48453aaf2d74abd7b77d7b80a545c6b8504e3a4cafe80a0afbd545485a6c0d9af40394c40077708e117a6996cdb78f5fa SHA512 a43f50970c9415a6c39ee30e131ea5063a53a9b332265d63ec52992cee3022e2aae0eb4ea1893c283d7068dc0d9454d1952cc8287b3c4018306895c8ed39b9b9
+MISC metadata.xml 262 BLAKE2B d956111dd23ecabf422e1d63d1544911922635562521b844bf87c64d14415748057fa5c10e0647a85aee501421e72dc539f589c2b96cb351ee80be27f67731a2 SHA512 383a23a695a1c63bcc045e62140dde337d7ad462d80ce195939b605f3a9d7c7ed037417002000c1eb0d2c72492162d8c4266c3549f5e7d61e530580d552c7080
diff --git a/net-misc/calico-cni-plugin/metadata.xml b/net-misc/calico-cni-plugin/metadata.xml
index 5fa2b8e49afe..b33b4ce7eec8 100644
--- a/net-misc/calico-cni-plugin/metadata.xml
+++ b/net-misc/calico-cni-plugin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <name>Manuel Rüger</name>
-    <email>mrueg@gentoo.org</email>
-  </maintainer>
+   <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">projectcalico/cni-plugin</remote-id>
   </upstream>
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index 941c4cba237e..262d1f11aedd 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -153,4 +153,4 @@ EBUILD calicoctl-1.5.0.ebuild 4548 BLAKE2B 552ba00a20c61cf2ceab79df6659e401da2d6
 EBUILD calicoctl-2.0.0.ebuild 7370 BLAKE2B 521081083aacd60a72b6c1a18b1d37d9de8a7447f38ca6b12417a884df9a64cbfde747a3461eea18cd8fa88fcd8750dabeec7bc636f3bc3a21f1a443415aa476 SHA512 24f4c1c654d3d6416b730e6bfba3dbceb55733c2795afb22ec0c151f862d9f5f9f496915f64531851b3683a4cc502a158bb62823189bfe9349750fc47dc20961
 EBUILD calicoctl-3.1.0.ebuild 7470 BLAKE2B f94887743cecbd2314584f534514f0520fa13c88aab9314c4e061465a976b4f3564e3e0e7d66aba8642d9f4402dd01a8e52d2037da99d87d1d8988e11dddb6e5 SHA512 01746b4b4226c4ffff1571e110340ed807af89e2b2c7e8cfc2fbe6f4229258c1884ae1f9c2a6e3ca13cd0944c78e1dd893d90c2813e91d2b3114505b6ae257fa
 EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
-MISC metadata.xml 333 BLAKE2B 3dd1d3ce43f7078154602241871e2b6771c001e8f5c60f0582f2ff97033b226a6c7e0d1ce88ba5dcdd72ecab65b6973afc35c893c2a74eaa2fb093543999b5c8 SHA512 3e2d87ccb2206d26aa0000ff9fc684bbd42c6d84b7b19572d1a8e49bfd96ee103a498372ff54acb29169c3b053dae55a9aa7635027d1175b649c15a49106b61e
+MISC metadata.xml 256 BLAKE2B 529f31a3c12c3a50ddc0aca4ca98c8e1465251d5e538a6797532178498bff27cee211c6d4d7e688a8200f3ac6c3a982762f09224d0956f9e1fd73e5708b2b4e9 SHA512 a54493cc73446e0d3eabf497d2e42c835f6d2da48d7bf1cecbcfb20625087699453db4106f7e77efa7bd3a6335b7cf263397d83edffd670bac7cfb797e3a753b
diff --git a/net-misc/calicoctl/metadata.xml b/net-misc/calicoctl/metadata.xml
index bd8c0f9ed937..c752009243b5 100644
--- a/net-misc/calicoctl/metadata.xml
+++ b/net-misc/calicoctl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	 <!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">projectcalico/calicoctl</remote-id>
 	</upstream>
diff --git a/net-misc/cocaine-core/Manifest b/net-misc/cocaine-core/Manifest
deleted file mode 100644
index a50db11d2e77..000000000000
--- a/net-misc/cocaine-core/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX cocaine-core-0.11.2.5_binutils-2.23-compat.patch 559 BLAKE2B ad7582807247fdd6b6cac88a5809831593b9b15bdce391bc02b3f44b89b32009dfc7e256fffa9f292532502e903418fa849dbe8ff5389a735c5f51407c9b6182 SHA512 b3b3dda65aab873057029bc76526e2c5f89e426788622c945888dd0005dd084f6854b0f739ee0f3f3ca6e1d41b94e1bd3b37964782b91d27a833f42ada229833
-AUX cocaine-core-0.9.2-boost-1.53.patch 619 BLAKE2B 02ae2a9c6ba1c9f159ff7ed4ee6df7eb4c326a33c5af259e65c79e7cf3a235d88a8caabd308eb0f6882d4ccffb9a15e487d14441fc74a735c01623f2133064cc SHA512 1d4eebb1601fa974720d6fba2fdc21f9f99b9222df0767ea8f1c96f023c7fa3bd3862feb393242e8680b3bf970da06f01a331acf7dcacf78b6426841a73705ec
-DIST cocaine-core-0.9.2.tar.gz 174494 BLAKE2B ed021a8c3ef145d0ec2e5f2a19af3878ad94a41d169efce6e4eb09a3eb33fab207f9c31620495c5d49d56a8afb1f1cb730517d6594c6c7b08aa03f23c348b992 SHA512 42bf9f38311026966b11414fc9987b4fc1d30dba9360152662810ce4e49ab1c8e662b18299efe2831b1ed7ea3490a8afb36195d7e7fc609cc9527e2c71f71bd1
-DIST cocaine-core_0.11.2.5.tar.gz 376997 BLAKE2B a428a4070984fe2cff68dcfdbfe3f5764b99a04120deb078cc1d8dd977296c31c32630acc6e6a7a80bbc9d9737aa3a1b0243dea10cae249c35606919ea33aacc SHA512 f2962d41ba12ebae475cb10d501da8d7b3ca6a428b4b2e8779dd7d768cacc2e3bf9b7952354454e432e2623a00add3d7cf424b12968c0c4a905a65dbda544866
-DIST cocaine-core_0.11.3.2.tar.gz 378575 BLAKE2B 6919819635776faae99120b6460c992ed4ed52ea00873683bc45a621434b36934b15aa2745970b2f386db20f80bc7e103e70426237013e90203c3a0cd8965b8e SHA512 f0a5eea827d0fbf65c484e6068a24dd1e81dfc868f38ef829003b410783a354a58886d2db972ea24adb6075b38ceb230432555b35af4aceb0193c4a12ab874cd
-EBUILD cocaine-core-0.11.2.5.ebuild 543 BLAKE2B d616779ba56fee545235574d0cdc29b8c812c2f1d28d31d4e88e1cacb98d2bc74f91c5a0fdb8d14d71e08eb561f3b332e46ef9afb0ae71df367ceb6f681dff4d SHA512 26962a30a9f2e67c43b6578c448f8f53befd0ed511b8d331728871f59e384f84ba7a540447a769c181dcc107ec3ebf097f2f3c5433cec8087e04f40a245566cb
-EBUILD cocaine-core-0.11.3.2.ebuild 553 BLAKE2B 0edc73d5a942996eccc8fde4092f11e083740ae16609cb4a6d7c76c12649abb7e19f26d9958dcbb6190df2d39e34ed05e6d3d127128dd2377922e8f850f32698 SHA512 7a184d39ebcb27dc22d322f76ad8d271e69611707e799b88f87f906871ea3b1c3415773947b430ab9ced98928e2ee85dc52571105864bcd8eead84385fb2faf3
-EBUILD cocaine-core-0.9.2-r1.ebuild 528 BLAKE2B 19533c4eba23fe729ca128d50a9fad2be1c8ef0180f42f93f3cb08839bd95a77fd68ff23b8c56b3336469c4ced159253db69b401a7eb9556092abc3c057a2566 SHA512 dcfeb606d1b82536484d624bc92131edaaaff812ad2e80e2c36eeb0f5acb04c0e602b06b9ad73493bb17029dca49f38efbd125a4e1d8ff96a7120db019d2aa78
-MISC metadata.xml 332 BLAKE2B f24e7cc7caa01e2adc094e88270c4264d1b3ec22396b97e7edddd3cab683e4a637be7d83a01833cf9093a453e517cec538669912fa74f1dcaed9e8a4db1ac633 SHA512 6beef52c2b282b0a6776e941c33706a803a8ec277de300ce701cb45179d916af221ea9cb190d0f3194dd75ca89366834a39a8d26a0bc145844b460fcca910764
diff --git a/net-misc/cocaine-core/cocaine-core-0.11.2.5.ebuild b/net-misc/cocaine-core/cocaine-core-0.11.2.5.ebuild
deleted file mode 100644
index 61e561d2f622..000000000000
--- a/net-misc/cocaine-core/cocaine-core-0.11.2.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Cloud platform, core parts"
-HOMEPAGE="http://reverbrain.com/cocaine/"
-SRC_URI="http://repo.reverbrain.com/precise/current/source/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/boost:=
-	<net-libs/zeromq-3
-	dev-libs/libev
-	<dev-libs/msgpack-0.6
-	dev-libs/libcgroup
-	"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_binutils-2.23-compat.patch" )
diff --git a/net-misc/cocaine-core/cocaine-core-0.11.3.2.ebuild b/net-misc/cocaine-core/cocaine-core-0.11.3.2.ebuild
deleted file mode 100644
index 6e8a93a96f9e..000000000000
--- a/net-misc/cocaine-core/cocaine-core-0.11.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Cloud platform, core parts"
-HOMEPAGE="http://reverbrain.com/cocaine/"
-SRC_URI="http://repo.reverbrain.com/precise/current/source/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/boost:=
-	<net-libs/zeromq-3
-	dev-libs/libev
-	<dev-libs/msgpack-0.6
-	dev-libs/libcgroup
-	"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.2.5_binutils-2.23-compat.patch" )
diff --git a/net-misc/cocaine-core/cocaine-core-0.9.2-r1.ebuild b/net-misc/cocaine-core/cocaine-core-0.9.2-r1.ebuild
deleted file mode 100644
index 491ca2cd0a9b..000000000000
--- a/net-misc/cocaine-core/cocaine-core-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Cloud platform, core parts"
-HOMEPAGE="http://reverbrain.com/cocaine/"
-SRC_URI="https://github.com/cocaine/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/boost:=
-	<net-libs/zeromq-3
-	dev-libs/libev
-	dev-libs/msgpack
-	dev-libs/libcgroup
-	"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.53.patch" )
diff --git a/net-misc/cocaine-core/files/cocaine-core-0.11.2.5_binutils-2.23-compat.patch b/net-misc/cocaine-core/files/cocaine-core-0.11.2.5_binutils-2.23-compat.patch
deleted file mode 100644
index 532700bec70b..000000000000
--- a/net-misc/cocaine-core/files/cocaine-core-0.11.2.5_binutils-2.23-compat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 771bc9f8055e7baf58011ff7514827b6212f9f51
-Author: Andrey Sibiryov <me@kobology.ru>
-Date:   Fri Dec 6 12:51:59 2013 +0400
-
-    Added binutils 2.23 compatibility.
-
-diff --git a/config.hpp.in b/config.hpp.in
-index a73fa48..651aa3c 100644
---- a/config.hpp.in
-+++ b/config.hpp.in
-@@ -8,5 +8,8 @@
- #define COCAINE_VERSION \
- 	COCAINE_MAKE_VERSION(COCAINE_VERSION_MAJOR, COCAINE_VERSION_MINOR, COCAINE_VERSION_RELEASE)
- 
-+#define PACKAGE "cocaine-core"
-+#define PACKAGE_VERSION COCAINE_VERSION
-+
- #cmakedefine COCAINE_DEBUG
- #cmakedefine COCAINE_ALLOW_CGROUPS
diff --git a/net-misc/cocaine-core/files/cocaine-core-0.9.2-boost-1.53.patch b/net-misc/cocaine-core/files/cocaine-core-0.9.2-boost-1.53.patch
deleted file mode 100644
index 2f03a328e0a9..000000000000
--- a/net-misc/cocaine-core/files/cocaine-core-0.9.2-boost-1.53.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Nur in cocaine-core-0.9.2: build.
-Nur in cocaine-core-0.9.2/include/cocaine: config.hpp.
-diff -ru cocaine-core-0.9.2_org/include/cocaine/interfaces/storage.hpp cocaine-core-0.9.2/include/cocaine/interfaces/storage.hpp
---- cocaine-core-0.9.2_org/include/cocaine/interfaces/storage.hpp	2012-08-29 15:54:35.000000000 +0200
-+++ cocaine-core-0.9.2/include/cocaine/interfaces/storage.hpp	2014-07-29 13:49:40.130375695 +0200
-@@ -22,6 +22,7 @@
- #define COCAINE_STORAGE_INTERFACE_HPP
- 
- #include <boost/thread/mutex.hpp>
-+#include <boost/thread/lock_guard.hpp>
- #include <boost/tuple/tuple.hpp>
- 
- #include "cocaine/common.hpp"
diff --git a/net-misc/cocaine-core/metadata.xml b/net-misc/cocaine-core/metadata.xml
deleted file mode 100644
index 13f626e87155..000000000000
--- a/net-misc/cocaine-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cocaine/cocaine-core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 40e2c7177fe5..349b206af70f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,11 +1,6 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.60.0.tar.bz2 2938400 BLAKE2B 1c80e63094b6c0e8c63265ed7a62f75aac2ba13cf86ba201d69837f32c6b0011599a33507e65234cf3dccc5aa08ee558ff9c52998c50f0288738ba3992b6bc65 SHA512 c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9
-DIST curl-7.61.0.tar.bz2 2949354 BLAKE2B bb9fb6155aa6031d000081fa17410e772a58ec111401e7854ad0148c33169f1a7067bb04029965f117be7df20c51a6157bf93fb6439bc4a2d25849a4784baadc SHA512 4907234c75a9e52a5b81cf895bcc811d7a69f1db84a9ae1adc3af360e8cc4371f58c00925ce6bc5170f2a8072848da47a52c41f4bfedcf14274ec75802afcddd
 DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660207f512974f9827c53037a95b935a6020620f926eee85339fbc558be5585f2a4c001bd287c4d33795e6a6dab5 SHA512 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5
-EBUILD curl-7.60.0-r1.ebuild 7203 BLAKE2B 1302225c56ec6d716f61a991cbcc6a22dbb3f3afb0d7c004c7d2781e27dd2906122c0f5e551c9b94f72ec95897f8ee6386faa323f93d26bade91d4d2ca63e014 SHA512 fa7af993d95984b8cda2be0abe798b9c9a4f41b92210d8b10beab7e08ab7f51608ff7a3c96dc508837ac81ee5508b102f60f372dd750c5c6ce460929d6799f59
-EBUILD curl-7.60.0.ebuild 7179 BLAKE2B 279d31842ec1e10dc54f45d18164ff6cc29119c6540d2284d5710ab569a1550ce0112e5c76d96fc5879cea9c502711269fc130d32e0eb43ed1029bda3f08edbf SHA512 012886e831b66d1df5e2d577c6e148c6081f0dc729df06671c672e4069e7377e3f2670dc72b5820d34c775a9991a839cf1c727595fc2b44c87e23df7a36119f7
-EBUILD curl-7.61.0.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6
 EBUILD curl-7.61.1.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.60.0-r1.ebuild b/net-misc/curl/curl-7.60.0-r1.ebuild
deleted file mode 100644
index 703e9d8df206..000000000000
--- a/net-misc/curl/curl-7.60.0-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:= )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.60.0.ebuild b/net-misc/curl/curl-7.60.0.ebuild
deleted file mode 100644
index 2a7fd3b4e0f8..000000000000
--- a/net-misc/curl/curl-7.60.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:= )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.61.0.ebuild b/net-misc/curl/curl-7.61.0.ebuild
deleted file mode 100644
index 568697aa80e0..000000000000
--- a/net-misc/curl/curl-7.61.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:= )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 80949cc2d620..54ccb11c923b 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
-DIST dropbox-lnx.x86-45.3.88.tar.gz 108891513 BLAKE2B f72ea5663a2ea46b0c34294eb18e647f857c8769a3a341fe73b1d4d252a3c08f3add1613b0413e6909e3a5b770f32e473b3383a956c08fec78067736b5b66cbe SHA512 499249377c22452a8266402e6b4ab48f9a1cf1249c4354919a5861ccb7080e8df47d4ef7d757a1667b3511b82c9faf512de1aa1e2e35a939908f74976a728724
 DIST dropbox-lnx.x86-48.3.56.tar.gz 108876564 BLAKE2B b809a220605265685026657e791aff3e716f7ff51e1fc5074d66df87eb8dc473c63c7513c94ca0715844c600fe71aaa3c42a108be4baee2e3e72baade97e3429 SHA512 3174c41e19a01cbd986c111711bc0df80b68882d595a5c869b81bfa1982b3f219da4cda852168bf7fdc9d67b91f52260017f4d25508f6372efd470536a6b96c8
-DIST dropbox-lnx.x86_64-45.3.88.tar.gz 114967662 BLAKE2B 3276b3b20bc96eff3a756064c64b5a0e8ad28b27d29579dd6dc34043427bb209bc5d86be62651f6642f61af17388113ec9a1a4a211e3149ecb8679a4b8e505ca SHA512 d3a787487084237fff928afd6ec2192f27e196c589bba3c6bd8a501055d1a3d4c8dcb88b15336ea03bed38e2a02d0731bb9725cbb324bb6e00ec95e98ed671ea
+DIST dropbox-lnx.x86-58.3.88.tar.gz 73782589 BLAKE2B 406758f056dce4348706d181f1620a16199f99d82c6a24b2cbe7773de32b8f64dc10199b88b8c0b7c3a577deb8658e5de18ce28fb00e509a46a5cd21db890f89 SHA512 455b6e0f78b4307d65f6420b76454229b7542475aba089961117d387290ae60df44a659bb6f8d22975cc6f51827d80b3141cb09832fe327fb5cf9861337b08d3
 DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
-EBUILD dropbox-45.3.88.ebuild 3051 BLAKE2B d9cfe69c1692b41279515b7773b843d745617c0353093be3739f293a3451f144001c0f7d32fc09b8cf477faba9dab270aec6254128a7ad6d41bcdf8dbf3251f0 SHA512 8db5dd0e9491cd822308d32f13941512fc2808992bc61c871f86de3600ec20410f0839e63db328a749d7323e482ccca3bb098308cd0154c0f29e323d5eb90ff7
-EBUILD dropbox-48.3.56.ebuild 3053 BLAKE2B 27e2f6dd3db07da139960b26c9ad1e21da10683962bbac501156176177052521ced303d073ecab9b4c94612347ad571b47c562fe18f3ebdd33e6aceb00a69ea4 SHA512 a1ab89b79cbe551ab7df51f94c3ba6949cc1cc37a08330b5d2f59aedeeb4afbd6ae4bd2a5a01d56b5cf547945d4e58506f22e516d4b4104ec1c5b5c1caaa23dc
+DIST dropbox-lnx.x86_64-58.3.88.tar.gz 77899313 BLAKE2B ecf729f4cf8c8fabed0f6ca19a9c908f7adec1a58719fae8ef3a6cc80f26b453c678d241af987339e26ccbe988db45f57402ea497c54245691cb702a868fc2dd SHA512 50199f6e60f34a13376725d0deee7c0e6aa31e63574ecdcaf69b43427d262fb35dbf979798b704d6a5a33756e9cea5867591d9a632a311b111d6645123f3385e
+EBUILD dropbox-48.3.56.ebuild 3051 BLAKE2B d9cfe69c1692b41279515b7773b843d745617c0353093be3739f293a3451f144001c0f7d32fc09b8cf477faba9dab270aec6254128a7ad6d41bcdf8dbf3251f0 SHA512 8db5dd0e9491cd822308d32f13941512fc2808992bc61c871f86de3600ec20410f0839e63db328a749d7323e482ccca3bb098308cd0154c0f29e323d5eb90ff7
+EBUILD dropbox-58.3.88.ebuild 3041 BLAKE2B bd920090ea92b4069c8474375b52554237857be239e31faf34a13b1cd3369e7c199a2205638941755cd0978189148e12a70bcba3c0df82a4a26049fb1f826ad5 SHA512 bfa3ef8d2362a1896318571b2996e0569c7e5d359b31a5e1472189b58d93ff1e087a8a682b0be9b9b4b059586d2bd5b48bb04bfdeceb0f85d71e8d3005e58b62
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-48.3.56.ebuild b/net-misc/dropbox/dropbox-48.3.56.ebuild
index 508ca3b746e3..8cdfeeebd379 100644
--- a/net-misc/dropbox/dropbox-48.3.56.ebuild
+++ b/net-misc/dropbox/dropbox-48.3.56.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
diff --git a/net-misc/dropbox/dropbox-45.3.88.ebuild b/net-misc/dropbox/dropbox-58.3.88.ebuild
index 8cdfeeebd379..4d43632ecb72 100644
--- a/net-misc/dropbox/dropbox-45.3.88.ebuild
+++ b/net-misc/dropbox/dropbox-58.3.88.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
@@ -94,7 +94,7 @@ src_install() {
 
 	insinto "${targetdir}"
 	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropbox_py3,dropboxd}
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
 	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
 
 	use X && doicon -s 16 -c status "${T}"/status
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index ee80d99cf1d4..493c18b04897 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -125,4 +125,4 @@ DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae97239
 EBUILD felix-2.5.1.ebuild 3998 BLAKE2B 13f283532d310dc707daaea73c428a66232c2450a4374d9740fcb8161a310333e6eaa823c5cde65477516725ee357b46d96f2b3fa055b442e74414f175ee70d7 SHA512 3d8f122b1c6214dc60cc47659d44d17aae7da4d14db083eba8d57a08c8c506a8f7086e4a350de2e518df91a96c4f42b8ff75cfb5339c755a950d93c63b4b4cb3
 EBUILD felix-3.1.0.ebuild 7540 BLAKE2B 8b10b3463d5bcebe8810044c302f2aa75169345d42ce3c03c2fab20c17539854622ace8d0e156ca356bfae56a4539b885bd8ba5afa48dc3b3ed92a6a9cb7a212 SHA512 e77f909b0902c10d3f8bf193dcd9e6c82697e400327236489b601afa489bfe953332a5e7c73534f2e1158067a62eaa010c6b53f533ace23265a215d6be689369
 EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
-MISC metadata.xml 406 BLAKE2B d2f0449cbf46550d7f8794221b6c6f9ed445ebf8b166bdc8976bf605ef61d12f8862b7597f63c6ec171af9d98c3a14bccea7d96fd24cedf58d895b8aed8b1fef SHA512 5aef67b8438efa537ac2a74f6ca701c8211f474ba2aa7a7ec8d26b523f93b18b3e31414143aa488c4480295ef51dac65988b2c923f3593f2028eb69ac93db8cd
+MISC metadata.xml 328 BLAKE2B 8c882f303485c68cd1b46cf55f194d15b2e6e191de8ccbeec7756ef43485e868b950b6138e196b465cbfa07da1df0ff5d7dc9441b349485b6cc55334add26f4d SHA512 39c22655bf9f27a303631f7640be0d375bcd3c25b82df94da86d814614b16b94b7237bbc112e3deadb6489d090dcc59060c6d186a9790d29886744942b5b156f
diff --git a/net-misc/felix/metadata.xml b/net-misc/felix/metadata.xml
index 41d7189e1220..addb25dbd114 100644
--- a/net-misc/felix/metadata.xml
+++ b/net-misc/felix/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 	<flag name="bird">Use BIRD, e.g. for route reflection</flag>
 	</use>
diff --git a/net-misc/iprange/Manifest b/net-misc/iprange/Manifest
index da126cee7245..0bbaa7c65005 100644
--- a/net-misc/iprange/Manifest
+++ b/net-misc/iprange/Manifest
@@ -1,3 +1,3 @@
 DIST iprange-1.0.4.tar.xz 104336 BLAKE2B 8b2dc82de89e2de92e873afbb8bcd0c1a0f9200619726d482ceea435131c4d18454856d8f808a03711a0967128a539c0e3abd94d9f2762262e43eeed6c4b885e SHA512 28fa258c95e6a7b0bb304b8fee624cfd8ef1a5b24a98a80c3dafe44639e6dc0de22c3b61a33794533c3d9fc0ba41f5663a6bb6c85cf940d57c64db043ccbdac9
-EBUILD iprange-1.0.4.ebuild 352 BLAKE2B 41d87cddcb53f1045f430a8534134b22e8f80f3fddfeb8b621948276fd83a904579372c652cc7c670fa88a531df1ffb6985bc40b33c5b1d599593004438686f2 SHA512 a174275395279cdefaa1d5a2fddccda874344fa58e4be9f68699a76decd85406a3e33062721f997f830d592d91b881017711f786956020c272d28a1b0f02a685
+EBUILD iprange-1.0.4.ebuild 313 BLAKE2B 2a46ca7f4d6c8ed584d464391d1a1f3d03ce5aaa02e1b1b2ae163780000cdbd88fde15c2bec2d5847f663107a7d6f35df95153504b11a7475412aa03e70ee67f SHA512 6275c12b3aa0fdc0375f79aa398eafa4444246d427c6cb592d9a52e65e4a218d42482261c578d8e0d5df5deb4e1880c8ce1a8a68583f2165e1c6b73e2fa6b730
 MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
diff --git a/net-misc/iprange/iprange-1.0.4.ebuild b/net-misc/iprange/iprange-1.0.4.ebuild
index 212de297347e..58230f60d420 100644
--- a/net-misc/iprange/iprange-1.0.4.ebuild
+++ b/net-misc/iprange/iprange-1.0.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="iprange utility"
 HOMEPAGE="https://firehol.org"
@@ -10,7 +10,3 @@ SRC_URI="https://github.com/firehol/${PN}/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index b830d430dfa0..86c8559b179f 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,11 +1,5 @@
 DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb82e6ea9b434c0901f2310161fdc504ba9ed728c942c93b21069954e0ab87319f949cd96fb135c2e4991b8cefa SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926
-DIST keychain-2.8.2.tar.gz 44211 BLAKE2B 0916ffebbfa682480e7599d7a07a74e916ab780af47f2c4094fff42147ad461a23bdae81cf18ca5ebba8f21b3917f74cfa3503026fe1f58beff2946173c45cba SHA512 741cffb5affaeaf2cea701d76e3bae8a0cbc2b781bf5d578001e763cee531011aacfb1754974afcb63e6d46588716e62e5f96fff63eff76dd5ad8ee7e16ac196
-DIST keychain-2.8.3.tar.gz 44205 BLAKE2B dcdddaa31d28a401ba4aaca842a8a0c50f18feab3ecd4e2d917eb4f7c2f7c7602c369d82dc82ddf788984b94e95ce4006ee3777995d8ab48cbe9797e39f5bb52 SHA512 493f376fff386069202eadcbef61140e8e66d195e7f73574948e69d8e778bd8f2c2926a174cd25b4380c17f0fb769d423a3b36af4a98aa39f55db22c45216447
-DIST keychain-2.8.4.tar.gz 66143 BLAKE2B eee39aa4f6d0e14277cc005247fe69ba9e83fc49427e3947c5ecaaf4d9d25c92f0ff22eb5fc7cca38c86dd6320c7b7c068841a960816ed97e20ab31c77dc2fa9 SHA512 182d6c6bc1f278839b1127eb0b0b7d094a06251c86a5ebb10410e657d3cb2e7207c75aa9d1f655a5fd4b4f2290f4bdcf00b3714cb0f825e6ef9eecfc486c6abe
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.1.ebuild 683 BLAKE2B 1bff50b1f964f89e6f393b204d9fefb00777754d5e00244402bd33c4f485c651dbb6c9bfceb813ba5ecbf54491be2019892ca119a0707456b97a82557ae520ee SHA512 73a2d899e3d970222cc0a16f32581885c92af5b932d89bb703dada9972495e1660f8cb13b4440960564140402b126029c4aed9a372cbc1ff7cdb5bf79c86310c
-EBUILD keychain-2.8.2.ebuild 696 BLAKE2B 2495dc47e0a0bc261f9d54703fe3de4b8c66588cf2bc6ca49f7b239887e64ec9aa67de2a6abf20a6673e0d10cb3c7a8b3647c449bc91fc4ea2ee519d903dff0a SHA512 63ea0b415a924091a545cf292f872e632b387d61d32ebeeabadd07b77c91e93124d4c1816b1718810a4211027f5b82520bd12d68fd4cb8fa41fed061a027ff48
-EBUILD keychain-2.8.3.ebuild 693 BLAKE2B 43f9cc51e3a2801f7f20b1db7228b9809f64c940eaf95690ba796e7e89e6067340f806a81cedfc82e0c94e5072429c9754ec9068b18729d573432600bf0b9311 SHA512 dcf0f4bd3fd251a9d4c3d7dd1594f82a44c27a99ff3a7c1746bcf81513c9a7a0bef9e000de499deb18b0650f41795aca8140f17129d7268033b60e002f81b8f8
-EBUILD keychain-2.8.4.ebuild 693 BLAKE2B 43f9cc51e3a2801f7f20b1db7228b9809f64c940eaf95690ba796e7e89e6067340f806a81cedfc82e0c94e5072429c9754ec9068b18729d573432600bf0b9311 SHA512 dcf0f4bd3fd251a9d4c3d7dd1594f82a44c27a99ff3a7c1746bcf81513c9a7a0bef9e000de499deb18b0650f41795aca8140f17129d7268033b60e002f81b8f8
 EBUILD keychain-2.8.5.ebuild 684 BLAKE2B a875c8b0e98ecfd1404d5b66498b4c1649e2842c0b08431f9a74ded799cedda9dc08e4111eac7ed664ae2715cab963fe570f9136463f182820bd59eafe58a8f2 SHA512 0b90ca1c331a1b2ef05211fb3009c06a94b02d3f568f845ec00934059c35ed3043956e6ba40b530f17256a69ae5ef968ac4d20fa580d9dfa26c5b189ec3ed9de
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.2.ebuild b/net-misc/keychain/keychain-2.8.2.ebuild
deleted file mode 100644
index 3dc274faae65..000000000000
--- a/net-misc/keychain/keychain-2.8.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner"
-HOMEPAGE="https://www.funtoo.org/Keychain"
-SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.md
-}
diff --git a/net-misc/keychain/keychain-2.8.3.ebuild b/net-misc/keychain/keychain-2.8.3.ebuild
deleted file mode 100644
index 89cf6c49bb8c..000000000000
--- a/net-misc/keychain/keychain-2.8.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
-HOMEPAGE="https://www.funtoo.org/Keychain"
-SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.md
-}
diff --git a/net-misc/keychain/keychain-2.8.4.ebuild b/net-misc/keychain/keychain-2.8.4.ebuild
deleted file mode 100644
index 89cf6c49bb8c..000000000000
--- a/net-misc/keychain/keychain-2.8.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
-HOMEPAGE="https://www.funtoo.org/Keychain"
-SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.md
-}
diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest
new file mode 100644
index 000000000000..a8816ee3664f
--- /dev/null
+++ b/net-misc/mcproxy/Manifest
@@ -0,0 +1,7 @@
+AUX fix_checksum_calculation.patch 1154 BLAKE2B adb80fa3b87106c8953675205cc580d13f1d5e4e9d93bfd05b87d9aa4843086ff7682c4ea47ec573654e39cc3ab2961d9daa69f8335043f63e8e623ad331ec0b SHA512 8b31c6758054d250fbbe91eef62d5a6df93ca0fa700730308c34a7402868644d7ed709c642a84a5f296217c6f3cf8132fba7a8506f54c951a2381cc1bf288cd8
+AUX mcproxy.confd 160 BLAKE2B 5c2e387bbcb5de69412b1b08b63bedab8346363c4d303336c504a5166396f4d09f18a5e203d5fd73abec5f55666742af26a6baa28d8e51fbcc1f7c3b35310965 SHA512 c7096d15afe94002197ee696ea94b88bb85d646c67bb3a2debf8d07098565d35399232610c7bccc0a13a390f6f6be8aad4295f2bf575e7940fb617651a945414
+AUX mcproxy.initd 580 BLAKE2B aff88e8962c7861140f4a11568cab5aaa17df153bcd88b6057f3f17cbad2ee46693db681f1307daa569d4c67e258ab7ab8123c18bffd39fc924b34dd483ab2af SHA512 9f5eaeb39ef5a5cbd8af70f23f17e609f783204ee2dc458128f41a4327eb9f5b8f7f77ae1d642121e7a4af4f6778e65bc97bf0c0b800606c0ce2d6ec79c18f95
+AUX mcproxy.service 161 BLAKE2B c218284289627ae733746263662c16579a617b740825e8b6e0032e9531e17c4c4f0d6bc88d6db2fd6ebbc4a9dcb6bb3dc181fea859e152eef8c53978944a6c0c SHA512 a8298d9278ee934289832d360e502268739e415681c8ecf1c69b93d80ec75094ef32e7f9618ed243a6c05a8facd7aee0b5be591aa6dfce0fcf4658bed845b830
+DIST mcproxy-1.1.1.tar.gz 3373209 BLAKE2B 0b54f7c20b9d6d66c5b88daeaa00901918057b449b932656355303a83c4e4f1feb370de0c55e55484b9bafc63bfd82b8ef8179144529f3074e3d94e147cc8ff5 SHA512 408bc27169c9c90080c7842aaeaf260d5349b735e017d1750118f190124f48743fbf15fc05eee16290e38cc2f752e27b28548714a3d0cd2366dfc53dafcda0bb
+EBUILD mcproxy-1.1.1.ebuild 1070 BLAKE2B 69ce9ea37e22eeae0cf7d4952a463ea6c9ea808a34b8b76f1a56d3c2044b6fb462cd9dd8070a1e90014096140951cfa3b86d594ea288fbb23f57f64e712c718f SHA512 5c116fed92133d3245f401b5412d7c6dcd87818f5c1e7e4a7693bff04281fa10d388311876e258b4e85cdb80e59a2975289c6a4bfe2b9fec604e35bd5f941392
+MISC metadata.xml 1382 BLAKE2B 5c7f722ba8c8886c41ee6cd5fb894e60d259718cc33b1898049f71cff039872272b6120faae28378c4f3722e5cc97154577899141caf2c6c0792443a67dbaad0 SHA512 99b20c4f17439db3e04cb85c2355a2944353adb3015b627f9f91836d9ae49efa54d044e153ec73980cab04ee78bbf1c1a9e38bb132284b46fce31859a7c9a3f8
diff --git a/net-misc/mcproxy/files/fix_checksum_calculation.patch b/net-misc/mcproxy/files/fix_checksum_calculation.patch
new file mode 100644
index 000000000000..2cbfb6590b72
--- /dev/null
+++ b/net-misc/mcproxy/files/fix_checksum_calculation.patch
@@ -0,0 +1,41 @@
+From 93b5ace42268160ebbfff4c61818fb15fa2d9b99 Mon Sep 17 00:00:00 2001
+From: Sebastian Woelke <Sebastian.Woelke@posteo.de>
+Date: Thu, 24 Aug 2017 14:41:50 +0200
+Subject: [PATCH] Fix checksum calculation
+
+---
+ mcproxy/src/utils/mroute_socket.cpp | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/mcproxy/src/utils/mroute_socket.cpp b/mcproxy/src/utils/mroute_socket.cpp
+index 61289dd..3a55359 100644
+--- a/src/utils/mroute_socket.cpp
++++ b/src/utils/mroute_socket.cpp
+@@ -157,17 +157,23 @@ u_int16_t mroute_socket::calc_checksum(const unsigned char* buf, int buf_size) c
+ 
+     u_int16_t* b = (u_int16_t*)buf;
+     int sum = 0;
++    int csum;
+ 
+     for (int i = 0; i < buf_size / 2; i++) {
+-        ADD_SIGNED_NUM_U16(sum, b[i]);
+-        //sum +=b[i];
++        sum +=b[i];
+     }
+ 
+     if (buf_size % 2 == 1) {
+-        //sum += buf[buf_size-1];
+-        ADD_SIGNED_NUM_U16(sum, buf[buf_size - 1]);
++        sum += buf[buf_size-1];
+     }
+ 
++    // fold checksum 
++    csum = sum & 0xFFFF;
++    sum = sum >> 16;
++    sum += csum;
++    // fold again in case of overflow.
++    sum += sum >> 16;
++
+     return ~sum;
+ }
+ 
diff --git a/net-misc/mcproxy/files/mcproxy.confd b/net-misc/mcproxy/files/mcproxy.confd
new file mode 100644
index 000000000000..908bc353d4d9
--- /dev/null
+++ b/net-misc/mcproxy/files/mcproxy.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Additional command line options
+# MCPROXY_OPTS=""
diff --git a/net-misc/mcproxy/files/mcproxy.initd b/net-misc/mcproxy/files/mcproxy.initd
new file mode 100644
index 000000000000..44efd721c549
--- /dev/null
+++ b/net-misc/mcproxy/files/mcproxy.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config="/etc/${RC_SVCNAME}.conf"
+extra_commands="checkconfig"
+name="Mcproxy"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+command="mcproxy"
+command_background="true"
+command_args="${MCPROXY_OPTS} -f ${config}"
+command_args_checkconfig="-c"
+procname="${RC_SVCNAME}"
+
+checkconfig() {
+	${command} ${command_args_checkconfig}
+}
+
+start_pre() {
+	if [ ! -f "${config}" ]; then
+		eerror "Please create ${config} before starting ${name}!"
+		return 1
+	else
+		return 0
+	fi
+}
diff --git a/net-misc/mcproxy/files/mcproxy.service b/net-misc/mcproxy/files/mcproxy.service
new file mode 100644
index 000000000000..0bad0f19cc86
--- /dev/null
+++ b/net-misc/mcproxy/files/mcproxy.service
@@ -0,0 +1,10 @@
+[Unit]
+After=network-online.target
+Description=Mcproxy
+
+[Service]
+ExecStart=/usr/bin/mcproxy -f /etc/mcproxy.conf
+Type=simple
+
+[Install]
+WantedBy=network.target
diff --git a/net-misc/mcproxy/mcproxy-1.1.1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1.ebuild
new file mode 100644
index 000000000000..463944737b3b
--- /dev/null
+++ b/net-misc/mcproxy/mcproxy-1.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info qmake-utils systemd
+
+DESCRIPTION="A multicast proxy for IGMP/MLD"
+HOMEPAGE="https://mcproxy.realmv6.org/ https://github.com/mcproxy/mcproxy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="dev-qt/qtcore:5
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${P}/${PN}"
+
+PATCHES=( "${FILESDIR}/fix_checksum_calculation.patch" )
+
+CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
+
+src_prepare() {
+	# Change install path from '/usr/local/bin' to '/usr/bin'
+	sed -e 's/local//' -i mcproxy.pro || die
+
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+
+	use doc && emake doc
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED%/}" install
+
+	insinto /etc
+	doins mcproxy.conf
+
+	newinitd "${FILESDIR}"/mcproxy.initd mcproxy
+	systemd_dounit "${FILESDIR}"/mcproxy.service
+
+	newconfd "${FILESDIR}"/mcproxy.confd mcproxy
+
+	use doc && dodoc -r ../docs/.
+}
diff --git a/net-misc/mcproxy/metadata.xml b/net-misc/mcproxy/metadata.xml
new file mode 100644
index 000000000000..e601c26a3075
--- /dev/null
+++ b/net-misc/mcproxy/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		IGMP/MLD proxies offer the possibility option to combine
+		local multicast networks with a larger multicast infrastructure.
+		In contrast to multicast routers, proxies are lightweight and
+		do not require the support of a multicast routing protocol such as PIM or DVMRP.
+		A common use case is a local stub networks that interconnects with
+		a remote multicast routing domain, e.g. via a tunnel.
+		But it can also be used in PMIPv6 domain to enable multicast for sources and listeners (RFC 6224).
+		The Mcproxy meets the requirements of the IGMP/MLD proxying standard (RFC 4605)
+		and has additional functionalities. The multicast proxy can be instantiated multiple times,
+		is dynamically configurable at runtime, supports multiple upstreams and peering-interfaces
+		for a non hierarchical interconnection of multicast proxies.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/mcproxy/mcproxy/issues</bugs-to>
+		<remote-id type="github">mcproxy/mcproxy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index fe4a8d843761..9d853f562e2e 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,6 @@
-AUX nextcloud-client-2.5.0_beta1-fix_cmake.patch 783 BLAKE2B e02f2df582ec0e1a2872e2d200fd20916b45a7c654be270b4cfb698010c494dd8babc1ead29daafcd2b80ffdc94e381de939619d1cf46080b9b170be8b3a1db9 SHA512 e3cd2de00c7baa00085498b05f4a64c63dd5e73f2ca435143e9069708e31d68a99bb3e903721a335256889c1e244b38c95ab8be7956a15ac3fd5c4dad2123343
 DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
 DIST nextcloud-client-2.5.0_beta2.tar.gz 18860182 BLAKE2B 9d6ab5f326c5280f0e9835c0c382b0ff78c01920f8bd2a6babbc3df20096d4c803fadfd1bc0f52798e5cbce503f241dc46b82923b8bdd19fe968b2d9c14189cb SHA512 ed5ec8c0fd79d3f7f843ef1aefb9b94088b85dacca442388bc9a42e1ddbf1ee90482595135ffaffc85e40d223406964c903949ca1c2161fa0f6a2d6770a77cea
 DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 EBUILD nextcloud-client-2.3.3.ebuild 2453 BLAKE2B e953f8c60f10101c891e46c98ba4c6c2f3ec09a17c40cdfe66687b31dcc0e17a9c3da8c4c8d6e7f27c1c0786f756dd98df2b979d671fa8d649d18eb1861fc7e2 SHA512 42614380bd5945afc39fb3b653c1d03e7afcd61f7bdb3715983198bb8dc7e75a029150189bf800ab39d9a0d9775aa3b05439269b6a0a987f9c02443167dc447f
-EBUILD nextcloud-client-2.5.0_beta2.ebuild 2025 BLAKE2B ce04f2727e59d7ed86038bc46760ca0bc06f6ebf7fa9d18eea87bbbe7a75a8f41270b961dc8992fe67d592e3e1bc530a8f42a4c7236ffba521587f9161863549 SHA512 c31768ac25786a3fd3f5a60b2768b264e25db4338d103cf22a9286547735e792f9f9991934ba58594e3197e1e6cc24b62cb839b77785c8b74b19b7ec92a9fbc8
+EBUILD nextcloud-client-2.5.0_beta2.ebuild 2053 BLAKE2B 82c72834a72183622c3ca4dae4b17a2722bd07a2dc8fb3728004e6e7b7dc236dd6d1cec4a13ace4d7718295cdb22c91f2ae2adbe89b849cd225b9032df4aa4ca SHA512 4d4ea0debd560b93b3eb3f613e5e9f4fa65b520dacacece181f6c85da0912e394d3424100b2aaf07ebcb9fb4ffc9f7980256b8b4b079cbd4c625ca6e701410f4
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
deleted file mode 100644
index e160d514088f..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2b825a1748b2ecd624a38976d1bd6601bdb198c9 Mon Sep 17 00:00:00 2001
-From: Ronny Kunze <Shinji.Ikari_de@gmx.de>
-Date: Sat, 4 Aug 2018 16:53:06 +0200
-Subject: [PATCH] rearange CMake find_package OpenSSL
-
-the command seems to be malformed . The keyword VERSION is not valid .
-And the version should follow direct after the packagename.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8b8330f2..f1d07eea2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
-     endif()
-     find_package(Sphinx)
-     find_package(PdfLatex)
--    find_package(OpenSSL REQUIRED VERSION 1.1)
-+    find_package(OpenSSL 1.1 REQUIRED )
- 
-    find_package(ZLIB REQUIRED)
-    find_package(GLib2)
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild
index d5fc16019e40..29daa11a9dbe 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
+	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sys-fs/inotify-tools
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index d03b0670b09c..f8db710677fd 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1,9 +1,11 @@
 DIST ntpclient-2015.365.tar.gz 31023 BLAKE2B 7974b7606a4fd979b9fd37446d6cf802b4104e566ba910933200c43bb7339721f17a9e5611d4b63850142eae7924623bbb765d2c6ef9c79d7f7409abd3bbe8fb SHA512 ca3d7b8ac6cb0626ac1017e4baee2faa833aab4fb449881e890b686f785b2fe30ded77a0a831f40126ded71abae0f2a944227d530859222eabfffe03f89d8a80
 DIST ntpclient-2017_217.tar.xz 108136 BLAKE2B 8f3717e33d70b3d150adb11b621098bef7a1a040fd96615b1ff994869372c3f358ab1b16cbf9e61c1884a19bd8cf9444732d7f938786c9c4899b0b3f95c6cd43 SHA512 a1dc7ef7b966bd49ffc2e63e2c850ba4eef76e5a313a00642074112e13adccf80a4a9211264850dda3052c948f85040e1a668846ddd0be9310c701df40282be0
 DIST ntpclient-2017_246.tar.xz 108348 BLAKE2B ff90eaedfb09462a656e33f2f36bf2e495a5809cb9419782b93567e85ae7e19ed061d9ae87ab21f4ae949506124aaecefd3952470a0c2994179e8175cf96ad59 SHA512 c836c4a921854730749aa0dd5a52e51e6845ea09458b02e14b61a5a3c808dc0b2ef6e9f62a95086e289ec38bb27b2454346e6776e472fb0dcc53c6a8e8092c48
+DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
 DIST ntpclient_2010_365.tar.gz 30423 BLAKE2B 9efe8b81eae5ae3e41c046acfbba6e148064097bb1bd3e2c1ec80d85bf0dffc8c2f73fa73f66060cb3287ceaa993d83241fcd67614f3414afad88adaf6fcc059 SHA512 74fd5e80dcf36c4e7aca6d97c5979b0dc4c51fed592279adfd04c0d329c117bfed819ee40d6400436c0d066f73ed3403e9fba8cb05846df55c991422ce434132
 EBUILD ntpclient-2010.365.ebuild 704 BLAKE2B 25b14f9088e389f0580dbb85272ff8d773ae0bd514899c2507980c28a476e61fd7c635c04fc6803fcfe3f0caca04f7ff93faa068f5fe69757c4b35940d934429 SHA512 5c4ef158e7bb7d2b003d45e40fa29d994596d2a657ca6359573730b4a30594bb0b6603c5647c4f97a9b7aca679c485bf3155a9a853d10f8e293d93fa3f1f38bb
 EBUILD ntpclient-2015.365.ebuild 700 BLAKE2B 4c23baca82e100dd31156534e1d1b15c6b9b7ba7a8adb590ff527508f831975fd1aaa1fd06ffa8ecde1e33eadc18315648a47e3e37c9650edb6b1e1c765c59ce SHA512 0220d85794028d9daa151ad2cc1c2e6e707938ebe5076c5bcb5f0ef2d954855c81f140ce845c6b6737fd8293e3510d53d26a4184179bd2fdfc76c91e6e181d74
 EBUILD ntpclient-2017.217.ebuild 655 BLAKE2B 0770499a3105930e5ed01ba5d3c9c75e537568a9ecb5ae4d30a497e31831eac52303545bca975313fe3a2d5fe9b90220973a19976732f4b6694f35bfca7e1e51 SHA512 b3e1d7211c99d2659ae925ff8123b49d10f1cc66057b0db2d51935829b49b5da04153b8fc3102386699fc0a9e1801df4afb12103c8f42728e0992bc6598b724e
 EBUILD ntpclient-2017.246.ebuild 626 BLAKE2B 080ccdf5a2ddaa15ae72af62fb0d1804a75f03a7b14de177f304c4177e50d67b073d0f6019a13ab4945ad7ab7c5522e93e70636f35895b12a43714520ce2c38d SHA512 6ea85f9ac17b4fdc091c46f5b01ddd10dd629eeeadf8a02decbf1ba36f7dd5954c6c5a9b3aef29ae4c5d789ade9a52aca7848f533d6b33afd2c5be81ceed96fb
-MISC metadata.xml 217 BLAKE2B 9d524b09bb788c087cce65f4aa8fd69e4423fd78d88e33996d264cd2cb9ae6f5774389a69e23f6af45b9128741ada3678bf353cf49ad9d0587b93d99fe1f922a SHA512 00ede86236950f74e074c7e76857386e743fff35bae5123d06a4ef36bd95e73b82a492a66e2e3cf336d6e60e9aefcec64799651ac9e39ffe327e84270772cae6
+EBUILD ntpclient-2018.244.ebuild 767 BLAKE2B 865070f73977bb2febef607505febf16e638b00904f2663816706d812d920d079e795189f06353b0cb5c28b2aa71509eb96ef3e6699fb398bbde78387fbe12b8 SHA512 de9f1870b7a32d095db493bfd5277301b91fb3557a7be65f1414a106ffeffe626f31254d66958b29de3da96cb3b806b6dccf6e137d90f79e4db83ddcefaaf0a5
+MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
diff --git a/net-misc/ntpclient/metadata.xml b/net-misc/ntpclient/metadata.xml
index 3f576f05f291..5d4f58a27a06 100644
--- a/net-misc/ntpclient/metadata.xml
+++ b/net-misc/ntpclient/metadata.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>monsieurp@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		NTPClient is an NTP client for UNIX-like systems, RFC 1305 and RFC 4330.
+		Its functionality is a small subset of ntpd, chrony, OpenNTPd, and xntpd.
+		Since it is much smaller, it is also more relevant for embedded systems in need of only a client.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/troglobit/ntpclient/issues</bugs-to>
+		<remote-id type="github">troglobit/ntpclient</remote-id>
+	</upstream>
+	<use>
+		<flag name="debug">Enable analysis code path and debugging of NTP protocol.</flag>
+		<flag name="embedded">Build a very small ntpclient, from OpenWRT project.</flag>
+		<flag name="obsolete">Enable obsolete features, to use with kernel versions older than 3.0</flag>
+		<flag name="syslog">Enable logging to syslog instead of logging to stderr.</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/ntpclient/ntpclient-2018.244.ebuild b/net-misc/ntpclient/ntpclient-2018.244.ebuild
new file mode 100644
index 000000000000..5a1d7f11c258
--- /dev/null
+++ b/net-misc/ntpclient/ntpclient-2018.244.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/./_}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
+HOMEPAGE="https://github.com/troglobit/ntpclient"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug embedded obsolete +syslog"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug replay)
+		$(use_enable embedded mini)
+		$(use_enable obsolete)
+		$(use_enable !obsolete siocgstamp)
+		$(use_enable syslog)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index d304b72618e5..3170d20edd83 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,14 +1,19 @@
 AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997
+AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8
 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df
 AUX ovs-vswitchd.service 393 BLAKE2B 6ca53819e5bda787eeefcf94f76749621da3462f2f92ccd70de35ba407b4dd74b29552b609871d77f85ccca764640555167b40b97d6585b80bf3bbfcb1ae242c SHA512 74d2ba9b76ad29dbb75e9b3321e1e714140a1c9bf9f5176c8418b025ffdb9c14d9f532709835c163c7256b4c81d69b522fcbc12d6bd9399283c8bd45b94cd7f2
+AUX ovs-vswitchd2.service 905 BLAKE2B 4474acd22956b21b6c89133c12013bb22ac2a19f759e2236a09b497a649ade6ea8db270f9a599931d622784109e71cce8ce9b09cef6ccfa6b938a31308eff7d5 SHA512 21e5a20bf469496f96afa13a5517393c1a55c09ae4cad57cb285a816f328ada190161210009e221acea47d0a038212e04ded7bb3f8235e6d6578ad283df7f0f5
 AUX ovs-vswitchd_conf 164 BLAKE2B 89cad03c930c21e3f83a40a27a3ae011ff5be50af74b589a3313d4f4964d7931f0186c9e8a543468e08cd69c1d03f018060840d6c32f072e678b68839cc75968 SHA512 2e65f8658b6120e30849a8b3b0268d7776635c36bdd77920537355fc1883f306d3df5c78d2a5fefffdcf76b093b126f9d315c1595cd0ab643ac5f000c8b4f439
 AUX ovsdb-server-r1 855 BLAKE2B 894b2bd417ad1e8113a0288db59af133e5b705deac982b01fcc9266c7c0387423a1897d55cd70651c3a0407461c641455869ceefe330cc1880abc2cf79516de6 SHA512 fa51b2a661c1bdd345adf58c2b0e4c4c68bb4ed4ce78dc6e195ba9fe662fa451753664c72f56d755cfa682d0c9accd283dc501aee3c4ba58238f44df1ddaf5a5
 AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab42fa1c93b079901777bc0e7fca0847427affc5a069e9041297369364f9aa28869f63a463e3646f70f47fd SHA512 cb9196ebdb7f16eca4182172a079027dc2c28f366d0a4f9251480b20172758cb581cd91b9a0f2a3dde95742455bec9ef96aa584305f17bdc97b3de7d4c99aa19
+AUX ovsdb-server2.service 1012 BLAKE2B b3d1d6373341d499d4e6c17b8b786de6a7861b46ed2cc76e526f0a196755408cff909a119862702e94dfd3171eae646f9f807a7b5c1be88e608938c3eff9d057 SHA512 da0deb44efabf3acd144b65bd0e32f1b4a6e6594e0e71eadcd0f98012d998c7bf21785b2bcb6b6f1cf1887836908ec7667161c31c1d827d8e865e95ebba8a591
 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
-AUX ovsdb-server_conf2 544 BLAKE2B b406ef90df3988cdf4cf2870596471d98324bacdabdf9c517fdc30f6d59927894b310dc8d256fdc68c9d065a1c54c00035ec287d4970607cc2be1b2bf748bf17 SHA512 b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5
+AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
+DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216
 DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef932bdd9e1d463c391e258a2b4461866a897c5063859708126c564e42ef99ab63a4b8fac8335bdc78531c46217abd945 SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
+EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B 25c4c0124b2d94e677274712fc03538edf5ba5119eb04fde8f388884bd780656bde4a3b84e349a2741ef626ad858ca5d78cf311ae51e9e32915c8ed5fc2d9d36 SHA512 1f4f103cc13e21105369a7da7ff0fe073776161e40c0e0768a79cd392835ea7d6d077d9128c880ab27f7bba6e7b4e20814f9492774295ad3c3c4cf0e0ac864c8
 EBUILD openvswitch-2.7.2-r1.ebuild 4444 BLAKE2B 7c9830c776d48eb04b7ba492704ab4ca0b6ccd75f8e057b6fa6432896023b14a6757e91f5a2c56eef644e5253e2e5f67ca900e19a2f3a66fd79a38eaabb1c617 SHA512 6db5b15358397de27d6fd396b8468970800c4159ab6ee1a92b74be97f9e0570b0f3393d403437cd76832f61bed3b58a52179f87b11110f24967fe1cb3d871c8f
 EBUILD openvswitch-2.7.2.ebuild 4391 BLAKE2B cd3cd02b18f4b4ff3bb75740d18b6507abb1d1841efbe623b757aca9580843cdbe11bd314707cc650d4a126e9025a4a52cad07669ad1add0652f23aa0de9378e SHA512 6c9f52cb4a2d811cb4a07443c0cb431658b71c6d96d1011d09d5e4ec8e226265cd4bb10d1aa5a60637d0e97904d8c0e3287a28660b52eedca9807ba4b878fb6a
 EBUILD openvswitch-2.8.1.ebuild 4453 BLAKE2B cb74b2daedaabcb207cbbd728cdd14ce692e90bcacbd42a826bd71840104fe54f0acdb550c1fe6bd7c7ef372a879b2c4ffad8f8f19a676afe68a1a5047c28de8 SHA512 cca708a57ee51bfa50da1684d2cc28194a293c4dbf7fa366f53b598592197bced2e471fabb8e00dad60cede01c33430080f17dc78bf3fc262b05ae5730ac41b4
diff --git a/net-misc/openvswitch/files/ovs-delete-transient-ports.service b/net-misc/openvswitch/files/ovs-delete-transient-ports.service
new file mode 100644
index 000000000000..4cd4d7f57f97
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-delete-transient-ports.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Open vSwitch Delete Transient Ports
+After=ovsdb-server.service
+Before=ovs-vswitchd.service
+AssertPathExists=/var/run/openvswitch/db.sock
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl delete-transient-ports
diff --git a/net-misc/openvswitch/files/ovs-vswitchd2.service b/net-misc/openvswitch/files/ovs-vswitchd2.service
new file mode 100644
index 000000000000..3092fdaaa669
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd2.service
@@ -0,0 +1,26 @@
+[Unit]
+Description=Open vSwitch Daemon
+Documentation=man:ovs-vswitchd
+Wants=network.target
+Before=network.target network.service
+Requires=ovsdb-server.service
+After=ovsdb-server.service network-pre.target systemd-udev-settle.service
+ReloadPropagatedFrom=ovsdb-server.service
+AssertPathIsReadWrite=/var/run/openvswitch/db.sock
+
+[Service]
+Type=forking
+Restart=on-failure
+Environment=HOME=/var/run/openvswitch
+EnvironmentFile=-/run/openvswitch/useropts
+EnvironmentFile=-/etc/conf.d/ovs-vswitchd
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
+          --no-ovsdb-server --no-monitor --system-id=random \
+          ${OVSUSER} start $OPTIONS
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop
+ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \
+          --no-monitor --system-id=random ${OVSUSER} restart $OPTIONS
+TimeoutSec=300
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovsdb-server2.service b/net-misc/openvswitch/files/ovsdb-server2.service
new file mode 100644
index 000000000000..5ff6f9044660
--- /dev/null
+++ b/net-misc/openvswitch/files/ovsdb-server2.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=Open vSwitch Database Unit
+Documentation=man:ovsdb-server
+After=syslog.target network-pre.target
+Before=network.target network.service
+Wants=ovs-delete-transient-ports.service
+
+[Service]
+Type=forking
+Restart=on-failure
+EnvironmentFile=-/etc/conf.d/ovsdb-server
+ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
+ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi'
+EnvironmentFile=-/run/openvswitch/useropts
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
+          --no-ovs-vswitchd --no-monitor --system-id=random \
+          ${OVSUSER} \
+          start $OPTIONS
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop
+ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
+           ${OVSUSER} \
+           --no-monitor restart $OPTIONS
+RuntimeDirectory=openvswitch
+RuntimeDirectoryMode=0755
diff --git a/net-misc/openvswitch/files/ovsdb-server_conf2 b/net-misc/openvswitch/files/ovsdb-server_conf2
index 97367b9717e7..07eca5e6c9f7 100644
--- a/net-misc/openvswitch/files/ovsdb-server_conf2
+++ b/net-misc/openvswitch/files/ovsdb-server_conf2
@@ -9,6 +9,9 @@ PRIVATE_KEY="db:Open_vSwitch,SSL,private_key"
 CERTIFICATE="db:Open_vSwitch,SSL,certificate"
 BOOTSTRAP_CA_CERT="db:Open_vSwitch,SSL,ca_cert"
 
+# Default user
+OVS_USER_ID="root:root"
+
 # Alternative path for the database (default is /etc/openvswitch/conf.db)
 # DATABASE="/etc/openvswitch/conf.db"
 
diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..302aafe58fec
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd versionator
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.9.2[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[conch,${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		# docs state 4.17.x code states 4.15.x
+		kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server2.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd2.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	# only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 070697b72b80..d058a7639f0d 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,10 +1,6 @@
-DIST rclone-1.39.tar.gz 38015559 BLAKE2B 534bd0be87e7c8291bfe3acdaff12e9acfddeb42f08067d413184a688b5c0cdfcde78abff3551d81cd2e692a020386116f03842c8390852b2137c2f8342e43f2 SHA512 6e5e5f5e06510f36185d165986cbd3ed994d3cbf97055b4dea37c78af932f89ab8c89249006b829aad38ba43c77ff46f254ba56bcfbae7deca1ebcea555ad884
-DIST rclone-1.40.tar.gz 46067393 BLAKE2B 56bc172965f7f601c8f5c9c72a03ca44b1b41cf280497f7473d318b6667f00df4dac2d104f6fe7daf1529ebedd4d6f4ca5899944e82d68b8fd1b66226264e82f SHA512 ce46393097122f2ae9669310767487218f74ee8fab607cb6355df33329325fe626d17b36565b7864e6b4ca1de75714e29356d7abeb3cc42038d3ab0677408973
-DIST rclone-1.41.tar.gz 48197335 BLAKE2B b2b48f74cebd5f7f772b0e0c58ba23a1f9a4981df8821da0c773d1dd1a6b713b51b075500e5f70086d481d080dbc2029ffb56455416d72d93b0b624c0569790f SHA512 efce2827a659d83c2fce74c50e6d4182dc5916ba8e47a335f2719cce5c3eb4a9622ee0f53c5923af1ed84b340b6dd7ac00bcf48dbb3de53644dc3f2298523112
 DIST rclone-1.42.tar.gz 52702474 BLAKE2B 35def37dfb44a9fccabf0f6c3d0106da58bd1468a0c73e8b0a911e9bad48c6da58d303726544c76464230714af68d1727336eb9a4858337b346630f5df147a08 SHA512 69fadc1bc661e6278e461a16b49fb473bf2e35ceb85704c2b92e252422d372fbbbbb9d188cf9cb58d55b6d6c8267c599ea0d8a79fb4edb4a7bc0bac61de3eae1
-EBUILD rclone-1.39.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-1.40.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-1.41.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
+DIST rclone-1.43.1.tar.gz 15965941 BLAKE2B 5bf0ac08ca75abfdf6bbcd8f5725b0ab3aa543c7dac043feaf301a6c0a23090c61086e3c16e674bbc2c29d7dff7fc19e7759c70e5990afb2ddd72e5610295cba SHA512 7da3b285a8ed401de95ec0b8bea21ca3db0313eb2012874b10fb65c4441311ba4b24b7dd3ea68a7bce17206ac065f091d2f6ef6a9662fe0111b9f00ff58e6c17
 EBUILD rclone-1.42.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
+EBUILD rclone-1.43.1.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
deleted file mode 100644
index 2c530609ee7b..000000000000
--- a/net-misc/rclone/rclone-1.40.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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}
-}
diff --git a/net-misc/rclone/rclone-1.41.ebuild b/net-misc/rclone/rclone-1.41.ebuild
deleted file mode 100644
index 2c530609ee7b..000000000000
--- a/net-misc/rclone/rclone-1.41.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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}
-}
diff --git a/net-misc/rclone/rclone-1.39.ebuild b/net-misc/rclone/rclone-1.43.1.ebuild
index 2c530609ee7b..2c530609ee7b 100644
--- a/net-misc/rclone/rclone-1.39.ebuild
+++ b/net-misc/rclone/rclone-1.43.1.ebuild
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b5a23a3ed82e..2f50fbc6f6e0 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
-DIST youtube-dl-2018.09.10.tar.gz 3036301 BLAKE2B 341e74da88ccb890cf41ce81b3f541118b6afcae6baa6bc7722e41730894ee466e57b3475622309de12dec01e15d51534db90fe5751f785287665416e3ba71de SHA512 ebc0b0357231173718be3b94c2c2974496170e039a69cb58d809a1973a56306af058d91f485d2bacee5d665fea1f96d9f7243960556b42a7280a647611dca750
 DIST youtube-dl-2018.09.18.tar.gz 3041086 BLAKE2B 6cca8e87c26f9b2d1c9aa117d4e798cd80b12a423a9f63f2d79a6b55d21f497f372a1d5d72f48ebdf52d658f26934c7f1db9e44b5b6ed030bcb55a452a3e8f44 SHA512 9ec58e05fb7db0e08ffeea3810631b21654dda9a57849db76a7a8f9dfb6fc95fd685b36188354c9b28f6e35c818a56c44e4c55bc826d2d1c19b96cecfcc8662e
+DIST youtube-dl-2018.09.26.tar.gz 3042551 BLAKE2B 1cf4fe51a55bd82bacf5405119f91c78d975d755c8dc50e41b52f8e0af26074d6873b4046970afda81b3732825918c3bd1a14aaf3ef554096db063b365a72e6a SHA512 b54721bd9b6c6bb66d0ddf4000a435bf8f4d3884a513aada844497db38a5bca34f82484b483b20adb709043ffdd1c00b6aa6cb9c5e6d5be2306d0ae7be77caee
 EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb
 EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11
-EBUILD youtube-dl-2018.09.10.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
 EBUILD youtube-dl-2018.09.18.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
+EBUILD youtube-dl-2018.09.26.ebuild 3286 BLAKE2B 3d1dcd532b3718f37128c1b3e95ccb4bbff360335a28232e8169cc87de2f74c60b9ae1c51ded8d49ebb71cd4b864bae7ee5d5c09788eea8123e8430a34059634 SHA512 e72de7230ed2cfd9371e12bf2a74d1c42ca4f7f4c42bcb1d0e78735b7768521e55e3227706b24c50d4d394f19ef75d42b95d73d27464919cdc2a7b2cf34572b8
 EBUILD youtube-dl-99999999.ebuild 3156 BLAKE2B 3e94ee7379ea96aa47c6276d78bab9683bc2317980a7206d119c9710ccf99ec2da383bb8744208bf4d82af91990b12a769dc66760614330a2ef276c3051f3d05 SHA512 b45f8856a4d7067dfe53f1a7689373c001f0e1b98540cd1654001c9e23c442a245bf41d014945b2b84d818f0e26d0995fd7b35b73d3e3871a6c567c8e664c5e4
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.09.10.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.26.ebuild
index 1c433fb38eca..8a6b3e14fd72 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.09.10.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.09.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 02234c5ec153..c57fb0ea6a2d 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -4,5 +4,5 @@ DIST zerotier-1.2.4.tar.gz 7963254 BLAKE2B 0c79533429e7aab8dc0a93d46ace132b168b6
 DIST zerotier-1.2.8.tar.gz 6009764 BLAKE2B 740b58888f6ce2808608867618df517996d423c61d2ab71f387405bb2528ac5edc6a890b9a7249eebe5d62be58e237362692c13725f0c5313b45102f5fc4824a SHA512 a97a8ff0e5050294fd8d56e74b5dd320b77822242ed4d43919c62a361ccbe1837417cba07d4114c91e277816f60bf47d226f37f816278bfd96505b752ef5d5ff
 EBUILD zerotier-1.2.4-r1.ebuild 900 BLAKE2B 78b4d45a2dbe5577f63193199125fa70298cf498300611f429771767fe165df4ac44a783104e3003628ecf1fa97c9b0de132fc021c759caed25be5ab93fb78b1 SHA512 3311a4b3431450384e08910fac3838b1221c1f6e46debb967e6d98b775aa433de588b6fbd03ca5cb0ae4c8ae28780344806891e5b421f5a90426045189b39434
 EBUILD zerotier-1.2.4.ebuild 910 BLAKE2B 1702a5bdbc81996fbc8503b88cc2149793d8391d80e736e57b6ded5556f0fd6f2d3a90c6d4105e453e4395de9b6cdd2fed835e99bb66361549ff89a82e7bd5c4 SHA512 0b0e295145b5c3b149a41a3645f080e644ca336e151a0dd7c7f6be4c8bfb508414616415b1c95e1f8f4dd34a00cec87ecec6cb67ad1a1642d833e6531a472d67
-EBUILD zerotier-1.2.8.ebuild 905 BLAKE2B 15730c3a9c069e8519998e1fcfcc1c44b38b6e9ec94cf3885562a08c4ad7212af5333dbcd021326f7e606f7c5c9312e0821944b523b6afa7c96ba1409f859aae SHA512 6b504bee732d704b692b00fa18fdc8c47054a1b38a082aa83d4335d2773308c0d12886327d4454a7d95ce43f37e931940c84d082f2e88e5c5e1bfea7002ac6ae
+EBUILD zerotier-1.2.8.ebuild 904 BLAKE2B 8abce716fdaea48a81bba690f91d987d48dae7fd2f39dc3a97f7583ff7dfab7dc9f6b2641db31e546f70089fb886d1cc1971fa399f760e6295ee89a30dc38623 SHA512 486490d097c4bdcd2049b700f294d112c34df920fb2086e57987e5c7141636b3bd1a372fbcb6cafbe5fe0aa6079468371dd78e477051626b40201ca80ff3e48e
 MISC metadata.xml 551 BLAKE2B f23a3b355a8f7a28b94328a4501c505ba1418426fbd0e97b1787ca085a416f664a3a2a065612d1371c8e79902445465bc2a308a8bffd60e8b767a50f4759b260 SHA512 5fae12e1943c36525f6d9206753cf59a9a27cd895872da9f9ebb31b1d07542b5a76dcf9295f20d2360fa0d56a3f3328cccbd2e2030a6494359c6c69e0c015a9f
diff --git a/net-misc/zerotier/zerotier-1.2.8.ebuild b/net-misc/zerotier/zerotier-1.2.8.ebuild
index 7d2f788b42ec..e77b9a824dd8 100644
--- a/net-misc/zerotier/zerotier-1.2.8.ebuild
+++ b/net-misc/zerotier/zerotier-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,8 @@ DOCS=( README.md AUTHORS.md )
 
 src_compile() {
 	append-ldflags -Wl,-z,noexecstack
-	emake CXX="$(tc-getCXX)" STRIP=: one
+	tc-export AS CC CXX
+	emake STRIP=: one
 }
 
 src_test() {
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-30 11:19:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-30 11:19:18 +0100
commit	62f67115b5c46134c34f88f4b1cbdacc19384c0a (patch)
tree	0a76b14de203a4c23040e5665e39df8de9867745 /net-misc
parent	265dbe5dbc14c199299496c6db8fce3f76647015 (diff)