gentoo resync : 13.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:56:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:56:30 +0100
commit: 948d557b4a61dc14722668b6b11a4cf3cee07b01 (patch)
tree: b28b6cb077ae6b2457e30d49028fc978d8e2b59b /net-misc
parent: e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)
122 files changed, 330 insertions, 4595 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c85d41b19ff8..267ed6ffbbed 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 21649ac305b5..206a599461fc 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -1,9 +1,13 @@
 AUX anydesk-4.0.1.service 276 BLAKE2B 1eb07a90a1e2369c42be849e9885d0696f1b68ff1f21bef3907e0772e930ba41dbed6228e7be62f1fb80bbcc02866294d6f0040e7d8a2928ad409d3bef78ae5d SHA512 af74f74030f6834dc85f0275a0a3f7ef8eafc902a5b8eb99197574c60de1658cd70f4e3152876a1e9c86349473c2e52bba98302d366fa1b1f2618373f90e0f78
+AUX anydesk.desktop 239 BLAKE2B 3e9c2d1b93b7efe9731ffb1ba1202620b71b4c2655d1b053cd303b4e122dac3423998c3bad3b41b491a820587cda5a959f260937f5b5c4ebeed27583d90d2caa SHA512 c6ec7c6022b7cd994d80fa8f3d4bc583e84dc616e0567e50b6a62145ac32d6157eb00a0202633148b00b15523473f3284ca698035ed55bfde9694e3407a8d25c
 AUX anydesk.init 291 BLAKE2B 5fa5d60240f3342e53fcf7aa17df6d658a98b6446887f73e04eed490824876cebe9fca7844c4e33737f6b4e01787a2134089de78152503130d4ef4a242bf3f12 SHA512 63e60d0442355f567e24bb6042710e998ac7ed09b4d970cd30bb6910955bc95e7629f63a4988c2b92067cf273aa04893510cc31971def96bf453c92b673254c2
 DIST anydesk-4.0.1-amd64.tar.gz 3663439 BLAKE2B 6d693262569708d0289f9e4b03e15a4d4b8d7eea5253a18c6694d720e916b9d3d2a6894db16e5e6a31ddc39bd87ef4e766244047761440f9245c5f563ccd8dd4 SHA512 df2d4ec945f77954b8548513052af4d4f16c904ba450f4560c9185e94c2d4e57dc5ffb865239d1082803e040a60775b78d9c09015932b0fa6159378475d73f10
 DIST anydesk-4.0.1-i686.tar.gz 3658518 BLAKE2B 39bcad58de9b5ae76da5e96e32a8799343e1b6f7f78b3db3d02e675acae1ebbfa5c2a47a043b9d88810644656bce027bc347a783fcccbf37cdf44f986f1a8548 SHA512 e922e296149811a7ef77ae642c9ba73ca9888be57f13b0616ba5008f6837c86245d4b8b3a4b8ab6739a97fffa9b397b20d572c1fae7d5a5b2d909e8ee07112cc
 DIST anydesk-5.0.0-amd64.tar.gz 4258837 BLAKE2B 1ebb7cb70226873e9a2207823a1d66eb6b2dda9846d2921fc4484638f1bb4b9bf1abe4897af38fe7fb4c1c585187121bcf54bda5bd33a48c052fa5021f5cac07 SHA512 f18a3374dfdc62fecb7d47cdc6d43f7ec71433ed06f4c7165056e9b9526acd624305b0409cf1140f85631f8d7b72cf032ff32298ea24781c8e48e58d7e50abf0
 DIST anydesk-5.0.0-i686.tar.gz 4259050 BLAKE2B 43eb38dda82e6846c3e3c47f28f2556d93a4a420ea82639c7be0fc122a4d1bfdeecc5bbe7088687a54a0cc992307bd0ca4502a9c46539e459cea2d362a962622 SHA512 bfe3b39540aec09432343c554ec761072dc688f271bf164c1b3d6cb54271336b5cf35b51a93902bfad2d92d530c186abe108cc250f2a7f88641c66abd42b3c6a
+DIST anydesk-5.1.2-amd64.tar.gz 4502952 BLAKE2B ff59e13161f58d63512da17162e32e52625ac7ab2698053e5183b10bf7971955797194962fa91d77a2f4d72fae4192811382f3c8664c859db637b6ab6adcd82d SHA512 e05fd51b77dbe5d4deace5dc245481a76e9c27f01ae8240da2eb510fb7c6685f5bb0cc6b89920dfb1aea10002f22f2a1e5bdd8d11a4a608224c2becded88f8e7
+DIST anydesk-5.1.2-i386.tar.gz 4498951 BLAKE2B c9e44513dd2c49fa9ac0312e5a91201161905d81a66f15ab3be0b3f65f3f2c638c584191b120998a8a3961528c185844a079461a8d273dac67f314acb7ac1108 SHA512 51cbd953a93591c7551ddcb17450aff43ddf3b93280f902326f43f9a07f5ed4fa7de1e6ea580b4d56bddfbcdd772c3cdfdf3c85233fe8b6783e7fe681a2095af
 EBUILD anydesk-4.0.1-r1.ebuild 2278 BLAKE2B 52408a66fb764f8286f4efdf25ecb63f0343bca3c19687fc54f91f0ed478d89e0a87a3c5db5b12df78fe962564ade248d87883e0edf1492448601c1db7592975 SHA512 1990f9f67117e25f46ccd4af5ad6d9a23a8854c226f0c808b2f0222b8845da5a750b6f796eb3460992577b654bd8fa8f777c5fbdbfcccac419b125414031399c
 EBUILD anydesk-5.0.0.ebuild 2259 BLAKE2B af0627e3eff482a7d4383244334775c08b1ecad8eb021fd161576f1357812794de6679c9da42a186d8d606c9658cb6d9715ec1d17459328bd0b327a21943a0f0 SHA512 b53cf1b2f63e9b6d7157a4cbcab416744716de1465a1a8f908575d0af8273fbc6ed9d2538fa40b6badee6f8a1bcbd507e85700943ccf481038cef0fbcf9f8124
+EBUILD anydesk-5.1.2.ebuild 2275 BLAKE2B f10cbc810ed587182af61c0a2175a7f34e01fa6aeac5bd4292119b032bfabd5d962029ae7da0f8375ad4bf6d0ba10818698ae1de7404242915516fc37fc77059 SHA512 c068f2b82c0d8feeda9972fbf19b3a04e8ce60e3262bc8aca615d624e8f8059104efdb4bd3134b4c46b275dc1eebb3139eb0ad09d4ae74e0dc247a64517eee4b
 MISC metadata.xml 782 BLAKE2B 4052c9f572568a3ab3a9c4bc1f567439cc7a4438a5f3fc1c4b14b0b7d4582d19d74ef106d5ad845e2f7549b734eeb539a3c79bc287f0359301c02d04083c303f SHA512 4c8eda43942444eeb6df7a19bb27528973a9efa412536b5b297640c77ae94065bd3b46e722289f1762494742d61ac6c9b47c5f967afa1c226a1daef30484fb03
