gentoo resync : 09.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
commit: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree: 047fc92023c520d07f13ec5ac96e094d1b312a7a /net-misc
parent: 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
37 files changed, 1006 insertions, 409 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 701aec407a52..74c2d820ce94 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 916bc5c128cd..eaa754792784 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,9 @@
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
+DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
+DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
 EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
-EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
+EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
+EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.3.ebuild b/net-misc/bird/bird-1.6.4.ebuild
index 580dd5694106..ebdf7de5c1f3 100644
--- a/net-misc/bird/bird-1.6.3.ebuild
+++ b/net-misc/bird/bird-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,34 +9,34 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ipv6"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug ipv6"
 
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
 DEPEND="sys-devel/flex
 	sys-devel/bison
 	sys-devel/m4"
 
 src_prepare() {
+	eapply_user
 	mkdir ipv6
 	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
 }
 
 src_configure() {
 	econf \
-		--enable-client \
 		--disable-ipv6 \
 		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
 		$(use_enable debug)
 
 	if use ipv6; then
 		cd ipv6
 		econf \
-			--enable-client \
 			--enable-ipv6 \
 			--localstatedir="${EPREFIX}/var" \
+			$(use_enable client) \
 			$(use_enable debug)
 	fi
 }
@@ -51,11 +51,17 @@ src_compile() {
 
 src_install() {
 	if use ipv6; then
-		newbin ipv6/birdc birdc6
+		if use client; then
+			newbin ipv6/birdc birdc6
+		fi
+		newbin ipv6/birdcl birdcl6
 		newsbin ipv6/bird bird6
 		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
 	fi
-	dobin birdc
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
 	dosbin bird
 	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
 	dodoc doc/bird.conf.example
diff --git a/net-misc/bird/bird-2.0.2.ebuild b/net-misc/bird/bird-2.0.2.ebuild
new file mode 100644
index 000000000000..b5bd01fc5519
--- /dev/null
+++ b/net-misc/bird/bird-2.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 1645a3aeaba8..08e4a9ea6105 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -7,5 +7,5 @@ DIST chrome-remote-desktop_57.0.2987.37_amd64.deb 15677362 BLAKE2B aa92ef2a6c890
 DIST chrome-remote-desktop_63.0.3239.17_amd64.deb 19026074 BLAKE2B 9a62d317768d6c0ab3cf3c6e7c5dea074133cc7c5d2b04ffdc1e0f9877f5f606c044ebab7b230914eba2ade51d2805fb1267f7b1731fa36235495a8192eb3c48 SHA512 2843deb7817217c8b8e41931b1e9ef0fdfb40c6a4ceb1bc69499aed16cc729d7ed64f88200c9bb2366a768f294a164da2360ed2b9654d1626696bcf0403e347a
 EBUILD chrome-remote-desktop-49.0.2623.40.ebuild 3668 BLAKE2B f149fbab2512737be2bf8668ac1aa6b0c2873a23afcbbef60fbb7d67fafd3ce213496860ff4266a05527712a26f6f9cf964258f8c8b5bb5c6638034c4f19ff5c SHA512 7486227050481ba09ac2f5a0c1fa205d1461210354bbbd2b1fdcd40195fc223ed018b439ad421c1f93c825e67106042e867f57552b68c26134fd185daa4126be
 EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3825 BLAKE2B c5d0b10e2c3685b6152c5e35631d223e5993078365a9d54dbc336455d51c1c4d5d213db0b29f3cd4e84845fa0f35a1606a51aacc91b632ea651fb1322cfc8249 SHA512 0e275cce491f42c3ab65e9d3fce723bea92edfa6354ad20203f347e9b39c152deea52429bb3c055d02d8ac4d913d37c6ce1855bc7ad5db36afa851447a8ec42d
-EBUILD chrome-remote-desktop-63.0.3239.17-r1.ebuild 4081 BLAKE2B d7fb7b32043c28bed4fc6ea8dc0a967aa804031153337dc5b2f550e483cb223852ba101ae4f5a2f3b5ba78c7bb41ea663cc9b4b39c4b297b541bf785e6061dc2 SHA512 f29cffda7ff28eea9f4094090875c633051232214d26d96f30ee7486b5e06d225960e443e32a824194b2eb7d6e345715280b6679be7d6b24586f5fe10ffa9039
+EBUILD chrome-remote-desktop-63.0.3239.17-r1.ebuild 4080 BLAKE2B a0e1646c93031ae3a09b9bbd4e2ec2935498c9104354a8656acff039e1b726b222563e4c7385b44018f5bf974b4359ad68a19b285ecf5de854ff7d4592696f46 SHA512 26c40842a4d067e6690baccc0126379292dc2cfd6b555043fd961cd4152b69bfef7ff33841e5beebad3b0b05f0b926d2633b5b3f420fa880763fd5fe56b50874
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
index 20302fb409ba..d8dbea31d66a 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index cebae592c38e..81e457b4bff3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,5 +10,5 @@ EBUILD curl-7.57.0-r1.ebuild 7103 BLAKE2B eb3b2a5181284c2e63d57d45e20692adf3e07d
 EBUILD curl-7.57.0.ebuild 7050 BLAKE2B ac2b9ef326caec4e07e89ea30f07140856a4ae62177c1ef7fef78a5a968f8095dbbb82e455d0f309ac35dfbbf57720d013fcb411bbaa523964da124bf0e3f140 SHA512 3b496a5d3159150b6ab7b45fe5145b97a64a9f8909f05f09604634aaf5750ed560941c17be249d7cc5c27a0e03ab353fb913795d47f285ccda7c5e3ad48c786a
 EBUILD curl-7.58.0.ebuild 7093 BLAKE2B 98eaa108a6d55f5a969fe0898e31f0a2af4b7fcb15ca993eb3d238d0a73c6a60d010ada1b1c5d6cd21b117832f8bab1e43fd9e3ff2072457144e4f5df254fc3d SHA512 a31269371ccf0948b1413cd256d6ad4df609b89c40c44a54cc1b83282353b45ea314322fc12fba279c27bfc7513a8c5ced8c09df065230ff833c7b13eebc87a5
 EBUILD curl-7.59.0.ebuild 7267 BLAKE2B 4fadca87badfa6435f391f19508a8a8818b47bf755746f9cb9597858923ea2205daa9661cf1af5cfc65e479205c03662524e18e0ef9d1dd2d2187226f5f93117 SHA512 eaf229ab649e47e2743f1d1217309df883d3513e4f3f0b7be9d1e1a5fbc04f9b0491b6be0a43c6202b0cb17dd03a3381185f5d8f9c256576173cf282dd91c411
-EBUILD curl-7.60.0.ebuild 7193 BLAKE2B ffea81226489b3954b6f3535d44e261b5d0885a731855e7a158295fc798e47cd85bb644434b4ab90a4d4d6522768188f90a65e89d0dd7aad57c57cee92f7a975 SHA512 ef629090384c003951f1f3ccf552a7cd35d3628c60077a31e04bafec18a8dc702e08e8edf3516b07625d7e47cee1fa689c98c628405e2f8d745e623a4a3dcb4c
+EBUILD curl-7.60.0.ebuild 7190 BLAKE2B 36875f071012e815144664cc3a697702e53969d84c4bfd77d36c378692a288ad8744c563ed97228a19bd00396085d5d1ddc0e8d93d8aa8fcf36b70f95ce74542 SHA512 e133adfcfc13eca9b7ec229b8d53a9fa3e56b2af97f4687d4c149bafa05ed7d72c1587b59da21ab24f1f10e87bb20edb83ab99cc7d009e3297a6c421e3a6b8a0
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.60.0.ebuild b/net-misc/curl/curl-7.60.0.ebuild
index 651e81b046c3..b45fffd3d353 100644
--- a/net-misc/curl/curl-7.60.0.ebuild
+++ b/net-misc/curl/curl-7.60.0.ebuild
@@ -11,7 +11,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~arm-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"
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index b64222121484..53e335a69a41 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -26,10 +26,12 @@ DIST dahdi-linux-2.11.1.tar.gz 2045435 BLAKE2B b84b8717a7568b00ab9cb9f6edb5a04f2
 DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c1388544710ab69bd727d54963c7df6c7fcd56a450d5ea0242ae1bbbe45855fbe5bd3b3150d28676490713f9dd1331e42c0c2fa5243415b69 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
+DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
 EBUILD dahdi-2.10.0.1-r1.ebuild 3619 BLAKE2B 78303522ad9ad22932719028da33f72baadeca7e380c535d10ed95c42941a19502175de1630dbf7dcd484d2189cef4d94813f69341f44527415f5d3da28843b0 SHA512 94273131542d58fcaec97471fd65a9503f1fffd833ef7632503a776c10805cda1f7da6163d2d5683adfbb47085fa920b8a527e37ee867df0ffac320d252fe8f9
 EBUILD dahdi-2.10.0.1.ebuild 3617 BLAKE2B d4ca2fe5dea6d1c175224a3bd72d6f15073d17c0a89347c305f631b9208686f83e5fdb03612e4ab6814dc1f90f90c74701dd5312c1b9ad17da1dbf9cf5c53368 SHA512 a9acaac3ac0d81b07f96c7d30ea2bf41e950dde07b53d2e800e792720ce82317f481322bdb472b10fc78aad7a28f5dc91b1d170025c185b4a0301e0a11f28d07
 EBUILD dahdi-2.10.1.ebuild 3617 BLAKE2B d4ca2fe5dea6d1c175224a3bd72d6f15073d17c0a89347c305f631b9208686f83e5fdb03612e4ab6814dc1f90f90c74701dd5312c1b9ad17da1dbf9cf5c53368 SHA512 a9acaac3ac0d81b07f96c7d30ea2bf41e950dde07b53d2e800e792720ce82317f481322bdb472b10fc78aad7a28f5dc91b1d170025c185b4a0301e0a11f28d07
 EBUILD dahdi-2.10.2-r2.ebuild 3618 BLAKE2B 5105bc86b9eabe1deddde2196d6bf98646a00a49f47d59dc9aef61d25bdf858d496da6663ad72262a79e02a408ed9eb8c44876a8e13c48f66d67caae9fb7bbe3 SHA512 73784dc279ce84937e52cdf2df7df9da91af842944bf2dffbabf780da04d5477067f791aee701b4b3615a14a667520fee602f601021304d06b1154e401e0ba4f
+EBUILD dahdi-2.11.1-r1.ebuild 3668 BLAKE2B ca3be7eda7090e86fa17d221bd1b3764a40b180735a4b00acae5df0654b2a3857802054fd167ea35877c61f82521d6cf9f8c420df68375572f24c2bc9ddcd281 SHA512 62c84fad523c3c58e3d81e1a4bc5b956a7fcde28ee088060f579913e1fad4b6a02895a8c3a0cb2795ba52a156c1b252214bbda1c248a5802613a3cccef755ffd
 EBUILD dahdi-2.11.1.ebuild 3682 BLAKE2B 3ff22d2b78db250bcb1ba265500861e1bdbe920d9871567f26ae736f87e9859fbe6399c7a9466c33050a98f738aa46dd534d7c80bac92a528aacb41126a7ec58 SHA512 6434e30a359f02afcade7384dfe2511ae3ca829abb7553be74bfd6cbe9be27e98be73eec7cdf5af70a082110dcae9585cf4d94b58f924b00d6e33dbe37c9df4e
 MISC metadata.xml 327 BLAKE2B dc7842c2aec03bacdbb85d43b0f13075d77fd36fcd1398b46ac2fcfa0862d2a1d2c2ce1cb6c4dabdd019b7a202661cdaf822223d510d0972e840186a2dc30995 SHA512 ee6a6009392a739eb25095468f78d7c76a09d49141faf8444e2c6e9969f05e4b1748a4f518127c8b14298746515c0606a6949d4629d75b5343ba56f72dc2eb9a
diff --git a/net-misc/dahdi/dahdi-2.11.1-r1.ebuild b/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
new file mode 100644
index 000000000000..7f9b0c8baf40
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.2.4
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index c344e8fa84fd..5b3f150511f7 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -7,12 +7,16 @@ DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802e
 DIST dhcpcd-7.0.2.tar.xz 208736 BLAKE2B 958118a7acdb6d55e06b88ec8b1fe342600e49caefc7e0e6745a20aafb9588f1c83af171c47e7b6ba1faa664290b052530271f5dd588f82db5933af315b8eea7 SHA512 f5b1407199163fb994519bc1b5a70ad043f00f263e3b254da5d519d1c6b689a4a5a8bcef3bf42401826984e273c2ead38249fcfe99129b87034f90de2fc46ecd
 DIST dhcpcd-7.0.3.tar.xz 208856 BLAKE2B d11f1845cae74470cd9982f5957911ac5fd7cc284b455254fef5c462e516018d94d56f970d758e81cd86a7f918e5cf0d3bd6d2087bda701b299436c4253220f4 SHA512 a2d4e8ea6a310090c2795c596c80a76f0e42dc6654ba50d2900e2af4239dbc542e857d20b2983ea97675903b85cdbd0e9212424390a62081837821bbdaf7ce83
 DIST dhcpcd-7.0.4.tar.xz 209860 BLAKE2B 12c9524d6cd012665479a91f2966ae8123cc38bd3a47d81490f3dc0efecda2a787a0d55e883906e536c989054d25e00fa96d06d11062013d154de88882f31414 SHA512 32382b17a00e6ff7a80868a35424d1cc25410f012048ef099a90fbcb15a43ef6e73d2e65094ac90ccb18ecd92c6fc2c7e2116e19669ad0084ee39182b5cbd7db
-EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
-EBUILD dhcpcd-6.11.5.ebuild 3281 BLAKE2B 6d98c09002122c9044e10aaaefe442f941db4686227d6e7a052c96dfaab68c276f9fc6b3230d3ec0bc9fa4f6fb0ea5933b574d23fd8860cf1e33c3a4eb10121b SHA512 94b13653b8202a4c402f1f52618a9f5bc414cb92ab1376098dc70e12dc5fb963ebb83ba517b100eaea0cd2cc248152b038115ef14e588abb0ae78c024c13316a
-EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
-EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B be75ed49f0477924807faf02e3adc6596257f9a026db8dc5583a24264686ab543aba839c33146ddb2368d632291a8b685d7bb18eb7157023f8f137071c4c7798 SHA512 98596cf6a5ecd4009fe02cab49cae6ac39283da3d3c9dce8ee1144063da4030a3433ac1ffef7d84edbf8bfd2c2a430c43a3791e77988e40b865b8b110fc7607f
-EBUILD dhcpcd-7.0.2.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
-EBUILD dhcpcd-7.0.3.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
-EBUILD dhcpcd-7.0.4.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
-EBUILD dhcpcd-9999.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+DIST dhcpcd-7.0.5.tar.xz 210088 BLAKE2B bd10e09eb160e09067a3cf0472417a191f05216dbae5e5b65255a6e212fdff099b178a331dc44cf420830d1aaa581629d669f491d4acb099d646a5969d621dee SHA512 b9d5a1c9306ff86544f0a74a0e61f9a78a643087da8cbee2bf09155a745c6815a2078be7f7a400f31f760355eae2177c5760ce4ca55e83cee615a343671d9b41
+DIST dhcpcd-7.0.5b.tar.xz 210024 BLAKE2B 38073a761d93b0cc1ece2f5a87791b50d40740796794852dfdba10a7e8e4264e77fa554c1a2e1192430dee791be7856b707889406bdb1e1d508c56187eb61348 SHA512 f2d9a6930a31e169ae63356c06ed7b6d642d03f13c555512a8cbac4e95430a8fdc7e5eecb2fffb795947e4f6a6e7a9db239fa85f12801833e553000a732879f6
+EBUILD dhcpcd-6.11.3.ebuild 3278 BLAKE2B f7d9dbf6a9d28a1f45e4f33becc4545da4db8298a107d543613035e386b8c529ea2ed21a289b943a6a3f9867f41490acfb9eb15aa791b3f526ac7d2155ab560b SHA512 a97575ba47e8912b17c228d694399af86ab928b87432a9ac6e5ed176ae3906db2fd80a044bc348203a4553571382afca619cb01b8b610b0bf7eab61b5cdc107d
+EBUILD dhcpcd-6.11.5.ebuild 3282 BLAKE2B bc9251210e85f02249a25f0861b598b587f8fcac8bf9e1524c3df64b269f44d654f6cd078b45e1597ee5114da8f17a64af06792e43c53355b1f321aaa09f2546 SHA512 20d99b37d66cf2e16892579189a32bf6586392a3c8216042f25238c7129d829a723da1e66b183edc153527b5c3036b4f588097d4a19b44c41c3d9f108dcaffd6
+EBUILD dhcpcd-7.0.0.ebuild 4458 BLAKE2B 54c2d419ad253ca4700ef26497cf0298675474ab10401897db0fffde6b4230775aa31f887e02d7d6b1fe5d5e0e7c8bac3e89544d6d45350571265ba1643891e5 SHA512 c1bd4860478c81be307db61730746b7a405b73d0bf5360a99b7cda93845a6c14b836c0624d0850bf40aa4472e4353209be762e9b4cee6b816fc1df55a6fe2662
+EBUILD dhcpcd-7.0.1.ebuild 4448 BLAKE2B b9540c9cc1e5e4feeb4839fff89371b89b775d403a704cc64e2212d0e985aae629d22e8174849d7e2be5ed0a858511347cdb56c7653bc1f47e30afe59a0a8311 SHA512 f9b859fab6072982c8081997fa72e3dc1ae1ea48f59857f9af410644caf2826073e7c677fc46ed7b8010dec2883b9ca11dc90e40713600df2603e1595bfd7a80
+EBUILD dhcpcd-7.0.2.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.3.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.4.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.5.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.5b.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+EBUILD dhcpcd-9999.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
index e3c4a2bbd1a7..ba2d583ce996 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
@@ -9,7 +9,7 @@ else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -17,7 +17,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
index b3643c1a86f2..88c108069c9e 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
@@ -9,7 +9,7 @@ else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -17,7 +17,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
index 2723156dac92..c77b8fed58c1 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
index be9639cc3816..10a09a211b79 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.2.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
new file mode 100644
index 000000000000..bca59ecd5d70
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
new file mode 100644
index 000000000000..3d93853bedc3
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.5b.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 3d93853bedc3..bca59ecd5d70 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -18,7 +18,7 @@ fi
 inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 36421cd3cece..fa40604390b6 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -4,5 +4,5 @@ AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a1
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
 EBUILD dropbear-2017.75.ebuild 2479 BLAKE2B b200fd9ce16df2cfcfe197bbaa4d23b86fd65ac28e3a91b2b9b38780ccab35333cc946b71dc67826932dc39dd67f7c0cf4cb3f026bbded140b306c5ab464f42c SHA512 7ff7df1daccbadc9a855ade363dd8158fced88e779ac9764136ed8c42e54380cbbdba2ad6392e859c974a4c81cf54ff7af240c54ee7a03094880528b21ada6c1
-EBUILD dropbear-2018.76.ebuild 2627 BLAKE2B d558e88e05a0169795e8885003f3d3ed6e82b18199a717ab55cc144067b65b0d9fe5f4988ca4b514ab84085779ae7609c05d615fe43e65a9c23d304e2fcb922b SHA512 993b7e76ab0a6746e42f81c94fc7a5e5de07cb76a745c0161ea0d8c1f0e96c5081b785ff68aa173240d753c0bd51576e2734f2394fc8f9af4534e6008db5cf78
+EBUILD dropbear-2018.76.ebuild 2659 BLAKE2B 86c2521f8ff752ab0e3957167f4e1e0f9f20bfa54fed2561b6c27251ee1a6eb71f80a08d8138fed5bd88d8f2778798a9534edf66a1274e7e1cf13cf36ea99ca8 SHA512 66aa0a4d6a60a8d6b893b7a75e088dee4b6c04eaee98cbac5399d4dfcae4df60f0939f52347e8aa372a8818a0906a167c71f6643a5f1aa923f546fdc3668da6f
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
index f73f40c403a4..a3ec3a6212d2 100644
--- a/net-misc/dropbear/dropbear-2018.76.ebuild
+++ b/net-misc/dropbear/dropbear-2018.76.ebuild
@@ -38,13 +38,13 @@ set_options() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
-	sed -i \
+	sed \
 		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		options.h || die
+		default_options.h > localoptions.h || die
 	sed -i \
 		-e '/pam_start/s:sshd:dropbear:' \
 		svr-authpam.c || die
-	restore_config options.h
+	restore_config localoptions.h
 }
 
 src_configure() {
@@ -86,7 +86,7 @@ src_install() {
 		dosym ../bin/dropbearmulti /usr/sbin/dropbear
 		cd "${S}"
 	fi
-	save_config options.h
+	save_config localoptions.h
 
 	if ! use minimal ; then
 		mv "${ED}"/usr/bin/{,db}scp || die
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 635af27e7a2e..72c37cccb19d 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -1,8 +1,6 @@
 AUX felix.confd 111 BLAKE2B ea790c8b649f58bc8b4cbef2c91dccdbd7ba2bff9db80d45b677ef1a7948252c5175f2d96257d7ce5d7fbf2c5e5543da7bc0345176808e02323d109aeacbe17f SHA512 b922e79f5cffff9ee72ca6b24c8eef13eef08ec5e0a5815665e784b89b7548b9154f5e5d31865aa3fbe964abb76efe4a93331ff2513ddf1fbd2a71f6d815be25
 AUX felix.initd 522 BLAKE2B 1250ebaa33bec5c85ae6489bdeabef8e36bec949c18072235cebb0b5811a89ae061659dc868e804a5f9f069b2829eadd2921313aaad95cb6f7b86cee34d4defe SHA512 c5393cfcf94303fb02e7c2aea7992cc3969437d5f39674f243a800ad2d0659fbc6e42a411aec20d6477774353b125c7a8ffacc510dffb20442eba81e88582ee9
 DIST felix-2.5.1.tar.gz 331705 BLAKE2B b8ed9b2355fd7ed6af95421d863f52f0553db5b2b7043095075231fe79d7500ce94c1ceb33614cdcdf715ba275ec254c605622eeae83486d8861a6449ba0c2bd SHA512 60bea2115164b0c75b08ee5011e6754a5173c5e360215b71483fac2f26f1a57223df6ccfcd226e542335be5aec886d9e4f379353f3d57f11f9ec0098b98b393c
-DIST felix-3.0.1.tar.gz 402532 BLAKE2B 4c648ddeb7e8fe6bb3f8e56ba2a6c519b869afa3096c52d6c426bc35ba0cde98edfea6c0dd9c1e7ad57b9bfc22763ce3d2b7ee26f3401b1012c0600fda64e5ac SHA512 0eef4e9d870835d8661ad570e99861a9e1d3a7ee071e873d783a0cc8c29ccc7d6975de613f32ba4e20b98f22ee925170397c124b279bca521c88e693150eea55
-DIST felix-3.0.2.tar.gz 402681 BLAKE2B 6be0c7a4038b55b9975e045afa15e978de6c89ffc96a970571c1b9b9b4a5ce1fe4e35577c2b32bb2329a60bc894512f305c33c4de53c6c9e17012dc91155a036 SHA512 5ded5c319dd29ba79579f7507215b481690ad6e418e6a262258bd3389913fef335362722324369efa1a1eaded8c97ef7552a47f5d60a7e9b4c97f5c7003b5ab6
 DIST felix-3.1.0.tar.gz 465717 BLAKE2B 07df31c230a377cc8f9f46a5c6d49ff98fb4292bada3713aaa71a73b309d2a661c9a0904cb67897ceafa767fc38ad8fc53cfdb6048e4d92a02ea08c005e8f88a SHA512 1633b9748334bb7e9044554c258130037bbffea5ca132235cb63cb061c3fd5b17f143cb85b815e321c936f31e501e2b4e089c896b1a9a5b5765e3cf354041170
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
@@ -11,10 +9,8 @@ DIST github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.g
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
 DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz 804453 BLAKE2B 6dff8674476a5667ce4b43922acc1ba752a64d26f720c3554c73b88d5114d211a93fb994bba161911732a61d279b7f5610b5fc218b2985b87ef8a8353e3ca658 SHA512 13716991e01d8192137fa5551607f7320b7a369a5ca7ae29110060a5d9116a0d1c147b9f1fe6539eacbdf331bea2c6abb64c9da4bc921c3621e49e8bc397590e
-DIST github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz 2890046 BLAKE2B da19c84834dd044a93274720437a068b36f97e859f6251af07252732b100297e28b8dd0ff350d8954290bdca50571a154b383f3cacec04f94f548332aa922bda SHA512 88a00ff578826bc7e06c6b88ca4ade468588e72ad4e33bdd8193dd942f1695cca285213ab40ce357f28f534a9d4ca50579f3d29183b468061500262e0441ce21
 DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
 DIST github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz 2527242 BLAKE2B 7ce3619ba5e18414e3732dc4ce608122df130dfe9a61cd2aa6cd573f9010954ab0d352d5660a74032a0d078f040c383eeb0c8eac5022965f7781fa8f152946c0 SHA512 ace63a7e909629993d1b5038460848cecc1aecb024bcb6f35738f3ad36933e564da80f7faafb9b0d6a3e9149e37d34b86913219ce068b17a8adc643aa3099d86
 DIST github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz 28165 BLAKE2B 9433c3db4fc8ca8555d6f0d5aee6a47d5bb238d8fb28d69935a126aa5e223a59d35df6bf8cfe2bbc6cef85afa71c63c30ac027f9e551280f6d5f5b5d2248d6ff SHA512 29d6ee973c1752a661ee78869ff26873c2ae6684ea77612c2516b0ccfc9dd00ead885a6b87c1fb9be2ac74ae3381be1893cdb143b6fa18a19b6450f8733fe549
@@ -28,7 +24,6 @@ DIST github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz 59
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
 DIST github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz 38030 BLAKE2B b7fd1f9a6f028a68b07ad71c2edaae3050dda90585053273ac8112e9fbcbc66af7cfe675687ff52dc5dbe16c3567b4cbae8ea902066ad4122b9f7e4e36a17a78 SHA512 9de56f22a8b4ffcc8d64ebba79e2a4aac796f4d2edf475dc506a45e155a3a5bd27bf4dc7c7b5745be585ae69f3ba1394d1f6f14812b7c3a338125a5b0c315b40
-DIST github.com-go-ini-ini-32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz 42762 BLAKE2B ad0f2ccc909591f79f949a6adb4f6bf1a439c1833d45daad12b88875c0ee6644c0641b8add421514aa563edab6c2fab071863536c1e9ca572b090b37495991d3 SHA512 27c07a78f9dd753b2067af71ffe14fc70117c0db5744ccc294e1cd3ab8690d66763e7e53866f0e8df4d9d239344ac5f383c623b523f5dba4abf55e792c29dbfa
 DIST github.com-go-ini-ini-5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz 31516 BLAKE2B 25846eeaaac2c159820aec06fb0a270d5099b7f0950cd6cfa8611e449fd5a961b3a72d6ee4ae5a03a86a7638c41dc61c287fa15abe87a24f72323a4880f7f546 SHA512 3237eb68ef882515e9de916b0d959920021f8a1b5eb156847441a36f43efabcddf929dd17ca608f66ea405c923e5561f8220fbbc7a7a55b80775b5502cecafaf
 DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
 DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
@@ -39,11 +34,8 @@ DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz 2432841 BLAKE2B 744f754476b0ae957d9874c4d06956057006ffcfd2d75ca50dc22b94eee967010b941f205b816216af58a19e8d3405d499d43a4199b5be172ccec6d4f2ece443 SHA512 6047875c5488d943a9f63776a4b55f71ab335344f6e99e76861240ad152db018b13ea52c18ff4db21c932090a50d32659643e0737c3290f18e945a352e450f3f
 DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
-DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz 248545 BLAKE2B f30fbefd0442e492a1435a415b8b70f19afbe13752779e80ce393ad3c01c478c0c975833c96291ddbcd3ce7086b0be8adb64dd96f16afdac2e5b784fa36eccfe SHA512 fb8a4e6b1689e8e6bec7fb9b4a4580892331322f144819fad96b7b5dd09fa89cfda45a8b4e1dfa25ee9f3bdb8a064705b05180efd1825fa8a3ea4f4cb93130e3
 DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
-DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e
 DIST github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz 1456586 BLAKE2B bdcbb114281611c90e441ab14786336f6352818fa766b6f3f8c62a6988fed3923dee618005cde1e17799272192cb06d1a8a176abfd3504bd7616e3596dd3345b SHA512 30a455f428011f4ab6b6528c8b3d882ed988d43f9e08cda3730b56b3174e674330df9610c48d839f81ec564a03cce5ffad60aed652cd04159a24b999750d81c1
-DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 1443268 BLAKE2B 19bb8d2861225a14ba3f19b2ae96c6640833fea7da52228480634e715b7690afc94e605a5be1b70b263bb3045a0fbcf9f78211c431836d077cca7d076fec1686 SHA512 e82f87394d2a8d96779cc69c8803555b5d23eb02f3d38101ccb9142a892280c32b8123d61a309a041cf5034282b5269ea38b5d29e03c85ca3c62c4fc0802502e
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz 899847 BLAKE2B 0ac617849aaf70cc78ebeb0b68cd8ed9b866ea15381eb31f233c2afb351c3ed90169311cf5105a961fc6a844434b55aecfc00e26e136a430481f86f3eaa394fb SHA512 9b98953b1cd4a0382175b4299cf605b3a41f758054a167bc764c324c4c5c8ba7205760113c44666f77d447804f7f1a6d3b34a334859cf9528b19161f77baf075
 DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
@@ -51,7 +43,6 @@ DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
 DIST github.com-golang-protobuf-8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz 217385 BLAKE2B 067df31ef043c798835c173eef23fc6dae18c30899752fed1ea776b35f54be63d144616a98230782fba1ef0812dbe02398fc50d196c48035f4d26c77baa1bf45 SHA512 bd5531821feea03d7bb273daf81ed648cf15c1573e70701f0e05c65995cef0030a927980447a5b9e52cfabd6049df9c3f3d9c7736157d994b3b38d4eef026a2c
 DIST github.com-golang-sys-43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz 761710 BLAKE2B c3ef495f2d2695da0dc9ce5c015d42ac0bd7d8f7d097cbbf0e4601b784da07610545bca2cf8673a6f3e0ea1f326424de697e642af29d43e256f5306ad8dda342 SHA512 9b2bc7a6fe78d4c7c4a6d4cb533be483c7f6b3b0f0821452cdcb0f015bf1f07d649d4d562c44d7bfc65d63cc1c2f8def2e7274a02e6f11ad41cdffaa1edc82f5
-DIST github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz 766292 BLAKE2B b88ad923e0caad501858e2b7fc59366fc287151f6ce988fb44632370f019c7edb5f1eccfbb6766f5d67e76d0768c7b459d86ee0a3c3dae68d840eaf7923a9447 SHA512 8d35c2b54cebae7f0f21916dd72be6132c22402829830f7b34805338f81e96da61977b346b72aadecec72c5eb1560998c7523fe0e6828813d635e06cf230934d
 DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0
 DIST github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz 4549739 BLAKE2B a124e96048fe4bf231b3e87e012d40f84de8541eefc4b3136451c75b6d45991b20893656fb920d014cb53a8ab5177a877c5ca48fc0dc43f92e50aa50d20d7ade SHA512 a4542d75a6326255d2cdfa48a454dcabf577fc04527973b6de00abb6d8bd4b04cfa4e6cf6b26fd3b2a546e6b4de7a36eaae409981dfe790b88a841a85348c83e
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
@@ -61,14 +52,11 @@ DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.
 DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
-DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz 5497 BLAKE2B 104080651e0cac64abdc78169b4a184e9c8fda803a6f629fa3ef4210015f0a76df7fc478ea88e3fc460ab49288633a27ceb452979b610d49475040b74cd2ece6 SHA512 8e444831301404454b0f1506a7cf20347bc42639691ad7946e36e30492e7d8108d83ffc974934632eec9c75f03e28ce75e9caf1e92980803a43fff82849145bc
 DIST github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz 2806 BLAKE2B c41d5bd53f9f4bdff9e5b1cde8af46f3b3c8518af88b45a33625fa6cc4d89052fd6588d99dcaa1f6fe3ddc2a3e566b2da6ae30a1d218256f6707db4f0ca01c32 SHA512 e8f0a888f8103fca6714f6a13ba80434560488c9be389b47ca505e84a45bd18ecd08a19e88684c6af2ed550ca5c11c6a215791420426a89a79cce0dead452d47
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
-DIST github.com-ipfs-go-log-0e2a17b81af445147a78d94a45d4398c4008c219.tar.gz 11185 BLAKE2B 0aaa1f8ef8d29350f1e4158846f03981c6bfda3b66730400c37174da99a755660c26bdc7e491850d35ca7497aca3c23a90a0f0d06d2fb940e772cf27e1d1c3d2 SHA512 1d0ee215e4e3c4d0a36e7ce830742a3d4e0b43b9f84abdee61c02907be24e8d12dda0f1d816950d00c32ed39fa1a732080466f273e835559cfd8850eee47a6da
-DIST github.com-ipfs-go-log-48d644b006ba26f1793bffc46396e981801078e3.tar.gz 10106 BLAKE2B d501a5901493238ac3040383c15d9e823ff738355e020e14dd586fbb7c0d9230073881df1197b453146bd3b88aff6b754f40682dc7f89b4480cda48da16b466f SHA512 4ba1798ba341a5fbe06f98eec71886eb26cbbb8c05c788f91e77285737b77dff671f089c9346c7eb72cdc61351773cc8bcd7af1520915c104d8a94099b9d51a5
 DIST github.com-ipfs-go-log-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz 11316 BLAKE2B e8aca3cbfc22c76e16c87c3ba3efa8903a7a378b485845831b9d3eb2deff4e637ffa67a490f144966987c9ac133903466a6ae17b5f9ab7ec87bff9ec73d55244 SHA512 5eca2b00b16ff94327b47505426f62c913ab3e0485f18a1d2a30e0a15afbccede8914a7ad10cddc8b0745deab70be4abb650a71c05659874c3900b3b9da26580
 DIST github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz 12680 BLAKE2B 852a4445fa50334de624395ea375945e273b7bfdc2a2dccf677e75a18bde34408ddfc9c0f4329edadec31cbe148cb139cd8659b4e7ba5dde829c58e39228de9f SHA512 729b41f0302aeb23b077a7ad913cb70f06982c243a37ccc264d5475d3db693c6e019c5cf9eb6307d809c2c99a4d68d711d4e11fe062e907750247d3f3e1d519d
 DIST github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz 5584 BLAKE2B 60e968bab9171dc1f09dfa3bfbe98324b4a536fc7664465154173a97f3a4a28a1adb1b8f659c5494b15c03ab8c788e8f9459fca2d6f0b37b7815da20d74e2072 SHA512 055351c704c9227b8d6cbb95177c2dbd554d582cc0ba4dfb5f8f0f550f80cfbd264c82b2a84010b8b1e9f02d9c759b4317f277f0f1b873a5eeb181cd0b672284
@@ -76,11 +64,7 @@ DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-DIST github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz 599812 BLAKE2B 6763e5204c210f9c4762f659a863ca2333e49b3f35d516fbdcd9a68124bc2f69f464e20caecd6a84b67f4962c4325f41c52464613a687d3ed12d1c97934e790c SHA512 5533ff2a56b573b644f16c4e287d50c850203e79a82588df252df78dd3d0e8ba0bb691b7211c6e24f4ad3bf954e7941851e840fc279ab3f189f4d7096e4b8707
 DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
-DIST github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz 599747 BLAKE2B a9d36fcc97232af6cae2558ef77caec625f790f75065ebbba3a94d61b9f06b68c3f5b7ed58f8fbf79b158905e849ce958b3b071a09e92a9d8bd46554fdf019d7 SHA512 99a1c84bad03df827288cd94665ccfd1c290945ec63787cd56f49ee27ecea8174fe5597d4c48367aec11f3ac18d1087a2cbfb7ed9a76906aabb31bd0199f5ddf
-DIST github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz 450402 BLAKE2B 422d64fd22f92c65f3ed41472e5a98b6197d32aa0b4fb19c7a487481e33738b65b807fa3af05e577641485a9702ce298e9741c57cdc9abba133a10d5a9d58de4 SHA512 628b11b308d8b76724f65e7d04570cd693a01368ea22ab556313ecd3af28e778c0bbf042a04f180bfa9c4b5188b437ae1bb5c0757fbd4d9602cae63f2fd37d36
-DIST github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz 450287 BLAKE2B d311171547b907179e9edb85f1e688752d628fb00001abdb0106bec0ae9f66bbb569c627fcce656dc57538435a6cf18f0d2f426c4e98d12296240f4dfe96352b SHA512 a9559fe0b585499a3f142cc24fc850ae2bc05c3232861f7749dc7b01a82903d17cb8ca889d58e0a76e245d8e8809c3a45160c1f79101b407c9141d8a893574eb
 DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
 DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 BLAKE2B c495730d6f4a4f477513e06c242f4cf9b234f4300a6ea0407a9fd36e6307445794512d7f6002dbe0153113b69af18ea7e316232d0054b714c2552c31b9ce08b8 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1
 DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 BLAKE2B 6229eb3d5a0b66221189588f13be52b6ed2f1a76a065b6c003b4968ff684736138af88ce3bb8b958fcb9ee0272e5c02be939fddff21ca32876880e31cd8b78b4 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe
@@ -93,32 +77,22 @@ DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b6
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 BLAKE2B b68ad69058837306d4988760ab7a052d988a9ea8c297001698aadff3eb0c404b3f0953faca4b2f12a174aae9e5b6f77dbb793b44b356cb9a420bfdabd72d76b0 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9
 DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
-DIST github.com-onsi-ginkgo-f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz 124167 BLAKE2B 71a35ddf1f3c885e15009705c9ace2ecf9847cf95d5ca4dd1661359ae5ad1b1228db280ceaa174a40b9339633cf3101707b70ff816400a3346a368ab6318e339 SHA512 9d54ec28953d55fb99a293dde31d1c31f68ae5bde987c45d79ad7ff8f5991d5fe26093806b7ef33bd11d76c417dc95ee1b6ac67672ccbaf4feb8f960b0d95e6d
 DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
-DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
 DIST github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz 28604 BLAKE2B 9507aaac97438b1331fd190a1ef2a260b9125ae25e5fba57898ec421bfd97c592f0f8c92b12759d57969365273383d8d92a0a153ecdbf758ece6b7559e8b931d SHA512 01fa40a812f568208aa4cc603fb61444b1699bf8f7f7caed538c36051d12aa2f863c6815044760109ab4e4d14e9c777695e5c66ea76d9473c928fb321d87c1bd
-DIST github.com-opentracing-opentracing-go-db37fa5964ade72399b2ac8201123b8623256d75.tar.gz 28595 BLAKE2B b8fa7752a9be6dd52153f353e214c1050699de49c28519ad41b830a1a7cf5d466bd7916ad0e76c7b81297078cb39cb527e36d81f8481f52a01e33e6438211961 SHA512 debe7f1bc668112ad1470aa40c83e8b9985323842fee120ef75d36a45d9421868998130c87a63778d37d9b0b5e4cd0028450e50894cadc295a4d2cbf86e00d63
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
-DIST github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz 382793 BLAKE2B 39b8355eb1b887328021c6b15c85e3a304e341b52f732b429562a7f0102eff00651091f1978efea0017512538669209e037694093e7482c3d2b2a6a4fbf59b89 SHA512 c411ebaf3c5e6e072b4c3fefac623e5cb7913ee8a58813827c090d1ea388a7b2023d98c56267e8755b2f97359a3c67d241b2e04630d3846cd514162fbcf351bc
-DIST github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz 383022 BLAKE2B 04dffe36eeab8fc1407ff6345bf994f4d507aa462f70c55c27ae2f0a4044a5b2ee09ff36997cb6bee5bbbc5c8574d2cb7fc1b97b8d02fc9883ab28ab17356eb7 SHA512 9034dd3b0d0f088219a3e4b0a1c73b0fb7ede3d3d5f6dd2d61fd51d5705aa9d64ea27f1d40dc6b40bc5d4514b25da73e2baf45f83232658009fca1323066e4a9
 DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
 DIST github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz 198156 BLAKE2B 58eb1a2e617260d1b61582a12d6ae01f7eeb9caefe4c8d6c4276a95d277e1d25242fe6975394c83d1e6bf39375f77dcccf37a77262f56dfc344d15f29cfe4b7d SHA512 0cab2d2d14205b184dba501fd171897117f0dbc2cb42ab121e789c20d46c3e2e6c71fcea4162646432726379322d332a841866101cf32ae51e698fdd92b54c1f
-DIST github.com-projectcalico-typha-0bba94171368573d2a936e02454b1762ff7fba7f.tar.gz 230593 BLAKE2B 86b6ccc0d79724f8a34d5c7f7fdccc918e8ff1eeba74e802b54448dcfdeca2f3eb224013163942cc1d182bae1214f61b2ef04a42909217a3ee6a0a7cc3db25ed SHA512 7a8b5ecdc561d5866433f1d138c49cd392ad6c9f1a1bac01e26f09d7d495d8c7d4e3bae7fe2450fe08dc6abd2018af44bd7aa53d9ea6872ad15406ebcba37a99
-DIST github.com-projectcalico-typha-4308ae102ebdfd52d38ac7a267b5494be1079d05.tar.gz 230683 BLAKE2B 0b8f953db7fde078af1a58600aff7f75585ba8c4ad46aa517fedc3c1c15e160debeb25623e6b30ebf54e339f2710b854b8f387d3420c800b57733d2c11a48cf4 SHA512 36f343d720cf2675286f922c0b607b28e6951551e8397afe9c577ea672f09a0daea3dbd50238f536aea45a93ce97d8c2ddf6716a809dec1c354231b7ac0a9f71
 DIST github.com-projectcalico-typha-6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz 230984 BLAKE2B aa385de599b109ac0fdd2cd8f87e8a9c753bbc60474c8b85d2f4b6a286bd375f0b0ad0c1399292abd4417e2db6cfefad5b11cb3e49c484f13f13b001ed6fa2c6 SHA512 cb857385d2e3ce262615d24149b635d2d84430eb0a5201f7dd7c746b1c2a335a19bd94c2050d1f4f74746eda4f3e9521e4025fe2469aa3fefc0ce148fdfde76f
 DIST github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz 227211 BLAKE2B 41857009f54f2f1dd4b2532cb06e14356990caffca4995020cf311278ad3990719b34add9024a39be513cc1f6491d3a57c2850f5d8990698e7b66eaac5c228d3 SHA512 100d53dc3164008d6f5e701193ea1860a266e2321da585bff2a083a7853224ce866ff5cd1a64be0fd6530101bf0cc6c98fa366df331336023c4fc6f140649e6f
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
-DIST github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz 62690 BLAKE2B 981efc277b38a6249cb232c2ce6f759ea7313902aa9e8edfa2e76bb793bbe0908d8b175a13248d042a8d2c611e57b278b5fe89d606e8410cd996a9f640bf94a1 SHA512 14e0e3a26c3a01e6921892559d34a6de05f8e1eb1fcb588b3f01d891679bce1a625806bf04aca16c89ca05efc907cc0ce3d06521dec30903886138b3c4b4dcd6
 DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
 DIST github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz 61732 BLAKE2B e0e16b1f12d62cb2c4618e37022aff054215b5910389505788bd671d6f29e2e8dac39ead98d590a75b4b07840d7667b293ad43096bc1e285e2b55137d3bcc796 SHA512 8dd198db3ee1f9708684ce25b3afa6e3202c9144537302d21dd34474d56163ceb429bd9372619d025d06a31f712feb2374b14d4053ba83355ff3b193e232c9b1
-DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
 DIST github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz 43889 BLAKE2B 046b59464a287395f73c756a3addcf319a437f4d5594e56d91ebe4fbc86ff5e6db92c87d7bfcd49b87606d1b2a4b3378a49f39a4989be55021da1e4e1834c7bd SHA512 c31a595327ee82e4f5fdd9f58f395261cd9a290e2bfd9115593b20508966ad529a31322b228736c7fa6eb0cc74d81c6f298bfd17450e534ffe1a8bd74633b325
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
 DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
@@ -128,16 +102,11 @@ DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 BLAKE2B cb880cb4ffd844c5dc86cfa2b1aee79b6ca7c7f527d3331b1bd8a85860cef203c6f4d4a85cbd6c55b3c160e2e121cf69c84de97fb77e3db0028662c15b7cc335 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2
 DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
-DIST github.com-vishvananda-netlink-3ff4c2196115d804aa1c747781ad2b2a5c73e140.tar.gz 116777 BLAKE2B 90826cbd22858f71f6ef6acd373a0668abc2eba17411d2f63cc4a1234017642d3b5e507f4ff92068f1cb584a4fbe2e83231c8a9d4a6336c29883543ad969a33b SHA512 51aab248fd440b8d2770068de70d55e646f2d04256e47b4429d3ed564718e671bf22cf2e0e7fa811ffa9581533f2f5ee78a82b1cdfdeaaa4a9550d829c0220cc
-DIST github.com-vishvananda-netlink-6e453822d85ef5721799774b654d4d02fed62afb.tar.gz 102805 BLAKE2B 502bbbf16137192291fbe8dffa48c3ab1f4564e7e40422df011b02344ecbc6b3f339e66604259b02180ca2c23ef8e57a5daefa8a8b112e0667ed4574ae391bc9 SHA512 09c3f61bca1e9490a158ce4f146d71d1d4017f4e8ed612217b5c8ead2e63f5c1e8edae7f041e456a86cd4096e59a8801bb263e090cb40aba525012df7278407d
 DIST github.com-vishvananda-netlink-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz 121969 BLAKE2B fe1d28a8249065955a1812e59279d823418af7c437683ba8a65d69339d6acb37ac9c5fb95d927314e0e461512958a2302cd8bde4b643d3ff95894aff374dfc1a SHA512 c5b7586e23a93022e52da1b570747ba2b24c43554ebe3836f93b3cb63e52f059bc300152015ba11d25a0573f03453da30e148933aa5a7db15cd26eecfd9456d9
 DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 BLAKE2B e0016e5a663157383ca37a99c32a1da395a9e6e53536acc6f03f25d9d347f1c4d8d1d00c8cfb02ba4f8ce69a5f7c06d9440fc177bd88e599678d67c18415cb82 SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184
 DIST github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz 7753 BLAKE2B c251f716c79fd6c94204c1d0a7e99d58b964fa9e9664a80ce4d8045a433e8d7af91fc99ceb0d7d00bed26bb65ff22dc9f0527f4001d9bf71ed8996d5caf2ad4f SHA512 7298f8ff33c14faca3cd57f68de676049eee8aad6891f5ac03427b63f3554c666bf27896801a8528d9483b469df14040116fa52d263d851c7a9766577728b0fe
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
-DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
 EBUILD felix-2.5.1.ebuild 3998 BLAKE2B 13f283532d310dc707daaea73c428a66232c2450a4374d9740fcb8161a310333e6eaa823c5cde65477516725ee357b46d96f2b3fa055b442e74414f175ee70d7 SHA512 3d8f122b1c6214dc60cc47659d44d17aae7da4d14db083eba8d57a08c8c506a8f7086e4a350de2e518df91a96c4f42b8ff75cfb5339c755a950d93c63b4b4cb3
-EBUILD felix-3.0.1.ebuild 7143 BLAKE2B d0a5017d975a6d163156e6af79a6b868ee539797802674846c5ceeb4226075145a87c31fe787aadc916eaa4c0624f30f8a412ac484f5b927e5e8c6af785205c7 SHA512 0dde673a354a7db6fa7f3e386883f52c9c05276bf6f9018a0621906cbf5ca533aea19874284a4f27378ea75f207dbba83761d4d202522d1619d4b2c2fa96bb1b
-EBUILD felix-3.0.2.ebuild 7384 BLAKE2B a7220a19e1b9840f02c1fdae37cf6216aa8254a0ce9e2a99118ac414f7173de62defdbf1c4251eaac7208129efe48c5825b0c85744fffe4b247e9334dcd01f80 SHA512 2c60cdb8e85b49d5e28a2eb697e326828ca1abc8eb426ba73b3b4880133aa3852c0d3b1fce2759c29cff69e774d16b71acdbfab8ec100c83ea2b02c3f105e4f6
 EBUILD felix-3.1.0.ebuild 7540 BLAKE2B 8b10b3463d5bcebe8810044c302f2aa75169345d42ce3c03c2fab20c17539854622ace8d0e156ca356bfae56a4539b885bd8ba5afa48dc3b3ed92a6a9cb7a212 SHA512 e77f909b0902c10d3f8bf193dcd9e6c82697e400327236489b601afa489bfe953332a5e7c73534f2e1158067a62eaa010c6b53f533ace23265a215d6be689369
 MISC metadata.xml 406 BLAKE2B d2f0449cbf46550d7f8794221b6c6f9ed445ebf8b166bdc8976bf605ef61d12f8862b7597f63c6ec171af9d98c3a14bccea7d96fd24cedf58d895b8aed8b1fef SHA512 5aef67b8438efa537ac2a74f6ca701c8211f474ba2aa7a7ec8d26b523f93b18b3e31414143aa488c4480295ef51dac65988b2c923f3593f2028eb69ac93db8cd
diff --git a/net-misc/felix/felix-3.0.1.ebuild b/net-misc/felix/felix-3.0.1.ebuild
deleted file mode 100644
index 9ea4080761d6..000000000000
--- a/net-misc/felix/felix-3.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
-"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e"
-"github.com/coreos/etcd bb66589f8cf18960c7f3d56b1b83753caeed9c7a"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
-"github.com/go-ini/ini 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9"
-"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/ipfs/go-log 48d644b006ba26f1793bffc46396e981801078e3"
-"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c"
-"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a"
-"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026"
-"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
-"github.com/onsi/ginkgo f40a49d81e5c12e90400620b6242fb29a8e7c9d9"
-"github.com/onsi/gomega c893efa28eb45626cdaa76c9f653b62488858837"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go 7c2de5ed8c029f222d87fc849b54c4075ef3173f"
-"github.com/projectcalico/typha 0bba94171368573d2a936e02454b1762ff7fba7f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
-"github.com/prometheus/common 2e54d0b93cba2fd133edc32211dcc32c06ef72ca"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink 3ff4c2196115d804aa1c747781ad2b2a5c73e140"
-"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
-"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
-"golang.org/x/crypto d585fd2cc9195196078f516b69daff6744ef5e84 github.com/golang/crypto"
-"golang.org/x/net 3da985ce5951d99de868be4385f21ea6c2b22f24 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce github.com/golang/sys"
-"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 9b9dca205a15b6ce9ef10091f05d60a13fdcf418 github.com/kubernetes/api"
-"k8s.io/apimachinery 5134afd2c0c91158afac0d8a28bd2177185a3bcc github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-FELIX_COMMIT="53553b4f7ff80d193e8550ee3b31704da5349d42"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
-EGO_PN="github.com/projectcalico/felix"
-HOMEPAGE="https://github.com/projectcalico/felix"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-libs/protobuf-3
-	dev-go/gogo-protobuf"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	protoc --gogofaster_out=. proto/*.proto || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
-		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
-		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "bin/calico-${PN}"
-	dodoc README.md
-	insinto /etc/logrotate.d
-	doins debian/calico-felix.logrotate
-	insinto /etc/felix
-	doins etc/felix.cfg.example
-	newinitd "${FILESDIR}"/felix.initd felix
-	newconfd "${FILESDIR}"/felix.confd felix
-}
diff --git a/net-misc/felix/felix-3.0.2.ebuild b/net-misc/felix/felix-3.0.2.ebuild
deleted file mode 100644
index 68ff0f21689a..000000000000
--- a/net-misc/felix/felix-3.0.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
-"github.com/go-ini/ini 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9"
-"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/ipfs/go-log 0e2a17b81af445147a78d94a45d4398c4008c219"
-"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c"
-"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a"
-"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026"
-"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
-"github.com/onsi/ginkgo f40a49d81e5c12e90400620b6242fb29a8e7c9d9"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/opentracing/opentracing-go db37fa5964ade72399b2ac8201123b8623256d75"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501"
-"github.com/projectcalico/typha 4308ae102ebdfd52d38ac7a267b5494be1079d05"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink 6e453822d85ef5721799774b654d4d02fed62afb"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
-"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce github.com/golang/sys"
-"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 389dfa299845bcf399c16af89987e8775718ea48 github.com/kubernetes/api"
-"k8s.io/apimachinery 4972c8e335e32ab65ba45bde0a99c6544c8a8e4c github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-FELIX_COMMIT="ccbab346adb7a7759e73fb11e57accc602f368a2"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
-EGO_PN="github.com/projectcalico/felix"
-HOMEPAGE="https://github.com/projectcalico/felix"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+bird"
-
-RESTRICT="test"
-
-DEPEND=">=dev-libs/protobuf-3
-	dev-go/gogo-protobuf"
-
-RDEPEND="net-firewall/ipset
-	bird? ( net-misc/bird )"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	protoc --gogofaster_out=. proto/*.proto || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
-		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
-		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "bin/calico-${PN}"
-	dodoc README.md
-	insinto /etc/logrotate.d
-	doins debian/calico-felix.logrotate
-	insinto /etc/felix
-	doins etc/felix.cfg.example
-	newinitd "${FILESDIR}"/felix.initd felix
-	newconfd "${FILESDIR}"/felix.confd felix
-}
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index 7b1b63e570bb..76fd562a5521 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,8 +1,5 @@
 AUX jwhois-3.2.3-whois-de.patch 462 BLAKE2B 1cee535c7f70bf80d3ae217452a5a38551caf0a37959686a920381641e86c39866eb6c4ff0ad70ede0975c8891c000da0e8b25d083374ec74582256b027efdd0 SHA512 19777491b1fc46df06cb54e136cb7faff595e4524c65f79e887b326cec7cd50e9b90014a30de4c436f711e324124bb39761b1bf24fb738e11174f857783e010c
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
-DIST jwhois-3.2.3.tar.gz 430792 BLAKE2B 9708af6ee3a63c283cbcf581cfe78c22a7b9dad01a4133c3db85c019730e937dfc95a369fd8264c19f99193f8ae842365050e7a4fa9934da76945ae3ca05673f SHA512 92ffeef5d9134800d54326c2281eb38c030acf812d2420031438e1f9171875403384ac847bb6d9670aae3e3efa8cdfe2079c822f82550dc8b0450dcb05baf60d
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
-EBUILD jwhois-3.2.3-r1.ebuild 747 BLAKE2B 711363df31fcb3dfc1967891cc686ad4305976f350530a442692fd9e3c5c8b529c01401724f22e9eecd6a6ca076f4587632493c7f9e9067b0ebd212c3f37ef47 SHA512 4947bb7e04c82d2806b988f6684eb085da2ee50bdc69106d8606e5c0bd26bc3c6a3c74e6b97134015016d48d11d4d3d179072658ba4af12c703a5d99444431cf
 EBUILD jwhois-4.0-r1.ebuild 683 BLAKE2B a66d32aba06f4526acff8e3010055739ae948bf3d860c1e944807180f08c6f3c7e86748e0510c3ab6d72451f43f36352fcdef00fb1df9efcf78e60131fe4b895 SHA512 5d97c6b37ad8a42de8236ae3a4aaf7499aa443124dbfbe978ee30f687133e58df5a5f8177c315f92b28d1412a346a06a0d244da7013ee3cb9578da7eba7ae0e1
-EBUILD jwhois-4.0.ebuild 695 BLAKE2B 35b091f83528284ed84869dff61eeb5171ad63b4796a9b2fdd957a1e239c35adf75670f69879d2258f009c8d4d6073c12012570e09900cc77aa17ef811dda9e2 SHA512 8df498816973f43662afdde9218173e36b34cf68efe6bc4e8c47e2f516237247b1ded0cb09b6ec2408224b1f8e6f5feeae0d365b8a8785259824f6640626073b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/jwhois/jwhois-3.2.3-r1.ebuild b/net-misc/jwhois/jwhois-3.2.3-r1.ebuild
deleted file mode 100644
index 6c78a893b720..000000000000
--- a/net-misc/jwhois/jwhois-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
-HOMEPAGE="https://www.gnu.org/software/jwhois/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-whois-de.patch #159776
-}
-
-src_compile() {
-	econf \
-		--localstatedir=/var/cache \
-		--without-cache \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-misc/jwhois/jwhois-4.0.ebuild b/net-misc/jwhois/jwhois-4.0.ebuild
deleted file mode 100644
index f0d604d77d71..000000000000
--- a/net-misc/jwhois/jwhois-4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
-HOMEPAGE="https://www.gnu.org/software/jwhois/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86"
-IUSE="idn nls"
-
-DEPEND="idn? ( net-dns/libidn )"
-
-src_compile() {
-	econf \
-		--localstatedir=/var/cache \
-		--without-cache \
-		$(use_enable nls) \
-		$(use_with idn libidn) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-misc/lcr/Manifest b/net-misc/lcr/Manifest
index e040dac57804..5aee612567fc 100644
--- a/net-misc/lcr/Manifest
+++ b/net-misc/lcr/Manifest
@@ -1,2 +1,2 @@
-EBUILD lcr-9999.ebuild 1235 BLAKE2B 52aac302d842861b0b1881571c5791a4eb7a1c69a7b045c6c43465c74228d3c7d8de0dc539f5a872d2c0d22b4a62dfce6b9f1b089c3bd7763b9c922efbbe3c07 SHA512 93b30ff22f463606800cfc165058975d189d8cd975814b9992a01edf8323c318ff64fa20fa2c4682fec99e8bbd7ade02ecc65571bc51e8d0369c0622750859a1
+EBUILD lcr-9999.ebuild 1236 BLAKE2B 5d6c662fbdf4e1b65e506717056b7b8ae1da3b74a4fd9565e5cf249997cddf6b408ff13540db52c5ed2763bbe5a6e6c56cb22c16788c5cbc0806370e811980a4 SHA512 25870cb4aff0fd585e32ca746f7a2c3f13f2a2f4b81af110cce50bb12169a67fdd33887d6a9036702a724db40c3cd05701402051d5e16d04eb6579065376024d
 MISC metadata.xml 650 BLAKE2B 3677cdb22a18b446b167eb122d2a81efd44505977a23e72a87d52ec813e6efe100d9a88ce04ec8205cac80bdf0076569275346ae723ca8a8f68148f1ca449a86 SHA512 12497b4e4d2b11a3f2fe6aba4ee440419fb217a7df6a56da837384e7a4a16db7a2b62b2f88e5aef462305676081e94475fab15b43581e08136a63eb8439f7a70
diff --git a/net-misc/lcr/lcr-9999.ebuild b/net-misc/lcr/lcr-9999.ebuild
index 4e1cdce0dd5a..8330ca2effc7 100644
--- a/net-misc/lcr/lcr-9999.ebuild
+++ b/net-misc/lcr/lcr-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2 autotools
+inherit autotools git-r3
 
 DESCRIPTION="Linux Call Router"
 HOMEPAGE="http://isdn.eversberg.eu/"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 844739efed2a..2c83cbbfaa5e 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -30,6 +30,7 @@ DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c
 DIST openssh-7.7p1-hpnssh14v14-gentoo1.patch.xz 21448 BLAKE2B 51d9324990d8098707359f355b9212679db38569e566f47659ffdae8046bdbb4e6873bd67ecb7da0b5706c5243f44f82089f08ecbc59c7e39062fceb4be78316 SHA512 63d2ffbcfe121ddedaa07955b1025d2c6e196ea694464610437368835cf46dd507d4d17361548cae93db53a1e3d93d9c409910620bbd0cd619d82b6215c833b5
 DIST openssh-7.7p1-hpnssh14v15-gentoo1.patch.xz 22060 BLAKE2B 81a7f3d1346718c154b39920c126eb0b00ae43f1369d882b8a1bd0b885668805639d869581fb49a8e7c67b61d72a904fde45841e4396af426b136d6d2f0a0dc3 SHA512 7b437bc061677aeabe561ad74bb19bc6f85369119ad8a92fb430fb5c1394c2bb3afd472ee66b285362b2041f871c56633dc94fec33cb062c6b1817d63c1d4a78
 DIST openssh-7.7p1-patches-1.0.tar.xz 8176 BLAKE2B 196b756f72bb3fccc927e31ae1b94adc3c9116de25258ac599c3653cd1234ff33f3dc608515a5ef56bea05191621974342bdb164b721c94d2c29a0de74731742 SHA512 9d56e306a5886a19d58c7a42389a82d8b912bb9250f97f64e9bf9752fc92e671539b24b0568f21072fb1ba7185e6bd1ec33511a39d26d48a699a911b910121c9
+DIST openssh-7.7p1-patches-1.1.tar.xz 16476 BLAKE2B fca2885a9e29faec40700ece37a995ba83e40bd2a6875129a5327770d8ee43663a7c063de33b4653994ed7332adb03730f613c047550d874190b95c66e2e9efa SHA512 aa5e33ce4bb4be16abf27ac1bade1dc85c51d82002be546402e0b8b0685de3ec7029f0f56bf1295ec346eb3960a6bed7cfc882722e57957a19a732f3174b3039
 DIST openssh-7.7p1-sctp-1.0.patch.xz 7380 BLAKE2B 6ad40972ece131ff148ede6ba94d63bffc606e0bcabb959d4c9056196cb6f4fddc285f97d7b49b73fde7ee84e3c981c07bddb058ad88eb7c7c2fe716e657c630 SHA512 bc5f50805ba25415f93f61b6654e5bcbaef673b0af48d339116ca9c94b6152afae294c5a9144adeb40190da97c2fc73b43e3ac7ac34feb4a647628327a7cac0a
 DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
 DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261
@@ -41,4 +42,5 @@ EBUILD openssh-7.6_p1-r5.ebuild 11292 BLAKE2B 0f8a0e888c539172a72cba3fbc08727de7
 EBUILD openssh-7.7_p1-r1.ebuild 14657 BLAKE2B b7539268f745f7edf9f654992a0971dd6d77c609b19f945ba3230a3901b85a675f8c951d146089efc238d66e9a0b5d38e1ab5272133e2af8aa4c7989dad8461d SHA512 e2bd77e37b10bb12350da25468a7f1733985dd375824e572a2de0df84cefdeb7bb1fda30014f9a5a3b86aa546c8419264f2b5b761a77482bf3a4fa65bf8a4e72
 EBUILD openssh-7.7_p1-r2.ebuild 15138 BLAKE2B d11f235d48f444750b33cc0964a997caf441601cde53249dea80ab060690562a596f8c1f99acc41d12bd8ecbe96aa4f3bcb328f123899de28d37667ae60d268a SHA512 833d01ce84557187c1109091ae04f3b53b6119debd412c14424219d7054f88aa6ab01644ab0ebe2beda50cec22f6c7bffbbee13091c369137aebb15542d250d9
 EBUILD openssh-7.7_p1-r3.ebuild 15119 BLAKE2B 76116b847961f3e5d57f47245a3edab2e86b81aa7906d4fd8cbc894d7f300d87fe6c9f8323821d5652d85971ec3e249a8b67568c9e4fa74550123df6f164461a SHA512 bd61079fc0731c03c57300696a7cad1ba75052139971cded7a7fe99b91d428a86350fe2979962e27a664a56957b8ee99f73131b9dc22881b40f66d417aca6ef8
+EBUILD openssh-7.7_p1-r4.ebuild 15571 BLAKE2B 43136015d7a9110d2910ad13be455cd21e469d980d20ab2abdbc09f0b3aa33d57cd191444c679eda08dd232767f6c9b45aca9f96f9cd12d4edf079a4396d1305 SHA512 e7db97cefb29d6cc5264365f85d950035ac7978ec93f0d62723f244bd8f5483e7f4c6348fc169b7e63201ff331d48b22122f134d7083fb3fd315d9e01124cfc7
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r4.ebuild b/net-misc/openssh/openssh-7.7_p1-r4.ebuild
new file mode 100644
index 000000000000..e884e0b9d3e6
--- /dev/null
+++ b/net-misc/openssh/openssh-7.7_p1-r4.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_VER="14v15-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
+SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
+
+# Disable LDAP support until someone will rewrite the patch,
+# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
+#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz"
+
+PATCH_SET="openssh-7.7p1-patches-1.1"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
+	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+
+		einfo "Disabling broken X.509 agent test ..."
+		sed -i \
+			-e "/^ agent$/d" \
+			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
+
+		# The following patches don't apply on top of X509 patch
+		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
+		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
+	else
+		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die
+		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
+	fi
+
+	if use ldap ; then
+		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
+
+		einfo "Patching version.h to expose LDAP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP               \"-ldap-${LDAP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in LDAP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		eapply "${WORKDIR}"/${HPN_PATCH%.*}
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+			
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use hpn ; then
+		einfo "Patching packet.c for X509 and/or HPN patch set ..."
+		sed -i \
+			-e "s/const struct sshcipher/struct sshcipher/" \
+			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
+	fi
+
+	if use X509 || use sctp || use ldap || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply "${WORKDIR}"/patch/*.patch
+
+	eapply_user #473004
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX%/}"/etc/ssh
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX%/}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		# We apply the ldap and sctp patch conditionally, so can't pass --without-{ldap,sctp}
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index ee6e7decf1e9..9be509898612 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,7 @@
+DIST Remmina-1.2.30.1.tar.gz 1252587 BLAKE2B ac5f60cf0e92585a157d9649904146d5ff17e53297e3cf041c443309c4526a89f9bf54358d6c61a59eed88783feb214397cd9af5d9ce1ad671bbf28c9ce2617b SHA512 c160655dd05d3b7ae7b3545e7f41d5bed80cb39b103f906a51c27f4653c7a13919fc02928097747fd2cceff1adf50c36e4d0ecccf32efbea6e859f24bf1b4294
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 DIST remmina-1.2.0_rc29.tar.gz 1194267 BLAKE2B c4059ed56f3903f248009eacc20201fc533d47c2ad5d4e053c2ce225e8bc3fe50fc4c01cf912eb77dde220418589d5a85808b7c5e4b6083f6919dc5695aa049d SHA512 ae1190762588857ac59c86c43c66ba0aa3f584820a6e87ea7b7bb81a63f71acc7407d544d9f25edf9be4f45a536d3a2bb8de34e2448de6cd5d0f130de05ff52c
 EBUILD remmina-1.2.0_rc24.ebuild 2007 BLAKE2B 30c5e90c97fa5c9dc329108320e90d82ebcffc846634e727fe0e6e25d32e5febbe68e249bca955c91449da1c3cc4f22f5a6184c4515d1fef4685236573e37857 SHA512 b69b8a14476ed2ccc75ae82e723d0f780a513f8978d2b27f2331b7c0cfd77797bc1351441fcd048338ad33f1a16cffda4e514e43314c782ccd5e8bf846e18b3a
 EBUILD remmina-1.2.0_rc29-r1.ebuild 2151 BLAKE2B 35512e91077ecf103fe3c3d57d60ccea7eff017af4f09daac52e4f94adb4fb85a952d08e24e90d65f95086cdd4b10931ed4fca821060d2d5c932b1ad5c9ed413 SHA512 21c3dbf8cf7566c4a8207c11868d92983f416d78ae4b710835f01f20c6231f0a905109c7f8fe240b5b33ae160353da90bbc8d4539a48f69369abd9ab1bf02cd6
+EBUILD remmina-1.2.30.1.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
 MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809
diff --git a/net-misc/remmina/remmina-1.2.30.1.ebuild b/net-misc/remmina/remmina-1.2.30.1.ebuild
new file mode 100644
index 000000000000..9c7e1d7fba7c
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.30.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2 )
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${P^}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_AVAHI=$(usex zeroconf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 442713035334..e27668783dd9 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.05.09.tar.gz 2962389 BLAKE2B bcdf235ce91cd2ac7ddf98d36112d9e23d8d181f5998e5e9bb2638d6acd1aff010f390dc7ae2c9d558c07b20f9d5ea1183444ead6a6a797ef980d8dc10c8b927 SHA512 cf62dff3f8427f0d31dceeebd7b6d8748ba004cd1077076b72f02c2779a8147ce07a7a40cd356a51d0f0dea3008a83f20dea73f6de5c1150cae311c552457a31
 DIST youtube-dl-2018.05.18.tar.gz 2963277 BLAKE2B 4e33f5c97ee20313bad1a4b0ccba55be08177e3c47342f163a04e23e3ce22bbf4e15e620bd5c5c1e1e7a0e3f2e422dc9cc2c213af27a25b40194e3ea93fa98c1 SHA512 99527e5aabf12018037c39d5ce4e3ca67b8848f84106409b8d5fd5271eb6ed53b49abbe5939ab5558ed981a5aeff730b2e27589bbc22d3d616061415154ab9bb
+DIST youtube-dl-2018.06.04.tar.gz 2972929 BLAKE2B 77f1ef9b869ea1b3b98d4deb064d959d3d05ae1732c2277cb5e2143025efb91196d2acd446f24ddd7aafbbe7275c066fa6a032d4a57930b62fb9fbb95ca45e29 SHA512 f354cfc77c6532926bf2a20a47a4b603bdf81a2a15997f493785e76eb0688f13ec3d4b3217f7d6b02d9a83366fbd31d5be6f579551bb179ab6008b85ec3675b0
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.05.09.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-2018.05.18.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.06.04.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.05.09.ebuild b/net-misc/youtube-dl/youtube-dl-2018.06.04.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.05.09.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.06.04.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
commit	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree	047fc92023c520d07f13ec5ac96e094d1b312a7a /net-misc
parent	7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)