gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-misc
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
229 files changed, 3180 insertions, 5599 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3dca536dc38e..cc45f5ff96c5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aget/Manifest b/net-misc/aget/Manifest
index bc1d24ae0b2d..06c866b155d4 100644
--- a/net-misc/aget/Manifest
+++ b/net-misc/aget/Manifest
@@ -1,4 +1,4 @@
 AUX aget-0.4.1-r1.patch 2423 BLAKE2B 26c1af35a30931d4c67323a636f4326426efe114cd62ef8ba344c59cc72a1581247483f9f80c3b6ea3d17695f752216d25ebd2983c19585c3e78a27b8f8b7cb2 SHA512 b4c1765634f6f14c19e992fa090b7ed1ec11a5d62fe874602f18466d3ced9c0a2ec255fdb8dcb732f0fbd9be9831fe080509992c86fa7b8f11f40366a523ae28
 DIST aget-0.4.1.tar.gz 12783 BLAKE2B e1716f85fe426a8b5c049d54a0c63ae2ec050ceafe8b7f67a36be23a2750782a96939e82ab53485fd646c078cdc5c64445340d0557b9a5656fdd4378aecc29a8 SHA512 23fd4a7786b905bb10fb8de62dea294e014e0c2ad276614c642ebd3865b262eb88e08308df9a68f418de19a984ad138561d82c67e0226dfb5f56520e8ed15ad7
 EBUILD aget-0.4.1-r2.ebuild 582 BLAKE2B d1f522198c0949e4346b97135e4ffecf8117933929859707649a771bcf6a4a2ff9d987cc9ab939a665c393a6ba2b65eeba00c241941176a037563edadfde75f2 SHA512 1f6f40bbdfae1eafdbb06de955bfdef4031c78457b06c6ee5c553b7792e9794b00efc350f20122dac1714afbf7f6c97a85a2dd068a03bbc3ea8bc31612551827
-MISC metadata.xml 759 BLAKE2B 04c2f4d6af748358f2d0d0150aa292cf68ef08d3c7f9f665cd64b5bf47fa8c5bb94e6447eb4502c78c050be962f26aa25963dd1816f6d233df5b9d1846cc2063 SHA512 c65b54fcd23ae72aabafd4259831f9bbe19c0e9ea65efeb49fbd703f900ae8b21d565cf1ea508f83064b05bd5df212a9e03991c6c652c9459648e77fdc7e98ec
+MISC metadata.xml 686 BLAKE2B 214778867fe490fb2b87a3785cfc71d51de5d8d0228c80c5d3e544fd120a545b042ac0e2e25c981d67f68243beb766f0fbf1a3c40a74e214c7cc22a2151482ad SHA512 5dc261567f8a6d575f9622995bda903d2d10279473aaaca4c9e4df2a2a58074a2dd7b8239437a6fb0532cbb2af3a0cd6450659aaa76446ff7df1604e6761ca32
diff --git a/net-misc/aget/metadata.xml b/net-misc/aget/metadata.xml
index 8fa258745ec4..f863fa42dce0 100644
--- a/net-misc/aget/metadata.xml
+++ b/net-misc/aget/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>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>Aget fetches HTTP URLs in a manner similar to wget, but segments the retrieval into multiple parts to increase download speed. It can be many times as fast as wget in some circumstances.</longdescription>
 <longdescription lang="ja">
 Aget は wget 風の振舞いで URL 上から HTTP 経由で取り寄せますが、異なる点としてはダウンロードのスピードアップのため対象を分割します。分割しても wget と変わらない場合もあります。
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
new file mode 100644
index 000000000000..7f1192ae9c93
--- /dev/null
+++ b/net-misc/anydesk/Manifest
@@ -0,0 +1,6 @@
+AUX anydesk-4.0.1.service 276 BLAKE2B 1eb07a90a1e2369c42be849e9885d0696f1b68ff1f21bef3907e0772e930ba41dbed6228e7be62f1fb80bbcc02866294d6f0040e7d8a2928ad409d3bef78ae5d SHA512 af74f74030f6834dc85f0275a0a3f7ef8eafc902a5b8eb99197574c60de1658cd70f4e3152876a1e9c86349473c2e52bba98302d366fa1b1f2618373f90e0f78
+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
+EBUILD anydesk-4.0.1-r1.ebuild 2272 BLAKE2B e8d7054d8237607150316ad90e8cf7be776c11770734a0e67ded1f19344fb0bbb82bf2704523a0f3457c319e54ca708c94def234fca4c9e02ad8b02c6513bb82 SHA512 5a7a368670b7d1337ff2246f23d1b26101b9630b9cfd00416d155b6ece5b240355bcf879ccdf535f61c8fb290cb5009b54387d4cfade1ff240f5e60b4a409384
+MISC metadata.xml 782 BLAKE2B 4052c9f572568a3ab3a9c4bc1f567439cc7a4438a5f3fc1c4b14b0b7d4582d19d74ef106d5ad845e2f7549b734eeb539a3c79bc287f0359301c02d04083c303f SHA512 4c8eda43942444eeb6df7a19bb27528973a9efa412536b5b297640c77ae94065bd3b46e722289f1762494742d61ac6c9b47c5f967afa1c226a1daef30484fb03
diff --git a/net-misc/anydesk/anydesk-4.0.1-r1.ebuild b/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..0d1c769a03b3
--- /dev/null
+++ b/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop gnome2-utils 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}-i686.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
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glu
+	media-libs/mesa
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+
+	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 anydesk.desktop
+
+	keepdir /etc/${PN}
+
+	dodoc changelog copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_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
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/anydesk/files/anydesk-4.0.1.service b/net-misc/anydesk/files/anydesk-4.0.1.service
new file mode 100644
index 000000000000..e7a3ef008374
--- /dev/null
+++ b/net-misc/anydesk/files/anydesk-4.0.1.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=AnyDesk
+Requires=network.target
+After=systemd-user-sessions.service
+
+[Service]
+Type=simple
+ExecStart=/opt/bin/anydesk --service
+PIDFile=/var/run/anydesk.pid
+KillMode=mixed
+TimeoutStopSec=30
+User=root
+LimitNOFILE=100000
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/anydesk/files/anydesk.init b/net-misc/anydesk/files/anydesk.init
new file mode 100644
index 000000000000..5b8986ed8d1b
--- /dev/null
+++ b/net-misc/anydesk/files/anydesk.init
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="AnyDesk service"
+description="AnyDesk global service"
+command="/opt/bin/anydesk"
+command_args="--service"
+pidfile="/var/run/anydesk.pid"
+command_background=true
diff --git a/net-misc/anydesk/metadata.xml b/net-misc/anydesk/metadata.xml
new file mode 100644
index 000000000000..09ba7bee8006
--- /dev/null
+++ b/net-misc/anydesk/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cb-gentoo@guya.de</email>
+		<name>Christian Buchinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://download.anydesk.com/changelog.txt</changelog>
+		<bugs-to>mailto:support@anydesk.com</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Connect to a computer remotely, be it from the other end of the office
+		or halfway around the world. AnyDesk ensures secure and reliable remote
+		desktop connections for IT professionals and on-the-go individuals alike.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest
index 809e6383c0bf..8c14c34e9982 100644
--- a/net-misc/arpd/Manifest
+++ b/net-misc/arpd/Manifest
@@ -3,4 +3,4 @@ AUX arpd-0.2-libevent.patch 423 BLAKE2B 834691198e97f8018a0861ac2938b60840dacb5d
 AUX arpd.c.patch 1404 BLAKE2B 9dbae33986d92a0d220baf428cedc24bf1ffb3a3b41edeb8ebaad68d5c60752d1c16902a32ec314b59baf7b9bb5d9ece35b1adc0af5e67f6173bc47741e97eee SHA512 f9a5669525ed2081a47025206fed6b016ef4a7d35b10b2c8a7c7135b0b7eddf060e380a7561c59d23466065614c1d9287cffc3158cb05ad1907fc6ea569def28
 DIST arpd-0.2.tar.gz 49437 BLAKE2B 6739954b5cb1da3d23251b526c5bc39b1563f6d54e74e5ff8d8e9c3f9b0ed1ecedc7caf805e51321849036d3dc49ab2e7f244599c7c2ef2b02d65160a8cf669c SHA512 24bd4626188d74e172a46312790f8453619af2ac634c23379d1922c789ed97ef5db8a73ae13fccd98c94457da79682d6a1d7ccc3236c787f9d2eb15f64716ea2
 EBUILD arpd-0.2-r1.ebuild 966 BLAKE2B 820cd8579f7e9b0be6c7b7b3673bb02722c8337942924d5a4ba89cb9885e25acabb9ccb7b540242dc44c34babe61c84e399d26972704d5a78da270b9d5af2444 SHA512 8487cd545b486bb67ccd73795e09d17eec84d06ecbd3b02430c2ba704cbfbbad80f2a0817b2c756a7ac8a993a8ad35f88b0da304990a20083423e745a1be7aa2
-MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-misc/arpd/metadata.xml b/net-misc/arpd/metadata.xml
index 3c3d5ced6412..d920e3ba3e56 100644
--- a/net-misc/arpd/metadata.xml
+++ b/net-misc/arpd/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/balance/Manifest b/net-misc/balance/Manifest
index c721bd273a15..591d5423e4df 100644
--- a/net-misc/balance/Manifest
+++ b/net-misc/balance/Manifest
@@ -1,4 +1,4 @@
 AUX balance-3.57-Makefile.patch 1349 BLAKE2B 9bf514589580af60165e4edf0558bd2924bdb13342e9e85c45fb07fe1ab988ae9660f10a3e46a999b16950b4587db68c94e020f22af20029faaa251f2b9b757c SHA512 95d98992206d21784ed53874a55c0e1bc8b0b8ad918d7daefe89f118e200d62d1bb445b6371cbca2418b2f362c57a67fc929aaba2256f502211cda96a89f443a
 DIST balance-3.57.tar.gz 35547 BLAKE2B 293861bdfbeb7d768c9ccc2e6373cee6000c1b048eed6d741b3e340382db15c5b012e228af47632cf6aed439caf200b62258dab9d0f4a6e64de0c299bd0588d4 SHA512 191195e2aa62c867d85085f273db911e8957c3eea7bed8e58abc29e125a0b0a4487048c7db5857e32f54545de1f81f8148b174225aaf8cf1e3a66e4b040748b4
 EBUILD balance-3.57.ebuild 549 BLAKE2B 486395c7e1cc58ff632093640d4b9c6084c3a0611f7f5c67fab260adf5d23d178b06a5630c802548dbf548f23fa78a6e0da8b16c7f0020da0867b516b29e2688 SHA512 e0cc0aa6e999f917697eefb46d58268cf3f66372c1eb2ee1cc8c3ec15e9b4ff9e7b4fabdf41302dba635976e6fa811025c9386b59f0ae63ba5e8c019a9fe4cee
-MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/balance/metadata.xml b/net-misc/balance/metadata.xml
index 3c3d5ced6412..7a38bb900964 100644
--- a/net-misc/balance/metadata.xml
+++ b/net-misc/balance/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index 1857f6926916..498859c71b05 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,3 @@
 DIST batctl-2017.4.tar.gz 85865 BLAKE2B 9d8786956b69407d46d1b024a40c3db2a80bbcce7c02e8e7d98234d06aaa3cd4fe86dd9331806699a7310ac41b7a758c324bcb6c3daf378da0db0a8858f814df SHA512 a3ce3f32ed1eaa65aee4a9ac56d8e235b861b3844a13fe050cfc0e707bbdf382fd2e6e4ecb35b7777f79020cb241e063f473d28f1b2e312f865e6dce304b4b9f
 EBUILD batctl-2017.4.ebuild 871 BLAKE2B c603114dc6beebd8c2c7eba2763efc58849fc14c30e78038e4fb47c0c0404e91ab542c9736780c572219d0eb20d40b0393291bb1258cf62a1bb554d338bb46ac SHA512 956f530d28d143a49dcb4d546555b6dc1085e2ee6bf98dec5910c485ef896e659e1791b5713342cc14d951c3526a083978676c4f4969d04e3b94780c5e3b516b
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-misc/batctl/metadata.xml
+++ b/net-misc/batctl/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/batman-adv/Manifest b/net-misc/batman-adv/Manifest
index c1646b571c60..6e2090bf311a 100644
--- a/net-misc/batman-adv/Manifest
+++ b/net-misc/batman-adv/Manifest
@@ -1,3 +1,3 @@
 DIST batman-adv-2017.4.tar.gz 249968 BLAKE2B 60386dedccc8e1cc1f59eedf69ecddb1180a3c9383132a3b85ed329bf372d08766311dd8fb1980dbe5dd35f5d10bc421257967f429da6151b497c6074924ea5f SHA512 08c99e726ddac99b619846808a1328603d6b40bce4fea8ba2ec955b4866f983b0c6af74a13172c75f040c9dc5eb4aa3a46404a5d1a6a20cbe7ec331a1441dc30
 EBUILD batman-adv-2017.4.ebuild 1047 BLAKE2B 65f7ef87146399598b413d2c9c9b06ab3bdf2e623030e151af8bf1b128052093d70be4f2bb23bdf84b79694fc0f450850a1084d7597adf0d061ba25d670e6f56 SHA512 5330d65778613b993fdf6a2288f81ab53afb228ce49c33596d37fdf1a5d62c9d63473484725810967f3c45de8deb2edf83637347f1923b42956cef88ecd6693c
-MISC metadata.xml 486 BLAKE2B 653a3aa1548694b1709b735695de0f4cfe405354b5c0fe3f3a7b4ffe2db1189122427942a7b2cf7b89d652c63b4b07c23bd56ea0da581a6c1726bf5dc89c0409 SHA512 be8936eb6768c058955038123a9af0380cac6a20d80aa29a93d0ecd41b68e4527e7d1e18bcd0c0f21b3e57ff2fce2da73335373eba37f7f0bd75f84fde44b7f6
+MISC metadata.xml 415 BLAKE2B b630aeeddd4168d8d026588d1daba489a3b3ab16e30ba0ee00be8f778c03c106dd64b83eafbb768435fc0cda46c711f12f9933c41b68bad559bff30a626ee31f SHA512 fd6841ff2409e06d91761456b5c9df49bc6e25f4e2c5f61527f5d7eb16516e750bb8bc8661ce282d8fd770e1c05e43f40e7d33fb962e3534520b89f3b9993184
diff --git a/net-misc/batman-adv/metadata.xml b/net-misc/batman-adv/metadata.xml
index dd744838a0ec..399595c26211 100644
--- a/net-misc/batman-adv/metadata.xml
+++ b/net-misc/batman-adv/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="bla">B.A.T.M.A.N. bridge loop avoidance</flag>
 	<flag name="dat">B.A.T.M.A.N. distributed arp table</flag>
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index a3505dfb8b78..e85e6621cfd6 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 1003 BLAKE2B 464382d408790dbd469baa1fddfbbb8332ce615c311766cdffb6b7a3883d37e46594adcc0d6c50bb654f45e25b1fe388cc3bf1aa649810846e462eacd6341bb3 SHA512 30476ce64954a4afb8142a3dc1e7103d8b51834ad89b965d938fa65640ce585d21a9532b76b9ad9c447ae721def2f73db380ac4c3863cd09d0323521cca96b4a
+EBUILD cadaver-0.23.3.ebuild 999 BLAKE2B 52b1b4fc1f9882055ba3f2aae4841ab2973fc6508e3385d641011de01688bb2f6b6684b22c9a0e0c6d69d28c7abca7b537d4d759729d62bacbd4ad7c34c33583 SHA512 79c57dd71459c6b2ddfc8cc285b4f552130ed27269f6b6f9fdcc70a565aa7a40aa28762f2cd6b0f3ff268d5d9ab41c20f452bd89499ccfb70dfc1800a46355b1
 MISC metadata.xml 338 BLAKE2B b00867702effd06d43020a0a3f5962d8aa1ae94197580af3d08c43458e0094f9967abdaa8f3cbf204d14c31c9ee37b31151cd05926978f18dc3344b52c2ca397 SHA512 7d37b09863b6d2a4a6c00930f8f4b9d2237cd216e52af58ea002875d0f65325b7c1a112a9832046db347d7b4bd5881e01cd06257be61516f9e1f975939989749
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 7b62221093c6..edb1d0379d7a 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Command-line WebDAV client"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://webdav.org/cadaver/"
+SRC_URI="http://webdav.org/cadaver/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 32fabb7d0cbd..96dfd881b019 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -6,14 +6,8 @@ AUX connman-1.35-include-ifbridge-before-netinet.patch 259 BLAKE2B a6c5ae9bfb61e
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 483 BLAKE2B 946dcb53fbadba4b2ddea95450f779680a8a00356489480f6ade122b8b2450fae90db0be76320d3666b991d09c766fba9a7037fb16b7b18db07bcbe4cfe83080 SHA512 a9999849f1e9b7c8c44db5aebbc5d2e615ff191da582333c3a575f594b99a6324469525a2937a98ccc444fcb42cf0131b2067263451273c6e093b22cb746306b
 AUX connman.service 198 BLAKE2B 8b943dc995fed630b15bcfe1040598e13a5b2118967f9fb681e36beaec4e1bf2f9c25e10f9c2d19bc7cd56c10e811b3722d12048b5180bae57bd8af074697ad4 SHA512 a769961922c40b5ed3e5a09d08262b20b84aa27fc278678063b348431ba2976de9f2ebcd9f9b0afa6241540d255ba4cdf7120b75184510d41444b7dd3209b825
-DIST connman-1.29.tar.xz 653324 BLAKE2B 16c09339f84eff5c4977d0c7b71e5a757cf8bdef247b22789d9b316e74f4ee9ed5c81420ab01020035c0bc4da207015b0e53df40684d2dd62a2456220f4db4d8 SHA512 19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee
-DIST connman-1.33.tar.xz 669800 BLAKE2B 5500b9a318bc0484d9647e5e27fa2da6d59d9238cba26564940979f27e339648f72700f6f78ded719ce08e8d2353bd361388baedb353301519363c4f14227544 SHA512 5670124d2e17ffde4bd5fb878198843b712a31f5840e8523e8247373c8547619e32a4d6dda9cf993eebd5c65bdd256cfc570708a79da1d10f969662b5b750566
-DIST connman-1.34.tar.xz 684992 BLAKE2B 48912ed7e52f1e696189240fc0d8cecec596cdb247683cd80c236a5757846d337d6d171dd1707acbb8414e09d4168212e614238136138c89acede6fc77c3a406 SHA512 732669648936630ae5895cba8bcccc69757ab594bc31ee8e4925b0e402d190939891fac61136f3f086ce708b8d576136f0947914c0cc07427c170cbf9b85a308
 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8
 DIST connman-1.36.tar.xz 692616 BLAKE2B 7d8cea55365fbfe78cd897b5b65d8edf475a737220732c46c95dda4c6b12badddca38150dbedddcc95c29bce486d86fe130a9d65043c6e18ed6b1eba3fe5aec0 SHA512 c0b9e924a28d58539d44c314168ae7aa46dfea8ce9d125198f525a6d6ef95ca77fd0357c4c4c7548b362b9de8e6f85c7915b1a4cf89b65116c4cbc4df75318e1
-EBUILD connman-1.29.ebuild 2013 BLAKE2B 8b80a54f1e7db67aaf16b7ba31d27aa4e9533260944944d6e3877d3794f67963b420a074bafdc5b5ec1f26fe29f6a24e29bd618a9eec52b3c3c2d690db21975e SHA512 e77846ca1759957f4d898fd76b06f126d6181c85384eed8f6ffee4d9e6845eb43f831a0db1ea349b387392e60e43dda8c364f87b1f98c5ca84652e2fa858e35b
-EBUILD connman-1.33-r1.ebuild 2280 BLAKE2B ac059303eeae7e2eefa254a874ff80c254c8dda3b80bbbf27ea62f6a9a59c5033bb0b244d30c68dc2dd3cb8117af6c0204b766911804cae6323a8056f7b1852e SHA512 8c396fa66e67a4519d2fe067e43f11cff3cb751e7f610e6ccb2cc75836cf74784fde1f8ae291b4b2189e92c941885b3c67e55556807eb1c9fdf619c9bc247ce0
-EBUILD connman-1.34.ebuild 2490 BLAKE2B bd804da85d0d880e69cf9fd6ea2b8fe813c508ffc3196cb82774d59966b9a4468f271e7e9472e74814c8c6a3df22c934ca2fcac5c792e64bb72226f0172d4b4a SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302
 EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8
 EBUILD connman-1.36.ebuild 2568 BLAKE2B 902e767beeeb20850f0387485444905ac4b607dbdcca5fe73b4db808df7534829d2a2ccec1636c1ecaf8cbcc0c60bea9dc8b8865d8da13b1d748fd778a62d551 SHA512 f9c93a7263ce7d683dcfb6e1fc2d6798a222159bdcaf432ab75fb37d5c8a37e200ad6ad2ba5efef8438eff2eaa486545d4593817aa9ff3532833c1a15f9acb27
-MISC metadata.xml 1259 BLAKE2B 9c4804b5e650d4823a129d3d64e59ca3165ea04a171dfdbf669c184c14eb6e3ab923e5f0834952aaadb734e5867d4ad241084c0388d52a29b8e208e23c72d44e SHA512 02189e5081b74da0b4a8d23dfb27c1b71e34b2f8b3e5bdac8817e50206470e5b6591979b65dede6dad0f5b14b3fe5ca627ba50f8856a5c586fe8b8996f813322
+MISC metadata.xml 1158 BLAKE2B 57d083417dd0b186b1d45368f1ffab64d6283535ae6f25adfd6cd85d26f535544f0b89d7f731dbb876ba7acd1973abdd26ac7643c050adc9a433d321ffc9fb57 SHA512 2d272d638d9f9f06eb900736815eb0e401520f3ad86082beea541932626c5758e220f692931772ecafffbd60798f0df38e8c9e8a02b58c03743ed984955edb8b
diff --git a/net-misc/connman/connman-1.29.ebuild b/net-misc/connman/connman-1.29.ebuild
deleted file mode 100644
index 329ac55f1db8..000000000000
--- a/net-misc/connman/connman-1.29.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit base systemd
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=net-firewall/iptables-1.4.8
-	bluetooth? ( net-wireless/bluez )
-	l2tp? ( net-dialup/xl2tpd )
-	ofono? ( net-misc/ofono )
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	policykit? ( sys-auth/polkit )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16-execinfo-assumptions.patch" )
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wispr wispr builtin) \
-		$(use_enable debug) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin client/connmanctl || die "client installation failed"
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/connman.service
-}
diff --git a/net-misc/connman/connman-1.33-r1.ebuild b/net-misc/connman/connman-1.33-r1.ebuild
deleted file mode 100644
index b3c1d52bbc4c..000000000000
--- a/net-misc/connman/connman-1.33-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools systemd
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=net-firewall/iptables-1.4.8
-	bluetooth? ( net-wireless/bluez )
-	l2tp? ( net-dialup/xl2tpd )
-	ofono? ( net-misc/ofono )
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	policykit? ( sys-auth/polkit )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.31-xtables.patch"
-	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
-	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wispr wispr builtin) \
-		$(use_enable debug) \
-		$(use_enable tools) \
-		$(use_enable networkmanager nmcompat) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-misc/connman/connman-1.34.ebuild b/net-misc/connman/connman-1.34.ebuild
deleted file mode 100644
index 12b9cd9901a4..000000000000
--- a/net-misc/connman/connman-1.34.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools systemd
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables l2tp nftables"
-IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
-
-REQUIRED_USE="|| ( iptables nftables )"
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	bluetooth? ( net-wireless/bluez )
-	l2tp? ( net-dialup/xl2tpd )
-	nftables? (
-		>=net-libs/libnftnl-1.0.4
-		>=net-libs/libmnl-1.0.0 )
-	ofono? ( net-misc/ofono )
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	policykit? ( sys-auth/polkit )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
-	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wispr wispr builtin) \
-		$(use_enable debug) \
-		$(use_enable tools) \
-		$(use_enable networkmanager nmcompat) \
-		--with-firewall=$(usex iptables "iptables" "nftables" ) \
-		--disable-iospm \
-		--disable-iwd \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 9bf64dff4d86..b6bed9600f0d 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>bkohler@gentoo.org</email>
 		<name>Ben Kohler</name>
 	</maintainer>
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index dd7c6f1660fd..0dfd56f8765d 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,3 +1,5 @@
+AUX csync-0.50.0-gcc_5_and_8.patch 1346 BLAKE2B 55c78622122e429b5a72790c5db3b0e2e063f419ab85dac460541aac121bf8d957a2be443837023e745c71debfe908a8fd5f75d041b16f7c22610da9e049532b SHA512 fb739031b2eca4f69f1384262214b13d5ccfd0abc64d889bb1b69f3a04473a43129ed26990aebcfd51e5b98b70649d9fac36a7eb116d162631f074d60ea82a41
 DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a
+EBUILD csync-0.50.0-r1.ebuild 1130 BLAKE2B a9e58b3350b243415498d64c5c050f25f859e9fe1f95c81ed5e1f2b49e5016a93fc216c30800c55b6da37614f2de3614910f328c57a4daf750e1bd51b7f60bff SHA512 f563547196e0f0587827a83c6dd939510f3635f8c2ba5b60e7e8b059f360328324e1269a2f971c34632e623f120b4cbc2bec903505427eeb8db68670916170c5
 EBUILD csync-0.50.0.ebuild 1202 BLAKE2B 1332fa048c525811d42889ae8a36e7a3b02faf815455b0e9d274d705c13d29ee47818fde2b529e5fe75a8935528124272dcc0bfce4eb7c8290a66da0444f6b96 SHA512 ac9d02accd433cc1b07675503c3104416a6e948c0e5be52ebf0ca794749db68d5253b3ddf51b1bfa75f6cece33e5e7d48cde4c828812db39a2956926a369b36f
 MISC metadata.xml 354 BLAKE2B 5a0ff4b19f98eefe67e4b6dc04ea59cdb76abfb4f8799163cf2c87a565660e84182ca565eb641b43b66083d9d9dde12cb156edc84b06e889edf0cc9a60e07d68 SHA512 513b19184444fb46882523fc160043d7d530d202aa253f44ace9fc97fad8dda7748083bd992921d93ebd62a12397e69a086932818e317f75fb7dfa478ab3f1ba
diff --git a/net-misc/csync/csync-0.50.0-r1.ebuild b/net-misc/csync/csync-0.50.0-r1.ebuild
new file mode 100644
index 000000000000..5374066247df
--- /dev/null
+++ b/net-misc/csync/csync-0.50.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="lightweight file synchronizer utility"
+HOMEPAGE="https://www.csync.org/"
+SRC_URI="https://open.cryptomilk.org/attachments/download/27/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc iconv samba +sftp test"
+
+RDEPEND=">=dev-db/sqlite-3.4:3
+	net-libs/neon[ssl]
+	iconv? ( virtual/libiconv )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	!net-misc/ocsync"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cmocka )"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch )
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# proper docdir
+	sed -e "s:/doc/${PN}:/doc/${PF}:" \
+		-i doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DWITH_ICONV="$(usex iconv)"
+		-DUNIT_TESTING="$(usex test)"
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package samba SMBClient)
+		$(cmake-utils_use_find_package sftp LibSSH)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch b/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch
new file mode 100644
index 000000000000..44bcc3ed6819
--- /dev/null
+++ b/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch
@@ -0,0 +1,36 @@
+diff -Naur csync-0.50.0.orig/modules/csync_smb.c csync-0.50.0/modules/csync_smb.c
+--- csync-0.50.0.orig/modules/csync_smb.c	2013-07-29 14:04:37.000000000 +0200
++++ csync-0.50.0/modules/csync_smb.c	2018-12-06 23:08:05.320992985 +0100
+@@ -49,7 +49,7 @@
+     char *pw, int pwlen)
+ {
+   static int try_krb5 = 1;
+-  char *h;
++  const char *h;
+ 
+   (void) smb_ctx;
+   (void) shr;
+diff -Naur csync-0.50.0.orig/src/csync_log.h csync-0.50.0/src/csync_log.h
+--- csync-0.50.0.orig/src/csync_log.h	2013-07-29 14:04:37.000000000 +0200
++++ csync-0.50.0/src/csync_log.h	2018-12-06 23:11:34.280239832 +0100
+@@ -55,7 +55,7 @@
+ };
+ 
+ #define CSYNC_LOG(priority, ...) \
+-  csync_log(priority, __FUNCTION__, __VA_ARGS__)
++  csync_log(priority, __func__, __VA_ARGS__)
+ 
+ void csync_log(int verbosity,
+                const char *function,
+diff -Naur csync-0.50.0.orig/tests/csync_tests/check_csync_log.c csync-0.50.0/tests/csync_tests/check_csync_log.c
+--- csync-0.50.0.orig/tests/csync_tests/check_csync_log.c	2013-04-22 13:00:35.000000000 +0200
++++ csync-0.50.0/tests/csync_tests/check_csync_log.c	2018-12-06 23:11:34.280239832 +0100
+@@ -115,7 +115,7 @@
+     rc = csync_set_log_callback(check_log_callback);
+     assert_int_equal(rc, 0);
+ 
+-    csync_log(1, __FUNCTION__, "rc = %d", rc);
++    csync_log(1, __func__, "rc = %d", rc);
+ 
+     rc = _tstat(path, &sb);
+ 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 8f06032687b7..31fa8beab7b0 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,7 +3,9 @@ AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660207f512974f9827c53037a95b935a6020620f926eee85339fbc558be5585f2a4c001bd287c4d33795e6a6dab5 SHA512 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5
 DIST curl-7.62.0.tar.bz2 3014762 BLAKE2B 0cc9ef5d19004dc5cc69444cac3b2fb4fd82ba470a831b761c147e45826fc26087f4e07da76ee0b6a070f6125a1423927607a257786387326f4c9f4e3953d5f7 SHA512 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5
+DIST curl-7.63.0.tar.bz2 3001355 BLAKE2B 7925825f606d7eb474fb73aeec52353d3a3bf8827b34457493003ef2e3c1aed5350d849fdbd5624f148c6bb776aad318f1f49ec1ca57690f5dfb21b12fcbdc16 SHA512 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25
 EBUILD curl-7.61.1-r1.ebuild 7220 BLAKE2B b022dceee6068aa31e3fbf8b792b554e32647da47ed863b35c11470a494c0ae6f51a1a243eed73589113d19a4ea52e601a6142a7b55e31cc0e52e0d9b28de7db SHA512 fbd4cb210b96c45d73ad053dec8d2f59550568f079787c38c22df208395205cb4d56dfc1891f115f349e05a10a67416bfebe0bea5f3761cab6d534da1bfaca55
 EBUILD curl-7.61.1.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6
-EBUILD curl-7.62.0.ebuild 7220 BLAKE2B b022dceee6068aa31e3fbf8b792b554e32647da47ed863b35c11470a494c0ae6f51a1a243eed73589113d19a4ea52e601a6142a7b55e31cc0e52e0d9b28de7db SHA512 fbd4cb210b96c45d73ad053dec8d2f59550568f079787c38c22df208395205cb4d56dfc1891f115f349e05a10a67416bfebe0bea5f3761cab6d534da1bfaca55
+EBUILD curl-7.62.0.ebuild 7212 BLAKE2B d7d24de7098a452da23e2b880fafb839146228b8c1bb7ce288e7bbb0f25df01f9c106543fb76fc201fff93cff7a5902c8b5f61e1ea55ab5855c4a4d815992cf4 SHA512 d4c1a663492be56cb2015817810980c7d951bd4938cfc11b3d7330cd015f295d6a1c5aff8f8bf8e9a2b6c7c5cc1f4c7d59bc42f77acf19f4f98bf49f732adbb9
+EBUILD curl-7.63.0.ebuild 6985 BLAKE2B 3cb94711bf38b194ae1de5b37cf0af1e425183beff977cba0c0d3aad3d0ff4174ba4e00ad3f18fbd82c62b96b435b27b4c111d98869b1ecccddc9ebca77daa74 SHA512 423b68b2cdeecafb7efb0ecb1ee5bba396804ad248ab46daa2a2de5cd13448367af4f422468163782b255ca2c5227b1dd0597dc0ebd0e85824e2d32a110c6478
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.62.0.ebuild b/net-misc/curl/curl-7.62.0.ebuild
index d13d87e7796c..c41fa328faee 100644
--- a/net-misc/curl/curl-7.62.0.ebuild
+++ b/net-misc/curl/curl-7.62.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/curl/curl-7.63.0.ebuild b/net-misc/curl/curl-7.63.0.ebuild
new file mode 100644
index 000000000000..fe3a028e413c
--- /dev/null
+++ b/net-misc/curl/curl-7.63.0.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2018 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[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin17 ]] ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=637252
+		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+			configure || die
+	fi
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-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-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/ena-driver/Manifest b/net-misc/ena-driver/Manifest
new file mode 100644
index 000000000000..33b25f8a20b1
--- /dev/null
+++ b/net-misc/ena-driver/Manifest
@@ -0,0 +1,3 @@
+DIST ena-driver-2.0.2-linux.zip 271852 BLAKE2B e2bf85a70abc0914fafb786bde2a24020ddf0e88e0a051f59938b0091e92fb8f11407567b384610f7838e85903eb734338f5af7f1045a05055566af83ddc1908 SHA512 8c1328ae6907f7e56d3398a6502db51dfb15772fbbb0eb075062ffa3f49b4b3697ec357c77f44701e33bd794e0b5858c619cad97581bbfb27ab010f7dd97da6b
+EBUILD ena-driver-2.0.2.ebuild 871 BLAKE2B 0e73e54e2b3ce04eaf4077bc8405812ff2748efc20d9f583e7355181716d6790e0dd60e8747377a21a5c113ad5f7a3ca44aa3bd5919fbab39501e6c6eb480c93 SHA512 c5c743f8b5dc8829e76cd608759e85723a3eaeb67d5e776ddbfc6eb33312ec7a5a9e6a25f9bc53399d7975d53887b62153a4a1b6ef201f4d8249ee2d79a72b3b
+MISC metadata.xml 260 BLAKE2B 93b4bac4246e017b0dc21599f85ff5d0d22ac2691acdeca76c67b1ea14c46d8764b5d52c370af28e44bdec84de9dfc5185136b143fde3d36859ba8f4900ed71c SHA512 5f4bd0763a9f614ca74f08969dc67a7e4221c5491922dc844942bfb5c01815ea30bda1cc352a4be4ef977200cd90e6f3d06555c9d151205ec245527920b83f70
diff --git a/net-misc/ena-driver/ena-driver-2.0.2.ebuild b/net-misc/ena-driver/ena-driver-2.0.2.ebuild
new file mode 100644
index 000000000000..04db47eb4f2c
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod
+
+DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
+HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
+SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.zip -> ${P}-linux.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
+
+MODULE_NAMES="ena(net:${S}:${S})"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}"
+}
+
+src_prepare() {
+	eapply_user
+
+	sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \
+		"Makefile" || die "Unable to fix Makefile"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README RELEASENOTES.md
+}
diff --git a/net-misc/ena-driver/metadata.xml b/net-misc/ena-driver/metadata.xml
new file mode 100644
index 000000000000..31521abd4e5e
--- /dev/null
+++ b/net-misc/ena-driver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 04e1843d8866..a2835d54ec80 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,21 +1,8 @@
-AUX 1.2.1-gstreamer.patch 3675 BLAKE2B 7e9ead69d46288a96e060451ed17e445e0feb27886d248e761b9bb0a2f25ba4b2c266e3cf9fd5a91429e3ea38cf78dec94c4a8b4fc6e2e2e23e8eeea3c718206 SHA512 758675e9f9292acc9877c37e240c8144a2e4f2f0440f9a75b64895f0f8514bb991cab4295250107b85df2058f07988c93f399690c8e06dbcfcb023d9dfde921e
-AUX 2.0.0-rc0-libressl.patch 3404 BLAKE2B 0365d3235e939917d4bc53ae4561d2085c4b7a99b8c585eddb8e5dea26a5038ea0a7f09b7ce1571516a4ce9e93b29113f2d35a1ff535a9a40a484352867bcb23 SHA512 b7b1018da4469de6c688e5894b200ec6846090e7e04ccd3e8e38b6f500832e75ffb30eef84845628eb26ed9ca64a4768dfd5c6a2f44d1fd13ad58b60074be21b
-AUX 2.0.0-rc1-CredSSP-protocol-version.patch 1474 BLAKE2B de37ed627f146807b6aa1a61c766d2909fe056ce0da5e5012d1a6503c6c92a5fc5ba03f82edaa4259d16e55bf8556eb7b9758663b672c5eae17b82034a441693 SHA512 c25f07d162817de0666bf9cfa296580c74b19b3326e1a009123dcf133fb67a876d3bcc99c23b09e96e3072f2811bec236f619b9eec0189b31dcb1e51c8ea1102
-AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4bae256dbed641796000a023c9f9516ec0815d3bdf968fab0fb92a12a8756221afd528280074aa7e96a8b39e8827 SHA512 e1404580a644253ef681a51c187fd8a3e983aa406276bf8420af7b5bdff2a42446e6ebd3c922d08fe0481ad1f7edf1a648d4be6eaa0fb6f2be4af8fd27aad7e0
 AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b4f5856b64899b14c97a76d685c8a663211aca51018e77cd3c8ba30e24203dcc895dcdb830f324353a2b8edc43aae SHA512 01a4d68493709352faf62d222b62e0368fca368f2b6e9ffff648af999d419675ab02fad2c8a9a9fb6149abca9bedbe35a35018dbeb82784d993fd09e3df62ab2
-AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77
-AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48
-AUX freerdp-ffmpeg29.patch 1778 BLAKE2B a34acaa93eb59c01623151989ef8dd97e0aecc394219249d33ab6815b295e105a5d7db4baeca44a4a43f53665919a65466f9423b002e40648b02aaf6c1ea879b SHA512 c58acc5ddab34fe664d38649b7271ad793430cb1c9ad8e6b78f1924a8b70e1b8d76c426fb633cf6dd97fe3277664649fd7254e2e4377330c64234d23f1b26fd1
-DIST FreeRDP-2.0.0-rc0.tar.gz 6486529 BLAKE2B 6d9bf0e88c925f2184f87696b78a374c5fb24ecb3014515e077825805191fcb2e58b930ef4eccb797d496d142024357ca7562426e990a65cd3c54c58de3cc525 SHA512 d3eb0d5d23aa2a4d0277414f13a984d40aba051102c5af1e5ade975cdb469ef3549b145cd4339415fc33f056044929cfac71884512ea77a1e718d70d5b21b9dd
-DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca70ece3496c1ba00766b04369fffde8d86ad446345f0eab0fea4641708b7f985f95ea4a6001107163ee60e35822a955 SHA512 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182
-DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8
+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-rc3.tar.gz 6575186 BLAKE2B a99b54ca284d1c5c61104e22edd6bb4bc435ed1d5b95a84f089c06e6d49c14987be24c5e6b08e02f7df4a56230159c827b8ada24f68ff0188e74c0386507d691 SHA512 0019daadd5f0071d983053c554834392a751ec3bcde2ed96d4c0fceb7c32a319b9bbfeb68ff9b15216f7db479c883b461e7c51e612c99626dd09af5a68ff96f5
-EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca4994abd5deeded6938631ed184139d452b49b98b957f03c57e709a4df6cda2627a773e6cc0bb7699bcba522aba7aa8548b4cafade9 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900
-EBUILD freerdp-2.0.0_rc0.ebuild 2907 BLAKE2B 1c4ff670b1e7db50ca56af231ce54a080095f8fce142bcb96cabf2908ff71ff11159e691a7e21fab5fd7e436f28ad644af6f710958c92a1908b77dfc7deb9407 SHA512 dc9b9e146822c84ed51e2221f10ba500ec51392f21f9d75fa3c10f1408c6f3fc266fdbc5f11bbf5dde566699e0e01ffd7bb0e85c072baa774e2933338fd2e9f2
-EBUILD freerdp-2.0.0_rc1-r1.ebuild 2892 BLAKE2B db7a01064767e64c2a7a70da24f61c41a02f0eb471f0f54092401a8b15865fcea61e9cde7e92e811a38e91ac90442523fc507ebb12a5df49c3fc82d94442fde1 SHA512 20910eaf36b9a4eb38231f96dc30443e760eae0f794d28a98f3187e424500e651f715ff79edb05400fea962a9d99cbc4c2ac32955391ac762e822eec666452fa
+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_rc3-r1.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b
-EBUILD freerdp-2.0.0_rc3.ebuild 2615 BLAKE2B 6987e6d5cb42d17359e6403b61bd44417da1e61be7fe4495e6aec26306a75f1d53faad0f89a2ffe632a63c486988c4e8991196dc7ddb28dcf936870e6b289259 SHA512 e5215b3905e2cfc280d9b6f44a026b65df7cafdb9d50611dd857e09c796556eafeebeb1f38c582c6afa9083508ef571887dc8c9668b9d69ceb59cda86169518f
+EBUILD freerdp-2.0.0_rc4.ebuild 2696 BLAKE2B aff4ef66a714733ac5eae705f01d9bf2e237f41ebaa78e6541a9d90e6b80a2d9b81a9d5c5b872a78de8f80b175d06c6f47b48d965bd5661cb6d036159ee7786a SHA512 f8929b63953bba9d22f29af069da0af4da9631ab6de613bcd486241311932aeed457405fab0f6676a5747cc036b90d2ee2c1205cce7e69e6edec8d73bc1b4002
 EBUILD freerdp-9999.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/1.2.1-gstreamer.patch b/net-misc/freerdp/files/1.2.1-gstreamer.patch
deleted file mode 100644
index cafe9702210a..000000000000
--- a/net-misc/freerdp/files/1.2.1-gstreamer.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From bea27fd919b64ee8d97996409e279e1e83d13594 Mon Sep 17 00:00:00 2001
-From: Jean-Louis Dupond <jean-louis@dupond.be>
-Date: Sun, 4 Oct 2015 18:17:33 +0200
-Subject: [PATCH] FindGStreamer_1_0: fix build failure for new gstreamer
- versions
-
----
- cmake/FindGStreamer_1_0.cmake | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
-index f7bf990..3aa8fc6 100644
---- a/cmake/FindGStreamer_1_0.cmake
-+++ b/cmake/FindGStreamer_1_0.cmake
-@@ -53,17 +53,17 @@ set(GSTREAMER_1_0_MINIMUM_VERSION 1.0.5)
- # Helper macro to find a Gstreamer plugin (or Gstreamer itself)
- #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_1_0_AUDIO")
- #   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-1.0", or "gstreamer-video-1.0").
--#   _header is the component's header, relative to the gstreamer-1.0 directory (eg. "gst/gst.h").
- #   _library is the component's library name (eg. "gstreamer-1.0" or "gstvideo-1.0")
--macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
-+macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
-     # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
--    pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
- 
--    find_path(${_component_prefix}_INCLUDE_DIRS
--        NAMES ${_header}
--        HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
--        PATH_SUFFIXES gstreamer-1.0
--    )
-+    string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
-+    if ("${CMAKE_MATCH_2}" STREQUAL "")
-+        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
-+    else ()
-+        pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
-+    endif ()
-+    set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
- 
-     find_library(${_component_prefix}_LIBRARIES
-         NAMES ${_library} gstreamer_android
-@@ -78,8 +78,8 @@ endmacro()
- # 1.1. Find headers and libraries
- set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
- find_package(Glib REQUIRED)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
- 
- # 1.2. Check Gstreamer version
- if (GSTREAMER_1_0_INCLUDE_DIRS)
-@@ -110,11 +110,11 @@ endif ()
- # 2. Find Gstreamer plugins
- # -------------------------
- 
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
--FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_APP gstreamer-app-1.0 gstapp-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_FFT gstreamer-fft-1.0 gstfft-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
-+FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_VIDEO gstreamer-video-1.0 gstvideo-1.0)
- 
- # ------------------------------------------------
- # 3. Process the COMPONENTS passed to FIND_PACKAGE
--- 
-2.6.3
-
diff --git a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
deleted file mode 100644
index 9e565e5b05db..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 9bf9ff9e8a548ecb5306d0142e75cdc274e93ba1 Mon Sep 17 00:00:00 2001
-From: Valery Kartel <valery.kartel@gmail.com>
-Date: Wed, 26 Jul 2017 17:12:14 +0300
-Subject: [PATCH] Fix build with LibreSSL
-
----
- libfreerdp/crypto/crypto.c      | 2 +-
- winpr/libwinpr/utils/ssl.c      | 6 +++---
- winpr/tools/makecert/makecert.c | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
-index 15e65d534..f3bb595b8 100644
---- a/libfreerdp/crypto/crypto.c
-+++ b/libfreerdp/crypto/crypto.c
-@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path)
- 	if (cert_ctx == NULL)
- 		goto end;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	OpenSSL_add_all_algorithms();
- #else
- 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index b674e21d5..78cbab1d8 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO
- 	}
- #endif
- 	/* SSL_load_error_strings() is void */
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_load_error_strings();
- 	/* SSL_library_init() always returns "1" */
- 	SSL_library_init();
-@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
- 		_winpr_openssl_cleanup_locking();
- #endif
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		CRYPTO_cleanup_all_ex_data();
- 		ERR_free_strings();
- 		EVP_cleanup();
-@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
- #ifdef WINPR_OPENSSL_LOCKING_REQUIRED
- 	if (flags & WINPR_SSL_CLEANUP_THREAD)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		ERR_remove_state(0);
- #else
- 		ERR_remove_thread_state(NULL);
-diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c
-index a9efb352c..c9e38200a 100644
---- a/winpr/tools/makecert/makecert.c
-+++ b/winpr/tools/makecert/makecert.c
-@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa
- 				printf("Using default export password \"password\"\n");
- 			}
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 			OpenSSL_add_all_algorithms();
- 			OpenSSL_add_all_ciphers();
- 			OpenSSL_add_all_digests();
-@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv)
- 		key_length = atoi(arg->Value);
- 	}
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
- #else
- 	{
-@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv)
- 	{
- 		ASN1_TIME* before;
- 		ASN1_TIME* after;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		before = X509_get_notBefore(context->x509);
- 		after = X509_get_notAfter(context->x509);
- #else
--- 
-2.14.1
-
diff --git a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
deleted file mode 100644
index 59887f698ec9..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 088c3940d9b488e8a83b9cefaa7271f955d1971c Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
-Date: Wed, 14 Mar 2018 13:39:23 +0100
-Subject: [PATCH] fix nla: don't use server version
-
-FreeRDP currently only supports CredSSP protocol version 3. However the
-current implementation always sent back the version received by the
-server indicating that this version was supported.
-With recent windows updates applied the protocol changed and this approach
-doesn't work anymore (see
-https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes).
-
-With this fix FreeRDP always sends version 3 as supported version.
-
-Credit goes to @mfleisz.
-
-Fixes #4449
----
- libfreerdp/core/nla.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
-index 47e087062..8a69f2f6e 100644
---- a/libfreerdp/core/nla.c
-+++ b/libfreerdp/core/nla.c
-@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla)
- static int nla_decode_ts_request(rdpNla* nla, wStream* s)
- {
- 	int length;
-+	UINT32 version = 0;
- 
- 	/* TSRequest */
- 	if (!ber_read_sequence_tag(s, &length) ||
- 	    !ber_read_contextual_tag(s, 0, &length, TRUE) ||
--	    !ber_read_integer(s, &nla->version))
-+	    !ber_read_integer(s, &version))
- 	{
- 		return -1;
- 	}
- 
-+	if (version < nla->version)
-+		nla->version = version;
-+
- 	/* [1] negoTokens (NegoData) */
- 	if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
- 	{
--- 
-2.16.2
-
diff --git a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
deleted file mode 100644
index 76e2514ef2b0..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bfe3af4c72b45e33321962644d864843e1c9ce3d Mon Sep 17 00:00:00 2001
-From: Greg V <greg@unrelenting.technology>
-Date: Fri, 1 Dec 2017 18:34:48 +0300
-Subject: [PATCH] Fix LibreSSL build
-
-LibreSSL does not support FIPS mode.
----
- winpr/libwinpr/utils/ssl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index f749939ac..194f82609 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO
- 
- 	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!");
- #else
- 		WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
-@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
- 
- BOOL winpr_FIPSMode(void)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	return FALSE;
- #else
- 	return (FIPS_mode() == 1);
--- 
-2.15.1
-
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
new file mode 100644
index 000000000000..f666e0d4d671
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
@@ -0,0 +1,47 @@
+From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Thu, 22 Nov 2018 09:23:46 +0100
+Subject: [PATCH] Fix #5049: LibreSSL does not have SSL_CTX_set_security_level
+
+---
+ libfreerdp/crypto/tls.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
+index 20fde415d8..76f51701fe 100644
+--- a/libfreerdp/crypto/tls.c
++++ b/libfreerdp/crypto/tls.c
+@@ -656,7 +656,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
+ #endif
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ 	SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
+ #endif
+ 
+From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Thu, 22 Nov 2018 19:10:05 +0100
+Subject: [PATCH] Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high
+
+Need to check specifically for LIBRESSL_VERSION_NUMBER as they
+set the version higher than OpenSSL 1.1 but without API support.
+---
+ libfreerdp/crypto/tls.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
+index 76f51701fe..ded41f127e 100644
+--- a/libfreerdp/crypto/tls.c
++++ b/libfreerdp/crypto/tls.c
+@@ -655,8 +655,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
+ 	SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported version by library */
+ #endif
+ 
+-
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
+ #endif
+ 
diff --git a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
deleted file mode 100644
index b63771d08187..000000000000
--- a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 28 Jul 2017 16:31:41 -0400
-Subject: [PATCH] Fix gstreamer-1.0 detection
-
----
- cmake/FindGStreamer_1_0.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
-index 3aa8fc6dc..6fbc0ecc5 100644
---- a/cmake/FindGStreamer_1_0.cmake
-+++ b/cmake/FindGStreamer_1_0.cmake
-@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
- 
-     string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
-     if ("${CMAKE_MATCH_2}" STREQUAL "")
--        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
-+        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}")
-     else ()
-         pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
-     endif ()
--- 
-2.13.3
-
diff --git a/net-misc/freerdp/files/freerdp-armfp.patch b/net-misc/freerdp/files/freerdp-armfp.patch
deleted file mode 100644
index 1a367d5600c3..000000000000
--- a/net-misc/freerdp/files/freerdp-armfp.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2355b54f8516a6e1c600df8f26ac7d56916bfd99 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 May 2015 17:35:21 -0400
-Subject: [PATCH] Remove the ARM_FP_ABI option
-
-It's unclear why this option would be necessary, and it causes problems
-when people do not match it to their toolchain and CFLAGS.
-
-To set the float abi, either use a toolchain with an appropriate default
-or set the float-abi option in the CFLAGS environment variable.
-
-This should resolve #2586.
----
- cmake/ConfigOptions.cmake           | 6 ------
- libfreerdp/CMakeLists.txt           | 4 ++--
- packaging/deb/freerdp-nightly/rules | 7 -------
- 3 files changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
-index b51a46b..cef6ba6 100644
---- a/cmake/ConfigOptions.cmake
-+++ b/cmake/ConfigOptions.cmake
-@@ -29,12 +29,6 @@ if(TARGET_ARCH MATCHES "ARM")
- 	else()
- 		option(WITH_NEON "Enable NEON optimization." OFF)
- 	endif()
--	if (NOT DEFINED ARM_FP_ABI)
--		set(ARM_FP_ABI "softfp" CACHE STRING "Floating point ABI to use on arm")
--	else()
--		set(ARM_FP_ABI ${ARM_FP_API} CACHE STRING "Floating point ABI to use on arm")
--	endif()
--	mark_as_advanced(ARM_FP_ABI)
- else()
- 	if(NOT APPLE)
- 		option(WITH_IPP "Use Intel Performance Primitives." OFF)
-diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
-index a1cbd9d..112b75a 100644
---- a/libfreerdp/CMakeLists.txt
-+++ b/libfreerdp/CMakeLists.txt
-@@ -156,7 +156,7 @@ if(WITH_SSE2)
- endif()
- 
- if(WITH_NEON)
--	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable" )
-+	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -Wno-unused-variable" )
- 	set(CODEC_SRCS ${CODEC_SRCS} ${CODEC_NEON_SRCS})
- endif()
- 
-@@ -236,7 +236,7 @@ if(WITH_SSE2)
- 	endif()
- elseif(WITH_NEON)
- 	if(CMAKE_COMPILER_IS_GNUCC)
--	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}")
-+	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon")
- 	endif()
- 	# TODO: Add MSVC equivalent
- endif()
-diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
-index 4366f63..44ceb56 100755
---- a/packaging/deb/freerdp-nightly/rules
-+++ b/packaging/deb/freerdp-nightly/rules
-@@ -1,11 +1,5 @@
- #!/usr/bin/make -f
- 
--DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
--ifneq (,$(filter armhf,$(DEB_HOST_ARCH)))
--ARM_FLOAT_ABI = -DARM_FP_ABI=hard
--else
--ARM_FLOAT_ABI =
--endif
- NULL =
- 
- DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
-@@ -26,7 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
-                           -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
-                           -DCMAKE_INSTALL_INCLUDEDIR=include \
-                           -DCMAKE_INSTALL_LIBDIR=lib \
--                          $(ARM_FLOAT_ABI) \
-                           $(NULL)
- 
- %:
--- 
-2.5.0
-
diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
deleted file mode 100644
index e4d81bd1c2aa..000000000000
--- a/net-misc/freerdp/files/freerdp-ffmpeg29.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/FreeRDP/FreeRDP/pull/2895
-
-Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-===================================================================
---- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -102,7 +102,7 @@ static BOOL tsmf_ffmpeg_init_video_strea
- 	mdecoder->codec_context->bit_rate = media_type->BitRate;
- 	mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
- 	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
--	mdecoder->frame = avcodec_alloc_frame();
-+	mdecoder->frame = av_frame_alloc();
- 	return TRUE;
- }
- 
-@@ -320,7 +320,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
- 								 mdecoder->codec_context->width, mdecoder->codec_context->height);
- 		mdecoder->decoded_data = malloc(mdecoder->decoded_size);
- 		ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
--		frame = avcodec_alloc_frame();
-+		frame = av_frame_alloc();
- 		avpicture_fill((AVPicture*) frame, mdecoder->decoded_data,
- 					   mdecoder->codec_context->pix_fmt,
- 					   mdecoder->codec_context->width, mdecoder->codec_context->height);
-@@ -389,7 +389,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
- 									(int16_t *) dst, &frame_size, src, src_size);
- #else
- 		{
--			AVFrame *decoded_frame = avcodec_alloc_frame();
-+			AVFrame *decoded_frame = av_frame_alloc();
- 			int got_frame = 0;
- 			AVPacket pkt;
- 			av_init_packet(&pkt);
-@@ -469,7 +469,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo
- 
- 	switch (mdecoder->codec_context->pix_fmt)
- 	{
--		case PIX_FMT_YUV420P:
-+		case AV_PIX_FMT_YUV420P:
- 			return RDP_PIXFMT_I420;
- 		default:
- 			WLog_ERR(TAG, "unsupported pixel format %u",
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
deleted file mode 100644
index 0ead5f2d8dc9..000000000000
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils vcs-snapshot
-
-if [[ ${PV} != 9999* ]]; then
-	COMMIT="aa2181dcf2dd98693767ba738c5b2ad8c3d742d4"
-	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ppc ppc64 x86"
-else
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/1.2"
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav
-	libressl neon pulseaudio server smartcard test usb wayland X xinerama xv"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	wayland? ( dev-libs/wayland )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-DOCS=( README )
-
-PATCHES=(
-	"${FILESDIR}/freerdp-armfp.patch"
-	"${FILESDIR}/freerdp-ffmpeg29.patch"
-	"${FILESDIR}/1.2.1-gstreamer.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa ALSA)
-		$(cmake-utils_use_with client CLIENT)
-		$(cmake-utils_use_with cups CUPS)
-		$(cmake-utils_use_with debug DEBUG_ALL)
-		$(cmake-utils_use_with doc MANPAGES)
-		$(cmake-utils_use_with ffmpeg FFMPEG)
-		$(cmake-utils_use_with gstreamer GSTREAMER_1_0)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with neon NEON)
-		$(cmake-utils_use_with pulseaudio PULSE)
-		$(cmake-utils_use_with server SERVER)
-		$(cmake-utils_use_with smartcard PCSC)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use usb CHANNEL_URBDRC)
-		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xinerama XINERAMA)
-		$(cmake-utils_use_with xv XV)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use_with wayland WAYLAND)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
deleted file mode 100644
index 4d54e1eef9c0..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="${PV/_/-}"
-	MY_P="FreeRDP-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ppc ppc64 x86"
-else
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa +client cpu_flags_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openh264? ( media-libs/openh264 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-DOCS=( README )
-PATCHES=(
-	"${FILESDIR}"/2.0.0-rc0-libressl.patch
-	"${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		# WITH_SSE2 actually enables code requiring SSSE3
-		-DWITH_SSE2=$(usex cpu_flags_x86_ssse3)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild
deleted file mode 100644
index a84d3524129b..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0_rc1-r1.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"
-
-inherit cmake-utils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="${PV/_/-}"
-	MY_P="FreeRDP-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~ppc ~ppc64 x86"
-else
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa +client cpu_flags_x86_ssse3 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openh264? ( media-libs/openh264 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-PATCHES=(
-	"${FILESDIR}/2.0.0-rc1-libressl.patch"
-	"${FILESDIR}/2.0.0-rc1-CredSSP-protocol-version.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		# WITH_SSE2 actually enables code requiring SSSE3
-		-DWITH_SSE2=$(usex cpu_flags_x86_ssse3)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild
deleted file mode 100644
index 48abe1a3fc71..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-else
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-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"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openh264? ( media-libs/openh264 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 0d86ec929470..01b6f127c5bc 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc3-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="alpha amd64 arm ~ppc ~ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
@@ -87,6 +87,10 @@ DEPEND="${RDEPEND}
 	) ) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/2.0.0-rc4-libressl.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest
index fa0dcb9b048b..b28edde6faf6 100644
--- a/net-misc/gofish/Manifest
+++ b/net-misc/gofish/Manifest
@@ -2,4 +2,4 @@ AUX gofish.confd 429 BLAKE2B 508d6970cf449da1b1b9cf3940d3df024f66ace3ec1f64415ec
 AUX gofish.rc 607 BLAKE2B 85733d62a2b59a0feb900169cac3ce58f49a40664c7a536b23e4efde8db0888957773ace3cd0f317b821be4532cfd8b9ff7f6641f66cfcac15af6e62bee959fb SHA512 dbae20d8b5bd17e05612bf85acea2a6d0433a7c59670e6d7c2807274da8d8a81a82cdb15eac7dda572be062ef2aa87b62dabc0dfc208013eaeb682f7bc49f9e1
 DIST gofish-1.2.tar.gz 212596 BLAKE2B ca202a55463fbc0b09ed902556d038101b4963ef24920ccd527c2b0c99a2905431c3bdffb2777605010b62db48dd80362ecc68e6ddcfecc7f5f4245bece4d749 SHA512 f7999a5e2b4f80d6402f26d9434f844b26b47b43a6b00055e72ba399426672ed299ca759252d8eb732b23a4c2c369a92c11c0d496f16f4bf3a999398cf6c5bee
 EBUILD gofish-1.2.ebuild 643 BLAKE2B d31502744e2cfdb665cb36dffad42faa2d2dbc461d7de715efaf926c495e9ebd67c7fe35f17b3b9e8a0fbad6559fc21b518cd1703b381ab77bc9fddc85ba0091 SHA512 02da3d0c5e09d17ef17f41c0fd94c9827d0063bd1a23377d49a179f904bb53a9d900a2fcb2d30349e2eda634c0a062eef56204e001d4e265ba4ec73e7c0031c5
-MISC metadata.xml 319 BLAKE2B 0c4c5ee6fea8098ae5534520b45f86827bbf9a4bb0c089b06c5164620f9d7307ef4a3f621ad881b298b6074935c19070eb809aea01fe0afed39e2729a42369aa SHA512 c8463c7246f59639db01c3d7c3ce2aea6b26f6f4d3e40239097e8df3e78d040ee50adb71d11748a2ce50a7b4d11ebd209596f4abfe3832dc1aae218d29d88f2c
+MISC metadata.xml 243 BLAKE2B abe6d8663d75c0714d442564a532697432403497680faea1e7aaac85ead3e43040f41b87aeff96392efe92cbeb4e8795d5fa89975098673d89b6b116e24e8b98 SHA512 20e0e5969c25ae20a3e0fd1a48aab24ea25d41f80ea16d1b5075a097ce1de9f1652c571a9b2673d6ff009e03eeb9bf5a11f61ed305486784df5ae0924ef9ef24
diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml
index bd537594c884..b939f35668cd 100644
--- a/net-misc/gofish/metadata.xml
+++ b/net-misc/gofish/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gofish</remote-id>
 	</upstream>
diff --git a/net-misc/hotot/Manifest b/net-misc/hotot/Manifest
index 762ee460739e..8cde0495c25e 100644
--- a/net-misc/hotot/Manifest
+++ b/net-misc/hotot/Manifest
@@ -1,4 +1,4 @@
 DIST hotot-0.9.8.15_p20150812.tar.gz 1234481 BLAKE2B e0e3a29b476b0de8c23586193578bf597a96b5ec3f203da61ca5e0f89d0c8bc0d020d262ccbb622a9f0e01b5c10e7ae432e9907c83c0aaaa5beb1b7ff7845fb5 SHA512 8faffd583bc7bc2888acac5b33cf7ede285a5732c7349e9f84acf63788a9a96d6c0de0759605afcacb618d904f1a54e50581684d49bd637acd6036046f28bc7e
 EBUILD hotot-0.9.8.15_p20150812-r2.ebuild 1198 BLAKE2B 739de6653d70d5522893fd019a9e8aa002d4312146072ecc1facc7457493bddbead5172c1b15696ad0886e3177adfd42f54d2c97f37fb3811664854b95d93d04 SHA512 3f884a548d773ae567ae902ad78016c9134a62af3e3d4907f7e9674d5e3904f9cd9373e6800b9d07d593cebdcea37fb0b1379b544d628aab2600c1d1fbabeb2c
 EBUILD hotot-9999.ebuild 1166 BLAKE2B 48f2e19b91ba78f9639eb30b7ce1df862d916c9149f8a8defd40976047e857ca0a5735d2efe6ac65a73641f285f6d8f14b860bacb07d42864fe5e45f7c7ee5e0 SHA512 e97babaeda233e04ab5fc02855ed43919ecb20d0df196f90ad0b553a6d3c32d67a9e372352c819e1b760c1caa1ea00491d4eaed170e3b917953d42d2f7ac18a0
-MISC metadata.xml 396 BLAKE2B 03b8bce8cf3a5aeacc77c255f34c431dafc202236fe7a4bf4343a72241d39d195511b66d86e980006613609e352bc2269c3360f2cf54b4a63ea0725900d45eb1 SHA512 2211ef5c04c0edbacd653777915b58e1cfdf55040a2242408e8422672ed83daa916132e064e03cb51394da9bc8430d24c8d65084702c3846862f381d89fa3b3a
+MISC metadata.xml 320 BLAKE2B 6337227bc64a7b830e67a9317fce491bbbff09ac59f89308ca133201cc0f247bfccffac369d88682506d0e6e6e9c92ac3d10efa44014701f045b5fb9121cece0 SHA512 fe513375ed6bc4c034f9b4ecd024cd447bd0e2335b6e9d13eecfc74f9c2c8f1e627ca99f798f7571428b29d299b708f7821ec43c1a51593c18402c11447327ad
diff --git a/net-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
index 9fcc5c61b405..c93b1aebf693 100644
--- a/net-misc/hotot/metadata.xml
+++ b/net-misc/hotot/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="chrome">Build chrome browser extension</flag>
 	</use>
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index dcf0b20f1e91..820c190ca416 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -3,5 +3,5 @@ AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba979979
 DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360
 DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4
 EBUILD htpdate-1.0.7.ebuild 1104 BLAKE2B f8430b15362130cc425a75b6b296b274e8f26ae4bc30085bd9d4d5d7330fa16560e19809e65dbf55d346f96a7f70901b8165526a0842b0b3a9cc2d9bf21671ad SHA512 b94a56bd7230572bc2b52fcba820a7606abd26254b202ad2c7be1ccbe29bb7a4fcce4e211576e06fe08d04d7b88979e4116b823254d9dd406cff61dd9b21fed5
-EBUILD htpdate-1.2.0.ebuild 1009 BLAKE2B c1d1edb2c2647fa0d9143deee6c2a5bb9eba37b38762f8b930df1e275c4c891d086082545fa632333f8880309fb284ed250fbbf307d58be686fc315c17de1223 SHA512 74c786e9a120f58ab18e77ac232530bc8cdd668a1f5d03cc9e4a5d8d44a1cb031c4283cabfa2db0f3a32a77baaeee9102ace4bb562e9a90d592f96b889fc9bdf
+EBUILD htpdate-1.2.0.ebuild 1008 BLAKE2B e8d1b72fa79229af5b9f2e9b9e08996e985ce68a34507dd65d4d8421e8f094b7cff5a7aae767e97c8529930aa578af9ddbc858d32a2b945deaedf6c77709a1e1 SHA512 0cd1b71a529c6255edf395d160ac4c229829597af5b9e140d18c187e36578704e60a215d2bf1eccab7601c99470a3d5a88a9a8f63073507a186cbd562b8449f1
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild
index 00d0daf424cc..e9f1b6de4ef7 100644
--- a/net-misc/htpdate/htpdate-1.2.0.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 4c850f1cf665..cf765e541abe 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,12 +1,14 @@
-AUX 10ICAClient 88 BLAKE2B de89e73ff93f7b7a78b4d20bb3233471e29b448727de46c51859153af6754d8c3f0d6343c84671b706f0921c573703593342580855ae6e9ae04220848a5f872b SHA512 1a9c405dd4e5629595cdbbd5a712432fd40531ef094c84fb64849a49885dca2e9e27687fe01568735a12c11282fa851aab7d26d0db8606acd7b577eae8339e57
+AUX 10ICAClient 61 BLAKE2B e2da5a69886dba37e8ccc9a4212cff2504a73a9a9da3c6f22f5ffe58e6661afce2858e224bbfdfde48e76b4cde4c0822da9b7ef39c357a3a3730a98d1f775c26 SHA512 a1eb61dcd636aab9770561d141241ae214870341ed85129e385509350cddb8f559eccbafd6832d000283d1a8ef0d7faf42910c76013d3cf97c8d4f036cd48957
+AUX configmgr.desktop 191 BLAKE2B 891069f75757cbe800053ee89e59c8eda2ce161a79a91def6895d3ce6b004b75395c167e88adb361a1f4ea5ff9b7a6b23a250a3d5a70c6fe4b875cc23a8ba8ff SHA512 ccb45da870e68e090ceb454ae4ef317e8834d2d0764ee3494dc3252b039be413ae27a27142040a130f2bcdd5a88d12bf598a432d31e0aa40581a5b682519aa96
+AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a2187be7598398c25d5e66dfaad932b893eea5b0d9d2a5b89d58b04e63811bfa03887da92d44c78b5cb0fc1 SHA512 53939f018a453b0cf40731af36ad55545f517a66d011dac2ccf0cf3f318f63f026e632e951b7c55e15d5f1841f23d0ad8ab4bc5adfb1ea92c9cb720c14af0261
+AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
+AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
 DIST linuxx64-13.10.0.20.tar.gz 20208082 BLAKE2B f350b303df768f17c49033111f79b85217829ed19ca3884d63266ed1fd436ff8eea44a6514e708d97e72313a6905425a30c0107191e98c68bfc9c7b0fc454008 SHA512 ac12c09fc459726ddff8564a4900e0184d3f04138cf51361076fb476296f96f0f98d55b6d079f2c3829cfbaf07c373e8722fcde56266f2f3c8c5989ad33fa06b
-DIST linuxx64-13.8.0.10299729.tar.gz 19855914 BLAKE2B 62029b75a2c77f3c58ca272a3cf8b91094f1328e9378ae66bf38ea94b7a0d14ccee392efd983cd1f2c7af822d488358b1db7c97569f866cb0381c9f5b3188bb8 SHA512 dc43587b7ca35d12ff2772618f8fa1154ee26081e315d381cf603976a7c2f4e395c8d8f134f7ad7238a3c390fdb085291f92ff3da2b4755d903fcd15d0c738df
-DIST linuxx64-13.9.1.6.tar.gz 20047795 BLAKE2B e23473d4f9486393b381cf7b6f0c91f63ac053c9b008d1351e9ecc65ad827a436b8de4758a1fca019731315deb4d0bd919af46839a771d270192c00699eab839 SHA512 b55fc4a89b3d482381abd48806534f55813746c17e1c457fb2c23f6c81dfbd019cf86355680921b9e3c3f4c01176855fce63ac7258ca726fc622bf1bb4e45ab6
+DIST linuxx64-18.10.0.11.tar.gz 21976273 BLAKE2B 4d673f40a04e31bba94b2e0dda744f8e3bb1ac489bfbbf846da3ae700d8fbd2504d22aa8fe1b703ceee9536699ea7fee288ce21306771f5c8806930cf54e2ffd SHA512 c14cfb2d10738c888dd2f56f840b0446d8952fe2adb76e1fac0c75d135a4c785cbfd8ccefed6d66f917eb4ebe3d27d151da738706b137abe26dcc3963dd78a1d
 DIST linuxx86-13.10.0.20.tar.gz 22123747 BLAKE2B 490024fa780fc8e09afb3dd56194525b6b5aefe89377c59f4bfa12eeb3f60711530dd2659dd8fe975df6121db5af35e3760315a5b656e4f517e2fad9fb411ada SHA512 e4c5220ea680601a95019d30c2fb2a26e7f3cd60da19c42b96168aab74456c1242b4400cc4d7b10910a7e0e1993377d6492fb9e2cebb98b1b662d3d1ebf4cffc
-DIST linuxx86-13.8.0.10299729.tar.gz 21763683 BLAKE2B fb8238dd256bbeff59df73e1ee495579ffa315d5d38d857436ebdafc2d5e4f9e3bf3c760a66005fbd82657ddbe418849a28532b15b757937d0892e4be33a1905 SHA512 7e6c70e3600cc56c85722f37e473cf3c422daded0f7e755c47bf8b17f224be0676f5ef09c594c058eae6760dc4633c13a02f4d75c3870a4a10a04d29159a670a
-DIST linuxx86-13.9.1.6.tar.gz 21969792 BLAKE2B aa683e63e6216ae03d86464cd24e0a65972f251880e8211bc0ed163353690570ec4840e949447d13008e0ce9bed35b097e97dc0c0981c710e74a6263b045f867 SHA512 9f9c0ffb25b4f476000199fb61668c577a098dc445366445cc5ed53bf433cb4699e66bab952bad9c3692e395247819c5b86ef7c2e35b974a1c7a9d4e2b83959f
-EBUILD icaclient-13.10.0.20.ebuild 4814 BLAKE2B 066692977c6a385da76f5c45f075674c093fdeb4ecb9583bea8314061bbf4e31c1480d35cad812ec0d534fc36a5c942bdc8b318e0ba8570063888874c6564d15 SHA512 0851c2e3a584b81c755bbe605344505af7b98663b6b03aa40d4fa5448cc1c1ce57681ad996c311a8801295674a57e14a394b4d6114a3a600c568f0e86771e919
-EBUILD icaclient-13.8.0.10299729-r1.ebuild 4381 BLAKE2B 25761456947813f76cbb5a344348d9b9c4fd84f399c4b851fbe2c72900018799ada6136080ccafc0a777bfe9489884f2a7026a087c9d8f3ddc9fcc8e40af4907 SHA512 869a09bf6e1e961b684e1efc7d5e09bd28e8aca6407f3ba2e9eb47234f2ea5c8c79a10fb4ce9db20f5b6c2839b58a15e46fc1815956d81da74fb72673cd9a998
-EBUILD icaclient-13.9.1.6.ebuild 4592 BLAKE2B be783d78e932cdd4e5249eb606a080e5c738512b210a72473f57d4a5f0b76a5e90dfa6c5c3841b4b9b459038c9aaa4f05b11255b4fd89d399715ed6104ce0f06 SHA512 f7f38a573b7b7c6950e5c8fea457f97cf8438ce5676c1b7ff20d4da09862133c0e08ef57e14c49105eafc128cfc363ca439e49468fac175a937df42d5adc3e26
+DIST linuxx86-18.10.0.11.tar.gz 24095176 BLAKE2B 5e7b9bba57661216b0194ccca292a9e663fdca65439c86ea68c1857352f1ed7c5247e41eeb976bc306148cd78c71b069da3e65042331a0e601637db1fee2d6c6 SHA512 8e073b436454472799df283266ccd68652b519336bf74b558b1d0345147331c5e8f4c8900b8d94a13bd6b08b94298c9dbcc5a3a06edbe53722304de5b117f239
+EBUILD icaclient-13.10.0.20-r1.ebuild 4809 BLAKE2B 08204d5dba7f9632d3047123a78f63539c78dbe9177234486b9afdd8dd2c13e72ce6d9e1eeadebdc9433b4a04ca37c40243c0fdc65b43ed414f2b7d3c19d1f56 SHA512 e16d3870b90449139a368d4e56777fdf97d015fec17878c2c57f92503da75e488cb47844ef84249e565eafff2c013f8f68125b7b8e8ae2c94daa681a14be1434
+EBUILD icaclient-18.10.0.11-r1.ebuild 5001 BLAKE2B 229bc1894b70fdb41fee4f46788e59e218e2c06c21696bd9a67fe6a10a7af3287e2f1ebad2632a083af478ef1de686fe28fb61d31c9899cbb43d0815165c7b7b SHA512 34109258156e8a9be1b1f7aedeb0e4ca8bb63087564cd053edb6ddb509ae98cce20271bb024a6177f494d2f25dd04d059ca4fc49464ab860f3781950935de1ad
+EBUILD icaclient-18.10.0.11.ebuild 4835 BLAKE2B 3cd1c02b2e0b29c36060c084718d8f0798aa7e07847f9d965565783b75030aac07fc45798bc3d7855ee775c13857ae6e8337647e1837806896e867078ad55302 SHA512 e067e03c848086b087d2f34855905c17d637b18d7b23addde72b5e9c1930963e644e5ac73b74280ce8649d2315d7ec8f3c8841ef7d67370f973ddefc8ee99b03
 MISC metadata.xml 678 BLAKE2B 7ca853d90b1492bd1c15b9e0109430afbedae032ef56a035cf75de74796f694b2ab955dca5f3ef93a97a1c61686ead93b1bd1579802b35e0bd381d0d0c35d5ff SHA512 a838a68c22e2f1585960a7699399285c0c9b47b79734a22adc5d74599380c7c7792428dd7287f1e62d1194a4f97c79e902910f4c1569fc227f0f7e1c39afc8d0
diff --git a/net-misc/icaclient/files/10ICAClient b/net-misc/icaclient/files/10ICAClient
index 31be24e3380a..e5c2c73d62f3 100644
--- a/net-misc/icaclient/files/10ICAClient
+++ b/net-misc/icaclient/files/10ICAClient
@@ -1,3 +1,2 @@
-PATH=/opt/Citrix/ICAClient
 ROOTPATH=/opt/Citrix/ICAClient
 ICAROOT=/opt/Citrix/ICAClient
diff --git a/net-misc/icaclient/files/configmgr.desktop b/net-misc/icaclient/files/configmgr.desktop
new file mode 100644
index 000000000000..02188debb7e8
--- /dev/null
+++ b/net-misc/icaclient/files/configmgr.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Receiver (configmgr)
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=configmgr
+Exec=configmgr
diff --git a/net-misc/icaclient/files/conncenter.desktop b/net-misc/icaclient/files/conncenter.desktop
new file mode 100644
index 000000000000..1c418af224a4
--- /dev/null
+++ b/net-misc/icaclient/files/conncenter.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Receiver (conncenter)
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=conncenter
+Exec=conncenter
diff --git a/net-misc/icaclient/files/new_store.desktop b/net-misc/icaclient/files/new_store.desktop
new file mode 100644
index 000000000000..9ea426ff6b61
--- /dev/null
+++ b/net-misc/icaclient/files/new_store.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Add Citrix Store
+MimeType=application/vnd.citrix.receiver.configure;
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=new_store
+Exec=new_store %f
diff --git a/net-misc/icaclient/files/selfservice.desktop b/net-misc/icaclient/files/selfservice.desktop
new file mode 100644
index 000000000000..7c37f223e66e
--- /dev/null
+++ b/net-misc/icaclient/files/selfservice.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Receiver
+Categories=Network;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=selfservice
+Exec=selfservice
diff --git a/net-misc/icaclient/icaclient-13.10.0.20.ebuild b/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild
index 09f7c5ef1a86..9ad6a7b62628 100644
--- a/net-misc/icaclient/icaclient-13.10.0.20.ebuild
+++ b/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
index 6de1b07173b3..2694d7156b64 100644
--- a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
+++ b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib eutils versionator
+# eutils inherit required for make_wrapper call
+inherit desktop eutils multilib xdg-utils
 
 DESCRIPTION="ICA Client for Citrix Presentation servers"
 HOMEPAGE="https://www.citrix.com/"
@@ -12,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -40,11 +41,13 @@ RDEPEND="
 	media-libs/speex
 	net-dns/libidn:1.33
 	net-libs/libsoup:2.4
+	net-misc/curl
 	sys-libs/e2fsprogs-libs
 	sys-libs/zlib
 	virtual/krb5
+	virtual/jpeg:0
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXaw
@@ -60,7 +63,7 @@ DEPEND=""
 
 pkg_nofetch() {
 	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/citrix-receiver.html"
+	https://www.citrix.com/downloads/workspace-app/"
 	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
 }
 
@@ -86,7 +89,7 @@ src_prepare() {
 }
 
 src_install() {
-	local tmpl dest
+	local bin tmpl dest
 
 	dodir "${ICAROOT}"
 
@@ -115,7 +118,7 @@ src_install() {
 	for tmpl in {appsrv,wfclient}.template ; do
 		newins nls/en/${tmpl} ${tmpl/template/ini}
 	done
-	touch "${ED%/}/${ICAROOT}"/config/.server || die
+	touch "${ED}/${ICAROOT}"/config/.server || die
 
 	insinto "${ICAROOT}"/gtk
 	doins gtk/*
@@ -152,8 +155,8 @@ src_install() {
 		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
 
 		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
 				|| die
 		done
 	done
@@ -171,16 +174,30 @@ src_install() {
 	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
 
 	exeinto "${ICAROOT}"/util
-	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
+	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so,webcontainer,ctxwebhelper,ctx_rehash,ctx_app_bind}
 	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
 
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
 	doenvd "${FILESDIR}"/10ICAClient
 
-	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
 
 	dodir /etc/revdep-rebuild/
 	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED%/}"/etc/revdep-rebuild/70icaclient
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
 }
 
 pkg_preinst() {
@@ -193,3 +210,11 @@ pkg_preinst() {
 		fi
 	fi
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/icaclient/icaclient-13.9.1.6.ebuild b/net-misc/icaclient/icaclient-18.10.0.11.ebuild
index adccfce74fe8..b8118d5f9b1e 100644
--- a/net-misc/icaclient/icaclient-13.9.1.6.ebuild
+++ b/net-misc/icaclient/icaclient-18.10.0.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # eutils inherit required for make_wrapper call
-inherit desktop eutils multilib versionator xdg-utils
+inherit desktop eutils multilib xdg-utils
 
 DESCRIPTION="ICA Client for Citrix Presentation servers"
 HOMEPAGE="https://www.citrix.com/"
@@ -41,11 +41,13 @@ RDEPEND="
 	media-libs/speex
 	net-dns/libidn:1.33
 	net-libs/libsoup:2.4
+	net-misc/curl
 	sys-libs/e2fsprogs-libs
 	sys-libs/zlib
 	virtual/krb5
+	virtual/jpeg:0
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXaw
@@ -61,7 +63,7 @@ DEPEND=""
 
 pkg_nofetch() {
 	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/citrix-receiver.html"
+	https://www.citrix.com/downloads/workspace-app/"
 	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
 }
 
@@ -116,7 +118,7 @@ src_install() {
 	for tmpl in {appsrv,wfclient}.template ; do
 		newins nls/en/${tmpl} ${tmpl/template/ini}
 	done
-	touch "${ED%/}/${ICAROOT}"/config/.server || die
+	touch "${ED}/${ICAROOT}"/config/.server || die
 
 	insinto "${ICAROOT}"/gtk
 	doins gtk/*
@@ -153,8 +155,8 @@ src_install() {
 		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
 
 		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
 				|| die
 		done
 	done
@@ -172,16 +174,21 @@ src_install() {
 	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
 
 	exeinto "${ICAROOT}"/util
-	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
+	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so,webcontainer,ctxwebhelper,ctx_rehash,ctx_app_bind}
 	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
 
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
 	doenvd "${FILESDIR}"/10ICAClient
 
 	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
 
 	dodir /etc/revdep-rebuild/
 	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED%/}"/etc/revdep-rebuild/70icaclient
+		> "${ED}"/etc/revdep-rebuild/70icaclient
 
 	# 651926
 	domenu "${FILESDIR}"/wfica.desktop
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index c6f71a47fa86..7a6761e3351c 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -2,10 +2,12 @@ AUX igmpproxy-conf.d 165 BLAKE2B df8526557acd0d88b017298dfd06b636c60537e79bca0fd
 AUX igmpproxy-init.d 514 BLAKE2B 5022b5f458c1a2c4082f591a1f003129453d6d8846ca6976820bb03b980aae7fed81abc29499effa3f96daf84e977c00ec842cc6a3d63b12be86c1e254adf15f SHA512 7bb2812c27556d1355e415eaa8ebe5d3ed5a896e88c6813c4bce686b3268c6f0000507cea59afa37a3f474fa6e2ca20c91bf87a63cf4c8209cef2f5bbb01c1cf
 AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85b383bcb8e77570f33c2a9f2a52ba3690b9a4a69bf0df82926571326b9720e274f7cbfd8bb39215c9 SHA512 3c95e98d19b88bed32562e64e4e491ac34da3533acb5cfd39032443688bdfe889e4835544bc358ccd5f7a95356c1eb8013462f3bc4a13e8e083717bfaaba4b5f
 AUX igmpproxy.initd 439 BLAKE2B 05673b50c7a055dfaa9011a21ab761a0ed87d142773bbbaa9dff90b35608c31cdd3837bcb575186e098568867499ab660e53a0215ef76bc83b95b3e6d174d174 SHA512 65c2107558ec0402daa1814eb45acdaaed40dcf7d7529ac0e02870fc2826cf770d6d2a54508b44b6a38c19ae58a4db777b2b4bf625df7797d0842cc44fb4559e
+AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62c7d62bbae33b59edd23c3b873db29f38eac37c42a9385c223e050fb3ed1e8776472f9fb73533d73200e SHA512 1e4e5d73fe9a734ab7898c2defdef8f9b27c3811109ef8819875a65733c72e48feb683d0001ced759c3195ce30bf31c6af9be7cebf30dd1dcd9141ffbbfe3f53
 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be
 DIST igmpproxy-0.1.tar.gz 140159 BLAKE2B d4a0fb0f69f1e8c7221ecd2842e95cfa390f54885d5eaaa5c69a32563b318a05540e123d4b19cd63a930d17934c1344fdf6467fad5c1de333d03e0a802e7912b SHA512 1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4
 DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
 EBUILD igmpproxy-0.1-r2.ebuild 587 BLAKE2B d96e2871845a21ddbab6a481915a82f5de977ff0e36d2c9c72cfc1d55a5bbf706349079151ada0f7b44a348a3a137c902dce9b4d88ffdfd96f3a1a8936ccf79c SHA512 75036b6de777dd630a89c6d08f729cb6c51c591c9ec9b206f492e081914f6c49ecb93bc9dd6e7026703a72b8adb1a4596d7c9aa326ab72b7e5cf72aa29ab3b86
 EBUILD igmpproxy-0.2.1-r1.ebuild 601 BLAKE2B 5b54a6d5950b0fb740d992eeaf0cea15716025b04b0459f6fc5aa1123cd39b1f107ee4b41d72da48039c48332f5772299351a3e9a7fee2f79959ba5160772ac0 SHA512 0b967134c5d086a82f02e52c51906894dda755fc60d6f34a763696b5212e4aa6d2fdd322f70125bc6fc402e3fc21275fd26cdb94e69c033215a83ab322b6ddfc
+EBUILD igmpproxy-0.2.1-r2.ebuild 604 BLAKE2B 912e3442cb61a583e2683213f1bef520d5029227b6fe61141011e23bb44aa95f0f532587f734c1bcd8ebe5727903da5b382841ab6035d369d531fac7ee881d53 SHA512 a05fb606035f88318ad73339576838dd4ca3b843a9112c682ccfe0542805629477edf7f2a287b2b1b40149500e2106ab24229ab220720b8270d16bb5ebe9fb6d
 EBUILD igmpproxy-0.2.1.ebuild 597 BLAKE2B 1ddba0a3cd604825d5f751986de268a9b26cfb1dde3f0ec03672c0c0452f7a5f3799e097dde6268e1095ec3d92ca7d0c1e31c1783713ae8bf02d66c5ccf0e610 SHA512 b01483610c5cc085a99cb1d1e554745fc71d9cf0b2599a1a9973d90f20547c02c5c7553ac0e9df715ee7194fe750cefbfb284bc6f261a8f559dd490a8e266479
 MISC metadata.xml 712 BLAKE2B 265497a27d79fceb3e2ea9cb44c1ec4b5dfc29876e5816041840c91cd1af9f3302eef4acb5b6499667f0a60c6758e56eb64725553bbbc524906c3796c6703748 SHA512 fde844efe66aef823179827b96541c8242f132bec2b58504848d332872c95b0007133f76806121a6285f305f9d7e773b166e7e4c634681a29d1c17576a843e40
diff --git a/net-misc/igmpproxy/files/igmpproxy.initd-r1 b/net-misc/igmpproxy/files/igmpproxy.initd-r1
new file mode 100644
index 000000000000..c5f9e56536ad
--- /dev/null
+++ b/net-misc/igmpproxy/files/igmpproxy.initd-r1
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+config="/etc/${RC_SVCNAME}.conf"
+name="IGMPproxy"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+command="/usr/sbin/igmpproxy"
+command_args="${IGMPPROXY_OPTS} -n ${config}"
+command_background="true"
+required_files="${config}"
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..5583e140a41d
--- /dev/null
+++ b/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd
+
+DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
+HOMEPAGE="https://github.com/pali/igmpproxy"
+SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/igmpproxy.initd-r1 igmpproxy
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	newconfd "${FILESDIR}"/igmpproxy.confd igmpproxy
+}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 76fc9c5d08e3..57a5c7c7fcaf 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -11,6 +11,6 @@ DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd
 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
 EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95
 EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d
-EBUILD iputils-20180629.ebuild 3970 BLAKE2B 3653a9223833bd1c8923647ed798679961ed02a9852fe83bcbef97c6210f997fb87de97533aaa198779ef0fc9d258dda2d21fb3d0a248a99a5a0bd8cd5567479 SHA512 8376d7ffef01f1047fb816d5f08a09f029027c1cdaf64626fba8351b8b5cbbd7ce5526f6039452694f60bc1c2c0cd419563228b93782854a1b1f9a588e7b0725
-EBUILD iputils-99999999.ebuild 3861 BLAKE2B 49cda306c5a9d1bc7200b1f1256f3ef867b0b573aa9b0620f98ec77f679e0599883fdff56de559fb06f0510d5d13960bb0bb998bfe0d42b737f08484066cf1e6 SHA512 26607fbcf1fc36f8c44ab10922866d6cc076dba5cb08dc3c0ffb7921dec0e188b7e680f61148616d172a73e27029413834aae431a87c9163e06837fc904a0b83
+EBUILD iputils-20180629.ebuild 3964 BLAKE2B 57879be448e20307246bc4567c842986aaf10c6aa18a871a2fe3fc44a7e69f72cdaa45984e49b87f3d8a4885f37ce801f79e2cb85a04a434353ef97cad2fefe7 SHA512 ec11a1e4864e941f7413536493bd18beddab63172705a0d15d99c76e47bbfcedb2329413b9a7be95fc4a8ed2298e228a93aafd1347a3646937f4b4793610c069
+EBUILD iputils-99999999.ebuild 3939 BLAKE2B 9b6d7d78854369cba6255685f634ed526bf97d4a195a0bec0271f8f40a63aa671f26168dd33e99bf9c1db8398acee79205a025b04edf7865d67a76fd1190b756 SHA512 22ba0bcb65f8b13800f2a14f901fc0140c02f4d22c2e96624a381b59d3ba9fe5f385cf6e4bb6d3a32659d6b3aa9dc2bfb8f26b67e3c9f50ffe41094cf4712734
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
index 98e13d04e31d..78a20048e2c3 100644
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ b/net-misc/iputils/iputils-20180629.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index d728fe52c47a..ccc540e0855c 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
@@ -9,9 +9,7 @@
 
 EAPI="6"
 
-inherit flag-o-matic toolchain-funcs fcaps
-
-PATCHES=()
+inherit fcaps flag-o-matic meson systemd toolchain-funcs
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
@@ -29,7 +27,8 @@ LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+LIB_DEPEND="
+	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
 	ipv6? (
 		ssl? (
@@ -44,23 +43,30 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 		)
 	)
 "
-RDEPEND="arping? ( !net-misc/arping )
+RDEPEND="
+	arping? ( !net-misc/arping )
 	rarpd? ( !net-misc/rarpd )
 	traceroute? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+DEPEND="
+	${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	virtual/os-headers
+	virtual/pkgconfig
 "
 if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="app-text/docbook-xml-dtd:4.2
+	DEPEND+="
+		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-stylesheets
 		dev-libs/libxslt:0
 	"
 fi
 
-[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+
+PATCHES=()
 
 src_prepare() {
 	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
@@ -71,99 +77,75 @@ src_prepare() {
 src_configure() {
 	use static && append-ldflags -static
 
-	TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	local emesonargs=(
+		-DUSE_CAP="$(usex caps true false)"
+		-DUSE_IDN="$(usex idn true false)"
+		-DBUILD_ARPING="$(usex arping true false)"
+		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
+		-DBUILD_PING="true"
+		-DBUILD_RARPD="$(usex rarpd true false)"
+		-DBUILD_RDISC="$(usex rdisc true false)"
+		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
+		-DBUILD_TFTPD="$(usex tftpd true false)"
+		-DBUILD_TRACEPATH="$(usex tracepath true false)"
+		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute true false) false)"
+		-DBUILD_NINFOD="false"
+		-DNINFOD_MESSAGES="false"
+		-DBUILD_HTML_MANS="$(usex doc true false)"
+		-DUSE_SYSFS="$(usex arping true false)"
+		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
 	)
-	if use ipv6 ; then
-		TARGETS+=(
-			$(usex traceroute 'traceroute6' '')
+
+	if use ipv6 && use ssl ; then
+		emesonargs+=(
+			-DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))"
+		)
+	else
+		emesonargs+=(
+			-DUSE_CRYPTO="none"
 		)
 	fi
 
-	myconf=(
-		USE_CRYPTO=no
-		USE_GCRYPT=no
-		USE_NETTLE=no
-	)
-
-	if use ipv6 && use ssl ; then
-		myconf=(
-			USE_CRYPTO=yes
-			USE_GCRYPT=$(usex gcrypt)
-			USE_NETTLE=$(usex nettle)
+	if [[ "${PV}" != 99999999 ]] ; then
+		emesonargs+=(
+			-DBUILD_MANS="false"
 		)
 	fi
+
+	meson_src_configure
 }
 
 src_compile() {
 	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
-		TARGETS="${TARGETS[*]}" \
-		${myconf[@]}
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake man
-
-		use doc && emake html
-	fi
+	meson_src_compile
 }
 
 src_install() {
-	into /
-	dobin ping
-	dosym ping /bin/ping4
-	if use ipv6 ; then
-		dosym ping /bin/ping6
-		dosym ping.8 /usr/share/man/man8/ping6.8
-	fi
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
+	meson_src_install
 
-	into /usr
+	dodir /bin
+	local my_bin
+	for my_bin in $(usex arping arping '') ping ; do
+		mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
+	done
+	dosym ping /bin/ping4
 
 	if use tracepath ; then
-		dosbin tracepath
-		doman doc/tracepath.8
-		dosym tracepath /usr/sbin/tracepath4
+		dosym tracepath /usr/bin/tracepath4
 	fi
 
-	local u
-	for u in clockdiff rarpd rdisc tftpd ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosym tracepath /usr/sbin/tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
+	if use ipv6 ; then
+		dosym ping /bin/ping6
 
-	if use traceroute && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
+		if use tracepath ; then
+			dosym tracepath /usr/bin/tracepath6
+			dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+		fi
 	fi
 
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	if use doc ; then
+		mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
-
-	dodoc INSTALL.md
-
-	use doc && dodoc doc/*.html
 }
 
 pkg_postinst() {
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 5df903d00395..68289de0e334 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,10 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.3.0.tar.gz 5996560 BLAKE2B 2037aed1d72c8db58f6be88caa695956e482776571879f439d39dad909c1f79e4fa4353fef1eacf1135e763109f777a8a30500892a9ee1d8d261d3fd41f6257c SHA512 4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b
 DIST kea-1.4.0-P1.tar.gz 6645111 BLAKE2B 290b7bcf8b32fcf2762240f2173cb45c035187c7dfd1affd0fd8a947721745ea9d8846be365ee3f9331d578b7bc248ee53a1e37666585a62c90d7dc541c7aaa5 SHA512 beb3baae09510de970fb5c1a301c57d64fc56d825d964f413357ba448b993d0a4f714d4efa4da166d3c06623a9ae78b70c25b61793e696551cb97b7e08d5e634
-EBUILD kea-1.3.0.ebuild 1325 BLAKE2B 1ffdea5221ba73471253b50a1fcf1e6c974588f45e5df67ea04c11bb2e2207e9182e9277aabe1f547a4596c042b36782aad53af4c7b2c4d3337f9efbfdd5cad2 SHA512 b846b3b7c202bd05b4be60ea4d89142052f46ff1ef10bea4b04b8e70cf4160d34f6ca6a6d637b821e8803ba5c7fc393e2fd1b50e8d670e8deeea45526fc668b2
+DIST kea-1.5.0-beta2.tar.gz 7372364 BLAKE2B bb5c8c119fbf52ceea58998cb37b19286ea85f30f67d0b6f4bd27be188f2d68ec551667a136f0e9f4bf5320ed1250494b67fc26c8d15910a46976c968cd4480b SHA512 c107a7a570d018a05d42bd0d521757d9036c4bdabf2943ac3c96e2f5124ec6f34fe1d60660450a51cba20b24e8fda3915e8c5ee2d3e5e6df4319ba965153b8de
+DIST kea-1.5.0.tar.gz 7395257 BLAKE2B dfc28916166a732714253e1e7458076643e1a40e9fbcfca78d7206155b355abedf630f19311a2b164b2af78227e9c8cd0db9afcc01015554e5b2c4c336a11c9c SHA512 6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8
 EBUILD kea-1.4.0_p1.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
-EBUILD kea-9999.ebuild 1485 BLAKE2B 44db9f6652a27c5a8f7b3a5dd45467db3b2f27ede3a0ffdfa590e4f12bb24c74aa5f2a7031c6dbb2b9cd120e4b6c91cfd720288c82b25416adfe9e76de624792 SHA512 b5c2cb3e99185a12187a0d9e9341322f48a15f165d55603c9981b7c0ce5abeb669c1bbc636fb3a6ab9267fa4fa2e5446119cbe4fd742de1559612ac06015352e
+EBUILD kea-1.5.0.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
+EBUILD kea-1.5.0_beta2.ebuild 1483 BLAKE2B 032da6b42cc0333422a8f88ccc823ab26ff33b1181f8ab0b3b009c4b094d72bb5ec0739ac97fbc058d30ed0c3095481012f50b7c2790f13f7f1da7c8fac87855 SHA512 ef638d67430c9f980121434367f7df2edc8b0e7a8c80f5dd56b346bf78e6062ec61932f2cb0e1dde989e21e03ba37f6360cd93d36fabf167f6aa3982276018b8
+EBUILD kea-9999.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.5.0.ebuild b/net-misc/kea/kea-1.5.0.ebuild
new file mode 100644
index 000000000000..75288a0c58a2
--- /dev/null
+++ b/net-misc/kea/kea-1.5.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+IUSE="mysql openssl postgres samples"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
+	!openssl? ( dev-libs/botan:0= )
+	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	[[ ${PV} = *9999 ]] && eautoreconf
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with mysql)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_enable samples install-configurations)
+		--disable-static
+		--without-werror
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd ${PN}
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
diff --git a/net-misc/kea/kea-1.3.0.ebuild b/net-misc/kea/kea-1.5.0_beta2.ebuild
index 8b6b7de73e33..6a29a56af228 100644
--- a/net-misc/kea/kea-1.3.0.ebuild
+++ b/net-misc/kea/kea-1.5.0_beta2.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit toolchain-funcs user
 
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
 HOMEPAGE="http://www.isc.org/kea/"
-SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="openssl samples"
 
 DEPEND="
@@ -25,18 +29,19 @@ DEPEND="
 	dev-cpp/gtest
 	dev-libs/log4cplus
 	!openssl? ( dev-libs/botan:0= )
-	openssl? ( dev-libs/openssl:= )
+	openssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
+	[[ ${PV} = *9999 ]] && eautoreconf
 	# Brand the version with Gentoo
 	sed -i \
 		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
 		configure || die
-	default
 }
 
 src_configure() {
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 3968b59aff2f..75288a0c58a2 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit toolchain-funcs user
 
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
 HOMEPAGE="http://www.isc.org/kea/"
 if [[ ${PV} = 9999* ]] ; then
@@ -18,19 +17,22 @@ if [[ ${PV} = 9999* ]] ; then
 else
 	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
 		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="openssl samples"
+IUSE="mysql openssl postgres samples"
 
 DEPEND="
 	dev-libs/boost:=
 	dev-cpp/gtest
 	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
 	!openssl? ( dev-libs/botan:0= )
-	openssl? ( dev-libs/openssl:= )
+	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
 "
 RDEPEND="${DEPEND}"
 
@@ -47,7 +49,9 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		$(use_with mysql)
 		$(use_with openssl)
+		$(use_with postgres pgsql)
 		$(use_enable samples install-configurations)
 		--disable-static
 		--without-werror
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index ddbce2c9d8c6..5c1ed39756f1 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -2,4 +2,4 @@ AUX knockd.confd.2 189 BLAKE2B 288c5c9e47a3001d83edd0f9d54286754fecd7d8321896370
 AUX knockd.initd.2 527 BLAKE2B 1c0e429d07d4023d34ae129c900161a9a681cd76761e953e3b6416fb3f5ad067b8f2e5c567887ccfc43adaa3b1a1f9e58bcb19ed660b118785db41aa45330107 SHA512 dc66e53bdc42487609d978a538dec26712f25c87b9a2e4a70e1a833fedfbacf3b8618f87cbe110ed54938f6620fd2e5f7a79143d7f8503927686dfa26eb9acff
 DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7
 EBUILD knock-0.7.ebuild 1098 BLAKE2B 9a5ada3e3d7ca576a5174c2f783f67b2ad240879f36c3ea399ff8108f1953c64b20af879f47849d78a522cdbd8f4628ad95c8567b3a9f18baf88dc6fa1ba292a SHA512 17d98392fe54b136c0f6adf2c5b64b4bcb2afc3db8c6c28ae11d4cc620f014c00c15839eac2540971913ac5d486bd00253423260bc6fb3d91e42e66728e6928e
-MISC metadata.xml 322 BLAKE2B 7609f7fe4bd42f54c54567492f3fedff22eee6acad526710cf94dafaa5312109a6cc13d565b026de3a115c9a72e27012859ffd75b4539fd4ef2dcd1a32850c65 SHA512 d74a9c4ed216bb9834f97f818b727c5c01103b0e54ae376200d47f11251ce4baeb517b4f76f3412bbcfc9085a301031a3f1be63c8cb330736412abcaeb97cbeb
+MISC metadata.xml 246 BLAKE2B dba219f8b59aae4aed3685948a81fc06da8d34cbe8a59fafe7b9c503f63fbcb011514ee8734fd74928ffc93e2ab201902fb28702df8b30be5d8636e4de0ce6d8 SHA512 68d82bf2a215c76134e5dc45ed11f3db4546f21f6989513faa7792e0ba0b706688960710f1d6cee3d2f209636d3552df9ed8120edfc1609b9d7d687883becc84
diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
index f7fb57167ee3..46f1937fc92c 100644
--- a/net-misc/knock/metadata.xml
+++ b/net-misc/knock/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="server">Installs the knockd server daemon.</flag>
 	</use>
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 5f06cc43d646..105004cc52b7 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -2,6 +2,7 @@ AUX lldpd-0.7.11-zsh-completion-dir.patch 318 BLAKE2B 98a182c00ac6d5fedabf2c5c08
 AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96b512dfdf1e868be50a07428ac810ec5276b132ef43215f59de498e0b1e61fbf9dce0db4261c96ee81461b20d2ab9764448b74a56ca SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
+AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -9,7 +10,9 @@ AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
 DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
 DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
+DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
 EBUILD lldpd-0.9.3-r1.ebuild 2457 BLAKE2B 4db8bd65035df013e9c3d8e70a235f2503c3e313da17f510deb498830966408f6761f42b12c8ee3dd98f296edb815df1de7f4da35f7eeebda7cbcbe9627dda27 SHA512 5426d7c8a2f73286a15b9901134692d77713d3cd4e20e31a4a30be64eb664b348cdd1c27196bc339af49a213e03bbc995bd4b30f8bab7c424b34f6595727b5bd
 EBUILD lldpd-1.0.1-r1.ebuild 2420 BLAKE2B 8847c8718f419481e92fdd857196c71bd73014448855ea8fba5f1b425def8614852fe2891498655acfb5fbc9d0eccf487f520ecc2bf2f475334b06d6c2524b09 SHA512 246b57c0f0e9acf2224e3138d136202d05603e5aa170314d5395679140b4545451a1eaf62d57f9842b967bf1ab2bdcd1ae1892e02bb178d6669a0127591f3335
 EBUILD lldpd-1.0.1.ebuild 2371 BLAKE2B a7926eb76298a0a53c0e2082452904d68f188da49eed3abae777d79ab60e93f68d0dad205effbfabef23c12c2a5ee53fbadad14fac25cb0a11b8df0086ae45fe SHA512 70370f83b91f0f7bd95227e52775386589b641c41f3d7d9ba671f52adab98cfbd78fce3bf02ede734d37b6389383e215bdbb3eefe4853054e4f252a7fa84c440
+EBUILD lldpd-1.0.3.ebuild 2467 BLAKE2B d47946910d25c659032527332596cf73766fb09d314dfe5ea1ee69b87501948bbf7fbc0bd5104ff456f6428589b04940e7a55eebb85f9896eccc6b398cb9e337 SHA512 a2290ec9eec9260b120a6ec3e157d221062ddcdc802a87c127a4979b66d6c85e0ded0462416e3c0c6e362acb382efa05194020a5bbaa6d1324b6594bb39b9035
 MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
diff --git a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch b/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
new file mode 100644
index 000000000000..c5e6d2edb78f
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index fe48ad3..791b76b 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child)
+ 	if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
new file mode 100644
index 000000000000..09b8552f81f0
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+	>=dev-libs/libevent-2.0.5:=
+	snmp? ( net-analyzer/net-snmp[extensible(+)] )
+	xml? ( dev-libs/libxml2 )
+	seccomp? ( sys-libs/libseccomp )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+	test? ( dev-libs/check )"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
+	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
+	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
+)
+
+pkg_setup() {
+	ebegin "Creating lldpd user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend $?
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 53eba4670a32..d02712be80d5 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -13,6 +13,6 @@ DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff3
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
 EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4
 EBUILD memcached-1.5.11.ebuild 2932 BLAKE2B 694ee35427d6009183f94e438b3ca51d2cb4bfda1c1bc0e93fa7e18b823c9291440698ffa364fe40fea6621248bfe87c6d789cb943dab9ca634550613e26fb4a SHA512 db18f156d71c8d7f31228669109ee1448ac6df8722b9f11ac02dcdcb0c33d4b367d1540c4cc5b3d1f036118c482a6e61a8672b3cde0c27c6f091a94d8a864475
-EBUILD memcached-1.5.12.ebuild 2929 BLAKE2B d8c109281a5a6c19a17f3509decd8ca554412e97877307bdadf70916c030e4d32a1cb9c8de8a7647e9d8505f0021ca9d70c73ae51afb953dbac3c2bf8aa52e3e SHA512 f087ea922838269561df7a6522afbff9b07f2d7c722f627f78ccd7373d4e32c0d8b4396e980a8b9d555fb8eac7e6ce24a805325336ce8677e460e7d1ee8f025d
+EBUILD memcached-1.5.12.ebuild 2924 BLAKE2B 246263510ec9c4433b4039b9a3fd503febc131238ac0894a34ecdd421a110efa10db978b87d6117d5876ad89032d9763ed214970117ed064cf3a378da3abefa4 SHA512 41110e8e5cc66a4f2aa09c9087caee4350ac6dccf71c981813803621828b23b9bff1f5241dbf9a1a58190cf138903c6f39283ae7f9e7c459d1b36c9294d2479a
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.12.ebuild b/net-misc/memcached/memcached-1.5.12.ebuild
index fc7181e4c8d3..198fdfd1774e 100644
--- a/net-misc/memcached/memcached-1.5.12.ebuild
+++ b/net-misc/memcached/memcached-1.5.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index e66274be32b5..62b9e7ef1d09 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -5,6 +5,7 @@ AUX minidlna-1.2.1-buildsystem.patch 758 BLAKE2B e9fd6e2ad4dbeee65b73c65a5537990
 DIST minidlna-1.1.5.tar.gz 488191 BLAKE2B bda7d9099a11578919387f6d4f0e04c162556fb3557352446f0e7c69ee7dfe8f2c19d002b3fde1af2e6ff9c8b1436177f0b47dcc5c86a96e4dfd35de57610d60 SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa
 DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.1.5-r1.ebuild 2428 BLAKE2B 83702751f29a3134ee2819da57671b46d5a8e707d79dddb61c78100d9d1352b62f4b0764c4f6956a59884ee62ebbb87ad2577cf5f217009e2a9baa00b5acaa48 SHA512 a8feb71af3593a8840ad3071e3f789089030a9378ec7ee8d8c5a178fab99a93da82beda7c0f73f126dd550205e66652db1b861f2ac63315bd83db6540960281c
-EBUILD minidlna-1.2.1.ebuild 2550 BLAKE2B 9b803a6f8bb88d0c76e88cfb544f70bd323e7e03d95fd4dd3c1f089a77113b216d8262d9a4f1ca33ba950180995d9379cf5824a67e04a6a677a782e6004ed153 SHA512 b3991371eafd355d1e8a8ef739a3aae978384517a123d0b8a812c01c8972384310e37213909e137d64f10026686d9b6e8f7631a46585fd30f407d752525a9f63
-MISC metadata.xml 496 BLAKE2B c1627b8430dabfeb9a6cdf51ba2f40f8630c5a79433ad115be8ea1c2ee174812a7d776211111d525b0b1496c13b03e63578130d3422dc63afc9fa3f34debd1b2 SHA512 1edb55fe26127d2728177ae91cea1346c9318ccf60f68f11e198d818e203238c9fda85dd85c61f406bcc9985bd1586ccf73bc83a8b0b353e2ef7057a54df6ab4
+EBUILD minidlna-1.1.5-r1.ebuild 2438 BLAKE2B 6d6207e1fd6b38f9153f82ea99c790bd481d5ffe396dd651d5b8264f8ce5905bf07aadca43bb63388d98c48aa12c32eb3caa9b45ed444d08368821d9acdd469a SHA512 55b9aa3ce385f56ef0047af899bd3eb3029553ea9b1c33e9bd354a8f55169e9ccb34f1cb0fca78a14b76f887ce93388d334237f2e6bc765338db7363e6466b4d
+EBUILD minidlna-1.2.1-r1.ebuild 2722 BLAKE2B 9d91b45b32013a97a16f077d9cfa9b5f64ae21a690fae2f7480b6cd08dc107edaaff37beebdea7d4852563bc5a44315600f7f3ddf1d9c2a207a7b229ae194257 SHA512 6efb9f6a829725549b09dadbc03aa71e13ebfff8a7861573509281e80e75eb72a4ac7c994d5647598d3fc6ed656d1194f1cc17bc5e493d94e51f69450bece4e3
+EBUILD minidlna-1.2.1.ebuild 2560 BLAKE2B 0c519c5c1e41df2391385d1b94228d208a9d82697bdc3198392c1167fc0bd0174ae0b1c02750641cf07e822a9e3b1576bf9fc3fae2c94da28c2550f76e22d3d4 SHA512 4b0d0b171c48b2854f8819402b6e87e47ba76fe2a496bf3acd57f4220d1fed551c5eac0e65a62c6cbe9ced1863ed5422c852a4492854ffe08a41c1132396fdb9
+MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml
index 8dd2bc50e047..168984bee22d 100644
--- a/net-misc/minidlna/metadata.xml
+++ b/net-misc/minidlna/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
-<upstream>
-	<bugs-to>https://sourceforge.net/p/minidlna/bugs/</bugs-to>
-	<remote-id type="sourceforge">minidlna</remote-id>
-</upstream>
-<use>
-	<flag name="netgear">Enable netgear branding</flag>
-	<flag name="readynas">Enable readynas branding</flag>
-</use>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/minidlna/bugs/</bugs-to>
+		<remote-id type="sourceforge">minidlna</remote-id>
+	</upstream>
+	<use>
+		<flag name="netgear">Enable netgear branding</flag>
+		<flag name="readynas">Enable readynas branding</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
index a0ca7b231fc6..c964214a45e0 100644
--- a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils linux-info systemd toolchain-funcs user
 
 DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
 	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
 
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..ccc53883c3b5
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info systemd tmpfiles toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
+SRC_URI="mirror://sourceforge/minidlna/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libav netgear readynas zeroconf"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/flac:=
+	media-libs/libexif:=
+	media-libs/libid3tag:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	virtual/jpeg:0=
+	libav? ( media-video/libav:0= )
+	!libav? ( media-video/ffmpeg:0= )
+	zeroconf? ( net-dns/avahi:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=(
+	"${WORKDIR}"/minidlna-gentoo-artwork.patch
+)
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i minidlna.conf || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--with-db-path=/var/lib/minidlna
+		--with-log-path=/var/log/minidlna
+		--enable-tivo
+		$(use_enable netgear)
+		$(use_enable readynas)
+	)
+	use zeroconf || myconf+=(
+		ac_cv_lib_avahi_client_avahi_threaded_poll_new=no
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym ../sbin/minidlnad /usr/bin/minidlna
+
+	insinto /etc
+	doins minidlna.conf
+
+	newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna
+	newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna
+	systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service
+	newtmpfiles - minidlna.conf <<-EOF
+		d /run/minidlna 0755 minidlna minidlna -
+	EOF
+
+	keepdir /var/{lib,log}/minidlna
+
+	doman minidlnad.8 minidlna.conf.5
+}
+
+pkg_preinst() {
+	local my_is_new=yes
+	[[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no
+
+	enewgroup minidlna
+	enewuser minidlna -1 -1 /var/lib/minidlna minidlna
+
+	fowners minidlna:minidlna /var/{lib,log}/minidlna
+	fperms 0750 /var/{lib,log}/minidlna
+
+	if [[ -d ${EROOT}/var/lib/minidlna && ${my_is_new} == yes ]]; then
+		# created by above enewuser command w/ wrong group
+		# and permissions
+		chown minidlna:minidlna "${EROOT}"/var/lib/minidlna || die
+		chmod 0750 "${EROOT}"/var/lib/minidlna || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/minidlna and file ownerships to suit your needs."
+
+	tmpfiles_process minidlna.conf
+}
diff --git a/net-misc/minidlna/minidlna-1.2.1.ebuild b/net-misc/minidlna/minidlna-1.2.1.ebuild
index 6b5a1be8ebe8..40ee4bd7a8c7 100644
--- a/net-misc/minidlna/minidlna-1.2.1.ebuild
+++ b/net-misc/minidlna/minidlna-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils linux-info systemd toolchain-funcs user
 
 DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
 	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index a4d843adf2c7..6005de57641d 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,4 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
-DIST ModemManager-1.6.12.tar.xz 1402364 BLAKE2B 11335c495cc428936c9b0dd319449a7bf4c58a95ccd53b7a5bb276d78030272a7f29e5f0fa96a96613c5e0cb6a62239d864a23de6260fb55f6ecab09a18e6454 SHA512 2ac72fb2d36530204528cc0cd4815d0b93a1a8c8539ac345101e5e15bbfffd3eda888bbdc54298d3547b9aeacb94c75be5c600e993099671da2f9f27e8ee93cd
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
-EBUILD modemmanager-1.6.12.ebuild 3143 BLAKE2B e125a1db92e2d1447f5e6334652a8147b3e0b7f36291b14fe605cfed502c7256c67e44c31fc4ccb6613be20b8383351772f32ca5d42b656485d434152eadb2d5 SHA512 3c294fa5022e2aed4d9ccc8f83bfa2eaffc216a29b48e77307bd2617ebad080657bb9d9239e053b22b3dfc469e6448d9e1aa01bdc435907d3c4402305b4d3ff7
-EBUILD modemmanager-1.8.2.ebuild 3359 BLAKE2B 6402f8d6fb0c7a136313775b78e1fe53dbe39a3424cf2c411bedceec20215b4f9529e0547dd6126908d8c9c6fa336a841563e7c5c8f6ceafd53ce83f16a1b76d SHA512 4ca894fa31f2ef55bb1aa21a92a06a8f1659e4305959587ea4aec223a30b8670ff9b522693a7aa28c3f768ac39a2b227477c2f53d40c35eae0d264af49ac2c82
+EBUILD modemmanager-1.8.2.ebuild 3354 BLAKE2B 46f7e3a076cecd6608f2d0c066029533ff0c4ed6afec43380ba3960f6b6077c90bcd5e660e7b65ebe2da8e427fef669c4af16cb269ad6033d804e1d4fb485dd8 SHA512 04ab770e46d2107985b0149f5aa1b86de5cefe0c47785f844bbc8e3cd1893187d04f7de328ec72b68e2b9d42aac8b1c6ecaa0fdedd8152807af3574840374a37
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.6.12.ebuild b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
deleted file mode 100644
index bd91deb3ef3d..000000000000
--- a/net-misc/modemmanager/modemmanager-1.6.12.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="+introspection mbim policykit +qmi systemd vala"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=virtual/libgudev-230:=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.14.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.16.0:= )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.19.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
-		You should install sys-apps/usb_modeswitch which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		$(use_enable introspection) \
-		$(use_with mbim) \
-		$(use_with policykit polkit) \
-		$(usex systemd --with-suspend-resume=systemd --with-suspend-resume=no) \
-		$(use_with qmi) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-}
-
-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
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.8.2.ebuild b/net-misc/modemmanager/modemmanager-1.8.2.ebuild
index fe9c099b3601..14bf1bffc8b5 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="+introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 48c09a697592..05b258fb9b4a 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -6,4 +6,4 @@ EBUILD mosh-1.2.6.ebuild 1403 BLAKE2B 5612c55dedf61f42344da91cf649817789394552b0
 EBUILD mosh-1.3.0.ebuild 1407 BLAKE2B 58e5cc20a44ab98508c68d805cdc83b06a2181a9261d2a9f63dd86dd6d71f8774875da417f333d609c56c9b87175b387b82a67ac356a019abb41261c87d41bd6 SHA512 b3a06abd4c1c45a4280c43f6628f4c02e438fa0e30b998aafc3db48a81bb8fde973b2617f1995f260ecff3978486aaec508cf1974137e293a82e6c0882f2b238
 EBUILD mosh-1.3.2.ebuild 1411 BLAKE2B 3adc2058e58b4dac33be8929e41488786b3009cf7afe5653d42ea87ca5282ea32b5f5d3eabf5a44d295277fd2872f4587233036184d29826eec54bcb959b512a SHA512 86a4a88d0baa93d50da8c1787fb960a9e74ce3c9b1ea0656f98ca6d7935d152177354cf26fc798bebf23571d112be21d21594883ad8c963cf93b53d8a0ab32ef
 EBUILD mosh-9999.ebuild 1369 BLAKE2B e9aaec4ebb618d05c9ca0a609f821594de3359e6b82d336a5ca261e720cdd83ee7cb29b97ba8ad2fac5f68f89fc73e0ddb20afe5508c0db60458b5dcafc48748 SHA512 778cc0316c4f8f600132477f2a9cb7f0011dbc204d5d2692f1fe61ad40276142f9f105025cef3aeddc1a158eecb5798a7b9e291fe2279348f206ab09e2a2a9c3
-MISC metadata.xml 1158 BLAKE2B c248c447c308c6a1361f605ce9ee6030bd89e23083295a7ff93c7f039860b16d3c98aeff4eb7f1d26687dfb9f00b1e3547c6df9ff62281433f71c01de11ed97b SHA512 fe6d5f54ffa09d5fb33df2669668a6e3f6c04809d4c61ece08c083600f7ac63dc4acb29b006ef7208b44e56ab8e232f598f33c390e0e2fa586ace6ad825f5c53
+MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 5f24fe90f47e..60cf94f05677 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest
index 2b453b9248bc..80711f91735c 100644
--- a/net-misc/ncp/Manifest
+++ b/net-misc/ncp/Manifest
@@ -1,3 +1,3 @@
 DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8
 EBUILD ncp-1.2.4.ebuild 853 BLAKE2B 24aec6cd73be1471ef9ca3a7f9da8cf0e6a11cd78ed4eebb6390d9edabe66ddbc62825410e5996c850a41aac639055f167416af8b17f464ccc078b59d1d3b796 SHA512 b7495762fa68ceb0927159dd65f000fc062fdfdcc5f50f1333ce68e43ce4e32db899e16d538b74bcf366a3deff49e1e73ec796e6df41ba8ebc1e544b94849316
-MISC metadata.xml 558 BLAKE2B 309e97dd8179546297b18b4d045b31a3c8dfe155a0c4629754fbfa4abb0f4ed490f9ee055d1d5c96eeee6fb25f909ecaa05678f82fc190cf562f4157c0b2d3a3 SHA512 464c2fd4788c533675368759bb5e41e56b114d6f93b4a69634bc7ac1e141f632f8ec437b701d3c8ac7d9e4dd35f31146adadc399ca27692da0a5bf8701cfa679
+MISC metadata.xml 487 BLAKE2B 2dba73139b43435aa6bc2cdbc667e615639de51f827ff1c114f6c94189c9b9e0279d0dbff1b48ea69680273b15b5f35bdd63dbb51b69538f361f5064d61f44ef SHA512 2be2a4fbddaec2fbeab193db226542ab35dc7fa51231c6b6fb55284b521c8c5afe9ea9cc5ada2cf1663cd87a8abdd8213c304e3c2dbf5795b1d4e8b5b956dce5
diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index c04ba062f30f..f0915952f0fb 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 "ncp" is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except one: you don't have to type the coordinates of your peer.
 </longdescription>
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index c1566f7da7f7..7432b8b5acd4 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -11,4 +11,4 @@ EBUILD ndisc6-0.9.9.ebuild 659 BLAKE2B ca4ea1607a560892ca4b60cf638342b5fb2869cc2
 EBUILD ndisc6-1.0.2-r1.ebuild 737 BLAKE2B 1ca4cb82d5a13a8cee418e9dd2d7fccce1f3eb7592e75eb2381e5b1f3046a89b106aca57dc0591759b6f9cb8ecab70aea5f1ec232e4307920855eb9f752bd25f SHA512 c4e35cb157782390e5a3262ecb4d84e939286ad9b4445e5a5e24a3377b6636cb41c3bf78dcc64531e702cc2527021c3f7bf2e49bedff7c4a5c2258a90a01447e
 EBUILD ndisc6-1.0.2.ebuild 677 BLAKE2B c1696f8497970344334d894e848547c44ac0fcdaffdabbf126bf5fb0f784723fc3edd5d3875d8e0e7e5806eaef50d713b6508d96461748195c164eaa0ecc2713 SHA512 9693cf1e1ed83b3d7565b54466c97f761946b5213857e1b016ff9d72a0c8bee04bff38ae83bcd53210e7e6b8fbeea7903904a63f06717a51d1aefb9e796251f4
 EBUILD ndisc6-1.0.3.ebuild 748 BLAKE2B 913515d07f3b59b71dbbf90e7953c88cbce6bf8f071f15402b239d30ad5d1d15ce0fb6f37b382d6fbf257e2394b1419fc236c92cfc0590144298b89a45ebe2a1 SHA512 82d281e2825a20cfe41154ecddf8e2ea039b747a0fa3b4a73de25ac0809aa438e2e539d9dfd51a0de3327caa227f6f0c4aa5d233ac3fdb6d27f654d3ccb77832
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ndisc6/metadata.xml b/net-misc/ndisc6/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-misc/ndisc6/metadata.xml
+++ b/net-misc/ndisc6/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/netkit-bootparamd/Manifest b/net-misc/netkit-bootparamd/Manifest
index b46441e6e335..f8e65f09a323 100644
--- a/net-misc/netkit-bootparamd/Manifest
+++ b/net-misc/netkit-bootparamd/Manifest
@@ -4,4 +4,4 @@ AUX bootparamd.confd 29 BLAKE2B a2697cebfe9e2c7a9617b2624b70d0615b4ad920d034dbd0
 AUX bootparamd.initd 502 BLAKE2B ebc4d4c3381c1003924c402415aea4ad820e24f38520b4f0bc41643dc3f24642e8010907ae1451f7286607ab387d256e9e74f43ca53c5f3677e876956d0a686f SHA512 9326e3a3dfca43cd7233a289b1f58c22db22aabc2136cba2d61a4bdab17652f9d031e4eddc877126aa09e08e048e63ba9fcf4219f9dbbf55d6787e03d5ee2548
 DIST netkit-bootparamd_0.17.orig.tar.gz 13934 BLAKE2B d828175594b0aae60c5284d4f02c73b4bb91cee2601dc52c6cbfb21e02779825a03567de7dbcc945246104889b7b4bc74f0429b508bda082a365a1d605e213e5 SHA512 fc237c72efd0c7a671c179ee4596f64e13a7a637441d32c9e82e81f4133d987f468c98b00611fbada1f7d6e5fa791c9b513978bfc7a58efe7d93102a2d3b4dca
 EBUILD netkit-bootparamd-0.17-r4.ebuild 1452 BLAKE2B 54bf24bdb77a6e0c93ab084382f41979a271a0b8cbb4805a118781e96072faf16d6af70a0a6225af0c90265b3d1325868f4baee7b0f0ba59af93103fc06acf3b SHA512 e5dc4aad3c38d127c94a3ce96b93a9f5486f2bf0a01a5012d25be3be988325d53978691f5133956dc50b2820b5b71ce3a9c7471b586895fe66e65ab035fa9b3f
-MISC metadata.xml 338 BLAKE2B 24f41b1f254dff65a886a6d2d2449940349c1995efe4eac132ea52fa848b9474faa762224d86d82551154620aced2af9f4ab32e41afbef73994a8287af8a0d4e SHA512 d054668c4f93e1bb54cdb4bf6557feb53c07416435ca091498173a33cdc148e5292b2a8126b15fd9a57a993db536cee43ee0fecea0879adcdd83247017573dcf
+MISC metadata.xml 267 BLAKE2B 117291980857ff3d1fb5993ffbc23b682a4487e52c9cf0eab1bbc8fa68b22a440c267163d0079215ada1ca39144bc3c23c1d52416bb4bbec32f53ce9bfab0566 SHA512 102416c4ad8f95e8d8ab03a05996df109427c8ef5c9618a572484c8d34e5e8a33437c0b9f8c1a11ce0ecf42a1e893da38bb10451474777799da7fceec8c152d5
diff --git a/net-misc/netkit-bootparamd/metadata.xml b/net-misc/netkit-bootparamd/metadata.xml
index dde8ad441958..a7c2c47d4400 100644
--- a/net-misc/netkit-bootparamd/metadata.xml
+++ b/net-misc/netkit-bootparamd/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
 </use>
diff --git a/net-misc/netkit-bootpd/Manifest b/net-misc/netkit-bootpd/Manifest
index 59f988fab6fa..1c544b46d081 100644
--- a/net-misc/netkit-bootpd/Manifest
+++ b/net-misc/netkit-bootpd/Manifest
@@ -1,4 +1,4 @@
 AUX netkit-bootpd-2.4.patch 19727 BLAKE2B a28eacff207bb59a4975830b8bbf5ba11a98d739ac3a5b172bc96beeb557eb231474f009744f2136c208c042e24eeaca82e57be40511774252fc7440327c3b00 SHA512 251fb2652c808bbfc18d4d1cdbe746aa3f52f09a53e3c09de426ab94ea6b016d6861e88f45f2cb0740fb5be3a76b6156a772f27d17221eb9f792ab3454c3282d
 DIST bootpd-2.4.tar.gz 99765 BLAKE2B ce435b562433e6cf2cc1ef0fe51b17d7d4b62c347749c6cff98af82f4af8934e23f19fa8f278e34497aea31b75b437a7bc3d59608454ac8eb42f0fd4c76da042 SHA512 aaed30b724c660973e2efac8c18ead48caf1e8e5e35d4af6c6476080c32f8ce8c8722fd1c18d864e557301d37615cbb313e2ab0140da8963fbd23d5000e60379
 EBUILD netkit-bootpd-2.4-r1.ebuild 734 BLAKE2B d5260b0cf7d0837b735df9b12f500fdbc769990e6b6afd6fe3fa310b5843da5fa994147eb91fe5a606a0558b5a2d7a09c6e34ccf71f0f1cf6f9a54a299ef23ac SHA512 2cb42cadb332d6154afd88108626945b39c1775b7cae51e9f95ada57806853675935b1368f6080dec5a68eda0d90d4d8f7790d612c2e15ca8368e4e1522ceb18
-MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/netkit-bootpd/metadata.xml b/net-misc/netkit-bootpd/metadata.xml
index 3c3d5ced6412..7a38bb900964 100644
--- a/net-misc/netkit-bootpd/metadata.xml
+++ b/net-misc/netkit-bootpd/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index fd333f0a8ff6..88625864c49e 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,7 +1,3 @@
-DIST NetworkManager-openvpn-1.8.4.tar.xz 547984 BLAKE2B bb637c824414b792c6272a1791a3e99ebb3c0fc7145b01b4fa6c9b0bc2d8a0879141b7e2d1f3157b8b05366e3d0410370d3523dbe0d2daf069e4f73cdd9cf84c SHA512 dd0381175fa6a88259726a848ac46b7a5ee07a797cbe34382d3f4c0b6d8ad3807d224bfbb53cff793f4854558484d77fc7c6a6970e5364d39d058da5c35eac5a
-DIST NetworkManager-openvpn-1.8.6.tar.xz 561652 BLAKE2B 37c47c997f68879221cb346b4afe9653d78ef21398f568469c8f511c18feec12dfcf86677d09088119a16ef30c47ab6b5b5a30f2a3c24811a12e6d58c6809f5f SHA512 a2d711be58810aad337b9c8bdead1ba6f64c1d1315a772ab79815624794c79668ab5056587be7096ac7367554c16114c2a3805a03484c2ea265ba4cd3bd54d32
 DIST NetworkManager-openvpn-1.8.8.tar.xz 562748 BLAKE2B 8c75d30a8865d41cd564e719f08522482b0d6901a8e812dec5f5b9fd8c8c2839663d078148e9d505ee7b7fc6e5c96fda8c3c0a0390837211a1fe9689f01fd27d SHA512 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574
-EBUILD networkmanager-openvpn-1.8.4.ebuild 1239 BLAKE2B 5fabaf60af8232a3505af4453bf9f5dc38a764497ce79925df896803c4bd5ae4d0921232eee01af83c383d3f7aa590c20912fa01e25bbe38b794e957eb1b9779 SHA512 204909799d3d9df3b9e14de9797ecc20e95c9cf9d3290c0479450a6a87ec90793a94c05925ba75019a7ed02819033d67463f5d86c1adcdcaad904e5f06a9fb3d
-EBUILD networkmanager-openvpn-1.8.6.ebuild 1258 BLAKE2B 1ec67e433001a0b0d09caff892b0f3e5e1c62555ee84e900e18a2ceee9c796982aa29bc1ba24480f030c51f7c146c448841ec4d39ee6888408b46165fd8be7e9 SHA512 b8187a0a29bcda8855a3fcf2dbf9dcd28fabfcdfc1a0133321a0dbc6468dc7b7a53525e1e5498ca6c207d19ad4af02abfa86a9ca8dc76ab2117518e420a2ee04
-EBUILD networkmanager-openvpn-1.8.8.ebuild 1258 BLAKE2B 1ec67e433001a0b0d09caff892b0f3e5e1c62555ee84e900e18a2ceee9c796982aa29bc1ba24480f030c51f7c146c448841ec4d39ee6888408b46165fd8be7e9 SHA512 b8187a0a29bcda8855a3fcf2dbf9dcd28fabfcdfc1a0133321a0dbc6468dc7b7a53525e1e5498ca6c207d19ad4af02abfa86a9ca8dc76ab2117518e420a2ee04
+EBUILD networkmanager-openvpn-1.8.8.ebuild 1256 BLAKE2B edd6d769382e025e7d94e15fb8ea95914b8876147579535dca3734f78789072b0ad9003b6129a92940f06ef3656aa62fa986cbf83b5804ac91b667d38bedde06 SHA512 8cb666f9966fdc926aed39483f3ae052dcb6151f2bbdb6861c4ac56804a1733b355ab2f73e9ba175129c0223324d5cd7a2471e70345bc83455513597ae5161aa
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
deleted file mode 100644
index 9f64c0d65ded..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.6.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.6.ebuild
deleted file mode 100644
index 8fb5003d6544..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
index 8fb5003d6544..572c134026e6 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index 31ab715a0fe8..24052dedc717 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,7 +1,3 @@
-DIST NetworkManager-pptp-1.2.4.tar.xz 382512 BLAKE2B 94e0bcfa3d3574bad016cec571e134d713bf4df48480a3fd71d3313a7c90c76ab7e3b9c8def60ceed9fcf4e3035425e5fe9a1924694535970d6458e0d202acea SHA512 b8983c6a6415e2f8757e91dfdeba66a7ba1264c01569f39b6da830def86d2c09d1084f4b561ca5ff48511b48f83d94fa004342efd54862d235ab75a49e4e7b33
-DIST NetworkManager-pptp-1.2.6.tar.xz 399292 BLAKE2B 91ca52d0e4373d9273c4d19cd9dec74e30106daf9bd10b4215a998ceef1680ebd0a369d5b7c4b75e2fed0d6179ea22e4a8c1399d56e97b98cc214b4112b19986 SHA512 aaa74eba949a93a132ebb956bfec46f8cf7b9807cf984a1fd8c4f71a252709d9e2b144cd7b4ce1f560501056c758f028eeb2c53d5cccaa79f8dc6b9d595763f8
 DIST NetworkManager-pptp-1.2.8.tar.xz 401540 BLAKE2B 64b3fe344a39eb64b462bda9204fb80b95a6cb54988efef9dbd1a5a6b04b3577edee97afabef410488868736d751846bdd98f3965a96806790527434c8207ec8 SHA512 ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7
-EBUILD networkmanager-pptp-1.2.4.ebuild 1164 BLAKE2B b8109adb694a84b150b8e7ecf693e41cc1ff7accc49417068c0c80d447f93b7e79806571c995338ce864c97286adde5ca4ef3fb51f97cb58ac4dafc9c9c15b9e SHA512 1d7bfc257fe3927bf5591cdfa1e57c57fac968e56f28b6abd67ea284ed02aa8865aa662c1bd18a4979b90d41e6cf41d2d22d170ef2e46aba446ddd4d7726860b
-EBUILD networkmanager-pptp-1.2.6.ebuild 1256 BLAKE2B f43fd43b30ba745a5bb1632f0e4ae86f424110a97ce4336e77190b9fa7e75c2f59a55a6634115910027e6200144433144dd54aa05b334e29f175e10cd001069a SHA512 853a0589681ee891b4be98bd42e2c57cd579af5420a720760a7c225d4094238ce41a167a53e5cfa8616c191c0f9c66ee0788865fe5a434c78f9fa32a431a1ce6
-EBUILD networkmanager-pptp-1.2.8.ebuild 1261 BLAKE2B 513b96b4b03f2bd25417454656e2763279ba68216ca695734feeae843ab12d4eb5cabad6adba3d48180207fcf2f55735e667abdbadd1b4efb8bc802fd00e58ae SHA512 ae358f37cbf00cb03977d06252c2a999e4501ec63e30c71ba0b11f1dbf8b563081cb76db1c176c3aae3a710b9ac4a13713090b713a8cdeb5d294853fbcb112b0
+EBUILD networkmanager-pptp-1.2.8.ebuild 1259 BLAKE2B 1794c968d668c0b0079ef759c67394edf67cff321cbbfc52284ee7077c3bb61a309443852722735f9bfc3c553f2dfa9e8c63674280f8d9f8329e993daa7c1ace SHA512 1956fbe0f67c4ecd77154e5381652e6875fc63c2b769f08b06865c377b173accd47f688a0b477bb107ac64e6e3d3d96330ab377f4c2835ba7266f3813137b99b
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild
deleted file mode 100644
index 7e80aec2b71a..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2.0:=
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp:=
-	net-dialup/pptpclient
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	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="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		${myconf}
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.6.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.6.ebuild
deleted file mode 100644
index 40085ef1b610..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2.0:=
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp:=
-	net-dialup/pptpclient
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	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="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		${myconf}
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
index ff701efd67d2..a20000d7800e 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 6e3cdca97e0d..9e468261eabb 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,16 +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.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645
-DIST NetworkManager-1.12.4.tar.xz 4195812 BLAKE2B 11c59da430cdf6f70cc841d980e0bc0280244a1a1ee52311946f27c1f61ae23b14e115caba02c80738ef35d67eab6f1fadc1a0dee3250510d05fd1e90aed5ac1 SHA512 6fc891a6f8c3b4cc43449dabf0c025a9e706b723f602085f34cc93bda885c300de293004390c4926b95e26201b86d97ecd23160f82ef03e4d2b680f822c827c3
-DIST NetworkManager-1.14.0.tar.xz 4389692 BLAKE2B 1d1b12764503d5f56d27f11449f3a0149491887312ed735c5cd25c0eeb6928fead30544d32cdd65262e00c4bdaed55dfb6dbc731c82de41ff8c49ff85937211e SHA512 cb0add2585c586ad36b4fb986a654de30047dc77f038927437156227f42622ac1045c58b76573f4e1acef22aa9f695da417f392a50fde70f4a086504701cecf1
-DIST NetworkManager-1.14.2.tar.xz 4415068 BLAKE2B e33d385f907feb6ca7cae51aaa4a0c64e9f33d7f3c9ba11ca19ba71d0d9f1f9b05ab99eb10debb65d4d0bf9d76be7d1610d23dfe84a2718be353725d8d0a7c70 SHA512 f2c45138daf8124704d4f8ee3966da8a2b6c9a18bc51332d19c36d6d5bbd795c6f85f182c7816604fa5e8be7e6ee1daa62b26a868b731e7bc4d4b72e543d3646
 DIST NetworkManager-1.14.4.tar.xz 4414196 BLAKE2B 31b236ee143892725cccccfe26a83bc75f938e19f52c5d09fb6ea3635f517feb5bab428eec4ee5e617920a8a8dd6bfe72bf9b760ecf16dec0bac4bb8663c58e4 SHA512 4199d6d7bbbee318b0f69cf2c1bf46cc3721c764121634751753c3cc833c4c5ac0856467896536e3d403ba8783fe452aaa79bfcd71a5ec324a4274989fb656c7
-DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
-EBUILD networkmanager-1.10.10.ebuild 10768 BLAKE2B b414e73cb89b97cf5a9d51b8a1823650c68050c936c0654d0add6e22ed8436f6335d3cf7a252aa2d143327ac6c6a0254f6f3cb3b376f38cc1d6c42341b163062 SHA512 43dca7293b9cc49d45fdeaa56ecbc37eb21213c8c25fe251c577c653cf1fd43fb72b798a60a70bf18a21837eb03441fb7cf38afef9a69e16f13bc516aa2cf1a0
-EBUILD networkmanager-1.12.4.ebuild 10955 BLAKE2B c7f6e7e1308dac603b48984d7910ca14b19d562e49cf52ec610eebf44d1ade0467b45150e97380a6fee9d5f2286ddecf8ebdfdb863f8c7af908994b065412c22 SHA512 7777538aebc1e0db66782e416c02c0d98da2aa849cb2828bbec0f00ce45323c8c8e9b3cf54ac0cc4443d261835908695ae27363dfacbf727396885c7c9efcc37
-EBUILD networkmanager-1.14.0.ebuild 10955 BLAKE2B c7f6e7e1308dac603b48984d7910ca14b19d562e49cf52ec610eebf44d1ade0467b45150e97380a6fee9d5f2286ddecf8ebdfdb863f8c7af908994b065412c22 SHA512 7777538aebc1e0db66782e416c02c0d98da2aa849cb2828bbec0f00ce45323c8c8e9b3cf54ac0cc4443d261835908695ae27363dfacbf727396885c7c9efcc37
-EBUILD networkmanager-1.14.2.ebuild 10956 BLAKE2B c83081c6d85a512d3c2cc4d7fe7dbc1fa309e062901c226c093ffa7a845057716a1521965b42bad595576670f8df980575205dd2de64a400e117260867291646 SHA512 c24174a3a5b67691eb07bd543b38d591cad6a5816cf457beb9618e5b043b2c9977582613f40417fe39f34bbd1dc5c23c239a5eedec40369a81d2eb3b3f974593
-EBUILD networkmanager-1.14.4.ebuild 10970 BLAKE2B 7ae274e086ac610398a3a3c1c3d98733fc69efa8a1289a0629d8f2878fc38889c146d2101d666b2114bbf926498d9f6644422764f5d9d27012ffb9164657022e SHA512 2c2b8091275214266e4274d818bd9418fd3471b428fc4911760b943e033bbd3c4313506012e14264ec3bc2544d758c6d7a2677e0f4dd8da24382864b186e0613
-EBUILD networkmanager-1.8.4.ebuild 10683 BLAKE2B 2c60630cbefd554f11e77b18a3bde0e0cc0dc361410ebcf36cb8e4223d715516268e862377fe2d2319ba67e9121153e6b6ec140254fdc159757a1d4a2e95b2d9 SHA512 93d62548e37ae437d7cd04801fdf723ba9e61034f605ab2e966a8958ac75d02ee210e6e7241ebcd7b47e6e9cca5212f0596421bacac7b07a6699996b0546bed5
+EBUILD networkmanager-1.14.4.ebuild 10965 BLAKE2B 833dd376a914bf626e0cdfc90449ee04f39039106948604a479548269b47d9dbed3ac30d7349cd724899b5185d2c24e38d0288a9c17daccd23892b1dc4f0351a SHA512 b3757b6bdbf99d94a4683eb4293d0588c16f6380d11e48ae52e5541dfee3ed44bb1560078822532c99353cb7f06da09dfb98a2cde7569fd3aa0b402fa96fb19d
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.10.10.ebuild b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
deleted file mode 100644
index f5f2d2126524..000000000000
--- a/net-misc/networkmanager/networkmanager-1.10.10.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 toolchain-funcs vala versionator 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 json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	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.37.6:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libnl-3.2.8:3=[${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[${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? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	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_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		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
-		# ifnet plugin always disabled until someone volunteers to actively
-		# maintain and fix it
-		--disable-ifnet
-		--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
-		--with-libnm-glib
-		--with-nmcli=yes
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		$(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)))
-		--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 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() {
-	! 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"
-
-	# 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.12.4.ebuild b/net-misc/networkmanager/networkmanager-1.12.4.ebuild
deleted file mode 100644
index 3f8a4080c5ba..000000000000
--- a/net-misc/networkmanager/networkmanager-1.12.4.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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_4,3_5,3_6} )
-
-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="
-	iwd? ( wifi )
-	modemmanager? ( ppp )
-	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-2.6.29
-	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_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		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
-		$(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)))
-		--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() {
-	! 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.14.0.ebuild b/net-misc/networkmanager/networkmanager-1.14.0.ebuild
deleted file mode 100644
index 3f8a4080c5ba..000000000000
--- a/net-misc/networkmanager/networkmanager-1.14.0.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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_4,3_5,3_6} )
-
-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="
-	iwd? ( wifi )
-	modemmanager? ( ppp )
-	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-2.6.29
-	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_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		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
-		$(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)))
-		--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() {
-	! 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.14.2.ebuild b/net-misc/networkmanager/networkmanager-1.14.2.ebuild
deleted file mode 100644
index 4c5162b6508b..000000000000
--- a/net-misc/networkmanager/networkmanager-1.14.2.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2018 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_4,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="
-	iwd? ( wifi )
-	modemmanager? ( ppp )
-	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-2.6.29
-	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_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		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
-		$(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)))
-		--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() {
-	! 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.14.4.ebuild b/net-misc/networkmanager/networkmanager-1.14.4.ebuild
index eeae52d8bd29..f23ac591aa4f 100644
--- a/net-misc/networkmanager/networkmanager-1.14.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.14.4.ebuild
@@ -27,7 +27,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
diff --git a/net-misc/networkmanager/networkmanager-1.8.4.ebuild b/net-misc/networkmanager/networkmanager-1.8.4.ebuild
deleted file mode 100644
index 329d3ef3ade1..000000000000
--- a/net-misc/networkmanager/networkmanager-1.8.4.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 toolchain-funcs vala versionator 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 json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	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
-# TODO: need multilib janson (linked to libnm.so)
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libnl-3.2.8:3=[${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 )
-	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 )
-	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? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	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_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		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
-		# ifnet plugin always disabled until someone volunteers to actively
-		# maintain and fix it
-		--disable-ifnet
-		--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
-		--with-libnm-glib
-		--with-nmcli=yes
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		$(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)))
-		--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)
-		$(multilib_native_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_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 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() {
-	! 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"
-}
-
-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/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 9d853f562e2e..8fd78310da12 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,6 +1,8 @@
 DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
-DIST nextcloud-client-2.5.0_beta2.tar.gz 18860182 BLAKE2B 9d6ab5f326c5280f0e9835c0c382b0ff78c01920f8bd2a6babbc3df20096d4c803fadfd1bc0f52798e5cbce503f241dc46b82923b8bdd19fe968b2d9c14189cb SHA512 ed5ec8c0fd79d3f7f843ef1aefb9b94088b85dacca442388bc9a42e1ddbf1ee90482595135ffaffc85e40d223406964c903949ca1c2161fa0f6a2d6770a77cea
+DIST nextcloud-client-2.5.0.tar.gz 18914632 BLAKE2B b6a8e353a7894dac599b5ecfb7bed0f373ef6ce602a929b9daf709a91513b34ff92f9af0ba57acd3294561f30d37623280b043c779b52872bad2829e66315e10 SHA512 85591e3d5011a514472f179e48815134e12751849be9fa3457f631cdb262764801e8aecc774e0cff4d1dc4a4c34e3238a6ac1442e93ae847417d25560917ce99
+DIST nextcloud-client-2.5.1.tar.gz 18916053 BLAKE2B 98daa5abde8aa82e2d30be7c340f808c4cb7a1986bbb7e9e5208174b268ddacfaf08e91b54d6bce5039fd19f6729716285e2a45f913c0d0eb473bf753031678f SHA512 04301f4b6283c4003ec4fed7926e11e2a627903a1b20e0b7cb4bb24b522e133d41001f48c633cad4fe3b100496d3a7826893b78074c2e3985a4c9c90122e3108
 DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 EBUILD nextcloud-client-2.3.3.ebuild 2453 BLAKE2B e953f8c60f10101c891e46c98ba4c6c2f3ec09a17c40cdfe66687b31dcc0e17a9c3da8c4c8d6e7f27c1c0786f756dd98df2b979d671fa8d649d18eb1861fc7e2 SHA512 42614380bd5945afc39fb3b653c1d03e7afcd61f7bdb3715983198bb8dc7e75a029150189bf800ab39d9a0d9775aa3b05439269b6a0a987f9c02443167dc447f
-EBUILD nextcloud-client-2.5.0_beta2.ebuild 2053 BLAKE2B 82c72834a72183622c3ca4dae4b17a2722bd07a2dc8fb3728004e6e7b7dc236dd6d1cec4a13ace4d7718295cdb22c91f2ae2adbe89b849cd225b9032df4aa4ca SHA512 4d4ea0debd560b93b3eb3f613e5e9f4fa65b520dacacece181f6c85da0912e394d3424100b2aaf07ebcb9fb4ffc9f7980256b8b4b079cbd4c625ca6e701410f4
+EBUILD nextcloud-client-2.5.0.ebuild 2053 BLAKE2B 82c72834a72183622c3ca4dae4b17a2722bd07a2dc8fb3728004e6e7b7dc236dd6d1cec4a13ace4d7718295cdb22c91f2ae2adbe89b849cd225b9032df4aa4ca SHA512 4d4ea0debd560b93b3eb3f613e5e9f4fa65b520dacacece181f6c85da0912e394d3424100b2aaf07ebcb9fb4ffc9f7980256b8b4b079cbd4c625ca6e701410f4
+EBUILD nextcloud-client-2.5.1.ebuild 2053 BLAKE2B 82c72834a72183622c3ca4dae4b17a2722bd07a2dc8fb3728004e6e7b7dc236dd6d1cec4a13ace4d7718295cdb22c91f2ae2adbe89b849cd225b9032df4aa4ca SHA512 4d4ea0debd560b93b3eb3f613e5e9f4fa65b520dacacece181f6c85da0912e394d3424100b2aaf07ebcb9fb4ffc9f7980256b8b4b079cbd4c625ca6e701410f4
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.0.ebuild
index 29daa11a9dbe..29daa11a9dbe 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.0.ebuild
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild
new file mode 100644
index 000000000000..29daa11a9dbe
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/owncloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 10e3129b833b..4620ff98a62f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -4,6 +4,7 @@ AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f1
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4
 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9
+AUX ntp-4.2.8_p12-libressl-2.8.patch 741 BLAKE2B 8b5542b216710da46a59d2cefa82142bfe1590ca351833c5a3b91fd3c14c37ddfbcee89aa819a9b254f3ba9f3ef8997aa81c881fc04a71da0c2bb1e727be5215 SHA512 4b8e2b79c0922a5a2d9eb1857679996fffc0dc807e01221c0b5be7a547fe700f715899d66f946a6626848bca89973b807b3b171b7cc3ae153d238a2da64f49e1
 AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6
 AUX ntp-client.rc 720 BLAKE2B 5662d2f6635b8d5bb07fbc82c259a8af7871b8312ebff0184005d3ea24f239a1d3e2b63a5a7e9eef8f385a72fcd9370a2e68031a7c54bf3ef28e8c26c97c0298 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81
 AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781372bdb0e6b06d46c009890a0a2ab4b60b6759bc650324994a2b81ef9b9d0bc922047add9bc SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c
@@ -21,5 +22,5 @@ DIST ntp-4.2.8p11.tar.gz 7076566 BLAKE2B e81ce2093ea7307a565089bba9cb267be64c714
 DIST ntp-4.2.8p12-manpages.tar.xz 25700 BLAKE2B 0a84908556e997bdd08a78cd04f7f38a32a8441138f31d0adf7fefc380da79e509bea4a8bc67154501e359638f4edcab561d14cbdd1d573473bd2ea5a14f0c48 SHA512 e6df0099b9f62db63d200702267276ee094e8d00b20a67d2181f3f32fe6b871c49ac2eedbc2186b3255c919820c05eac528718b80afe7ed7ed7654b55c361f7c
 DIST ntp-4.2.8p12.tar.gz 7079642 BLAKE2B d7d7817afaf9f94bf230951901b7531aff03c0828eecd40ca6fcc836ffd081387837afee44978742b507a9bee58788022fe9556733e8861dcc37d63f5637b3d1 SHA512 5382dcd1bb7feca8f28fc650f68892cb53f9364ebeb3780754cfbe71b1602057fdfd6eb27956afe79014a435624d77e2648d9e07f4d86ce7a98f5a4438d08310
 EBUILD ntp-4.2.8_p11.ebuild 4517 BLAKE2B 87ccf28c99af3848df8ca2bfc5825358d6c38d2045939b3d8a7c6509a83493ef1de004e4afdc466c453335b637c63895446c351cb2072193620e2af4883c2fbf SHA512 e8d5662377daa1c0ea1e9c1d746b05cf16944d8b3c3d9811307bca1cf6be923899390597019f9a5d203acfdec00d252860110ca0f434bffc43a25c42162696ff
-EBUILD ntp-4.2.8_p12.ebuild 4527 BLAKE2B aab6adb14c39d2cf5ded64e8c2e9f03b4db5c9152d829f4ef4ee515027067ae85700ded1ee605d5c57208ae56b7a415bdb623c1b2066d69b58addb28845ca35b SHA512 ea5bfe4085840ff9046a3aac100f9bafb7a4fb4f2a26684545e5a62a5341a1d6a63d7d51c71c5f108f11a9642e9aa14932e038e662a61b8543e063799eb6c7a3
+EBUILD ntp-4.2.8_p12.ebuild 4570 BLAKE2B 6b04910357bf80c3132a039d1372708892b1a92c8bd75d1ea61f6b4bd5df13c770492387a30b0d91b604c11a4934546c4672274f2d72fe7ccbaf427140c7f8fd SHA512 339662b9372645e15ede194d8fdd9976b32ee9c62c6b2f6b3b07472e84a2d5448c83f25e5ee8121ba120a12d4484f8dd96cf366a31a51b1148f486deac004e86
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
new file mode 100644
index 000000000000..182fcefe88b4
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
@@ -0,0 +1,16 @@
+--- ntp-4.2.8p12.orig/include/libssl_compat.h	2018-12-08 01:14:58.434733497 +0000
++++ ntp-4.2.8p12/include/libssl_compat.h	2018-12-08 01:42:04.479474757 +0000
+@@ -107,10 +107,13 @@
+ 
+ #define OpenSSL_version_num	SSLeay
+ #define OpenSSL_version		SSLeay_version
++
++# if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L
+ #define X509_get0_notBefore	X509_get_notBefore
+ #define X509_getm_notBefore	X509_get_notBefore
+ #define X509_get0_notAfter	X509_get_notAfter
+ #define X509_getm_notAfter	X509_get_notAfter
++#endif /* !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L */
+ 
+ /* ----------------------------------------------------------------- */
+ #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */
diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild
index 179de05fc600..bb9963584796 100644
--- a/net-misc/ntp/ntp-4.2.8_p12.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
 	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
 )
 
 pkg_setup() {
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index 451ed9e37a1d..3e4972763d41 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1,11 +1,3 @@
-DIST ntpclient-2015.365.tar.gz 31023 BLAKE2B 7974b7606a4fd979b9fd37446d6cf802b4104e566ba910933200c43bb7339721f17a9e5611d4b63850142eae7924623bbb765d2c6ef9c79d7f7409abd3bbe8fb SHA512 ca3d7b8ac6cb0626ac1017e4baee2faa833aab4fb449881e890b686f785b2fe30ded77a0a831f40126ded71abae0f2a944227d530859222eabfffe03f89d8a80
-DIST ntpclient-2017_217.tar.xz 108136 BLAKE2B 8f3717e33d70b3d150adb11b621098bef7a1a040fd96615b1ff994869372c3f358ab1b16cbf9e61c1884a19bd8cf9444732d7f938786c9c4899b0b3f95c6cd43 SHA512 a1dc7ef7b966bd49ffc2e63e2c850ba4eef76e5a313a00642074112e13adccf80a4a9211264850dda3052c948f85040e1a668846ddd0be9310c701df40282be0
-DIST ntpclient-2017_246.tar.xz 108348 BLAKE2B ff90eaedfb09462a656e33f2f36bf2e495a5809cb9419782b93567e85ae7e19ed061d9ae87ab21f4ae949506124aaecefd3952470a0c2994179e8175cf96ad59 SHA512 c836c4a921854730749aa0dd5a52e51e6845ea09458b02e14b61a5a3c808dc0b2ef6e9f62a95086e289ec38bb27b2454346e6776e472fb0dcc53c6a8e8092c48
 DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
-DIST ntpclient_2010_365.tar.gz 30423 BLAKE2B 9efe8b81eae5ae3e41c046acfbba6e148064097bb1bd3e2c1ec80d85bf0dffc8c2f73fa73f66060cb3287ceaa993d83241fcd67614f3414afad88adaf6fcc059 SHA512 74fd5e80dcf36c4e7aca6d97c5979b0dc4c51fed592279adfd04c0d329c117bfed819ee40d6400436c0d066f73ed3403e9fba8cb05846df55c991422ce434132
-EBUILD ntpclient-2010.365.ebuild 704 BLAKE2B 25b14f9088e389f0580dbb85272ff8d773ae0bd514899c2507980c28a476e61fd7c635c04fc6803fcfe3f0caca04f7ff93faa068f5fe69757c4b35940d934429 SHA512 5c4ef158e7bb7d2b003d45e40fa29d994596d2a657ca6359573730b4a30594bb0b6603c5647c4f97a9b7aca679c485bf3155a9a853d10f8e293d93fa3f1f38bb
-EBUILD ntpclient-2015.365.ebuild 700 BLAKE2B 4c23baca82e100dd31156534e1d1b15c6b9b7ba7a8adb590ff527508f831975fd1aaa1fd06ffa8ecde1e33eadc18315648a47e3e37c9650edb6b1e1c765c59ce SHA512 0220d85794028d9daa151ad2cc1c2e6e707938ebe5076c5bcb5f0ef2d954855c81f140ce845c6b6737fd8293e3510d53d26a4184179bd2fdfc76c91e6e181d74
-EBUILD ntpclient-2017.217.ebuild 655 BLAKE2B 0770499a3105930e5ed01ba5d3c9c75e537568a9ecb5ae4d30a497e31831eac52303545bca975313fe3a2d5fe9b90220973a19976732f4b6694f35bfca7e1e51 SHA512 b3e1d7211c99d2659ae925ff8123b49d10f1cc66057b0db2d51935829b49b5da04153b8fc3102386699fc0a9e1801df4afb12103c8f42728e0992bc6598b724e
-EBUILD ntpclient-2017.246.ebuild 626 BLAKE2B 080ccdf5a2ddaa15ae72af62fb0d1804a75f03a7b14de177f304c4177e50d67b073d0f6019a13ab4945ad7ab7c5522e93e70636f35895b12a43714520ce2c38d SHA512 6ea85f9ac17b4fdc091c46f5b01ddd10dd629eeeadf8a02decbf1ba36f7dd5954c6c5a9b3aef29ae4c5d789ade9a52aca7848f533d6b33afd2c5be81ceed96fb
 EBUILD ntpclient-2018.244.ebuild 765 BLAKE2B e09055ccd0a2ecfa73a0483bd3d69fd15112564562ecdaaa67b22aaca72e56680afd57d6907b63fb36fbfbbc84ef1263fae2aff35dad170047004e12ac89b357 SHA512 f8135e6e64bf44e9d7bbc9a2d258c691c8477147002f286bff961ec6828d479d3c84577639d033c71a303c344d93619b9677f0929a0d44edca60423913cfd3a0
 MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
diff --git a/net-misc/ntpclient/ntpclient-2010.365.ebuild b/net-misc/ntpclient/ntpclient-2010.365.ebuild
deleted file mode 100644
index 3f0eb828012d..000000000000
--- a/net-misc/ntpclient/ntpclient-2010.365.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
-HOMEPAGE="http://doolittle.icarus.com/ntpclient/"
-SRC_URI="http://doolittle.icarus.com/${PN}/${PN}_${PV/./_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-#S="${WORKDIR}/${PN}-2010"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/${PN}* ${P} || die
-}
-
-src_prepare() {
-	sed -i -e 's/-O2//;s/LDFLAGS +=/LDLIBS +=/' Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dobin ntpclient
-	dodoc README HOWTO rate.awk rate2.awk
-}
diff --git a/net-misc/ntpclient/ntpclient-2015.365.ebuild b/net-misc/ntpclient/ntpclient-2015.365.ebuild
deleted file mode 100644
index 6b1b65b208b4..000000000000
--- a/net-misc/ntpclient/ntpclient-2015.365.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
-HOMEPAGE="http://doolittle.icarus.com/ntpclient/"
-SRC_URI="http://doolittle.icarus.com/${PN}/${PN}_${PV/./_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/${PN}* ${P} || die
-}
-
-src_prepare() {
-	default
-	sed -i -e 's/-O2//;s/LDFLAGS +=/LDLIBS +=/' Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc README HOWTO rate.awk rate2.awk
-}
diff --git a/net-misc/ntpclient/ntpclient-2017.217.ebuild b/net-misc/ntpclient/ntpclient-2017.217.ebuild
deleted file mode 100644
index 462dc406de39..000000000000
--- a/net-misc/ntpclient/ntpclient-2017.217.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
-HOMEPAGE="https://github.com/troglobit/ntpclient"
-SRC_URI="https://github.com/troglobit/ntpclient/releases/download/2017_217/ntpclient-2017_217.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DOCS=( README.md "doc/HOWTO.md" "doc/rate.awk" "doc/rate2.awk" )
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/${PN}* ${P} || die
-}
-
-src_install() {
-	einstalldocs
-	dobin "src/${PN}"
-}
diff --git a/net-misc/ntpclient/ntpclient-2017.246.ebuild b/net-misc/ntpclient/ntpclient-2017.246.ebuild
deleted file mode 100644
index 12af1add9c4d..000000000000
--- a/net-misc/ntpclient/ntpclient-2017.246.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
-HOMEPAGE="https://github.com/troglobit/ntpclient"
-SRC_URI="https://github.com/troglobit/ntpclient/releases/download/2017_217/ntpclient-2017_246.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DOCS=( README.md "doc/HOWTO.md" "doc/rate.awk" "doc/rate2.awk" )
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/${PN}* ${P} || die
-}
-
-src_install() {
-	einstalldocs
-	dobin "src/${PN}"
-}
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index ce17367f208a..0522ebbbcebc 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,7 @@
 DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
+DIST nx-libs-3.5.99.17-1-full.tar.gz 5287579 BLAKE2B 8ea54a55071e1161a349ecc1c897b1e774f43567e557cb5b06ed296922b87d2c9c613a58b2d86d7ef912d179d44ed09ca2aa6679c43c334bfbaa31edbf0aff11 SHA512 17c782ccd972c0b97de86195b5994e681570f0184813a8200fea4803d51e5033976e7c8300cb37ba6e811e26e526226a3d4e6a469eecdf772cbba7a12adeeabe
 EBUILD nx-3.5.0.33.ebuild 2337 BLAKE2B a902ccaccafac239a62ccfe6db1543161ea4c47890dc75996744824caee103eb0b6150bcfe10a0befdff4658f60097d06c77d5fd90de79f925e79351ab357c16 SHA512 7e2e099057167fec9639ee20389764d06997a11bb73a94d825dc07c18e563fcba4aa068210e36675c9ca0303edb78e9d564943b26d38e4c67e8ea8ef77a41a54
 EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
+EBUILD nx-3.5.99.17.ebuild 3226 BLAKE2B 1b0297c80b5ed3c963fc0e08fd96e6733a390fabe6f4a6fbf12ca38a92e600c62a82605385b06a23b5dd1aadcdf62a1d35f689aa216f3e50a19c7b0589cbbb34 SHA512 73d03ec5ae9c262855a03b5bc702dd81b660b4beeee43a87ccf24419463fd92e005bb264472eadbe2af0e97947a241150b15ee136c18ef19fab281107ad8b293
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.99.17.ebuild b/net-misc/nx/nx-3.5.99.17.ebuild
new file mode 100644
index 000000000000..335570d48a40
--- /dev/null
+++ b/net-misc/nx/nx-3.5.99.17.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+
+SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-1-full.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="
+	dev-libs/libxml2
+	>=media-libs/libpng-1.2.8:0=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:*
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXfont2
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pixman
+"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libfontenc
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/nx-libs-HEAD"
+
+src_prepare() {
+	default
+
+	# We want predictable behavior. So let's assume we never
+	# have quilt installed.
+	sed 's@which quilt@false@' -i mesa-quilt || die
+
+	# Do not compress man pages by default
+	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
+
+	# run autoreconf in all needed folders
+	local subdir
+	for subdir in nxcomp nx-X11/lib nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		eautoreconf
+		popd || die
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	pushd nx-X11 || die
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+	# Disable SunRPC, #370767
+	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
+}
+
+src_configure() {
+	local subdir
+	for subdir in nxcomp nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		econf
+		popd || die
+	done
+
+	pushd "nx-X11/lib" || die
+	econf --disable-poll
+	popd || die
+}
+
+src_compile() {
+	# First set up the build environment
+	emake build-env
+
+	# We replicate the "build-full" make target here because
+	# we cannot call "make build-full" as it
+	#  - calls autoreconf several times
+	#  - invokes make directly but we prefer our emake
+
+	emake -C nxcomp
+	emake -C nx-X11/lib
+
+	mkdir -p nx-X11/exports/lib/ || die
+	local nxlib
+	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
+		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
+	done
+
+	emake -C nxcompshad
+
+	./mesa-quilt push -a || die
+
+	emake -C nx-X11 BuildDependsOnly
+	# Parallel make issue resurfaced, upstream working on autotools switch
+	emake -j1 -C nx-X11 World \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		SHLIBDIR="/usr/$(get_libdir)"
+
+	emake -C nxproxy
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
+		SHLIBDIR="/usr/$(get_libdir)" \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		install
+
+	# Already provided by mesa & related packages
+	rm -r "${ED}"/usr/include/GL || die
+
+	# Get rid of libtool files and static libs.
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index c03019e876ba..67a5a13ae65a 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,9 +1,7 @@
-AUX olsrd 479 BLAKE2B 188a78f7193a30cb63fda354ba92e162ba1bd56933c376998703c7f2cb9bee94a99f086d4cde6d0a437a9df064a21c16a77e973c9dfa68459591aa1a7294eac4 SHA512 8fab5fc2fda925a346d8f61f5be31bce666a2922c66bfb8c6a48a9943673b5be713cd5a93dd96b3d06d470793dc6136d624efb52ff1c58c8f5e6887336bffe38
+AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473d786c1e9acccf3512ba437d203798114ea1e9eb1fa79f4e5c6eca977b7b1357c2e668e SHA512 26329da5360bd25dacea3fde8c025f0bc34203970d2e75b47157fc0c4a3873cf6e7faa93c0a5a51bf20618846135ab18a09b6157521c3199c0667f969d491c4d
 AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791
 AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88
-AUX olsrd-r1.initd 95 BLAKE2B bbb1cf7ab923be8ca24ae0735b38a80d1ec5c531d7334492346e391034938c2180d55f66e854f867db46e745fb0baff1ffa71a21b2822c24ecd7fb4878febbb4 SHA512 ecbf343ec1086b4678c12d070cad8c6e9e7b8b87865c2aebe973271950fc255c64960b477eb25628809f99bebefec60724c7fa4667c820abaf1641402550175e
 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
-DIST olsrd-0.9.6.2.tar.gz 20466227 BLAKE2B 45d90393814ac7cbd6b86fc532d560a415e80ed50be78ad9e55abe44d17a456546820897edcfb6cc8a05fbb6d8919dec9c413d0af7194cbf810bb8e621d66edd SHA512 fb0ff8553f33339f38338ec3f0d15aa7ad17ee30d38437a6e23c96f5a310ee7e1c907c8d8deea58e90181d4ed89f190e042fea6cb03d47adbf4851b6a630b810
+EBUILD olsrd-0.9.6.1-r1.ebuild 2337 BLAKE2B c7c96b2ce368d1245b5faab05686eb24ef8e3aae650a94939664ed0d50fa0a8c86011b0187c654dea359d6fe0fc40ad0928d89d094fdbed4ed260705a64e1f85 SHA512 bda205c6ada5a043a624e1a82385d4079258128698ae2acfc516bc74ae06ff8ef6ca8f30d1372a9645d1ea939e77b3c5792a408e5dbd2aaa373d128a19b60e73
 EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
-EBUILD olsrd-0.9.6.2.ebuild 2548 BLAKE2B d96a89a164d4f24dd565ea4d222ed21c733460eee4653c1bcac2a25ef35cbeedeaf999cbdb7455af3936e90d3b63439e32da13556034634a4e686fe44012a286 SHA512 0ab7947e9fbcd1dba27150754e8fb2b46c8a31a91ed26c43100e663898cf254103a791d5c5af38819612fc6840d5ce2a608bfd569072b1a49c5b23ae91b5c6f0
 MISC metadata.xml 289 BLAKE2B c88d8f719ab7ee520a042f4a45a60a8e797eeede9823b1d21ec5e12700805666e81e96be90b9d961cdbde662ee813a7f68949cc477c40f17ace6902abfc9627e SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520
diff --git a/net-misc/olsrd/files/olsrd b/net-misc/olsrd/files/olsrd
index aca79b9d428d..34c410e9944d 100644
--- a/net-misc/olsrd/files/olsrd
+++ b/net-misc/olsrd/files/olsrd
@@ -5,8 +5,8 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e /etc/olsrd.conf ]; then
-		eerror "You need a /etc/olsrd.conf file to run olsrd"
+	if [ ! -e /etc/olsrd/olsrd.conf ]; then
+		eerror "You need a /etc/olsrd/olsrd.conf file to run olsrd"
 		eerror "There is sample file in /usr/share/doc/olsrd-version/"
 		return 1
 	fi
diff --git a/net-misc/olsrd/files/olsrd-r1.initd b/net-misc/olsrd/files/olsrd-r1.initd
deleted file mode 100644
index 9bca9b37074e..000000000000
--- a/net-misc/olsrd/files/olsrd-r1.initd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/sbin/openrc-run
-command="/usr/sbin/olsrd"
-command_background="yes"
-pidfile="/run/olsrd.pid"
diff --git a/net-misc/olsrd/olsrd-0.9.6.2.ebuild b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
index f52b1c40cc98..32a6685bd66a 100644
--- a/net-misc/olsrd/olsrd-0.9.6.2.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-inherit multilib toolchain-funcs
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator
 
 DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
 HOMEPAGE="http://www.olsr.org/"
-SRC_URI="https://github.com/OLSR/olsrd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="BSD LGPL-2.1"
@@ -40,7 +40,7 @@ src_prepare() {
 		-e 's|@$(CC)|$(CC)|g' \
 		-e 's|@ar |$(AR) |g' \
 		-e '/^prefix/s:/usr/local:/usr:' \
-		$( find . -name 'Makefile*' ) || die
+		$( find -name 'Makefile*' ) || die
 
 	# respect LDFLAGS
 	sed -i \
@@ -76,18 +76,11 @@ src_install() {
 			LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
 	fi
 
-	# decompress default compressed man pages to honor user wishes
-	local compressed_man_pages=(
-		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz
-		"${ED%/}"/usr/share/man/man8/olsrd.8.gz
-	)
+	doinitd "${FILESDIR}"/${PN}
 
-	local compressed_man_page=
-	for compressed_man_page in ${compressed_man_pages[@]}; do
-		gzip -d "${compressed_man_page}" || die
-	done
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+	gzip -d \
+		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
+		"${ED%/}"/usr/share/man/man8/olsrd.8.gz
 
 	dodoc CHANGELOG \
 		valgrind-howto.txt files/olsrd.conf.default.rfc \
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 22dcf60ac435..9aa9a6b58276 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -5,6 +5,8 @@ AUX omniORB-4.1.4-format-security.patch 557 BLAKE2B 3aef2fdebedfdaf91cac169aa047
 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 220 BLAKE2B 56890af80b2c3a19dbe8168671207bcd3c19714c1dc227b71207f01a67ed1691524adc94e609937da117b560faadc574ba210139fd13455b3bef2ed30cde0c2d SHA512 a8201f66fb2504f83b9b89adf3e3b23b1b78410cbcfa740e49ea0c984e164aa430eadfe01fe05b1ad4d9c6cd1206e8ef614fc31a1aad86f3e4af183781cea563
diff --git a/net-misc/omniORB/omniORB-4.2.2.ebuild b/net-misc/omniORB/omniORB-4.2.2.ebuild
new file mode 100644
index 000000000000..289f1fa2c4f8
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.2.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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 python3_{5,6,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}"
+
+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/openssh/Manifest b/net-misc/openssh/Manifest
index 59afa899c602..4c64fee904c1 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -13,12 +13,17 @@ AUX openssh-7.8_p1-X509-no-version.patch 878 BLAKE2B 2ed1a11e4b9066720057e5ae0a8
 AUX openssh-7.8_p1-hpn-X509-glue.patch 2786 BLAKE2B ef0651dc65ea1ab22c17e6ba0efe34141bc3af4dafcdbfba5c7fd80107a31fbc7c2671670c57153918bd626f4172e7e16ba22b4f36d67ced1b6e9d7b03c9dbaa SHA512 a205809bded3ac0aba1aec0f27ddc3948414fc3354cf8ec2945fc91effb9a0617ef259475347164c2f7b95de280704be1646725dae183c070efd104c4c515510
 AUX openssh-7.8_p1-hpn-glue.patch 3644 BLAKE2B eed002fc87362fa8bf3a86681fdaf8153137b7a9de7ba4f6fe47dbb39031f61773e9546f226f8035ce4391dce62a1487ba1450cd92e02e4d74fc0875ef2ca603 SHA512 f6410be5632e4f04f6ba4517afe279640ddc7050750f036fb3e57ab4318e59b86dc44a983deacd6b6f88c4cd0f78dae523f9dded424dce3600a3b1d7a0964435
 AUX openssh-7.8_p1-hpn-sctp-glue.patch 597 BLAKE2B d7ac82653c48467ebdc59e1444eead84d3de8cdd93acda6361cedd0cc1e2969e52610c10075463ade71e4c1bb1fcb243bd34d11d6c21cd4c500b6743dc628770 SHA512 4742112e3d0e7463d9194a5ab068d3b6cae6bc4a9b5755599d49a13db514014c7d406c16c7ff59197917b5c152b2a54d15323d88de942215fced4c628cacf2c0
+AUX openssh-7.9_p1-X509-11.6-tests.patch 531 BLAKE2B cfb14747ed4e39d11d7727b779753ddf5f7e94be56d1dbe0a76131d8434dd4453c253467ec1eb7cac49a50f5a3f81c82b804926f46dc79ed09c252397ac9d349 SHA512 7f1322a94aa79c822a8bede36a92fe48dc6b9bf7ceca3068450877b543a1d186031060d642c7d689c02e06ef3e038eae9739deda53c6401439ed20808e82ff10
+AUX openssh-7.9_p1-X509-dont-make-piddir-11.6.patch 812 BLAKE2B e09cdf2c2d3cd0ae05ce7938542d8ebaccacd7b40920259798592e89b3b2a0425a207eee6dd71024b20e3f1220a4ecf65e9f35adc624ad9d5f2fa29b5b796860 SHA512 55612fc54a29ed1e0ea7c6e5332f217efb0b415ab4e04cb48f693bc8c48d8aaed0c962f111f939097fc990110ce506f187fe09827871ec0cee320c463523f7de
+AUX openssh-7.9_p1-X509-dont-make-piddir.patch 812 BLAKE2B 1b4a6def589125f6cf6e63f3be89dfeba4d3d80474df4420b10cbe280e777e4627066b70944313351ca7d54949b7e667192c945bda4a06fccdab780feaff72b7 SHA512 dc07ed8da66a9b29c125375da4b67e9654c4eca5cb3219b19de3f8433e8c593c0ded440c24c80332ffad3b0f25a0baa970a8de6bcecd3d4aa2ba1a6607376a93
+AUX openssh-7.9_p1-X509-glue-11.6.patch 1240 BLAKE2B a6c7f7971ddb9b10af1160a7306ed683da72e9bcc3809b1ac28071b67ef96da942dede47b161e9d88c8d3e8bac213425e4fc9b35703455378b11a9465b3dcc8d SHA512 0f4195740c871aec8d806a56911fda37c6ff87c13de094305faf95da718afcdd015672db798d1cb67d3493755fa186758b75a6c0d819188884c92915a7c16bc4
 AUX openssh-7.9_p1-X509-glue.patch 1240 BLAKE2B 9b5423774e37a90cbad6414ff143319f744452f02cdfb740f59eb8ff9c92f65cb1f64ebb8543e5d25ea082b3104e43a54e07fbc76da202e94df69d4230b44d3e SHA512 e326f1a148f65aef9aa170c5d714e471b1b0dca38c8d267e4879a6a36f476104fae921cef18c0ce25e2023aa3056e609aac294f34a67c85a2758f1b1421f7d26
 AUX openssh-7.9_p1-hpn-X509-glue.patch 2786 BLAKE2B ef0651dc65ea1ab22c17e6ba0efe34141bc3af4dafcdbfba5c7fd80107a31fbc7c2671670c57153918bd626f4172e7e16ba22b4f36d67ced1b6e9d7b03c9dbaa SHA512 a205809bded3ac0aba1aec0f27ddc3948414fc3354cf8ec2945fc91effb9a0617ef259475347164c2f7b95de280704be1646725dae183c070efd104c4c515510
 AUX openssh-7.9_p1-hpn-glue.patch 3644 BLAKE2B eed002fc87362fa8bf3a86681fdaf8153137b7a9de7ba4f6fe47dbb39031f61773e9546f226f8035ce4391dce62a1487ba1450cd92e02e4d74fc0875ef2ca603 SHA512 f6410be5632e4f04f6ba4517afe279640ddc7050750f036fb3e57ab4318e59b86dc44a983deacd6b6f88c4cd0f78dae523f9dded424dce3600a3b1d7a0964435
 AUX openssh-7.9_p1-hpn-openssl-1.1.patch 3160 BLAKE2B fdf063bfd7855879a3cc8765d841f743cd07f3f3c96ecfeb219243680e46deec0d5ebe14f4f2b417cfce4f681b6baf493ee04d86aec74c61777b0485681406e1 SHA512 775d06a5b22cd306f884602dcc22533fe55f083f39ffeed252e7e33d44c52910f0fbe7705ef260d09503d3c26cf7b76b5fa3b0c7f1b263150e945f2ca6050b2d
 AUX openssh-7.9_p1-hpn-sctp-glue.patch 597 BLAKE2B d7ac82653c48467ebdc59e1444eead84d3de8cdd93acda6361cedd0cc1e2969e52610c10075463ade71e4c1bb1fcb243bd34d11d6c21cd4c500b6743dc628770 SHA512 4742112e3d0e7463d9194a5ab068d3b6cae6bc4a9b5755599d49a13db514014c7d406c16c7ff59197917b5c152b2a54d15323d88de942215fced4c628cacf2c0
 AUX openssh-7.9_p1-include-stdlib.patch 914 BLAKE2B 9c7eb79f87ecd657a80821dfa979d8b0cc12a08d385ec085724f20aa6f5332593ffc7481bb9f816e91df3eb4d75d8f7b66383ff473d271270de128c3b2bf92e5 SHA512 7dade73bdafb0da484cbd396b4a644442f8ea12fef54c07e6308ae2e73a587fa4ddf401e8a0c467469b46fe7f00585e047462545182924c157b4d3894c707a70
+AUX openssh-7.9_p1-libressl-2.8.patch 391 BLAKE2B 779d278a3c66a41d65b15ef122f2a01832e71abb85c5a0314acb9d5a587fe6f337516a4387da051f56c4b7c269bb8bd67f54b4cabdceb840716fad381062f508 SHA512 83da5749a72a2e8e8d3e1125d9370de0f61f663ed4cf8605d39118be4c4f8b211a1c41c566ffd6f9239db0b8afa949b25728b26db146eab76509f3cd8611795d
 AUX openssh-7.9_p1-openssl-1.0.2-compat.patch 514 BLAKE2B e3859c2bed0e4116e558e7ea8c4679a8666316c26a650acd93ea023444bf69fafad6eba47a6faef7c017d812da76fe93a291e51c427ddecc1fe89bd362758403 SHA512 dde28496df7ee74a2bbcf0aba389abefade3dc41f7d10dc6d3c1a0aca087478bafe10d31ec5e61e758084fa0a2a7c64314502091d900d9cee487c1bdc92722a6
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
@@ -41,6 +46,7 @@ DIST openssh-7.8p1+x509-11.4.diff.gz 536597 BLAKE2B 18593135d0d4010f40a6e0c99a6a
 DIST openssh-7.8p1-sctp-1.1.patch.xz 7548 BLAKE2B d74010028f097812f554f9e788aa5e46d75c12edbef18aaeaa9866665025bdad04a1a028cc862d11d718208c1b63862780840332536a535bb2eaff7661c966ef SHA512 c084f6b2cfa9cb70f46ecc9edfce6e2843cd4cd5e36ac870f5ceaaedd056ba9aa2ce8769418239ad0fe5e7350573397a222b6525a029f4492feb7b144ee22aa3
 DIST openssh-7.8p1.tar.gz 1548026 BLAKE2B 938428408596d24d497f245e3662a0cff3d462645683bf75cd29a0ea56fa6c280e7fa866bedf0928dd5bc4085b82d5a4ce74b7eea0b45b86f879b69f74db1642 SHA512 8e5b0c8682a9243e4e8b7c374ec989dccd1a752eb6f84e593b67141e8b23dcc8b9a7322b1f7525d18e2ce8830a767d0d9793f997486339db201a57986b910705
 DIST openssh-7.9p1+x509-11.5.diff.gz 594995 BLAKE2B 2c44df224e4114da0473cbbdfdcc4bd84b0b0235f80b43517d70fe1071f219d2631f784015ab1470eebcf8f3b6b5f8744862acebb22f217c6e76f79e6a49c099 SHA512 4d2fd950dee9721add822fdb54ff8c20fd18da85081ce8a2bd2a1050d3ff7900a7213782c479691de9dcfe4e2f91061e124d34b365edb3831e8bfe4aef3744f9
+DIST openssh-7.9p1+x509-11.6.diff.gz 655819 BLAKE2B f442bb993f89782b74b0cd28906c91edfcf5b1d42a4c8135a5ccf5045e7eb000eb7aa301685b748f707506ba20e3b842d684db436872ed82b6d9b9c086879515 SHA512 0ff6ed2822aaa43cf352134b90975fb663662c5ea3d73b690601f24342ea207aecda8cdb9c1bdc3e3656fb059d842dfb3bf22646b626c303240808286103d8bc
 DIST openssh-7.9p1-sctp-1.1.patch.xz 7552 BLAKE2B 0eeda7c8a50c0c98433b5ee0734b9f79043067be376a9ca724d574d4a595c3f7aed0626342300467b73ad9003392e22fda8abe778158ba5be5a50a57eeef79f8 SHA512 6cad32c40dd3901c4eadb0c463a35ec2d901e61220c333d3df7759f672259f66fc83e2b1ace8b0ef84cbc1a65397f00f9c670ffa23726d8309fa5060512d2c21
 DIST openssh-7.9p1.tar.gz 1565384 BLAKE2B de15795e03d33d4f9fe4792f6b14500123230b6c00c1e5bd7207bb6d6bf6df0b2e057c1b1de0fee709f58dd159203fdd69fe1473118a6baedebaa0c1c4c55b59 SHA512 0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e
 DIST openssh-7_8_P1-hpn-AES-CTR-14.16.diff 29231 BLAKE2B e25877c5e22f674e6db5a0bc107e5daa2509fe762fb14ce7bb2ce9a115e8177a93340c1d19247b6c2c854b7e1f9ae9af9fd932e5fa9c0a6b2ba438cd11a42991 SHA512 1867fb94c29a51294a71a3ec6a299757565a7cda5696118b0b346ed9c78f2c81bb1b888cff5e3418776b2fa277a8f070c5eb9327bb005453e2ffd72d35cdafa7
@@ -49,5 +55,6 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5
 EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15aff3bd9a59c77c41d96576b6aeb77c5e6fa17aceb573d4d1f0518aa703d298eb292d0d157fb843a702cbede1f42c0296 SHA512 446414c8961458b812b768d18afe46d60ef4dd54111d95b99654cfb3dfef592812b30527fdda352a595bba815e0ffea4a813e3291bcc96bacb368267ff837bdd
 EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2
 EBUILD openssh-7.8_p1.ebuild 15333 BLAKE2B 4452bc6cc03ed9fb8242b15894133e6e224e1ac0818688b02bc17850050bc67c0dd8fefcbba66c96bfedc8fb452bbcde7282062ea372d220a2b1d77fb0b48b20 SHA512 bff6000cd8913a885bcad3ffb60bde7760a24d37a4987afd34f4b38d603c8bc72bfe0d07f8f109c238d11e49bed72ddbcbe26838cd9d69b379dbf7521f12626f
-EBUILD openssh-7.9_p1.ebuild 15632 BLAKE2B 132f8a24977b010fbeb62644383d0c97b64887eb67e28f78f319c522550c5cd304ce6636a65e6b4f8034ed29cd8e8dd8bc3fb3bab51ed642e4b4cb8b7f3bc1dd SHA512 cc50dbcbf7a1bbc949fed7f9db7eb442e2d2a6e0e864a8c57dd2b68aaf23949e148ab8741af9e825761c5edd07e3355aba1fceeded3b58103212c0fe1b13c846
+EBUILD openssh-7.9_p1-r1.ebuild 15769 BLAKE2B bd4f5f9e1927d59226c3469f22884c835d158f364f6b74946bd4c5fa551e1cb7715ffad9263b51a9319f44fae352b334eb536dd390f58d44fb6878f936e3b41d SHA512 b338b6e3708e4295a3cf5f8bbe1973fc8164bc2eff79e05272bfccc924a2416c10a7d225e5d5da53a2ba3e3e3c960f16db7561ebf3adca335032910b0154f67e
+EBUILD openssh-7.9_p1.ebuild 15743 BLAKE2B b6108901b97ede2d349729a80d69e9bb9ea059a36967ee1688113c0d17351ecdc3cded6f5e45abc8bb54dc9e1a40ccc78165edca6405a4148d99910f9f1cde44 SHA512 3787f6b671477ae1fd4eb5b6bbd5dbaf8375d36fcfda33b67de402fcc36396b28b221bc9e763b6c5f1ba8475330ee9c15edcf45134c048c7f8faec8e885e2893
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-11.6-tests.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-11.6-tests.patch
new file mode 100644
index 000000000000..9766b1594ea0
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-X509-11.6-tests.patch
@@ -0,0 +1,12 @@
+diff -ur openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in openssh-7.9p1/openbsd-compat/regress/Makefile.in
+--- openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in	2018-10-16 17:01:20.000000000 -0700
++++ openssh-7.9p1/openbsd-compat/regress/Makefile.in	2018-12-19 11:03:14.421028691 -0800
+@@ -7,7 +7,7 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
++CPPFLAGS=-I. -I.. -I$(srcdir) -I../.. @CPPFLAGS@ @DEFS@
+ EXEEXT=@EXEEXT@
+ LIBCOMPAT=../libopenbsd-compat.a
+ LIBS=@LIBS@
diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir-11.6.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir-11.6.patch
new file mode 100644
index 000000000000..487b239639a1
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir-11.6.patch
@@ -0,0 +1,16 @@
+--- a/openssh-7.9p1+x509-11.6.diff	2018-12-07 17:24:03.211328918 -0800
++++ b/openssh-7.9p1+x509-11.6.diff	2018-12-07 17:24:13.399262277 -0800
+@@ -40681,12 +40681,11 @@
+
+  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+-@@ -333,6 +351,8 @@
++@@ -333,6 +351,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch
new file mode 100644
index 000000000000..c30ca2785448
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-X509-dont-make-piddir.patch
@@ -0,0 +1,16 @@
+--- a/openssh-7.9p1+x509-11.5.diff	2018-12-07 17:24:03.211328918 -0800
++++ b/openssh-7.9p1+x509-11.5.diff	2018-12-07 17:24:13.399262277 -0800
+@@ -40681,12 +40681,11 @@
+
+  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+-@@ -333,6 +351,8 @@
++@@ -333,6 +351,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-glue-11.6.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-glue-11.6.patch
new file mode 100644
index 000000000000..b807ac45f79f
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-X509-glue-11.6.patch
@@ -0,0 +1,28 @@
+--- a/openssh-7.9p1+x509-11.6.diff	2018-12-19 10:42:01.241775036 -0800
++++ b/openssh-7.9p1+x509-11.6.diff	2018-12-19 10:43:33.383140818 -0800
+@@ -45862,7 +45862,7 @@
+  	ENGINE_register_all_complete();
+ +#endif
+  
+--#if OPENSSL_VERSION_NUMBER < 0x10001000L
++-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ +	/* OPENSSL_config will load buildin engines and engines
+ +	 * specified in configuration file, i.e. method call
+ +	 * ENGINE_load_builtin_engines. Latter is only for
+@@ -81123,16 +81123,6 @@
+  		    setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL))
+  			return;
+  		setlocale(LC_CTYPE, "C");
+-diff -ruN openssh-7.9p1/version.h openssh-7.9p1+x509-11.6/version.h
+---- openssh-7.9p1/version.h	2018-10-17 03:01:20.000000000 +0300
+-+++ openssh-7.9p1+x509-11.6/version.h	2018-12-18 20:07:00.000000000 +0200
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_7.9"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-7.9p1/version.m4 openssh-7.9p1+x509-11.6/version.m4
+ --- openssh-7.9p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-7.9p1+x509-11.6/version.m4	2018-12-18 20:07:00.000000000 +0200
diff --git a/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch b/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch
new file mode 100644
index 000000000000..58f3ce2922ec
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.9_p1-libressl-2.8.patch
@@ -0,0 +1,16 @@
+--- openssh-7.9p1.orig/evp-compat.h	2018-12-07 17:07:37.929762570 -0800
++++ openssh-7.9p1/evp-compat.h	2018-12-07 17:08:03.923592845 -0800
+@@ -100,11 +100,13 @@
+ }
+ 
+ 
++#if LIBRESSL_VERSION_NUMBER < 0x20800000L
+ static inline int
+ EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx)
+ {
+ 	return(ctx->encrypt);
+ }
++#endif /* LIBRESSL_VERSION_NUMBER < 0x20800000L */
+ 
+ 
+ static inline void*
diff --git a/net-misc/openssh/openssh-7.9_p1-r1.ebuild b/net-misc/openssh/openssh-7.9_p1-r1.ebuild
new file mode 100644
index 000000000000..af3fd632c5fc
--- /dev/null
+++ b/net-misc/openssh/openssh-7.9_p1-r1.ebuild
@@ -0,0 +1,450 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+#HPN_PV="${PV^^}"
+HPN_PV="7.8_P1"
+
+HPN_VER="14.16"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+)
+HPN_DISABLE_MTAES=1 # unit tests hang on MT-AES-CTR
+SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="11.6" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_VER)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-openssl-1.0.2-compat.patch
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-7.8_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" || die
+		eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch"
+		eapply "${FILESDIR}/${P}-X509-dont-make-piddir-${X509_VER}.patch"
+		popd || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}"
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}"
+		pushd "${hpn_patchdir}"
+		eapply "${FILESDIR}"/${P}-hpn-glue.patch
+		use X509 && eapply "${FILESDIR}"/${P}-hpn-X509-glue.patch
+		use sctp && eapply "${FILESDIR}"/${P}-hpn-sctp-glue.patch
+		popd
+
+		eapply "${hpn_patchdir}"
+		eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	[[ -d ${WORKDIR}/patch ]] && eapply "${WORKDIR}"/patch
+
+	eapply_user #473004
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX%/}"/etc/ssh
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX%/}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	# stackprotect is broken on musl x86
+	use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.7_p1" ; then
+		elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+		elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+		elog "if you need to authenticate against LDAP."
+		elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.9_p1.ebuild b/net-misc/openssh/openssh-7.9_p1.ebuild
index 83ff7a4d299d..f39686f32b07 100644
--- a/net-misc/openssh/openssh-7.9_p1.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1.ebuild
@@ -124,9 +124,11 @@ src_prepare() {
 	if use X509 ; then
 		pushd "${WORKDIR}" || die
 		eapply "${FILESDIR}/${P}-X509-glue.patch"
+		eapply "${FILESDIR}/${P}-X509-dont-make-piddir.patch"
 		popd || die
 
 		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}"/${PN}-7.9_p1-libressl-2.8.patch
 
 		# We need to patch package version or any X.509 sshd will reject our ssh client
 		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 3170d20edd83..6f90554d9c95 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,20 +1,22 @@
 AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997
 AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8
 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df
+AUX ovs-vswitchd-r2.service 905 BLAKE2B 4474acd22956b21b6c89133c12013bb22ac2a19f759e2236a09b497a649ade6ea8db270f9a599931d622784109e71cce8ce9b09cef6ccfa6b938a31308eff7d5 SHA512 21e5a20bf469496f96afa13a5517393c1a55c09ae4cad57cb285a816f328ada190161210009e221acea47d0a038212e04ded7bb3f8235e6d6578ad283df7f0f5
+AUX ovs-vswitchd-r3.service 904 BLAKE2B 1a9880154a7628c57838a7d0fcf60d3734f35bef36fcaf6e396da92a35fa80a056bb1122d218f0331cc3382c13433672471dba7d7e711fd4f2ced4803b5623fa SHA512 408b52e74dab747bf83c66e43515868eaddb24de6e914c7ed201425cdc24c731b3d705cf9abf2cfc30c2499b77f2795b72d11f31bcfc3237cca0ad13ca17fc63
+AUX ovs-vswitchd.confd-r2 188 BLAKE2B b38ed709f5d59caed9146df078c26b08d85178e7dd783ecc1f431721a23732fdacad77886ab4387ab94121eebca267b1d628f5a3e2f8c95e11f90b8a260a80c6 SHA512 b1afe4a4095ea78e7a58c69a26c0eac6e944594702364d81766944f7470cdbac09922286b8a8f926aad8ff2e14ee6b5311188d2dc22ea2d8bb9cf28034157135
 AUX ovs-vswitchd.service 393 BLAKE2B 6ca53819e5bda787eeefcf94f76749621da3462f2f92ccd70de35ba407b4dd74b29552b609871d77f85ccca764640555167b40b97d6585b80bf3bbfcb1ae242c SHA512 74d2ba9b76ad29dbb75e9b3321e1e714140a1c9bf9f5176c8418b025ffdb9c14d9f532709835c163c7256b4c81d69b522fcbc12d6bd9399283c8bd45b94cd7f2
-AUX ovs-vswitchd2.service 905 BLAKE2B 4474acd22956b21b6c89133c12013bb22ac2a19f759e2236a09b497a649ade6ea8db270f9a599931d622784109e71cce8ce9b09cef6ccfa6b938a31308eff7d5 SHA512 21e5a20bf469496f96afa13a5517393c1a55c09ae4cad57cb285a816f328ada190161210009e221acea47d0a038212e04ded7bb3f8235e6d6578ad283df7f0f5
 AUX ovs-vswitchd_conf 164 BLAKE2B 89cad03c930c21e3f83a40a27a3ae011ff5be50af74b589a3313d4f4964d7931f0186c9e8a543468e08cd69c1d03f018060840d6c32f072e678b68839cc75968 SHA512 2e65f8658b6120e30849a8b3b0268d7776635c36bdd77920537355fc1883f306d3df5c78d2a5fefffdcf76b093b126f9d315c1595cd0ab643ac5f000c8b4f439
 AUX ovsdb-server-r1 855 BLAKE2B 894b2bd417ad1e8113a0288db59af133e5b705deac982b01fcc9266c7c0387423a1897d55cd70651c3a0407461c641455869ceefe330cc1880abc2cf79516de6 SHA512 fa51b2a661c1bdd345adf58c2b0e4c4c68bb4ed4ce78dc6e195ba9fe662fa451753664c72f56d755cfa682d0c9accd283dc501aee3c4ba58238f44df1ddaf5a5
+AUX ovsdb-server-r2.service 1012 BLAKE2B b3d1d6373341d499d4e6c17b8b786de6a7861b46ed2cc76e526f0a196755408cff909a119862702e94dfd3171eae646f9f807a7b5c1be88e608938c3eff9d057 SHA512 da0deb44efabf3acd144b65bd0e32f1b4a6e6594e0e71eadcd0f98012d998c7bf21785b2bcb6b6f1cf1887836908ec7667161c31c1d827d8e865e95ebba8a591
+AUX ovsdb-server-r3.service 813 BLAKE2B ba16534aaf407121f56e1ffc711dcc87b4c5ee07cc12f74e1d8ca2b7e85fefede4100154ef2031470b68fe5085539984b6b38b8c518fa38a8eb19d8af3a24c1c SHA512 ed3137fb0b26be82f311aa9a56855d91bb113a64fd43ecde8d97979354edffe26ee7712eac91c96b19e56c35a5b4ef2c68acfe5c3c0c0cd21e35745fde41574e
 AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab42fa1c93b079901777bc0e7fca0847427affc5a069e9041297369364f9aa28869f63a463e3646f70f47fd SHA512 cb9196ebdb7f16eca4182172a079027dc2c28f366d0a4f9251480b20172758cb581cd91b9a0f2a3dde95742455bec9ef96aa584305f17bdc97b3de7d4c99aa19
-AUX ovsdb-server2.service 1012 BLAKE2B b3d1d6373341d499d4e6c17b8b786de6a7861b46ed2cc76e526f0a196755408cff909a119862702e94dfd3171eae646f9f807a7b5c1be88e608938c3eff9d057 SHA512 da0deb44efabf3acd144b65bd0e32f1b4a6e6594e0e71eadcd0f98012d998c7bf21785b2bcb6b6f1cf1887836908ec7667161c31c1d827d8e865e95ebba8a591
 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216
-DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef932bdd9e1d463c391e258a2b4461866a897c5063859708126c564e42ef99ab63a4b8fac8335bdc78531c46217abd945 SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470
+DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
-EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B 25c4c0124b2d94e677274712fc03538edf5ba5119eb04fde8f388884bd780656bde4a3b84e349a2741ef626ad858ca5d78cf311ae51e9e32915c8ed5fc2d9d36 SHA512 1f4f103cc13e21105369a7da7ff0fe073776161e40c0e0768a79cd392835ea7d6d077d9128c880ab27f7bba6e7b4e20814f9492774295ad3c3c4cf0e0ac864c8
-EBUILD openvswitch-2.7.2-r1.ebuild 4444 BLAKE2B 7c9830c776d48eb04b7ba492704ab4ca0b6ccd75f8e057b6fa6432896023b14a6757e91f5a2c56eef644e5253e2e5f67ca900e19a2f3a66fd79a38eaabb1c617 SHA512 6db5b15358397de27d6fd396b8468970800c4159ab6ee1a92b74be97f9e0570b0f3393d403437cd76832f61bed3b58a52179f87b11110f24967fe1cb3d871c8f
-EBUILD openvswitch-2.7.2.ebuild 4391 BLAKE2B cd3cd02b18f4b4ff3bb75740d18b6507abb1d1841efbe623b757aca9580843cdbe11bd314707cc650d4a126e9025a4a52cad07669ad1add0652f23aa0de9378e SHA512 6c9f52cb4a2d811cb4a07443c0cb431658b71c6d96d1011d09d5e4ec8e226265cd4bb10d1aa5a60637d0e97904d8c0e3287a28660b52eedca9807ba4b878fb6a
+EBUILD openvswitch-2.10.0-r1.ebuild 4703 BLAKE2B 9d233873e2184567ef3f94a41e54269b8af673e48b1daf2b45bd7a57fb4838e3a700b68cf4a41ad57a6898b85d54877acfdae469c8010f597b7c7cdfaca3be25 SHA512 9e97056a512bba79cdf33226f8e9e4b5a124d740833b3d3ee5c373361979b0b473036b5fda8decfa2e52bf89b390c443aa5f6a27c3c89be7f6791126431e79d7
+EBUILD openvswitch-2.10.1.ebuild 4267 BLAKE2B 2e595b2abafc339f14622976517177b2dc73b715592ceb0a2d7a28d71f4d17bf0fc1f1a211e025ab0b2ead4e35273d8d3e1c7a570c031ee23fecb4e9e2c50835 SHA512 48005f3a8151f3cae2ff93e0959b162a7c671d87d69a99a20f12ddde4f6a4178f1dba076790d22dcad5d9c5ab00677dec3c9cb34db50e408ab27aceaaaeef1a9
 EBUILD openvswitch-2.8.1.ebuild 4453 BLAKE2B cb74b2daedaabcb207cbbd728cdd14ce692e90bcacbd42a826bd71840104fe54f0acdb550c1fe6bd7c7ef372a879b2c4ffad8f8f19a676afe68a1a5047c28de8 SHA512 cca708a57ee51bfa50da1684d2cc28194a293c4dbf7fa366f53b598592197bced2e471fabb8e00dad60cede01c33430080f17dc78bf3fc262b05ae5730ac41b4
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/files/ovs-vswitchd2.service b/net-misc/openvswitch/files/ovs-vswitchd-r2.service
index 3092fdaaa669..3092fdaaa669 100644
--- a/net-misc/openvswitch/files/ovs-vswitchd2.service
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r2.service
diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r3.service b/net-misc/openvswitch/files/ovs-vswitchd-r3.service
new file mode 100644
index 000000000000..165ea3bfbf81
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r3.service
@@ -0,0 +1,26 @@
+[Unit]
+Description=Open vSwitch Daemon
+Documentation=man:ovs-vswitchd
+Wants=network.target
+Before=network.target network.service
+Requires=ovsdb-server.service
+After=ovsdb-server.service network-pre.target systemd-udev-settle.service
+ReloadPropagatedFrom=ovsdb-server.service
+AssertPathIsReadWrite=/var/run/openvswitch/db.sock
+
+[Service]
+Type=forking
+Restart=on-failure
+Environment=HOME=/var/run/openvswitch
+EnvironmentFile=-/etc/conf.d/ovs-vswitchd
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
+          --no-ovsdb-server --no-monitor --system-id=random \
+          --ovs-user=${OVS_USER_ID} start $OPTIONS
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop
+ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \
+          --no-monitor --system-id=random --ovs-user=${OVS_USER_ID} \
+          restart $OPTIONS
+TimeoutSec=300
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2
new file mode 100644
index 000000000000..eb4b6c2f2831
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2
@@ -0,0 +1,7 @@
+# Connection string for the configuration database (usually a unix socket)
+DATABASE="unix:/var/run/openvswitch/db.sock"
+
+# Additional options
+OPTIONS="--mlockall"
+
+OVS_USER_ID="root:root"
diff --git a/net-misc/openvswitch/files/ovsdb-server2.service b/net-misc/openvswitch/files/ovsdb-server-r2.service
index 5ff6f9044660..5ff6f9044660 100644
--- a/net-misc/openvswitch/files/ovsdb-server2.service
+++ b/net-misc/openvswitch/files/ovsdb-server-r2.service
diff --git a/net-misc/openvswitch/files/ovsdb-server-r3.service b/net-misc/openvswitch/files/ovsdb-server-r3.service
new file mode 100644
index 000000000000..a1d308478daa
--- /dev/null
+++ b/net-misc/openvswitch/files/ovsdb-server-r3.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Open vSwitch Database Unit
+Documentation=man:ovsdb-server
+After=syslog.target network-pre.target
+Before=network.target network.service
+Wants=ovs-delete-transient-ports.service
+
+[Service]
+Type=forking
+Restart=on-failure
+EnvironmentFile=-/etc/conf.d/ovsdb-server
+ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
+          --no-ovs-vswitchd --no-monitor --system-id=random \
+          --ovs-user=${OVS_USER_ID} \
+          start $OPTIONS
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop
+ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
+           --ovs-user=${OVS_USER_ID} \
+           --no-monitor restart $OPTIONS
+RuntimeDirectory=openvswitch
+RuntimeDirectoryMode=0755
diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
index 302aafe58fec..8b7c0be030c7 100644
--- a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
@@ -106,8 +106,8 @@ src_install() {
 	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
 	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
 
-	systemd_newunit "${FILESDIR}/ovsdb-server2.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd2.service" ovs-vswitchd.service
+	systemd_newunit "${FILESDIR}/ovsdb-server-r2.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r2.service" ovs-vswitchd.service
 	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
 	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
 
diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1.ebuild
index 9d3deaa60519..1f5b61810944 100644
--- a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.10.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit autotools eutils linux-info linux-mod python-r1 systemd versionator
+inherit autotools eutils linux-info linux-mod python-r1 systemd
 
 DESCRIPTION="Production quality, multilayer virtual switch"
 HOMEPAGE="https://www.openvswitch.org"
@@ -13,14 +13,14 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	${PYTHON_DEPS}
-	~dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
+	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
 	|| (
 		dev-python/twisted[conch,${PYTHON_USEDEP}]
 		dev-python/twisted-web[${PYTHON_USEDEP}]
@@ -40,7 +40,8 @@ pkg_setup() {
 	if use modules ; then
 		CONFIG_CHECK+=" ~!OPENVSWITCH"
 		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		# docs state 4.17.x code states 4.15.x
+		kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules"
 		linux-mod_pkg_setup
 	else
 		CONFIG_CHECK+=" ~OPENVSWITCH"
@@ -60,7 +61,7 @@ src_prepare() {
 src_configure() {
 	set_arch_to_kernel
 	# monitor is statically enabled for bug 596206
-	use monitor || export ovs_cv_python="no"
+	# use monitor || export ovs_cv_python="no"
 	# pyside is staticly disabled
 	export ovs_cv_pyuic4="no"
 
@@ -101,12 +102,13 @@ src_install() {
 	rm -rf "${ED%/}"/var/run || die
 
 	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
 	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
 	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
 
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
 	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
 
 	insinto /etc/logrotate.d
@@ -118,18 +120,7 @@ src_install() {
 pkg_postinst() {
 	use modules && linux-mod_pkg_postinst
 
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
+	# only needed on non-systemd, but helps anyway
 	elog "Use the following command to create an initial database for ovsdb-server:"
 	elog "   emerge --config =${CATEGORY}/${PF}"
 	elog "(will create a database in /var/lib/openvswitch/conf.db)"
diff --git a/net-misc/openvswitch/openvswitch-2.7.2.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild
deleted file mode 100644
index f5dbcf60a924..000000000000
--- a/net-misc/openvswitch/openvswitch-2.7.2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd versionator
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index b7618deb4b92..d433c8d0949c 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -2,8 +2,10 @@ DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d594
 DIST owncloudclient-2.4.2.tar.xz 15409188 BLAKE2B 89ae891479f29c8637843e14e3aa58d91769393dcfedcfaa415a601962eabd4d1760250fa57166fde215e5c0c5b5799b72dc4f1b52814e59149b778d92d5eb93 SHA512 17f857354b270ecde75cae81557adb78dab830589b32df0b3cf96667010f02501d793609cddf57223d1dd3d9cdb493f1f55bcb04a09d05c467afaddfeb2210b0
 DIST owncloudclient-2.4.3.tar.xz 15406724 BLAKE2B 1e8790f9ebb96ba7de5350c3f7be01f6e0a06e66de591b598795c2ea6787d0caf238daae4f56fad5a8695b8c4eeeea62e36b469fecfdc2df7a90f110a7c7a1c8 SHA512 072fafe69a962f3f0892706f8fff9a9af643b479229dc99e95c712071f11942f75ecc08e7a3470a9ac49f0564da23f8fb21097064c9fa8c6ba1c830c32a6c01f
 DIST owncloudclient-2.5.0.10650.tar.xz 16651172 BLAKE2B 98b928963f3327bdcddaaa61eadcd73422e982cda11c4a4791987eb34ce692258af47649dcaddaefd01097bbc3aa514a56726dce52ce6f51eb61bdf493bca37a SHA512 61f355e514306ce0dec628ac8af7ba004158a890bc40c3905e5aa7705aff753a3a723ba4a0727625327b399cc71bb6c1ad2b415acc760c551eea1bf2590392f7
+DIST owncloudclient-2.5.1.10973.tar.xz 16662564 BLAKE2B b0c58fee00e366c2a2e0c7b316fc098558758fc3644fdd5a0f39e29dc853030f1df504536a6725a3557e08024346ed9c3fa3d54e35a4d5d452afd1a34ff6fb62 SHA512 11a16f2a2656517f6c89433d8f5e9e44d61be7cc45eb702fe118a000e32ec2f2c53bab75e2d226bc50106c3be975b34b1bafedbaed757d0c3bd8cb025facf47a
 EBUILD owncloud-client-2.4.1.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
 EBUILD owncloud-client-2.4.2.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
 EBUILD owncloud-client-2.4.3.ebuild 1964 BLAKE2B 5f76eaf7e9a235a59ef092b870dba42de326def85549ebacfe9e903f5f192c8ec82ce5f19a3d349b2017a8b2f36f47209fb45b203933ca92bbf220fef9f68520 SHA512 731ec31418bc8ab853fb2015baee798ae9473500c0aecd0078526a9e4fbb8450f623e19e6f465cf3c02c4fbe2832d41c12a41dd4764ad98b0e42b4fc8ec36b9f
 EBUILD owncloud-client-2.5.0.10650.ebuild 1961 BLAKE2B 1febde1d3ca49b463c6f05b45e42178a6bab1b104e3cc00986a29d3f3037bc05a9ddc7df94fc0e3d0c3742cc02af0a6b1975fc8857ace251a28ba27fece66061 SHA512 7afaae30ccc8fdb53e812f54c2d2c01c1960d07e990cd470a067a0679d6c005f38791c8333954a75d9c3dd4e99560d5e0a4d7a39ad1d5d33c50e715ae87c6498
+EBUILD owncloud-client-2.5.1.10973.ebuild 1961 BLAKE2B 1febde1d3ca49b463c6f05b45e42178a6bab1b104e3cc00986a29d3f3037bc05a9ddc7df94fc0e3d0c3742cc02af0a6b1975fc8857ace251a28ba27fece66061 SHA512 7afaae30ccc8fdb53e812f54c2d2c01c1960d07e990cd470a067a0679d6c005f38791c8333954a75d9c3dd4e99560d5e0a4d7a39ad1d5d33c50e715ae87c6498
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.1.10973.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.1.10973.ebuild
new file mode 100644
index 000000000000..221362c5f1ad
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.5.1.10973.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index ea62b4342e84..94cbffe5283e 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,5 +1,7 @@
 DIST pyhoca-cli-0.5.0.4.tar.gz 32486 BLAKE2B e47799519715c14ba89f8696ed8d394248397548ccbd0dcfc514d8c8ba96071dfa12a191eace4cc6f92aeaeb8fd0b17addf471e6f11d5ffb4e456977d38c7e14 SHA512 6dadbd01922f9957469c2f401a6b1d7da4ad7bfa9c82f38d951b230cd880b826e96a63cf3d244d27299ea9bab4d1f42239a2f0d73702e62eb4859a52c25158bd
 DIST pyhoca-cli-0.6.0.0.tar.gz 40513 BLAKE2B 203ba683c65a77c8f136ac65fea156e938b86b8338dff4c39c5b0ab9368a5e0b1e845e4862b9d95fd02cec9484691b9b11b6d2dbd41cc8a1089e32a4e9c9d717 SHA512 a6e2504cf40eb847db826eb016bcba4ead83f5b8d45de8c251c4c3b0f4cef86dbdfe4c8663f900ce9afe6fef868e67ff5ab1e3222179d19afcc7d0233b4804c6
+DIST pyhoca-cli-0.6.0.1.tar.gz 40816 BLAKE2B 719ca6f277cfd2ecd2100e1b34e1c0d4d7e6849eb0b8f39d2a1628878b4da1bdcc1db622144d815347c33e0148d7fd6303caa661f146e18422169d7ae455c993 SHA512 65ced3bcb6e8fc15d22b0abc760a981af66b10325278613a9276de16c1e73d3b8d325b57aed9d4faf43a6d9eb8167045716c2974d4f6563c7a51df8ee66a69eb
 EBUILD pyhoca-cli-0.5.0.4.ebuild 632 BLAKE2B 2fb2dc256b574eb5c0513aea1dca34e4da1bfab381e79c52c050671d58cb181012feae8fbbe551b8681102dedbad602b3f98fda72b9037bd270ac05a5fd86ce3 SHA512 f8f04b7e2eefe51364fe3288037eca80ba02fb5b254824d5504802d9b14e54324d3b88989a02354535b138a14cfeea3fe7bb7dde670f395f601d80cf1c0248c1
 EBUILD pyhoca-cli-0.6.0.0.ebuild 676 BLAKE2B c3c543015469c793dfd7c3d4679c2668b8cb951c2a6159e28ee7af9d69a4a0282ab56d772ab88ca7b78256910110c078839019c8206d446a0700f03f6f4bb689 SHA512 3f10663f7eb34e17dbf511f4976b95381a55df5d3ffc20e66e650e2a017bcf6dfe0bf1e3932405e33f9cf2188f0fd0fe4c6d357586f083821ff6f9a7c9cf2f3e
+EBUILD pyhoca-cli-0.6.0.1.ebuild 676 BLAKE2B c3c543015469c793dfd7c3d4679c2668b8cb951c2a6159e28ee7af9d69a4a0282ab56d772ab88ca7b78256910110c078839019c8206d446a0700f03f6f4bb689 SHA512 3f10663f7eb34e17dbf511f4976b95381a55df5d3ffc20e66e650e2a017bcf6dfe0bf1e3932405e33f9cf2188f0fd0fe4c6d357586f083821ff6f9a7c9cf2f3e
 MISC metadata.xml 521 BLAKE2B 07e613991af22f75609d554e9c533773fb4ae1b00227c717dde027b16cc14c5a31c0144b8970dc8095e2eabd62d3bff0578b290489eb44787611b860120ed35d SHA512 7be8e7f29191fc70cfb2c9f3482dc536803ba374996c52fb8c7011c60c0f7de0b10ab333792ee59b391d04e8a74bd778a30db7a6722118e612db232567527959
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild
new file mode 100644
index 000000000000..858a77c4648b
--- /dev/null
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go command line client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.6.0.1[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index 6c2ba6fbb609..00fb1ac6a8a9 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -1,5 +1,7 @@
 DIST python-x2go-0.5.0.6.tar.gz 198236 BLAKE2B fb39afe9dadf104c8e348ad699539522977da839c8db2df23b3b976e7603064c4882d1a058e194847553e3a2c3e614e242e5fc0bd117f55594e7de0d682d9ed0 SHA512 bad064490ed1b30ec63631d4e6af4ad133f4f1049e60f345dfc0a45abfd5d54a54556953baeae40bb543573d23987da745ad67bf6270f28be4dd6b130a05a9f2
 DIST python-x2go-0.6.0.1.tar.gz 243623 BLAKE2B 60d0b6245d089f168bfc8c47f6360f53cecf5553de04a741d5993c2a78875bbe4367ae5c6d430b472df1870ed3b12cf9a11a046081fe1272d634ee1a46ff2afc SHA512 d4ee7b6d8a6efa8c6071cb5e899c624e3f4527ab8da85c4a088ccee02dd518da0da2d49b5cfb4940f585939b5761ddd9aacb00cb82e2c21c5b22cebc2d0575df
+DIST python-x2go-0.6.0.2.tar.gz 243857 BLAKE2B 9e64ed5f28a231396ea5322c51942814df2d80f1df092c1a33b1884bbadcf4b27b8180b3a2f9b07001ac3e90ab2e65bde594f83d3adadcc788e0236d738bb746 SHA512 883c26b01bdcab9e57f4ef4ac5a980f849cd2df849c77d1b82e11bbb1872c6e97f3ff8b02c841d8e3acd425f3f55da2613d31a3876ffcc91545195aae5f88d77
 EBUILD python-x2go-0.5.0.6.ebuild 591 BLAKE2B 9f661376976d06605f0480d3396cfa9486031f491c4d1561b4fae07f44e192c1f85b072f11613eee45d7a4e6d4ddb739b01296170671012221bb0a7abc239d0f SHA512 fbddfe4f5dae098c33f30047d369d3fb9d0c2d9e367200396b9ff7f1f095c5b45d5be316bed423547e6b1ff69392cce6cceccae7bfd508ced473d945d6bed1fa
 EBUILD python-x2go-0.6.0.1.ebuild 602 BLAKE2B ce7d2e0dabc87fc36298214494bb95b000823f561a13d9d453b888bc0d929252bf3ea730e4b8ab145ab003b5df75252f8274b864cce9fefd7d8bb038a5e43148 SHA512 b94fd3a989739df4c8badf16bcf0aeb927536ac310164d991cc8cfca26070b55072ea286f83ce1954e41a7fdb4e8faf415fe140b012bbf796b62ebce7485752e
+EBUILD python-x2go-0.6.0.2.ebuild 602 BLAKE2B ce7d2e0dabc87fc36298214494bb95b000823f561a13d9d453b888bc0d929252bf3ea730e4b8ab145ab003b5df75252f8274b864cce9fefd7d8bb038a5e43148 SHA512 b94fd3a989739df4c8badf16bcf0aeb927536ac310164d991cc8cfca26070b55072ea286f83ce1954e41a7fdb4e8faf415fe140b012bbf796b62ebce7485752e
 MISC metadata.xml 483 BLAKE2B 556d85d173fd848484a7ede8e26d1b66fcfc95c49c1231b12273a6e8bbc42c4421fbc1933f7aefa846369f474caa25163095774daf6be7680c6b3b79b09c3e67 SHA512 42c6decd895d3cf1097fc1e9a4a8eeeda0fff769a74fe4a74b17ba2943c76b63bc243d200b08d050aa1e778f3ee71f8a504f59384c79a54b220c7a022b23bc6e
diff --git a/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild b/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
new file mode 100644
index 000000000000..e9d9ddc2fde1
--- /dev/null
+++ b/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go client-side Python API"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
+DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	net-misc/nx"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index ae0c651d3233..3bb8e3e23920 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -4,7 +4,9 @@ AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33
 DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
 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 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
 EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
 EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 1e52884869bea88c8128249c395226fa4b67ffa574b23ee0dd336d6c59f0af050139617a0688e4875cb0633d9032898a7b754f57be37f6977ffccfd8e9d5d3a1 SHA512 5d2d9fe18a2a4a03521b47ede6209791871d361dd00448a2c668a9740dfca834246d4af1b01bf4dd35d1198a3c7359ff911cbdad9c0a4a77e39a2e560d900704
+EBUILD rabbitmq-server-3.7.9.ebuild 2995 BLAKE2B 78f3dab75df9ac4c5f7ca74920678e841cacc5633163e4e2a6478a7a53337417dccae86784132cdeaf922cb6d4bdc4c2de683a966aef4ab7615350aecb67f2aa SHA512 c42215c89935baaf78cb0fcc6c438b8e6552317b9af0f13e4f3daee581f25a3ff346f7027fb5469ae751dac0d10094c0298345c07bf91282463b6fce1b5f96f2
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild
new file mode 100644
index 000000000000..06a77b030f39
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 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="http://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"
+
+RDEPEND=">=dev-lang/erlang-19.3[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-lang/elixir-1.7.0
+	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 "http://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 "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index fd01deee27f7..48b5060dde09 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -1,10 +1,13 @@
 AUX radvd-1.9.1.init 1541 BLAKE2B fadbd829fdfe7e480e6142f07853e45ce1f11ed6ecaf2ea82a898dd6258a5d85c74c8b686130c6e48f7d78c1bd337e645ce5c0a95d85fbc96617ad9baf15fd56 SHA512 1c2bef4f39c14b4244f10b5ad5a5bebeba62bf3f60da78511151713d0f29a03a2736055f84bbcd18f0b3a5dd3fb02accb81ed078105b84ca34d0dca931348d65
+AUX radvd-2.14-headers.patch 724 BLAKE2B 88dd2ebaa50e627755650d0054c4240e5ab46059f5197cbdf3e031d377dde0d2e6ea61680b6544dcc60d9cc8135253210e920e2643caba9503869e064c8ea8a9 SHA512 758a25830eed2b10c5aab18b5a670a482ed312e54c105b449f904c88737afe437c015926841b3f78bc4095e824b9e6fb4e2cfc8eb7426a7cf14481f3f58af049
 AUX radvd-2.15.init 1537 BLAKE2B 6ca0db1eeeee77c345e4a5d9ee75d4e4fac188e3e19b153cff748c2b3a6c95960e8c360168b32a0f2b860bf40c21de86bcff1cfb69b2f70e7ce005e46f5d532f SHA512 cd3a6527d7b323266748cf674090419e89dc153daf883601604d040fceb55850d551e44371ba383a2bb98adaf361311969d1eea94a9f3ec1bf8c11aad54aac8e
+AUX radvd-2.17-nd_opt_6co.patch 2240 BLAKE2B 45c096fc406d31d9a9edca64c6e24005ac0b73b13acdf7a73fefe39f6212e574d3eca342d90211df65255763fe40771d4836b3f5b060e4e3875a865e571c2e49 SHA512 0732d403e416fc4b3ed3f322c90b3d5c98adaf7b4fe0af05fa5ffaf3845f5047b0997f03065889c6272e57d3a09088a6beb99692cb9e4efc660638f586c4dbf3
 AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401
 AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
 AUX radvd.tmpfilesd 30 BLAKE2B a1c207296debe31a4fb25c7ec52202b679e41fb9b73658d278e5e2599cc12b2b1b48ce53043ef89210cc18ef445c8c952e498bed43cc474b698581777843017f SHA512 d126bc90083e0f8aefda8cbd3cd01ecc9beb0eb05713c2d9fb5315bc10337d927b3c9e52c390e35799d1421078b365793772a712c33028be35280cd083cf65c3
 DIST radvd-2.14.tar.gz 211461 BLAKE2B 0acdd23d1606d7dc5df3a8c8e2d3be7f6178bde866b9463b2a645a78b4ed710e8c60bcd32eff9456b80a993c3544a71721199298fccb184b357bc2ac51651f55 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02
 DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
-EBUILD radvd-2.14.ebuild 1706 BLAKE2B d9945809543964b856b8d30cbafdad388bf48fe37cc02dbb28b3ba245ab0a581b8d5389582e416f944626218b52c6110c09488fb66259335de0edc276fcf9e25 SHA512 8d0035cb5309556841e87769b6839ded82e0fa17b7664eb7a732c8cc31561ceb0482d2ffe687ff80fc65110e9e6ec6753152c99b9ab6a7722324734137b989b8
+EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce363ed3fe36780ee803676aa6ab3d650ba8d48bd8f5fd1f2207a86486916edb831d16c723511bc9d907d71ba SHA512 7f7e28f4d4b84e088fb60a50c26ce2a42eb3ddbcfce094f035d779a01aa235b27e24ed590646ab186f2faec854e6d13f5b2c32e0e580d76dfc6d08ba5e4f9550
 EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8
-MISC metadata.xml 358 BLAKE2B 70f1eae6d5cf08ab6f32571544ff2a4ae7169bd493a435cf03faf038f7aa1fbe5f14dad4a19e468b2ab6577a18340489f547420bb4551288612b7fe23ea468ca SHA512 3d5a0cff9bc15adc735715969e1d5e5dbb88d1b938f12291b5e1f2b63e5eead0e598b6abb71a740867551f28a50567c4006a77fde240603aded2d956ad784485
+EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206
+MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/net-misc/radvd/files/radvd-2.14-headers.patch b/net-misc/radvd/files/radvd-2.14-headers.patch
new file mode 100644
index 000000000000..36f6c3b7de4e
--- /dev/null
+++ b/net-misc/radvd/files/radvd-2.14-headers.patch
@@ -0,0 +1,26 @@
+Fix build failure:
+    recv.c:17: /usr/include/linux/if_arp.h:114:8: error: redefinition of 'struct
+on modern linux-headers.
+
+Patch by Murilo Morais
+Bug: https://bugs.gentoo.org/625236
+--- a/includes.h	2015-11-19 10:58:52.000000000 -0300
++++ b/includes.h	2017-07-15 09:32:17.024877205 -0300
+@@ -86,7 +86,7 @@
+ #include <net/if_types.h>
+ #endif
+ 
+-#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)
++#if (defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)) || HAVE_LINUX_IF_ARP_H
+ #include <net/if_arp.h>
+ #endif				/* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */
+ 
+@@ -101,8 +101,3 @@
+ #ifdef HAVE_IFADDRS_H
+ #include <ifaddrs.h>
+ #endif
+-
+-#ifdef HAVE_LINUX_IF_ARP_H
+-#include <linux/if_arp.h>
+-#endif
+-
diff --git a/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch b/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch
new file mode 100644
index 000000000000..09fb29f9e318
--- /dev/null
+++ b/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch
@@ -0,0 +1,48 @@
+nd_opt_6co: fix serialization
+
+Bug: https://github.com/reubenhwk/radvd/issues/77
+Bug: https://bugs.gentoo.org/637958
+--- a/radvd.h
++++ b/radvd.h
+@@ -261,5 +261,3 @@ struct nd_opt_6co {
+ 	uint8_t nd_opt_6co_context_len;
+-	uint8_t nd_opt_6co_res : 3;
+-	uint8_t nd_opt_6co_c : 1;
+-	uint8_t nd_opt_6co_cid : 4;
++	uint8_t nd_opt_6co_res_c_cid; /* [ res=3-bits | c=1-bit | cid=4-bits ] */
+ 	uint16_t nd_opt_6co_reserved;
+--- a/send.c
++++ b/send.c
+@@ -621,5 +621,5 @@ static void add_ra_option_lowpanco(struct safe_buffer *sb, struct AdvLowpanCo co
+ 	co.nd_opt_6co_context_len = lowpanco->ContextLength;
+-	co.nd_opt_6co_c = lowpanco->ContextCompressionFlag;
+-	co.nd_opt_6co_cid = lowpanco->AdvContextID;
+-	co.nd_opt_6co_valid_lifetime = lowpanco->AdvLifeTime;
++	co.nd_opt_6co_res_c_cid = ((lowpanco->ContextCompressionFlag ? 1 : 0) << 4)
++				| (lowpanco->AdvContextID & 0x0F);
++	co.nd_opt_6co_valid_lifetime = htons(lowpanco->AdvLifeTime);
+ 	co.nd_opt_6co_con_prefix = lowpanco->AdvContextPrefix;
+@@ -637,5 +637,5 @@ static void add_ra_option_abro(struct safe_buffer *sb, struct AdvAbro const *abr
+ 	abro.nd_opt_abro_len = 3;
+-	abro.nd_opt_abro_ver_low = abroo->Version[1];
+-	abro.nd_opt_abro_ver_high = abroo->Version[0];
+-	abro.nd_opt_abro_valid_lifetime = abroo->ValidLifeTime;
++	abro.nd_opt_abro_ver_low = htons(abroo->Version[1]);
++	abro.nd_opt_abro_ver_high = htons(abroo->Version[0]);
++	abro.nd_opt_abro_valid_lifetime = htons(abroo->ValidLifeTime);
+ 	abro.nd_opt_abro_6lbr_address = abroo->LBRaddress;
+--- a/test/send.c
++++ b/test/send.c
+@@ -311,6 +311,5 @@ START_TEST(test_add_ra_option_lowpanco)
+ 	unsigned char expected[] = {
+-	    0x22, 0x03, 0x32, 0x48, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x00, 0x00,
++	    0x22, 0x03, 0x32, 0x14, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x00,
+ 	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 	};
+-
+ 	ck_assert_int_eq(sb.used, sizeof(expected));
+@@ -336,3 +335,3 @@ START_TEST(test_add_ra_option_abro)
+ 	unsigned char expected[] = {
+-	    0x23, 0x03, 0x0a, 0x00, 0x02, 0x00, 0x02, 0x00, 0xfe, 0x80, 0x00, 0x00,
++	    0x23, 0x03, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x80, 0x00, 0x00,
+ 	    0x00, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
index 8307f5e2d4f5..3ffdeb4af3b5 100644
--- a/net-misc/radvd/metadata.xml
+++ b/net-misc/radvd/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild
index 866364355569..2dfcb3af875c 100644
--- a/net-misc/radvd/radvd-2.14.ebuild
+++ b/net-misc/radvd/radvd-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,6 +33,10 @@ pkg_setup() {
 	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-headers.patch
+}
+
 src_configure() {
 	econf --with-pidfile=/var/run/radvd/radvd.pid \
 		--disable-silent-rules \
diff --git a/net-misc/radvd/radvd-2.17-r2.ebuild b/net-misc/radvd/radvd-2.17-r2.ebuild
new file mode 100644
index 000000000000..aeaf39fdd2b1
--- /dev/null
+++ b/net-misc/radvd/radvd-2.17-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user eutils readme.gentoo-r1
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_FreeBSD selinux test"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nd_opt_6co.patch
+)
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/run/radvd/radvd.pid \
+		--disable-silent-rules \
+		--with-systemdsystemunitdir=no \
+		$(use_with test check)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/html
+	doins INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/rancid-git/Manifest b/net-misc/rancid-git/Manifest
index a29f46086b1a..74935dbb1077 100644
--- a/net-misc/rancid-git/Manifest
+++ b/net-misc/rancid-git/Manifest
@@ -3,4 +3,4 @@ AUX rancid-2.3.8-config.patch 1241 BLAKE2B 8d03211285ecd05d277cb5d1e60f3ba3f91ea
 AUX rancid-2.3.8-mailprefix.patch 5878 BLAKE2B 87d5ef27a2194eb746006e0330b562a22d7801ec9954e248b41417defddc2ccdaa92a7c9b220edb6f1aba312e43e8e5cfe16b4ff47893538e781e3aa9a896abe SHA512 c01cdaafd599c8b1559b158ba0999c1e79c40dc4c8f6c0f5aa284225a5903ba967b742cee7d81f2edeb07c6e7e344c1208c018421c023a7f678204c647f3e8bd
 DIST rancid-git-2.3.8.tar.gz 388121 BLAKE2B b485688efdbc7b2ab2e8d9dd5f3b3ca6acfe5e443140be46962c9e36fe8632f0df9457b20719d46aed08d50f1ccc1a7f56898c2d3373dc2e66400bde566f6867 SHA512 14a4fa097a31e2772d83e72cdcfb5488bf3e1c69e8065286c52eb554a392eb4257a0dc38fad5d79819fb417e699fb4e2c265ef5cfbf018418d9550eb653fa551
 EBUILD rancid-git-2.3.8.ebuild 3164 BLAKE2B ed234b18c4e30ba98c5230b9f29cfce931768a77ba063a9b29996de3ba8100f46b05db7e7a7bf8c9e346ba05ca418a922d77a415a9e368ecdf47c9712580539b SHA512 8f87a0a3b17b45caaa993f34c10c01872bffab07370f04d5b352d06842f263e335c338d02da32113f8e1237b303ebae92798bd9beced96bb0b15d3e24588c7ae
-MISC metadata.xml 413 BLAKE2B e24880c21f8e852552803737d287411d2ad47f27b40797f40481db740c8d39dcaca8ba824c35407d53c847ef26251411f9b7caf709274fe2a119c0410ec401f9 SHA512 887715c012718cea48bf69565b4c5f7e3f89567c6996f971add6ff83bc8776157cef639cc6893c311c8599c363d1184a1cf8a7df3c1bf5eab6a8ac5fa3386ca0
+MISC metadata.xml 337 BLAKE2B a9da9ae98a2b21fda7585b3d839d7f7e213dfea4dda145a76632195fd49351f9d22ae9c81dccaf6f1f5444e3db49b7cddb29b6185cb8d135fc32fce234ca1c13 SHA512 b370676f1152d07705974bb833ee38ce51b0b563b8b3e942ac893469242b8c41fa5588362a0c908597491e2ec3774a771eecd9d72fa893e7077084b4c8fa76fc
diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
index 4db7e6baf41b..08681bd3b2be 100644
--- a/net-misc/rancid-git/metadata.xml
+++ b/net-misc/rancid-git/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="git">Enable git (version control system) support</flag>
 	</use>
diff --git a/net-misc/rancid/Manifest b/net-misc/rancid/Manifest
index 96eb02e47320..8e4d7ebb84a7 100644
--- a/net-misc/rancid/Manifest
+++ b/net-misc/rancid/Manifest
@@ -3,4 +3,4 @@ AUX rancid-2.3.8-config.patch 1241 BLAKE2B 8d03211285ecd05d277cb5d1e60f3ba3f91ea
 AUX rancid-2.3.8-mailprefix.patch 5878 BLAKE2B 87d5ef27a2194eb746006e0330b562a22d7801ec9954e248b41417defddc2ccdaa92a7c9b220edb6f1aba312e43e8e5cfe16b4ff47893538e781e3aa9a896abe SHA512 c01cdaafd599c8b1559b158ba0999c1e79c40dc4c8f6c0f5aa284225a5903ba967b742cee7d81f2edeb07c6e7e344c1208c018421c023a7f678204c647f3e8bd
 DIST rancid-2.3.8.tar.gz 379908 BLAKE2B eea909cd486086d436bf9bf8d7eb287471fa0af2a2a257ba9974adbcc01fa946cbc0173e7d6e93842eaf3dac321abaad2db2ec33a0e625b50b401e9373715b23 SHA512 cd071670e160f2e8268e676ae92b0d982719a2bc306aef3ef8fdbbaae398854178613eee2a139f206e799eba6c0b49dce2094db69ea57ef938e5d0c2c294a3cc
 EBUILD rancid-2.3.8.ebuild 3035 BLAKE2B b0632e2847e5f3a452367d428d5af48278973365f67401ba02dd0043cff532f953a2a97ae78984dfc77ce19e53c7a885c281f6e1ea2030f46edda395504b4d11 SHA512 b5d74ea75f21903bf77cbec3fbc81afc3e61ddf41e6c5342967dc21387f398bd8fb5dbd6856d5f557635a8e8997149a1b0e60fa15a3e2e512581dfe86bdbdbbe
-MISC metadata.xml 239 BLAKE2B d243069880f9225abf8b77145dd8c9edbc49f9cd3ce91b8995f16aec20c74534c9e8941a0886c01ee4a2cac5dea72653b8be1b08033252e9f81a76ca9b78bc32 SHA512 be29819db58c3ddb7212a488f9965de11cb5d84223ccae9458e968425296d3ef0f93f20edf7b4ab8a4dda6c166c4104c8b615c82feac5d87b3364a88de591a45
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
index d04de4894ede..6f49eba8f496 100644
--- a/net-misc/rancid/metadata.xml
+++ b/net-misc/rancid/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>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index d058a7639f0d..5d392155eeef 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,6 +1,8 @@
 DIST rclone-1.42.tar.gz 52702474 BLAKE2B 35def37dfb44a9fccabf0f6c3d0106da58bd1468a0c73e8b0a911e9bad48c6da58d303726544c76464230714af68d1727336eb9a4858337b346630f5df147a08 SHA512 69fadc1bc661e6278e461a16b49fb473bf2e35ceb85704c2b92e252422d372fbbbbb9d188cf9cb58d55b6d6c8267c599ea0d8a79fb4edb4a7bc0bac61de3eae1
 DIST rclone-1.43.1.tar.gz 15965941 BLAKE2B 5bf0ac08ca75abfdf6bbcd8f5725b0ab3aa543c7dac043feaf301a6c0a23090c61086e3c16e674bbc2c29d7dff7fc19e7759c70e5990afb2ddd72e5610295cba SHA512 7da3b285a8ed401de95ec0b8bea21ca3db0313eb2012874b10fb65c4441311ba4b24b7dd3ea68a7bce17206ac065f091d2f6ef6a9662fe0111b9f00ff58e6c17
+DIST rclone-1.44.tar.gz 16362501 BLAKE2B 28b4e444b83f361ae641eb7b09e150d46eaac09dd777e247e38f3e708a18e8e58d6a1c40829aba1c44c6c37e733dced2eae069a9b6e725adf0785b7c9959e47b SHA512 1207316ed12646a4ec5f9795d5cca1de9d2fa333f60a8b6dd157462813e2e6ad9ebf85d3d20b9b881d11dcd9ac162b5a674a53ff2af15a452afcfc04f7b34f5b
 EBUILD rclone-1.42.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
 EBUILD rclone-1.43.1.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
+EBUILD rclone-1.44.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
 EBUILD rclone-9999.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.44.ebuild b/net-misc/rclone/rclone-1.44.ebuild
new file mode 100644
index 000000000000..2c530609ee7b
--- /dev/null
+++ b/net-misc/rclone/rclone-1.44.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-misc/secpanel/Manifest b/net-misc/secpanel/Manifest
index 2eaba74b3786..7fcafdc3b422 100644
--- a/net-misc/secpanel/Manifest
+++ b/net-misc/secpanel/Manifest
@@ -1,3 +1,3 @@
 DIST secpanel-0.6.1.tgz 51417 BLAKE2B ebabd11ed218cc9c7816f996f7d424058b433f6be2d07d61be47a8c5fefa1a244cda243ceb2899d90ad3b7547d152c021d4c850980297b3657a1d62eaee190d0 SHA512 9cb654c1aa1fbb81c948b95194bc6198df0e3411e39bef09156d516c5ed2980ea364dc2f60e1549e6224e738a6bdeee26fa8e091aa3ba2d8e1f1fd2cc59c4ce1
 EBUILD secpanel-0.6.1-r1.ebuild 1233 BLAKE2B 1cf4166c87e2a613c2b66930a235422a1a7dd306ad1dfec2d90c67cf62cb1d5c0ebcfd56f2eb8c1860f678c608fc7c5d69091184a62f5b3cb702094bc4fdbe11 SHA512 c11245a0c0917efbf47105fbf40a696df70469b1f7bd26ebc7f7dc1cb653254a12c7c11b1d34577e8e4d7edc4df0f2fa8b0cd13c324fb063479736edcff67a76
-MISC metadata.xml 499 BLAKE2B 8f8975291bb6151ae85cbff5bc446ef83162c2504013d36cbe1e6a35dd775e1a86c105d7e79faa6accfbaa4dfff016cdc42fa4bff46705317f89608004f2f170 SHA512 a1fdac19839b1b04a73dae93e202c7b17916f0fadcc07653182c2928b4abee4fcafa64ea9faca2237a5cfac4cc2522b2139012b835720a7b01650e01022b0eed
+MISC metadata.xml 423 BLAKE2B a0199154e9c3000e3b87f96f292a8f3dbba2cfd83db6acd49358550d3cce7e934c4c2f9860faf76b797c5940883bbec52a5ad0854ba1f870d32490df8e8377ce SHA512 4f7214bbffb870f731d97c952c99afdb73b1252d3bb5d4d1589bf80d19a3e1a8fa69c76d28caa4127eca886e13679454ef427223a9a2736b0888fd281268c4b1
diff --git a/net-misc/secpanel/metadata.xml b/net-misc/secpanel/metadata.xml
index 15e1a0cb3d07..1b85bde1b114 100644
--- a/net-misc/secpanel/metadata.xml
+++ b/net-misc/secpanel/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		SecPanel serves as a graphical user interface for managing and running
 		SSH (Secure Shell) and SCP (Secure Copy) connections.
diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest
deleted file mode 100644
index b6434546fd72..000000000000
--- a/net-misc/siproxd/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX siproxd-0.8.1-amd64_static_build.patch 1280 BLAKE2B 2db477566bcb0e2da837bc2df263eac3a5be3fbd999177ee6369ea655724bad4965a1a48948f316e47a8179cbd5b2e9f1d4fae44300e562c97dd15e3c65228ee SHA512 d29f9d48127fa10e17a50c364ca2a50886a88e3b449ff2ef68ac08596d8f1cb84a5b088d888a76c79391c571ed506934fd2add6136ba10ee6718ce686ae99bd7
-AUX siproxd-libtool-2.4.patch 412 BLAKE2B aa2163640b6e1da95921b0076d5b80c979c1e496774224d1f23ffcfcf3199c8079692673c7622b1587a1c30ffbc0f5c2dcaff59bec3bc0706f79a7394f46dccd SHA512 7ea24a99d65ecc8586473d49b7d485f27634c54290b23821313b1698bb495cf96db0b997d8cb48673a6291a538d5d31d1ee3089187c3d4f500727bc857de5f0c
-AUX siproxd.rc6 585 BLAKE2B 4407089b32fa67d14af2e8d092e882478f4e61d74c1243d002f1a7828458cf1a9ee9ff235c204f6234c5f982491b44df2ea1f1293ce0b89daad30f7b0b7daf09 SHA512 2b15ad14121ad20dd72fed9a8a1d41b5bb4185c8ac2bb546acb589be3ee1cd9229a7cda687769a720f06c0d329874bb34543250deec14ad2ef1240ce0d9c7cee
-AUX siproxd.rc8 464 BLAKE2B a82b921f70f9c06d9760b97dfe4b791a862d3b3980cf5a4c024a2ccafaffb6a26df19344f1f96364dc8e93d74d0d4dbecdb1c8070afc5a310f45152cbb5b9872 SHA512 0c7deb87eb9bc0ad6b31b021c4a65fd30d9a79effa993b79954381bfde6a232ba97c82eae01ad0464916e9ee1ba00f6a731460091706aa02a9876a3335359248
-DIST siproxd-0.8.0.tar.gz 824404 BLAKE2B 5a53d80dfcfe81070c73a37de95290bce59a3a7d5aab61ce90da587daf422f87932f26d0007f07d4abefe2526b91db8914bdf1944316e58b99734d89d4918a33 SHA512 eb14a6f7a893e3347d316feedca89c1700e2977b9671da7d77c475993137b049e5caad5254e19dc00f5cb4f0f0c767188cdfb02bb16238dd7b56473886063440
-DIST siproxd-0.8.1.tar.gz 833170 BLAKE2B 8e1ab78b98982140d3987a8383e91e1881e6ddd3645fc47d46747939391a3a0e10d457c10b41a526a478ca0969dd730be40103dc63db19c3593294c3b0070f66 SHA512 b47c7b74b4d3adeb4fd9536f82c014a123a6fcbe508a4982c9e77e53a8c68b05bc32799f57cf749e860b3e1f19f6502dbea561a410975f9f095754748515964f
-EBUILD siproxd-0.8.0-r3.ebuild 3331 BLAKE2B 1b75071a06246c61c7fd8ab9c3a89fb34ffcda1e185cea68c1bc7abdcd282cbd2bf1ae7ba162283099f80ecd7199680c8055626102315beee161cbf1fd85e9d6 SHA512 8ee67a2fc081fb8caad2eacc88123e8a7f6518988e1a45baee94a48c7e1133ea32628881d9c3c332c7281fd2ac19f5a6157abd6d40546544e0dc3808ccdb55b7
-EBUILD siproxd-0.8.1-r2.ebuild 3412 BLAKE2B 61b2f40f9b791c9235049e7e6b38c89101e16c4182847eed5f6c7318d5820d38670072068d3cca0b6ac7e3bcb84f0d43b5ab5f97de663326a36ef66d7ddf7451 SHA512 95b1325ad7d9bda11af3caed40ab59a67c5d1c9af6e3eac4f91431f8b4c37f6ce591164d1addaa616b179113d5b9608bed2ce555e59d864af2572f77b7a8437c
-MISC metadata.xml 244 BLAKE2B 4adbafcbe3f9af57f743a50db01452f29f165435a1905a2460183a1e7ce0b92f620df57702be063094bce16a8f99f3d56fa8445c704f89f3a6625192a5a401ec SHA512 8ced66f9a1e5533891a0142222723fab44ddda99a5d00b8f880e961146cb2abbd076005db790cab522be24d5cdec5a391d6a3942c1497450efcb30774e180c97
diff --git a/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch b/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch
deleted file mode 100644
index af491c167da1..000000000000
--- a/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- siproxd-0.8.1/configure.in
-+++ siproxd-0.8.1/configure.in
-@@ -361,8 +361,9 @@
-    dnl link statically to this lib
-    dnl (this probably only will work on linux yet...)
-    AC_MSG_CHECKING("where I can find libosip2.a")
--   libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \
--                        /usr/lib /usr/local/lib \
-+   libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \
-+			$libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \
-+                        /usr/lib /usr/local/lib64 /usr/local/lib \
-                         -name libosip2.a 2>/dev/null|head -1`
-    if test "x$libosip_static" != "x"; then
-       LIBS="$libosip_static $LIBS"
-@@ -371,8 +372,9 @@
-       echo "*** ERROR: a static libosip library is required!";exit 1;
-    fi
-    AC_MSG_CHECKING("where I can find libosipparser2.a")
--   libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \
--                        /usr/lib /usr/local/lib \
-+   libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \
-+			$libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \
-+                        /usr/lib /ur/local/lib64 /usr/local/lib \
-                         -name libosipparser2.a 2>/dev/null|head -1`
-    if test "x$libosip_static" != "x"; then
-       LIBS="$libosip_static $LIBS"
diff --git a/net-misc/siproxd/files/siproxd-libtool-2.4.patch b/net-misc/siproxd/files/siproxd-libtool-2.4.patch
deleted file mode 100644
index 189b32090f7b..000000000000
--- a/net-misc/siproxd/files/siproxd-libtool-2.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U 2 a/src/plugins.h b/src/plugins.h
---- a/src/plugins.h	2010-01-07 12:44:38.000000000 +0100
-+++ b/src/plugins.h	2010-06-19 13:56:30.960679284 +0200
-@@ -25,4 +25,8 @@
- 
- 
-+#ifndef lt__PROGRAM__LTX_preloaded_symbols
-+#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
-+extern const void *lt_preloaded_symbols[];
-+#endif
-
- /* Plugins must return STS_SUCCESS / SUCCESS_FAILURE */
- 
diff --git a/net-misc/siproxd/files/siproxd.rc6 b/net-misc/siproxd/files/siproxd.rc6
deleted file mode 100644
index 0ec75e159f79..000000000000
--- a/net-misc/siproxd/files/siproxd.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-check_config() {
-	if [[ ! -f /etc/siproxd.conf ]]; then
-		eerror "Please create /etc/siproxd.conf first!"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	check_config || return 1
-
-	ebegin "Starting siproxd"
-	start-stop-daemon --start --exec /usr/sbin/siproxd -- \
-		-p /var/run/siproxd/siproxd.pid -c /etc/siproxd.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping siproxd"
-	start-stop-daemon --stop --pidfile /var/run/siproxd/siproxd.pid
-	eend $?
-}
diff --git a/net-misc/siproxd/files/siproxd.rc8 b/net-misc/siproxd/files/siproxd.rc8
deleted file mode 100644
index 017783025f1f..000000000000
--- a/net-misc/siproxd/files/siproxd.rc8
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config_file="/etc/siproxd.conf"
-
-pidfile="/var/run/siproxd/siproxd.pid"
-command="/usr/sbin/siproxd"
-command_args="-p ${pidfile} -c ${config_file}"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	if [ ! -f "${config_file}" ] ; then
-		eerror "Please create ${config_file} first!"
-		return 1
-	fi
-	checkpath -q -d ${pidfile%/*} -o siproxd:siproxd
-}
diff --git a/net-misc/siproxd/metadata.xml b/net-misc/siproxd/metadata.xml
deleted file mode 100644
index 91288ffa73c3..000000000000
--- a/net-misc/siproxd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">siproxd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/siproxd/siproxd-0.8.0-r3.ebuild b/net-misc/siproxd/siproxd-0.8.0-r3.ebuild
deleted file mode 100644
index bb230657846c..000000000000
--- a/net-misc/siproxd/siproxd-0.8.0-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools user
-
-DESCRIPTION="A proxy/masquerading daemon for the SIP protocol"
-HOMEPAGE="http://siproxd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples doc static"
-# TODO: debug can be used but dmalloc is breaking the build
-# upstream has been contacted, see bug 2649238 in their bugtracker
-
-RDEPEND=">=net-libs/libosip-3.0.0
-	<net-libs/libosip-4.0.0"
-#	debug? ( dev-libs/dmalloc[threads] )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.4
-	doc? ( app-text/docbook-sgml-utils
-		app-text/docbook-sgml-dtd:4.2 )"
-# docbook-sgml-utils is for building doc
-# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it
-
-pkg_setup() {
-	enewgroup siproxd
-	enewuser siproxd -1 -1 /dev/null siproxd
-}
-
-src_prepare() {
-	default
-
-	# make the daemon run as user 'siproxd' by default
-	sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \
-		|| die "patching doc/siproxd.conf.example failed"
-	# do not fail when building with external libltdl
-	sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed"
-	epatch "${FILESDIR}/${PN}-libtool-2.4.patch"
-	# do not crash when building with external libltdl, bug 308495
-	sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	# static-libosip2 make it link statically against libosip2
-	# static build static version of plugins, forced to true
-	econf \
-		$(use_enable doc) \
-		$(use_enable static static-libosip2) \
-		--enable-static
-		#$(use debug && use_enable debug dmalloc) \
-
-	# statically linked plugins to libosip2 causes a shared lib linking with
-	# static lib (gcc seems not to like it : portable issue it says).
-	# there was also DT_TEXREL issue and stripping of static plugins failed
-	# so shared lib has to be used for plugins
-	# upstream has been contacted, see bug 2649351 in their bugtracker
-	if use static; then
-		sed -i -r -e \
-			"s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ ]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 -losipparser2:" \
-			src/Makefile || die "patching src/Makefile failed"
-		sed -i -e \
-			"s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) \$(LIBS_STATIC):" \
-			src/Makefile || die "patching src/Makefile failed"
-	fi
-}
-
-src_install() {
-	einstall
-
-	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
-
-	dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
-		doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS
-
-	if use doc; then
-		dodoc doc/RFC3261_compliance.txt
-		# auto-generated doc is not auto-installed
-		# upstream has been contacted, see bug 2649333 in their bugtracker
-		dohtml -r doc/html/
-		# pdf is not build all the time
-		if has_version app-text/docbook-sgml-utils[jadetex]; then
-			dodoc doc/pdf/*.pdf
-		fi
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/sample_*.txt
-	fi
-
-	# set up siproxd directories
-	keepdir /var/{lib,run}/${PN}
-	fowners siproxd:siproxd /var/{lib,run}/${PN}
-}
-
-pkg_postinst() {
-	if use static; then
-		elog "static USE flag does not build a _fully_ statically linked binary"
-		elog "only libosip2 and libosipparser2 are statically linked"
-		elog "In addition, plugins are dynamically linked with those libs"
-	fi
-}
diff --git a/net-misc/siproxd/siproxd-0.8.1-r2.ebuild b/net-misc/siproxd/siproxd-0.8.1-r2.ebuild
deleted file mode 100644
index 664fe43e1ff3..000000000000
--- a/net-misc/siproxd/siproxd-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools user
-
-DESCRIPTION="A proxy/masquerading daemon for the SIP protocol"
-HOMEPAGE="http://siproxd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc static"
-# TODO: debug can be used but dmalloc is breaking the build
-# upstream has been contacted, see bug 2649238 in their bugtracker
-
-RDEPEND=">=net-libs/libosip-3.0.0
-	<net-libs/libosip-4.0.0"
-#	debug? ( dev-libs/dmalloc[threads] )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.4
-	doc? ( app-text/docbook-sgml-utils
-		app-text/docbook-sgml-dtd:4.2 )"
-# docbook-sgml-utils is for building doc
-# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it
-
-pkg_setup() {
-	enewgroup siproxd
-	enewuser siproxd -1 -1 /dev/null siproxd
-}
-
-src_prepare() {
-	# make the daemon run as user 'siproxd' by default
-	sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \
-		|| die "patching doc/siproxd.conf.example failed"
-	# do not fail when building with external libltdl
-	sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed"
-	epatch "${FILESDIR}/${PN}-libtool-2.4.patch"
-	# do not crash when building with external libltdl, bug 308495
-	sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed"
-
-	epatch "${FILESDIR}/${PN}-0.8.1-amd64_static_build.patch" #380835
-
-	eautoreconf
-}
-
-src_configure() {
-	# static-libosip2 make it link statically against libosip2
-	# static build static version of plugins, forced to true
-	econf \
-		$(use_enable doc) \
-		$(use_enable static static-libosip2) \
-		$(use_enable !static shared) \
-		--enable-static
-		#$(use debug && use_enable debug dmalloc) \
-
-	# statically linked plugins to libosip2 causes a shared lib linking with
-	# static lib (gcc seems not to like it : portable issue it says).
-	# there was also DT_TEXREL issue and stripping of static plugins failed
-	# so shared lib has to be used for plugins
-	# upstream has been contacted, see bug 2649351 in their bugtracker
-	if use static; then
-		sed -i -r -e \
-			"s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ ]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 -losipparser2:" \
-			src/Makefile || die "patching src/Makefile failed"
-		sed -i -e \
-			"s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) \$(LIBS_STATIC):" \
-			src/Makefile || die "patching src/Makefile failed"
-	fi
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.rc8 ${PN}
-
-	dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
-		doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS
-
-	if use doc; then
-		dodoc doc/RFC3261_compliance.txt
-		# auto-generated doc is not auto-installed
-		# upstream has been contacted, see bug 2649333 in their bugtracker
-		dohtml -r doc/html/
-		# pdf is not build all the time
-		if has_version 'app-text/docbook-sgml-utils[jadetex]' ; then
-			dodoc doc/pdf/*.pdf
-		fi
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/sample_*.txt
-	fi
-
-	# set up siproxd directories
-	keepdir /var/lib/${PN}
-	fowners siproxd:siproxd /var/lib/${PN}
-}
-
-pkg_postinst() {
-	if use static; then
-		elog "static USE flag does not build a _fully_ statically linked binary"
-		elog "only libosip2 and libosipparser2 are statically linked"
-		elog "In addition, plugins are dynamically linked with those libs"
-	fi
-}
diff --git a/net-misc/sobby/Manifest b/net-misc/sobby/Manifest
index ab65da050835..68b95eb9cad7 100644
--- a/net-misc/sobby/Manifest
+++ b/net-misc/sobby/Manifest
@@ -3,4 +3,4 @@ AUX sobby-init-0.4.7 560 BLAKE2B f21863f4df71918beb29497207d2ace23acfcd4a21e3f94
 AUX sobby.xml 451 BLAKE2B 75ac409597a9e369f63aaa91f45bf18a33d11077445c3c2a53ed8d8bddb0d0f6cf38da91d1002403c8a5d26729958d4956967229524aca6d29bfd55025297516 SHA512 5ef02607a1e60a801036ad57b59d79fa1adff128da857491e0a149dd0b3a14c7244f263e7c916a1f9b08fba49597a02a11b8ff3924b278031d570679fa9eb8e3
 DIST sobby-0.4.8.tar.gz 134766 BLAKE2B 2406f4e71615cd00de7a5dc1b00734d26b96f577d7bfd3bfd56746c63b26fdc089a1560fbbea78b5863ce1755b81c0e0787cab0d6c3c476b1ab2b35bb6df084a SHA512 b946fc5c15257f74213fd6418933f8f4970ca58213a4c5bb33e1110f85964ce137eb5a9fdd0a601d8838310315241b9c29065493f4c9b33a8dbe09e77cc25492
 EBUILD sobby-0.4.8-r1.ebuild 1255 BLAKE2B d74e22051bf09518372fc25c16fb78011129459e90844e1aac1b16410c31d383de75c68754a6ab4c1b7fd4b14ffc3358d1ac149a4e853c42224ac0c36f086feb SHA512 9905003ce6942c2bd3632a0a4b7449a396de3ce32f0a318b9f2000e6e79d688e56ea6e3aeb76ea9cf5b1babe7923cb189d81c9d4d792f7481b7a2474130f3bb0
-MISC metadata.xml 345 BLAKE2B b93846c86cf24c5227f6ce492668b33cee7207e34f517ad49f2c0072e00d58e40b348be313b38f9b46c511e7aa1810645de5554668101b662044abdef4801a46 SHA512 3abe34bee888e0c4a39f293fd88991ac62d125b146536662176b99f7dd6bb8c2f440b2bc5efaac0a12daacdbd734e2818b2b0144600af79fbc8c1197e67c9f4c
+MISC metadata.xml 257 BLAKE2B d8c971c7ac06c07769e0eaf3d6353aca6108be6c79bcf423e0657c0f571773eb925e2c14f9f33b9b23d8b76be4384d3a823f6c1bbc6b87fca056529dcb201a9f SHA512 66f0895ba9f63a78af60e0e37ac6537d6cf3a5362fcebb82f97c7799f3fa73ce0e5474291ddf254d258372012f2a497eee0e17138ca291f9b8a11a1bf7dc76c9
diff --git a/net-misc/sobby/metadata.xml b/net-misc/sobby/metadata.xml
index 2c70b7b5af87..c969532a7097 100644
--- a/net-misc/sobby/metadata.xml
+++ b/net-misc/sobby/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>Stand alone server for the obby colaborative editor</longdescription>
 </pkgmetadata>
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 5cba1b52baab..8ff80ec108fd 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,6 +1,8 @@
 AUX sslh.conf.d-2 297 BLAKE2B c59d4eb8dfd4c2ed6f3a952cd2764c11aea21c1c62e5a4ffc584500cc29d62867d6852e700eb3e6c339f3456d39bcdff16a476dfdbe5705dea5934460769fa22 SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f
 AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
 DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
+DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
 EBUILD sslh-1.19c.ebuild 1931 BLAKE2B 5374fa4e57249b1d5b89b80460e6487f6e5f74bc29d473eaa161c786f467b2cb7474af00fcd28073aa1583a1958966c6ae8b16c9460134f6c22716bae1a039fe SHA512 989d3f47f06fbdae7bf2964dc90e49d2652080bce56a6f2f15ed7bc8e7afc57d109c644655bc71dffe290f1493fe02fa21f2fd48beb44fb41b92cb7fc006a6c5
+EBUILD sslh-1.20.ebuild 1933 BLAKE2B 7d17000c698a58d75e29b3975c3e8001a583374817145fd6e47e4bc6eaad24469eb05621da246eb30438b14a10eafba1f947868648fb194970bafd363ce0662c SHA512 568a7cca43b4458b05d87e3b310ce61029900bcd1f80916082e3de9447bd6bacfbe19127042c3094425abeddfe5351f97ba3ad31099ad208cea4ae0897e41e11
 EBUILD sslh-9999.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.20.ebuild b/net-misc/sslh/sslh-1.20.ebuild
new file mode 100644
index 000000000000..ca2dd5d8cb61
--- /dev/null
+++ b/net-misc/sslh/sslh-1.20.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	pcre? ( dev-libs/libpcre:= )"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBPCRE=$(usev pcre) \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index d2a669c7d633..897c3de3f884 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -14,6 +14,7 @@ DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1a
 DIST stunnel-5.46.tar.gz 706499 BLAKE2B 6ece93015b2a59ec17fa60505bccb5e4444879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136 SHA512 2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
 DIST stunnel-5.48.tar.gz 708356 BLAKE2B 6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba SHA512 5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
 DIST stunnel-5.49.tar.gz 713560 BLAKE2B c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2 SHA512 8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16
+DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 EBUILD stunnel-5.36.ebuild 2888 BLAKE2B eeeb7cd12318516aabcfe224d531d6061e25d4e51ed0c607a4ff56a1d721eb09cf275759fb47ea3e787fc760155492d97c96f341c2a3e28f4f4ac546c10b4160 SHA512 1257f0dcc4e1bdfb32095577841b866535318aba496d662d34fec13d6acbb45f0f6ed46ef185549e317a8254782f4d73a6827622f62ab27e6b011b3bf306b5bd
 EBUILD stunnel-5.40.ebuild 2919 BLAKE2B de5cbf748e76f13d9b07591988ae868c0dbc6ac5d619564951c983bcfd71a195f306be41f86e602c2b87a709a8315ca65112082310458945ebb809a1b1925df7 SHA512 affc603a13a074d6b37dfe1c2cdf400814f13209b1d7ab11a48c4c99a3ff6b607b510d6719f47a4a51071422296ecb4c44455ab9792c594880f12b944c1476fa
 EBUILD stunnel-5.43.ebuild 2912 BLAKE2B 834bda9e67568a42e3e0c87621e37a31ffbfc098d90f17ca45edb5bb6c5eee4c54e5bd899a0717851af2b225d7fe8ec4153d2c7c1133a62f2ebfa1cfaa14b460 SHA512 49b8e6a4ae5b218655a76695adf3f3e9cff3cf03198e4692083548bd348b272c9ded224ccd13076d955d3c92fab3a5f9735a279cd72a608ed5b15efcfa5da26e
@@ -22,4 +23,5 @@ EBUILD stunnel-5.45.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040
 EBUILD stunnel-5.46.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497
 EBUILD stunnel-5.48.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
 EBUILD stunnel-5.49.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
+EBUILD stunnel-5.50.ebuild 2916 BLAKE2B 1b32f04a2d31b068752c6ac6bb311fb1e7550a8ddea9a2eba49c6c7fc7babc57308cd457d74fb54fab9edbb95891e0c0de008ce50df41a37e369e08132a287cc SHA512 4d029fae73b4dafc12a675c73512586127575a7b4d5804ae2de31ae3256356dd2c3289a825c660a03fe21aa7078935421949cbda80351e1fd7439f1aa5b05581
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.50.ebuild b/net-misc/stunnel/stunnel-5.50.ebuild
new file mode 100644
index 000000000000..428e58d9d2be
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.50.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	eapply "${FILESDIR}"/${PN}-5.48-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 81e66df8b947..ce5c858ed86a 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,11 +1,15 @@
 AUX teamviewerd13.init 285 BLAKE2B 7e81248f94f173569a76ec0a87926302b621c2086eb61796313d2fb4ea6decb26561398f6b435a7b55f93b22f7b9b64a6f996f7c3964af4de8e4271bff283c59 SHA512 2dc110140dc89b649cfd6ebc4312f23406a911b19b6aa59e877d8206f242c6ec8143cdbe63317909001becf253be216e081f31bcc667dc6a8b176cc31b79517d
-DIST teamviewer_13.1.3026_amd64.tar.xz 11500188 BLAKE2B 98dab12224ea65cdb7c45f01a835cb50fd052e044cb2908a27e0324d5647c1bcc38565eca0c1e70e86fd96a9f70ddd4b6250f13cde1fd3c381be9af8ecb1805c SHA512 30914b761833dd2720458eb3a3076f59e521bdf4fd50489e1cb7c0c80a05ef73c2fd5a9a59a33644e73b96d8db1616665a130e2781c39f35f6c5bfb64c7c7b9a
-DIST teamviewer_13.1.3026_i386.tar.xz 11343300 BLAKE2B c0170acf9c67f34755800a0200016dacb6f93f3f3805932fbf467dc19bb0213fce74363a0bc703af1c62b4c1bafda2257bd0cc2c52aad4dd1f22ae5a9fb2d486 SHA512 f7dac040de4a0ac3489ee5e911c3c278723cee2372bd42a4a929d3cb268f735eb73cccc514a8d72cc49c82277869533289e3195936218be6db323e732c9c380e
+AUX teamviewerd14.init 282 BLAKE2B af900eacf64f57d6c3a404cde9b42d4e45037c7bf8d5466422ebfddbce4fc1eb27c3982dd81d4bb918479b8da00104cd1b761e64738d00e70efb3b1d7fe2134e SHA512 0905da2033afbf2f4464fae31f7d22b87469c584b912d2f8b652d05a1f2a63709e87d0e70cb981cb87803e9d66f25c399f13eea0ecd0e665bd0a9c1f6994c3f1
 DIST teamviewer_13.1.8286_amd64.tar.xz 11574812 BLAKE2B 9941a3c1894e4b1a285ac61bdeffb47629c7972d19a573016c357275b3fc5ede51838f35acb2debe36ccd96c20cab6478868b78c831ab7137cb1196440e62297 SHA512 76b10c1df368f4c639ff60a69dc541f791b82b73a19accce4c60fdfcff2922a4a674e08da73df570587e840088b466f4791f8da0691582451259965044a18ccb
 DIST teamviewer_13.1.8286_i386.tar.xz 11422756 BLAKE2B 0bc408cbbf44bdeb84ce8c1d1274e8253ec261571670bce46130a325729eb801f101afae768a38cc43719abe625ebc89b12f3eacba507c9193e1049366b1c2c0 SHA512 1fdbdacfdd2f7884af246326e63f6bcfaf8efc95ec326f566216a173509a21891e4c66d85ef1290648a890135ae3fe23f185da36346d68c016da923b7c9c644a
 DIST teamviewer_13.2.13582_amd64.tar.xz 11472084 BLAKE2B adcec9bfb9ccedbc958eceef611f0f04b9b192313d3c060202166b77a4c2623008cbac147e9136925156446ef10a143283735f13c52cebd30e924329d1ff2453 SHA512 82a7cce2046a0dd268181044093e0d0bccfef0cbc2e842a94bc9a9fda87062b7236ff23606dd482e68baf8194b189ae6994603ac0584fad624d7f47366f34af3
 DIST teamviewer_13.2.13582_i386.tar.xz 11406728 BLAKE2B 91bd8fe9c30f8be9de2ce089a0f678e90cb371233c2e8a05e695aa203634846510f1381b449007648a4b0e6b2b201a654b71dae1c63ade0eb08e732ae343766b SHA512 9453b289ba99f63c75e1acb03d3e5a343db4814cffc4464b46116b269a6556e9fda4b1d963fa35e2e912ae959b09fd5dcfbc26ca31ccd76e6d3235be2d9cf55e
-EBUILD teamviewer-13.1.3026.ebuild 3703 BLAKE2B 5a6f0fd7fb45b4f79b9fc4be5198aaa0416d709f4d5883c2b7e54bd2158aef15171caf7861cc47986cc773bbe82d9cf14a40975070e9910333850281eb7fbff1 SHA512 af6fa5e352389a40dcd222b9ed6b25d43179d9eecea6f9d87aef2df66543fa26ab5c7e358caf17fe18a6a10f84045fbfe1cce3cf158f114b7ff959b6b3497709
+DIST teamviewer_14.0.14470_amd64.tar.xz 19458912 BLAKE2B ae106af9126719d92d69501091db46ed7aa9200dd9de24498cc586f3dc75fbbad863eb20b3176e32353beb994e1a4048bac381f172c33e022cd6973d76fa0e91 SHA512 d13310eee551e1ce606fa4ba73084ab9680ba3b6eb2fb2db4f9668decd920f6f16906971cc1900f44bd7d76506788430e1a5cff74f9729b957a3ef8d7aaef051
+DIST teamviewer_14.0.14470_i386.tar.xz 19473776 BLAKE2B a96ed757c6af5e07d4b958d2034c94bdd04625e0ae68c6dba94eebd1f1416f33e339a8766161bfa412ce90119a70cefbded995d66656ac11c0b08869639ba15b SHA512 6c867e32f26df3675bee80e3dfb2aa5868f3bf4717ce07deabc7495d2797018051dde42080eea6e3c0a919e20f5517d621e075c7d7f75cabec4b6feeae5fa74d
+DIST teamviewer_14.1.3399_amd64.tar.xz 11311600 BLAKE2B 082b23322b4a24add2f7a1235810a3fb3cfd6572ccfe2a54942bd93902d3adc170a175d32653375c406de7a54949fd0904dfae8b8cf98da58ef492ac63d0e576 SHA512 9417fca34d2b4b3e53d173ed31f85ca6d3f2488dceb7bf2321082631b425d7c3404549ff4bfe615e6f8f82354df5c43ab61e8cd4ec99ae9c42b28807ea0db365
+DIST teamviewer_14.1.3399_i386.tar.xz 11305576 BLAKE2B 1a40cd6dd5e1554b44d210fb0ca78a3570185e046b12eba52d0e089cd317ab6c8828f774d6b786ab7232ad663785bd9fb2e9137eb0ea7364347ea5513ab5e6ef SHA512 0fef5c5794ea06d9a729cd5be0b2e7c28add1fca9bbf9e77ca69fe569a08fc1efb6dc007040d8a8d3608061469dc2e2d364584130316d58e2d8195b2389deb0f
 EBUILD teamviewer-13.1.8286.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
 EBUILD teamviewer-13.2.13582.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
+EBUILD teamviewer-14.0.14470.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
+EBUILD teamviewer-14.1.3399.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
 MISC metadata.xml 250 BLAKE2B 94de840f3a83c87af4ee3224855111d06a5c77ebbe20d6691dd5a95b4677075a0e9e2fe405a327ac485056269bf3146d5ee6726843447f6436a97d1f7ef44288 SHA512 1ec261c858ac8824789dab07b4b01fde96e8d2a13add9b05617a4b824085d77c181057a7c602db5f4fd3b864b864e6314a64512159d174304fc4fba393b49734
diff --git a/net-misc/teamviewer/files/teamviewerd14.init b/net-misc/teamviewer/files/teamviewerd14.init
new file mode 100644
index 000000000000..fc793766abd3
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd14.init
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/opt/teamviewer14/tv_bin/teamviewerd"
+command_args="-d"
+description="Starts the TeamViewer remote control daemon"
+pidfile="/var/run/teamviewerd.pid"
diff --git a/net-misc/teamviewer/teamviewer-13.1.3026.ebuild b/net-misc/teamviewer/teamviewer-14.0.14470.ebuild
index 6c3cc7311e7e..66f0313ab868 100644
--- a/net-misc/teamviewer/teamviewer-13.1.3026.ebuild
+++ b/net-misc/teamviewer/teamviewer-14.0.14470.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_PN=${PN}${PV/\.*}
-inherit eutils gnome2-utils systemd
+inherit desktop gnome2-utils systemd
 
 DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
 HOMEPAGE="https://www.teamviewer.com"
@@ -67,7 +67,7 @@ src_install() {
 	done
 
 	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd13.init teamviewerd
+	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
 	systemd_dounit tv_bin/script/teamviewerd.service
 
 	insinto /usr/share/dbus-1/services
diff --git a/net-misc/teamviewer/teamviewer-14.1.3399.ebuild b/net-misc/teamviewer/teamviewer-14.1.3399.ebuild
new file mode 100644
index 000000000000..66f0313ab868
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-14.1.3399.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="${PV/\.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+"
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 42c57edbd3b7..fcdc9620403b 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,17 +1,10 @@
-AUX java-utf8.patch 653 BLAKE2B 7254ce7a2629c74a8a6a460bf3e4f83fddd242eb1043a691618dfb22eae5aa6cdf7e50ed81a6c754714dac5238a64a6db96a4e8c71753d1c87abf25ef4e7e85b SHA512 e6c8638858019865348c3920146249de12b91917f23258c0f667b630d778e555c5cbaca8543624d67fc369f1a4b80e11ffa22153803895327221b12527cfd76f
 AUX tigervnc-1.9.0-030_manpages.patch 1978 BLAKE2B c9054f599b503d68d19dab1bd5c588ed19e96f3d547482c10acf84acc81fb59089497d1a282d6f8108132c8ed2fc412af9153c1305d6b04fdecf227c4ad42180 SHA512 dd58ab7987e2e619cc544cae77d7234575dbb812073f730ca0abda24e05c95fcc62449f96472a7962202725d2c9277432cf2289ff930d9841852c858977bf44e
 AUX tigervnc-1.9.0-055_xstartup.patch 1188 BLAKE2B 99f9371fffd6fdddef86b821152833ea7b24b9d121a51e85e04f1b25411a14f629513ed211b1c13f38f60dc48708db40891f1c36eea6b24e7b239f1e480540fe SHA512 b16cbd2360c6eba6210362d138ff5406f472bd4d81277def69460b846169f49cb3f98d29193c4fbc89d7ab06fb04052c2b94f7ceab6003f2b9b17c5b6c51151c
 AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
 AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432efa9e741f10d341e1a76e2c2a9780ecc7bdbd4a3e78c6286e9749f24a1d07b768584ad6203931477 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8
-AUX xserver119.patch 3681 BLAKE2B 04a4bac19c1e7463b916647e92017ea14af4a9e1140db229383d574381a24f30e68042b6b383fdf18cb0dee90b4d535183121076a6638fb8454222013dae85a8 SHA512 531c3b99c5402a66f95ed5743dd37ae9de493cd9bb2e63b39afdd2d536ae438b3c5e2618226f070adc62e41b169837ae7a3302b7bb131b181361a7b142a9e93f
 AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8ffadacd7c394f0bd5ac82a0d5b6a023c020a5125112807762b5260f07180f591009bd22eeb6d9a1324bae64caca7dd6aaba SHA512 aa980e28568df01f4589c258e293df1499c8d7d8d2e37a0bb52c240efb0fcb45f862f382633c389ba60283b6776e33e642acf3544bb89832bd2980bb80908e30
 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d
-DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
-DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
-DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.8.0-r3.ebuild 4311 BLAKE2B 7335c1bcb3093a44483c6962edcec9809ae0d7cd65b9f565c87cb433572a93085214ece4e804222d7ed354c20d0cd5c168ccc197b0c39860b2188448b2eeba0a SHA512 bbc5b8d0b91cdddfd801f08a9f7432f57dff70d21a3038107ff2cfce15e10e23b31104e59fc0465d7404656a6083a45b0c5431be7ca9d33d761dbd5236a0df62
-EBUILD tigervnc-1.9.0-r1.ebuild 4374 BLAKE2B d3964c3a3ecaf0bd8c6bda438487929bfdee3709eea301663c066ce9e41f134d4120238a92e0a20a4ba53ad354709752fe1c2554d06fc5678ae523c5578cfe3b SHA512 e6e078769748a6121d5f65a5c9a77646c80268a6be29819184bb6f5cbb3d9625e576de9a76df605173895cb61871044b47559bb28d1973eeedd13a9df42cb6ff
-EBUILD tigervnc-1.9.0.ebuild 4372 BLAKE2B 4023fa062416384ff05bd6c91cfda9ff646fb5b7f71be98a84691e946c1e688e051115049178e1e9c6e60bfc73da01fb443f6564920baad11c629b0924822fa5 SHA512 6f82c8338003a3cbfc06d9fe8cf3ea3bc102eb1b6ca7a56f7954c70e4c999381ff54961385a4543f74bf3e3585bfa566a28ac44871ba1a062e9ac1f69c610d30
+EBUILD tigervnc-1.9.0-r1.ebuild 4370 BLAKE2B e3149dbd4879f1a4b55ae1a4a08ec1414f6c9003757fae6ff53bc5f7c5fed55ad70ec59e6909d7931bd0864ec5ff214dad8947c82a2ccb0aa6e445def54882a9 SHA512 eaacd897edb96196039892ad0290856df0ba495d4d63bf32461e7540eec53aa6545e7a3912f0e8f7339a46ed07f24a14ec4b625e6a2e5dc05c1f5cf71d14250a
 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/files/java-utf8.patch b/net-misc/tigervnc/files/java-utf8.patch
deleted file mode 100644
index 71bd4503b777..000000000000
--- a/net-misc/tigervnc/files/java-utf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/java/CMakeLists.txt	2017-10-25 22:26:12.920787580 +0900
-+++ b/java/CMakeLists.txt	2017-10-25 22:27:21.423007891 +0900
-@@ -9,7 +9,7 @@ find_package(Java)
-
- set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
-
--set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
-+set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -encoding UTF-8 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
- set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
-   "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
- message(STATUS "Java compiler flags = ${JAVACFLAGS}")
diff --git a/net-misc/tigervnc/files/xserver119.patch b/net-misc/tigervnc/files/xserver119.patch
deleted file mode 100644
index 614f104a4d4d..000000000000
--- a/net-misc/tigervnc/files/xserver119.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac
---- xserver/configure.ac.xserver116-rebased	2016-09-29 13:14:45.595441590 +0200
-+++ xserver/configure.ac	2016-09-29 13:14:45.631442006 +0200
-@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AM_PROG_AS
-+AC_PROG_CXX
- AC_PROG_LN_S
- LT_PREREQ([2.2])
- LT_INIT([disable-static win32-dll])
-@@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then
- 	AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
- 
- dnl Xnest DDX
- 
-@@ -1898,6 +1903,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+
- if test "x$XORG" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -2116,7 +2123,6 @@ if test "x$XORG" = xyes; then
- 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
--	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
- 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2691,6 +2697,7 @@ hw/dmx/Makefile
- hw/dmx/man/Makefile
- hw/vfb/Makefile
- hw/vfb/man/Makefile
-+hw/vnc/Makefile
- hw/xnest/Makefile
- hw/xnest/man/Makefile
- hw/xwin/Makefile
-diff -up xserver/hw/Makefile.am.xserver116-rebased xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.xserver116-rebased	2016-09-29 13:14:45.601441659 +0200
-+++ xserver/hw/Makefile.am	2016-09-29 13:14:45.631442006 +0200
-@@ -38,7 +38,8 @@ SUBDIRS =			\
- 	$(DMX_SUBDIRS)		\
- 	$(KDRIVE_SUBDIRS)	\
- 	$(XQUARTZ_SUBDIRS)	\
--	$(XWAYLAND_SUBDIRS)
-+	$(XWAYLAND_SUBDIRS)	\
-+	vnc
- 
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
- 
-diff -up xserver/mi/miinitext.c.xserver116-rebased xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.xserver116-rebased	2016-09-29 13:14:45.618441855 +0200
-+++ xserver/mi/miinitext.c	2016-09-29 13:14:45.631442006 +0200
-@@ -114,6 +114,10 @@ SOFTWARE.
- #include "micmap.h"
- #include "globals.h"
- 
-+#ifdef TIGERVNC
-+extern void vncExtensionInit(INITARGS);
-+#endif
-+
- /* The following is only a small first step towards run-time
-  * configurable extensions.
-  */
-@@ -238,6 +242,9 @@ EnableDisableExtensionError(const char *
- 
- /* List of built-in (statically linked) extensions */
- static const ExtensionModule staticExtensions[] = {
-+#ifdef TIGERVNC
-+    {vncExtensionInit, "VNC-EXTENSION", NULL},
-+#endif
-     {GEExtensionInit, "Generic Event Extension", &noGEExtension},
-     {ShapeExtensionInit, "SHAPE", NULL},
- #ifdef MITSHM
---- xserver/include/os.h~	2016-10-03 09:07:29.000000000 +0200
-+++ xserver/include/os.h	2016-10-03 14:13:00.013654506 +0200
-@@ -621,7 +621,7 @@
- extern _X_EXPORT void
- LogClose(enum ExitCode error);
- extern _X_EXPORT Bool
--LogSetParameter(LogParameter param, int value);
-+LogSetParameter(enum _LogParameter param, int value);
- extern _X_EXPORT void
- LogVWrite(int verb, const char *f, va_list args)
- _X_ATTRIBUTE_PRINTF(2, 0);
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
deleted file mode 100644
index e21b514912e0..000000000000
--- a/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.19.5"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
-
-CDEPEND="virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( virtual/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-base/xorg-proto
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${WORKDIR}"/patches/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-	"${FILESDIR}"/java-utf8.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server ; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver119.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa ; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server ; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-tslib \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--disable-unit-tests
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index 55f1c8a54861..edbfb0053534 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/tigervnc/tigervnc-1.9.0.ebuild b/net-misc/tigervnc/tigervnc-1.9.0.ebuild
deleted file mode 100644
index 711d27363d3b..000000000000
--- a/net-misc/tigervnc/tigervnc-1.9.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
-
-CDEPEND="
-	virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( virtual/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( virtual/opengl )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-base/xorg-proto
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-030_manpages.patch
-	"${FILESDIR}"/${P}-055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server ; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa ; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server ; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/tlsdate/Manifest b/net-misc/tlsdate/Manifest
deleted file mode 100644
index a37f84654be5..000000000000
--- a/net-misc/tlsdate/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX tlsdate-0.0.13-tlsdated-service.patch 674 BLAKE2B 70472a3e57550340025daef7b65dafd6f0f2a0c49efe06fa560f13e3c53a9e6041ce6a4853d699315286d3293d3660bc927d1a99b08b7e6ce527a4dd8a7e55fd SHA512 ff24e073306bcedf014f0c3734f6ca17e7b4663409744e9960e832215a83a1954cf2c84cc7ef752de5c28d8814ec4bcc7f840bcbe78b18226380a3afc09c0706
-AUX tlsdate.confd 247 BLAKE2B 055886d6c32578d3a7cbaf8bbb0c12fd847b667339d5dedb7c46adfde7c47ada0aa5be9c082ca92c23b4e0078f1fcd7d70e6dc700fc211ea9e6b844216418a06 SHA512 62149e3a9f26a71624bd851780f92a41c9aaf138793b5da762aa3002bcc5a409686d1bbe687b4abf1fc2e12205720a3825d9603cab0b0d978c2d0fd41422efe7
-AUX tlsdate.rc 349 BLAKE2B 544beb2480c7bb7a145902baf034f420e834fbd3d35bf675d046d3d322d72f650bf56add35b7198b07571362cfee8939b14233b8e43ff0be464d794806fa4a92 SHA512 2f0bca7251fbd1ae0def2287c7470bee85a2ee0c6baa25ff724ef6880ae7a8a8793460056139d0f1add0003958b2e5dcbddb562b7ac99abdf130032f764d335d
-AUX tlsdated.confd 469 BLAKE2B 4cfd61b9227e82ab6487a920ce9e6d80d73b6b060d27203e7ae47dca71b0fe52f06eebc9ff88154eff24ceb70c31757ef5054cc90c08e53382e8ef240611120d SHA512 38bd7d64473ab487eea2539b11a7acadfc3fa5a627fb12e78931b62c46d3ebedab4c75d56839b0dee9fd8f42d4b7ae9ace08ea3f58941b8e2d183828c6a4fef2
-AUX tlsdated.default 114 BLAKE2B e20872ce29aa94e8cce98029807c894bc21cc57b5fd7190fee0499cde69519b98a7befd0f30100b2030b296bb0a8e683c69bf9e31c8297378a536cc90f9076d4 SHA512 f18138f0980f2c02405597eccb03d3031129ca622ebccf80d6090697857853823ae69e06afff65275304d25f6cb31121b93c21575990e5008f0646b28d37bfcd
-AUX tlsdated.rc 430 BLAKE2B e18ecc4fbbde6f0b3982eba1d989d77fa0ae70eee52e144cbb625e033e8d9b884c32ab4ff12fb54210a1d692a435d0b6fb70fa699984ff2a791163386a18315d SHA512 d3defb743ff9413d7f3b209590f25914715aa19dd02a39ee03aa1cb51607c83100db1eee5a3fe3ce8b21d334dc02a07ca1656416acec800f7c95d98f69b1fe23
-AUX tlsdated.tmpfiles.conf 45 BLAKE2B 238c924ae7998578f98e25c23530d4547d3a3d16dfbd43dc5c30abdd99d7324c1bd5dcab1ca4bf7dab9dcaa90582adbed9981a240e617685e05912b79f7198ff SHA512 c9b5c682032efb16e8b182aafa5a768a210f04c598ab313fe66fceda9f8d496720d5d9e614a165c90fe82aed8c1327bee2a2706c2185fbe70b348349f9ea7ede
-DIST tlsdate-0.0.13.tar.gz 264228 BLAKE2B 74d915ee070ddc62ec25696557d1dda3ce677c6a46e38b0a8462821cf7f99f0f75ed08e318bfd0145bfc08ed5773d77148edecec1ac90f143912bb0219849005 SHA512 9c4fd51439976a8541fdf1bb70afa5333b43b2e43b801a65b3b1ac3e4a437fd3021ef2aaeeb13fc1ba63ccd119f6eff4c10e3a5a28cf0cfd96bbc7a174dbb789
-EBUILD tlsdate-0.0.13.ebuild 1928 BLAKE2B ae80d809e4468ad78e93d6dea974e7cd397bb1dec67f5750fccaa189b2192b68cf47d0be5ae7e68efc9149d7844f815dc7c49e468490a4eef5dbf322547cab3e SHA512 7f8dcd5f4c3c351c32a7755ae0402e4b3b72e670d26f429a457eeae9b42ad636ddbb8ef67736a16d7cb77385935d7c34e1ab4557ffda65b59fd53948866eac02
-MISC metadata.xml 247 BLAKE2B 5d5cc4ae599640e2dac5380335b7021f7079ece558ced15bcb23ce8f370c3e35e5ae67cc4bbddb940fdef12bb625ebcaf7a1ddfdcdf8be812409ec24e7779fe0 SHA512 b10c29ac77534c0a164e21e74329961415a060b3d71e7d0073c280df7efcf16cab753e98b207b18f79c19f4d686dccfd0754fdfaf48d47530fd6f68fa1fa1e0c
diff --git a/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch b/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch
deleted file mode 100644
index df03833f7cd5..000000000000
--- a/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Dominik Kriegner <dominik.kriegner@gmail.com>
-Date: Tue, 26 Jan 2016 12:12:26 +0000
-Subject: [PATCH] Fix systemd unit file
-
-Project-Bug-URL: https://github.com/ioerror/tlsdate/pull/162
-Gentoo-Bug-URL: https://bugs.gentoo.org/533380
-
---- a/systemd/tlsdated.service
-+++ b/systemd/tlsdated.service
-@@ -5,6 +5,9 @@ After=network.target
- [Service]
- Type=simple
- EnvironmentFile=/etc/default/tlsdated
--ExecStart=/usr/sbin/tlsdated ${DAEMON_OPTS}
--ExecReload=/bin/kill -HUP ${MAINPID}
--ExecStop=/bin/kill -INT ${MAINPID}
-+ExecStart=/usr/sbin/tlsdated $DAEMON_OPTS
-+ExecReload=/bin/kill -HUP $MAINPID
-+ExecStop=/bin/kill -INT $MAINPID
-+
-+[Install]
-+WantedBy=multi-user.target
diff --git a/net-misc/tlsdate/files/tlsdate.confd b/net-misc/tlsdate/files/tlsdate.confd
deleted file mode 100644
index 2d7ed030de33..000000000000
--- a/net-misc/tlsdate/files/tlsdate.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# config file for /etc/init.d/tlsdate
-
-# Command to execute to set the time.
-# This are some common tlsdate options:
-#  -l: leap (set time regardless of difference)
-#  -H: hostname to sync with
-#  -x: proxy URL
-TLSDATE_OPTS="-l -H www.google.com"
diff --git a/net-misc/tlsdate/files/tlsdate.rc b/net-misc/tlsdate/files/tlsdate.rc
deleted file mode 100644
index 3c5163ac92b5..000000000000
--- a/net-misc/tlsdate/files/tlsdate.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="set time once when started"
-
-depend() {
-	use net
-}
-
-start() {
-	: ${TLSDATE_CMD:=tlsdate}
-	ebegin "Setting clock via tlsdate '${TLSDATE_CMD}'"
-	"${TLSDATE_CMD}" ${TLSDATE_OPTS}
-	eend $? "Failed to set clock"
-}
diff --git a/net-misc/tlsdate/files/tlsdated.confd b/net-misc/tlsdate/files/tlsdated.confd
deleted file mode 100644
index d257289cc58d..000000000000
--- a/net-misc/tlsdate/files/tlsdated.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# config file for /etc/init.d/tlsdated
-
-# Command to execute to set the time.
-# This are some common tlsdate options:
-#  -l: leap (set time regardless of difference)
-#  -H: hostname to sync with
-#  -x: proxy URL
-TLSDATED_CMD="/usr/bin/tlsdate -l -H www.google.com"
-
-# Additional options; see `man tlsdated` for reference.
-TLSDATED_OPTS=""
-
-# Cache dir.  Probably don't need to change this.
-# It matches the compiled-in default.
-TLSDATED_CACHE_DIR="/var/cache/tlsdated"
diff --git a/net-misc/tlsdate/files/tlsdated.default b/net-misc/tlsdate/files/tlsdated.default
deleted file mode 100644
index 08186f75ef31..000000000000
--- a/net-misc/tlsdate/files/tlsdated.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# defaults file for /etc/default/tlsdated
-
-# Additional options; see `man tlsdated` for reference.
-DEAMON_OPTS=""
diff --git a/net-misc/tlsdate/files/tlsdated.rc b/net-misc/tlsdate/files/tlsdated.rc
deleted file mode 100644
index d0814c874b4e..000000000000
--- a/net-misc/tlsdate/files/tlsdated.rc
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="start a daemon to continuously set time via a helper"
-
-command="tlsdated"
-command_args="${TLSDATED_OPTS} -- ${TLSDATED_CMD}"
-command_background="true"
-pidfile="/var/run/${SVCNAME}.pid"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -m 0700 -o tlsdate:tlsdate "${TLSDATED_CACHE_DIR}"
-}
diff --git a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf b/net-misc/tlsdate/files/tlsdated.tmpfiles.conf
deleted file mode 100644
index 07a7966cc873..000000000000
--- a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/cache/tlsdated 0700 tlsdate tlsdate -
diff --git a/net-misc/tlsdate/metadata.xml b/net-misc/tlsdate/metadata.xml
deleted file mode 100644
index a43835484625..000000000000
--- a/net-misc/tlsdate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ioerror/tlsdate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/tlsdate/tlsdate-0.0.13.ebuild b/net-misc/tlsdate/tlsdate-0.0.13.ebuild
deleted file mode 100644
index 135c195e304e..000000000000
--- a/net-misc/tlsdate/tlsdate-0.0.13.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils systemd vcs-snapshot user
-
-DESCRIPTION="Update local time over HTTPS"
-HOMEPAGE="https://github.com/ioerror/tlsdate"
-SRC_URI="https://github.com/ioerror/tlsdate/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips s390 sh sparc x86"
-IUSE="dbus +seccomp static-libs"
-
-DEPEND="dev-libs/openssl:0=
-	dev-libs/libevent:=
-	dbus? ( sys-apps/dbus )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tlsdated-service.patch
-)
-
-src_prepare() {
-	# Use the system cert store rather than a custom one specific
-	# to the tlsdate package. #534394
-	sed -i \
-		-e 's:/tlsdate/ca-roots/tlsdate-ca-roots.conf:/ssl/certs/ca-certificates.crt:' \
-		Makefile.am || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable dbus) \
-		$(use_enable seccomp seccomp-filter) \
-		--disable-hardened-checks \
-		--without-polarssl \
-		--with-unpriv-user=tlsdate \
-		--with-unpriv-group=tlsdate
-}
-
-src_install() {
-	default
-
-	# Use the system cert store; see src_prepare. #446426 #534394
-	rm "${ED}"/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf || die
-	rmdir "${ED}"/etc/tlsdate/ca-roots || die
-
-	newinitd "${FILESDIR}"/tlsdated.rc tlsdated
-	newconfd "${FILESDIR}"/tlsdated.confd tlsdated
-	newinitd "${FILESDIR}"/tlsdate.rc tlsdate
-	newconfd "${FILESDIR}"/tlsdate.confd tlsdate
-
-	systemd_newunit "${S}"/systemd/tlsdated.service tlsdated.service
-	systemd_newtmpfilesd "${FILESDIR}"/tlsdated.tmpfiles.conf tlsdated.conf
-	insinto /etc/default
-	newins "${FILESDIR}"/tlsdated.default tlsdated
-
-	insinto /etc/dbus-1/system.d/
-	doins dbus/org.torproject.tlsdate.conf
-
-	use static-libs || \
-		find "${ED}"/usr '(' -name '*.la' -o -name '*.a' ')' -delete
-}
-
-pkg_preinst() {
-	enewgroup tlsdate 124
-	enewuser tlsdate 124 -1 /dev/null tlsdate
-}
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index 46909e2b9ca6..bcad5c421d61 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -8,7 +8,9 @@ AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892
 DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15
 DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0
 DIST uftp-4.9.5.tar.gz 243999 BLAKE2B 32f6e6fef062e3b0696db775f2e925fdd53f03d8e04181f65140372abc85674b90579ea4b0c48cf21378c97552d06374005e70b6f1e9af7c03b7478d0b86e26c SHA512 3a4809cc61555ee26de6c1e1ac8525c0345a3b9555cf0a2094ff06eb6f409d1b3ca16b94d7b953dba6d1ae1d8c69a646d575a6357cd178c374bef68888744086
+DIST uftp-4.9.8.tar.gz 244855 BLAKE2B bdb5b5caffbfbfaf8d7aa71e675a98240e64b27b6386088c9a096202f32e825a1cd9bed933b5242601c9ff7c5c2afb4c43190b2335a2a73c0dd0b51caf74a1cf SHA512 04875ddc59cdd9cfa88d642aeb9ea4418a99eca12057f54c949ec5aecee85a8a78803ebdeefe11a29a298a151bb5eb19d6c6c5656f26e17639a86308a2946ef5
 EBUILD uftp-3.7.1.ebuild 1062 BLAKE2B eab032956e3170de02ad65e543011be42260335cbe51e30acde9509a6b15a10f98ade2bd284293a27906484c4281bd7549569543df68ae1af6b4c2fcd5160b13 SHA512 59352a391e6b7aceff3939ea588a6be4859b1b62333451b26978ad0b08eb3d1cd7b90c0e3e4a5d84c1fac86741ce43ffc9ec5bfb64c697ccb02079cd1b5f6006
 EBUILD uftp-4.9.4.ebuild 1268 BLAKE2B f0f5346bc945ded6924a601256d95e997c9a626a3b770f849e35b73a380ab319ca30e3ef8b211f7aed256fb0e1d214291943b730b6b9b52b23bdd8b0cf48fb82 SHA512 1ae279fcaa4e627fd212465e73de1d1b1bb18491de290fd0cce5c945c07c43eca7f35421ff589fe1fc33b35bf057d938519cb32d327fd5bf88de1e7a27fe5612
 EBUILD uftp-4.9.5.ebuild 1366 BLAKE2B 155a929dc9a2eba399f0842ca73a4187a91bf4c6c5399f70a26e27026e3d25fd7c404278cf09ea73f4c3e215a31928b2a189905a7ba924d3894e2c22fab58013 SHA512 9812a24f7988ccbbe8a905ec0c0c0423b1f2aa178ab53b2270bbdd5a0dbbee376e0400128bea6a9c3416071952f22125f2a6e4bb038c7ffa10bff81b807198e2
+EBUILD uftp-4.9.8.ebuild 1363 BLAKE2B dd637e4fe96458b3b7db4053be4d15e71914e215daf3cf89f530ece8bdbfb509de3608d6250e7a0a06bfb41d83e3ab3a340096bd613c7380e650cf4a9ecd36cb SHA512 78f403d2293de619115214fba140cc4e28e76cd5995cb0e97f0886d4da2418d3fe31ba511f8f206427d28c47709ed5d440e4dca778aa664108bed23490fc7005
 MISC metadata.xml 433 BLAKE2B 0c732cc29ed317b29aa5c7313ebf825e62835325c1c44f1e39bbf2893d40335b3458ddf9263132fc858d28ac8c66876f39bdccbfdc376c87c955e8f09eba7171 SHA512 7e63ff9bed7a90bc94ac2f0441b6f089e5f38d08afb47c5513b09bb6ee2b5fca756a20401d622548c129b540a0b93dba882c38e5ac69dcca9ec72e4c4c9e7686
diff --git a/net-misc/uftp/uftp-4.9.8.ebuild b/net-misc/uftp/uftp-4.9.8.ebuild
new file mode 100644
index 000000000000..08943133b714
--- /dev/null
+++ b/net-misc/uftp/uftp-4.9.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Encrypted UDP based FTP with multicast"
+HOMEPAGE="http://uftp-multicast.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+server ssl"
+
+# openssl with EC required, see #644674
+DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
+RDEPEND="${DEPEND}"
+
+# Workaround, see #644670
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.9.4_makefile.patch"
+)
+
+src_compile() {
+	use ssl || local opt="NO_ENCRYPTION=1"
+	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
+	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
+}
+
+src_install() {
+	dobin uftp uftp_keymgt
+	dodoc {Changes,protocol,ReadMe}.txt
+	doman uftp.1 uftp_keymgt.1
+
+	if use server ; then
+		dosbin uftpd uftpproxyd
+		newinitd "${FILESDIR}/uftpd.init" uftpd
+		newconfd "${FILESDIR}/uftpd.conf" uftpd
+		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
+		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
+		doman uftpd.1 uftpproxyd.1
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate" uftpd
+	fi
+}
+
+pkg_postinst() {
+	if use server ; then
+		ewarn "Please note, uftpd 4.x server is not backward compatible with"
+		ewarn "uftp 3.x clients! Please upgrade clients before servers."
+	fi
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index ada24f1ae74b..30bcad9e2e4f 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,6 @@
 AUX wget-1.19.5-fix-dot-prefixed-domain-matching.patch 1077 BLAKE2B 09a341db55d4c0e47007060ba743f11a509526c01cf9815ee4eb9d21c8ae821f122b3ae10047fbfa69e1da407baea799663661e9dbdba0d6a6ddcaf4eda4eef1 SHA512 971b13380dd0a8f60a8ae423ce98798105cbf5670b86445bec67a869ffaf891be7b48a0a6b02e3575459b64f586b2748be8077925f873dc2e1a4bc5467a95392
 DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
+DIST wget-1.20.tar.gz 4474641 BLAKE2B f9a1fdb1299dcee36467e6a78fc90fb8b17b71d14079b5ce6d60a19a27a2bd4c53fdbd3660cbd2d94a3523d4c5ea517e52f46e4af1be60db885fe79a376b3720 SHA512 2e50b9e83c22cb342d85981f89253d9c72bb1a48152c17c4c0b6315683890075f60ad2783e4fa8c2a6d15c53820d9ecb8d0c4b81cfcef4fcc66126ed1cb7ff54
 EBUILD wget-1.19.5-r1.ebuild 3231 BLAKE2B c3c1c75e7f9d2df4e40959c481c1266f78a216a7600788bbebc0d51b0c9203f773b469df6e2797d98b71c0c5a5cbf5146134312af7bcbaf2945c5ded3604f984 SHA512 694cedb34e2687c1e69212b96808251446618669ef947c410852435063a1daea0000d3a883edf86fa552ef7e0ee104ed250ee0ab125f1ded47f9112002959156
+EBUILD wget-1.20.ebuild 3199 BLAKE2B c7c585395a0398339f225f7b93ba0c68a651754191a5517824fe21779434d2ff1af1ae66d1a1a9036c145a3baf8108006bacd103a6f3be0eaeb1805809588186 SHA512 3ba598122d8bab203f362fc73bb53cdb9cb42401f9ee9615bcdc21b94a1bc98c744dd02d33d84e6964a1fd4f756a56b95394c16f2337a274172e92c294569cb7
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.20.ebuild b/net-misc/wget/wget-1.20.ebuild
new file mode 100644
index 000000000000..912dcc731412
--- /dev/null
+++ b/net-misc/wget/wget-1.20.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+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="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="
+	idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre2[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	local myeconfargs=(
+		--disable-assert
+		--disable-pcre
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre pcre2)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with idn libidn)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+	ac_cv_libunistring=no \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED%/}"/etc/wgetrc \
+		"${ED%/}"/usr/share/man/man1/wget.1 \
+		"${ED%/}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 670c91cf4a3e..3352f48d97f5 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,7 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
-DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
 DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
 DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e
-EBUILD whois-5.2.20.ebuild 1503 BLAKE2B c8f9f004b15d47af335cbb9ef8e8504fa5cf1e91c3c8dc35117df6772a3831081b51fd5379a93ed65119219f6657c6a2dbfade35dbdc39fa1080e203aabf82e7 SHA512 ef0fcf8e2a3d4b439644112a2b8e69f56e652f6afd19172d550c7669a34be8ee291944ae7bc74feb0fadaf346eadd9e64d192205b6d3b46a6efd1684268f2452
-EBUILD whois-5.3.2.ebuild 1582 BLAKE2B e843a267973f2b3901cc43b931922a8c4d9dcc36971d6bc29f7cd244241a617c67807e5911ad91ba0d7e56bc364dc8a4be7bcdb077a826063ac93e0de5a03a61 SHA512 9dc0fbdec6222d539f01382a694ceb519bb541530eb77ed6bbdc3f93efd817bf699edb6a5576de510dfeb993c4b4f90399cc74b091f4d350ecb6cd2077f980f8
+EBUILD whois-5.3.2.ebuild 1577 BLAKE2B fcafe5e78eaa79b02d6ee03ffc964307687eaccae5bda1959c63542389697c016372c3718e02478d2bf70aa91d9e4a7b3b7a1df35f5aed02acec48c85af74965 SHA512 0d524bc8e5ac35c3034b34f402ffca1e2004ea03f7b75986fc09f1c8ce5354a08834871767b2d9e5a6063ff2fde258c90d22778cf9ef66811c84ddaa7618a5a3
 EBUILD whois-5.4.0.ebuild 1590 BLAKE2B b832b7c82c05efff9136bd6f4ca02c9b482f141fdeff38aa6b72ec5ef5b3cefe74b9a8711f4f358bac380d0c34f2ecd0bb92203c40f0912aecbdfedbd64834cc SHA512 6251dd887631db7394f43ab322d733b4da29f5c012c8398de2f79c83ba57bde18dea0ead4fd6eef8005e48373946ac6ebe88e468173c59d6735175eec65be37e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
deleted file mode 100644
index 25d05e54e274..000000000000
--- a/net-misc/whois/whois-5.2.20.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn:= )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-)
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :;} # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.3.2.ebuild b/net-misc/whois/whois-5.3.2.ebuild
index bdac1924f285..2663d8da5ad3 100644
--- a/net-misc/whois/whois-5.3.2.ebuild
+++ b/net-misc/whois/whois-5.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 3b843c57dfa2..1e4922873459 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,10 +1,4 @@
 AUX x2goclient-4.1.2.1-qt511.patch 678 BLAKE2B d4c6de81d060d415030c7b160eaca2d72fc4c0fbcb4dc4428471069fbf6c6c1b8b918b382efd5b852cbd0accd4a2cd7c76b7b3a957a271bb46fd7b770fca74c6 SHA512 4c2571dfe286dc5e632a278c683df8ed3d5bb7107f9342ba843ac42b36d73df24a140927b0d147484c4e69668a85ccc309dd6a32627a9e0ba82493e0a9529a55
-DIST x2goclient-4.1.0.1.tar.gz 1891484 BLAKE2B af9ccff0ae313c42a13089e0e1b154d8204cc626b2cb5dfbd1f0016bd7099592d2f29ff8d540a2e1d64552359e90ed024c9790bce551e38e5826bfff5b2ee408 SHA512 6cbfb70fb7f522f0a5557ab36b6e15b6cae9ad184bd1d51b6c2f2acfa7b22d8fd9344bbfee141f2d5bd71f5adf9d3bd6d2c7db7b774cd8f8af5bcd25144de98d
-DIST x2goclient-4.1.1.0.tar.gz 2745227 BLAKE2B 3cd33a828a890189fa92790388abf34c95eeb33d0c5019a014b1ba893a739011886462f62b2ce74cf57c8229acf573db778defec7e0097f5c0d6ea1e35361699 SHA512 c9763ab4b1ce4065ee1512dae2fcaf5b23dd515dc64fd8bb11d033aca1a026a4bf0d06a0fab38576e98627490dc459973716689e8c9aa7c47fb6c68124405e30
-DIST x2goclient-4.1.1.1.tar.gz 2749650 BLAKE2B 212e4ef9bb13478c79b46fe5ac247db2ac1cde1e24c0293397f54c793fa647318fa8f1d13417cb54218ed6757a26db4d6fe00076ad5c04c4d426ee428200735a SHA512 b18f3b2889e2f43846a1c83fccb1a1219621b442849a8e454e82e3d27a638740ea22dd419d6b1e0544416445d4abe80f8b931d46f77237bce1df11d4394451dc
 DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b179cb69bf28c082ef1d8122d4c32b79dd7bcb685e846a62481a4a3334eb902a3fe84aa8422099a5088559a3b548fbe20 SHA512 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369
-EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 BLAKE2B 817b894fa28a636679d986e1c1cbcc60c1c0c575c1ee3a6a61053c6ec4a396db6af09daa15f5b87729fb8b4da162d92345abe685f8028e78c06ca51f5342636f SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3
-EBUILD x2goclient-4.1.1.0.ebuild 1377 BLAKE2B e7f76cefcbb3fbe497dc3d653291dd5d70998f33632a83fe2a98bb724c2a4ea9953b41ca390473b2b494824f4b52f56c0dc06d030fa72d5f67a95e813d7a5c35 SHA512 6665dbc7ddef0a202a0dca44a8cae74dc1117253f0f9129bdee3b8dd80e2ddddfac7182d58dcda89dbcacbd7dd0d30b976c698c15c5a337b37fbceeb26338b04
-EBUILD x2goclient-4.1.1.1.ebuild 1378 BLAKE2B e57ee137c064cbca5f3a74a4d6da5c3a62cc12a13837d86a76934cb696f6ceae1320d0bcce78e45a1e937aa960c27b360354f7e9d8221e73570e034252089d64 SHA512 96ac2ad4645b5a220050b7a7b70ff8cf64330be309f5739f2230c6e89ea49cf296b8da6bb2335cd3a07e40cd57141cd44593f69737f17b8c0c30fa0d77c0054c
 EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.1-r1.ebuild
deleted file mode 100644
index 5538f8dc50ec..000000000000
--- a/net-misc/x2goclient/x2goclient-4.1.0.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=net-libs/libssh-0.6.0_rc1
-	net-print/cups
-	x11-libs/libXpm
-	ldap? ( net-nds/openldap )
-"
-RDEPEND="${DEPEND}
-	net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-src_prepare() {
-	default
-
-	if ! use ldap; then
-		sed -e "s/-lldap//" -i x2goclient.pro || die
-		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
-	fi
-}
-
-src_configure() {
-	eqmake5 "${S}"/x2goclient.pro
-}
-
-src_install() {
-	dobin ${PN}
-
-	local size
-	for size in 16 32 48 64 128 ; do
-		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
-	done
-	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
-	insinto /usr/share/pixmaps
-	doins res/img/icons/${PN}.xpm
-
-	domenu desktop/${PN}.desktop
-	doman man/man?/*
-}
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
deleted file mode 100644
index 937d4780256a..000000000000
--- a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils qmake-utils
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap"
-
-COMMON_DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=net-libs/libssh-0.6.0_rc1
-	net-print/cups
-	x11-libs/libXpm
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-src_prepare() {
-	default
-
-	if ! use ldap; then
-		sed -e "s/-lldap//" -i x2goclient.pro || die
-		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
-	fi
-}
-
-src_configure() {
-	eqmake5 "${S}"/x2goclient.pro
-}
-
-src_install() {
-	dobin ${PN}
-
-	local size
-	for size in 16 32 48 64 128 ; do
-		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
-	done
-	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
-	insinto /usr/share/pixmaps
-	doins res/img/icons/${PN}.xpm
-
-	domenu desktop/${PN}.desktop
-	doman man/man?/*
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
deleted file mode 100644
index ae8b67cda78e..000000000000
--- a/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils qmake-utils
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-COMMON_DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=net-libs/libssh-0.7.5-r2
-	net-print/cups
-	x11-libs/libXpm
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-src_prepare() {
-	default
-
-	if ! use ldap; then
-		sed -e "s/-lldap//" -i x2goclient.pro || die
-		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
-	fi
-}
-
-src_configure() {
-	eqmake5 "${S}"/x2goclient.pro
-}
-
-src_install() {
-	dobin ${PN}
-
-	local size
-	for size in 16 32 48 64 128 ; do
-		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
-	done
-	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
-	insinto /usr/share/pixmaps
-	doins res/img/icons/${PN}.xpm
-
-	domenu desktop/${PN}.desktop
-	doman man/man?/*
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 0353f3fe2fc6..6d1981468205 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -2,12 +2,8 @@ AUX x2gocleansessions.service 198 BLAKE2B 2660b62182aecd274786220abe4616f3862934
 AUX x2goserver-4.1.0.0-Xresources.patch 1139 BLAKE2B f48f329836a86958866836949a44ccd6c37dc56b3da85366d8ab9a5ec003bc50a10f262211c9de3f2512aa497746d4ad43d1043fe6a36caf3905981f3d551e3c SHA512 42dba64bb8a0c278ca81f4e41236c17ea01c8294914f0051d4781c701b4356ccc05ee6835b0688b79205e0cd7a4c9ebbe418aac685a982db00fa293d48a61300
 AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e2767047dcd94ebb61b0418ba5d55d55d2860530ab818b87192bdc85124be6a9d52d5c19872063555b7bdcd721429ccfa8593cabb SHA512 7b56c725c42f0813ecb88ed7f34feb0cecd1eaedd157c19068f3e6607bd8510fbba177079744f9e93fc83a4bcc65e7df40f8b1bb6acf4124fda847bc4fb86986
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
-DIST x2goserver-4.0.1.22.tar.gz 101286 BLAKE2B 238da88d333b6bcb31b37b7d5e44d223ad975388fdee0cfb1ba21c58d5ab9a42961c7fcd55e474affd29197bc92fcbddf8c679eab8052387996b983a9e0244ba SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67
-DIST x2goserver-4.1.0.0.tar.gz 132386 BLAKE2B b24b29f2eebaec04061690b51cf00f65de256ce2f68b57909909fe88a08466a1f802ead00ad9cf62a5327c2b7bc6690feb7c26b8b5b711757e88a553586fbe1a SHA512 3f48dced332729d726bffa991a7a203035fc6580dd2e094561f52b327e7c2e48b807daf68219132fbec29b5abcb865021361a35654792e58da1f2e4715ea95d0
-DIST x2goserver-4.1.0.1.tar.gz 137553 BLAKE2B a7ece36332a8aa583491103e23e37fefb3ec13d8e73cb43382d7e3cfcd3b1bd32706356a45091f34335a07cc5b1bc549a5d275e1ee207b740a0c61248da74be1 SHA512 cd201cef75585d1c918d481710ca03608cadff9c5adba073e48750b5c9dcefe70f1d7ae0d77aa619e2bb3fffa644f8da261bc486e0dced4094d179888ddc9964
 DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17e4f743ab6a01779bcf0252c2c34d4525919ae71deef190bf835713be2f43d25fa41fd5c82e99280f0dc77927af7006 SHA512 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672
-EBUILD x2goserver-4.0.1.22.ebuild 2745 BLAKE2B 46368f9d193c2961f8a7643e36caf60c4e3e7917a5b0279e31e50e3132851c132c7d4398404de69cc2d7b786b993e250f39aec5d3b81de779f89be0c74b6b063 SHA512 085e01dc8fe8fb4b7e7d609db05852deaaec28a828f0ea7d27d17e02b6972240078b790a13b77d1df0dba826407ec4369b739cfd2a01068429fae9978025a85b
-EBUILD x2goserver-4.1.0.0-r1.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
-EBUILD x2goserver-4.1.0.1.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
+DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a
 EBUILD x2goserver-4.1.0.2.ebuild 2711 BLAKE2B 188f91ad888a632a3ecbba4ea6b4d9ad8f909bcd01d72eb5734b4304765dc7157325e0420c5c332681b15f5cff243ede8629ea368f2546dbb7fe0a288a2249ba SHA512 eaa56966049689fbfac0fcccaca74a62bab669a06b94ecadfa530c344ec6c280e1bb7252a9d69845fe66ea7fd14e341897080890cad633e75b32568255614730
+EBUILD x2goserver-4.1.0.3.ebuild 2808 BLAKE2B 0df9cab0798ec472ca3bc3edbd60236fe9108b79945575c90e4a44fb48df4d0e95cad70833ad714c95521c22d8ed10b5084d5eec4d4d8bed7a0c5c20bdb10719 SHA512 31ce8f596388556bc75acc46f9a999711fc9261e4b6d871bd27ed9d40840e1f80dc29431c7d1059185a86ce1c2975c6f3502c17cf05ec1f8a224e92f1875a09b
 MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
deleted file mode 100644
index b875b6ca9daa..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib systemd toolchain-funcs user xdg-utils
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.0.25
-	net-misc/openssh
-	>=sys-apps/iproute2-4.3.0
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( net-fs/sshfs )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-PATCHES=(
-	)
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	# Do not install Xresources symlink (#521126)
-	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym ../../usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		elog "To use sqlite and create the initial database, run:"
-		elog " # x2godbadmin --createdb"
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL database, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.1.ebuild
deleted file mode 100644
index 36e6bdd7c3dd..000000000000
--- a/net-misc/x2goserver/x2goserver-4.1.0.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib systemd toolchain-funcs user xdg-utils
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Switch
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.99.14
-	net-misc/openssh
-	>=sys-apps/iproute2-4.3.0
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( net-fs/sshfs )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
-	)
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	default
-	# Multilib clean
-	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		NXLIBDIR="/usr/$(get_libdir)/nx" \
-		PREFIX=/usr \
-		install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym ../../usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
-			elog "To use sqlite and update your existing database, run:"
-			elog " # x2godbadmin --updatedb"
-		else
-			elog "To use sqlite and create the initial database, run:"
-			elog " # x2godbadmin --createdb"
-		fi
-
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL database, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
index 36e6bdd7c3dd..4cf26cef1e03 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit multilib systemd toolchain-funcs user xdg-utils
 
 DESCRIPTION="The X2Go server"
@@ -52,6 +52,9 @@ src_prepare() {
 	default
 	# Multilib clean
 	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
+
+	# Do not compress man pages by default
+	sed '/^[[:space:]]*gzip.*man/d' -i */Makefile || die
 }
 
 src_compile() {
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 108e1a19a058..f78fb33ee415 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,12 +1,6 @@
-DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
-DIST youtube-dl-2018.10.05.tar.gz 3044157 BLAKE2B c65651eebda6bd9c28245415f7aa804c78a74fa33a9717a3e9589734334ed8d12d5432eadd18d55ee46d4b51b1cacbe458c2ad175ed2e135b838fac54d468192 SHA512 b581372522d467b3277d81bdc9978352c720d4f33e0d8249cd0271eb1814a153324a5b34608d88d392bb52b1c57d0a6f425baf8377d5609810ef770839586714
-DIST youtube-dl-2018.10.29.tar.gz 3045428 BLAKE2B cf21d3113c07b7d62a373ada4a366fa61231eb8aa7f14192683451c99cf3f4f59d1abc04053359c2c3b40e7f80cfc2c5325f66a1b73196bb561a2244988f5114 SHA512 86f94acc888084348466d8aabc3711f25cbeb28c9a7afe08dcf23034d3b43d0e0a9c58dab60fe9c7eb2ab8ce2e3ce97b849e1eb11f547d173bb25dbb9df1b39f
-DIST youtube-dl-2018.11.18.tar.gz 3057924 BLAKE2B eb995cd269c3febcda950d87466df85a31128aaf95dbbd1cb9ee3d329610ffae3194c57f5063b47e49de3e387b5f60a5e10c237dc5d944ce47a6cffacab31935 SHA512 47e503c18f2db948beeda6a61b034953fab61d7d122641be7564a0f6dc0fe66ff93d6ef436c2acbcaf7255248a0b53e4df8c5ed1efca1139dc518a3ffacb737d
-EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb
-EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11
-EBUILD youtube-dl-2018.10.05.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
-EBUILD youtube-dl-2018.10.29.ebuild 3439 BLAKE2B 2e9fcd2e40f815a9d75bb7adff01f12afa5345c027f5dc55b9e20b30a3055bef402d66361048a9cc6cb71e1e6b3982e3b059bee837fb8d36c886be616d078490 SHA512 b46ab94dffbea58076d3b83de105a1c51ed1ae2213ff9b26b074cdcc41ec8ed97223baf92aec78ca2c56d0614826893a01ee0ca8e2e5667561dc43fec12ebbca
-EBUILD youtube-dl-2018.11.18.ebuild 3441 BLAKE2B ad19ee4cbb330369e7a007d43d9c44c3cf2ce2f2ecf6d0900d47aa8bff6940a5a6700e600391b2b155b0dc4128dbcc9d779ef72cb647c34f523c715dd22c8e2d SHA512 549810dea84371496b5d4c284949c9d5f3fd6aebc126223a1f7b03b92dfe1f4f2920c15224b774bfbb1ed0278256dfb4c8b1df86e70cdb4ba83cc5906c228c04
-EBUILD youtube-dl-99999999.ebuild 3308 BLAKE2B 6bf8e21c62c0da4f88a67f785a7304ea014022db3872fd1ff678184e2142e4d9337387287c925a08d783b5b5a0b9cb679320df27abb3f1145f577b7370c42c1d SHA512 31c0050ec83f3261432c8fccfcba7986019ee8e72655ded191053d08c7d209f7cf74fa6455d2565fcde061cc31a2e9f03fa550d24aed3090c672064731536410
+DIST youtube-dl-2018.12.09.tar.gz 3073427 BLAKE2B 2b97f062d2e32af71c491ab518d9d86b8fdc6c93f96052ec931b72752e8d5dc5064a24719bcbbd700dbae5b18f5ada7a447245ecc88c952f357d0a90c702bd9c SHA512 00e233cfe21cbaa871e8ef4478c052a06129d24d8fd509de2aaf826a44eb9fabd370d931e8cc58af2406d4ce07bb2296a8bf675e818e55dde3d92c72073a3596
+DIST youtube-dl-2018.12.17.tar.gz 3074432 BLAKE2B b6f4b3a7a2c2159093494230219914ee4a2f87194ebe741cc4687aefa76dfef09c282bcc6534030bb65cd87a641b05cc74bd74eecc0c78b57157970fbea98121 SHA512 88d98391d110d6542503590c4735c765137cde43bc3a1f1b33b197d323a1226ed550d559f67bd4aadab3c82de8a471fa71bf4e1440e5641e1c51ba5cb7059904
+EBUILD youtube-dl-2018.12.09.ebuild 3410 BLAKE2B 8a6e7ca605c8c39c98eba0b01f5c5c1cd3c03b08d963043125f57e1cd87a50cf16a685bbfe26374d5dab07248ca031ce9015fa300d3084896062fc50a8c3f938 SHA512 ca156bc1a202c3a5001f176356c61d8a0ae31c697ff930773adb46c4a04b5fba53766fb6b8584ded1a50c23b6f3d1db662f5af98dd78680f3880f6a6afb7e26c
+EBUILD youtube-dl-2018.12.17.ebuild 3416 BLAKE2B 7b020b6c81f433988368fef4b43a2347eeb9517ae2fdf8dc2172cad1bbe186b0ce74fa3230344a7ad5c303c978a472bf3edb3264d57ceb40473ef493d103e25d SHA512 ad59d231a9458b318ba821c68eb30aa4429d8cd3b3fc67cf21325e1b055188c6ccaf3cae36500233622bf98d4fdee91a8f47e647fb2881e34746646a1701f1b8
+EBUILD youtube-dl-99999999.ebuild 3304 BLAKE2B 62e4cfa266a5c117633a91e9fe83648f42bbbbd60e8764adca0002a03fb55b06caf224fb7997bcc9073847ca7d0055037749fd45f7521757a8e1bf9d4cc7215b SHA512 70686e618298486fc81621671f687cf11a0b56a05041be6016f4e2eed97ea215c21e869f90b5f071111f229f0d3ee49be3b3d395cd8e28900cc985d1d9d8fd31
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
deleted file mode 100644
index 53e72dce6194..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
-			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
-			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
-			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
-			youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube pornhub redtube tnaflix xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/completions
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild b/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild
deleted file mode 100644
index 45357c68f635..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild b/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild
deleted file mode 100644
index ccd279b522c6..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2018.10.29.ebuild b/net-misc/youtube-dl/youtube-dl-2018.12.09.ebuild
index ccd279b522c6..7bce052e27ce 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.10.29.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.12.09.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
@@ -11,7 +11,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-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"
 IUSE="+offensive test"
 
 RDEPEND="
@@ -85,10 +85,10 @@ python_install_all() {
 	newbashcomp ${PN}.bash-completion ${PN}
 
 	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
+	newins ${PN}.zsh _${PN}
 
 	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
+	doins ${PN}.fish
 
 	distutils-r1_python_install_all
 
@@ -97,8 +97,8 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
 	elog
 	elog "${PN} works fine on its own on most sites. However, if you want"
 	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
diff --git a/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild b/net-misc/youtube-dl/youtube-dl-2018.12.17.ebuild
index c28ce5a6c074..29fd6bd3825f 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.11.18.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.12.17.ebuild
@@ -85,10 +85,10 @@ python_install_all() {
 	newbashcomp ${PN}.bash-completion ${PN}
 
 	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
+	newins ${PN}.zsh _${PN}
 
 	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
+	doins ${PN}.fish
 
 	distutils-r1_python_install_all
 
@@ -97,8 +97,8 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
 	elog
 	elog "${PN} works fine on its own on most sites. However, if you want"
 	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 4de5d95c46fd..4713e21251b3 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -7,7 +7,7 @@ inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
 HOMEPAGE="https://rg3.github.com/youtube-dl/"
-EGIT_REPO_URI="https://github.com/rg3/youtube-dl.git"
+EGIT_REPO_URI="https://github.com/rg3/youtube-dl"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 9bb461f4bca0..2a09cbe32706 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,5 +1,5 @@
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
 DIST zerotier-1.2.12.tar.gz 6058902 BLAKE2B 851d0d871fac7f6cdd9feafb375f97181f9155c265f13e44122424bd7adcaff10e3f2c2a4484d2e2ad1f4f2f174fc723681451c1a728c9aa324bdcb02300af57 SHA512 a35029993d9266f3529a9922daa606b0d56a332514545f8cfab2092a4c9db4fc7217223f3bd7dbe59e536de325ee9b4f0226d673c0f0ec5859cf2937e8a4a2d4
-EBUILD zerotier-1.2.12.ebuild 905 BLAKE2B 15730c3a9c069e8519998e1fcfcc1c44b38b6e9ec94cf3885562a08c4ad7212af5333dbcd021326f7e606f7c5c9312e0821944b523b6afa7c96ba1409f859aae SHA512 6b504bee732d704b692b00fa18fdc8c47054a1b38a082aa83d4335d2773308c0d12886327d4454a7d95ce43f37e931940c84d082f2e88e5c5e1bfea7002ac6ae
+EBUILD zerotier-1.2.12.ebuild 907 BLAKE2B 0e22ec3b3c60feda4a13c8ae3962971fface27247ccb76fa8abbbcd50487e7ff251929548389a9519c8c938da0574c13a354891b0aa83b0c35a9408bda3e0040 SHA512 ea2df909823b40748376615d9e619104c8997f5e9395bd2600c30aa29f97af1f2cbb337f23b096170cd6ed6c9c80ff8922af32589f976cbac990607afbe6c5b4
 MISC metadata.xml 550 BLAKE2B b2337f927bef36ec75e2329459f9f654e3e786ec8d4dfa2016e42c5c857db77a539df1e2e6398483995e72d2a71f9eee3bf81df3e26501354c8bdd8ac5243222 SHA512 2c76feb941ce99247828da120bf10b4c9152065a361230b06c2717716fe0eb8798fa59eb737dff449d9c2d8f7f99025576e42a1592ac7183163bd4d8e7e9ba8a
diff --git a/net-misc/zerotier/zerotier-1.2.12.ebuild b/net-misc/zerotier/zerotier-1.2.12.ebuild
index 7d2f788b42ec..fa68ddc1c4f2 100644
--- a/net-misc/zerotier/zerotier-1.2.12.ebuild
+++ b/net-misc/zerotier/zerotier-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 S="${WORKDIR}/ZeroTierOne-${PV}"
 
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index dda94a964428..66c9ff8a937a 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -1,5 +1,5 @@
 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d
-EBUILD zsync-0.6.2-r1.ebuild 1086 BLAKE2B 1e10f4290a8f4ebabf373daec5c2ca71bfc38388c16fb6ebf6a68d4e5f68f9ccd272fe7c19142ad0c69ead49b2dbb3a3a41fe6b31aff0cd02bbe381f7a4d36b6 SHA512 e2fec8aa4c44a1380edce1a8e5ce727693924f16f2cf4addf6b450aed03f6492f84be08605699b033ae62fa35053e8a881d12ede1f5bbcd831f48947f7fbf5e5
+EBUILD zsync-0.6.2-r1.ebuild 1090 BLAKE2B 06696d2011295bb4b57f9e699562488f03f6dd1e9b7ee2f551a17734bb47773220d29b1876c61d1ce90f33c05a66658860d4254852dd6341435066df074660f5 SHA512 1b1ade2408a93f8fc0028a3c8c9dfff67174e5bc89a17bea8351a6179e162ed38dcbb497dcc3c1d108c78aa5adb1f041c75b0d9a79dc10f7898d62d0ba281f11
 MISC metadata.xml 1248 BLAKE2B da1ebc159e8f07cf0237017bf86cda2dc162472539ea5b8777c0f9f12384e6728eabbf0dc0d87823c5480b6a905eb533042ef2ca9ec1b83a52f6cb9e4082bc58 SHA512 ee5763e3797b34d9b70bdada81f187c7d61cf155a0c207b6b70067a1407770dcdd2f7cce93f796fc022bed0577935d216e57f3260cf1a2a0a23672dbd610c04a
diff --git a/net-misc/zsync/zsync-0.6.2-r1.ebuild b/net-misc/zsync/zsync-0.6.2-r1.ebuild
index cc19d4024ce0..39625dc9ac89 100644
--- a/net-misc/zsync/zsync-0.6.2-r1.ebuild
+++ b/net-misc/zsync/zsync-0.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE=""
 
 ZLIB_S="${WORKDIR}/${ZLIB_P}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-misc
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)