diff --git a/net-misc/anydesk/anydesk-5.1.2.ebuild b/net-misc/anydesk/anydesk-5.1.2.ebuild
new file mode 100644
index 000000000000..a3bb4194a948
--- /dev/null
+++ b/net-misc/anydesk/anydesk-5.1.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="amd64? ( https://download.anydesk.com/linux/${P}-amd64.tar.gz )
+	x86? ( https://download.anydesk.com/linux/${P}-i386.tar.gz )"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/mesa[X(+)]
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-libs/pangox-compat
+"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+	local dst="/opt/${PN}"
+
+	dodir ${dst}
+	exeinto ${dst}
+	doexe ${PN}
+
+	dodir /opt/bin
+	dosym ${dst}/${PN} /opt/bin/${PN}
+
+	newinitd "${FILESDIR}"/anydesk.init anydesk
+	systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service
+
+	insinto /usr/share/polkit-1/actions
+	doins polkit-1/com.philandro.anydesk.policy
+
+	insinto /usr/share
+	doins -r icons
+
+	domenu "${FILESDIR}"/anydesk.desktop
+
+	keepdir /etc/${PN}
+
+	dodoc copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To run AnyDesk as background service use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service anydesk start"
+		elog "# rc-update add anydesk default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start anydesk.service"
+		elog "# systemctl enable anydesk.service"
+		elog
+		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+		elog "further information about the linux version of AnyDesk."
+		elog
+		elog "AnyDesk might require the following commands/packages"
+		elog "for some functions:"
+		elog "* lsb_release	(sys-apps/lsb-release)"
+		elog "* lsusb		(sys-apps/usbutils)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/anydesk/files/anydesk.desktop b/net-misc/anydesk/files/anydesk.desktop
new file mode 100755
index 000000000000..cd4c1e0089f5
--- /dev/null
+++ b/net-misc/anydesk/files/anydesk.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=AnyDesk
+GenericName=AnyDesk
+X-GNOME-FullName=AnyDesk
+Exec=/opt/bin/anydesk %u
+Icon=anydesk
+Terminal=false
+TryExec=anydesk
+Categories=Network;GTK;
+MimeType=x-scheme-handler/anydesk;
+Name[de_DE]=AnyDesk
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 4aade7c36f3b..ac8150b0b3cb 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,6 +1,5 @@
 AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
-EBUILD aria2-1.34.0-r1.ebuild 4439 BLAKE2B 95ceeb794a25162f1edaf2910117f093fdb06f4afa956b14a5fe8034440edc6f0ea7a91f18434cbf083505e7effedad47fcf68ee52286c931db73b9be29085b0 SHA512 2a9d7e9c963f3f8158727bafe5fb8895981bb3e81687bdfee36c23be097b7f3d452efb8e560dfaa540aa007368e386e04162c93ca651c405cf1c68386f9a8ff9
 EBUILD aria2-1.34.0-r2.ebuild 5014 BLAKE2B 11ade715c629821946b28812b7990918f0134093f3bbc374701a0ae196ca46ea569caa2d435f91250c07489603e3a222556a3eee30dc8c052aaf267802942ffd SHA512 ca8aa1ff070bb11b5d542f93e07b573eddbde3286f82101c3b2a2b65eccdb30872e66388185092fa1113bd41542e1645b213960cab5b15eeeab62f1ac9da992e
 MISC metadata.xml 1442 BLAKE2B 82e8426004e56ba96a5f8766a6d04325ea3919ecfa0996da1d767dc4f4fb2b3277d1b3e4b60d369bc7636eb557af336b890c4bde0b49ee39cc3352050a112fe5 SHA512 61da3c1c3cd1535d208e7ae1930fc2af16eb2080f99c923b9bc405decb50f09cf5acfbb1e922c3eb7edbb799f359e8e9762fe2e67ec24ae542613459250c6f7b
diff --git a/net-misc/aria2/aria2-1.34.0-r1.ebuild b/net-misc/aria2/aria2-1.34.0-r1.ebuild
deleted file mode 100644
index 39d7cfca73ab..000000000000
--- a/net-misc/aria2/aria2-1.34.0-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( >=dev-libs/libuv-1.13:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-make_unique.patch
-	# https://bugs.gentoo.org/674622 (CVE-2019-3500)
-	eapply "${FILESDIR}"/${P}-mask-headers.patch
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c0e417179d79..2c6245b8ba5a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -16,6 +16,6 @@ DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfb
 DIST asterisk-13.23.1.tar.gz 33064056 BLAKE2B 7f531766df5f2db29b562e7c7d4e265d5cf610f192188691279c0294195b835bb62beef19d7e9554862e6b44764064b21d50a3e307bbf85dd12b67a2df8be459 SHA512 227bfc80b2e6382019d608296c4e1c8e992ba867636fa2c8ee578d0aa406b8828bf7962b24035d9b581c433afd18be7cbe98eb954112661b9759b6296ee686dd
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5
-EBUILD asterisk-11.25.3.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f17229904d7ae9c08913cb0910d20d7f9aa9d27d719e06b23faf57174708cebc1212b11887de89d02b7916694702123b93a SHA512 bce64dc6beca0a55b8c8a86186e98f7947ee3ac8ad42ca9efb1b7bcfea105ef8a0c663568bbec1b157e225a12df3e2782f7fd5b92a353dc01317c0c6c0806887
-EBUILD asterisk-13.23.1.ebuild 9717 BLAKE2B edd999c6abf4b83c3028d8c69f167e494f372f1b8b2e5640569adf0a212617d96bcfc326fcbf45cf8200a7f9a6fd1836d974c267ef10777f0cbd5fbe7499a75e SHA512 110828ccedecf0bd535357134ee51c860ece343e4116e81d6242a8b9098d01f7889d6b440ccf23c9d0fcfe036083edde0be23fa82049463553c6b9c24b8b76ef
+EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8
+EBUILD asterisk-13.23.1.ebuild 9721 BLAKE2B bb24fad06bea49534ead1bb19917842eed3e04c24b0a2f60ae2035544ba250d420c995134cbe221a51aa05327c45cfe5e44710539891966fb0af7d6e379876c6 SHA512 42df62f3e23ceef24fe934b2565bcb44fadbce1c69d9c6c17c14afea457418f250ad99e9969a4197ab28b208a48d7fb86ab4a2872d27a1fa1f00c01dcd86f41e
 MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3.ebuild
index 75bca5529286..dccee3d36f7d 100644
--- a/net-misc/asterisk/asterisk-11.25.3.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,8 +32,8 @@ PATCHES=( "${WORKDIR}/asterisk-patchset" )
 CDEPEND="dev-db/sqlite:3
 	dev-libs/popt
 	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	sys-libs/ncurses:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
diff --git a/net-misc/asterisk/asterisk-13.23.1.ebuild b/net-misc/asterisk/asterisk-13.23.1.ebuild
index e55474c53fd1..4b4f8daa8ba3 100644
--- a/net-misc/asterisk/asterisk-13.23.1.ebuild
+++ b/net-misc/asterisk/asterisk-13.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,8 +33,8 @@ CDEPEND="dev-db/sqlite:3
 	dev-libs/popt
 	dev-libs/jansson
 	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	sys-libs/ncurses:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index c76a980f609d..4cd10a6e1b21 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,5 +1,5 @@
 DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
-EBUILD bfgminer-5.4.2.ebuild 5117 BLAKE2B 9468e321a37398cc63cfcf01cb9e940e3cdb7acabd9681c5c41129172849cfa87eb68b73246e99d9b18172d4c62e5b6d0b774b54ccf22eb33637595fbb196016 SHA512 3dc376715f42147d016307e36c816a20b3b101ff135aecb1a9e9b3b3a8ffaf59f6cd2d721b7f6334b370090d612903e71ad4d839e48fc772b86401fba6a350fa
-EBUILD bfgminer-5.5.0.ebuild 5179 BLAKE2B 96f3419d43cb9da8a0acefb50d7db215884988233c99d8283495519286af8ece98bfaf8a08826fbd870e957d8275c15590b49fafe2433f1c73405e640219e053 SHA512 9ef2d514c5e80ed59a32a0f289e2b15ee8b64d9d14e1e2c173a62fd5bb431ef14388378c316639817d34e2e9ff202d072f1014f6b64059f7dd25cbd685fbb46c
+EBUILD bfgminer-5.4.2.ebuild 5117 BLAKE2B f1e985c58d4ab5c626b6fa67234a07f84b5302eef4599bf22b57ed77918e821b03a8c8735fe83466433ef17f186936bef52214a91436a0e8b86b68437a03f144 SHA512 5b96f640bca3d18ad5c75da5be5250c4a90184b69698723875a9ad0647bb803a3f13402a822d63c020bc006827f86512a399c1fe4beb34a44f0b8e816c48a7f9
+EBUILD bfgminer-5.5.0.ebuild 5179 BLAKE2B 179869f66f6495d1bd831f0777c9caa5665dbf1445fabbae1f93d90b15c5687d0385e0b90245f614977a691ebf9b10ad03be2474015aa72c32055c9f275eb794 SHA512 df5c9ba8b76775eab85b0b69f4245e570d295ab62f8c56542c6af06a5eaa3d3e08b47bb273f21ba35fd06812f12d153a0c3d2c2f8c59fd74012b73e9eb1f02ad
 MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21
diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
index bb70a2cd1ca7..93d5146abac5 100644
--- a/net-misc/bfgminer/bfgminer-5.4.2.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 # TODO: knc (needs i2c-tools header)
 # TODO: kncasic & titan (need systemwide knc-asic install)
 # TODO: minergate (needs actual miner_gate)
-IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
 REQUIRED_USE='
 	|| ( keccak scrypt sha256d )
 	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
@@ -42,7 +42,7 @@ REQUIRED_USE='
 	keccak? ( || ( cpumining opencl proxy ) )
 	klondike? ( sha256d libusb )
 	littlefury? ( sha256d bitfury )
-	lm_sensors? ( opencl )
+	lm-sensors? ( opencl )
 	metabank? ( sha256d bitfury )
 	minion? ( sha256d )
 	modminer? ( sha256d )
@@ -78,8 +78,8 @@ DEPEND='
 	libusb? (
 		virtual/libusb:1
 	)
-	lm_sensors? (
-		sys-apps/lm_sensors
+	lm-sensors? (
+		sys-apps/lm-sensors
 	)
 	nanofury? (
 		dev-libs/hidapi
@@ -175,7 +175,7 @@ src_configure() {
 		$with_curses \
 		$(use_with udev libudev) \
 		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm_sensors sensors) \
+		$(use_with lm-sensors sensors) \
 		$(use_with proxy_getwork libmicrohttpd) \
 		$(use_with proxy_stratum libevent) \
 		$(use_enable x6500) \
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index b2dd3f03b1bc..6d7f7cea5ea7 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 # TODO: knc (needs i2c-tools header)
 # TODO: kncasic & titan (need systemwide knc-asic install)
 # TODO: minergate (needs actual miner_gate)
-IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
 REQUIRED_USE='
 	|| ( keccak scrypt sha256d )
 	|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
@@ -43,7 +43,7 @@ REQUIRED_USE='
 	keccak? ( || ( cpumining opencl proxy ) )
 	klondike? ( sha256d libusb )
 	littlefury? ( sha256d bitfury )
-	lm_sensors? ( opencl )
+	lm-sensors? ( opencl )
 	metabank? ( sha256d bitfury )
 	minion? ( sha256d )
 	modminer? ( sha256d )
@@ -78,8 +78,8 @@ DEPEND='
 	libusb? (
 		virtual/libusb:1
 	)
-	lm_sensors? (
-		sys-apps/lm_sensors
+	lm-sensors? (
+		sys-apps/lm-sensors
 	)
 	nanofury? (
 		dev-libs/hidapi
@@ -176,7 +176,7 @@ src_configure() {
 		$with_curses \
 		$(use_with udev libudev) \
 		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm_sensors sensors) \
+		$(use_with lm-sensors sensors) \
 		$(use_with proxy_getwork libmicrohttpd) \
 		$(use_with proxy_stratum libevent) \
 		$(use_enable x6500) \
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 5cdeef55bd4d..1090b44bd489 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -3,4 +3,4 @@ DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd
 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 EBUILD bridge-utils-1.5.ebuild 1281 BLAKE2B e6de8e0ad11732c63cf2d7ab327eedb2c64645ca17e716a334c31763283054df09b31fb4f25eb59ae3b168729ea6cdaede66d0f588ba023a7c38e755a92a5da6 SHA512 f2770626ffb714981d426b4d9f005922724389580d0dd3252c91123fdd94212b6aecaed5547c66a459dd1d1d6109d4f93453103c996e55a1659fa27e72c57636
 EBUILD bridge-utils-1.6.ebuild 1346 BLAKE2B c33c146b23adb59d332498b285f69c78aa7f6016c3272e32a4bf3119af297c008939eb0ca557dfe96b88c45d0279730097b7f7fe934f9f648d4b5953bc95a46f SHA512 405c661cba4d088ae986f75a1df0cf43efe623df0d0547242d05eab5575ba315a5f8e623725e7d59de59562bca86a65c4d789c80ee125c2364999041699bf08c
-MISC metadata.xml 426 BLAKE2B b5b760c60c84d9cfc3f941b1ec1fc8f8736f93fa479bd3f68c772aa0e0e8f6c0de30b55dd3a10010ee9845165d3075c439af72ab006f4924a422a28466c74ccf SHA512 b6d8f31496815fff6ee465b4eff20dba27a478e803c299e1d329ad33dd80493380b746fd0aba19d15a3780e4a4b37365829781cda5aaccfca2f044506b15c38e
+MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index 995aec82049e..4320f1c5d7c2 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-utils/metadata.xml
@@ -9,6 +9,7 @@
     <name>Gentoo Base System</name>
   </maintainer>
   <upstream>
+    <remote-id type="cpe">cpe:/a:kernel:bridge-utils</remote-id>
     <remote-id type="sourceforge">bridge</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 3e4f963bd179..40139ba407d8 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
 AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
 EBUILD cadaver-0.23.3.ebuild 1073 BLAKE2B dc2af096996fafb295055cf9843465c323ce5f04b97a42e7d2fc201c8ef34c5ca93c28c97723a3671abc968fec9adec094a69d0c9c812c3afde8857edf3952b4 SHA512 217e5a20da9bea6e7eb099b61b33447ef074596d53e45d0318712771596c00adda66e0546e1f15e9067c25b51a842697451219e4b843ab06b428f98f619156ae
-MISC metadata.xml 222 BLAKE2B 94ebd170c2e2b56a2a280b892081f4a2b380a9dd63304df741df254293ac82054167980b6e986315718abdf0da5f6d26226df0d13c3f1eedc4ee2f32bdb5a798 SHA512 c4199e672c74e701df271dc48c920480d853cdc341936ef071bb5d1cd3a28127ff0fdf6a4e135ce7e805bcb99bebe93407dd2aa4dfda91a8c66d6cc2d2ae9a01
+MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index 58be4f4a109f..ca82cfff518d 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -4,4 +4,9 @@
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/calico-cni-plugin/Manifest b/net-misc/calico-cni-plugin/Manifest
index 4c7c516b70a9..109fd3b314de 100644
--- a/net-misc/calico-cni-plugin/Manifest
+++ b/net-misc/calico-cni-plugin/Manifest
@@ -1,16 +1,12 @@
-DIST calico-cni-plugin-2.0.1.tar.gz 59792 BLAKE2B a7ca4799030ae83bd96291c72d46b95efff9bcbf465da41b19fe54d61503b0a3efdaee55fa086ee154fa83b8b36725ec848145fba078f107a8d3807959d60a7d SHA512 1ca447e2e8a4f95254c5433ba39427014da40febb44c29969a9e81f8a7ae62f706d9cf6b116400b7a5372ebc91954d588916808d64d9b12fcfe25fff90feec9d
-DIST calico-cni-plugin-3.1.0.tar.gz 62358 BLAKE2B 04a435b427da12f6fcd01e8713bb42f094da8de54fa33982c9fc9d4d9ab71f3b5f23e6bb750eb5395d0cf5b8250057c9c670b89121456509b1f204230b3cead5 SHA512 44bcdbc91c56c7f1610261aaf6d6bd7f0ee32bd08501ac74cf980a91c5c126903eee5c2daf6c3ccedea6396f93c4b22df1c5de247acdefb47b49c0b9a2717e26
 DIST calico-cni-plugin-3.1.3.tar.gz 64054 BLAKE2B 782847ca79306b27fffd0426b9cd7c5b8e34f39634491beafc1c652d26dd0ebd84b46116b12b3f6e8ebdff4a8aa5db52966ac62e1bba595456f41bbdb3c48fd8 SHA512 d4c064d4f7b5e65c933d6b7866ffc077e20da35ae3af03d8b0175f01f9fb87857a5c891f8e15b877e6a1c238c894a8163458197f7921d866b7a180ed52eed527
 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
 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-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz 173167 BLAKE2B 9aad6388fd9c307a31a37a746684ed9fc52ff556ef5209e14c2afebf69af0abc28cb9d825245b87a49fd9947f638344b92143868fea7852db0bd2bc39239a2e1 SHA512 0607a4213f1291cff03d21d6860a8830ad998bcb4c6e3489bf0a8c207137fe9b958c3c453e9cf6fe0911a219d250d89f0e8b3c457900893b9ed8bd31dc696777
 DIST github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz 789110 BLAKE2B b04688b90503cb01aa18d9c1227b7cb510846f8b42678729fb7a80bf914ef4a06c399a8f165b7f01d6a05aaf98d4e97c17675a3774745a7850862bdd609b5168 SHA512 2aa1a665531c2e6b7800d38abdec4f0b68e778ae27c638b4ab097abb720c66a4863fd1f4b59dc818b91bddbc5c7dce4e1fefddfda11881e2334d7b71122bd60e
 DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
-DIST github.com-coreos-go-iptables-259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz 11294 BLAKE2B 2e95b4c7c9836d54a004da28f6abd09d3d165055d2d1d4f8e6a67d3389b7f93fee14f30c92096d2da6f7639a602bc163df40c1f817370c481ebbf63094d8b197 SHA512 58c5b995dc12a881820f5dccadcd75cb8e6d856f34c2d33c01ff8538c0a1451b75e14d3bc675fb008fe3c4e87d1d0bfd4a27443f19dfa8b53b4da02d3de9dfea
 DIST github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz 13564 BLAKE2B 5d0227229ccb548a8978f0ff4f45d55437995ebf09d6af0f71f2fd6fb9ca6ebee58a75c0eb1b8badafd85dc79651672476b8298404dc13aaf8c602bd914a715c SHA512 df1a5c19ac8cd10602886f0adedce07629f56a055bd401caf64e9b330aa7dc40995d203b446bd5486f67c6f932bfcafe4e6af7ff6f9480ec815763bcccc374c8
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
 DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
@@ -25,8 +21,6 @@ DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz
 DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
-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-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz 860438 BLAKE2B a19c673d984177faf078a04b7351258fed56390d09bb74f715409e30a7c99b68ef1861f1890db0683370c290a4fcec8f2a1d82a01e9132160f5a3a2954b9cfe1 SHA512 693f3586a09e2149ceda3b6833154acdd7d924eb6e225697db4d103a9a907147a9b1860efbd0dcecf2db6b39f44b0e6e6414eff318ae4ccaaf36e18f505f438a
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
@@ -48,21 +42,14 @@ DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 72
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 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-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
 DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-DIST github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz 450402 BLAKE2B 422d64fd22f92c65f3ed41472e5a98b6197d32aa0b4fb19c7a487481e33738b65b807fa3af05e577641485a9702ce298e9741c57cdc9abba133a10d5a9d58de4 SHA512 628b11b308d8b76724f65e7d04570cd693a01368ea22ab556313ecd3af28e778c0bbf042a04f180bfa9c4b5188b437ae1bb5c0757fbd4d9602cae63f2fd37d36
-DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
-DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
 DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
 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
@@ -71,20 +58,14 @@ DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.t
 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-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-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-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
 DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b
-DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
 DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
-EBUILD calico-cni-plugin-2.0.1.ebuild 6365 BLAKE2B 26d3e32b88c6bc5236b42452eb80d034766188d5fe974be16f360209b7c02fded5ec2e0989aff8d8055a02eff236c7ef0fadadede52e684ca5d9807d3d1c55a7 SHA512 3edca428c969bc535592ce4cd6112945744e02b9e534490714112a9e08d276fd73ac8ab258242fd9c5db92c2b656f2abc44e7a91052edcfba1d1008519b93f46
-EBUILD calico-cni-plugin-3.1.0.ebuild 6365 BLAKE2B 03939f254629d3fdd82f2085665d1613ca650c0331654a7820f827e5d2045466a47169df41e7da6e2a29381d947f33d20ba5734b76bbbe6da5dec2b38c871608 SHA512 1c608f4b9e91bb64343c6c96300d760c8140fb3f6dd068d46f787b32e119eba97b209fe61aa28e88301a8211f47c762e11f38764ca36887f978ca162ca451965
 EBUILD calico-cni-plugin-3.1.3.ebuild 6365 BLAKE2B c562508cd4955695469bc41512377a8d1ed9105173929ea84d65e34ac0f30bd0bebabd8a08b30099a73bb24dd2b6e0d5f33521c58ded979a4bd8d5a3d5ef37d9 SHA512 fb7d14bf2625b002da53a52d475f5e32e9b005adbab272e8927ca4f7a6faed83187fafef70d42c63237669662b06a1146a81ac7e3f8679800aaafdd5f9692c9e
 MISC metadata.xml 262 BLAKE2B d956111dd23ecabf422e1d63d1544911922635562521b844bf87c64d14415748057fa5c10e0647a85aee501421e72dc539f589c2b96cb351ee80be27f67731a2 SHA512 383a23a695a1c63bcc045e62140dde337d7ad462d80ce195939b605f3a9d7c7ed037417002000c1eb0d2c72492162d8c4266c3549f5e7d61e530580d552c7080
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild
deleted file mode 100644
index 12702395ef9f..000000000000
--- a/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild
+++ /dev/null
@@ -1,113 +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 a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
-"github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/coreos/go-iptables 259c8e6a4275d497442c721fa52204d7a58bde8b"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"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 c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"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/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8"
-"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/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 fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
-"golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d 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 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"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
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico Networking for CNI"
-EGO_PN="github.com/projectcalico/cni-plugin"
-HOMEPAGE="https://github.com/projectcalico/cni-plugin"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-misc/cni-plugins"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	sed -i -e "/calico-ipam:/ s/vendor//" -e "/calico:/ s/vendor//"\
-		-e "s/git describe.*/echo ${PV})/" -e "s/CGO_ENABLED=0//" Makefile || die
-	rm -rf vendor/github.com/containernetworking/plugins/vendor/github.com/vishvananda/netlink\
-		vendor/github.com/containernetworking/plugins/vendor/github.com/containernetworking/cni || die
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}:$(get_golibdir_gopath)" emake binary
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	exeinto /opt/cni/bin
-	doexe dist/${ARCH}/*
-	dodoc README.md
-	popd || die
-}
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.0.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.0.ebuild
deleted file mode 100644
index 94c85194745c..000000000000
--- a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.0.ebuild
+++ /dev/null
@@ -1,113 +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 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/containernetworking/cni a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
-"github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/coreos/go-iptables b5b1876b170881a8259f036445ee89c8669db386"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"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 c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"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/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go ae021117ebb7c4d8067ea079706b718c6a88eb7f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common 38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a"
-"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 fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
-"golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d 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 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4 github.com/golang/appengine"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"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 3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd github.com/kubernetes/api"
-"k8s.io/apimachinery ab7fc865fb0881d161f37adef3e5a67b89a18d05 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
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico Networking for CNI"
-EGO_PN="github.com/projectcalico/cni-plugin"
-HOMEPAGE="https://github.com/projectcalico/cni-plugin"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-misc/cni-plugins"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	sed -i -e "/calico-ipam:/ s/vendor//" -e "/calico:/ s/vendor//"\
-		-e "s/git describe.*/echo ${PV})/" -e "s/CGO_ENABLED=0//" Makefile || die
-	rm -rf vendor/github.com/containernetworking/plugins/vendor/github.com/vishvananda/netlink\
-		vendor/github.com/containernetworking/plugins/vendor/github.com/containernetworking/cni || die
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}:$(get_golibdir_gopath)" emake binary
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	exeinto /opt/cni/bin
-	doexe dist/${ARCH}/*
-	dodoc README.md
-	popd || die
-}
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index fb8ab2e8ceb4..ecb0a969c26d 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -1,6 +1,3 @@
-DIST calicoctl-1.5.0.tar.gz 63645 BLAKE2B 583159a60d7b8ac02bd36d63579e216cb2a60cfad4305ba89997bb9e55568dfcb349edd9d2ef94525b2b71044a96fa5baa79c3f70a9eaf9b93f58ed949e967d6 SHA512 57bf1b9e008df0c652881f84e59cbfdb3bf6192ff0810ef068c16e7601a6da78e7d0c4bdd912606c2095059ced8e7fe820bbb42f328bf9e7a5404f773f4c883f
-DIST calicoctl-2.0.0.tar.gz 86002 BLAKE2B ec096880b6c6463364eca721693722d3dcd747a9f3f45af6188ad0d89d4ca2420cd9e5c9f6ed59d64842500887bf8849a7636846cf7ea84223503e333e20ab95 SHA512 d8c4f71c310ef8e2e41d51cc1ff02559cb85b1450e139dcf70aa4eee7989d2d4dfb6cf9c9dca88a6589e28f963e319835ba3542352670b14709812077473b133
-DIST calicoctl-3.1.0.tar.gz 87560 BLAKE2B ec9ccfc1b2fe03edb64372afd7caef7c96301a4a25909eac2bd2386112170262db4ddd017587c731a62fb0fdda18183a808634579a1e407bbe5e6f2b61edc00d SHA512 0cc60dfb635c3092ec998917ad564c7d7bba427fe2355d57fa53d6b050bbe54208b30412f6a5da5cd9c8e943abdf3e5ef264213643107919af70d0a2f142dc17
 DIST calicoctl-3.1.3.tar.gz 87574 BLAKE2B bd1c00f5ba084bb7bb49af64fed0dfd3cac8da921f8e33ecafea1329d7d09de3d2051680f8f0a3638d1cb98b90a9cddf0a88438844f365ffcc1fc6a9d50d656c SHA512 7369ecbdb4c7afb383e0e47ab088022b020665854a66400ee415dbc64a9ce7fba32ace67e202d13e8feaf2bde7c7e3544ea46e98ea0e2f9fc59c7def4a851479
 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
@@ -8,19 +5,14 @@ DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz 5943 BLAKE2B 35f99d69b58cbdf7b49d9aba5b8456c2702dd2fecec3da6e522e5d97e13b697037afe81c115a0a8980b25d99ad3216d3e07027c912a644a4efcb27c6c1404022 SHA512 431e41870728d86accd7ed78d1e16c92adebfe79cef59b7f656a395e4bf7727ae9521f7e9d291931590680fd32eaef26622d888f30a4a4511dbddcae8dda1c08
 DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
-DIST github.com-coreos-etcd-17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz 2538523 BLAKE2B 8a7cc944e2eac99e549ef13e3630ab04d89579a59e8bfbc1629f1cbb350fe460aa02054c144275287192cbe956784d7758d5bfda2b642f7aee5ad6b1f6595bfd SHA512 9202595469d538328cd0ca57f08e29d66f93080592eb65fb32ae76c13a14dfaefdacb9d7b1aca8c069db52363e3d798b4882c5977bbcd600159d3d8cb65d5eeb
-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-go-semver-568e959cd89871e61434c1143528d9162da89ef2.tar.gz 7314 BLAKE2B 2bbcbf0a49820c6e5f5e236a844ddc7b78840c416e60c213a122aaf1415499e9f303935c834487b28462b555db33ffb47c63eb46614d36027e8ce10fd6223d0e SHA512 8e17cad3a52ffbdf658e71fbe97364a2a202ff6520baf25ce119d537f0d03c10b591772df4ed0e5da06665354c9deffcc06ffa3749c47d2042350d3ab1134940
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
 DIST github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz 33471 BLAKE2B bd97ffc4bdef9c3c7007d9af34c2e330d3068379f0718b3f0831379d1ff7fdc2ca63e5579542152d68d546a23e82baeb601cc796cc76a82154b2f488f789721f SHA512 12a26fd70674394fe5dc64695314d85c08370d134c8af0d8047363938c90c23f40e0f8f8b25e9288c40bdb28513cfe64fac738a6e557f5425531d7dac01586e8
 DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391
 DIST github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz 11711 BLAKE2B d024ead4af79692729ebf790a26e53ceefd005efc97017a9ebedfa345640c1f86cbaf1c61267abc478619b41c371887dcc363672a7d4a7cc61476997ca81864e SHA512 378d5ae07b41275c6a1633e26470255210ba62d6fdd6b926ae3f48e37160f659fc050e9866267cbfd86fe07a8c0ef3cd00eeda8cd9deb0ef66af697773d71601
 DIST github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz 3503 BLAKE2B 95a0030b182097aa1fb640f34b60fa094073f57ed576da5180b49e254e20f88a5b3980742b43d55e02c715a8dec9f0a58a5410ab91c88a19ebcf1584ab0f7216 SHA512 7aff388e6908911bee51e0c22be9252981c22980d78f911b96235e2ea0f8ddb38b80bc3c513dbd30f8514ab3012f83e688b0beb959c917b5b45d6db57c15a162
-DIST github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz 3504 BLAKE2B 3e0149532ffb89b5bd6ff3c53689e659f6d4bb9eec5d6b50b8afce2c56fcabfc4e3b3ccb5fe0a2b86adf5a758c1acb36ab733efc1dd10adaf47e4a80d594c88f SHA512 5641abf798c2e238885f692262d5b6932c41c770f9a2a6806c764a31a14e14b99eccc59d3571a83919aaeaa619fe1f8e5e492d245c6d6d41fdc03c45d2b69670
 DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
 DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6
-DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
 DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
 DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
@@ -32,20 +24,13 @@ DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c
 DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 BLAKE2B 9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1 SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
-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-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
-DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
 DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
-DIST github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz 768453 BLAKE2B d65875956c833884b408e2515ba032ecf2138153e4ca71821fd48aea6603312a8a5c68a6212676cdd09255d19785aa4552c867383b157368b0dbf42e7f5b157e SHA512 ad0b00afcfd95101939ec307eb6413f638797ce464cd13c4b5810032f633538be297bb30a785bde7623da8eeb6007814f0531572acd67b1b5c5ce0aa1de819cf
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
-DIST github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz 769752 BLAKE2B 3d118ee77f7ff6ada9388fb3c569726aa00e77eb743ca38f51bcb4fbd1c31a8d43103b6cb2a5291224653c699d75143f3c449e84a4dac2b7dd2797e5a035e8e3 SHA512 91c2db2cb798fe0b185602e135b6acea6eaee1c5345581b14439197287ec2d7e9b9a57b951a6e033ff8c40ed8f8f4f8a8c5a68f29f25b048922001fa8290df42
 DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0
-DIST github.com-golang-sys-8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz 598397 BLAKE2B 8cc77f2f7d3f4a3f42a472e5fd683be5030d2e6d26f49443891dce2a68d289d1e39d400c92a81027c76aa2514b445a183fbfdac0157694a98e12d4272407dac2 SHA512 d97b5d39302e52a7ffa337199137cefc91ada8c31135f4862b3aa09fe98ad2279f5d04874d3a53e64f6daa71cacefa8fdbbf29a1c6b86225844f3fdc65f86eb3
-DIST github.com-golang-text-19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz 4549757 BLAKE2B a2f26b79f19fef37ee517bbc725760f56e89bd08691ed6f19edd7e5cd75dd12b231d02f4efedf953aa44cdcf60983476d726c7afc2e77fd248a2048b4e892db0 SHA512 dc82a73eded06af2572d2906c8727467c0b330ddf9c0e21227253f55c1559796882124c6c689c6be5d0204a5141a782b00642dfdf0024a3d7a156df96e7ccad4
 DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
 DIST github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz 12725 BLAKE2B d9db98b01c8b4b3e62fcd8f94e890c58ab80dce88f8a8b811eff9fcd9e35a76a53dabbe591f66b10e281c268806d69b29f558091d0e091612443197dd9ba5ca8 SHA512 16b23b56b7e99ef19b1e8251b646f13be1bac0f41df8077d80235434c1c3f187fec3782667eb7ff022442915ffeca1b28ff18b410bd7c6cb9db29a72beb168c9
 DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
@@ -54,103 +39,49 @@ DIST github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.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-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz 220340 BLAKE2B 788b394df3b791a558c5aeb0fc1e330053d0dcc58d47308d337498743284a7b0a01eb28a853d619ae0038b27db4c93883cef672f74d7a7442d856b19e3e1cfb2 SHA512 ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5
-DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
-DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
-DIST github.com-hashicorp-hcl-392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz 69703 BLAKE2B 14fd9a3a6796ceb6aa92aff2ab1fbadce6079084a168c7f9afab8d624da9b2b45237c7e27f77ffa40dc132bc06c28e73dde6c5d37a7a305ccaf973d98a432754 SHA512 07ac3405d91039471e7ff86ab21d832ba1da223a3e4a07a97b090d13d05b508fdd65c60350209db0f9731b3316b684303875af72e4db1c20c924bb16585b2692
 DIST github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz 70427 BLAKE2B 3b699fd5923ce6c823bed429fdbaecd0ea3f1a7518e37d7b4698b2b112e24c049a90994c1651fc66f0def3958865b88374ebb39e03618c09a49a5795661d3498 SHA512 d56f15b28e89c638d2d5c4f7859d3612ae7c7f981a6950ea59bb87987ac4db6a3582b00680ccd4f9e579b3d2c5e53958d89941270366e159772959a4c5b1e96f
 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-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz 1290543 BLAKE2B 6517450c7d4cdac1908ed0a498c4cf6c66ec5f64631edabd5293c3eacae02a4650affc4af80beecc024d34aaa629827b9d116974f2b2bbb978fa57c119b143f7 SHA512 ca66e7fb49c3525222a3dd90bc62cf835218d95018ce093a2464b42b70293c3a7203c9a930e92d788be6f67a90558def5d6c62802280fdf382874acf372ee8ac
-DIST github.com-influxdata-influxdb-38d2d29f79f249b4f7647b441355cbc03e9fec1a.tar.gz 1227453 BLAKE2B 6319911183f16e0a38afc5a5e88f122b17028e49dfd1c7a9457b4f4d821a6fc230ff901143aebf255cfe8b575708bbd9833ac895c7a9d3c09859fd6b5d4bc37d SHA512 a8583db6224bb4c821fdf807f1d9fe151ead3799bb1d69cc5449dc0f958e04ea41ed0d77e425314736cc34856b56a699bb37ea220969dc823eeea911f037d940
-DIST github.com-influxdata-influxdb-392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz 1071651 BLAKE2B 036d9aec6ec0acf694e350fbf02ad3fa9c0f7cd030a3e6fe36e19d1acac643b34c2f2c2aba45526d606d26009a3e97fb3f2ac33194722864063222e3ea95b087 SHA512 615fac477fd2dbd7afecef1be0cdd222997ef977cf388d3c6ce856cafd5ccf62e35cd76c5a9bcc04d93370bd45035e0fb346d1099950768ea60eafb36c5e19b4
-DIST github.com-influxdata-influxdb-b287c191f362e7313aae0fa08c19b787076ad530.tar.gz 1165644 BLAKE2B 657eeb6a1dce77f712deff0294017f57952e3455e5c3dea7279358c170dce08708c51278517b11f2fd504572f526683108c72e7a7bae42528786120d4102c510 SHA512 268e4f119429d209942d054dd9457f88d0bb97ef7cbaf9e7550c9887c78c4bb9197b260bf763ece33e3ffa0e0cf33d41a5049a454118b2eefeb8062ef096c16e
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-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-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
 DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-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
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
-DIST github.com-magiconair-properties-2c9e9502788518c97fe44e8955cd069417ee89df.tar.gz 28780 BLAKE2B 70b3a20cb202e40873a3d68753c36765d09ec47da285bad924b68efe0eb1dcddd50bef0bcf20d3363d3a2912edc22fc528270868bcce8d83642efd1de71b7161 SHA512 492a1534467349e2aae5e49e286639ce711d3c6b94f97924ee4dc59cbcdca19fc519089a9226c142c69aedb0beb6dc2bbd570f0941998a1d94c57b074129949f
-DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
-DIST github.com-magiconair-properties-be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz 27514 BLAKE2B 82a650e1641bfc98776fdbe39cd8a8afe777cf6d8af5c43bd52d0b26f089d59245d30bbb4da64caffdfd68921792d328f32cbd698068febf5a6acea3a02bc8a0 SHA512 63731f3772ec2f8b503824d9d7805d8f087c96f95c37ce15500fb6a528a1d3c09ab95f0d5fb86a6cccbca185a9c666c87a8130676a01e0c887b1ba57216c4b12
 DIST github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz 29495 BLAKE2B f394e50ce58dfb59db8e8ef6364cdf494604cec2e042009a8a72250908102ce31bac173291f9c75ad585cc570fb7635b7146b1ec85daf01899945b5bbe1be621 SHA512 fe3e521365758b42df60acd8d582a080eb4828ef56cd20da57b6041074bc4b7673f01a6ee83d8271abf60609efd0c200149ccd7564da1b3a40bbf3e2c9967e66
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
-DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70
-DIST github.com-mattn-go-runewidth-a9d6d1e4dc51df2130326793d49971f238839169.tar.gz 22882 BLAKE2B 4a9fb7eceb3bc3f32fac8bba304a971ba4387d3bb65799105682236b86a155c6921afb82f542bff4b90378bf6d47823f81a09999642d88b4f5e80521a1329674 SHA512 465b03ab84b9949d392ed8573dabb0b588fb92d410e027f45f4a58d9f9fbb8f9b03e33e5f9ed27f8d34146e9e26cbd8f229caa134278af203daef40859524202
 DIST github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz 22988 BLAKE2B 3fb35426ba8d909d20a1fd939998685efc4b8ae684defe13b27d344350b7de366b05953eecf93ed192263e8d72380c7f4c644334f1192f1482393d8c7390b511 SHA512 1379124ce0f1c83d6677b110ff43ee6b8b003d125b311666de2fc029d25b59ea895dac1bfd812ceb360457379276650f62b8747d9fba15de78f3b57cf7d72af9
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
-DIST github.com-mcuadros-go-version-257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz 12273 BLAKE2B e02e33c32147dcd94129b98b1e4f0e7e2864999844ce1c815e3acf448fb853f1094cc46b81310e2bf54ad2000006884412a72226322fbfa6eb32f1c21592d7e9 SHA512 68c62bd29ae3d1e67b626be39b4af69134ac973d75b880ba935315d4ea1b47769683ba50739b5d65e9a01022e2f9ed0f73a483a6023113eb762667636fe9a190
 DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
 DIST github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz 7591 BLAKE2B a5f8b5f65740ea93f2dcd753567885530c4ec9cde743780e74fe0fe08056f87464f398ee6fba37b26a2d74342d839df45c7fe649f3857018649c86d96c87ec67 SHA512 143b517ef8b5a8bda86dee77b573b12e051816bb6cd0ba962befa3fde4d849a4b95c02c76d36a08209fa29681bbb39fe28a69ba9fb326f218bb4f3ca70350496
-DIST github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz 18394 BLAKE2B 928baf92d3af36498a4fd74f23086dd4d759f72ebcfa18b49cda23e7fff719ae9fdba9576869ddf5e220f8f6cce61a9c5c772d34a0fba1cb96eb6e05dd9b916a SHA512 2b74b167940018f95f1e4767d44ff66d94b4bc8ccd97f98364e06bd1f6bc46006c0acfcd470567b6de8e357009f42e96b9058315cdbaa3254743480d2cbfd35b
-DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
 DIST github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz 18671 BLAKE2B a06836438c27cd4386fe3d2fb234a4ecccbc011fefffb52f9cb71f55443360c186c48e603ae745a6266b7356fbfddd92465f246b73b2bd5b9fe233af979bb552 SHA512 b5740447fa3b81ff8b713f328dbbf866f01527ee71f23141595d0c0f39d865f9ea95a04bac118dc223a3ebfc3ebeb5b8f857fec66f4232ef7da8f292ac8cab59
-DIST github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz 15563 BLAKE2B 18413ac854e81ae19576dd7be5d6e2c09bdb6ec8c2c72770ccf1c3a4bca1d7c4f03065a94fc966a22800102c6aeafc43438c50aa8bd88785849316f2d8a5226b SHA512 f4a77684d2919f48c274df444525772e0714d600fa64523cbe0598ff6294e0806d7ce7cddd34b87b852526c0d7ddf9ac2b65e38ade9de8b86d7cf04165886287
-DIST github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz 15185 BLAKE2B ba0e6cb42e67fddde9d4454c5757128842290daf6356bf44e05112d3759ef9373ae6ac7b82909f3cef7a31ac2b2612fc222861ca3f65190b24f80da9e2e0fa8e SHA512 48aa8d3e5795dc1d16486a1c418b60e51da254091081bc82116a66a7eac277c34814e0d8e598a7946dfbbc851b94a31d6d7e8032eb427bd858a5c3f56d3edbfd
-DIST github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz 16790 BLAKE2B f69ec79cf7e3bfb6d7ee32139db6970b1f45edeb701bdb1b15de48f2a9b33a3eeab003e67e82de2c4b6597af4fd1d94064b7fd7d31b115491216d2e868ba6744 SHA512 697296bda248977a19c573ffe5ab8b2535becaf2d775229bab744b20f931e49ba83743b99201f2ac154ff2f8aab7ff1dae792d09e7be3b1d7e4963b5efffc53c
-DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 BLAKE2B a67162f71bb88ce1100966805ed1ce71a500d3299fef06bce25590b1273b0e47139d952b499535fa3c1627bc5693f3d063f281818096d1520040d44f850ba1cb SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929
 DIST github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz 17378 BLAKE2B 23cf5e288d72278f082e1b533ef8324abc268a317b7c11772af89f964e646b22fa246833eff4d0307a89dc89c0c304e3dcb3e37ac1f3252f7213655acdf887b6 SHA512 9418d06e67a72089f0b35f9f7eb1d0da68ee8c433e4577b798a6ba428233b2f9c3bec5723ed6620c5ed257ccb1a1f32262394f21d4d781c3d56e8b2034ac7111
-DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
 DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
-DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
 DIST github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz 669740 BLAKE2B afecd69c02b30555625e96ae9fde583336620e2ba8129817bf4af60a1db4ce33c630e0d7de47d42996970ec94a781a895ba8a938a3132dca560e8d2c1a0529bd SHA512 5d9da0f1ccb9443e834d32662906c8cda0c4b0a780d61283a433e0a86af97579938ab5814e5c337c3febe57963256db0107564e73884eaf78edb2357fc4eb7b1
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz 56998 BLAKE2B 3971cf040257c6daf6175f25ea01b8026a04b74d5a56dfa0a562fbd6e64ae7111aaf94080c141f2c595ebd38cc3f0611f7f05e419254fc40c63c4493f2a468c7 SHA512 3aa9af45b36d280637231fbab39584542ba0892cc0bab177add01254caf90a49d14c4131249e5615b8035cc61dbaff8b65da27148a1026fb36d32d4ac48dc13f
-DIST github.com-pelletier-go-toml-69d355db5304c0f7f809a2edc054553e7142f016.tar.gz 52209 BLAKE2B 6b4a09ceee871b06beb1a1ad1bb872422fcc5078186b5fe4ac6a2d78a1fa9c0c87c0194f305125831536380bcf28a4a021641010a36b4ced3a621a9a4b08d59d SHA512 5cf649a8c1883ce7c9e189f0518b0b364ecd314f77238783c95cb1a0cfd7c863f7209ea59a346927cc9ea67fc8a4dee77ce5e0248f0e8b0191a8a9097a2d336d
-DIST github.com-pelletier-go-toml-b8b5e7696574464b2f9bf303a7b37781bb52889f.tar.gz 55759 BLAKE2B 9896a0625ad091fa26dc8808324edf1fb66aa542d8acc18c1b1fe9ed8dab6187da71284c519100d8dadbe3c029a79dd2a52f2e2ab58a8e4199f0328c6fa6780f SHA512 cb4a170a9f1601e7a4b1e8a77766eaf9ba5c41dab3434999ce34203945930f5aabc0604494343516b46169406497a0c9daf7902af8237f867612233634be7627
 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-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-DIST github.com-projectcalico-libcalico-go-25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz 196217 BLAKE2B 93c66ef3e4e4c13b7063a369dfa3a48fd94c62f04888238ad0980109f5894f1fd903a34ed959b286d7df81998e23db4a39b2f56ab6e21e4a84f9768b4b20b247 SHA512 15ad47cd54f4424eaf5300094d4b85760d344bf6f10bd01c6a165bc63dacbe09e08bccd727e03dbda9d0fbd00663f51a257a0e49b7fa94ba549d131f5e56c5ca
-DIST github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz 382793 BLAKE2B 39b8355eb1b887328021c6b15c85e3a304e341b52f732b429562a7f0102eff00651091f1978efea0017512538669209e037694093e7482c3d2b2a6a4fbf59b89 SHA512 c411ebaf3c5e6e072b4c3fefac623e5cb7913ee8a58813827c090d1ea388a7b2023d98c56267e8755b2f97359a3c67d241b2e04630d3846cd514162fbcf351bc
-DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d
-DIST github.com-prometheus-common-49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz 59135 BLAKE2B 662b71c56b087e95ebd250c79adf15b7daacc4f48e315af64bdaebc8830e5c24e649af24531a65d5bb907146c91e1676e3af3a7114e11c7a8f5e88dc48a1ecb1 SHA512 5d01ad668eb6a15494fa207e85da558f7f8f1dbc89866db7d0c400ace81fc87b16a7cd105d167c2bd06150c33a356f5fe46d4cadd05d6dd2b3fac1e3c3b988ef
 DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
-DIST github.com-prometheus-procfs-a1dba9ce8baed984a2495b658c82687f8157b98f.tar.gz 31620 BLAKE2B a9c539edddb87109abedd6d7f96ecb382d61420f585a4dbce97edaf67f2032551b468d762dd8c45dc03301e111d0880dac5c435bff5886c090ca9c77e163eff7 SHA512 55993efecd85d2efdfbac030731dc0f4174a76625a66edbea57e0358591b8fd998270961c6801eec6e3cf8fc1d622e5aef1b3d4867258b177359dc353f0d0fbd
 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
 DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
-DIST github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz 26698 BLAKE2B 10f98819cf6e8e64e22ead564d8460414818cdfda5159a3e751a6457e531d8b8c34eee8fad5c35db187d52400a93ec7240bbea8821ac39360708b61940c33fcf SHA512 7152a9e355e21de7980a28e915b712103ae1eaaa4142a5c37db00d8d30415cb2ecacf53bbe178cce49a1b9c4ad57336e8438a40f0bb92dd20a2bcabb1980013b
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz 45193 BLAKE2B 78dd065841571fee60c41a83af08a97478f8a47599eb4e451717a8460856fd20be7732761b8321514993b65477c92492e81eb69d2548bf2468b5e072b2d2d25d SHA512 c1e1e2af81d6474a0404c3d3152b1ba8b89e6f3f90234e2fe869ffad6003f44773ca9411d96e70c959ea8a5ac9d8ff8fb11360edda71eea2e4de96b815e06d51
-DIST github.com-spf13-afero-8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz 43475 BLAKE2B 024f8754e4ef6af0a2fd8ce274e82ab46c12ac4b81ebbfd5c93c1c44327ead58bf71242714eebaaca5f2adafed63ebf112ad5b2eae125895514bffe8e21b117c SHA512 900ce0ed04dab86bc7f33a0ec94f2b49a7d91dd1bbca65a6be50bd4575ff1ad5fcbb4f02bb0fb0b7b2d1b2473b3e6512fe5f8c877947c11819a4aa5d763a6d2c
-DIST github.com-spf13-afero-9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz 40637 BLAKE2B a430abade09ff9dc46d9ab8f59d6ae6af7fb469c12ebf6659927a070d3e2a353a2fecfa332fe29dfa0727573f9da02c6e26f48b39eb6b4b3cfcdd40d172164c1 SHA512 098a94d3c143170c2e06836c5f975acc49ec39c4225e6f4fd258648febe91ee4bb69ffe3ce9be53873184aaf7c34c5afcd2ad56969f576ada075f46cd8e8f66a
 DIST github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz 9864 BLAKE2B e2bca43b06e8cedc63504b716f052ae5d6da90d2336372bdcf1c7bd456e8e60c9f830fa1da6cc6602b4355196c8c0e74e480f55020ead5706f3e0bead1cba08d SHA512 96ed2d94c7e970c9894751245fe4a0b17b6fa2f0fc524d3c8a05463dc5bf81d48bba4d01c0c742ca492f756fd6f21034c2cd1be44047d79f7ab87d2e4c76f1d7
-DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
-DIST github.com-spf13-jwalterweatherman-0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz 6340 BLAKE2B 85eb5f272705f860932e6c25e3783cf40a126bac57cf43e38cf502333b3e8f9e6e915c2ab8b1ceac41275634a05f05e89513f2bad2177823f15a6f2eeaa9c092 SHA512 e994187443d8c4f05e9864a9c6db52847f3459d4afb1b094bfd9ab6d9d374856028319f7b8a99e2483242a2decc6432e8fd85cb567b4f6dc76dc700900eb5ca1
-DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
 DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
-DIST github.com-spf13-pflag-08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz 28833 BLAKE2B 882202f5b6d96a2bfdeaf0723d782d08b96fb4afdf41786217a085e8941b0a1326ef8fa643c72e61346b335985c0bc6cfb88eceef284b43c96532f6ccbc677e2 SHA512 5bd4af9e36625b508b106ddc288c09d65735875fcb6a0235ab9eef99958fe4b4666037b63faab74c63a76bb7f4eb2ca2f60d53ece71e695bf6d73ce818c2bed3
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz 32109 BLAKE2B 3d1f8c8d943766a7b7402f30ce80fe78a96b8455f901b6c3dab786682c84ba3a7515e62b1f62f5124564f6ea664abea1e2f77685e259f5e31db3241aeb89c826 SHA512 18fd5063350bec742ec85d7299c678d825be9f6745990264fe98c6b874ab3abe9bc478fb97059b2e675b78dc5bc3f12fc9ae65ce9e7c170f8abf9498b6e78071
-DIST github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz 32229 BLAKE2B 95b1ed58026f177674a452e531ad445582a8cdafc1e86293918e3b8a8e81f71644b66873c621621655eb87c0cfb67f8e2b089b02bb74bdb30a714b92fdae0cc3 SHA512 004f7cb37ce692cb86b3f793afe5ade9dd478ffdceb23ac8da667c626539503e199f424d6b3183c8907257186eb1a16552ba36979bcdaf363482a6f19cc98d89
-DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
-DIST github.com-spf13-viper-8dc2790b029dc41e2b8ff772c63c26adbb1db70d.tar.gz 32064 BLAKE2B d80eae5064164c160d75a8c1fadbffb0a90e30446ff887c422685a5ca179ff7d14e4c3630c1cac0a93e71749180e3257e7b5079a40f71391500198a483bf261e SHA512 457a307ad389f7deaee7fc547376fdf618509460f57aa304fd144181c8138207703864e036615426e64cbe3d39735a38053c9e2401f026e081ac669edf00f4a8
-DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 BLAKE2B cb880cb4ffd844c5dc86cfa2b1aee79b6ca7c7f527d3331b1bd8a85860cef203c6f4d4a85cbd6c55b3c160e2e121cf69c84de97fb77e3db0028662c15b7cc335 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2
 DIST github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz 3684 BLAKE2B 92a9f37acc2c3f497c432be4519edc02db7d5bb371309183a3a52034cf12e4626b8b018f7b17e3128a406edbce24db1d2c5a0176f8221907c27f198696a2d737 SHA512 b007be79389160c27a602f4ec35a969a408abb340ab9b3bd8f44578a6dd9ac95fcede4edc56b1c1c7a2a9f258c5cb448cda54bc91d6dd17f0464cb050b946769
-DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
-DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 BLAKE2B e0016e5a663157383ca37a99c32a1da395a9e6e53536acc6f03f25d9d347f1c4d8d1d00c8cfb02ba4f8ce69a5f7c06d9440fc177bd88e599678d67c18415cb82 SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
-EBUILD calicoctl-1.5.0.ebuild 4548 BLAKE2B 552ba00a20c61cf2ceab79df6659e401da2d6d6028e41b9e079ed77c4ab3cc8148327879071b80462ccedf35ef6056ccc3f9462566c2a8e7e23b35ca753962d5 SHA512 d4f7b1c9440797478d7253f1e73d52c0e7b93520b11cac134c4840b73912ab4945aa48643c278a970bce924354d31df0c768c6fffd725cafa669d1bb5391a53c
-EBUILD calicoctl-2.0.0.ebuild 7370 BLAKE2B 521081083aacd60a72b6c1a18b1d37d9de8a7447f38ca6b12417a884df9a64cbfde747a3461eea18cd8fa88fcd8750dabeec7bc636f3bc3a21f1a443415aa476 SHA512 24f4c1c654d3d6416b730e6bfba3dbceb55733c2795afb22ec0c151f862d9f5f9f496915f64531851b3683a4cc502a158bb62823189bfe9349750fc47dc20961
-EBUILD calicoctl-3.1.0.ebuild 7470 BLAKE2B f94887743cecbd2314584f534514f0520fa13c88aab9314c4e061465a976b4f3564e3e0e7d66aba8642d9f4402dd01a8e52d2037da99d87d1d8988e11dddb6e5 SHA512 01746b4b4226c4ffff1571e110340ed807af89e2b2c7e8cfc2fbe6f4229258c1884ae1f9c2a6e3ca13cd0944c78e1dd893d90c2813e91d2b3114505b6ae257fa
 EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
 MISC metadata.xml 255 BLAKE2B 327b939e3f064ebf891076936ec8505f1c4c0aa4651c7afb71b78803ab7088b8212357e1c97295dbd51c7da2ea9bd5cbe1b6082b626d1b6b58c46368c05842a9 SHA512 b2eca26fa24e481e0129a8a44bea385892fa08b2c0997ac719bbfbe4119cb3c2b8a8ea36e4d714cf0143b18e3b1646f9408d4d668d1b7444519b8aed7541ee25
diff --git a/net-misc/calicoctl/calicoctl-1.5.0.ebuild b/net-misc/calicoctl/calicoctl-1.5.0.ebuild
deleted file mode 100644
index 45eb88efab70..000000000000
--- a/net-misc/calicoctl/calicoctl-1.5.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-	"github.com/mcuadros/go-version 257f7b9a7d87427c8d7f89469a5958d57f8abd7c"
-	"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
-	"github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
-	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-	"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
-	"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-	"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
-	"github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98"
-	"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-	"github.com/influxdata/influxdb 392fa03cf3cc98b78e606c34996976cea65b6814"
-	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-	"github.com/projectcalico/libcalico-go 25a8c377d7b3299a50197a92704d606f5f5ca691"
-	"github.com/coreos/etcd 17ae440991da3bdb2df4309936dd2074f66ec394"
-	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-	"github.com/coreos/go-semver 568e959cd89871e61434c1143528d9162da89ef2"
-	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
-	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/hashicorp/hcl 392dba7d905ed5d04a5794ba89f558b27e2ba1ca"
-	"github.com/magiconair/properties be5ece7dd465ab0765a9682137865547526d1dfb"
-	"github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4"
-	"github.com/pelletier/go-toml 69d355db5304c0f7f809a2edc054553e7142f016"
-	"github.com/spf13/afero 9be650865eab0c12963d8753212f4f9c66cdcf12"
-	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-	"github.com/spf13/jwalterweatherman 0efa5202c04663c757d84f90f5219c1250baf94f"
-	"github.com/spf13/pflag 08b1a584251b5b62f458943640fc8ebd4d50aaa5"
-	"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
-	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
-	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
-	"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-	"golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d github.com/golang/net"
-	"golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 github.com/golang/sys"
-	"golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 github.com/golang/text"
-	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-	"google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
-	"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
-	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-	"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go"
-	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery")
-
-inherit golang-vcs-snapshot
-
-CALICOCTL_COMMIT="118b8ae1cbfb852f387c9066b5ae27633593a99f"
-
-KEYWORDS="~amd64"
-DESCRIPTION="CLI to manage Calico network and security policy"
-EGO_PN="github.com/projectcalico/calicoctl"
-HOMEPAGE="https://github.com/projectcalico/calicoctl"
-MY_PV=${PV/_/-}
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
-		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "dist/${PN}"
-	dodoc README.md
-}
diff --git a/net-misc/calicoctl/calicoctl-2.0.0.ebuild b/net-misc/calicoctl/calicoctl-2.0.0.ebuild
deleted file mode 100644
index bd03e1baea07..000000000000
--- a/net-misc/calicoctl/calicoctl-2.0.0.ebuild
+++ /dev/null
@@ -1,122 +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/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/coreos/etcd bb66589f8cf18960c7f3d56b1b83753caeed9c7a"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go d2709f9f1f31ebcda9651b03077758c1f3a0018c"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
-"github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"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 c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/influxdata/influxdb b287c191f362e7313aae0fa08c19b787076ad530"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
-"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-"github.com/olekukonko/tablewriter 65fec0d89a572b4367094e2058d3ebe667de3b60"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega c893efa28eb45626cdaa76c9f653b62488858837"
-"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/pelletier/go-toml b8b5e7696574464b2f9bf303a7b37781bb52889f"
-"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/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 49fee292b27bfff7f354ee0f64e1bc4850462edf"
-"github.com/prometheus/procfs a1dba9ce8baed984a2495b658c82687f8157b98f"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/afero 8d919cbe7e2627e417f3e45c3c0e489a5b7e2536"
-"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/spf13/viper 1a0c4a370c3e8286b835467d2dfcdaf636c3538b"
-"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 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/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-"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
-
-CALICOCTL_COMMIT="8006d58068c2a81d23977670e0c6061d959ba32c"
-
-KEYWORDS="~amd64"
-DESCRIPTION="CLI to manage Calico network and security policy"
-EGO_PN="github.com/projectcalico/calicoctl"
-HOMEPAGE="https://github.com/projectcalico/calicoctl"
-MY_PV=${PV/_/-}
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
-		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "dist/${PN}"
-	dodoc README.md
-}
diff --git a/net-misc/calicoctl/calicoctl-3.1.0.ebuild b/net-misc/calicoctl/calicoctl-3.1.0.ebuild
deleted file mode 100644
index 9bd762db595e..000000000000
--- a/net-misc/calicoctl/calicoctl-3.1.0.ebuild
+++ /dev/null
@@ -1,123 +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/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go d2709f9f1f31ebcda9651b03077758c1f3a0018c"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
-"github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"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 c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/influxdata/influxdb 38d2d29f79f249b4f7647b441355cbc03e9fec1a"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/magiconair/properties 2c9e9502788518c97fe44e8955cd069417ee89df"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/mattn/go-runewidth a9d6d1e4dc51df2130326793d49971f238839169"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
-"github.com/mitchellh/mapstructure 00c29f56e2386353d58c599509e8dc3801b0d716"
-"github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/pelletier/go-toml 66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"
-"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 ae021117ebb7c4d8067ea079706b718c6a88eb7f"
-"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/afero 63644898a8da0bc22138abf860edaf5277b6102e"
-"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
-"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/spf13/viper 8dc2790b029dc41e2b8ff772c63c26adbb1db70d"
-"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"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 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4 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/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd github.com/kubernetes/api"
-"k8s.io/apimachinery ab7fc865fb0881d161f37adef3e5a67b89a18d05 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
-
-CALICOCTL_COMMIT="a09fa70e0c24519356d0b619dc4c931c6e4fa735"
-
-KEYWORDS="~amd64"
-DESCRIPTION="CLI to manage Calico network and security policy"
-EGO_PN="github.com/projectcalico/calicoctl"
-HOMEPAGE="https://github.com/projectcalico/calicoctl"
-MY_PV=${PV/_/-}
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
-		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "dist/${PN}"
-	dodoc README.md
-}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 08e4a9ea6105..eaebca8b9c2f 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -3,9 +3,7 @@ AUX chrome-remote-desktop.conf.d 579 BLAKE2B 30b23526aa888ffeaa4b4e3bb7ae642e550
 AUX chrome-remote-desktop.rc 1388 BLAKE2B 937378e8ad7bb295333dc537a9c333e1a1041a75333de142c8b2299ea1c2cd9c2deb82bdac7e49e075996d30c96c1cfccb7edf130c922491edbfd164ad1b77b1 SHA512 f5d0755bfa337b7f3bf7b9d58cd9bd820404e1257e2d64cf74a073afece6af4dcb00a46ee2192087870eadd768b85a0b5ebd2b50223f13d105496a3902d094c2
 DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 BLAKE2B 03725450590fad81105ae5314f9a1c9c9acc1b3f2d294ee1401379c264d59d737c2c39333ab5cb7a77e5885855ca484db360f0936be6c5bc2c84aa0cb38afe72 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330
 DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 BLAKE2B 7f86e734fdc9c95f8820912aa075d4be805896f4f045ba39fb1fedc9ba6e3b576d71ce67692f683009ff005c2c248ed067ef4980906ae9e158c107aa96b58470 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8
-DIST chrome-remote-desktop_57.0.2987.37_amd64.deb 15677362 BLAKE2B aa92ef2a6c89043ff7e1a39c186edc57dabd9b5a629391aa0603f51b527131a94cea501a9929a5cacd951b8204959ed93203b81bdadf677af5d937774d110f69 SHA512 df470d9f69545dd2793b5d97674bb8724f5ad3dfad05b4d5572b01a21443d79e6776fb72ca14044d7ee00660b7d040023c9716e2568551e2862bdfd3cff99d88
 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 4080 BLAKE2B a0e1646c93031ae3a09b9bbd4e2ec2935498c9104354a8656acff039e1b726b222563e4c7385b44018f5bf974b4359ad68a19b285ecf5de854ff7d4592696f46 SHA512 26c40842a4d067e6690baccc0126379292dc2cfd6b555043fd961cd4152b69bfef7ff33841e5beebad3b0b05f0b926d2633b5b3f420fa880763fd5fe56b50874
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
deleted file mode 100644
index fc00cdec2c72..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PLOCALES=(
-	am ar bg bn ca cs da de el en-GB en es-419 es et fa fil fi fr gu he hi hr
-	hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw
-	ta te th tr uk vi zh-CN zh-TW
-)
-
-inherit unpacker eutils python-single-r1 l10n
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="${PLOCALES[*]/#/l10n_}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
-	${PYTHON_DEPS}
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/psutil
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
-	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
-}
-
-src_install() {
-	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
-	rm -f fake-bidi.pak
-	local l
-	for l in "${PLOCALES[@]}" ; do
-		use "l10n_${l}" || rm -f "${l}.pak"
-	done
-	popd >/dev/null
-
-	insinto /etc
-	doins -r etc/opt
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
-		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
-		elog "    (d) run start-host again, and past the code when asked for an authorization code"
-		elog "    (e) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest
index a962a19ca198..b9953a5a5cf0 100644
--- a/net-misc/crossbar/Manifest
+++ b/net-misc/crossbar/Manifest
@@ -13,4 +13,4 @@ EBUILD crossbar-17.6.1_p3-r1.ebuild 6033 BLAKE2B f4ac47903acc228320c224a18c832f9
 EBUILD crossbar-17.8.1.ebuild 6435 BLAKE2B d2e41ff6f90579d152334152cb42cf50e3e48dd9b198642aa0a36f738797edec812f4fe51b311871e207022e4b2897c48bb958483f2d4f17c895468a8e287eef SHA512 b440f74d45b22312f5a97304d40dc4c2d36a534202de19e15a20698f8be5faaea85c31b05309a45116820c9d26f25819135e5613483486ec73567f51e5772364
 EBUILD crossbar-17.9.1.ebuild 6385 BLAKE2B 5e6e26cc376fe091a5ad2fced8cb2ccdcc8ef30a2581816468744325e616ed7c6847bbb905457b9ee811689385a79e2313a68bd11db0a1071b107b318a616339 SHA512 0dcb2623777b352e0f168a0c59fef1b50d441c7fa486ba1bbe81a2152e39e68d5a633b3fdf6948985d95b4579068ef0e062ea99f269ca546312593f622d464ac
 EBUILD crossbar-18.3.1.ebuild 6337 BLAKE2B e1e3cfab199e176033b539881e977cc40c63431b1a83fbf5708876234e3c5b72335cc08231e990f0c1399c57f9ade92546326b1e87659eace7eba0f733682446 SHA512 896b8831d12986807f355e7172738fb0e69c0ddccabd29ebb1c65dc783ce1837006c521537b939500aa22e8ad2b17be32db81cc571bad2631daa8a647fb7d353
-MISC metadata.xml 861 BLAKE2B acef636c9c51de3530425dcf3ab31afe8300c3fcbe1615d374c52610647086324887e2fb97b7a2fc9aeae73c48f5742b67ee9190abab5b01f3f7e762ae286851 SHA512 90ce37e4764583a09f90e99c7010de5c1f2abff6837cef4255eee5d83f7d9de2f641812700fa180cdb0e0511d401cb1e160a721600efabc787fc2a32ac0b83bc
+MISC metadata.xml 811 BLAKE2B 689aebe79e9e10ec110a4a5327245d727e3c6bb2e8e8dd3b0b07fefd8ab0032ec85a061309fc8fa8452e0c795c0a2fefed6ebd0091868c3815ab23d0e4a27c50 SHA512 f48554a367ca9b99176b6b3ed9b7322fd60ef4fe6ca78584263411a8e59fc9e89bccbca4c9484b1d267ed534ba6bab05750164f4802709795e1505e4ef276a41
diff --git a/net-misc/crossbar/metadata.xml b/net-misc/crossbar/metadata.xml
index 53363da49379..d9d6f959b0b7 100644
--- a/net-misc/crossbar/metadata.xml
+++ b/net-misc/crossbar/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<name>Crossbar.io Technologies GmbH</name>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 17b405c31d07..13e471845f1d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,14 +1,10 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53bf45b4f0c98edd78daa309877e1856e1253a3582b3db35d2ae877af5aeedf2fb2741bfd8faed3bc4525880581 SHA512 058da4c63a05f704de475271f37fb99ca90a67a919b168e07958ed45d10cb3d03898ea6e3452ffb1a1f1e5dd5915f08a2993024b12233919f3c46c036b9c07e3
-DIST curl-7.64.1.tar.bz2 3000536 BLAKE2B 787b9f9662dad4e3497357dc3f9cff0fb2c997e2603cf3c621633d9983fd011c346640be5227ddc4b363bdb7e1a64532a44ae9d5ccc27e405275e08f150d63fa SHA512 e04532d68896b79f28aea3b30aec2d5b53076d0d27c8f6404769618300828eed96633e7bd5945125bca76241bb1e169f5002ac9566108bcaddc8c51b513106b6
 DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5
-DIST curl-7.65.1.tar.xz 2392672 BLAKE2B 96519ad3b342944d2e6ae645a8435ba902e319830a95a2f873f4ab71cf2585daf98b5e44509dd394eaa6db71ac3d2cc6dd9e45deead7021e5d2e96db5de295ab SHA512 aba2d979a416d14a0f0852d595665e49fc4f7bff3bee31f3a52b90ba9dc5ffdb09c092777f124215470b72c47ebca7ddb47844cbf5c0e9142099272b6ac55df4
 DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be70740119879beeb08ff2a6ace7737efe1fb6d96ecaacaf8f90dc0142ceede2b90c84275ea8f72bcd09f21dba SHA512 fc4f041d3d6682378ce9eef2c6081e6ad83bb2502ea4c992c760266584c09e9ebca7c6d35958bd32a888702d9308cbce7aef69c431f97994107d7ff6b953941b
-EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
-EBUILD curl-7.64.1.ebuild 6976 BLAKE2B 703d33296158e3e7514588080c11308926d9ae246c416e993a23e623ea6c846e8ad50dff2624e4c9e7d2c228dd165716909c009a5f9a11243589f13d19dfa499 SHA512 5eac3bf04054a2b7bceb22a7840cad1b6c04743bf02d468e5ae9789318f3dd087ae0f8dd3dc6da0ce23c48261cb62d756c1b75cb92cc83f9ea22d21bfb0b4052
+DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
 EBUILD curl-7.65.0.ebuild 6975 BLAKE2B 3ba830aa65b0c9e98f5128289a7c8cef5c3cbc2ee91881f47bb9318c2fe82f5121942c4263cbcef5d6ab26c602e4a2b1ffca795e8253800c5318a3c4f6c16f23 SHA512 fef5557f9175b3a8c6240e6a89dfb994412948a6e44ec356e308f4fdafd0362df2f63400048c9ea0d6cece07240370965ba51d39424c3014ee761db1d799bc15
-EBUILD curl-7.65.1.ebuild 6986 BLAKE2B b060aef8e919418996ed1815507b500c93dfb886565e184414ce968515f5ef8316cafb4232228fa6b3466583adc613f1fd6f55e83580d64862aff4e94c84fdad SHA512 ea65a7aaa2ba8b3f2931a4726cb3756fe14adcb8a44293ca3bd09d4b2482c272470e5f7b89f818a9a88866e81b1602049a0cd34678f7a4599c0705b383d3ae3b
 EBUILD curl-7.65.3.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
+EBUILD curl-7.66.0.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
 MISC metadata.xml 963 BLAKE2B 5bec839fdacef23398bbdf097aa8d25dae2579501d2f4a385c251ff4b37e246bb762c30ebc5f24e0fdafc65a11ff7a58406777f44071b10f43203ea6c68a5508 SHA512 d70b0f5aee074f53272cd6292503f4705142d4e9cc274e4e13228dda30bd6357618af3b70601ef9624bf98522525cde011d6c756faf24563cbf8953f9683400d
diff --git a/net-misc/curl/curl-7.64.0.ebuild b/net-misc/curl/curl-7.64.0.ebuild
deleted file mode 100644
index c648fbabaec8..000000000000
--- a/net-misc/curl/curl-7.64.0.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.64.1.ebuild b/net-misc/curl/curl-7.64.1.ebuild
deleted file mode 100644
index fd9bb539f92e..000000000000
--- a/net-misc/curl/curl-7.64.1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-alt-svc \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-amissl \
-		--without-cyassl \
-		--without-darwinssl \
-		--without-fish-functions-dir \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-secure-transport \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.65.1.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 3c1b6b01820d..85324e17a3e7 100644
--- a/net-misc/curl/curl-7.65.1.ebuild
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
 
@@ -150,6 +150,7 @@ multilib_src_configure() {
 	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
 	# 3) --with/without options third.
 	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
 	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-alt-svc \
@@ -174,11 +175,18 @@ multilib_src_configure() {
 		--enable-tls-srp \
 		$(use_enable adns ares) \
 		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
 		--enable-hidden-symbols \
+		--enable-http-auth \
 		$(use_enable ipv6) \
 		--enable-largefile \
 		--without-libpsl \
 		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
 		--enable-proxy \
 		--disable-sspi \
 		$(use_enable static-libs static) \
diff --git a/net-misc/dhcpd-pools/Manifest b/net-misc/dhcpd-pools/Manifest
index dd6a4f64e9e2..f74c43c92e84 100644
--- a/net-misc/dhcpd-pools/Manifest
+++ b/net-misc/dhcpd-pools/Manifest
@@ -1,3 +1,3 @@
 DIST dhcpd-pools-2.21.tar.xz 544940 BLAKE2B 22c6fd4f461480f95b0671309389dd90a5d1ae6cc64e1a61a6c450f1a861855b682a8c276ebc4517cf627ca7cb435cf6f4917d25c86c3bc40396b92ad8ae156d SHA512 33c89dd7eb23b3df6e454cd75051f3d842cc265e8596f5657a9e72ae485befbe78655eb682cab10c14973286b85f2b174c2f23b88c5142b63589ca9ec0a9d975
 EBUILD dhcpd-pools-2.21.ebuild 466 BLAKE2B d9070f585907274444d3266eb8cf87e993883757bafbf5afe0216bb355d3c0ce968dd0f08eb4f276c6b703677259ba21f858e2ecf04f300eb28a1bbb4f7be6f5 SHA512 5af5975d4ee19f1127834f3757efbd6938776694f56f20622c4d7689c65f88c1a7b05cc7248ccca0b70558e688312cbe6a3e3465961a8cbb312948cb30d68269
-MISC metadata.xml 328 BLAKE2B b32035d6f000ac6b66930a548b0df67027579d632b605266f2aa70c104b341de667b8f5a3c119288669283db3e21839d678c550ebcc0e0119805bc78d4dd31eb SHA512 19d9fe46aaa5e2e71587e28bc964194f6699b36782588cb384290646b208941320afc00512082bd216f43370a7df5313e96a99783c843d12c6f53f813875744f
+MISC metadata.xml 248 BLAKE2B 08f96609f1f2f9710137b80ba66301f51be6775ad5a8d0325485cbf61d5fe5cdcf7d8fa7a3883e95747f859f453fdbac7d96c87f6a5898c3c6c7917a434dee52 SHA512 fa1880b28830d7288b9905ffba62f3aed001698fcf05b86e8eb66683008f60d3451b1e8d749faf6acab2acfa0ea3641ec232171e903fdd20dfc04f2f6903f4cc
diff --git a/net-misc/dhcpd-pools/metadata.xml b/net-misc/dhcpd-pools/metadata.xml
index 8577945b03ba..dbb5930ad32a 100644
--- a/net-misc/dhcpd-pools/metadata.xml
+++ b/net-misc/dhcpd-pools/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">dhcpd-pools</remote-id>
 	</upstream>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 5a96691f3448..3afbe890e435 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,11 +1,5 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
-AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
-DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
 DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6
-EBUILD electrum-3.3.4.ebuild 4638 BLAKE2B 6c7e2c95d7be76e496d49aea1e2b6ac691c2b72336f155cda5643824ccdb51ee27f7c5c8a15d90fc1d464de0e8e504ffe0efbe1c3c652101efc611bf3fa520ab SHA512 60c252dbb9ac4c8f2f31713c1c4ff7086c6c62193fc59f000ab4a0e7b7ea7523b30587bf78318d80e950d28fd07574f414211e0b126cf0ecb8fc97aaab8d4ee3
-EBUILD electrum-3.3.6-r2.ebuild 4483 BLAKE2B e091135eb705c26e15822a0368d8523464ca973e4822c531c1ac7c1f023b97c365808a685610239add5b6365c4e8ea13664e2451c6f23a4e85be8128bfd9dc5d SHA512 1a2ef4689c4e786e20a56f288778ea6eef9557cdbc4955ca029782cfa67951b0eef8bc1cf9528b60cf23c5a1a9cd802c36f19ed001545deb93a05d1f5624b77d
-EBUILD electrum-3.3.6-r3.ebuild 1985 BLAKE2B 0c7ce770601e51f7acd6486ace1b16391db55837f37bec1efccc5ce9790afa5ef5cf6a4262c3b0775cd5dda6de9f335d44c8e16e27109dff74a59416219955e1 SHA512 e01f79da37cf2050992a21e4ed5c215c2d2bd7cc4074f50e70293fe6c174f0c34816ac2758d7bf2b3554d6fb5c76d779b2cf8b359320d8a1439565455a8ff14c
-EBUILD electrum-3.3.8.ebuild 1984 BLAKE2B 7b21baafee7ecd511fb62cf5966b094b24d1c7ae6bc22d160301c168ce9ad68a539f38f18574f01b7b079d60d102ea6e99feab200e21f361824e2ae697722f8c SHA512 3186355d2502da16753b69d0ad9481b92c9c330ec20dc3199f6be00ec0710eb1a492e114c546418cbf84a855cc67e280fb4069b95373242a13f55db380db1c8f
-MISC metadata.xml 1572 BLAKE2B 4681012dbca54a822c32dcbb5eab12718294c138343ac2469426678a85647dedc892a14e2287d0aaf2291e9d9b029796a29f32f6ae82ac6b56d7a9acb49295f3 SHA512 83bedb1cbb9c5260c7260b7e83c2105742c0403ceafae9857b4491abfd070ec3248f918d3a11bb7c93973714fb46af3864bdd85075d075bfb94f2ec6b9aca82b
+EBUILD electrum-3.3.8.ebuild 1982 BLAKE2B c1db2a13135b445b0ffd37779025868fc2446039a527988052d10dd48e0e5fff86e0e04f6373ff4d12a3e0946493c1496677404e8b35643a1847da149cf2db9d SHA512 9f9844b2ca4b8a76d3de83684860c9f840d4da10787478c579d3cebc1d026c8d4989ec0ce8de0a976d46771597723653485604d4eb85427987cba2c3364f3e61
+MISC metadata.xml 629 BLAKE2B f1a4cf6cae2c3471b946b9a2966b0b3c8e7c2d39ce124fc100142b5d79d27377939094bb5b3ae9a7ff6c947b93ce12a38e3075e77110f1cad9a246e03159fed6 SHA512 c8e37976ca6a16a8d7f2326ff6d276814b5c4f5b7c1f39becb7a800f10b0c6aa7333d15f0d208a1ffd592b46db887dc77e95ffb5d1e01eea1ebfe6c478c8dfc6
diff --git a/net-misc/electrum/electrum-3.3.4.ebuild b/net-misc/electrum/electrum-3.3.4.ebuild
deleted file mode 100644
index 72ad9942454a..000000000000
--- a/net-misc/electrum/electrum-3.3.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	dev-python/aiorpcX[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "${PN}/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "${PN}/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm ${PN}/gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex coldcard        '' coldcard             ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex safe_t          '' safe_t               ) \
-		$(usex sync            '' labels               ) \
-		$(usex revealer        '' revealer             ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r ${PN}/plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.3.6-r2.ebuild b/net-misc/electrum/electrum-3.3.6-r2.ebuild
deleted file mode 100644
index a66c1036b967..000000000000
--- a/net-misc/electrum/electrum-3.3.6-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "${PN}/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "${PN}/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm ${PN}/gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex !qt5     qt   '')  \
-	; do
-		sed -i -e "/electrum\.gui\.${gui}/d" setup.py || die
-	done
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex coldcard        '' coldcard             ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex safe_t          '' safe_t               ) \
-		$(usex sync            '' labels               ) \
-		$(usex revealer        '' revealer             ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r ${PN}/plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.3.6-r3.ebuild b/net-misc/electrum/electrum-3.3.6-r3.ebuild
deleted file mode 100644
index 06e13125923f..000000000000
--- a/net-misc/electrum/electrum-3.3.6-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.3.8.ebuild b/net-misc/electrum/electrum-3.3.8.ebuild
index 3a3dda96aa67..21549110f526 100644
--- a/net-misc/electrum/electrum-3.3.8.ebuild
+++ b/net-misc/electrum/electrum-3.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 
 REQUIRED_USE="|| ( cli ncurses qt5 )"
diff --git a/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch
deleted file mode 100644
index 6d62f5675764..000000000000
--- a/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/setup.py b/setup.py
---- a/setup.py	2018-09-17 12:56:34.000000000 +0100
-+++ b/setup.py	2018-10-14 14:46:16.524385198 +0100
-@@ -72,7 +72,6 @@
-     name="Electrum",
-     version=version.ELECTRUM_VERSION,
-     install_requires=requirements,
--    extras_require=extras_require,
-     packages=[
-         'electrum',
-         'electrum.gui',
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 4f3345beaed9..f341e55ffeb6 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -15,17 +15,6 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
-		<flag name="audio_modem">Enable plugin to support Audio Modem</flag>
-		<flag name="coldcard">Enable plugin to support Coldcard Hardware Wallet</flag>
-		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
-		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
-		<flag name="email">Enable plugin to support emailing invoices</flag>
-		<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
-		<flag name="revealer">Enable revealer plugin for extra security. https://revealer.cc/</flag>
-		<flag name="safe_t">Enable plugin to support Safe-T mini Wallet</flag>
-		<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
-		<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
-		<flag name="vkb">Enable plugin for virtual keyboard</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 493c18b04897..cc87e7761f20 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -1,7 +1,5 @@
 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.1.0.tar.gz 465717 BLAKE2B 07df31c230a377cc8f9f46a5c6d49ff98fb4292bada3713aaa71a73b309d2a661c9a0904cb67897ceafa767fc38ad8fc53cfdb6048e4d92a02ea08c005e8f88a SHA512 1633b9748334bb7e9044554c258130037bbffea5ca132235cb63cb061c3fd5b17f143cb85b815e321c936f31e501e2b4e089c896b1a9a5b5765e3cf354041170
 DIST felix-3.1.3.tar.gz 467553 BLAKE2B 80fc599d5b2d6f57a251b6d679cd7b3ea461827e8f37fd3c798f1b8bbfd319449d037c0a5a6b7dcc77594a8f557897f7a228567fca8f95c00c028a8c4433e425 SHA512 2ba79babd27016a83ad525611917f1ed43707ccbdfda80bf40973698ac343255896aa978a38be58b58e13ecf6956a028caa5c2d0f1cbbef8a088961f449646ff
 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
@@ -10,43 +8,29 @@ 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-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-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
-DIST github.com-coreos-pkg-fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz 30353 BLAKE2B 5dc99a86cb95a8336c05380b0895844d27b79ad6c6e0d1223a3ec25f9cd5a39f0374c5826ff5a97c0472ea4538ad427997c95eea075feefa0a7703224e6a5035 SHA512 f1247031ebd00d6b5c5039dd3e66734035c761c39f7a7f333727248a9a78894b121f1cd18d06c58965292e9b95db2369219adeaf3bf0c63efbc90a6a6004b04b
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
 DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
 DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391
 DIST github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz 74285 BLAKE2B f2fe94848736a4f798e3ea31bc8a4e7259c11da56ab2811f47faf0d510ea66888e18ea9b805aa51b58f356809c3208dfd39be075b06811d0d40d1d289808709d SHA512 2ecce57da67d149e3329d76b6f811097760c42de3346c4353b1932af293cef32cb5b9913ec385619e932e632416f44b878aa621665a4cd6db0293e951ee2bb97
 DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6
-DIST github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz 5945 BLAKE2B c57ad94b089601faeaab532e503a73fe1868cc5d165c7594e96bad34b5e2ee474ba9ff59418ab8b4c7e877cb3ec59d54114711304a797c712468a20f14aa8e4d SHA512 b736e2f99b44ecf3876faf1243374885048084ea61786e77bc17a866f2f27ac14dc3b4d032e5968489a08044321ef32b0bca020db453a6315e3696e063b6bf11
 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-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz 34203 BLAKE2B 8eda5e022be1507d92f17ef3d2ca9f02df7a63d4bdae14d3486af05981d4007be0f32d1930341d5a724d20fd6f37d19dbfa9f1a703c14a86923f2940a5b3e2a6 SHA512 fdeb9b80afb13697b9b3084ea17e92fe2c528fec57bc4a18beafa18160201c94a9e31f85751d8eac836f2e41f818e547f5f2038c3a001c3f91a1187e1ba7846f
-DIST github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz 38030 BLAKE2B b7fd1f9a6f028a68b07ad71c2edaae3050dda90585053273ac8112e9fbcbc66af7cfe675687ff52dc5dbe16c3567b4cbae8ea902066ad4122b9f7e4e36a17a78 SHA512 9de56f22a8b4ffcc8d64ebba79e2a4aac796f4d2edf475dc506a45e155a3a5bd27bf4dc7c7b5745be585ae69f3ba1394d1f6f14812b7c3a338125a5b0c315b40
-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
 DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
 DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
-DIST github.com-go-playground-validator-5f1438d3fca68893a817e4a66806cea46a9e4ebf.tar.gz 61584 BLAKE2B d07460bbad50eeb4ece9c25dec0a0074d730a32d9c340ea42bf33b72c8b1175555df38d1af273c9547f02cd2a826888bfec71efb3f46c4474ffcd896b1caf4e8 SHA512 86721164b62d3bda80683bbfe578e48e5842cf10ea9236fe56b2db49617afe17a5faa6b85b7be87be34d4a77c3acdf6de6d200e3176a5a46f8b929546602622d
 DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6
 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-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
 DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz 1611750 BLAKE2B 510395566152cfb558ad71d8c5e9ad5821948265d58bf6e7943fc4889e92b6a6c95f627feab2750c119d5b303588152772cc5005e0d83fdfdba96256f7c513c5 SHA512 21ef1940bc1f1f854fa9497eb27a87b554e38d608e1ce5e0884fbf7203591f2fd52127062e85c50cbd366edceecbd226d4f75e96bb0014603200ada7d268abd5
-DIST github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz 1456586 BLAKE2B bdcbb114281611c90e441ab14786336f6352818fa766b6f3f8c62a6988fed3923dee618005cde1e17799272192cb06d1a8a176abfd3504bd7616e3596dd3345b SHA512 30a455f428011f4ab6b6528c8b3d882ed988d43f9e08cda3730b56b3174e674330df9610c48d839f81ec564a03cce5ffad60aed652cd04159a24b999750d81c1
 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
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 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-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,7 +45,6 @@ DIST github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz 280
 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-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz 11316 BLAKE2B e8aca3cbfc22c76e16c87c3ba3efa8903a7a378b485845831b9d3eb2deff4e637ffa67a490f144966987c9ac133903466a6ae17b5f9ab7ec87bff9ec73d55244 SHA512 5eca2b00b16ff94327b47505426f62c913ab3e0485f18a1d2a30e0a15afbccede8914a7ad10cddc8b0745deab70be4abb650a71c05659874c3900b3b9da26580
 DIST github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz 28143 BLAKE2B a2ef3db0067c5cf86ad17376c08f28efdc2d735a62dd10aec5b55ef5e4b711f0f6b281fbd6916a0f91fc9ef1e26415bac3d1184f6281c478506a17b4e6f31ba4 SHA512 e01209547e95f45d51d3794e912fe0a4343c61d54c3fca5f7ec6c13d859aeb7a2eab61b14ddeaa451acd8c7aa6f57bb000cf9b9c77c53a8fd0212be5e5df4687
 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
@@ -69,26 +52,17 @@ 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-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
 DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
 DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-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
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz 8208 BLAKE2B 4cd558c21bd893f17280c05550015f2f8148344d50dbd958f7cc7fa68d06223d0e732ace81c445f0091357d6d0a1564efd7d246af5cf432de0d8728f5cb1d250 SHA512 fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e
 DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421
-DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
 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-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
-DIST github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz 28604 BLAKE2B 9507aaac97438b1331fd190a1ef2a260b9125ae25e5fba57898ec421bfd97c592f0f8c92b12759d57969365273383d8d92a0a153ecdbf758ece6b7559e8b931d SHA512 01fa40a812f568208aa4cc603fb61444b1699bf8f7f7caed538c36051d12aa2f863c6815044760109ab4e4d14e9c777695e5c66ea76d9473c928fb321d87c1bd
 DIST github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz 32162 BLAKE2B 4e7a0c8e4f84c6495f866f12f1da176c99d5ed7bed65238585b177a8edaaadc5981748b2d1c16fe9c8d9b4ec3d065212584462635ef3b25574c859834769adb8 SHA512 1e90f596f2888de1f61247d3f8ea084dd1248f17552408f14fc1dc7b794ddf547c288858d920b43fa5b340703a5385489ecde7b9065392324d457499560f07a7
 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
@@ -96,33 +70,16 @@ DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.t
 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-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-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-5374e9f32bde159a4aa19c821618920f491004be.tar.gz 231051 BLAKE2B 0d799bcfa6396dc264bcfe1d90343f35444c6f21a5efad57e3358815c939fff4a6af587e75250f259ea243337fa27f2d0405163b002b2a05708016b663c17767 SHA512 c89213b92b36d509714be314bbe4db171e5682afb3ca69d771b4b53ead24e7105b03420040b6d57a7a5836a22f9dd1ef87da28b08e4726eef65ee5987385c4ec
-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-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-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b
-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
 DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
-DIST github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz 26698 BLAKE2B 10f98819cf6e8e64e22ead564d8460414818cdfda5159a3e751a6457e531d8b8c34eee8fad5c35db187d52400a93ec7240bbea8821ac39360708b61940c33fcf SHA512 7152a9e355e21de7980a28e915b712103ae1eaaa4142a5c37db00d8d30415cb2ecacf53bbe178cce49a1b9c4ad57336e8438a40f0bb92dd20a2bcabb1980013b
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 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-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz 121969 BLAKE2B fe1d28a8249065955a1812e59279d823418af7c437683ba8a65d69339d6acb37ac9c5fb95d927314e0e461512958a2302cd8bde4b643d3ff95894aff374dfc1a SHA512 c5b7586e23a93022e52da1b570747ba2b24c43554ebe3836f93b3cb63e52f059bc300152015ba11d25a0573f03453da30e148933aa5a7db15cd26eecfd9456d9
 DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz 122308 BLAKE2B 3b7e1486b64c0dfd9658b7e7e631b1fc4ae19155dee5392ab57929a51e0734b744399c7902ff558091046ea64f5f1ecacfb2594011d3077880356d659a42c9c7 SHA512 65251591bec228edadf1b0193d4b47f97cefd8eac1a54edd623d20186c70dbf49631562826bc193e81f3af3262a0211dde9b9638ee5a9ca7ded6841a2ebe65ec
-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-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.1.0.ebuild 7540 BLAKE2B 8b10b3463d5bcebe8810044c302f2aa75169345d42ce3c03c2fab20c17539854622ace8d0e156ca356bfae56a4539b885bd8ba5afa48dc3b3ed92a6a9cb7a212 SHA512 e77f909b0902c10d3f8bf193dcd9e6c82697e400327236489b601afa489bfe953332a5e7c73534f2e1158067a62eaa010c6b53f533ace23265a215d6be689369
 EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
 MISC metadata.xml 328 BLAKE2B 8c882f303485c68cd1b46cf55f194d15b2e6e191de8ccbeec7756ef43485e868b950b6138e196b465cbfa07da1df0ff5d7dc9441b349485b6cc55334add26f4d SHA512 39c22655bf9f27a303631f7640be0d375bcd3c25b82df94da86d814614b16b94b7237bbc112e3deadb6489d090dcc59060c6d186a9790d29886744942b5b156f
diff --git a/net-misc/felix/felix-2.5.1.ebuild b/net-misc/felix/felix-2.5.1.ebuild
deleted file mode 100644
index 970b4349f1b8..000000000000
--- a/net-misc/felix/felix-2.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-	"github.com/gavv/monotime 47d58efa69556a936a3c15eb2ed42706d968ab01"
-	"github.com/go-ini/ini 20b96f641a5ea98f2f8619ff4f3e061cff4833bd"
-	"github.com/gogo/protobuf 100ba4e885062801d56799d78530b73b178a78f3"
-	"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
-	"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
-	"github.com/projectcalico/libcalico-go fc4a3648215b9beda5d08e26d76e91f12fb45079"
-	"github.com/coreos/etcd d267ca9c184e953554257d0acdd1dc9c47d38229"
-	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-	"github.com/projectcalico/typha 71413e6c4e8f903f899429329cf3e38e17633ba5"
-	"github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
-	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-	"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-	"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
-	"github.com/coreos/go-systemd 2688e91251d9d8e404e86dd8f096e23b2f086958"
-	"github.com/golang/protobuf 8616e8ee5e20a1704615e6c8d7afcdac06087a67"
-	"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-	"github.com/prometheus/common 61f87aac8082fa8c3c5655c7608d7478d46ac2ad"
-	"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-	"github.com/prometheus/procfs e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"
-	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
-	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
-	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
-	"github.com/vishvananda/netns 86bef332bfc3b59b7624a600bd53009ce91a9829"
-	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-	"golang.org/x/net 3da985ce5951d99de868be4385f21ea6c2b22f24 github.com/golang/net"
-	"golang.org/x/sys 43e60d72a8e2bd92ee98319ba9a384a0e9837c08 github.com/golang/sys"
-	"gopkg.in/go-playground/validator.v8 5f1438d3fca68893a817e4a66806cea46a9e4ebf github.com/go-playground/validator"
-	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
-	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery"
-	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go")
-
-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.1.0.ebuild b/net-misc/felix/felix-3.1.0.ebuild
deleted file mode 100644
index 4274011e8140..000000000000
--- a/net-misc/felix/felix-3.1.0.ebuild
+++ /dev/null
@@ -1,131 +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 3a771d992973f24aa725d07868b467d1ddfceafb"
-"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 5e9692864e22d02ac79e2fa499cffb00520b4fea"
-"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 4b54e7d2460df21c1c2d345af2337f91bfc938ca"
-"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/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade"
-"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
-"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 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/opentracing/opentracing-go 328fceb7548c744337cd010914152b74eaf4c4ab"
-"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 ae021117ebb7c4d8067ea079706b718c6a88eb7f"
-"github.com/projectcalico/typha 6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common 38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a"
-"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 85aa3b74a43a9fa174a588ce9a042c9b71b0842c"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
-"golang.org/x/crypto b2aa35443fbc700ab74c586ae79b81c171851023 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 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys"
-"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
-"google.golang.org/appengine ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4 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 3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd github.com/kubernetes/api"
-"k8s.io/apimachinery ab7fc865fb0881d161f37adef3e5a67b89a18d05 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="dba3279377fd6ec7baf0ee560bcaec685f25fa86"
-
-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=plugins=grpc:. 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/freerdp/Manifest b/net-misc/freerdp/Manifest
index b8ef84f9d748..310151818355 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,7 +2,7 @@ AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b
 AUX 2.0.0-rc4-libressl.patch 1770 BLAKE2B a0f9c5938ecc9ee6f7ec3d67f0a285285c5dc42b95b7c452f461d4fe96cd9ab26c3062426d2cf22e5ebe72d26befab25730573c22419020176cbabd97e8e35aa SHA512 c27ebee51e88e94b845f633d1c4c6eeff19bda977ac98cd25ae1e9eb589c68499e97eb2fb4fdfdb1f5dbbaf71653d657b3dfe8805c78460c6fdcdf80261ebb0d
 DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
-EBUILD freerdp-2.0.0_rc2-r1.ebuild 2664 BLAKE2B 8612caa8fd82f99e1e6369ea991dd25270b9d7d104825038d6f0bc11983d43b84ac0ca15b02ad112072ab654b10f68372bd949b171ca0f9282dd0971be6b6389 SHA512 0c17d9a07ef8a13bfa8462eac1b3f19c3741e156e1dfd4e5fad41158cbd65bd18403b55cef9a04d0f3f5fb4c53a75c1f34b3405e86210823916eb2a10d6510be
-EBUILD freerdp-2.0.0_rc4.ebuild 2702 BLAKE2B 2835c11a2dca2c6b28670867343fc387eb10b2c19cc8111574fe2e9c9d2a3adf5d025f95e1672414687973fdbcee0e1ebcef62e5622896248998ae4e0f6d87cd SHA512 fa1c1f485c5fb3368975794e22334f93e921c1000f5bbad0590e7b59d2566163bb626c628af9bc3cc33c3dd347def778bc1aeded490b4df0a89547601ad140a1
-EBUILD freerdp-9999.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b
+EBUILD freerdp-2.0.0_rc2-r1.ebuild 2689 BLAKE2B 7f94bd2bcf14b1a0b73e5180bb11bd85dc86e0dab5af329944ecf3772b52c73c49731f8e6166afc1f69090d4adee586575e11caed0462f0b40a89d58761a31cd SHA512 b33ff3f59ac78245b34cedff771fb211c9bdeb99964391e9f722c3cecbc153b30e6e4d63e9c36fd993c945ef52e9b21ee5616a7c1eb06814727f805e7555d16e
+EBUILD freerdp-2.0.0_rc4.ebuild 2730 BLAKE2B d9660b2e33919b12f95e807ae7eee4135d9aabb619c485a354023300bd757244bd7083685279875b23be0cb8e65af42da22260e6c67ae8a86462e6adf1f21949 SHA512 d2e26777016b350ff4afc6e2300964d38edf75ddf4b9c034492ac125ca487d3467e5c6b7a4cae9a6308c1b61d1a5d03eac24e1877a80ba36d1827ea77ca8efd7
+EBUILD freerdp-9999.ebuild 2675 BLAKE2B 062df07d0bd6c7274aa1433c8c2067e653cbd5e563956e226bcdd97012bc9b938667970e2d74e5f3ef06a6a056b855745cfb77e38fd2de9c5b21d98f4c301659 SHA512 f8f5458aedbf4fb7693c8b2630078c43473d1b088c6aecd9ce8ed553b95783d67575893d1acf8eddc4fcdc42a607e26a722b1f213bbe01479f913850fa086d73
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
index 9b4af99905b1..7e5cfb6e5906 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -104,7 +104,7 @@ src_configure() {
 		-DWITH_FFMPEG=$(usex ffmpeg)
 		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon)
 		-DWITH_OPENH264=$(usex openh264)
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_SERVER=$(usex server)
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 772d36f98fa8..51108006d581 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -105,7 +105,7 @@ src_configure() {
 		-DWITH_DSP_FFMPEG=$(usex ffmpeg)
 		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon)
 		-DWITH_OPENH264=$(usex openh264)
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_SERVER=$(usex server)
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 0d86ec929470..78014fa99063 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -101,7 +101,7 @@ src_configure() {
 		-DWITH_DSP_FFMPEG=$(usex ffmpeg)
 		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon)
 		-DWITH_OPENH264=$(usex openh264)
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_SERVER=$(usex server)
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index c71459e6fa68..3447dcae4736 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,16 +1,5 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
-AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836c635b36a49dfa67b7d0370da5ed5486539a8bf5a79130bee1c950d012053fd610ea101be16ce120468221a343e893cbaa6a6507c95d8c SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad
-AUX gsutil-4.28-use-friendy-version-checks.patch 750 BLAKE2B a4b2e54e3d0d983f5ed2ed41ae092b2ef398a8702830a890c97aef4f6ac1655689f96537c0cf6c99dfb4e2fdca29537aabc09cab2a9a772e5d71c3f303c82aa9 SHA512 461668e10d4480f21144af93f14d4059a2cdfc15b739bc58f7fe9547a96dd38a8bf0f6c7f10b9928fdc1c5e1e402292eaabbbcfb808a4b5dae09cfac1c797e27
-AUX gsutil-4.30-use-friendy-version-checks.patch 759 BLAKE2B 10f482f828c53f4f569a097bbe6e77734b9df697c0280da1cadbf4cbb7e52965dc89d08e4831963e740d8a3a52ebe9082ed58d6363dab70e823de1a8ddcdcfdf SHA512 3d1afc9568d5fb50ffd154352e5e92941000852a64ece5c1e0e4f86835f7b7d2f1d04e1c7e0c115d89a0c6e4214d7f18464153213d5fbec26d5b8cb0d2a98412
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
-DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
-DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
-DIST gsutil_4.30.tar.gz 3549515 BLAKE2B e6ef7e3832922d0ac1dafee27d56ce810fb6daab0ffb19e3c5644c9f6b71c3a68490c809fce101c723a15a2124013691321c1cf5a6e5be0970bb8f9cb8878ead SHA512 504f21e3a79695959b128aac9c1b53fda8a5752c813b81edeff3d435c95e5cf269c75e682467a615e093a00ae2b52a6c9c7f0fc2a2fd49440f633124d47f197c
-DIST gsutil_4.32.tar.gz 3644450 BLAKE2B 0e8667504d2bcb499723cf55e6bf825cf555609209c73efaf544183d01a2a5e696ee7c4968f87ded36158a517abf397a295a770d8b9e230695720e90ce52f2d9 SHA512 9000d67cc29af6e28b6210edee3e2143bd382ff7fbea76bd75dabfd0caaafe82832c86e4148005edd1d9f986127f573d16b8a3387747bc28a6091ff189829e8a
 DIST gsutil_4.41.tar.gz 3685987 BLAKE2B 7586d6c64c87c27e4c5f3e86372bfe6d7fdfbdcbe4146308ed497d86b6e3fb984a79d3f07ba3ed055ac09bfe70eef893b8b764a46921703c48c8e54e49cac7eb SHA512 f96500a4761cb244039ba20ccb328b143134a74822990538585116fe6afa6f9e23cfecc9958e34d5deb4291edc9cbe97c6176b3a0f0136ed6e8e81303b5b8c4a
-EBUILD gsutil-4.27.ebuild 1783 BLAKE2B 528b5d30dc29765fa28807f4f2ac059dfb5060684a88acb1cd258e1fbe004f9bfb9315d158049c7fd97cf20bf128a0a055fc20a7c57e16a0cdb966ed7687673c SHA512 afc5055223dfd3c2ef7bdd1c4681ebec2f81cfbcae9e6c06a4ca8abe887c020050ef261e2e047160bdb0f3f49da57ae67e9e6dc75928a886eb25cc696e5488bf
-EBUILD gsutil-4.28.ebuild 1787 BLAKE2B 8f310bf7a9f0f318a2a7a018c27259f76d0d5bebde508880f83fa72932b062d4453a25ea819a183ae439614be57c4d1ee54faa80cb0ef0608b6f7f2fcef7ad31 SHA512 95c1a8b2a379a1efd1ae6cc1816bb799dace33b88bb5983e2c98165df118360e4174a7561a357ca8accec6520f13909ec53b0b7289185f909ce72fe9aabe97ad
-EBUILD gsutil-4.30.ebuild 1789 BLAKE2B 088ae1fa8dccdc6144597d7101517373075b853fce3068d4493af5a840088886f10324f1864e2bc7173b1dbc8cab4324b0c18f3692a14f791b16ccf440480bd8 SHA512 382ac24aa1093c90c64ad3c4d1e059bfe83f37c098810ee93a46325025dae125a3b80a552659b766642fc748a8792944e394dfe8921a73855f201a9727ad85e2
-EBUILD gsutil-4.32.ebuild 2547 BLAKE2B 3a5caf6b54cb38b7d615b20bf1909a289b13c4ec3e632565da07e830a5956e57c8495eed4d55781b4643e2ae199464670fee1efb82513d3dafe93d2a54c2ee14 SHA512 47f01bfce6091f5f7911663fd71fb7cef7e6f0cd5434607cd669c0d7b757003c6f7b1f3dc68b88ff18f00334e14a1b4c18e52136f554260b7f2a62347bc9b3bf
 EBUILD gsutil-4.41.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
deleted file mode 100644
index c02e567989f3..000000000000
--- a/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,21 +36,21 @@
- 
- requires = [
-     'argcomplete>=1.8.2',
--    'boto==2.47.0',
-+    'boto>=2.47.0',
-     'crcmod>=1.7',
-     'gcs-oauth2-boto-plugin>=1.14',
--    'google-apitools==0.5.3',
-+    'google-apitools>=0.5.3',
-     'httplib2>=0.8',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
--    'oauth2client==2.2.0',
-+    'mock>=2.0.0',
-+    'oauth2client>=2.2.0',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
deleted file mode 100644
index 93b529a3003b..000000000000
--- a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,21 +36,21 @@
- 
- requires = [
-     'argcomplete>=1.8.2',
--    'boto==2.48.0',
-+    'boto>=2.48.0',
-     'crcmod>=1.7',
-     'gcs-oauth2-boto-plugin>=1.14',
--    'google-apitools==0.5.16',
-+    'google-apitools>=0.5.16',
-     'httplib2>=0.10.3',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
--    'oauth2client==2.2.0',
-+    'mock>=2.0.0',
-+    'oauth2client>=2.2.0',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
deleted file mode 100644
index 5cf7c42274da..000000000000
--- a/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,23 +36,23 @@
- 
- requires = [
-     'argcomplete>=1.9.4',
--    'boto==2.48.0',
-+    'boto>=2.48.0',
-     'crcmod>=1.7',
-     'fasteners>=0.14.1',
-     'gcs-oauth2-boto-plugin>=1.14',
-     'google-apitools>=0.5.22',
-     'httplib2>=0.10.3',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
-+    'mock>=2.0.0',
-     'monotonic>=1.4',
--    'oauth2client==4.1.2',
-+    'oauth2client>=4.1.2',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'PySocks>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/gsutil-4.27.ebuild b/net-misc/gsutil/gsutil-4.27.ebuild
deleted file mode 100644
index cb2c309ec5f9..000000000000
--- a/net-misc/gsutil/gsutil-4.27.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# The oauth2client-2 dep sucks.
-# https://github.com/GoogleCloudPlatform/gsutil/issues/355
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.47.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.3[${PYTHON_USEDEP}]
-	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.27-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.28.ebuild b/net-misc/gsutil/gsutil-4.28.ebuild
deleted file mode 100644
index 85dfba63c0dc..000000000000
--- a/net-misc/gsutil/gsutil-4.28.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# The oauth2client-2 dep sucks.
-# https://github.com/GoogleCloudPlatform/gsutil/issues/355
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.16[${PYTHON_USEDEP}]
-	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.28-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.30.ebuild b/net-misc/gsutil/gsutil-4.30.ebuild
deleted file mode 100644
index c956e6c8793f..000000000000
--- a/net-misc/gsutil/gsutil-4.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Python 3 depends on google-apitools being updated.
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.30-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.32.ebuild b/net-misc/gsutil/gsutil-4.32.ebuild
deleted file mode 100644
index c22ead4ade73..000000000000
--- a/net-misc/gsutil/gsutil-4.32.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.1[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e 's/boto==/boto>=/' \
-		-e 's/mock==/mock>=/' \
-		-e 's/oauth2client==/oauth2client>=/' \
-		-e 's/SocksiPy-branch==/PySocks>=/' \
-		-i setup.py || die
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady
-	sed -e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		-i gslib/tests/test_cp.py || die
-
-	sed -e 's/\(executable_prefix =\).*/\1 [sys.executable]/' \
-		-i gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -e 's/sys.stderr.close()/#&/' \
-		-i gslib/tests/testcase/unit_testcase.py
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 0c93de0412e1..7b908427a4cf 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -3,9 +3,7 @@ AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb
 AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
-DIST hylafax-5.5.9.tar.gz 1364807 BLAKE2B 1e63d28dbe42170af65369ceab6b76b30fb264515992bb7f3561722eccae21e2d790e50eab3f1f9bdbb8c48e369166c90271aa8cf37c1905fda44c3b31b18b71 SHA512 67ac84df2619db7fb88cd7ad3af4beff9918b2481fc8edf7cc7574941161dd7aa6186cfc49c6cdb2a1f073f6cbf2f2a4ed084ca70ebe288bf7cd8e752cd56b2d
 DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd32f669fb2ea513b86e112a5743ae6b4ddc8d43f3bd4af6006517e8787392c84bf60e715c104ddb0d819b22985a SHA512 c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1
 EBUILD hylafaxplus-5.5.5.ebuild 4715 BLAKE2B 9d6ca4008ad1c725374ea961f7573daa2ec4fff75506b5d131a6680ba95dfdae6bbd734e1d003f07093d47bbfe07fd5db0b7001bf226e50360968e1deae3cf82 SHA512 e3b531d0ea6ed7039abbf2488f8ac5955b41691d1fa47da7182c06e7f44ec2f59082f8b3a1b7493c6129859e477bc72c2b8f21dfc795530fcf5e89de01bab05f
-EBUILD hylafaxplus-5.5.9.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
 EBUILD hylafaxplus-5.6.1.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
 MISC metadata.xml 604 BLAKE2B 012e03ab403ae6f27142ac9394736f1ad10bd049e5403e673259371d39119162ad5c61bd84248f1a1ec4f659f20c879e5682b0855d54f096b51c75688975e835 SHA512 bcaa18269a7ece318c970552134c79f89eb41c76a7e471e430d72ad9a8dc4ea10fa57d6b89434759f6cd1aa22db6ad8b5fb8933b7e65ffcdab11275cfce14593
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
deleted file mode 100644
index 18d1e65d47a1..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="http://hylafax.sourceforge.net"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="~amd64 ~x86"
-IUSE="jbig html lcms ldap mgetty pam"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	app-text/ghostscript-gpl
-	virtual/mta
-	media-libs/tiff:0[jbig?]
-	virtual/jpeg:0
-	jbig? ( media-libs/jbigkit )
-	virtual/awk
-	lcms? ( media-libs/lcms )
-	ldap? (  net-nds/openldap )
-	pam? ( virtual/pam )
-	mgetty? ( net-dialup/mgetty[-fax] )
-	!net-dialup/mgetty[fax]
-"
-RDEPEND="${DEPEND}
-	net-mail/metamail
-	!net-dialup/sendpage
-"
-
-S="${WORKDIR}/${MY_P}"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=( "${FILESDIR}/ldconfig-patch" )
-
-src_prepare() {
-	default
-
-	# force it not to strip binaries
-	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
-		hfaxd sendfax sendpage ; do
-			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
-				"${dir}"/Makefile.in || die "sed failed"
-	done
-
-	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
-	# Respect LDFLAGS(at least partially)
-	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
-	sed -i -e "s|-fpic|-fPIC|g" \
-		configure || die
-}
-
-src_configure() {
-	do_configure() {
-		echo ./configure --nointeractive ${1}
-		# eval required for quoting in ${my_conf} to work properly, better way?
-		eval ./configure --nointeractive ${1} || die "./configure failed"
-	}
-	local my_conf="
-		--with-DIR_BIN=/usr/bin
-		--with-DIR_SBIN=/usr/sbin
-		--with-DIR_LIB=/usr/$(get_libdir)
-		--with-DIR_LIBEXEC=/usr/sbin
-		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
-		--with-DIR_LOCALE=/usr/share/locale
-		--with-DIR_LOCKS=/var/lock
-		--with-DIR_MAN=/usr/share/man
-		--with-DIR_SPOOL=/var/spool/fax
-		--with-DIR_HTML=/usr/share/doc/${P}/html
-		--with-DIR_CGI="${WORKDIR}"
-		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
-		--with-PATH_IMPRIP=\"\"
-		--with-SYSVINIT=no
-		--with-REGEX=yes
-		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
-		--with-OPTIMIZER=\"${CFLAGS}\"
-		--with-DSO=auto
-		--with-HTML=$(usex html)"
-
-	if use mgetty; then
-		my_conf="${my_conf} \
-			--with-PATH_GETTY=/sbin/mgetty \
-			--with-PATH_EGETTY=/sbin/mgetty \
-			--with-PATH_VGETTY=/usr/sbin/vgetty"
-	else
-		# GETTY defaults to /sbin/agetty
-		my_conf="${my_conf} \
-			--with-PATH_EGETTY=/bin/false \
-			--with-PATH_VGETTY=/bin/false"
-	fi
-
-	#--enable-pam isn't valid
-	use pam || my_conf="${my_conf} $(use_enable pam)"
-	use lcms || my_conf="${my_conf} $(use_enable lcms)"
-	use ldap || my_conf="${my_conf} $(use_enable ldap)"
-	use jbig || my_conf="${my_conf} $(use_enable jbig)"
-
-	tc-export CC CXX AR RANLIB
-
-	do_configure "${my_conf}"
-}
-
-src_compile() {
-	# Parallel building is borked, bug #????
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
-	dodir /var/spool /var/spool/fax
-	fowners uucp:uucp /var/spool/fax
-	fperms 0600 /var/spool/fax
-	dodir "/usr/share/doc/${P}/samples"
-
-	emake DESTDIR="${D}" \
-		BIN="${D}/usr/bin" \
-		SBIN="${D}/usr/sbin" \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		LIB="${D}/usr/$(get_libdir)" \
-		LIBEXEC="${D}/usr/sbin" \
-		LIBDATA="${D}/usr/$(get_libdir)/fax" \
-		DIR_LOCALE="${D}/usr/share/locale" \
-		MAN="${D}/usr/share/man" \
-		SPOOL="${D}/var/spool/fax" \
-		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
-		install
-
-	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
-	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
-	generate_files # in this case, it only generates the env.d entry
-
-	einfo "Adding env.d entry for ${PN}"
-	doenvd "${T}/99${PN}"
-
-	newconfd "${FILESDIR}/${PN}-conf" ${PN}
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-
-	use pam && pamd_mimic_system ${MY_PN} auth account session
-
-	einstalldocs
-	docinto samples
-}
-
-generate_files() {
-	cat <<-EOF > "${T}/99${PN}"
-	PATH="/var/spool/fax/bin"
-	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-	CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
-	EOF
-}
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index b475f118a072..158453bf0091 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -13,4 +13,4 @@ EBUILD iperf-2.99999.99999.ebuild 711 BLAKE2B 569294c8cfae197a94563320c64cd477c9
 EBUILD iperf-3.6.ebuild 996 BLAKE2B dd68b976f0bd58179a934c33f07591633f85a6509ea24e7fa80a6f79191c40257784bf47325a0b4b88df061a8f84e29f55e8b53d314518a73fe42627fe766a00 SHA512 d070a0944b3a3a3c1085b457944ed0417ab8a65a571dd92f43132d527c1f6a8fd14d967188768766f84d7e8eedfbdca0195dac3a07d25945bd99c357d71af359
 EBUILD iperf-3.7.ebuild 953 BLAKE2B 30d7abc4c2ad9c667323c0fe8073bae77bc0071827e3eab301a7f986fb76d08204bb50bb6c99793c5c827034794ab181bd8c37d2c97a69633aa365adf1a2cd2d SHA512 aa817ef5584a9914151bffb399a77eec290b8e171596dfc424b0a962cde13e1dbba45695ef50c7dd6c00edbfeef40ba1cf0c53f077da4a177d0f7527e719b752
 EBUILD iperf-3.99999.99999.ebuild 803 BLAKE2B 586514d1fb209fccbd940bca4a5e37c0c4e12778f6caf493e959a2acc7bf86c979f4f0b2f47b963446208aa681b900fb5d044a4ff2c827f21a796b79c7b1e052 SHA512 96794cbc42db4da3b6e8bcc8e700f9809f0992f399d1efcbdba304090943321815b83180360eb2286877ce769873a28b51c13025ad4c129a590f3eedea054826
-MISC metadata.xml 483 BLAKE2B 4ea7f7c86966199a3bfc78cb2f8312696a0aab08f97d03f84eafe1c418d849bc69ad5bf89d07125d47677436f666748e09820f119b5ca77e5f8e10d4d97b40a3 SHA512 0d0792352d95821b0d603f0628fca7e447ba9c9b1eb9fc119d58d45de1970dc4dc512a132867eb6bcab3725e1b724594f807461dc2fccfd8308bd2043196ce22
+MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 344d7ddf0bf3..6941792a1185 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -6,6 +6,7 @@
 <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <upstream>
+<remote-id type="cpe">cpe:/a:iperf_project:iperf</remote-id>
 <remote-id type="github">esnet/iperf</remote-id>
 <remote-id type="sourceforge">iperf</remote-id>
 </upstream>
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 49e9f74c2b4a..a335374c0a31 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -4,5 +4,5 @@ DIST kea-1.5.0.tar.gz 7395257 BLAKE2B dfc28916166a732714253e1e7458076643e1a40e9f
 DIST kea-1.6.0.tar.gz 7154301 BLAKE2B b05bd6cbf53140e10da2614917d2f314a048035f1ba5b33bc260166d203c3c99c1aa6438f886569aa5a809f705572096834dbb0ccea67eee1a93c1ed61fc0d9c SHA512 09e670996ad3dbfc523ad7639e3cfd43147bf370069cec80a6ba6af4c45264f33318594a20073f1c5d75bd19bcaa275e3167b243e13c5a6c151c10d634f338af
 EBUILD kea-1.5.0.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
 EBUILD kea-1.6.0.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
-EBUILD kea-9999.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
+EBUILD kea-9999.ebuild 1751 BLAKE2B 85d329a3c2dde5181f930e3b4c89da49ceed7848c0f3548e1c2eaf63fd54d1c9886bb84f9da070258ffd6556a523e92046fdec467ad6a93a7bd76a066f79c862 SHA512 f27916bb53e83b4d7370bee5721df36327202ee6de1751181cf7e482d33ccea8a301ed5baf91de14665edcda927bc6e6c2e5cbc3e2721d0299b7900cec9a7ccf
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 2d0234c2da44..16b905261783 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="mysql openssl postgres samples"
+IUSE="mysql +openssl postgres samples"
 
 DEPEND="
 	dev-libs/boost:=
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 424c565fc86c..c4f11e04970c 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,7 +1,5 @@
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
-DIST minissdpd-1.5.20190210.tar.gz 37227 BLAKE2B a273c35bb332e50f5c528cc395b257de7761fbec2cdef910018b0c751026ca4f3fc9fce60485c4209488574d3130a3c8a6d2755ae4114d2f4e2c0316491be021 SHA512 1902c3c396cdcec90af0638305224f77871bd7f70057ac8a1ff59b3ab6da168ee17eb52a5bee87eb85c8d759d02112225876e38c254ad521396eca9c4884686c
 DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
-EBUILD minissdpd-1.5.20190210.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
 EBUILD minissdpd-1.5.20190824.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild b/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild
deleted file mode 100644
index 35c0a1f9b2be..000000000000
--- a/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	emake PREFIX="${ED}" install
-	# note: we overwrite upstream's init.d
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 650c9f0f9462..32e2abe1683e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,9 +1,5 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.1.20190630.tar.gz 240466 BLAKE2B fe4d4e59a7dad32bef9ed9b4c58b52e378ec9b26ea2439e84284630a7ef7269c6cd53cabdc632ff274cae88aea2552a8808af2ea349138f8b8ed667baf9e87ee SHA512 cd6006e5487652a258f7320e1e28fea7b0790528cc014071109a1abd0f6c249237cf8d0620987c14ee0ce1cca14f4bb4abd439b1d422e0e49a398cd485eaf970
-DIST miniupnpd-2.1.20190824.tar.gz 240490 BLAKE2B c2eaf08b18d4cd27a18a71232fd8d972ced799a68b0e6f3ff1b3d155ab0e27047153dcd81a0c89806f74a6c09c303eb3255825f6fd4083f1ec77605ee4f0d1b3 SHA512 f3e591e10b33d2459e55118db11f6692bafd75ae867f934f4a5c6ccf6c9cf21363d0a746d1b319a08381119f382d5941af84c5bfb5c54b97f8945aa9d7372987
 DIST miniupnpd-2.1.20190902.tar.gz 240742 BLAKE2B 0b880b1e8a96c56af92726d3fe81da0a26de83861efe4dc266e287623dcac4c6bd4c4ac8d2c6ef7724c1055933d5138e7c86da5c8e3852f2022f69697505f231 SHA512 0abeb9df088ecd57909106fbb43de14d90eebd351a466477777f413f40c49bc432050bc8ea0d655d2eea0bfcedbdb97719ea2476a8bd9170ef9b74ad97217d26
-EBUILD miniupnpd-2.1.20190630.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
-EBUILD miniupnpd-2.1.20190824.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 EBUILD miniupnpd-2.1.20190902.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild
deleted file mode 100644
index 07c804f35640..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
deleted file mode 100644
index 07c804f35640..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index a694bfeda162..1f65707a71d1 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
-EBUILD modemmanager-1.10.0.ebuild 3651 BLAKE2B c60944e83a7d6066957eea5bdec781575d546bb163debc0cdfda317e21bf2625aa588e636fe8b0dc13f511605e95c6f742f335958f325733b7faa2e1bd8982db SHA512 cfafb4251886b39bc10eac948f7686bc3540740737624abfc0e469a20e3f74e523b15ce76a159b3216926015fcf6ae1bce9783f7498e8db9899c0b8cea264699
-EBUILD modemmanager-1.8.2-r1.ebuild 3645 BLAKE2B 3f0e68549417041d6f625fb986a32976ecfe66b6ee3364a978fced73dd5573f2a643c6ee4d2c84c555903aad8d4b5e338463a99712d866e5cd6e0e06eef8c63a SHA512 3916fa42c70eb157888cbbd13fdf076148efd7f25ec3168d1947c804d52f74a9b471682ccadfa9a4884d1b50ce72835299d35ca7b9b2277aeb612f3854396e7c
+EBUILD modemmanager-1.10.0.ebuild 3665 BLAKE2B d91a7604aaf597bc6f25c4a4db6122cf8f83cdc0ad0352e52542459ee9db7e199c226952e9953b399f2689f75dd9ed4a06518f3ff35df848ed1b28b40e4196ab SHA512 e9f25dbd713a28a8281e6f1c01ae91e1e07155358e64408ccaccd79cab51bdfb2957c0c42bc854cff0ce79baf8e74e1a49a041bcd3accb7dc3555da55d898269
+EBUILD modemmanager-1.8.2-r1.ebuild 3659 BLAKE2B 6ef3bbe4362f5432ba5366051f512b036f74fa349b457deb2ca24fab4e308dea6d2a66afaef79eb233436950698e6f15b0f549b64c6464a24546c280535abb45 SHA512 4cc03cfc6776aa6a716fed0773a6e35d013fecc1925a093ecce31d01e37bc02d70bc8d3b47377becdb984e35fe7d81989bf6c1c05785656ff1f42624d0c796f3
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
index f7ea0d8471dc..3f68591007d6 100644
--- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
+inherit gnome2 readme.gentoo-r1 systemd udev vala
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
+RDEPEND="${RDEPEND}
+	policykit? ( acct-group/plugdev )"
 
 S="${WORKDIR}/ModemManager-${PV}"
 
@@ -97,8 +99,6 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	use policykit && enewgroup plugdev
-
 	# The polkit rules file moved to /usr/share
 	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
 	if [[ -f "${old_rules}" ]]; then
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 52d42ead5c7b..7457b97ba8a4 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
+inherit gnome2 readme.gentoo-r1 systemd udev vala
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
+RDEPEND="${RDEPEND}
+	policykit? ( acct-group/plugdev )"
 
 S="${WORKDIR}/ModemManager-${PV}"
 
@@ -97,8 +99,6 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	use policykit && enewgroup plugdev
-
 	# The polkit rules file moved to /usr/share
 	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
 	if [[ -f "${old_rules}" ]]; then
diff --git a/net-misc/mulk/Manifest b/net-misc/mulk/Manifest
index 19ca9c0ce441..28e9ab696ed3 100644
--- a/net-misc/mulk/Manifest
+++ b/net-misc/mulk/Manifest
@@ -1,6 +1,3 @@
-AUX mulk-0.6.0-large-file.patch 867 BLAKE2B 2ebf6dd4ddd4e4bfb0e8ced95844064d956f67374177ad11e0d8795176755523e35bf81110087fe9bf34594aab785878992f76d277178e657ab2c2a02f501516 SHA512 8018cacc3713474c5033aaafbae314136a448a10c13e4b49630a1808c2f1a14d3b22c79229a54e661cebfb59051cdbf29ccede72f2dc3265614d635d1ada16ae
-DIST mulk-0.6.0.tar.gz 459141 BLAKE2B f63d2d78128e9f9cfa39107ec294d49d401fffe37883be41b9bab391c70751de1fdb955683c85f9491b0739c3e99fcde3525c54fcb3beb2e280851eac0c98d29 SHA512 9e42add34305b071ac5132c645be75d3666e2a47b6b3a7c7eb46b1fbc130db85bccdd31dd54586b20c4d3629f000219c630511d6f2a59d241d60afce2cfeee37
 DIST mulk-0.7.0.tar.gz 487995 BLAKE2B 446cf6652f7a1736dc1fbadf7a4fca8941507fa02abdc6ff3871e1cbb7dcd341e00be03c0e0b860f4cfe70ce1241a90adbae15e947e958fe37fd206863aaa01e SHA512 e1c6cf14b0ee2e42d83c8ad33d011feec9eb192ea4f8495cc67926db934d7ac132dfea66e40c47844965321573bd5b0734e4b19fe34c97c38170ee0cf4643499
-EBUILD mulk-0.6.0.ebuild 808 BLAKE2B 0f74eac84b91c0fd46504130291bc32c1717907e2f2412e46cd945231e6683e40a2648a07a8ddeb6c977c3bb7979c769b681ed48f05fb8b3b3dc47e0040a74bc SHA512 b19c6d6ac579f72fb128cae2ff6c7b39718942945866e1e2c84bcfeb513eb361895e10ccefe6e32151b87baff5bbe7c1830b03a2b2a900a6740c27ced35ea445
 EBUILD mulk-0.7.0.ebuild 758 BLAKE2B 1bc5c95884921369679b10ac05a639997fe76ada83803eaffb397c3826bb49f985b579f7263b202a84228615e7c5e7395f404868e541237360c0db86c1e314a2 SHA512 8cbd690937d3e4447e3b86a2667d89c740d59463c74578654cd52863b6dcbb2a2ef9e6091700a59996c688a0328d5500be1e80a737a18f0c6908f53faee71faf
 MISC metadata.xml 446 BLAKE2B f58d02b9addd2437ec243d741627a52a72192583a4f2b99df560d9681d6486811c52149678161f5bdb8055b071fb1565cdc52fd07c136854a4c7180f764e2cb7 SHA512 8d36ae10e4da6a5a6aab41ac25d6e85dfd9b2dd1e976f771a330aa175a30e932d6e40e86ca32751e9c89b227a173757da647465c59f3de5659abaeae66e1fb20
diff --git a/net-misc/mulk/files/mulk-0.6.0-large-file.patch b/net-misc/mulk/files/mulk-0.6.0-large-file.patch
deleted file mode 100644
index 801433080e46..000000000000
--- a/net-misc/mulk/files/mulk-0.6.0-large-file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: mulk-0.6.0/lib/defines.h
-===================================================================
---- mulk-0.6.0.orig/lib/defines.h
-+++ mulk-0.6.0/lib/defines.h
-@@ -41,6 +41,12 @@
- #include <stdio.h>
- #include <string.h>
- #include <time.h>
-+#ifdef HAVE_STDINT_H
-+ #include <stdint.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+ #include <inttypes.h>
-+#endif
- #include <curl/curl.h>
- #include <curl/multi.h>
- #include <uriparser/Uri.h>
-Index: mulk-0.6.0/lib/m_malloc.c
-===================================================================
---- mulk-0.6.0.orig/lib/m_malloc.c
-+++ mulk-0.6.0/lib/m_malloc.c
-@@ -34,10 +34,6 @@
- 
- #ifdef MULKDEBUG
- 
--#ifdef HAVE_STDINT_H
--#include <stdint.h>  /* for uint32_t */
--#endif
--
- #define HASH_TABLE_SIZE 131072 /* 2^17, use always power of 2 */
- #define HASH_CHUNK_SIZE 2048 
- #define INC_INDEX(i) i = ((i == HASH_TABLE_SIZE-1) ? 0 : i+1)
diff --git a/net-misc/mulk/mulk-0.6.0.ebuild b/net-misc/mulk/mulk-0.6.0.ebuild
deleted file mode 100644
index af8c80b6d579..000000000000
--- a/net-misc/mulk/mulk-0.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-MY_PV=${PV/_beta/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Download agent similar to wget/curl"
-HOMEPAGE="http://mulk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="checksum debug metalink"
-
-DEPEND="net-misc/curl
-	app-text/htmltidy
-	dev-libs/uriparser
-	metalink? (
-		media-libs/libmetalink
-		checksum? ( dev-libs/openssl )
-	)"
-
-REQUIRED_USE="checksum? ( metalink )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-large-file.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable metalink) \
-		$(use metalink && use checksum && echo --enable-checksum)
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index c0db81594cf1..637a5430677d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,10 +2,6 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
-DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
-DIST NetworkManager-1.16.2.tar.xz 4820392 BLAKE2B f85fa4ff27cb2f0fc7d58052c810d4c20ca51d6e77e400c44270f941de6b4878b0c645053b9ffb02c3587b6c7b17631f9a6c6c15b630da4747051e1745d1dae8 SHA512 b3e874786d0bce58b967677fe82980aac58023fd4e913345acb63d7a7f253cd8fa6c044e788dd337a52f0fb026ce5fbd333d738dc9c3644d696e85498120f6d2
 DIST NetworkManager-1.18.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
-EBUILD networkmanager-1.16.0.ebuild 11106 BLAKE2B 2ad8ff5ee0069946ed60b644ac8beb24167ba6da6bb5d8ddcef09d7b4187974efb62ef867d98b746b7910005a3dc89ffba5b263ffdcb2260a92463658b4fefcf SHA512 db17cab0f2ae56802f57e5f785ba11f5b3391a6a595c9ff773ace9b75d0d36df260fd5ef1ba6ec5d5f3539645bc2c5c03af628df89cb830861526da078b6e619
-EBUILD networkmanager-1.16.2.ebuild 11131 BLAKE2B 0ce19eba230f3608d09c4a6664e4d877711e683b6fecdabfaf5876ebfe924f6ced3445881f99cd90003e17482f90cd6d8ef24d3c0b1541afe5cc9ee510ec1c47 SHA512 40f15c6ed60d0c931b8b882e99a32a4daf795f40939a8e8b8826ede4fdacfd204efbbc4e3f82ffec4e5ee6d4ad0c54b435e5d3301cf7c6486663ad3ce65b6a62
-EBUILD networkmanager-1.18.2.ebuild 11126 BLAKE2B 0490cfa37f7423edc94e7b5b650c6d1986c0dd450413bd5031add0b6585e134a26f29f3306ee6198feba3b22191d774cfba7bd73cabc87e359be2bfe8678ad74 SHA512 0f041e6faa53cd4ecd6a07c0b8aa7e4d43594d9a89d96115265a9198be5449e2cb3bbe8312f01237b7aabad5cb6853d8d56ef1803ce119f76c7b8d68f3c7a318
+EBUILD networkmanager-1.18.2.ebuild 11121 BLAKE2B 1599674ae5a7eba5a71051cb407389426861ebe5028fa495bc069a2cd7e0921d380356b3a9a648dc4f83c3a2c86edf88cc945ab986a29c6c45346f646597d8cc SHA512 00ae391ff577b8b0c74db9ff0603e54a643c9f3eeb462266f413470bfdc7744bfb460bdbd4ce8555428202529be909578760dbbce46362a2d24854eca9cb356f
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
deleted file mode 100644
index 4ab48bffe5d5..000000000000
--- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-	enewgroup plugdev
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		--with-nmcli=yes
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	if multilib_is_native_abi && use policykit; then
-		myconf+=( --enable-polkit=yes )
-	else
-		myconf+=( --enable-polkit=disabled )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.16.2.ebuild b/net-misc/networkmanager/networkmanager-1.16.2.ebuild
deleted file mode 100644
index 777cf71c6036..000000000000
--- a/net-misc/networkmanager/networkmanager-1.16.2.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=[${MULTILIB_USEDEP}]
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-	enewgroup plugdev
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		--with-nmcli=yes
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	if multilib_is_native_abi && use policykit; then
-		myconf+=( --enable-polkit=yes )
-	else
-		myconf+=( --enable-polkit=disabled )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
index 0e98e4e8353b..4342ec029bab 100644
--- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo-r1 vala virtualx udev multilib-minimal
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 
 DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
@@ -70,6 +70,7 @@ COMMON_DEPEND="
 	)
 "
 RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
 	|| (
 		net-misc/iputils[arping(+)]
 		net-analyzer/arping
@@ -141,7 +142,6 @@ pkg_setup() {
 		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
 		linux-info_pkg_setup
 	fi
-	enewgroup plugdev
 	if use introspection || use test; then
 		python-any-r1_pkg_setup
 	fi
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index f91a837c1056..d544e9202ddc 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -5,7 +5,7 @@ AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b454
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
-EBUILD ntpsec-1.1.4.ebuild 4190 BLAKE2B 640c6715ce923db7dee32faeb37a25263a84b09400a46c3700cf3a6b4ab6fe8433f14beccbd848d159b1a80659b472213f4d1733c4f6c3cbf046269f2cf1afb0 SHA512 7956cdb4e185ed50a6ee96d1d9b56b512e0b1be7af21020b97ece7c8663f048bf2fa89f466429e58785523708d48e308ffbb15e3c0490a104323005f67e145a8
-EBUILD ntpsec-1.1.6.ebuild 4148 BLAKE2B 576f7c59c43afffb32920db2726aeae99b723c071ffa2cf2a567718896a1c65b8bba6d7aba8df2f9e60e53500ed8e9e1e589bc5b144d2ea40d8dac86a4cb9f66 SHA512 276f3cc96dcc1be5f85477860b139fe8b7e663cda04eeb3dbfa2aeb75124ef9b263fdeec88db1090b8547b65a4e0a83a98944df761754f88c07ce76281330c3e
-EBUILD ntpsec-9999.ebuild 4148 BLAKE2B 576f7c59c43afffb32920db2726aeae99b723c071ffa2cf2a567718896a1c65b8bba6d7aba8df2f9e60e53500ed8e9e1e589bc5b144d2ea40d8dac86a4cb9f66 SHA512 276f3cc96dcc1be5f85477860b139fe8b7e663cda04eeb3dbfa2aeb75124ef9b263fdeec88db1090b8547b65a4e0a83a98944df761754f88c07ce76281330c3e
+EBUILD ntpsec-1.1.4.ebuild 4130 BLAKE2B c14e7e7d1bf4d4f840b9e555cfe13b967824901ce1b5dc021be0fb9d0cdb53a358e1e73037bab9e251400238d99a9f2fac69c48232df2d8c49bf105927b363c5 SHA512 a40332b0d7621e905099dbffe43e336a8b32e842d888c15eac07e87de9bc89cedf23eef2e04681704a8011b84965b9a6c294eba7dfb5df5b10883b973e322984
+EBUILD ntpsec-1.1.6.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
+EBUILD ntpsec-9999.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
index ed5401217aaf..fdf4cc4b9cc2 100644
--- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -41,8 +41,7 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index cbf16e45b9f8..7cc6f74f6d34 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -41,8 +41,7 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index cbf16e45b9f8..7cc6f74f6d34 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -41,8 +41,7 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index 15c751660560..bc12e2937132 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,10 +1,4 @@
-DIST nomachine-enterprise-client_5.0.63_3_i686.tar.gz 28334138 BLAKE2B e90a6babe93a25da1a86d7a06bf0b6371857042fa9e1a97c5b18e7b7e8b2161be4a87d8b9e7068f1efe48406987c1f361fc579d28a69fa919a258c02a9fe6188 SHA512 27cde31a8805862617e898bf27eec99c9d848d455aea5e021e99da5cf920baf45d487bbeef75cd98142c6e65fa299ce6fc8c40ce8370f69698db6e0d6f00d937
-DIST nomachine-enterprise-client_5.0.63_3_x86_64.tar.gz 29300554 BLAKE2B bab6a47216207cd6a9e4705cec7829bfb504ca0b8fa29eb5a5941eec24df5c8456e8aa7704c91cc44b113de2609ae3229e698f90c96090c016586da9e14734f7 SHA512 aa9e37b4a9b52e534289f4879be2c98ee7db6aa0379270a1a757bfc6bc3550a258987c365329732f162ebd26d0b442649756c33426e28bb2c84c041d88f3eea0
 DIST nomachine-enterprise-client_5.1.24_1_i686.tar.gz 28378074 BLAKE2B a377dca915d6955d10d517754675a85a674e12088c1205adc6b99cc86685ec3551221cdd897f51f7f9da519388f9bd214c9828e530555202e1dd7506f1a02f42 SHA512 9ac3ee63a2c9dd7d6a110924a92718c7a9738e5bfbc7a3a30b2060a64c5eaeab3597e0d0532890e0e463869e47781528b6c7006d96634bf819cdd2415e35015c
 DIST nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz 29381273 BLAKE2B 491224421978a687a65a440ac069dfdef23cb8802872d51b1d2ae2e729696d85f082cfb6faf04e5dabf1bacb05849423003424738c755c1e043292d7b678d2f6 SHA512 18bbba7d729fd1ade04ad2d4812bd4b1bbe806036b44cbb8f9648e8bfa32008d72bc85d380fe1fc352ce92de50104fc43da030d56349502ac46a7ed6fa6afc42
-DIST nomachine-enterprise-client_5.1.7_6_i686.tar.gz 46115 BLAKE2B 36680839be172741405cad06d33bef6d9ea69360dd26c88b84bdaa15c9efc57ba934378277a7d9725f96bf70db1e6eda23b43f72417aefc10290804832bb26dc SHA512 97cc898063a4c27ec0eb6924fa0b778b4a7844b7bb9884477fc42c7407ada16182b2e48e0d45c5e21405afaf092a7fd9934446e7d15d63b35ff59e476d90c79e
-DIST nomachine-enterprise-client_5.1.7_6_x86_64.tar.gz 29373847 BLAKE2B d725a695b6c46630898ec8728750ce59103e5f6f763ee3c4d2d2448c44b70ca99d1c29945dbaa7fa32d899c43f3cff9a922d868bbb87e830a715b93f78ed4b45 SHA512 a297fae2a81ce0add4042caba05e2f5d0779f312a91ad9bc71e6498363fad2ec45f40a638b9b6dc1daea986f30dd6bff27896b74ae7ebf3a4cb37abeda126b2e
-EBUILD nxplayer-5.0.63.3.ebuild 1075 BLAKE2B 42b10a0a6c1459edd1863c2d5c90f3bbb5e6754e38d56921cf0bf7f5feaccc1e325a5a148bdca2b3c6dae8b599051534228989a0950332804019929d1946f4eb SHA512 50e8e4cfd30bc2b41a3ef5f5ca57b67b31f36b80f95ffd972034efbd25c999ba22112632760a5456c195ea30af78f1270b9b9f4be6d016dc54cce12de9e0f7be
 EBUILD nxplayer-5.1.24.1.ebuild 1075 BLAKE2B d4a0e827478a0d1be055e79724801cd5d3b779f04e727db79fb0434c609eaaf4a7cb78d65ccf0fd0c7c244e6ad7a57b9de68acfe3d4fcbba9ba5a4ff8bb4db44 SHA512 0a2defd467a465d57ddcf7aace9089997a236fe5a8a46e8733073532bd534f55ace6b8712ac78b52318fc5a05dd19a5fc4f83ca27475aeb4f4c0f073eb1f7a97
-EBUILD nxplayer-5.1.7.6.ebuild 1075 BLAKE2B d4a0e827478a0d1be055e79724801cd5d3b779f04e727db79fb0434c609eaaf4a7cb78d65ccf0fd0c7c244e6ad7a57b9de68acfe3d4fcbba9ba5a4ff8bb4db44 SHA512 0a2defd467a465d57ddcf7aace9089997a236fe5a8a46e8733073532bd534f55ace6b8712ac78b52318fc5a05dd19a5fc4f83ca27475aeb4f4c0f073eb1f7a97
 MISC metadata.xml 665 BLAKE2B 273027a6bd397147d76478c2822ab78a6fdd381074e34af1d410b68fbcbb12d0ca65b3f4ccbac09c7b9582630cd4345724b1b669eed16d1e94ba567d99344472 SHA512 7c07aeac4fd7ef22c8ffbb383715c0cc56643345a789cf01f9f436db667ae1ee06a3261f81137101cbdd1275ea8f3b09c440cf10e4b1b88f09e1e1a8be5db6f0
diff --git a/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild b/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild
deleted file mode 100644
index 2b4388cdf433..000000000000
--- a/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
-
-DESCRIPTION="Client for NoMachine remote servers"
-HOMEPAGE="https://www.nomachine.com"
-SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl:0"
-
-S=${WORKDIR}/NX/etc/NX/player/packages
-
-QA_PREBUILT="*"
-
-src_install()
-{
-	local NXROOT=/opt/NX
-
-#	dodir /etc/NX/localhost
-#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
-
-	dodir /opt
-	tar xozf nxclient.tar.gz -C "${D}"/opt
-	tar xozf nxplayer.tar.gz -C "${D}"/opt
-
-	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
-}
diff --git a/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild b/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild
deleted file mode 100644
index 67c1b6331100..000000000000
--- a/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
-
-DESCRIPTION="Client for NoMachine remote servers"
-HOMEPAGE="https://www.nomachine.com"
-SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl:0"
-
-S=${WORKDIR}/NX/etc/NX/player/packages
-
-QA_PREBUILT="*"
-
-src_install()
-{
-	local NXROOT=/opt/NX
-
-#	dodir /etc/NX/localhost
-#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
-
-	dodir /opt
-	tar xozf nxclient.tar.gz -C "${D}"/opt
-	tar xozf nxplayer.tar.gz -C "${D}"/opt
-
-	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
-}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 9a00e1ec9706..22fb99bff23b 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,12 +1,9 @@
-AUX change-umask-from-002-to-022-in-CreateDir-macro.patch 1985 BLAKE2B a3254e101ed22afc6ee75c680442e59f29f5df65a1cf3a75f21500c4aaa65a28506cd037ce4d6402837a12c948c17b56b9a79255458a197464370ce0a1735f0b SHA512 cc2fb4c3bc9e10aea73b65623b679f930a668ef758392e0d67a0a0a7e46b15df788fa7668b788d0b356fe367399f70f0012e1ca99b0a9e7452608d07d8db9e05
 AUX ldflags.patch 452 BLAKE2B c2adba2e1cb395eb2261397acc879ab8cb82ef776cfd5e53411761d1ebf91017cd5bbe14654d814798149d2838efc90979273a406d8ab8c72b343e8453d8ec5d SHA512 472d66b3071de94d4753773092c4781f5b4419041dc23b777bc13e8e4f4a1a40f245931479fc294c43a9e73f322e93b2055fb52a1070423d58dd32f23b0f61ca
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
 AUX omniORB-4.1.4-format-security.patch 557 BLAKE2B 3aef2fdebedfdaf91cac169aa04715c37509e6d86bfc03a0171af238e232f3d2b9b59e69f2a01c6b35d291a4dba199ec6cf2c80203ee58478318ca0fb5a89f58 SHA512 f2d9ca53f9dcdac7fc0224e435ee7d4eecaf5c948d406f94e81a9ae7770d192b18e846ddd245c5b74e77efb7030902b9f2817b13349f2a685caadb05633e14ee
 AUX omniORB-4.1.4-openssl-1.patch 770 BLAKE2B ffdb15d5e48ae4cad6ee0c75334c48634f450a9f128fe84b3a345ce72f4be551e203ed21978dbd0381b610b98cc64375dd4bd873a33b9403374980b7e17b1264 SHA512 b43adc69ec30a3a1cf6581e050ca93927b267c67623aafdb53db0135a8d4164c779a9d54249c8672e5d8f1c761681092be3c2908cb772820d019db1e2b1ba396
 DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c
-DIST omniORB-4.2.1-2.tar.bz2 2663504 BLAKE2B 3a5a48e7d85b5815b576067f16cf602ff9a44e547e4350d25d8ae43d8063e1bccb3da88eed09328224c88420870a64f331e6198f2f8911f4a718322ffcd3a8e0 SHA512 574bbc66f9eee87f06500c798e034a289e6104b3a921c8e956231c5c042a3306016b2aa69699eadef25edb97bed7580f7f27beec3893582a1ba16bb01f934fd6
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
 EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af
-EBUILD omniORB-4.2.1_p2.ebuild 2868 BLAKE2B 9e04f87b95f12c8c07910bc56a25a69d7896b655283d9e0197b43672ea8138b7cd4bd81997c8aa3e5a8ce2294f3cd70b26b5cbe80abc76eef3c1a3655e7f2214 SHA512 cd5b8534d4a9c6a745e2c6d3d51c69b7c9521ff8d46a93461f09cc5b113645357496ab42f597bc3de45c642c523bb512a70150a336c33c499127864c4f4bda60
 EBUILD omniORB-4.2.2.ebuild 2715 BLAKE2B 82966544593b19da2b9db6c8eb723f51d423cc26e2f4b6cae90779c9b8f45078660dd14848993cd78ee4bc8f7b303d868160e5485edca03e96861be39ec91b88 SHA512 6a35c3279d3ce09f462f166cc3c761fc36dae0fa6c30b632af4beebf944a3f4e47699b082696a2dc044982504f94000f3d28a62aaa80af4750a99e3a771a5002
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch b/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch
deleted file mode 100644
index 2aaab59ef201..000000000000
--- a/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2a0ea5621ef7cd9303e49657166dfd04ffa624d7 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 16 Aug 2016 13:55:08 -0400
-Subject: [PATCH 1/1] mk: Change umask from 002 to 022 in the CreateDir macro.
-
-The build system has a macro called CreateDir that does more or less
-what you'd expect. But before it creates the directory given to it, it
-sets the umask to 002. This can be a vulnerability, since we don't
-know who the end user will be building the software as; there may be
-untrusted people in his default group. In that case, one of those
-people can overwrite the scripts in the directory created by CreateDir
-before the user executes them.
-
-There is a kernel-level workaround for these types of vulnerabilities
-in the Grsecurity project called Trusted Path Execution (TPE). When
-enabled, users are not allowed to execute files in directories not
-owned by themselves or root. When that restriction is enabled, omniORB
-fails to build (due to the aforementioned umask).
-
-This commit changes the umask to 022 in CreateDir. This should not
-cause any problems (ha ha), and is safer than the previous umask of
-002. It also fixes the build on systems where TPE is enabled.
-
-Gentoo-Bug: 576040
----
- mk/beforeauto.mk.in | 2 +-
- mk/beforedir.mk     | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in
-index 83d544c..9f65c69 100644
---- a/mk/beforeauto.mk.in
-+++ b/mk/beforeauto.mk.in
-@@ -167,7 +167,7 @@ unexport SUBDIRS
- 
- define CreateDir
- if [ ! -d $$dir ]; then \
--   (umask 002; set -x; $(MKDIRHIER) $$dir); \
-+   (umask 022; set -x; $(MKDIRHIER) $$dir); \
- fi
- endef
- 
-diff --git a/mk/beforedir.mk b/mk/beforedir.mk
-index f804ed3..855bc4d 100644
---- a/mk/beforedir.mk
-+++ b/mk/beforedir.mk
-@@ -187,7 +187,7 @@ unexport SUBDIRS
- 
- define CreateDir
- if [ ! -d $$dir ]; then \
--   (umask 002; set -x; $(MKDIRHIER) $$dir); \
-+   (umask 022; set -x; $(MKDIRHIER) $$dir); \
- fi
- endef
- 
--- 
-2.7.3
-
diff --git a/net-misc/omniORB/omniORB-4.2.1_p2.ebuild b/net-misc/omniORB/omniORB-4.2.1_p2.ebuild
deleted file mode 100644
index 46b2de01bec8..000000000000
--- a/net-misc/omniORB/omniORB-4.2.1_p2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# The build system picks one version of python and sticks with it. It
-# tries to guess your version (based on /usr/bin/python), but for
-# consistency we have to force it to use one that we specify. The
-# highest version the configure script will accept is python-3.3, but
-# that's on it's way out, so we prefer to stick with python-2.7 for now.
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MY_P="${P/_p/-}"
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6 ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${PV/_p2/}"
-
-PATCHES=(
-	"${FILESDIR}/omniORB-4.1.4-format-security.patch"
-	"${FILESDIR}/change-umask-from-002-to-022-in-CreateDir-macro.patch"
-)
-
-src_prepare() {
-	default
-
-	# The OPTC(XX)FLAGS variables aren't present in these files, but we
-	# will set them when we call emake.
-	sed \
-		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
-		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
-		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
-		die 'failed to switch CFLAGS variables in the makefile includes'
-
-	# The out-of-source build is suggested by upstream.
-	mkdir build || die 'failed to create build directory'
-}
-
-src_configure() {
-	cd build || die 'failed to change into the build directory'
-
-	ECONF_SOURCE=".." econf \
-				--disable-static \
-				--with-omniORB-config=/etc/omniorb/omniORB.cfg \
-				--with-omniNames-logdir=/var/log/omniORB \
-				--libdir="/usr/$(get_libdir)" \
-				$(use_enable ipv6) \
-				$(use_with ssl openssl "/usr")
-}
-
-src_compile() {
-	cd build || die 'failed to change into the build directory'
-	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	cd build || die 'failed to change into the build directory'
-	default
-
-	rm "${ED}/usr/bin/omniidlrun.py" || \
-		die 'failed to remove redundant omniidlrun.py'
-
-	cd "${S}" || die "failed to change into the ${S} directory"
-
-	dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
-	dodoc -r doc/omniORB
-
-	if use doc; then
-		dodoc doc/*.pdf
-	fi
-
-	cat <<- EOF > "${T}/90omniORB"
-		PATH="/usr/share/omniORB/bin/scripts"
-		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
-	EOF
-	doenvd "${T}/90omniORB"
-	doinitd "${FILESDIR}"/omniNames
-
-	cp "sample.cfg" "${T}/omniORB.cfg" || die
-	cat <<- EOF >> "${T}/omniORB.cfg"
-		# resolve the omniNames running on localhost
-		InitRef = NameService=corbaname::localhost
-	EOF
-	insinto /etc/omniorb
-	doins "${T}"/omniORB.cfg
-
-	keepdir /var/log/omniORB
-
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/omniidl
-}
diff --git a/net-misc/pmsvn/Manifest b/net-misc/pmsvn/Manifest
index 85517e9b411d..b06348cb1cad 100644
--- a/net-misc/pmsvn/Manifest
+++ b/net-misc/pmsvn/Manifest
@@ -1,7 +1,3 @@
-DIST pmsvn-1.0.5.tgz 5867 BLAKE2B 13077a64affb6118d8f3761b2052bfbfce62c2e346735ba2d88695653ed92cb38c6f3fc738eedc56f90010e44351d1de7aba695ef01475f0e95d4d8d2dd510cf SHA512 0fc9d06a2911d361d004e7f809bce7292f4fb1ba79152defcede426a15a7792d70c05d527d7b1627c4094bcb3e180d77684e9c55aea7df5e4e1e821d943d0221
-DIST pmsvn-1.0.6.tgz 22021 BLAKE2B 7b9a71c0816694d617f1ad31f2a799d487ebe800f7c42e5d059b76a565fe80c2a3af791dfc8eda44f31c3e8128b8035906526262220b20ba599e073d6603db82 SHA512 e06ee3f43468a0fd71799b08ba3f1dc8dd26cfb1ea8d1409674418bfa27db0f095edb2b60f61ad6aeb68a9a3f76e987b52fb9b0c3d9d54d82c790668af68b541
 DIST pmsvn-1.0.7.tgz 7565 BLAKE2B 2af33cd57312ef9b6d3f46f429fe5ba9e103dba0b984a8c1901f52fcc26abd0fda0c23ca57272f73795529372531a219be85733c7c18fbd5e3273ef9ad2e4257 SHA512 1bf205ec142c6ea018b9f606a67fb97c87aaefa56e0dbd848db6c09f6ce6115856b94c2b75cc4e923be8d66b322ffd8adeca88bfe1d3cdcc72377adfed3976d4
-EBUILD pmsvn-1.0.5.ebuild 893 BLAKE2B 87b8c381bc1e48796c0b04858a9f8db77a7a9d5f85e8955a7deae624727125df018be21c233d974b442d66d909e14e067e00083c20d5db52aa79a23ff4ca6db3 SHA512 79218d8b8fb8bfbcbb2d752ca5fac74a8c6abc44443ae43d9e7b163c61ff0b4e1c88c2104abc614524e9f9c373b315f25bb538a574346ef112f353add5751ce7
-EBUILD pmsvn-1.0.6.ebuild 846 BLAKE2B 7a1312790142dd0875256315b84ab28813adc10d0d284b9b78db5d90a33d1f187967ada1e5a79e93d27ea657cffcbdfb921c07ec8d8a33dea7eed1e24a8cf1ef SHA512 a3f698fe2a94a8ea97ef77b53e2dcf4bf6561d94e0e25e7b7694e4cb09f88042ab2a9211bf555d9f6ea17d1550e8beced4a516fd37acca20718e81ad5f419097
 EBUILD pmsvn-1.0.7.ebuild 782 BLAKE2B af5fdce97b76f4c25b9fe39dbbe812c9b93b9913f3ee73bb2caa993e4c8df584ea33698101fbbdc0d3c7b04b0e0ac1b53f0d1b03bb3a12237ad5edde36be8638 SHA512 d3ebefd72550e338c5d67f9bcede8a339f528744da2de3e62fbb9f03f07b66987fd34a354fcc19f700c92ce310486466544a260c2b2f0d7be37f63f8c8ebaab2
 MISC metadata.xml 242 BLAKE2B 33fe71c26297e4323da4bc063f8eb4578e77d7bb1a8c7f2044f4624680a2efb008596d45780c2abfbb867258c42051f955798279d57f51ee7083a25fc15549d6 SHA512 4b9a6787713f824e4d7b7f54a8c4031c97b519fc2d92856486799a8e6ca0c5231cbf2c781723d79a5a736949ebe7c81c667af61a64aba3483b3dc4c3d55c2465
diff --git a/net-misc/pmsvn/pmsvn-1.0.5.ebuild b/net-misc/pmsvn/pmsvn-1.0.5.ebuild
deleted file mode 100644
index 10ce2da7ad48..000000000000
--- a/net-misc/pmsvn/pmsvn-1.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Server's configuration management and monitoring tool"
-HOMEPAGE="https://sourceforge.net/projects/pmsvn/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-analyzer/nrpe
-	>=app-shells/bash-4.0_p37
-	>=sys-apps/sed-4.2
-	>=dev-vcs/subversion-1.6.9"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# move configuration file from /etc/${PN}.conf to /etc/${PN}/${PN}.conf
-	sed -i "/etc\/${PN}.conf/s:etc/${PN}.conf:etc/${PN}/${PN}.conf:" ${PN} \
-		|| die "failed to fix path for configuration file"
-}
-
-src_install() {
-	dosbin "${PN}"
-	dodoc README
-	insinto /etc/${PN}/
-	doins pmsvn.conf.sample
-}
-
-pkg_postinst(){
-	elog
-	elog "A configuration file sample is located at /etc/pmsvn/pmsvn.conf.sample."
-	elog
-}
diff --git a/net-misc/pmsvn/pmsvn-1.0.6.ebuild b/net-misc/pmsvn/pmsvn-1.0.6.ebuild
deleted file mode 100644
index 844512be8fff..000000000000
--- a/net-misc/pmsvn/pmsvn-1.0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Server's configuration management and monitoring tool"
-HOMEPAGE="https://sourceforge.net/projects/pmsvn/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-analyzer/nrpe
-	>=app-shells/bash-4.0_p37
-	>=sys-apps/sed-4.2
-	>=dev-vcs/subversion-1.6.9"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# move configuration file from /etc/${PN}.conf to /etc/${PN}/${PN}.conf
-	sed -i "/etc\/${PN}.conf/s:etc/${PN}.conf:etc/${PN}/${PN}.conf:" ${PN} \
-		|| die "failed to fix path for configuration file"
-}
-
-src_install() {
-	dosbin "${PN}"
-	dodoc README
-	# No sample file anymore. Autogenerated on first execution
-	# insinto /etc/${PN}/
-	# doins pmsvn.conf.sample
-}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 75ab6b0d7029..8cf4444eadf4 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -6,13 +6,15 @@ DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a
 DIST rabbitmq-server-3.7.10.tar.xz 2569968 BLAKE2B 90a0162c9e573f1b99526c7a6cdec38061c3e6f355377b51b920a62b0d61c5f13a21b69d627b49c4c6702e517dfba4c856664e9741d9ad2d21171a3b46770799 SHA512 092df82ac00397fc90ecd69c712985f055ec25fd0ba427fce9330df75f5fe6d788aabc9e25ccbf63c8c3cbe111816a226fb63479a16d8530a53b23ab23b2598e
 DIST rabbitmq-server-3.7.11.tar.xz 2593632 BLAKE2B 4455b47a36ed4b642f0c30a34d018f76ade7153ec8eb872728f0b6baf6d431dbac71b3e27e2661924155950836be80faee23d4fd663d0f852740c143ac24658c SHA512 a54034ebc919be0c6f58832ea5d47f8e3964e30ca9185c59bf882c3dc17d1df5b6e1ab0460f75e8cf0cc325504cc3a674f7cb44a5d7613e16a5ad8b721a286a4
 DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9
+DIST rabbitmq-server-3.7.17.tar.xz 2808260 BLAKE2B 45a77ebb81d1199219b3638f03698d147b5dd43160647f829163ee35607a3d7ada281b7156f555614b1eec7295e32d241410b8a691bccab2f40f1c548d2e0b51 SHA512 33af52a3f95854e7b3e067308181e37c7b9715b24e0ceb690d606f3e69a8be9cab258a18b68681350c31a01e4fa530825473bf652c7ac10894d36af4fa573a38
 DIST rabbitmq-server-3.7.3.tar.xz 7382708 BLAKE2B 66d4c2fcb80ba5a851fb5d2bee91d41b04a05e70e74ac2b3adae8aebcaaa01de7ca47772c38deb4e9c25c19f67c2bbd6c4fb3b71480d73986540c60ab6dac02c SHA512 337edddceb66c44b5cc3cec710918385306d9db97ae340752bc39a1be39229a58b3bb1c96763a2ce441a6d46135f2aac8cec09fc33591d0e14e7571c9507d79b
 DIST rabbitmq-server-3.7.9.tar.xz 2551456 BLAKE2B b64037481254f39300fecf53c1f8eda69df3fdc92bbacc6f6edc9d89e167e4cdd0708482b0daf680366986a28f4a3562d4af7dcf427604acc79145d24ca41bd2 SHA512 4a9fd452ad878f20c3a269d2dc0fa63ef7dcf99d2ee1ca46ff693df8d92ae0ef5a05453a6aaaeb00db643b2209770b15216fdff109f27d1e531e363a99bd4a2a
 EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a
 EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50
-EBUILD rabbitmq-server-3.7.10.ebuild 3002 BLAKE2B 79711c2a8713661373d6bb34c91a5580255676d067c770073c77eb99ee3bf441a1416e64daff3acccdbec839864d694e6c9aba246bdc18529c65b203c6a91610 SHA512 8e4e02f70bd52215fc8d3a46510c2293607d9badc4f0e1ec9ca04a5825de84c7eafca5647cb63ea2d66fda615ddfb91654ad7948aacccd800ffd82380e1a9043
-EBUILD rabbitmq-server-3.7.11.ebuild 3002 BLAKE2B acf516d61dcf314336818dc5773e3248622e8a242afe65d48d075ecd25e3627d5f6aca7fac34f372fb66d08ce1c1d7874b1e06b9e7b183ff1e2dbeed2a17c27e SHA512 e5045a138bb87d96cffbf39b82baec2865f326ccb2b77d19cddf7e5b36378c67eeaeb31d09dad99aa5887c591aa67c7ceb8a53424f98fdc463991ca11a4bc4d6
+EBUILD rabbitmq-server-3.7.10.ebuild 3005 BLAKE2B c6a3f5d0161ff227f8b76e130b690010df3710b2952795b55a19e3081a0e293113fd534f10bf598c93ae517631e9c5971fdfc79586d0536f0d6e5656f1a2c241 SHA512 f61267f217f0271f05519aefff7f04992f93532818282cb65c1d2e0a7132cd51a44ae56aa085931ddd620304268cd5cf99381cfb4e0279dad13b521bcbb1c583
+EBUILD rabbitmq-server-3.7.11.ebuild 3005 BLAKE2B 7a297aaac0f5a47a8f6dc18b07751d04c83155409dd89e8a749c5b07b4df8d45c30e13a598fb5ec9fd106577b976bf4b6619e05e4b8eddb32a11e6ed81c2c0b4 SHA512 c1c67b2d603d69735d0ac8cac4431f909dc014642875c498a4aa9cd833ba1e0b840aa9c9cad58a31ca7c7179c2f89f21d705e0d08eff4f787db74393fa30d05f
 EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf
+EBUILD rabbitmq-server-3.7.17.ebuild 3107 BLAKE2B 9addb1aa27f75285878de8689555b079fc9a603c93b22226aa06cb84d9b9185ef5ed26fe8740a5cd776526c68b96792bf338494b5dabd5f80d1b749359bc58e8 SHA512 5f1da605aca09ab102cf3343b96c6db5a2b9cbc2b54f5ffedd547db1ee581b297b3955e668d497e7dc6842e56753be6e96af6b09c368e4d8df8e0d6e852ea64c
 EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 6f240a3325c446277a3779721dde982daa2528697118290c48d2ab108369fb781c538b19029662e6de632ace9d00d9c2f0df4e9686064af4174617efe71c27e9 SHA512 63f9528982875d523b2ef4f9c5a064b647c0edba6385ffe27372989cc962bae4167c60ab647eea338bebc7e4fc52b9063d477c5db5c83ad757e8432dc883aee2
 EBUILD rabbitmq-server-3.7.9.ebuild 2998 BLAKE2B 7c77aa3c5bde60e8ba67529591a9883337b30691a08d8256e168b2dc3bb95eb7d87645db57f065f47ffbc34036c519250a5261cf5f7db1fd9b8667f0fd8bd640 SHA512 9d3b4f8c4256433dc69ea6f3ff0968640a810cad780cb8bb971f76615248374f20b5eac129e0ddafde845a97430f7a7676243d5f6fb43879560e56edfe14a53a
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
index 7fd02de44fd3..a6aca3854916 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
-RDEPEND=">=dev-lang/erlang-19.3[ssl,smp]"
+RDEPEND=">=dev-lang/erlang-19.3[ssl,smp(+)]"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	app-arch/unzip
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
index d1d04cce6ec2..edaf30210192 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
-RDEPEND=">=dev-lang/erlang-20.3[ssl,smp]"
+RDEPEND=">=dev-lang/erlang-20.3[ssl,smp(+)]"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	app-arch/unzip
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild
new file mode 100644
index 000000000000..c403645186f1
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+# dev-lang/erlang-20.3 cloud be used but 21 is easier to specify as it always includes the smp stuff now
+RDEPEND=">=dev-lang/erlang-21.0[ssl]
+	<dev-lang/erlang-23.0[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.6.6
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "https://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index c7c4d9db513a..1593ed5ee445 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -12,4 +12,4 @@ EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce3
 EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8
 EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206
 EBUILD radvd-2.18.ebuild 1585 BLAKE2B 4b7ee406b6a20b3ad44e1dbc01d47db91af0d6ea623e1939d6030c46aeeeb651a7d1e40ea1dc9a611c907ac77c7db34b0ec130b8946078c2bc6ab59d3fb568e9 SHA512 b715af5af67cb90b30e43f79392db9942124e099151c2411a885809f586eff843428a0546e7783971e9c535aba7d3e6131986cee511fc72d4f3ab3874f2c549e
-MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
+MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
index 3ffdeb4af3b5..a0f2278d1ed5 100644
--- a/net-misc/radvd/metadata.xml
+++ b/net-misc/radvd/metadata.xml
@@ -5,4 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:litech:router_advertisement_daemon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest
index 3fea1b7dac61..cba64fa2679f 100644
--- a/net-misc/rwhoisd/Manifest
+++ b/net-misc/rwhoisd/Manifest
@@ -1,8 +1,5 @@
 AUX rwhoisd 280 BLAKE2B 8d2e54026175bb53897e69a61abf83b5c7548acbe52555f6adbdc88a07f94a88e3486aea81dd2d3043a99b83b5bc7b4255014f3df2687d463ab60a86ef2a37b5 SHA512 cd278c6dd828d7f07c50147e5dedad7cf8c8e44926b4717fec442b91d891838b59f61dc2a51968df5b4b1dfe181958148a9a7f9e93e65fc815b69c6219dabd6d
-AUX rwhoisd-destdir-1.5.9.5.patch 1007 BLAKE2B 3e7ca5d13ceb724ab212b7a6b2d4186e15b2a524b07fdd40268f8eb1ec7983270ad6240c1eea2ce212353bab7ba94d71a947bef4cd5a31879ad7506d823ce4f8 SHA512 9fc08f639cd087c1cbbc3139eb648fc4afed1c8aa299fcec867c3938a773e8c0ca9b1be40acdc61026ded1f012df9eea2bb713ec1207464f1cd66d215c2fa221
 AUX rwhoisd.conf 154 BLAKE2B 1f80fde2a8ed3066c4c5b5a3a17ad735a6bef56bb897cb41bbc7d3e314803a9e3b06dc957077b28b3590435b7a18a0827f3f4554247509ea21bc0d5048b08cf2 SHA512 882d93ddf72f6a909ab6a33a6f5026e35f52ae025a9e4653cc0449c4b0ab1b2fda5799e1b44b19c620eb98337270a7a1c1eb9cff66af49832adf9726f4713bb8
-DIST rwhoisd-1.5.9.5.tar.gz 491600 BLAKE2B 3e6857e7aa260fb6d714d53b63279517e15fede29be0113541213bf1a9f70bf160486fa42561fb551e019dbd6d5d773fb01a67d3da794dd17dc5978f9d3f2335 SHA512 d9227cd700cb14e0c83003c7a8dff43f859eba58390f4ba74b03c58fe629bcc9e8a39f2aaf7ce9b55aa4f17f43fc54fed9ba05a29bcbe1df5fc1340202d7b04c
 DIST rwhoisd-1.5.9.6.tar.gz 491955 BLAKE2B 97587fc6a728cde58bc5049a9bf27ec1673ce7beb751aa0de7c787d08185b597e16a4920e89fa5aaabc6e7e1b5dfecedc50aaf55cbdbe7f85a43d6a125848cb9 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52
-EBUILD rwhoisd-1.5.9.5-r3.ebuild 892 BLAKE2B f35bbf5a22077d8cde0661adafb72d93f77b898627e16cdab220f06cb6cff593ffd7d28fc436b16edbb3d1bf7c9882984885b4ba97f591d56d18bce552dcef84 SHA512 ba47902133b686606c3aa64571ca7d9bf8530201971fe7f8abd750714dced074e4365e2c2418238f88b62bc3a40884462cd67e6a44d56d8b756f5ba0b9df40a0
 EBUILD rwhoisd-1.5.9.6.ebuild 873 BLAKE2B afb247fb325e53dd810912b5334cb9ec239a8e41008b49d7b8bcf425010664c7489be82c02f5c4a53598fde731af6a36fab822519a295f8d2d5f39be92c8b2ea SHA512 8959505ad0dff653851c312c6be15302163d5ba0b9190ec339a9f6180f2ccd838d5e520018463a0fb0b94567d9722ec2a06fdff3950e17444d40e6ab724acf67
 MISC metadata.xml 225 BLAKE2B 19246ee217a79a478dded3e88f6eb021a574016a0bb6dc118ee6dbece7b9cbc5df12e36d8585c71416cb4e3d5533edc652d686674044b188a7457094f53a5fa4 SHA512 0b610f2ab50e3c82c7e3fb9bbe1af0ce84851de95ad8b8caec506e4d8260e3bd64995e7d51d447c29bbd4696285a67d14fc1f10ceab9185e4501802986e27980
diff --git a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
deleted file mode 100644
index 6cd6b28f2e51..000000000000
--- a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/tools/rwhois_repack/Makefile.in
-+++ b/tools/rwhois_repack/Makefile.in
-@@ -52,9 +52,9 @@
- # procedural
- 
- install:
--	if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
--	if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
--	$(INSTALL) rwhois_repack $(bindir)
-+	if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir $(DESTDIR)$(exec_prefix); fi
-+	if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir $(DESTDIR)$(bindir); fi
-+	$(INSTALL) rwhois_repack $(DESTDIR)$(bindir)
- 
- uninstall:
-	$(RM) $(bindir)/rwhois_repack
-
---- a/sample.data/Makefile.in
-+++ b/sample.data/Makefile.in
-@@ -10,7 +10,7 @@
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
- bindir      = $(exec_prefix)/bin
--etcdir      = $(exec_prefix)/etc
-+etcdir      = /etc
- 
- srcdir	    = @srcdir@
- VPATH       = @srcdir@
-
---- a/sample.data/Makefile.in
-+++ b/sample.data/Makefile.in
-@@ -17,7 +17,7 @@
- 
- DESTDIR =
- 
--RWHOIS_ROOT_DIR = $(DESTDIR)$(etcdir)/rwhoisd/samples
-+RWHOIS_ROOT_DIR = $(DESTDIR)/var/rwhoisd/samples
- 
- FILES = \
-         a.com \
diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
deleted file mode 100644
index 0ff7fbf1072d..000000000000
--- a/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic user
-
-DESCRIPTION="ARIN rwhois daemon"
-HOMEPAGE="http://projects.arin.net/rwhois/"
-SRC_URI="http://projects.arin.net/rwhois/ftp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	sys-devel/flex
-	virtual/yacc
-"
-
-pkg_setup() {
-	enewgroup rwhoisd
-	enewuser rwhoisd -1 -1 /var/rwhoisd rwhoisd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-destdir-${PV}.patch
-	append-cflags -DNEW_STYLE_BIN_SORT
-}
-
-src_compile() {
-	emake -C common
-	emake -C regexp
-	emake -C mkdb
-	default
-}
-
-src_install () {
-	default
-	doinitd "${FILESDIR}"/rwhoisd
-	newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd
-}
-
-pkg_postinst () {
-	einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd."
-	einfo "It is highly inadvisable to run rwhoisd as root."
-}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 2989f1b23261..eacadd020f5e 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,8 +1,4 @@
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-6.1.7.tar.gz 2260217 BLAKE2B 96d032d5d9332cd40fabc135a132ad96e74520e677ab3071c3bb5765d17fb2ec0f7e243a8110e482137ce599672b5513b3e83d1d2ebb0cf4be66149a2891e068 SHA512 545f47a93c16fff9c000add19f55784c08878cf3b1448a8307fc0d25f7f5c35d671dd20940842c4f9e97df3ae3754fbbf170d0669097d67484226aad60ba09da
 DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
-DIST seafile-client-6.2.4.tar.gz 2345481 BLAKE2B 7efc25830c6d4b2203390ae453d2e9162b62e477cc12f58a03c9fed0730630c8c077f37aff2b467dd960671a3ab9f41b18be32283bcc3e6b597b9a4f1cb99688 SHA512 754d317e812d340c1a3d4eddeede6d8fe535b02c2f0aca4bda07c020389dad3bd7bc937b1c13ea7ac8ee3e833c8e2fe8f7b74f1051395b5a35deda46d727beeb
-EBUILD seafile-client-6.1.7.ebuild 1333 BLAKE2B e43343c956390b439e47bf7738b2fb9999b451e6e51c3db0bed3cf05e9d1c9628bf2c6a307663fe182b4db60151da302c250537f1dd0cd145bc6384f8eea878b SHA512 99e4fa02aa9270e7467a7c719f527a8bd892d56fa99fe011fe198fe9d61c652ad62ff4ab3723ab1484821a997d282dcaa9acbbb30bcac5936961e93ac8d6e121
 EBUILD seafile-client-6.2.11.ebuild 1079 BLAKE2B 1c0063f8e7a59724543578fd7b86afba18d613d310713446790c4fd01e5f0a0d0a15f0329dfa60e55c80b0cec8f190ff137ebf3bb533fee5a003e60385521e93 SHA512 7fd40b48cbf3fc6533c56450f8fea78aa3685ebe9c04e40172ae18a5ac8f2a25d6e05567d6b35385485e64a3dd51336b2fc69f6baa9381d302d0a9f1410f60e5
-EBUILD seafile-client-6.2.4.ebuild 1310 BLAKE2B 04ca777eb8579e5f9a03cfada1364606cacf6cb0b27268bfdcc9fb11074e66faadcfb64f2d835eceaa4b2cf1b6b3cd63b89e6637e44776025c211d1f2be3f83c SHA512 d1054c6d049d25bcaf5d172d7707b5b06cdc670aed8c0cac5f0f083cbb1bda7ceab7c5ba22c30b55ce8b62ae9a27c9be51bdd847412250080270be732450d305
 MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
diff --git a/net-misc/seafile-client/seafile-client-6.1.7.ebuild b/net-misc/seafile-client/seafile-client-6.1.7.ebuild
deleted file mode 100644
index 08b04cd8efc6..000000000000
--- a/net-misc/seafile-client/seafile-client-6.1.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-
-RDEPEND="net-libs/libsearpc
-	=net-libs/ccnet-${PV}
-	=net-misc/seafile-${PV}
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
-	if use shibboleth ; then
-		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
-			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-6.2.4.ebuild b/net-misc/seafile-client/seafile-client-6.2.4.ebuild
deleted file mode 100644
index 8e68d960c5c9..000000000000
--- a/net-misc/seafile-client/seafile-client-6.2.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-
-RDEPEND="net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
-	if use shibboleth ; then
-		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
-			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index ff463161f5d5..f292b1fdaaa9 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,3 @@
-DIST seafile-6.1.7.tar.gz 825734 BLAKE2B 204ede4870f15cbfa9da7e51f565078290b4d03d36a0f8f7a35d54ca1f26c414c350ac05628054d290723b067dfda45aeec1777a2d32e1b376654323106083a4 SHA512 5ae27b2f8e84d57ecd9d81a42fab9611d56a260adb027fba427a700d0d17cd215b3c5b5b37df7e14181bb9ae7df611df9895181de135425ec42da44511d2545e
 DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
-DIST seafile-6.2.4.tar.gz 705760 BLAKE2B 2fc0d0c370f3a3de11cbee017be3599aa2b099c08de75b23a86a0b586ab83d928d4305f2e2c0571b3b6b1f7de1eaf23a1868febcc3db9e65f08072826a5dd480 SHA512 f9d95990e913ff63835c83d429df6be66f78c993df0c38bb029090a20dfbb4d789e18e679450634f0c6d918c7ff824347301412805b86f797b81719aafa43f9a
-EBUILD seafile-6.1.7.ebuild 1091 BLAKE2B dab7de91b98b99108a2aed235ccfdb5b72e3a3aa5fb56f0ae8cdd5611b6c0b72656a80bf02de318f5ee5656591e73c734417dc4df70db37cc63a710e459f15d6 SHA512 bc9b4513c3c7217c26a0a71dbd140197fd4c762e3718796e1a9a3f871d7a2e838e59525cfff0ea52e0687c8b7ff30b924a6e082eac2dd1617b4b6638259ba290
 EBUILD seafile-6.2.11.ebuild 1048 BLAKE2B 8427d6e2fbaf0c0cd07539c75b2710773f802bbf64b47cc19c5278faa767f8ec8ebd6b48d81410f1ec9960bac6baaf1eaa6d432f36629572db510cb055d2f2b2 SHA512 8bb17b48494317a758d414c56db5751a229859072aa6634cc826208eae48c4cd21c1659b86064100032f1d685140fc3c55e2df623ac5aa5f3bb29344075e29ea
-EBUILD seafile-6.2.4.ebuild 1092 BLAKE2B d6d273f7665619cca3214411dba88c36fbe6e601b81dff00decaeef82e35f598956e52b816712ccfd46d4dccc9c5cdf34676115e1d8958a687906409c4915b2b SHA512 0c1f06cb14353dfb65d21387d6803834d47807ca6b305fc4a754caab706084d91404c41d0510175f04024d9f6048b121ca782d32e4ac239eeaefaab7bd6d2ac9
 MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
diff --git a/net-misc/seafile/seafile-6.1.7.ebuild b/net-misc/seafile/seafile-6.1.7.ebuild
deleted file mode 100644
index 5e871abceb5b..000000000000
--- a/net-misc/seafile/seafile-6.1.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	=net-libs/ccnet-${PV}[${PYTHON_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/jansson
-	sys-libs/zlib:0
-	net-misc/curl
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"usr/bin
-}
diff --git a/net-misc/seafile/seafile-6.2.4.ebuild b/net-misc/seafile/seafile-6.2.4.ebuild
deleted file mode 100644
index 2d7f5c030463..000000000000
--- a/net-misc/seafile/seafile-6.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	~net-libs/ccnet-6.1.7[${PYTHON_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/jansson
-	sys-libs/zlib:0
-	net-misc/curl
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index 326557a04591..aab5dc56c3d0 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,10 +1,5 @@
-AUX ser2net-2.7-b230400.diff 754 BLAKE2B b6f876fed39de8ce88eb9df89d25e2975fb5a9a1d511434a0adb5493e67cf0fba24652738310fb3a3d6661714f0d26b2717d0deea1bc0ceff965a6cb13b4b615 SHA512 47f369b23c6f75421ed143abb75a0d9b46e7ca1ee2c59f17e6d75f98bb61d9fdf4e0792367e732ad60fb0f6804af6f316b291d7743d7807df8192bbdef3363ca
 AUX ser2net.confd 879 BLAKE2B 41e159da088c7db25415da24f545435e4e1ee94af9f922ddb3accc392a5fd9ec0517e79a6a37d9dcfae6911739306e02711580ce1c0059fb1f5e38495ebe929b SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501
 AUX ser2net.initd 1528 BLAKE2B 509df2c77f6c8495a669aaf017c9809f342ec9bb50033461f94a5a4c729d7be49e8ef3cfca2fcefa49769ba98e5c53b743dfe67b58ae1189ec8d75e957716fa1 SHA512 d98032d8de463d2023f087106ff68367077dcd4680c673e41e50e42c91578925c72f741508e2b36b0711478e9bc12c61efef76d57c578bc726950c9d6fd2f5c3
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
-DIST ser2net-2.7.tar.gz 355064 BLAKE2B 682210619b26d6d34b8ad26559fc20f73febdf8c106afa7cd64c272af5ed9353186db2dcc899f58cd93ae82f5df45b66d025c3f3e88cee0ae1a25252e5be2d8a SHA512 39ee99031fad45ea8eeeb9e8bec343e8d6bd58c818f56ec01a05c50ef6d8ed845c6521a6d4a306671ed26959bd2df5c0b29a6b4399103815923cf958c1891c16
-DIST ser2net-2.9.1.tar.gz 357820 BLAKE2B 2068d9aabad23e647d71baa2951ebf882e2575e457606b15c18ac8a2cf5ea55a251f19b553fe926f37ace51de4b4d33de4a32a0ebd5f33a88c0a231f5e1c6ed0 SHA512 9fd0efc853993b70c0c632a7059df7a04c832f85491194c49dd8b384e1bb1a576ed9cfe28088cc181a2f7084c88dc6ef6dabbc4ead5ad9339a7becebaa6fb8e7
 EBUILD ser2net-2.10.0.ebuild 622 BLAKE2B 22edbf4209bf735f55b5c31adef27d77e82b11ddaa9cd1e19c274d47e498d84d71767d93b8889a9b45ff515343614d797230222e8fb79bdb7c80e830718a2991 SHA512 9d6f473e03ec1d181dceb261e98324db26a1cc78006ba8c66e74bb733115bd1db3cec19fcb8986323aeeba7fecdeb874d727c51624fb42064dd62649d61cdb1b
-EBUILD ser2net-2.7-r1.ebuild 847 BLAKE2B e3fc02c86a660671e5767c89296ea2852a68db014552ef12a6b01b79f6119c1e83f1c901ad78eeb84255e2332f7dd4beed1e25620a2243726c8173ec2b500aae SHA512 f2acf54587c7791b9516db5488eaef6f5fba022a5d43ab6451dae3fda14a190dde790eba2ebce0d1bac488eeb4a90e0496663b243f19d80b5422a3f9583a7345
-EBUILD ser2net-2.9.1.ebuild 626 BLAKE2B 4a8ceeb1f02be88b95ce5e62feb0170d74043a3abfcac79242b373b25aa3a14ac52c8446fbf4509ef0ec5a18b933980a0f5954c48d71ce0e2196c0e4837b2ff2 SHA512 5c401b1795a2b2a46af9af947891702d1074a8edc6f3e252874531b8325d1a0474871e5f35a2c3684a4d311c06cda74fa57ffc66594fcd7c7d010e52e8ae90c3
 MISC metadata.xml 244 BLAKE2B 31c4948eba2d8d59d90f9f49328291d0d678db43eadabae9c482ccc82e2343160809308451a5f014180a4e017eb85afd24e64b6f630219987b3bbb4df45fd170 SHA512 c026f437d46c264d228d51fe7e6d9fa32e7647aad09124fdb77b2c602885609135c63f2b8fae8092b5c68ba62cf4bda87bc3c321f2918bc2f3e77c4fb42a10c0
diff --git a/net-misc/ser2net/files/ser2net-2.7-b230400.diff b/net-misc/ser2net/files/ser2net-2.7-b230400.diff
deleted file mode 100644
index 5e567c118eac..000000000000
--- a/net-misc/ser2net/files/ser2net-2.7-b230400.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ser2net-2.7.orig/devcfg.c	2009-10-23 14:23:25.000000000 +0200
-+++ ser2net-2.7/devcfg.c	2012-07-17 21:03:49.708603108 +0200
-@@ -113,6 +113,9 @@
- 	} else if (strcmp(pos, "115200") == 0) {
- 	    cfsetospeed(termctl, B115200);
- 	    cfsetispeed(termctl, B115200);
-+	} else if (strcmp(pos, "230400") == 0) {
-+	    cfsetospeed(termctl, B230400);
-+	    cfsetispeed(termctl, B230400);
- 	} else if (strcmp(pos, "1STOPBIT") == 0) {
- 	    termctl->c_cflag &= ~(CSTOPB);
- 	} else if (strcmp(pos, "2STOPBITS") == 0) {
-@@ -190,6 +193,7 @@
-     case B38400: str = "38400"; break;
-     case B57600: str = "57600"; break;
-     case B115200: str = "115200"; break;
-+    case B230400: str = "230400"; break;
-     default: str = "unknown speed";
-     }
-     return str;
diff --git a/net-misc/ser2net/ser2net-2.7-r1.ebuild b/net-misc/ser2net/ser2net-2.7-r1.ebuild
deleted file mode 100644
index 06e6708100e1..000000000000
--- a/net-misc/ser2net/ser2net-2.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base autotools
-
-DESCRIPTION="Serial To Network Proxy"
-SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/ser2net"
-
-KEYWORDS="~amd64 ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-IUSE="tcpd"
-
-PATCHES=( "${FILESDIR}/${P}-b230400.diff" )
-DOCS=( "AUTHORS" "NEWS" "README" "ChangeLog" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myopts="$(use_with tcpd tcp-wrappers) --with-uucp-locking"
-	econf ${myopts} || die "econf failed"
-}
-
-src_install () {
-	base_src_install
-	insinto /etc
-	newins ${PN}.conf ${PN}.conf.dist
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/net-misc/ser2net/ser2net-2.9.1.ebuild b/net-misc/ser2net/ser2net-2.9.1.ebuild
deleted file mode 100644
index 315fc015e035..000000000000
--- a/net-misc/ser2net/ser2net-2.9.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Serial To Network Proxy"
-SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/ser2net"
-
-KEYWORDS="~amd64 ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-IUSE="tcpd"
-
-src_configure() {
-	econf $(use_with tcpd tcp-wrappers) --with-uucp-locking
-}
-
-src_install () {
-	default
-
-	insinto /etc
-	newins ${PN}.conf ${PN}.conf.dist
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 601c953fda61..37348928f827 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -9,4 +9,4 @@ EBUILD socat-1.7.3.2.ebuild 1525 BLAKE2B 8ade6fec17362a75b0e56798dc9496058e39cbe
 EBUILD socat-1.7.3.3.ebuild 1475 BLAKE2B 38a503d4a6d738e70a61f4643951426ccd70ea80d08135500560563bc18b7c55fa5c7aef45aaa66ac2bf1a90151535b9aa208253b3d10367125a326cc5387578 SHA512 01874d51215e91181226e8ff8586a3e2ab398e39b8c46191d7f44bb3a3a92b98d7462ae9e6703f4cf2a01a509fc62aa6326423788dfd5c4467553e1e9825718f
 EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
 EBUILD socat-9999.ebuild 1337 BLAKE2B 63b3a50ba7f79887bd0769cde62604b61322c8f8ff0ec14dddc6cd6a7e271600914f6ef17ba37f68677f247e4567343b0f18ca4ffe757416f190ba703ea1dbd0 SHA512 d3153b16916abff983b91525eea488945585a6817561aa5471528741af6ef0cbdc440ddbce3086ef238f7056d053e209b451daab098299b98d185b6df3037c8c
-MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
+MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 2c2a7923cfc8..70bb6410439c 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -5,4 +5,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:dest-unreach:socat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index 071a5f05af4f..9fad75fd6b87 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -1,6 +1,5 @@
 AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce2675ba74ee008676d97313b4b75ee5625aeff5b56fbdb1a89909fa4cb006102e43f65a2832a1805fb747608eb13054ebfe SHA512 468870a9e64f0ace876bc1254e264e634fc07011b9ffa5ca0ccecb23c925e2a4a5c4463e6741b265bc8df17d0a578710cc8ea135461a1dfcd1c782e991bc7623
 AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a
 DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
-EBUILD taylor-uucp-1.07-r2.ebuild 1336 BLAKE2B 4ab6366c61aa8c1ea815a3c5a02616ca0d7a08b496d114efedf78069f2f632c9908dfcd7f93bdda6c36c2ac905f5886b85ef7f2fd7f4436b8a2c34931393239c SHA512 e499cea422bb755a588a98991bb00acb466db6b55d85a8b8d495c1fab2c5cbb6d70b527df95ec9914f2c773c05b5e804f86ecfecf3cf540099434f5143447194
 EBUILD taylor-uucp-1.07-r3.ebuild 1369 BLAKE2B 7b9f6ad62d03d980157178077e02388596121728c346c18f75d740f89ecb8f64a76b15367dde165a8eeb4b4cdc05bbefbd19c8107ec3ef8a8b32d322195420f5 SHA512 87e29758cdcdd4badc190e18643a1b0e668c60254d9f27df9262daab34f643605219e5100d989169d13f684a5d6d4e5c3122979cef7c242b0e8c4c87a5d26217
 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
deleted file mode 100644
index e4402f3f88a0..000000000000
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Taylor UUCP"
-HOMEPAGE="https://www.airs.com/ian/uucp.html"
-SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
-IUSE=""
-
-S="${WORKDIR}/uucp-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	mv configure.{in,ac} || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE -fno-strict-aliasing
-	econf --with-newconfigdir=/etc/uucp
-}
-
-src_install() {
-	dodir /usr/share/man/man{1,8}
-	dodir /usr/share/info
-	dodir /etc/uucp
-	dodir /usr/bin /usr/sbin
-	diropts -o uucp -g uucp -m 0750
-	keepdir /var/log/uucp /var/spool/uucp
-	diropts -o uucp -g uucp -m 0775
-	keepdir /var/spool/uucppublic
-
-	emake \
-		"prefix=${D}/usr" \
-		"sbindir=${D}/usr/sbin" \
-		"bindir=${D}/usr/bin" \
-		"man1dir=${D}/usr/share/man/man1" \
-		"man8dir=${D}/usr/share/man/man8" \
-		"newconfigdir=${D}/etc/uucp" \
-		"infodir=${D}/usr/share/info" \
-		install install-info
-	sed -i -e 's:/usr/spool:/var/spool:g' sample/config
-	cp sample/* "${ED}/etc/uucp" || die
-	dodoc ChangeLog NEWS README TODO
-}
-
-pkg_preinst() {
-	usermod -s /bin/bash uucp
-}
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
index 123f5ce03e78..866482b50155 100644
--- a/net-misc/tipcutils/Manifest
+++ b/net-misc/tipcutils/Manifest
@@ -1,6 +1,3 @@
-AUX tipcutils-2.0.0-rename_configuration_message_field.patch 510 BLAKE2B e6149e5421feafda1ce94978e143e37c37b718d1e15cd1e4f45829151661b301ebbf69b226d23607b000e18000fae27e36d8908a2d55b21a35050a9607d896d2 SHA512 0ec3e56cf79482a8c4f99d3eb5a7c984022c1ae934a2b4bb1f2c8acfeddabbf7f85559b503125bd439aa3040be7c7a6f6703736286897b0f66855d9cb9354c2d
-DIST tipcutils-2.0.0.tar.gz 66495 BLAKE2B 2c0116ce8a59ba6dfeec0061109c003c6eb73ed54ee5e75bbca31abb2f9a92e9312f71ddd9116e706e7b76130a86b7ef63915a0530da9ddcd4d30b38e66c6956 SHA512 40d25d7bb23359ef1c5caeef30f15166deb24772034ec34a69600764c0445d9e7023254e19a2a76e75a46643f5c710b881341d3f32e42e2d9c58d4a94e17c49a
 DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec
-EBUILD tipcutils-2.0.0.ebuild 815 BLAKE2B a641d072a85f4595ab518d8a8c0680b0c1e38601c5e141cc145247ba86a4f4ff3d9fc4478abda87ac8df078aecc7f6dd34a732a982b8513290572c7f80565cfe SHA512 3eaf4ec70c756f43780d2cef705a72ad9722445b294052c753edc99818e1a985b2f0593a92cede845e749d368e9e160154d15aa3bd97a3f03b238238223d02a5
 EBUILD tipcutils-2.0.3.ebuild 449 BLAKE2B 8dd589c389b293bf4c9c79bb5069d5e3a3c1ef2f261808637634072a6d8dcc3bdda71705ff6f0cf5b6a9c310b2b0eca2d4de9e01c7f3f15042a1620e4f966f1c SHA512 6b805810c2ccfdbacfff7015e09956dee32be3ae598f5eaa15ceeadef794cba1b7781eedcc0bd935d0ea86bfa0664eff08de6bf95d7dc1471ebed3adc3acd715
 MISC metadata.xml 241 BLAKE2B eb3c33457610df6ba6f6698f73504e0ce94c5538fc2432c3b2555b4c8e0f6a1b9d2c54806aba3a5aff5f74c2f62f2b8a4151a6f214282b666041cfaf1fe788b2 SHA512 ff2c5ffaf00fa30dd4ed38f986992dfd88a006a63a07c836efbd00dc682f5ad708c8640007c4e8b7b4aab46a7dbcbfbca501aae31f8c73936b7ca9143fafe4a8
diff --git a/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch b/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch
deleted file mode 100644
index e5dacb485f67..000000000000
--- a/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/383807
-http://tipc.git.sourceforge.net/git/gitweb.cgi?p=tipc/tipcutils;a=commit;h=44efb87cb453c16a31ceef27164b0f0394ae4433
-
---- tipc-config.c
-+++ tipc-config.c
-@@ -1150,7 +1150,7 @@ static void enable_bearer(char *args)
- 			a, for_dest(), addr2str(domain), pri);
- 
- 		req_tlv.priority = htonl(pri);
--		req_tlv.detect_scope = htonl(domain);
-+		req_tlv.disc_domain = htonl(domain);
- 		strncpy(req_tlv.name, a, TIPC_MAX_BEARER_NAME - 1);
- 		req_tlv.name[TIPC_MAX_BEARER_NAME - 1] = '\0';
- 
diff --git a/net-misc/tipcutils/tipcutils-2.0.0.ebuild b/net-misc/tipcutils/tipcutils-2.0.0.ebuild
deleted file mode 100644
index 4cb376facabb..000000000000
--- a/net-misc/tipcutils/tipcutils-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs # linux-info
-
-DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
-HOMEPAGE="http://tipc.sourceforge.net"
-SRC_URI="mirror://sourceforge/tipc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${P}/tipc-config
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rename_configuration_message_field.patch
-	sed -i -e '/OFLAGS/s:-O2::' Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	# inherit linux-info and add IFLAGS="${KERNEL_DIR}/include" below in order
-	# to build against headers in /usr/src/linux
-	emake EXTRAS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin tipc-config
-}
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 9148ba197fce..5ecee12e9a82 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -1,6 +1,4 @@
-DIST trackma-0.7.3.tar.gz 142450 BLAKE2B 27ec903e7372d18349bdc978cf1b72c501bd028cb00b9e8e1facde367c9b6041b87561370351eb21ffba9ac23ac40dd370e2aa74b0ebe8b9142f870f4f7e018a SHA512 73a7caa1e740e96f29edfcdfc5dbcaf26f280371c176bba69947fff37ca935d56e280a6d3e12c0a7f6283fecdad3d8e8e82c0d45a75d1962e58fdd7458630791
 DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364
-EBUILD trackma-0.7.3.ebuild 1973 BLAKE2B 70527b22320658ce358fe9ac31d3ffe24c6194af220f0da890bcbc80606f846fe5ce03fbedc368436356c9ff66424d95b58eb9cd5060fd8618f50efeb8e890ad SHA512 b98fa9fe204d76f996946e6d48d853885badc3fb6a77fbc9aca9990cf72bc876d6fba955ed811259b31e51d8e514afbd449566fb6f3d145cf1c4d849cecb975d
 EBUILD trackma-0.7.4.ebuild 1979 BLAKE2B b5a0190c8d128cf6c6419d06ae0cbfacd05ab2102ff6613ddff338da2bbc3e7936eeaf435171731e7b41a75668c8b8e9c8f5608b11efc091fb515a11d9d84b2f SHA512 034a2bff20f856767d08939cf1f151d71e4351bc118be26b086b4bfb64eb681cb0cc6ee44265f8be713c9d975d75e7650340e1f1fac8c9ef1f5c48958760dd2c
 EBUILD trackma-9999.ebuild 1931 BLAKE2B 3b52f598487bb469a890a96d978d31a4d796459da3908a28ce17994e0ad9a39709431152eb26bce72f4006449ed4c4582bb5d5422c4366f0e14877a5e06e7c23 SHA512 d953512cb15a9f05dd972487cc9f19a88b69b0f9810aee3755bd51b64e46965e22859832c97c57cdaa5518a3a3ddf34106398f443cd864f6f793db109a7ef9f9
 MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/trackma-0.7.3.ebuild b/net-misc/trackma/trackma-0.7.3.ebuild
deleted file mode 100644
index e1a4538679a3..000000000000
--- a/net-misc/trackma/trackma-0.7.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Open multi-site list manager for media tracking sites"
-HOMEPAGE="https://github.com/z411/trackma"
-SRC_URI="https://github.com/z411/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ncurses cli gtk inotify qt5"
-REQUIRED_USE="|| ( cli gtk ncurses qt5 )"
-
-DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
-	gtk? (
-		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-RDEPEND="sys-process/lsof
-	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
-	${DEPEND}"
-
-python_configure_all() {
-	sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die
-	rm "${S}/trackma/ui/qt4ui.py" || die
-	if ! use qt5; then
-		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/qtui.py" || die
-	fi
-	if ! use gtk; then
-		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/gtkui.py" || die
-	fi
-	if ! use ncurses; then
-		sed -i -e '/trackma-curses/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/curses.py" || die
-	fi
-	if ! use cli; then
-		sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/cli.py" || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newicon "${S}/trackma/data/icon.png" trackma.png
-	use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true"
-	use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true"
-	use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3"
-	use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5"
-}
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index d4b256da40a4..a440e0bbc28d 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
 EBUILD x11-ssh-askpass-1.2.4.1-r1.ebuild 923 BLAKE2B 0c58c634c173af9549c4c68e6496455bf39f5414a3fb7b387d139a03f9d2d5ff90bb1e446d9861b58cb2593c21c2e4f6f375e258259094f72f3ff6c83819e192 SHA512 52d0706cdb99e3c68ec624f82c816da9dd7a7e84329788335c13fe54a9000dfa02430a2a9f43c0f1f051b11b54d53835b912935513bae98f9698107c81b39f43
-MISC metadata.xml 291 BLAKE2B de0c3922a209acaecab21089d401dd41170260f8fea60da6afa7f02a096bdee50d3663dc947223b66429a3fbab6b5534e0afdbf174a66b5f429f48976faba570 SHA512 ff2abca93c49335572d3b78875cb835aad5d469d01c36f93a0e713962616cc1cc4fcb5e5a6c358616c47ee16d461b0db767dbdf64caadc3f7595e69b822fc989
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
index 0c1e85ee38ec..6f49eba8f496 100644
--- a/net-misc/x11-ssh-askpass/metadata.xml
+++ b/net-misc/x11-ssh-askpass/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>cardoe@gentoo.org</email>
-  <description>I guess I'll maintain it since I fixed it last</description>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b2fe6fc5e186..f869e7df1d1c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
-DIST youtube-dl-2019.08.13.tar.gz 3177273 BLAKE2B 927b7bfe128738efbb5023817ccbcf635b6f7f3741f3f794bd8af377cd7c203ae4466818d03ee717f5196124c3a46c5bf9c1e1a92438a295a453786bd8ec3ee5 SHA512 0b5066f3ce93bc0ffa3f9c3aefe4154daae38e78449a8b5825ecf032252f8fafde893f1325809b3d9fecf28ca1c2539d941b90acf204c5bf68783e79fcd28c61
 DIST youtube-dl-2019.09.01.tar.gz 3179376 BLAKE2B 422e7f7f86d6486c45c2638b81a107c1fbf1aac4c05819b5d98185a403b9ed75be520e5711f42393ed4560b5828d10b6a55a633b55fa84d110f0c323bb159374 SHA512 327ef44180e2048045884d79de20541f81a4dbcee415c3fa15bcf333674f2b6e6c6663efa532b64e4f7078449af946479c98464ff9b54642e886f8c792f0b82f
-EBUILD youtube-dl-2019.08.13.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
-EBUILD youtube-dl-2019.09.01.ebuild 2130 BLAKE2B a6b9c8c31b6c7631f19183fccd1adf7b4c3ae5f5bc3108549803c83df78b66c2af9e04e1549a70b6f3bcca4cbc78a6e279f8aa063259c63e2fa464996ee69bcd SHA512 84f330ea104602ecd898906b7d33c98bd254715fc9feb5e71d35e34ac32466b56f178d22fe72dbea83f78ba45ffcd5fe73952c6d508dfc99bccec9a237daa155
+DIST youtube-dl-2019.09.12.1.tar.gz 3180312 BLAKE2B 0fb4f6fdba490407c655645823ebdabff443e8bc0490a0c54865cc4e0d2da0fe27a9eb297e521084a412b1dacd6afb988f5c167f3643a6783bf9d4f52a49b980 SHA512 8177165cab21e83d1e1012c3d56e5182816f2367322eeea526c6d18aa74d35271a4625c6663204c0a5206976dbe32c97cdcd22b000e4e8e23a1073b474345eb3
+EBUILD youtube-dl-2019.09.01.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
+EBUILD youtube-dl-2019.09.12.1.ebuild 2130 BLAKE2B a6b9c8c31b6c7631f19183fccd1adf7b4c3ae5f5bc3108549803c83df78b66c2af9e04e1549a70b6f3bcca4cbc78a6e279f8aa063259c63e2fa464996ee69bcd SHA512 84f330ea104602ecd898906b7d33c98bd254715fc9feb5e71d35e34ac32466b56f178d22fe72dbea83f78ba45ffcd5fe73952c6d508dfc99bccec9a237daa155
 EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
index 89ac8f636eea..8b7913f66a7d 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 DEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2019.08.13.ebuild b/net-misc/youtube-dl/youtube-dl-2019.09.12.1.ebuild
index 8b7913f66a7d..89ac8f636eea 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.08.13.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.09.12.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:56:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:56:30 +0100
commit	948d557b4a61dc14722668b6b11a4cf3cee07b01 (patch)
tree	b28b6cb077ae6b2457e30d49028fc978d8e2b59b /net-misc
parent	e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)