gentoo resync 08.09.2018

93 files changed, 1092 insertions, 793 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3fc5722cf6e9..13ab7623accf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index d4d2755638cb..ba5662426a67 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,8 +1,6 @@
 AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
-DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
-EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
 EBUILD aria2-1.33.1.ebuild 4277 BLAKE2B 8fe6f7b2df6988e9e89ae3da97d7d6561b28ac0fe4d3891147c04915158acfa806706fbb3152edb21a92ab6b7c6eb1413cdb36b03512ec45e4477e93591fc44d SHA512 5b79fa4264165da13935a75b20edb66edf315e7cb37180e0f02723209190d1c455b950844464557b7d5461d3048559a30835a8d7d067ab37cbf62d4227f221f3
-EBUILD aria2-1.34.0.ebuild 4324 BLAKE2B 9893b39ea8e7a7445ddcba77896f123ea076ef2a716e113da6dece94b0a83618b21e12c2c0733c1015dc389606b38245294ccf98f30d35c2245b433fe5becb9e SHA512 7a38eeb6f2017a5a2a18720f27ffdaeda028221f71f88cfe4074fb32962a8f4cf9c12290610788e614e8013b56acc1606b32f57e669ae9a45c2a2b3aa978b265
+EBUILD aria2-1.34.0.ebuild 4323 BLAKE2B b390a7fb675010a26cda3e9ffc5dc6f6b15b19c07cda307f0adbd90ee3e807c57833c43927633070d024fda721895c95c3293fcbf9bcaf4240a815ee1aa2b575 SHA512 dcdcb363d7f3e7fdad8b6637cfc870fbc34cb124cf7bfc4831753035306e2a02cf139087d5467cd279999b59516b2acbcabacb4c35e7ef1b278f43294ed3b550
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.30.0.ebuild b/net-misc/aria2/aria2-1.30.0.ebuild
deleted file mode 100644
index fd1ac628d47b..000000000000
--- a/net-misc/aria2/aria2-1.30.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( dev-libs/libuv:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild
index aa58515c9fb6..f941e79d8c01 100644
--- a/net-misc/aria2/aria2-1.34.0.ebuild
+++ b/net-misc/aria2/aria2-1.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
 
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index c75d825a3ff8..b06ae505d680 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,13 +1,15 @@
 AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b
+AUX chronyd-systemd-gentoo.patch 765 BLAKE2B 541cf597dcecb800f569847e813edfbfaa13130fee2d1b991de710ff2936cc593aad65497505e99da3f563288e0d52d52432f392817a45c5fcf123a5af370d7b SHA512 0662ab22428d221f62e76e97217c8f5589b54d12deac7d4fc2f9359987b57f39d7c42e6a10c3b97ae0c17b57d63cd11e8e586110194249f7ed2d5dd0fb9a8041
 AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640
 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
 AUX chronyd.init-r1 1637 BLAKE2B 046896f6eaf0a9311a9b3cb7cc6360f4bffaee95067efded8358e1a925da5468e3aa3eed972818aa171ea14c0a3625793588ba6853968cc541a942ccc3597f92 SHA512 cbfafe8210cc3d86d417d590fa6c54924ef9f3487c3766a17fffb34d2421a5fc2dfb98ce53dcc33c5811e7c2fd428a235bfde68d999cb50c7d9e5100f769a37b
+AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 AUX chronyd.service-r2 261 BLAKE2B ac29cdd2e717060b5af68608db8a7b3dd8aeb90225edc5b48ea84a8537017d531519a00fb394934c270eb965a615b0b53188bf8bd16edd645074b497ba91fa9e SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe
 DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b4881fbd0e19d966dca86ed6973c31618b1ae56b59cad989144bf59a0206328d50d9eb436fdb058684e74a1661 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427
-DIST chrony-3.2.tar.gz 433882 BLAKE2B 4351cd22efbb2c819f09a562b2e0c1851336f8973b37b3015ec6acc04b925e13c1207262d4561318c187809bf989710d9a8fdf54e93b3d3dac56d0d6df8782df SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4
 DIST chrony-3.3.tar.gz 443571 BLAKE2B cc35f55b8d63eed85495f88b71c9285c68867a28b27c6c5e7d4475a77857ce4a09fbe561906757d66fee13b19d9ee750d41518050048776b2c0ef600407632e9 SHA512 36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0
+DIST chrony-3.4-pre1.tar.gz 451934 BLAKE2B 4cd5aaeacb3bed5cc3c9b79d9fe5f02b79f6e2a9f7eb6be6f159e257c9780ce3b77d379633e9136cea8d4ffbb1f024e71c8e3bddbaab9b4a126cba30be4f4b23 SHA512 b45c2f94060ee4f5917d49420a726c412231cb8c3fdc4475465daee6d24d809ae6cb146332e88c975d58f969de357d1b9e2fb3a1c66e35f988f6c8828b39f9a3
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
-EBUILD chrony-3.2.ebuild 2912 BLAKE2B de9d8eda478642e023ac95abc3009930644354ce75e145d989a003a61c1273ddb17e2a29255cab98199cc74c07553f866a85355b9255ed26a276abdbbaa08b34 SHA512 846d29b2b4fb9ff2c250a0d07a5b31ddba0e0c8e08ec625535ae7143f271f6f751a155768ddc91f474f75b677bf158709304b38c43e904a51220ca6f2b2bc612
-EBUILD chrony-3.3.ebuild 2912 BLAKE2B 44df07e01650a66bac1b2c0e88975f7c7ebde7ab58156ecc0dc46cf0d3189931b53552b2342da55ac6091b1a426809e5733bc38c0528f8d0f000e2d32cbf584d SHA512 8bb57308a4c506e46a101111584ab8fa9a01e0ee86333e2661a33a70d5ae73cf92b5dfc8868f588551b9a4d6f892cf7c5b951556b777bc7c936cb44ebf157966
-EBUILD chrony-9999.ebuild 2796 BLAKE2B 24f9468445a0b1bd820740c97d7d764825bdda4ce7e271a6e18ef48b05f5d692ead4d6f248dfbc5ab22373a6b06e106722faba7c8c1c42bd61e2d726b2c46997 SHA512 9d662c832a48613a7de249e4444cd0fc6f4440826e4d2cd0c6630927e8a1b179a21f341931899bb970addfb3c5b380738ac76f443dab665909d09925c5315f2a
+EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
+EBUILD chrony-3.4_pre1-r2.ebuild 2913 BLAKE2B 407081e189b5664f6899671ae75d28e544aa5bff61e4a510083f45155d06a82ca6c1589284bf73018fdfd79d0cd411456231519eb802de68a1b2bc1e42893ca3 SHA512 7502287f4b9a2e5f9d006dfdf744756b66abd4f920a4214ac2ab4183b7bab3b4427babf16eda204857b839f79cd7d7aa6ed223e8c7de2c21975e9629d722c757
+EBUILD chrony-9999.ebuild 2800 BLAKE2B 39990629d85aab317f84e1e083e3b94b28c27834116108d509c213f297ca4e2d1b1d87b7d7ccf75206004b5813c1f6d3b50b33b4fa9bd50f04f485865465f7c8 SHA512 b8120434e2646b91727b63560f5002ea7c97696f780eeb02a91c97ee1de053a093eb3009b8721c139ab20ff15dce857e7d4af00fd51ac9aa3624b5282dadd386
 MISC metadata.xml 1566 BLAKE2B 94f800f032197823ff746e93dcb8955a273a0712add991415852d5192c09b465aad40aca121f959442b83fd225becacb063f4ac28b8a7bd035ca65aab2ed3ecb SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84
diff --git a/net-misc/chrony/chrony-3.3.ebuild b/net-misc/chrony/chrony-3.3.ebuild
index c3aed38aa99e..a34cf9102e49 100644
--- a/net-misc/chrony/chrony-3.3.ebuild
+++ b/net-misc/chrony/chrony-3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
diff --git a/net-misc/chrony/chrony-3.2.ebuild b/net-misc/chrony/chrony-3.4_pre1-r2.ebuild
index 83b487ade7f7..2b17b91c999e 100644
--- a/net-misc/chrony/chrony-3.2.ebuild
+++ b/net-misc/chrony/chrony-3.4_pre1-r2.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
@@ -36,13 +36,15 @@ RESTRICT=test
 
 S="${WORKDIR}/${P/_/-}"
 
-src_prepare() {
-	sed -i \
-		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
-		-e 's:/var/run:/run:g' \
-		conf.c doc/*.man.in examples/* || die
+PATCHES=(
+	"${FILESDIR}"/chronyd-systemd-gentoo.patch
+)
 
+src_prepare() {
 	default
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
 }
 
 src_configure() {
@@ -75,12 +77,13 @@ src_configure() {
 		$(usex rtc '' --disable-rtc) \
 		${CHRONY_EDITLINE} \
 		${EXTRA_ECONF} \
-		--docdir=/usr/share/doc/${PF} \
 		--chronysockdir=/run/chrony \
+		--disable-sechash \
+		--docdir=/usr/share/doc/${PF} \
 		--mandir=/usr/share/man \
 		--prefix=/usr \
 		--sysconfdir=/etc/chrony \
-		--disable-sechash \
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss \
 		--without-tomcrypt
 	"
@@ -97,7 +100,7 @@ src_compile() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
 	newconfd "${FILESDIR}"/chronyd.conf chronyd
 
 	insinto /etc/${PN}
@@ -116,6 +119,5 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
 
-	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
+	systemd_dounit examples/chronyd.service
 }
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 1878efaf91d0..3281755d0869 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ IUSE="caps +cmdmon ipv6 libedit +ntp +phc pps readline +refclock +rtc seccomp se
 REQUIRED_USE="
 	?? ( libedit readline )
 "
+
 CDEPEND="
 	caps? ( sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
@@ -33,13 +34,15 @@ RDEPEND="
 RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
-src_prepare() {
-	sed -i \
-		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
-		-e 's:/var/run:/run:g' \
-		conf.c doc/*.adoc examples/* || die
+PATCHES=(
+	"${FILESDIR}"/chronyd-systemd-gentoo.patch
+)
 
+src_prepare() {
 	default
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
 }
 
 src_configure() {
@@ -72,12 +75,13 @@ src_configure() {
 		$(usex rtc '' --disable-rtc) \
 		${CHRONY_EDITLINE} \
 		${EXTRA_ECONF} \
-		--docdir=/usr/share/doc/${PF} \
 		--chronysockdir=/run/chrony \
+		--disable-sechash \
+		--docdir=/usr/share/doc/${PF} \
 		--mandir=/usr/share/man \
 		--prefix=/usr \
 		--sysconfdir=/etc/chrony \
-		--disable-sechash \
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss \
 		--without-tomcrypt
 	"
@@ -94,7 +98,7 @@ src_compile() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
 	newconfd "${FILESDIR}"/chronyd.conf chronyd
 
 	insinto /etc/${PN}
@@ -111,6 +115,5 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
 
-	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
+	systemd_dounit examples/chronyd.service
 }
diff --git a/net-misc/chrony/files/chronyd-systemd-gentoo.patch b/net-misc/chrony/files/chronyd-systemd-gentoo.patch
new file mode 100644
index 000000000000..63d6b7ed3398
--- /dev/null
+++ b/net-misc/chrony/files/chronyd-systemd-gentoo.patch
@@ -0,0 +1,28 @@
+From ba3ddefc90f58d30a365104cf6e930333e3a2704 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 4 Sep 2018 13:01:06 -0400
+Subject: [PATCH] Tweak chronyd.service for Gentoo
+
+---
+ examples/chronyd.service | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/examples/chronyd.service b/examples/chronyd.service
+index 1777413..ceed830 100644
+--- a/examples/chronyd.service
++++ b/examples/chronyd.service
+@@ -7,9 +7,8 @@ ConditionCapability=CAP_SYS_TIME
+ 
+ [Service]
+ Type=forking
+-PIDFile=/var/run/chrony/chronyd.pid
+-EnvironmentFile=-/etc/sysconfig/chronyd
+-ExecStart=/usr/sbin/chronyd $OPTIONS
++PIDFile=/run/chrony/chronyd.pid
++ExecStart=/usr/sbin/chronyd
+ PrivateTmp=yes
+ ProtectHome=yes
+ ProtectSystem=full
+-- 
+2.18.0
+
diff --git a/net-misc/chrony/files/chronyd.init-r2 b/net-misc/chrony/files/chronyd.init-r2
new file mode 100644
index 000000000000..4892a57b1636
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.init-r2
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use dns
+}
+
+checkconfig() {
+	# Note that /etc/chrony/chrony.keys is *NOT* checked. This
+	# is because the user may have specified another key
+	# file, and we don't want to force the user to use that
+	# exact name for the key file.
+	if [ ! -f "${CFGFILE}" ] ; then
+		eerror "Please create ${CFGFILE} and the"
+		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
+		eerror "by using the"
+		eerror ""
+		eerror "        chrony.conf.example"
+		eerror "        chrony.keys.example"
+		eerror ""
+		eerror "files (from the documentation directory)"
+		eerror "as templates."
+		return 1
+	else
+		# Actually, I tried it, and chrony seems to ignore the pidfile
+		# option. I'm going to leave it here anyway, since you never
+		# know if it might be handy
+		PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
+		[ -z "${PIDFILE}" ] && PIDFILE=/run/chrony/chronyd.pid
+	fi
+	return 0
+}
+
+setxtrarg() {
+	if [ -c /dev/rtc ]; then
+		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+	fi
+	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	setxtrarg
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Starting chronyd"
+	start-stop-daemon \
+		--start \
+		--quiet \
+		--exec /usr/sbin/chronyd \
+		--pidfile "${PIDFILE}" \
+		-- -f "${CFGFILE}" ${ARGS}
+	eend $? "Failed to start chronyd"
+}
+
+stop() {
+	checkconfig || return $?
+
+	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+	ebegin "Stopping chronyd"
+	start-stop-daemon \
+		--stop \
+		--quiet \
+		--pidfile "${PIDFILE}"
+	eend $? "Failed to stop chronyd"
+}
diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest
index 1da950e752dc..22390b9edcd0 100644
--- a/net-misc/clusterssh/Manifest
+++ b/net-misc/clusterssh/Manifest
@@ -1,6 +1,6 @@
 DIST App-ClusterSSH-4.01_05.tar.gz 71502 BLAKE2B f9e1f9de36173c766a382660e34adee3005a64550a90cafe59101fd3f4b66307990e254334fb270398c9e36a9d27657a27e7348b1223a7ccef04181f8c88809b SHA512 4b63b91684c981a28871e5264502c66435b531ae3c4bad2eab2571f8b237d43e5f45ed93d036e7497c713f2982a110d93a3055ae0004d4f33e7786df9aa56ff8
 DIST App-ClusterSSH-4.03_06.tar.gz 81476 BLAKE2B 6b513cb86fd4827eb510dd26ded9aa2d45ac1fe484dc10b8cb841c8b1fb50c7f279cbc6a63e817acbbf66e4aea5faa4f32cc612c387d018bf09abb18919fd7d6 SHA512 87dff4c0445436c10929bcf30a9295deb6ddacca16939091fdab0cf67765c77706745ce8e738145ea6c67ec06093567b7668e4387a72b48018f8e173da5709b4
-EBUILD clusterssh-4.03.03.ebuild 1063 BLAKE2B 9d9294318d34498dfc209486dfdbd3b59c403d030dad613b18577fa9f3107379d655df06a9abd00e5193fb8505a58fcc3d85cc584ea590419941d110f83b5b5c SHA512 990f533aafc4dc25e6c351150cf1633a2f27641f5ad2baebb78c719ef26f2df109c572d7231cbb6081a31ee39855eebf8b571a93cb7b544060dafa2828631a81
-EBUILD clusterssh-4.30.600.ebuild 961 BLAKE2B 1dc6de22d691385c0edfdb51a286c37d75ea4928693d4708239fddd9122f64c4dc11df5f954ed2d174543e6b2031b3bbf97a305e8e77b2c7e442e66f2df71c7a SHA512 3083c5c28e51ac68f5c02496955877fc245e987149d2fa32f609e88f5f612a2415dcd48d59b7d61736b5144c54c306472c6d8e2147e6c1ba7200db1fe1be187b
-EBUILD clusterssh-9999.ebuild 864 BLAKE2B 96123b50ee9c0dd0f94b60f7cf4eb8404d256009a9d4807f1f210e6855a4c39110373cb4364349bbd8a3229a8e69ddf245630460382d4e49eaca525ce91dbab4 SHA512 29931cdccc35a84bdded49728598741107e6c46c9203c70eba2557251d805d1a597c99a3f156744eb35b986cff4d21b9a7524408536d138deea509bfee646911
+EBUILD clusterssh-4.03.03.ebuild 1065 BLAKE2B f23dd97279973da977a7b1708f845d67d27b9702cf431b6a6c91eec688486913558a9d68c0ddaae56abee527e2c910e8687724b99b6779ba1ef9c50a80f2bd6c SHA512 2f913d2a0dac204bc7a1623c5366d10f5446ac33e0fb22f68a90a4f3816a18068f3c1d619888d3aae0e75f9c1d0c0fb9cfd2a93d5a31345f6908e199fd719a47
+EBUILD clusterssh-4.30.600.ebuild 963 BLAKE2B e283618433cf1e67cd249d23986300b23d42b1696af991c77e1b1ae6b67fa43c0c2be0bdfbfb6d4d37fc0d0422c409d2efec996deb316c283bfe08a25faca81a SHA512 d206ca3467498443b3f1af7adbb194327203c967d81daaa2da9d55510a547bd9add8e1f81e27844450a46728c700ee60b181ad015e6ead9e4f0086b2889b631b
+EBUILD clusterssh-9999.ebuild 866 BLAKE2B 76da367ac5db0878a5058db827f281a143addc552e75a3c73fea8fe485af4247bd824c7f89b94b19575b60c6d99fc40960733bfd21cafab5e1566ef1d28b1e6e SHA512 2d3d680ff71842dd405c8b527e3e728faaffc0f45c8cc8addfff9ea3d142882658798d804e0fe3870eb82f9ba5a8590f26439dcdbd1f10225210446238efe3d5
 MISC metadata.xml 708 BLAKE2B 7b8f81297e6627f6d072cb45a58319f12879277a5b2f414b6f3b7d0c0bdbb0358cd278b6d35e1bd4b01a4185a4f227706a43f21874c0bd36e6ba124eb9cb05b0 SHA512 f4033f8bfeb926bfb4a3ad935988068ed53eff91e35cb3683df27c8d56f095b7873a66fcd2e56c79df434a51fa1796c265d9d89334d3538b4f6a9f42755089f2
diff --git a/net-misc/clusterssh/clusterssh-4.03.03.ebuild b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
index 49423a9ddc38..863fe1fd08fc 100644
--- a/net-misc/clusterssh/clusterssh-4.03.03.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
@@ -10,7 +10,7 @@ MODULE_VERSION="4.01_05"
 inherit eutils perl-module versionator
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
-HOMEPAGE="http://clusterssh.sourceforge.net"
+HOMEPAGE="https://github.com/duncs/clusterssh"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/clusterssh/clusterssh-4.30.600.ebuild b/net-misc/clusterssh/clusterssh-4.30.600.ebuild
index 13ac11db5171..46eaa9f27080 100644
--- a/net-misc/clusterssh/clusterssh-4.30.600.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.30.600.ebuild
@@ -14,7 +14,7 @@ MODULE_VERSION="4.03_06"
 inherit eutils perl-module
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
-HOMEPAGE="http://clusterssh.sourceforge.net"
+HOMEPAGE="https://github.com/duncs/clusterssh"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
index 7d055614d0e9..28e0fdc6d1d7 100644
--- a/net-misc/clusterssh/clusterssh-9999.ebuild
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="git://git.code.sf.net/p/clusterssh/code"
 EGIT_PROJECT="${PN}"
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
-HOMEPAGE="http://clusterssh.sourceforge.net"
+HOMEPAGE="https://github.com/duncs/clusterssh"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d6b5945fe4d8..7fc3fcddbe7f 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.60.0.tar.bz2 2938400 BLAKE2B 1c80e63094b6c0e8c63265ed7a62f75aac2ba13cf86ba201d69837f32c6b0011599a33507e65234cf3dccc5aa08ee558ff9c52998c50f0288738ba3992b6bc65 SHA512 c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9
 DIST curl-7.61.0.tar.bz2 2949354 BLAKE2B bb9fb6155aa6031d000081fa17410e772a58ec111401e7854ad0148c33169f1a7067bb04029965f117be7df20c51a6157bf93fb6439bc4a2d25849a4784baadc SHA512 4907234c75a9e52a5b81cf895bcc811d7a69f1db84a9ae1adc3af360e8cc4371f58c00925ce6bc5170f2a8072848da47a52c41f4bfedcf14274ec75802afcddd
-EBUILD curl-7.60.0-r1.ebuild 7214 BLAKE2B c146b26c7a5872dff04bf4a77511df27597749ef09ddd625092e79fd6a6b756c65ba11f18fc4cf30f19c5480b6d44e083ed47a16aa5e79d66320556c26906ee4 SHA512 5a3ab159fdbff04d492a2e34f3f581944c163115bf52c4975bb9cde376101657435da985c522720651b7c2a6904de61087297bbcc22203f3bf8536d6f8d2f199
-EBUILD curl-7.60.0.ebuild 7190 BLAKE2B 36875f071012e815144664cc3a697702e53969d84c4bfd77d36c378692a288ad8744c563ed97228a19bd00396085d5d1ddc0e8d93d8aa8fcf36b70f95ce74542 SHA512 e133adfcfc13eca9b7ec229b8d53a9fa3e56b2af97f4687d4c149bafa05ed7d72c1587b59da21ab24f1f10e87bb20edb83ab99cc7d009e3297a6c421e3a6b8a0
-EBUILD curl-7.61.0.ebuild 7201 BLAKE2B e5dac489e9044ca4e546aa6a4a2d34b492a5849b33fc18b5c5fc3f325376ab95662700986aa3a398ac795f32ccca619e154bba19d238172149f80409e1540aa7 SHA512 7ef55c99f8571b24d931c971065239dc42899164acec1149d270f211b917be0bc0661ef5ad19d71ecd0d65da483116068511e431644737c40ea503c746cf19b1
+DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660207f512974f9827c53037a95b935a6020620f926eee85339fbc558be5585f2a4c001bd287c4d33795e6a6dab5 SHA512 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5
+EBUILD curl-7.60.0-r1.ebuild 7203 BLAKE2B 1302225c56ec6d716f61a991cbcc6a22dbb3f3afb0d7c004c7d2781e27dd2906122c0f5e551c9b94f72ec95897f8ee6386faa323f93d26bade91d4d2ca63e014 SHA512 fa7af993d95984b8cda2be0abe798b9c9a4f41b92210d8b10beab7e08ab7f51608ff7a3c96dc508837ac81ee5508b102f60f372dd750c5c6ce460929d6799f59
+EBUILD curl-7.60.0.ebuild 7179 BLAKE2B 279d31842ec1e10dc54f45d18164ff6cc29119c6540d2284d5710ab569a1550ce0112e5c76d96fc5879cea9c502711269fc130d32e0eb43ed1029bda3f08edbf SHA512 012886e831b66d1df5e2d577c6e148c6081f0dc729df06671c672e4069e7377e3f2670dc72b5820d34c775a9991a839cf1c727595fc2b44c87e23df7a36119f7
+EBUILD curl-7.61.0.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6
+EBUILD curl-7.61.1.ebuild 7196 BLAKE2B 068454eefa89a11158dc2ecf4895a3aa1af1ca87a11b56e8b67c78d50a1e8d38bf140b284d88d3001bc0ce2bfe21dc4cc1952b2ddec23f3222ef7375e2171100 SHA512 3ceb5226371240d4adb13d6fd60b162505162a7e51eb1be8586619f0b1c2ebc01cf18433e4a335d47a4f8856d748845f2e044c5bf76da2e8630d4548959fa009
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.60.0-r1.ebuild b/net-misc/curl/curl-7.60.0-r1.ebuild
index 4fc764769388..703e9d8df206 100644
--- a/net-misc/curl/curl-7.60.0-r1.ebuild
+++ b/net-misc/curl/curl-7.60.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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.60.0.ebuild b/net-misc/curl/curl-7.60.0.ebuild
index b45fffd3d353..2a7fd3b4e0f8 100644
--- a/net-misc/curl/curl-7.60.0.ebuild
+++ b/net-misc/curl/curl-7.60.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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.61.0.ebuild b/net-misc/curl/curl-7.61.0.ebuild
index e09b22460ad7..568697aa80e0 100644
--- a/net-misc/curl/curl-7.61.0.ebuild
+++ b/net-misc/curl/curl-7.61.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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.61.1.ebuild b/net-misc/curl/curl-7.61.1.ebuild
new file mode 100644
index 000000000000..f25694aee71e
--- /dev/null
+++ b/net-misc/curl/curl-7.61.1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:= )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin17 ]] ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=637252
+		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+			configure || die
+	fi
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index ea75b24c6c3a..922d6990676a 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,11 +6,11 @@ DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802e
 DIST dhcpcd-7.0.6.tar.xz 210392 BLAKE2B c343ebfd42cfd0c76d3524cab799d05e3ec0c1735fde1703613a60cd4e3a656d4a1428ed8a84f7d66ef4d39ffb519ab7eabf4d7c765e6dec93386ccf7d84f363 SHA512 5885739e60d6eb4fded117cb87f59a073ae6e8da8454dee56d8e7c5d33778e413e121d28a22163ebf31e4508a21d3a21c1d17ee6d4551081db2ee8e5384d44c9
 DIST dhcpcd-7.0.7.tar.xz 210572 BLAKE2B 4ba70c32fe012930928a8c3363c8fe3f655943883ff521fcfb3b5b75950be2e7432ca79e52298a119fc70c1dd8095a28f59d4cabe62da3ad8179c0dc73af0aac SHA512 04c316f7b180bbbf48aa58273d3a28d659824e474d1ce48325f610ed2c5d2a01117f5b65b4a9697f3e8e1b85d4bdcc0b8ab75a928a8cd5723a865d8c0a065269
 DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953
-EBUILD dhcpcd-6.11.3.ebuild 3278 BLAKE2B f7d9dbf6a9d28a1f45e4f33becc4545da4db8298a107d543613035e386b8c529ea2ed21a289b943a6a3f9867f41490acfb9eb15aa791b3f526ac7d2155ab560b SHA512 a97575ba47e8912b17c228d694399af86ab928b87432a9ac6e5ed176ae3906db2fd80a044bc348203a4553571382afca619cb01b8b610b0bf7eab61b5cdc107d
-EBUILD dhcpcd-6.11.5.ebuild 3282 BLAKE2B bc9251210e85f02249a25f0861b598b587f8fcac8bf9e1524c3df64b269f44d654f6cd078b45e1597ee5114da8f17a64af06792e43c53355b1f321aaa09f2546 SHA512 20d99b37d66cf2e16892579189a32bf6586392a3c8216042f25238c7129d829a723da1e66b183edc153527b5c3036b4f588097d4a19b44c41c3d9f108dcaffd6
-EBUILD dhcpcd-7.0.1.ebuild 4448 BLAKE2B b9540c9cc1e5e4feeb4839fff89371b89b775d403a704cc64e2212d0e985aae629d22e8174849d7e2be5ed0a858511347cdb56c7653bc1f47e30afe59a0a8311 SHA512 f9b859fab6072982c8081997fa72e3dc1ae1ea48f59857f9af410644caf2826073e7c677fc46ed7b8010dec2883b9ca11dc90e40713600df2603e1595bfd7a80
-EBUILD dhcpcd-7.0.6.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
-EBUILD dhcpcd-7.0.7.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
-EBUILD dhcpcd-7.0.8.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
-EBUILD dhcpcd-9999.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-6.11.3.ebuild 3267 BLAKE2B 439fae2ecd18b8c32319fbda22fa419f288bc977b8541f07a27c43f908bfe0867addf4b949c8e9f9e4163ca6f366f2083949f9b4d895d4e4bfc858d23cc3f514 SHA512 8c650ccff0f4ffb6ee9a17046b18c7f4c0e849e25b73d3d3abea66cd423a77e1c80c830f639d2ce74bc9c7566f8d6cea968feeb52ccdd6e20a5975f08f6a4b75
+EBUILD dhcpcd-6.11.5.ebuild 3271 BLAKE2B 5064827809559cd2057813ca86889dcdb85253477a44b3a8393fcaa75944a4dab38161796b62943f7b88f88eca15a9012822293499649a4ddc125768ce89dafa SHA512 407eca53d8b7bf76702ed0e87b582ce7b88a8d4598619b192f59309fc111b9048ed222a81a1a5c9404e50b88c036302998682c41f11f049cb959a9d5ced881db
+EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B c27f5d78441c62e481f4439fbebe8454838e6e1e577b239848d6d484754e12da270674ec15ed0de27645508687160077155f0e639254b8fa2da6a92578bd619b SHA512 93e79e9148afd868ec9d0c8134d538b19d2f894056beda42bacc9a6d2ae57989e862e109fd3525e78149a6f7a83e6898972af9c2b0e21892d33aac01079946e7
+EBUILD dhcpcd-7.0.6.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
+EBUILD dhcpcd-7.0.7.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
+EBUILD dhcpcd-7.0.8.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
+EBUILD dhcpcd-9999.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
index ba2d583ce996..c355512e259f 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
@@ -10,7 +10,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
index 88c108069c9e..3880ad082832 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
@@ -10,7 +10,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
index 10a09a211b79..b7938c558521 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.6.ebuild
index bca59ecd5d70..a146481fe88b 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.6.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.6.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild
index bca59ecd5d70..a146481fe88b 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild
index bca59ecd5d70..a146481fe88b 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index bca59ecd5d70..a146481fe88b 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index b93bfd8b10ac..529411d676a7 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,3 +1,4 @@
+AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f
 AUX iperf-3.0.5-flags.patch 1323 BLAKE2B 14a7c9a889d5dd370553de7151f4103ba638559ee1111a2f8b4c479edd4af454652989843c8444dffcbb72206dd530cfe7204a80bba3123219f81b95acd8f1f5 SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
@@ -9,9 +10,11 @@ DIST iperf-3.1.3.tar.gz 549466 BLAKE2B 645e9614ef8f4e4f7949d9aaa99631eba604754a7
 DIST iperf-3.5.tar.gz 596476 BLAKE2B 756216618b45b637581318afaa5b48366061501c3ee65bbd6788ed1b6ab61073fa5e231a5212cde0a0703970c97af2511aaa59e250f2326cc1e393771828850c SHA512 f1823b5cd23b344b772a37f485e458d6b3703c11892ea4fa2abca61f474eed6229b3cb75db78adedf87092431d11c3174bfbd92833fc56dedab64953f50ac6a4
 DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
 EBUILD iperf-2.0.10.ebuild 701 BLAKE2B 6ae19ec54c963ebe5609c22370a80662e13db46e7750785da8b4087b7ba7fc8949df61ea8665b93cbf7bdfb6938f6aae57a8197af439a771b342bb303d65826e SHA512 7c2136a8ad639bbfc43929813ed43148daf6a3320ed729a2b41c464eb42f5f3eca6a5260654f21c132ac1190bfd0271fd8b5d3931f3d931ca2dbfb20750d785a
-EBUILD iperf-2.0.12.ebuild 701 BLAKE2B 30f4e3487553c28c87dee6a70896efa0164fd7506d92bb693e89a5a1ea727f8062bdf11fc49b025dbd1a3a5aa5047cbaa3c2c4aadb308139776c6d7082978853 SHA512 400962260fc149cf5f614b6dd399bafd54d157ce00e285436d55bbfa91c35ed4745720c55823b5e99ab723adf5cabcf9ee0b2eee107f9c6a70e8d0b577c661cc
+EBUILD iperf-2.0.12.ebuild 752 BLAKE2B 72acd92d2cb33a31953cd024efe80b65527ec1808308b1b90e012aa72b77585e6f73cadefbe4870b24284b6f9a2871b832c75aefdc8185169a36d199fe90c63b SHA512 7ed8c871573d7024e0d1fc168455c12f811349280964400b61c68a587927a5438d33f0bad7ba1cab60e55e5c7f625e0fd50b3614411c232c861d169ccb425f32
 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e
+EBUILD iperf-2.99999.99999.ebuild 714 BLAKE2B 084ab539cbc2937bcdeb0aa0cf8932e630c1ff4bfd828649f528240dd75800497b770690cb059bc829c6a80ad106485ca748e70887a32f74b065cd146e5c2033 SHA512 0a55b9adacba8a42e7ab42d78e5af49fc03d5ab5409ced8ea35e8a61afe1a2c3eccf098916615157f2cef057f6e2e6f8c548bc8e6b6b495b47ca9d84be7b0f30
 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999
 EBUILD iperf-3.5.ebuild 924 BLAKE2B 8c75107d844f00d4ddd50c4bff0c85748db724b54e0ffd273f6faf4f509b733a7ca014390ca0755f7ef65c1a3ddfb62f1681629bc7e20722feb892bbf4359d36 SHA512 ec4a8c4d8d77a3e0343e87cd430a53169a5892c729effb88ad2f4acf8bfa1a66cb65dd1aec8970a4c7b89c911f48563e297e094acedad045b061150123e81feb
 EBUILD iperf-3.6.ebuild 924 BLAKE2B 8c75107d844f00d4ddd50c4bff0c85748db724b54e0ffd273f6faf4f509b733a7ca014390ca0755f7ef65c1a3ddfb62f1681629bc7e20722feb892bbf4359d36 SHA512 ec4a8c4d8d77a3e0343e87cd430a53169a5892c729effb88ad2f4acf8bfa1a66cb65dd1aec8970a4c7b89c911f48563e297e094acedad045b061150123e81feb
-MISC metadata.xml 406 BLAKE2B a76547cb9d2885900ccabe6c2549039abba6b7a4a0febd58038a088957817634e7340393f0f5c0b4cb655bf54f4ecb33232040aacd0bca3070d6ea48146f70ec SHA512 98d8685483b308d70c56e436291e0229f53982bb78a953b13455eeddaba53ec4ad1d860fc1be4b9340cb89a06471d1caee938bc6213355179147923e0d7eaa17
+EBUILD iperf-3.99999.99999.ebuild 723 BLAKE2B 938e5f3ee26410c5914d036992f386ddba66dde5994fb8f039ba10975941f054f1b6b656861240e120d5d17f15155800587ba224c418a741fa2319559a02e505 SHA512 4cde5fabfb9aab82c50c4ced937abf8da0dda5fbe40fd70d1ceb7bbcf56732d6555e5fc07e76d74bd270cdb0790d2ae24403c8ae2c8f59c622a2ce4137b4b37c
+MISC metadata.xml 469 BLAKE2B b85e0e29a4d36b1dc3757d9388aa8d4f563596c59a239694ca23a4863068e11c96b2ea72c71c9539c164be36698649f88666f0b3ddbf723f8c0d324721b1aee9 SHA512 5a153502b0b521fd82c5e096c80be2de09e2cfb17e638fe1a265e9cecb3eed109b4973541d0f326e7a181cb6b9051314478fac1087b476d712a954b848c53580
diff --git a/net-misc/iperf/files/iperf-2.0.12-ipv6.patch b/net-misc/iperf/files/iperf-2.0.12-ipv6.patch
new file mode 100644
index 000000000000..cd189f62108b
--- /dev/null
+++ b/net-misc/iperf/files/iperf-2.0.12-ipv6.patch
@@ -0,0 +1,23 @@
+--- a/src/Listener.cpp
++++ b/src/Listener.cpp
+@@ -670,6 +670,7 @@
+ 
+     // Now optimize packet flow up the raw socket
+     // Establish the flow BPF to forward up only "connected" packets to this raw socket
++#ifdef HAVE_IPV6
+     if (l->sa_family == AF_INET6) {
+ 	struct in6_addr *v6peer = SockAddr_get_in6_addr(&server->peer);
+ 	struct in6_addr *v6local = SockAddr_get_in6_addr(&server->local);
+@@ -682,9 +683,12 @@
+ 	    WARN_errno( rc == SOCKET_ERROR, "l2 v4in6 connect ip bpf");
+ 	}
+     } else {
++#endif
+ 	rc = SockAddr_v4_Connect_BPF(server->mSock, ((struct sockaddr_in *)(l))->sin_addr.s_addr, ((struct sockaddr_in *)(p))->sin_addr.s_addr, ((struct sockaddr_in *)(l))->sin_port, ((struct sockaddr_in *)(p))->sin_port);
+ 	WARN_errno( rc == SOCKET_ERROR, "l2 connect ip bpf");
++#ifdef HAVE_IPV6
+     }
++#endif
+     if (rc < 0)
+ 	return -1;
+     else
diff --git a/net-misc/iperf/iperf-2.0.12.ebuild b/net-misc/iperf/iperf-2.0.12.ebuild
index 3eab18822777..95f3d7dca146 100644
--- a/net-misc/iperf/iperf-2.0.12.ebuild
+++ b/net-misc/iperf/iperf-2.0.12.ebuild
@@ -13,6 +13,9 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-
 IUSE="ipv6 threads debug"
 
 DOCS="INSTALL README"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
+)
 
 src_configure() {
 	econf \
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild
new file mode 100644
index 000000000000..ee2ce2958181
--- /dev/null
+++ b/net-misc/iperf/iperf-2.99999.99999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3
+
+DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
+HOMEPAGE="http://iperf2.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
+EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
+
+LICENSE="HPND"
+SLOT="2"
+KEYWORDS=""
+IUSE="ipv6 threads debug"
+
+DOCS="INSTALL README"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable debug debuginfo) \
+		$(use_enable ipv6) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+	dodoc doc/*
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
new file mode 100644
index 000000000000..605135d8e2e8
--- /dev/null
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils git-r3
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf/"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS=""
+IUSE="profiling sctp static-libs"
+
+DEPEND="sctp? ( net-misc/lksctp-tools )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_/}
+
+src_configure() {
+	use sctp || export ac_cv_header_netinet_sctp_h=no
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable profiling)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	prune_libtool_files
+}
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index c2391d465b93..f3c92356707b 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">esnet/iperf</remote-id>
-		<remote-id type="sourceforge">iperf</remote-id>
-	</upstream>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<upstream>
+<remote-id type="github">esnet/iperf</remote-id>
+<remote-id type="sourceforge">iperf</remote-id>
+</upstream>
+<use>
+<flag name='profiling'>Create a profiled iperf3 binary</flag>
+</use>
 </pkgmetadata>
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index e9595f2eb70f..b830d430dfa0 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -3,9 +3,9 @@ DIST keychain-2.8.2.tar.gz 44211 BLAKE2B 0916ffebbfa682480e7599d7a07a74e916ab780
 DIST keychain-2.8.3.tar.gz 44205 BLAKE2B dcdddaa31d28a401ba4aaca842a8a0c50f18feab3ecd4e2d917eb4f7c2f7c7602c369d82dc82ddf788984b94e95ce4006ee3777995d8ab48cbe9797e39f5bb52 SHA512 493f376fff386069202eadcbef61140e8e66d195e7f73574948e69d8e778bd8f2c2926a174cd25b4380c17f0fb769d423a3b36af4a98aa39f55db22c45216447
 DIST keychain-2.8.4.tar.gz 66143 BLAKE2B eee39aa4f6d0e14277cc005247fe69ba9e83fc49427e3947c5ecaaf4d9d25c92f0ff22eb5fc7cca38c86dd6320c7b7c068841a960816ed97e20ab31c77dc2fa9 SHA512 182d6c6bc1f278839b1127eb0b0b7d094a06251c86a5ebb10410e657d3cb2e7207c75aa9d1f655a5fd4b4f2290f4bdcf00b3714cb0f825e6ef9eecfc486c6abe
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
-EBUILD keychain-2.8.1.ebuild 694 BLAKE2B 111b1469003d6a19ef1d072b23edc31fad404fa1045c60f9a1ebfa49318084feb4cd895af39fb89d182585c7b3a0b5bb586fdf3f5437f276633e7a7afe14d50f SHA512 cb5517675384b266f10703ceca01e2c5957fff75c0cb0ee68a8267b97b79bb635ab8e62cdba08ab14d956a2205fa7e378deb697e3ddf94dfc2d89b17e1418279
-EBUILD keychain-2.8.2.ebuild 707 BLAKE2B f6bbda63afe716957708402db826104348553043801af48f80a9599725b084832ab560e97925149d8ed07f14bc7665dac90eb92fe5467ca8b19a364d85a5567d SHA512 2076239fcb70c9eb19262a47798ae23cce2a136c3faaf2af3d95162a53e12a4dc260a4e0b288f2ce8963abfd223c5e9042160dca772c82c38ea6acb64fa848cd
-EBUILD keychain-2.8.3.ebuild 704 BLAKE2B 1579cdc9ac29b81e4ee0da976ea9f7cef31e8cebf51931edfbf4b412e8f2ea7ff7429e168b2b0b47f1e890461939b0775e487df7d7f2fbeb5d9fda503a52a92f SHA512 55dbf6c852580c1501cb269e56c1a7b2685d959535b5b27ae1e7d677d1f6bfcf584d946e2697567ae40528a97eac625481cbeeb3c747d0d201043bc53b778f17
-EBUILD keychain-2.8.4.ebuild 704 BLAKE2B 1579cdc9ac29b81e4ee0da976ea9f7cef31e8cebf51931edfbf4b412e8f2ea7ff7429e168b2b0b47f1e890461939b0775e487df7d7f2fbeb5d9fda503a52a92f SHA512 55dbf6c852580c1501cb269e56c1a7b2685d959535b5b27ae1e7d677d1f6bfcf584d946e2697567ae40528a97eac625481cbeeb3c747d0d201043bc53b778f17
-EBUILD keychain-2.8.5.ebuild 695 BLAKE2B fbc03c6010050cb75231bba11410557908238c41e360b4bc9387f84b307beb958e2a4e90e5ab41382a06ff2e64793491248430d861a7f2d840fb6f75e28f9413 SHA512 069adecef56f5584ce35a2b8b1451c4112ba4b967b9cf140494f34a603d51c35254a479292ba67474db46219ab2403141a4c39e9eee4bca195f51edff7cf393a
+EBUILD keychain-2.8.1.ebuild 683 BLAKE2B 1bff50b1f964f89e6f393b204d9fefb00777754d5e00244402bd33c4f485c651dbb6c9bfceb813ba5ecbf54491be2019892ca119a0707456b97a82557ae520ee SHA512 73a2d899e3d970222cc0a16f32581885c92af5b932d89bb703dada9972495e1660f8cb13b4440960564140402b126029c4aed9a372cbc1ff7cdb5bf79c86310c
+EBUILD keychain-2.8.2.ebuild 696 BLAKE2B 2495dc47e0a0bc261f9d54703fe3de4b8c66588cf2bc6ca49f7b239887e64ec9aa67de2a6abf20a6673e0d10cb3c7a8b3647c449bc91fc4ea2ee519d903dff0a SHA512 63ea0b415a924091a545cf292f872e632b387d61d32ebeeabadd07b77c91e93124d4c1816b1718810a4211027f5b82520bd12d68fd4cb8fa41fed061a027ff48
+EBUILD keychain-2.8.3.ebuild 693 BLAKE2B 43f9cc51e3a2801f7f20b1db7228b9809f64c940eaf95690ba796e7e89e6067340f806a81cedfc82e0c94e5072429c9754ec9068b18729d573432600bf0b9311 SHA512 dcf0f4bd3fd251a9d4c3d7dd1594f82a44c27a99ff3a7c1746bcf81513c9a7a0bef9e000de499deb18b0650f41795aca8140f17129d7268033b60e002f81b8f8
+EBUILD keychain-2.8.4.ebuild 693 BLAKE2B 43f9cc51e3a2801f7f20b1db7228b9809f64c940eaf95690ba796e7e89e6067340f806a81cedfc82e0c94e5072429c9754ec9068b18729d573432600bf0b9311 SHA512 dcf0f4bd3fd251a9d4c3d7dd1594f82a44c27a99ff3a7c1746bcf81513c9a7a0bef9e000de499deb18b0650f41795aca8140f17129d7268033b60e002f81b8f8
+EBUILD keychain-2.8.5.ebuild 684 BLAKE2B a875c8b0e98ecfd1404d5b66498b4c1649e2842c0b08431f9a74ded799cedda9dc08e4111eac7ed664ae2715cab963fe570f9136463f182820bd59eafe58a8f2 SHA512 0b90ca1c331a1b2ef05211fb3009c06a94b02d3f568f845ec00934059c35ed3043956e6ba40b530f17256a69ae5ef968ac4d20fa580d9dfa26c5b189ec3ed9de
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild
index d08d7b6586cc..d1bb284d867c 100644
--- a/net-misc/keychain/keychain-2.8.1.ebuild
+++ b/net-misc/keychain/keychain-2.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.2.ebuild b/net-misc/keychain/keychain-2.8.2.ebuild
index 7c0f94c2bb42..3dc274faae65 100644
--- a/net-misc/keychain/keychain-2.8.2.ebuild
+++ b/net-misc/keychain/keychain-2.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.3.ebuild b/net-misc/keychain/keychain-2.8.3.ebuild
index 8685b880b4e5..89cf6c49bb8c 100644
--- a/net-misc/keychain/keychain-2.8.3.ebuild
+++ b/net-misc/keychain/keychain-2.8.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.4.ebuild b/net-misc/keychain/keychain-2.8.4.ebuild
index 8685b880b4e5..89cf6c49bb8c 100644
--- a/net-misc/keychain/keychain-2.8.4.ebuild
+++ b/net-misc/keychain/keychain-2.8.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index efd7ea94c143..d8ff6634129f 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/lanmap/Manifest b/net-misc/lanmap/Manifest
index cb9a178cba1f..eb621edc3068 100644
--- a/net-misc/lanmap/Manifest
+++ b/net-misc/lanmap/Manifest
@@ -1,6 +1,6 @@
 AUX lanmap-81-make.patch 1930 BLAKE2B 0c4ccc3173e3d5bb9babe39f6ee32f0a5c6f045cebc6d59041af24f51b906dfa4596e0a54270c49b9b6b29813af0d8a4f7f1aa98392cd61dfc2d689879a62c61 SHA512 601a570e55ce987d41106cf1c79a2564e55d8756bf8ec1cd58c63df38ebdccfece6b60d29b24f36aa828289f0762c3c54ae58b30b61355c2479c27fa9322b86c
 AUX lanmap-81-printf-format.patch 303 BLAKE2B 90cfcfc8d3c94e0ef1a3a929500e5d86de51e9c046987a5e68317ec5435a4bdf739a6caf3869fc334561000e0c4cb66c87c95c01c03955499986cefb931e0710 SHA512 644e269b1c3b872f66707d452129033f9f2d67ad895244b5aeb34886f1cf572482a7ad82f97f4d23ac3e652ce64f56f9bdaa8c11aa76cb5d6cac42c170f30285
 DIST lanmap-2006-03-07-rev81.zip 405933 BLAKE2B 6ccf3bd502d7417a4c795ec536e6b970bf0e5c8e0666db45a80e25ced7a27e56e64aec6482cbcf6808d2ee653e7a3a5552dc7215127660cf2c7551f051c3ab9b SHA512 9216d753548fba48f4fcd18a55136a50c0dd01c87f1d5f7736319a7a71b28bd50f082a9aa94d8c426924e0fa4fb6537cd8c8cbd2a289736ede54fd4c6f4679f2
-EBUILD lanmap-81-r1.ebuild 790 BLAKE2B 380d11e06bf8c9bfab7741545f220ee03548104150864a8222a9e67d26981bdcdee678df73bf2d03cfc4cf40d449e502ae7eeea3333f01b6328d69bc18927439 SHA512 cba80ae3be83ade4018ea9bd7c8a45200c9d08fb4dc13dbc2fe2bdc13e834415be2b26a61614c06821965b9f753f641a07d438084412f952d1cc9937f720f7ae
-EBUILD lanmap-81-r2.ebuild 837 BLAKE2B 1e2a60513830a76c564df1ec675ef1d10e8d962483d0ecf9378c5a80e91c9d2298e02878e5e41be1f4e9bbb4a9d6ae0a989cd6c8bd9343a822257861d63f7c96 SHA512 9e3406a98b0c49f7d256a19964d151f5a74fd808d53d4cc3faa16d66eb6de3656b555bd8ed4e815ebce504fc65ee5432eff682484b3bc4660a8118674418ddbd
+EBUILD lanmap-81-r1.ebuild 779 BLAKE2B 68d6d67041d341555fce2015fa91e50c3de634a62fb914aa40e42876649c890939045cbf07d9f07cba68d254116029b6358f2ff6f94ddcc6181a5d40447f33f1 SHA512 38b6db639c62ce2fe9988854500eefdb2c6b77392120c4fc587aacce419331ec35e685a19541020945f5d2ff003bae3f4d6c8b591b334b7fb09be0b3029cc5b9
+EBUILD lanmap-81-r2.ebuild 826 BLAKE2B 8779cb8c5bedf3489677e5ec339fb9d63307d2abce70e6cd108a59ce3dc9966447a5c8d126da4dcdac5b9a37f5b9a35e53665161568bfcfb49526963177d236a SHA512 5a73d9fd50ebe21f8e629746527cc1f13689ffb5c39e8dae159ecbb9f549663f93c237e24f574d16289ec108aef8b9fef578de46fc73dea5ef49fe26d08f1bca
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-misc/lanmap/lanmap-81-r1.ebuild b/net-misc/lanmap/lanmap-81-r1.ebuild
index 44739a58baf5..7c14fb94965d 100644
--- a/net-misc/lanmap/lanmap-81-r1.ebuild
+++ b/net-misc/lanmap/lanmap-81-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="net-libs/libpcap"
 RDEPEND="
diff --git a/net-misc/lanmap/lanmap-81-r2.ebuild b/net-misc/lanmap/lanmap-81-r2.ebuild
index 6b5892520aaa..044049046494 100644
--- a/net-misc/lanmap/lanmap-81-r2.ebuild
+++ b/net-misc/lanmap/lanmap-81-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="net-libs/libpcap"
 RDEPEND="
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 32c47825a39a..098db834cff0 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,10 +1,5 @@
-AUX minissdpd-1.2-remove-initd.patch 595 BLAKE2B 420f456bcd5d0e1df0d857a142d463020716f9d8e1480b523ae5634ddb00c855efc4fef94ce683a3f136faa964dedeccd95877177182d4009b72bf91e1b4830c SHA512 20306ae9870659c9d5c07643f3d95ce56961a57a119d3f15b6aa6ef4ad6ab4c8f32bff9d11af3445f1c94fc9b628faf0a9c9b7e1fb1924f5bd20697bc39d438f
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
-DIST minissdpd-1.5.20161216.tar.gz 35078 BLAKE2B c8e681e812869ddc15cece499356e7852a4b2e86b661bd80d62a840c8a9a01f321d4616013fec49d4abd834c75378014b52e605ad3fa116c0dc863e5a389a9fc SHA512 4fe1dbc14a39a18bcc834c73cc0150cda656b2be7ffcc0a72dc2854dbd698f3528bfdcd80af741124546f916d914921ffc428bb4f19b34e7493f0cbf9ff54928
-DIST minissdpd-1.5.20180203.tar.gz 35848 BLAKE2B 2a784bf6c8cf2e656d86f60802d11823d15ad0d7ca4b941c4cf71ffb0433be81b1f12fc11eaa84585d0cc77f1710b24336962e4242a957c49e7ca957e38c0a55 SHA512 2ad8964cd9893b29318659d39adf006cb3df2b97260b6b93a9b71b8f318941fd569cd6de02d34347cab75d4f556e89aa1b3f727561d1b6805c22ed9a3183f6ce
 DIST minissdpd-1.5.20180223.tar.gz 36179 BLAKE2B 0668862848e8d3f87b151e84e3fbea39a593556b4c9a3800ab7b534228a5af2c7cb20ad183e99f95d9616d306cc5aabdc379521bfb19a5e25a63fe0d81d816d7 SHA512 2564aa91ad54da392ca305a59b3eeab9b4c0a8504c674fc0c34d387560b239ea03c988e667fa3100b2b01e6916dc8e00ddc161fd6f652912a37b4b879b54dfbd
-EBUILD minissdpd-1.5.20161216.ebuild 694 BLAKE2B a1e1cd336d2993c5384f923f7d74e021d0f5e8db1b437fb7610fdc5858254c2d0f0f8707870bc8f7971ea99e6da1c0d84367c4ee1cffd339fb11f176b9942275 SHA512 7d5738d4fec110c526ea32aa830b2dda2f0c4a8dfecbb77e5e5fd1201be01063ff32cec1206e4b635f35592d51b800e006fe096abd4e8d65aad56d3526f5933d
-EBUILD minissdpd-1.5.20180203.ebuild 679 BLAKE2B ac75807e2d3a75b631af3ce3d90674e37cbe61a94fffc5e72bf5bf50f9f420d7d95b895c90035d081e83863082416f37f0d129199c9a941dcf644e99ffe9401d SHA512 c4d8bf10a23fdee9575f802b362ec59c8b20b805a37f2bf8a278555e11861632a92b89a688ab92d0ffbd250441b8ae5d5b3be937ff20b326f7a6266b65af5251
 EBUILD minissdpd-1.5.20180223.ebuild 679 BLAKE2B ac75807e2d3a75b631af3ce3d90674e37cbe61a94fffc5e72bf5bf50f9f420d7d95b895c90035d081e83863082416f37f0d129199c9a941dcf644e99ffe9401d SHA512 c4d8bf10a23fdee9575f802b362ec59c8b20b805a37f2bf8a278555e11861632a92b89a688ab92d0ffbd250441b8ae5d5b3be937ff20b326f7a6266b65af5251
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch b/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
deleted file mode 100644
index 9a5f5966e90f..000000000000
--- a/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur minissdpd-1.1.20120121.orig//Makefile minissdpd-1.1.20120121/Makefile
---- minissdpd-1.1.20120121.orig//Makefile	2012-01-02 05:46:24.000000000 -0500
-+++ minissdpd-1.1.20120121/Makefile	2012-01-22 07:01:54.000000000 -0500
-@@ -42,10 +42,6 @@
- 	$(INSTALL) minissdpd $(SBININSTALLDIR)
- 	$(INSTALL) -d $(MANINSTALLDIR)/man1
- 	$(INSTALL) minissdpd.1 $(MANINSTALLDIR)/man1/minissdpd.1
--ifneq ($(OS), Darwin)
--	$(INSTALL) -d $(PREFIX)/etc/init.d
--	$(INSTALL) minissdpd.init.d.script $(PREFIX)/etc/init.d/minissdpd
--endif
- 
- minissdpd: $(MINISSDPDOBJS)
- 	$(CC) $(CFLAGS) -o $@ $(MINISSDPDOBJS)
diff --git a/net-misc/minissdpd/minissdpd-1.5.20161216.ebuild b/net-misc/minissdpd/minissdpd-1.5.20161216.ebuild
deleted file mode 100644
index 3feef3241d18..000000000000
--- a/net-misc/minissdpd/minissdpd-1.5.20161216.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2-remove-initd.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	emake PREFIX="${D}" install
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.5.20180203.ebuild b/net-misc/minissdpd/minissdpd-1.5.20180203.ebuild
deleted file mode 100644
index dea4e3034612..000000000000
--- a/net-misc/minissdpd/minissdpd-1.5.20180203.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	emake PREFIX="${ED}" install
-	# note: we overwrite upstream's init.d
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 04a4b596d2b6..3ed240cdd923 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,7 +1,5 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.0.20180503.tar.gz 225454 BLAKE2B d08c1fe050fce4a6f2348ff17f9d03feae04ca99a1b70fd7cc1734f56374f2be73708c5b495cf1a23ae76bd1f0042a90442793a87adb3ed9d0c49678dd8eb0b8 SHA512 7615f28d8e41bbe5b7343159a526ba33e643d14e2be7c2382461fda36ecfb3420ef2903e0cc9fa92ffe376f8609feb9403a316244eec0459e78a6b5ad96462ee
 DIST miniupnpd-2.1.20180706.tar.gz 233675 BLAKE2B 641be6dc6a32383a02711139ac56236dc285041f2bda595a909ed5281a5163d1300212892e011f6256c6cf73b877f0e5e2e93efbfb08a77b0ae7d3dde94c28f6 SHA512 90881e08754f9fe3d1ef01da1fe437626d1fef09bea5eab9c1bcf3347e1197038ab87de8c7c454083ba90a86760230a323a6c293307b0fcecefbd5cfb658d227
-EBUILD miniupnpd-2.0.20180503.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 EBUILD miniupnpd-2.1.20180706.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180503.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180503.ebuild
deleted file mode 100644
index 9f786c4d43a2..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180503.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 8ba44ab4a9e7..48c09a697592 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -2,8 +2,8 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b
 DIST mosh-1.2.6.tar.gz 347185 BLAKE2B 4676ebc9736d83eaf842ac847fb7ce29d0ebbe9546df9755fc03d352ee69edd0d2135bf232c42c77c37e66a69049682611ccd10ceba999c6b4b419c66e288813 SHA512 fe53ba3ba79fb393f9fd5d3c48b2864838a1b51a8e08f0160bcfb98fc8c2363d2bb77456e1bc79b765d6489a2af54237c5423ebb88a13196a82420be0cbc7403
 DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98bf1a0946ede03f8139dcc159c9a6cbbc019ef43c7b324990077df7ac7287866ea2daa813621ff3618ae1d77 SHA512 2b43e3e3fb2ccf6c29a889f10dfc0d5504dbca6fabaf10419f4e355e4b73d64cc1e632324e447b25ac24ee18bb88d8a9a23f9c4824b267343fb86e26e7d5c54b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.2.6.ebuild 1414 BLAKE2B 0e25ad166c0585e5ab666995ec51dde78873d70baaef606b7792c3f40c8f936d301540283d9e58b62ec7c35501230eccfbdc6e511d6d2880941da9cf468cae2b SHA512 d71a034a819cf74ccde1bcef032e9bb61fab3b8f77f344f1ecb8dec642a35ef16af4a8735fb07a4f363eafdc907dc684454762588d83a8090b272fa3e75134e8
-EBUILD mosh-1.3.0.ebuild 1418 BLAKE2B ea80d1bb63dff0ea18e76ce252bc343411f2a472b4bff33c1bd0f7481194f924b6e27f5d12f85c206bc7ee86e182a5d5e6de2d4251d64bc0ef713a0cff3a8578 SHA512 96ef79e279f7f5ca889a0a0cbd0b5d97e32181d8c5865e314b91e052a1b0cfa92343959e501536b11917e5092b11ecc7a834198ce06a211b1395dd5e4be9b0c5
-EBUILD mosh-1.3.2.ebuild 1422 BLAKE2B 732674d4246a16a74065f47caf6a6238acea72cef6c91bd5cd3459b07ed737a949b98bdeb44037598ef2ef445cacafc829d617e5056922acb9e330b63525db3e SHA512 61a9a93fb8bf59e3782c3ef8f3cd003dbded3f142b78787e502e80092270b8e55f56b32dcd05b4a25ec771a7a7dd7d64c8d196f839c5d4cc5cd917009fb1b388
+EBUILD mosh-1.2.6.ebuild 1403 BLAKE2B 5612c55dedf61f42344da91cf649817789394552b0af084f0e64f019d4edbfeeda659facb6f5ad8d20f8e90a891ac4eae2445957cf6f1badfe07e7742d93e740 SHA512 36761d027f665567bdeb6bbbcf97af741da641db5878c8db4dea7f73653f601dcee951f0500c503986226b44a8589f30c11c1d93244ef0b5076829ef80325747
+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
diff --git a/net-misc/mosh/mosh-1.2.6.ebuild b/net-misc/mosh/mosh-1.2.6.ebuild
index 1c6b0db48f08..0258c62a187c 100644
--- a/net-misc/mosh/mosh-1.2.6.ebuild
+++ b/net-misc/mosh/mosh-1.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/mosh/mosh-1.3.0.ebuild b/net-misc/mosh/mosh-1.3.0.ebuild
index 305b36f5b077..6998cb6bbd20 100644
--- a/net-misc/mosh/mosh-1.3.0.ebuild
+++ b/net-misc/mosh/mosh-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index d4f0d6efcf8b..8e0a4705f404 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index 86f58016cf4b..241426ebf6b0 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD networkmanager-pptp-1.2.4.ebuild 1164 BLAKE2B b8109adb694a84b150b8e7ecf693e41cc1ff7accc49417068c0c80d447f93b7e79806571c995338ce864c97286adde5ca4ef3fb51f97cb58ac4dafc9c9c15b9e SHA512 1d7bfc257fe3927bf5591cdfa1e57c57fac968e56f28b6abd67ea284ed02aa8865aa662c1bd18a4979b90d41e6cf41d2d22d170ef2e46aba446ddd4d7726860b
+EBUILD networkmanager-pptp-1.2.6.ebuild 1256 BLAKE2B f43fd43b30ba745a5bb1632f0e4ae86f424110a97ce4336e77190b9fa7e75c2f59a55a6634115910027e6200144433144dd54aa05b334e29f175e10cd001069a SHA512 853a0589681ee891b4be98bd42e2c57cd579af5420a720760a7c225d4094238ce41a167a53e5cfa8616c191c0f9c66ee0788865fe5a434c78f9fa32a431a1ce6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.6.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.6.ebuild
new file mode 100644
index 000000000000..40085ef1b610
--- /dev/null
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.6.ebuild
@@ -0,0 +1,52 @@
+# 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/Manifest b/net-misc/networkmanager/Manifest
index cfee71efc8e1..a23ff76a5512 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,11 +3,10 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 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.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610
-DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
+DIST NetworkManager-1.12.2.tar.xz 4193776 BLAKE2B bc2b55f33e85dc8381eb18148cef02059e96abe1863da35af2b8f5671e3b2a4296eb1f9b79d864f3d0e6b362f7dbebdea4518a96d255acda9141b9ae95b49038 SHA512 cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35
 DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
+DIST networkmanager-1.12.2-patchset.tar.xz 4944 BLAKE2B 3ab6e395b4e13fd019fbcf851286f1cc8a08eff9d93891174c19949efe10390c69d9aaf6cdbe81f33503ec96838eb001eda67f6d1da034195327e172527cd72b SHA512 bdb22c42a8c53dce2f81ecfd026685240c8b790c44b0f13767ccfa0834cb2edec61ade69c828fb21c54ad3d37412e89b15f1fff4a98577a5bea460ba78d43bc3
 EBUILD networkmanager-1.10.10.ebuild 10769 BLAKE2B 0adb377fc034856e1e1045a9134f231009e9e4181e13e9b7a9e990dcf562d3b98984ebcb27c15ee475b9024a76e3e262b9a9a162f58c16510a86ac920cca7d57 SHA512 af2868a2490d80ecaa0e703b5f2091fe481e6c47e3362a781344cd2313e2cbf5bd5cfdd0ee5c404b1dcebc70e9ebc32f2bcc59416718659b2e0af6925f0b97f1
-EBUILD networkmanager-1.10.6.ebuild 10772 BLAKE2B 04abf058760e6a89a215de2e01e371f85c5a3fae221b79f3c2e1663f0cc9254c0fca3704094eb756cf2ab244e254392aa87bb21cd2ae087ae9999a3e443ccd6b SHA512 8950a84fe560747c914f7e2597860885d08c25a1ac3fe27a65507beb3ffb80889a98d6bb40342f8e68b02161af8b271a2543c8cea16f26b86611f33934d7c91d
-EBUILD networkmanager-1.4.4-r1.ebuild 11420 BLAKE2B 2245516cc7f356c194032729459a96c68e684fd1d3e3f78230424dff74648c29a75225d80376793544d15b9e450d7266a5e3457756fb0db9134981ba2d3c29c3 SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956
+EBUILD networkmanager-1.12.2.ebuild 11210 BLAKE2B 5ce9200cb1c0f400ff27a5f0f0266035e2878f8f80b800feb8383b41a16dbdccaec312299483ba679ca5b56f955b54553195a1b960504664d585c3af932b5662 SHA512 53d07fe10d655729f24e1697f025740fb2000d532fec057912e9947eed43c5bdb3f917d589dc346c6d66ee10ece6ff04a95d0cd7ab4698c737ce004de0112258
 EBUILD networkmanager-1.8.4.ebuild 10683 BLAKE2B 2c60630cbefd554f11e77b18a3bde0e0cc0dc361410ebcf36cb8e4223d715516268e862377fe2d2319ba67e9121153e6b6ec140254fdc159757a1d4a2e95b2d9 SHA512 93d62548e37ae437d7cd04801fdf723ba9e61034f605ab2e966a8958ac75d02ee210e6e7241ebcd7b47e6e9cca5212f0596421bacac7b07a6699996b0546bed5
-MISC metadata.xml 1717 BLAKE2B c41ba2f0d9783afa3edb4e45d1616fb38222ecc783b67c2139706f93d621a1d659ddf6b4484bfcfec7e396469c8f19f8ded48a7f8af73f2743336e3783595bb6 SHA512 d21fb210b038df20bce0a693f6e3a14e175682589f9d29eb6e7ccbc7b0fa83ba4ff56c58bc93029af8d2bff2cff0ca03c87aef6e400d0ef9d72b30d4784f10a3
+MISC metadata.xml 1808 BLAKE2B 836dc65487a0e7ab3e527726f7d34698b48ac1529f9d87113b4cfb8c3330449ae3c3c61b11c9b37bd62884e9ab9f2cd8a3aa6abf7272b0836cc24b395990f32a SHA512 9088a30ef5c513348e76303a00e6e0cc4c8fc82d03d52d4c55a9bd27d1bfdf9fc1a08037b162cd6bd28ca68afc50cf2c8f7aafa69c1fc441eff0355e8e189661
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index a6c3ffe13269..d2f416137039 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -14,6 +14,8 @@
 			getting ip</flag>
 		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+		<flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of
+			<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag>
 		<flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg>
 			in libnm.</flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices
@@ -26,8 +28,7 @@
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
 			DNS information</flag>
 		<flag name="teamd">Enable Teamd control support</flag>
-		<flag name="wifi">Enable support for wifi and 802.1x security using
-			<pkg>net-wireless/wpa_supplicant</pkg></flag>
+		<flag name="wifi">Enable support for wifi and 802.1x security</flag>
 		<flag name="wext">Enable support for the deprecated Wext (Wireless
 			Extensions) API; needed for some older drivers (e.g. ipw2200,
 			ndiswrapper)</flag>
diff --git a/net-misc/networkmanager/networkmanager-1.10.6.ebuild b/net-misc/networkmanager/networkmanager-1.12.2.ebuild
index 3d3830010e12..cdfd87acdf7e 100644
--- a/net-misc/networkmanager/networkmanager-1.10.6.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.12.2.ebuild
@@ -8,17 +8,19 @@ 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
+	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"
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 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"
+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 )
@@ -33,8 +35,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 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}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	policykit? ( >=sys-auth/polkit-0.106 )
 	net-libs/libndp[${MULTILIB_USEDEP}]
 	>=net-misc/curl-7.24
@@ -55,7 +56,7 @@ COMMON_DEPEND="
 		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}] )
+	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}] )
@@ -75,10 +76,14 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/iputils[arping(+)]
 		net-analyzer/arping
 	)
-	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+	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
@@ -97,6 +102,8 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 
+PATCHES=( "${WORKDIR}"/patches/ ) # Selective patches from nm-1-12 branch, most importantly fix for NM_AVAILABLE_IN_1_12_2 macro, otherwise nm-applet and co fail to compile
+
 python_check_deps() {
 	if use introspection; then
 		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
@@ -159,14 +166,11 @@ multilib_src_configure() {
 		--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
+		# still not ready for removing that lib, bug #665338
 		--with-libnm-glib
 		--with-nmcli=yes
 		--with-udev-dir="$(get_udevdir)"
@@ -195,6 +199,7 @@ multilib_src_configure() {
 		$(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)
 	)
@@ -291,6 +296,14 @@ multilib_src_install_all() {
 	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
 }
diff --git a/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild
deleted file mode 100644
index c1d6830c9208..000000000000
--- a/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2017 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} )
-
-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 gnutls +introspection \
-json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
-systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( nss gnutls )
-"
-
-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=
-	>=sys-auth/polkit-0.106
-	net-libs/libndp
-	>=net-libs/libsoup-2.40:2.4=
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libgudev-165:=[${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] )
-	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? ( >=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}]
-	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 test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	else
-		return 0
-	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
-	use test && python-any-r1_pkg_setup
-}
-
-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=()
-
-	# 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
-		mkdir man || die
-		find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
-	else
-		# libnl, libndp are only used for executables, not libraries
-		myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
-	fi
-
-	# ifnet plugin always disabled until someone volunteers to actively
-	# maintain and fix it
-	# Also disable dhcpcd support as it's also completely unmaintained
-	# and facing bugs like #563938 and many others
-	#
-	# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-	# still not ready for removing that lib
-	ECONF_SOURCE=${S} \
-	runstatedir="/run" \
-		gnome2_src_configure \
-			--disable-more-warnings \
-			--disable-static \
-			--localstatedir=/var \
-			--disable-lto \
-			--disable-config-plugin-ibft \
-			--disable-ifnet \
-			--disable-qt \
-			--without-netconfig \
-			--with-dbus-sys-dir=/etc/dbus-1/system.d \
-			--with-libnm-glib \
-			--with-nmcli=yes \
-			--with-udev-dir="$(get_udevdir)" \
-			--with-config-plugins-default=keyfile \
-			--with-iptables=/sbin/iptables \
-			$(multilib_native_with libsoup) \
-			$(multilib_native_enable concheck) \
-			--with-crypto=$(usex nss nss gnutls) \
-			--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
-			--with-suspend-resume=$(multilib_native_usex systemd systemd consolekit) \
-			$(multilib_native_use_with audit libaudit) \
-			$(multilib_native_use_enable bluetooth bluez5-dun) \
-			$(multilib_native_use_enable introspection) \
-			$(multilib_native_use_enable json json-validation) \
-			$(multilib_native_use_enable ppp) \
-			$(use_with dhclient) \
-			--without-dhcpcd \
-			$(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) \
-			"${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in api libnm libnm-util libnm-glib; do
-			ln -s "${S}"/docs/${d}/html docs/${d}/html || die
-		done
-	fi
-
-	# Disable examples
-	# https://bugzilla.gnome.org/show_bug.cgi?id=769711
-	cat > examples/Makefile <<-EOF
-	.PHONY: all check install
-	all:
-	check:
-	install:
-	EOF
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake all-am
-		emake -C shared
-		emake -C introspection # generated headers, needed for libnm
-		emake -C libnm-core
-		emake -C libnm
-		emake -C libnm-util
-		emake -C libnm-glib
-	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
-		emake DESTDIR="${D}" install-am
-		emake DESTDIR="${D}" install -C shared
-		emake DESTDIR="${D}" install -C introspection
-		emake DESTDIR="${D}" install -C libnm-core
-		emake DESTDIR="${D}" install -C libnm
-		emake DESTDIR="${D}" install -C libnm-util
-		emake DESTDIR="${D}" install -C libnm-glib
-	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"
-
-	# Remove empty /run/NetworkManager
-	rmdir "${D}"/run/NetworkManager "${D}"/run || 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
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# 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 >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	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/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index ff62a5f6fb99..7780ca401879 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -5,7 +5,9 @@ AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b454
 AUX ntpsec-1.0.0-fix-seccomp.patch 587 BLAKE2B c937a12ed548a4d825964c66e37faebb35b3b8ca2bb6dda6a75a84cfcce04777a0e9ff48a6f3bbd82dfc9fd47977aba749dd93200e81280cea5475bc04c933f3 SHA512 12eaa510d6dac6b6e2fe764d6ec8cc8582031be25e5e6785a4813d4c150ecb36574b64f1fa8c2a7d6cf6a49423642fe875774b8d6e894f31f8605e5716313107
 DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43
 DIST ntpsec-1.1.1.tar.gz 2451415 BLAKE2B 516c87f0710ecacfde27f801a5fc4a492e7871eb35cc3afb8a107e0c381cd9787a4af2d0b01e2cf5d4f43043afe042321e5bbd2299578723e870b2fa502646d2 SHA512 838ed81c94e14a3d8588670ce63a1c4f6216d2f79be5149ad6a845cec00bdf6d7fe77310ce9c33c4675d3db54e59c3d9d02ae4351913ffbd9a3883716c443f83
+DIST ntpsec-1.1.2.tar.gz 2458805 BLAKE2B e9ab493f60179ce94a5995287423c3a0038298b622b0dcffd5a299261a7b42fc8d0d04256726e049c625c0789882f601615eaa7169047e984a274f62e0cf40d2 SHA512 83d2d3bc59202f1e5f3e76eeb6810e575e24c6f392f20c25732a6881a0a0a9f72453b76b294399351ec4baf88bc64da089dc1340aee38576021659f81bcd0e19
 EBUILD ntpsec-1.0.0-r6.ebuild 3984 BLAKE2B d1752c19aedecd7cb4a7522ab4f4adbc6c86daf0a3d33a45aa81f501142b0daab5e66785362f751d3603f21fdab66c17a22304365db99af5dd808ae6beccc95a SHA512 fecd7e354283d83be97445a4d7dd36e103f56e123519bbfacfd2983d8e94953dcafc461d97a628be7b019e06a989ef1778afa1af63a41d2e42b61023debc92a9
 EBUILD ntpsec-1.1.1.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
+EBUILD ntpsec-1.1.2.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
 EBUILD ntpsec-9999.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
 MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/ntpsec-1.1.2.ebuild b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
new file mode 100644
index 000000000000..680e3dcba1d5
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd user
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+	BDEPEND=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	BDEPEND=""
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	${BDEPEND}
+	sys-libs/libcap
+	dev-python/psutil[${PYTHON_USEDEP}]
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+	!net-misc/ntp
+	!net-misc/openntpd
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--nopyc
+		--nopyo
+		--refclock="${CLOCKSTRING}"
+		$(use doc	&& echo "--enable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use nist	&& echo "--enable-lockclock")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use tests	&& echo "--alltests")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install
+	}
+	python_foreach_impl run_in_build_dir python_install
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e7ef9ff5012d..0f7799bde05b 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -31,6 +31,6 @@ DIST openssh-7.7p1-sctp-1.1.patch.xz 7548 BLAKE2B 3b960c2377351955007005de560c2a
 DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
 DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
-EBUILD openssh-7.5_p1-r4.ebuild 11172 BLAKE2B ad8d14a4f2e2edfb842963ea4b73c16c7ff4db05541cd9e2c8fbad08bd67619a10b95df1d3d367429d9b59aa103181c60b9ab4ac596271647f757d2c634c6647 SHA512 8951e6cd77403411c57d9757b42e3065c5296033093c49de4bbc933d79cd1f74f884647e608ef282937e49a0ea617fcfb16cba7c1f3ebb11f283cbef0901d1fb
-EBUILD openssh-7.7_p1-r9.ebuild 15954 BLAKE2B 2ab19aed784ba9d1781746d016a4895585667e25724b34ecf380f6f35eee20e96217ccf02acb22b86ff04a6d0ccdd29d24d8d2945045d178c5c6e49b34b9df2c SHA512 12afcd80010dcf0fcec55c8a70bce8a4fcf73d3f0d2e0bb3efec3cfdc57ad9626ca08c81ee5b904f4133ec072dd13a05b4d8a68c2e628c434af58a41de854aaa
+EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15aff3bd9a59c77c41d96576b6aeb77c5e6fa17aceb573d4d1f0518aa703d298eb292d0d157fb843a702cbede1f42c0296 SHA512 446414c8961458b812b768d18afe46d60ef4dd54111d95b99654cfb3dfef592812b30527fdda352a595bba815e0ffea4a813e3291bcc96bacb368267ff837bdd
+EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
index be7aea7c8888..cbe425c4eeff 100644
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
index b64d100d14c7..0a21486e685f 100644
--- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
@@ -26,7 +26,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 skey +ssl static test X X509"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 130cec8bb6f0..7bf4a33fc89a 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,8 +4,8 @@ AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab36
 AUX rdesktop-1.8.3-openssl-1.1.patch 3643 BLAKE2B 986f8af19dcd2613d1b45a66060096bed3913ea20aff61a2c0b2f3f2ccee5cad97f054b90128488a2dcf8a997b7b107eca0923714a5f769de040946d880144e5 SHA512 b525aeced7971d77120ad7da166b5fcb491436b8716e140d22df39e2a036ed837f7d2a3623958208d7f1c027ffca9cd7237746ef9e01c10edee24320022a3b41
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
 DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d
-EBUILD rdesktop-1.8.3-r1.ebuild 1854 BLAKE2B 6836ceeb60e7342292eba2c8d007841011e9c299902478240154e5bf608455008b92d14452c5227f2177e50ef8fb6f9235057a801690c2526459da58aec47b0f SHA512 4c70505726e22fba07d333ccea0bdf6a8364d04bded7df577839f1300d585f490f0774ac3810fad0cd39b3410d76d199439eb600700c48f4d5878a08036800c7
-EBUILD rdesktop-1.8.3-r2.ebuild 1907 BLAKE2B 3636154af2f39d9c2c8cb34e05a5d6f8d7b9c86af15691d954e741f313409a41927ffb1d504e812fad576a8c9a0e3565998435ad107f7ae8a5e53a3ea0c52e99 SHA512 599d6900a1fd58c137abcba8e9c3651e8937b9414d63377bd29291367b9586ae7d71ec95c2261c35a4a78bc5d6895df78f9e63da9392f549f71c8d0d6b93fea2
-EBUILD rdesktop-1.8.3-r3.ebuild 1736 BLAKE2B f755cf95c78453d0836f1774673176edeb529f09726eb41c5142903993c1328b896e0b2ce0196f2020a5a0fcde31b6daccaca5e3c884448d217b84c4065362e7 SHA512 b041f5cf5cdfdbe4cc6eb678cf0d51d1ff0baa7fccd51034d347524a45364c26e387796fdd66be16092d4800c3cd4cd03c659871053a217ae298bbf29b6563e8
-EBUILD rdesktop-1.8.3.ebuild 1814 BLAKE2B 650a04a637c6a34d9e1bd2e3986e2ebc1ca481171a15bfe9826bd7a37914946291460290c68458dfb108b3a5f95420fd189a3282cbdabe5e0f7bfae683be6e2f SHA512 fb0ae6e70dd092e8e27499e9dab31a3c0bb86085e1c7a2b0f6e8b225c02ce09570f7b87a603dd8a23f3b473ad04917c38f3213cba2c0a55afa439c80707534a9
+EBUILD rdesktop-1.8.3-r1.ebuild 1843 BLAKE2B cc3e9e807656d5cf1d92337f90be8ec6b7e99dfb4d5dc91de931c9f1471d2e080063b1c3b2a2e1cc4418b9d2052e019e06b1573ba0921346d885b82eec37fc3d SHA512 ab93bf6c822cfae151158a427a5d1679beb0fa17f6a9df629283cbeead43b0003a23bc4b3a2ca89a616eca6d46cfc7e2080e03e36600605891a4b4743ba63d71
+EBUILD rdesktop-1.8.3-r2.ebuild 1896 BLAKE2B 5741137acba3af2842dfd5e6bdc95a53d230feadece2a7c5d71ed2042442a6702ff3d94bb1f98554fb2c0134488c8fecf456ca9d8171680c89cc0054ce2acba8 SHA512 2b5e2ed13d3a42dfd70173b7cbafde9d078c08a27ea13aec85951c7dddb302d61b61c08eecc72b7bc8a0ef13fa9fe1854069d6e1c106428adc2182314ca798ec
+EBUILD rdesktop-1.8.3-r3.ebuild 1725 BLAKE2B 0523fb8eb8962017673fe4dc7cfbd05457aa514c2166fbe5ec0beb1fe6902d5109a878f7371ce2157d2a0a85da2e6245d0ca9b80ef2c2de013dce2bca456c296 SHA512 519ff1eafb4ea9420c62a6ce864fdf5005aaa3f7dffa05dc5265d14837133430fc60a204390a7055a2b1277d0f90c2f84bc11ee46baaf0fd76f15c79fd5068ad
+EBUILD rdesktop-1.8.3.ebuild 1803 BLAKE2B 783d1cdb94a66f2c6339cc45fb4c201ed0ba2af0d06b91bf6d615b00b086d7f498fb082efbb34e48b6a110a1232d5c400fd8b984e7729685c7cf1410544ba7cd SHA512 c1bcdac48e93f0e30b57ebfdeb6338b20f980aca3630986e564f20483b38e9f31110a1efda74b94d8fb973b9299399ae7e75351dbda049b82f8e74002363f68a
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild
index 58b4e48064e3..57610b0cc2cc 100644
--- a/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild
index 285f1c5dbdc6..5598e930762a 100644
--- a/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild
index d8c5ec13872b..1d73ffcf64a2 100644
--- a/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/rdesktop/rdesktop-1.8.3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3.ebuild
index 4f0e7a9ccffa..1e898da2e7ae 100644
--- a/net-misc/rdesktop/rdesktop-1.8.3.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 6726402a96ec..6b56108cc180 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -5,5 +5,5 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
-EBUILD rsync-3.1.3.ebuild 2820 BLAKE2B f3c55c2b7ca2f8e163e8d6e851f3c05a00f9cca23d1df3844ac84643db28b19dcdf6f995d0d7d17fc6902fe13b0ab5ea4f8f65965ba318eff12547b8878fd7a7 SHA512 afe2b5643bdd518d9d60a270824ab890ec449624a6ee55e53772ea8391e9b76c1fbf765921a1d3cc4072a67e156eff49ad7057ea60659fff37a3a5fbca8fad09
+EBUILD rsync-3.1.3.ebuild 2809 BLAKE2B 2033c22dd22d16b47f5c1cda65d3aed3a5b6fa598e844b75a4ff8334fac343d188a37a03f4c2168fcb00033e20d0b77ecb23f47d1f930efff99e366a8b9c66c6 SHA512 779c45768731f75c3e4902cdb156eb60be75662499b41745a9a2fc2b951fc0e3d73c5d836052a7b2677dc79b670943964ab2793ad9b04e37a2657ca9bc750f76
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index d61ad5797ec8..26945c94656f 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} = *_pre* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 4746b9406430..c10876c07c9e 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,5 @@
 DIST smb4k-2.1.0.tar.xz 3714936 BLAKE2B c105909034acbdb3c8593bb06d787a6602290dadc87982ff45703e574bf978ea8a93d88cd91d062a87683559cda020d4971a7784687a74901e97c0c4a6d66d90 SHA512 632d916d6a9cf08c883d4a17747cf036d8d6e285ee149c487cc305d036977e86a7ef4d3ba4630b3b8f29ca9123d894418348e687b0c009653297d77059fb535c
+DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7
 EBUILD smb4k-2.1.0.ebuild 1355 BLAKE2B 88ba77eca88e4a8526859dfde99fc719f8c79a9f950c9f82c17f0dbe4e74a36b13b3dc1ef19b96614d254c2cbb8dcc026bf95284e034f250542c4e79422d7caf SHA512 d8d40ded13a6eea5062174a992badada8e1b609a65ff9b44954792841e5b4b07d9f39614273e0b98bff630a12dadc2f6970916fac5b09df85f90801fea9a1b5b
-MISC metadata.xml 386 BLAKE2B 2b2a77496eb840ec0c8889b480c2aa5472d31b90f4e66a18150d8b9571debddbc23613df30a385165effb9a9233fa1406788aba54df4550db105b75f68d390be SHA512 7a3a3b97ae2091efca39e99a45034c9a0ef06168ca3dd74ce1a73fdada365b0b1f5fbb68a84bd7505451d1075abe593077c472ca76d23da3368872b87e06d530
+EBUILD smb4k-2.1.1.ebuild 1357 BLAKE2B 15e02964186f102e9e5da73232a1d60bbd3ee882d5917216706b698db26360649a311e8912635e1968aa80c96b47ed0fa2808e54419765439d7582e147717bf2 SHA512 18716b09cc5962f1a2b478e546bb5695abdfe93a06521bd25699374e267d3c02235bf7088e9ee6d481463a643435c4528bae6bd4e6cead0f4da33cd9d42a6250
+MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
index fbe6764bb1df..95bfeb8f1e1b 100644
--- a/net-misc/smb4k/metadata.xml
+++ b/net-misc/smb4k/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">smb4k</remote-id>
-		<bugs-to>https://sourceforge.net/p/smb4k/tickets/</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/smb4k/smb4k-2.1.1.ebuild b/net-misc/smb4k/smb4k-2.1.1.ebuild
new file mode 100644
index 000000000000..74eb7914f02f
--- /dev/null
+++ b/net-misc/smb4k/smb4k-2.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="plasma"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	net-fs/samba[cups]
+	plasma? ( $(add_frameworks_dep plasma) )
+"
+
+src_configure(){
+	local mycmakeargs=(
+		-DINSTALL_PLASMOID=$(usex plasma)
+	)
+	kde5_src_configure
+}
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index 1506d49144d7..ab240e75c491 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.libvncauth 140 BLAKE2B 84b119a944ffe6b126fd697d28f96f805a7c7b11311b
 AUX Makefile.vncviewer 273 BLAKE2B 2c57e85006e4f2ee8cd81d074deae19aea3ee3fe7c8f8a5f3c4273d17788214c97c40c2b18901fb7748386583a42f343098923d8e17959d089d104feb9bf7af3 SHA512 21104188080d7a3dab83140e7a32ebb8129cbc7af1759d7537802df9943f63af1d6e01df57cc816b96b7a91886607ccfcf86f35ebabb05537dad16a850f8c22d
 AUX ssvnc-1.0.29-build.patch 1087 BLAKE2B 9c568b53d1aee0875e65cbb919fcc0f7a986fe70d81028ed28bbb881ebbba91644cddae92bbc52d3c291d85cb07390b9f38bbb419b6b4e277e6a48850ea3421d SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157
 DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092
-EBUILD ssvnc-1.0.29-r2.ebuild 1358 BLAKE2B 7d769c88f8be1aa02e3da922c7148e448d3f643da9625b671e74eec5136d277fd7e5f4144430a608ec2604f4c97ed67a06aeb48c8bb9cfe8b2cacd8df5d09b56 SHA512 67ea93c3a80ddf4ca8433abeb79ff89e91e4cbe4bae0eedc9fe9e95df79a31df49d1190436820db77f539b8fe9b18350cabf4bbeae4d81a2ade6fd4a5002e131
+EBUILD ssvnc-1.0.29-r2.ebuild 1347 BLAKE2B aa53dd49376ebefae26d6995ee6afb70e28d518c5b18c35f3fc2f2d2a381daca29823aa55d86780afe63b174cd28e99a4ff6907bbc33d8771c86ea11d7875aff SHA512 abed242fef361462b5e0d7af76dd9a380568a40a95dc8ba787a68698bac8ade05fb8828cd837b84a373e4a95e2d8542d087aa7a6fa1f897dce9c4af6f0561aec
 MISC metadata.xml 242 BLAKE2B fccb5f5d9a500d3cb05aaee9df21a0ec0421e398c36915139fe871493632c7df070d222a5bc7d06b4451518baab1d0cbeb61ee2c8e909eb796d087ef7b627676 SHA512 ddf123246fb00abd46363ba180b90241b23577c60d7c001c2cbca9c3968dd240e98d8af00f63f3170fc7df9f824e7fd7957b3aafc780530a2c2fefbfd7e5faad
diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
index 91bb7ba57993..0304a7237897 100644
--- a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="java"
 
 RDEPEND="sys-libs/zlib
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 18c9bee5661f..d2a669c7d633 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -13,11 +13,13 @@ DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f04
 DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce SHA512 653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
 DIST stunnel-5.46.tar.gz 706499 BLAKE2B 6ece93015b2a59ec17fa60505bccb5e4444879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136 SHA512 2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
 DIST stunnel-5.48.tar.gz 708356 BLAKE2B 6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba SHA512 5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
-EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
-EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
-EBUILD stunnel-5.43.ebuild 2923 BLAKE2B b4438beb61d47b2b7ff23d9023edfcf28e998ca1355742957d8e9eb6634068e45aa38a5b749127b8f4c5e1e659d8e9ff3342ab1449545a9287d79478960dc82e SHA512 17cc6782cdb7362cc3464be3e3946119676d0d782a0646731d34d1ade7c8a20eb300901ccad83f50879ec2fe4571a5dfcb73f94a889efdfa12ff6a8f4df2f5d8
-EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
-EBUILD stunnel-5.45.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
-EBUILD stunnel-5.46.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
-EBUILD stunnel-5.48.ebuild 2930 BLAKE2B 53abfb43b47f4eca2785109e8dcd38ba7d2e112401f49c4481bbc03e2678debd6eb660592f2cecd21f3931317189f5193144fa79eb3c5cb353d4fcee6c9bf525 SHA512 9ba4ca10038b20457a596a416b52a2249a206c78dee0273cde8d0f5dbd8063504119a637fd8845109321608f444906b67360101f09469047e1dc63eeb4eec5f4
+DIST stunnel-5.49.tar.gz 713560 BLAKE2B c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2 SHA512 8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16
+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
+EBUILD stunnel-5.44.ebuild 2919 BLAKE2B c0c06ad293fcd5f7ccc57040fab9ef8305107c5450535d0a6cb061f0cab39ea1bf5e55d06c6fc297b100c267d852e0926cbcc70b8519caf9cf8869cdb08afa97 SHA512 8545c5e5fd24fcd317c1eeecd1677c833830cb5be4c4df0ff403b995b1f5d06012155d1ade602a669f6f892c66ba195594452c41fe0b61280e50a2996560a064
+EBUILD stunnel-5.45.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497
+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
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.36.ebuild b/net-misc/stunnel/stunnel-5.36.ebuild
index d89336a81611..430a5ab301d0 100644
--- a/net-misc/stunnel/stunnel-5.36.ebuild
+++ b/net-misc/stunnel/stunnel-5.36.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+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 )
diff --git a/net-misc/stunnel/stunnel-5.40.ebuild b/net-misc/stunnel/stunnel-5.40.ebuild
index 8f37b78d84f4..779c55aafc89 100644
--- a/net-misc/stunnel/stunnel-5.40.ebuild
+++ b/net-misc/stunnel/stunnel-5.40.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+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 )
diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild
index 514b475ba351..278bd5348267 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+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 )
diff --git a/net-misc/stunnel/stunnel-5.44.ebuild b/net-misc/stunnel/stunnel-5.44.ebuild
index cb4aa4447841..00f1d19b6a2b 100644
--- a/net-misc/stunnel/stunnel-5.44.ebuild
+++ b/net-misc/stunnel/stunnel-5.44.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+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 )
diff --git a/net-misc/stunnel/stunnel-5.45.ebuild b/net-misc/stunnel/stunnel-5.45.ebuild
index d30f1845da1c..997849c87f0f 100644
--- a/net-misc/stunnel/stunnel-5.45.ebuild
+++ b/net-misc/stunnel/stunnel-5.45.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+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 )
diff --git a/net-misc/stunnel/stunnel-5.46.ebuild b/net-misc/stunnel/stunnel-5.46.ebuild
index d30f1845da1c..997849c87f0f 100644
--- a/net-misc/stunnel/stunnel-5.46.ebuild
+++ b/net-misc/stunnel/stunnel-5.46.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+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 )
diff --git a/net-misc/stunnel/stunnel-5.48.ebuild b/net-misc/stunnel/stunnel-5.48.ebuild
index d7898dbcca06..6e724f8d84f5 100644
--- a/net-misc/stunnel/stunnel-5.48.ebuild
+++ b/net-misc/stunnel/stunnel-5.48.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+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 )
diff --git a/net-misc/stunnel/stunnel-5.49.ebuild b/net-misc/stunnel/stunnel-5.49.ebuild
new file mode 100644
index 000000000000..6e724f8d84f5
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.49.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index 4b5306c4f261..3cb8ee7bf1dd 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -1,4 +1,4 @@
 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
-EBUILD wakeonlan-0.41-r2.ebuild 620 BLAKE2B 39f60d41105f55fad0803e8a94ddbb0263ada3ef8709c126853366a8b92d4210fe6d64f9fcaf29be877197dd212847be1b02e297b751fefbebc696dacc672c1a SHA512 44fc89c20ab63a6cde8881b40d8c69a9f744c03fdc877afeda97c68810d3adc3a73e85d338f59ef0da363f70baac896cecce4d7e281d6bb961afc5e5a423870d
+EBUILD wakeonlan-0.41-r2.ebuild 609 BLAKE2B a8616ca475614d081ea0b88e0827257c379793e415db0b9cb047235654d2b5f4fe662d1724087f4d0135a2c619ab18480049a860c38414e98e431d233246de77 SHA512 a3b9c3f1e9c25eaf65cdcb8d832f70d93afff920718694e544e528543137a4f66d658db80e0ecde08160e7e95210b3f7d7c77386ba7a6003b926d29adb6879f7
 MISC metadata.xml 252 BLAKE2B d5ae1c6434a18a4052d21b9d34d573fceda4a6a37f4f0f1001fcd8c5d7d179d6f6d7df0f611b7129eddeb894dbcbf573d9c22f25dfc12fcd989900efe48b3512 SHA512 84cb947f6732467eb3137a917ea484aed7b45f56115790f8fb6595b73d0a558e03f379e239db903e4741934744c8eb10237382be10788787c684fafc854527d3
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
index 62de72536991..decf955126a0 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 723b0136f9ae..e6178e0d8cd5 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,3 +1,3 @@
 DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
-EBUILD wget-1.19.5.ebuild 3174 BLAKE2B a17a950d485a5e0e7ab4467687f6a11b149ef746006eca83902c682e9babf62c66d7c21213108d8c74617be78ae87aab0d2521d4a3d9de62017b415066847e82 SHA512 e35deb63e5d9f9d176e4b7ae3125b8b1e9db63a9fb1bacb3bc01f485d9b6aa559f948ac8ace85ec816dc180fb328a69fd45a0c6ac79051ea6245b4692247d6db
+EBUILD wget-1.19.5.ebuild 3163 BLAKE2B e0300678d97d7b02bf0c0ab13b7c18d7d808b29bbf47f12612b47aed1636772127d141fc3908fe54ff374ddac20dacd01e59dfbae4fac369d0e69d72d423871d SHA512 9c9ce2698901b8342f3db2bf641a35c430c572bf1ab58cffa210a9801c25fbb9e7ec83a363d47d4f5863ba788ad3d1ef676c96fcfcd10c576564034be9f4d89e
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5.ebuild
index a73abf153f6b..15bbc3803482 100644
--- a/net-misc/wget/wget-1.19.5.ebuild
+++ b/net-misc/wget/wget-1.19.5.ebuild
@@ -13,7 +13,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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 )"
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index db145603d07a..2ecfe4a0907a 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,10 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.08.04.tar.gz 3015718 BLAKE2B e9b64bfa791fdd854b180f58ed81ceead89b5cd8a1d6f537eca54ff041151504bbd1ea125fbb8be9c5e05abcd9a1064c699211378dd53f67ff3aa653df59da4d SHA512 4a23dd644b039a8bc64d5d55821cc5470a29b3ce2c5ccea9eb2aa6ba753d675363e14b9ba959f6b0dfc62a97898032225c21eb4993fd742b273259d89ba99cba
 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
-EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.08.04-r1.ebuild 3300 BLAKE2B 11407c2650d8273cc61e3497ca7babd4b03a7fcb2484cf1b78393c652d415df53c8c67dd6f958901e1477283da8d02996ea46a9cfed467fc2f345170d93526f3 SHA512 40ff5c705776b30a996a93557daaa69a161f21851190c0e2cf621576b96de37eff72e4dfc9029b5fa46814833909618257db7936aebdda9cc0cd24ff6258cb30
-EBUILD youtube-dl-2018.08.22.ebuild 3300 BLAKE2B 11407c2650d8273cc61e3497ca7babd4b03a7fcb2484cf1b78393c652d415df53c8c67dd6f958901e1477283da8d02996ea46a9cfed467fc2f345170d93526f3 SHA512 40ff5c705776b30a996a93557daaa69a161f21851190c0e2cf621576b96de37eff72e4dfc9029b5fa46814833909618257db7936aebdda9cc0cd24ff6258cb30
+DIST youtube-dl-2018.08.28.tar.gz 3027906 BLAKE2B dde156395f40aa91247341ab46e909536b3a4f53acea071b543ab8a548608655f2072280c9d927e7845ef79e4b0d7a0c150bafa477fb46df9ff11979cf344c5e SHA512 311abf4410a4e59df9b6941ee7cf03afda1c2e959eac8c1be182a31854d2f4dac9cd016a5103828d4860dce3db0671a8937c296eac2f24364acc67271f8ffd14
+DIST youtube-dl-2018.09.01.tar.gz 3032563 BLAKE2B c1535f1311b03ea5f3b20aba3a14487515427aad7d16e52ddca9d974050fe955405ba05fbac5c91e6e3ac830176b537d44d039a1d1e13fedc32a665610cc2af7 SHA512 172f65f48e81f335e959c119ca13f40f32cca7fc57c123d17e7be836aef2fa072cc20a1255bb5d9584c8cd1d8f8fa4c88d3f2ed5b3fa94075d3f97e7285f30af
+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.08.28.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
+EBUILD youtube-dl-2018.09.01.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
 EBUILD youtube-dl-99999999.ebuild 3156 BLAKE2B 3e94ee7379ea96aa47c6276d78bab9683bc2317980a7206d119c9710ccf99ec2da383bb8744208bf4d82af91990b12a769dc66760614330a2ef276c3051f3d05 SHA512 b45f8856a4d7067dfe53f1a7689373c001f0e1b98540cd1654001c9e23c442a245bf41d014945b2b84d818f0e26d0995fd7b35b73d3e3871a6c567c8e664c5e4
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
index 5d2d5bc1bbbd..53e72dce6194 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
@@ -11,7 +11,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="+offensive test"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild b/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild
index af8daced1abc..45357c68f635 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild
@@ -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 ~arm-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="
diff --git a/net-misc/youtube-dl/youtube-dl-2018.08.04-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2018.08.28.ebuild
index af8daced1abc..1c433fb38eca 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.08.04-r1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.08.28.ebuild
@@ -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 ~arm-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="
diff --git a/net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild
new file mode 100644
index 000000000000..1c433fb38eca
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild
@@ -0,0 +1,115 @@
+# 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."
+}