gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /net-misc
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
70 files changed, 1602 insertions, 835 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1bbc8d7f98a7..a0bf3a289223 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 88d298f91a2b..2cf5739c5900 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,6 +1,6 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
 DIST gwhois_20120626.tar.gz 41698 BLAKE2B cce3a6eb385bb782a772a7532cecc2ae164d6ea00a42a6afa29b2ff4d16526507511c16e9cae3dab3d26e7818126b2fcd20a5d88a4affa472162f9ef30c0e464 SHA512 8ffaa611389929435f70d3f020e28249e6e3109c4e822e9318b050f52cf09d6934adbb14ab67a6361574ce8645656d5eaf24808dea453f2187352fc2b2513e0e
-EBUILD gwhois-20120626-r1.ebuild 1359 BLAKE2B c1ce2b2386e1538cf45466c505f0b0a6f039fb873842f1e6b865bd21ee6bf4c6945ecdf69352c31c464aeec14f65712ec9a22db5af03dc62370cd84cc4566fe7 SHA512 bac5dec7178f57ee3d86894ff793e2fea021b5da19fadd18bf6d9ee4700aa59d47cc7dabcdb566d3956325065506c821fdd518a948836629ed4a22e4a0a0d9e1
+EBUILD gwhois-20120626-r1.ebuild 1358 BLAKE2B b936e6cf62344f7dd90422714b9271429519af3abefde8d4aacc9c87822aed47308cdfcac8f224c5857b03116f937554f6586734f154697fb9e8eb2703c6676e SHA512 d8d47ae5f5c26607ba51f11bc13be3a2cfd7bf3b6a56f742a7d70eeca2300562ba0c70f85f481e0d45bc81cd35e6f1842d2d5c6540d1725bf05aaa7a8ca70f55
 EBUILD gwhois-20120626.ebuild 1176 BLAKE2B 8c4f27cd2a32a3227b4a22ebac16b9d694e8ce845ca450f83e3a23cc90a99f1ca0a0cdc044d9eb97cd9e801997d646df6d6dcfccada9df39626892a2da46758b SHA512 730f084c67f0051c130d25dd1f2dfb765b8ace18bf29d81454b8f937d45ec80e01cacfc02adc6652fa369e95fd3553d688edd4030b2b7455ce7201e6e3c4259e
 MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
diff --git a/net-misc/gwhois/gwhois-20120626-r1.ebuild b/net-misc/gwhois/gwhois-20120626-r1.ebuild
index ef9a7ad8c339..aad1bfba2a0d 100644
--- a/net-misc/gwhois/gwhois-20120626-r1.ebuild
+++ b/net-misc/gwhois/gwhois-20120626-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${MY_P/-/_}-${DEBIAN_VER}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest
index de5ebf582b9f..f0150f6de827 100644
--- a/net-misc/haeredes/Manifest
+++ b/net-misc/haeredes/Manifest
@@ -1,3 +1,3 @@
-DIST haeredes-0.4.4.tar.gz 19382 BLAKE2B 8e84246a73ba5e9fa2badf93378a2a3a7bf36cceb5f4b806bd51e7dab9f026499bbe8b5bb5167425777c7ed753438fb1fb992f46d9547b3bec5d275d165c0740 SHA512 4e8da1141daafe9ba2190f28d14eb19c8bf929c2ea225a06b7961ad378d688f8a191a8304c8390574e9ca7a28ec9b0a265ca2ef6f736dec0d245ab4baed0a57a
-EBUILD haeredes-0.4.4.ebuild 887 BLAKE2B d9c73b28a01799ffd733868d277cfb8b2ffd00302813eae134bccc539ef3f2421e3ba420d517b24e8fb2a4817e6fe5c90457aeb3e1ffd0e0b6e6495bf7fff0ce SHA512 fb951122c4af7d9ec9041cdfe12cd4d8ac3f1121b218226e616a99977a453132975c2e477fc779699325f05c78860bc7cfb118c3e440b3d3f66aacf65ac10ff6
+DIST haeredes-0.5.1.tar.gz 20590 BLAKE2B 8ae474451a83695a259ea90babc912d58c2c52988d5858c0540b8447f91bb91403a0404970771f65dea79b3d38d23df5cbdcead6630043bbd6bb465d1ca9fe64 SHA512 54351734df35bffec96fa664c4e2458c929fc9a7d63c77dc35ba545b814741e1191019ca663579940af8f39fc5f85cd7dc1db313671b149b9af08facf600fde5
+EBUILD haeredes-0.5.1.ebuild 840 BLAKE2B 5cc3ac43bfa304f5d717ec30bf84f4ef6119c70d8d13f2cc0bd047225bbb2e92eba684f0d9d404d8751470e525b7fa1ee6e89f7f4efbefc45faf1b39184c61c6 SHA512 7e97c0991e1ef41adacad1dfa6923b9b36f14754269e32e67985ef11c3db425d38109ed4a7a30cdfa33221dff3a02a727643b288a59622db07714a3afcf5eca8
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-misc/haeredes/haeredes-0.4.4.ebuild b/net-misc/haeredes/haeredes-0.5.1.ebuild
index 92c316ab0de6..3807f1b5e13f 100644
--- a/net-misc/haeredes/haeredes-0.4.4.ebuild
+++ b/net-misc/haeredes/haeredes-0.5.1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-# ebuild generated by hackport 0.4.6
+EAPI=6
 
 CABAL_FEATURES="bin test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Confirm delegation of NS and MX records"
-HOMEPAGE="http://michael.orlitzky.com/code/haeredes.php"
+HOMEPAGE="http://michael.orlitzky.com/code/haeredes.xhtml"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
@@ -17,20 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# The only test suite requires network access.
+# The test suite requires network access.
 RESTRICT="test"
 
 RDEPEND=">=dev-haskell/cmdargs-0.10:=
 	>=dev-haskell/dns-1.4:=
 	>=dev-haskell/iproute-1.2:=
-	>=dev-haskell/missingh-1.2:=
 	>=dev-haskell/parallel-io-0.3:=
 	>=dev-lang/ghc-7.6.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
 	test? ( >=dev-haskell/doctest-0.9
-		>=dev-haskell/filemanip-0.3.6 )
+		>=dev-haskell/filemanip-0.3.6
+		dev-util/shelltestrunner )
 "
 
 src_install() {
diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest
index eb18557da8f1..0e6f19fae4db 100644
--- a/net-misc/hath/Manifest
+++ b/net-misc/hath/Manifest
@@ -1,5 +1,5 @@
 DIST hath-0.3.0.tar.gz 27747 BLAKE2B 2563ec0d8ae308f5262c401575722468a10eb9fbd309adbd9294b44203c8dc1b2f872b43a839b72590681f2c85cd2b04589509ab18a6c0df9f4aa99cd7ae993a SHA512 424c1f95301160fe17d5358082a52ede90ceac14bf2a57d9e481bfb8c727c8314e47c0e871f4049c051d6f7112aee2c71ca256904fd9203cec9fce0bafcfe740
 DIST hath-0.4.2.tar.gz 30482 BLAKE2B d65b45c8be85f231fbdbb398c4d4225a0c79ae6a46334fa3dc8de840c95129a1d0a235202b7696abf2f672f7d7bba9c6787063a4bd9d3b8dcf2292d0f31c4baf SHA512 54770dcd211a288f2a8ed02ec709d2bf535b912a776ca9dd8acfe01beccf6ce0a68c7e18a1117c656be989084ebde1dc6506c17e5e3c930be2a45178654b0627
 EBUILD hath-0.3.0.ebuild 808 BLAKE2B 4751fa496ce3daa7d777d8ac7054c19008c143536b6ad01ba55fa21f1bea18deb80f2aa15f40cc2c26291a26cabce5f0c29d4b73b13fd5daf7b67daddb737619 SHA512 63947dfa8ecfa3639fbde80fc0d273aba5007fbfe480b10b512a79900a1524c554ddd4bf495745d5a173dd24616ad3889ddeda163e3a665cb509719c2908b18e
-EBUILD hath-0.4.2.ebuild 802 BLAKE2B 245c7271d2b0f5b1fd03c58b0698063171df797fd8d873c5aaf52294eb68684d5416a909d247e2fd38001a4a0ae973fca9b5522424fee7da732063a9264023f6 SHA512 182f69d62efbef0a4d4b76cab4b0978f0b41b9dea7c0d0e911ab641c7287a5a066056ff3c151f336f34517bf4bd8e025140c4048586210a03dcd9bf22050b513
+EBUILD hath-0.4.2.ebuild 798 BLAKE2B 752a491ca38648e88abca37f535dc2c5d6b09b7c704a395727f95975d4f1458afc9f2283ea06f01b7a2d19ffa1bc7ff1e8f855418ccd765a59784c8780ce10bb SHA512 370e10b39a59e149ee3dde27e9c426f5fbd9794efe637f2d37774393c6ab7fbeb5f243f778de1d7f01b0ba213f5dc464636e62b5e421e5a32b881396957964f3
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-misc/hath/hath-0.4.2.ebuild b/net-misc/hath/hath-0.4.2.ebuild
index feb82be539d4..7756a3672235 100644
--- a/net-misc/hath/hath-0.4.2.ebuild
+++ b/net-misc/hath/hath-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cmdargs-0.10:=
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index f8487c267544..edfabdcc583e 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -3,14 +3,14 @@ AUX iperf-3.0.5-flags.patch 1323 BLAKE2B 14a7c9a889d5dd370553de7151f4103ba638559
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
-DIST iperf-2.0.10.tar.gz 290282 BLAKE2B f36ea3572c53dc94646e09372dc0ad3bda6a3d13dbab2eb059e8ecfbb51ad663c2fb456f3365a1645d84e9865ecd397bf695e2f21def54e83ebdc00b0880e2aa SHA512 74bf49133cd123243c179e174cbaa7d2f74ca9fb47c80ca2c88b2e68ce8bca0a73709e51b3aac6bd85b8c70483b70f33e8a2424e7e0e5922397967330f7e2ecc
 DIST iperf-2.0.12.tar.gz 324528 BLAKE2B db5b0a3566912f98f2647ff43ed440704caf6b67aeb3b4c698262aa94868f0fc2b2fd304beb885a0db7062ee274c5435a2a3593f88c6386044d0c4c3d47f9bfd SHA512 fd672e545b6e0a74e5061e4c861378c69490a978b63ee63414842bf379a202484868010deb27cb9f2a3691d74fe3b1e6a61dff37abeabd9e3db4c3317908e461
+DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-2.0.9.tar.gz 277702 BLAKE2B 6de23e43be0c14bce2379e699b1e25a8ac5ed80cdef1493167c80253cbefac3357dadb00c15d572c5e4213528d0e48b9242cd93b71dc367e22753243e56b2496 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2
 DIST iperf-3.1.3.tar.gz 549466 BLAKE2B 645e9614ef8f4e4f7949d9aaa99631eba604754a7744d1a729408c5549beb4baf692cee99498dddd8150e1cf06adaa13213cf70510e8ab54418274cdcf145ecd SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9
 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 752 BLAKE2B 72acd92d2cb33a31953cd024efe80b65527ec1808308b1b90e012aa72b77585e6f73cadefbe4870b24284b6f9a2871b832c75aefdc8185169a36d199fe90c63b SHA512 7ed8c871573d7024e0d1fc168455c12f811349280964400b61c68a587927a5438d33f0bad7ba1cab60e55e5c7f625e0fd50b3614411c232c861d169ccb425f32
+EBUILD iperf-2.0.13.ebuild 749 BLAKE2B 058fee353d0b527ff7b498393edede4b27a6e964986a9ea0a5c1726438f5a5ea5e3b78b8c3ebe0c11f6c4eb183479a5ff9ccbc36391cffabfe3835c9630fc85d SHA512 063744c9a43f5cc37bc56adf9fe0980adb448a119afd41b006e8192bb91de562a7b5942259aefcdb5c76c07515e8fbee552fed6184dc191933febe7712e4458e
 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
diff --git a/net-misc/iperf/iperf-2.0.10.ebuild b/net-misc/iperf/iperf-2.0.13.ebuild
index 42c1e501eb05..004d6c577224 100644
--- a/net-misc/iperf/iperf-2.0.10.ebuild
+++ b/net-misc/iperf/iperf-2.0.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://iperf2.sourceforge.net/"
@@ -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/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 4a42aa438b01..77f79ccc67c1 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -2,20 +2,16 @@ AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238
 AUX kafka.init.d.4 709 BLAKE2B 3fb3d09fb715b4c01396406574c21a2127cc7c73a92927b9add59123fb5cc2d9f97c2dd2c10c212eb3bb723a05ab7575c2443a71baa6063b85ef21dce9426f75 SHA512 1c96854b6fab044e1b415e6e9f16964d1d06dc4070dabead9a1b391a9ab2a4b64120e175f8199afbc1fd2a4ba7f7d319932e0d2b5fb1ef0e8cfe55c68313d1a3
 DIST kafka_2.12-0.10.2.1.tgz 34046244 BLAKE2B 210ebb9a2994d453e10e7c2f7a789ac33f65adced96032c2cfaff8ec2fceb2c4e4a35d71421a2b9c965c8c6e8b85b6a4e5cabd7cb0b5af0474b5a1c598c3e2f1 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc
 DIST kafka_2.12-0.11.0.2.tgz 37282246 BLAKE2B 55485ff6b319b35626e8c93967357eda7099e427b5f1d87ab29bd7c8edd0ded8e271b3973b5d3ee025f09e17d319a0e9f1a9fffcf75c663052ce3b656f2e9b66 SHA512 b1652b53558886a1d407fd82d6ea1c3af5b580752303dcf836c43d76c0fc0773790df4af2d9364f937fac96d197974282e57add488bd592e87cf4c3f52592bb8
-DIST kafka_2.12-1.0.0.tgz 44352403 BLAKE2B 14c536224c2d75ccaa471dfa7dc806f99e17e70663670bbc09fc6150d2ef76f6e31b1a3567b32fdc7caa8a2b440f83734102b1bafebd1df067bad1ab8dcbe9d7 SHA512 1b647b7f392148aa2b9d47550a1502e50be4b005c70c82dae03065b89484e66400528be40ca2d54f35eb2c0e70f35c88a04777c2b625daa5d5546caab4ed6818
 DIST kafka_2.12-1.0.1.tgz 44474706 BLAKE2B 59aaa2bb2f1940b4d581882eaedbba091149cecadca970762b7ba83aff41da165526e5d69a65212de2f25c28ad5c2327befa4d9d01bd04e7fa8b9d882e832dd8 SHA512 935c0df1cf742405c40d9248cfdd1578038b595b59ec5a350543a7fe67b6be26ff6c4426f7c0c072ff4aa006b701502a55fcf7e2ced1fdc64330e3383035078c
-DIST kafka_2.12-1.1.0.tgz 50326212 BLAKE2B 079118f6e269c028a78700a6d11f70c36b8856a5f4180050c5d4b667f6f719fcffcc50433a687e6b181dd15423dbe28dfdfacd82f6d6046e8839a21d56c6377f SHA512 48d1ddc71f5a5b1b25d111f792553be69be62293640a3c6af985203c6ee88c6aa78e01327066bfad3feae6b0b45d71c0cac6ebd2d08843d92269132741a3791b
 DIST kafka_2.12-1.1.1.tgz 50602117 BLAKE2B acef2456e70278e09fe2a686205829d0c699aab6057ca0ba458bc1ee141e6d9336013e664b02242ad83401f4f71a8ab4b42574ffcaa99b05f55ef68a4b87d72d SHA512 2a1eb9a7c8c8337c424eefed7baae26b3dacba6a4ab8b64d9a7d5c6ee2cdb66cfa76c5b366f23435941569b89bf02482625189016296b2ea2a05fd0f38f6b709
-DIST kafka_2.12-2.0.0.tgz 49405896 BLAKE2B 601ea97c3007e2d09b1520baa86bf9ed7e740ba6e1aaac675cb158dad3e079a253e032ba7e1034526fa04d7f8088043747800b37db59232b45e729b944029f6c SHA512 b28e81705e30528f1abb6766e22dfe9dae50b1e1e93330c880928ff7a08e6b38ee71cbfc96ec14369b2dfd24293938702cab422173c8e01955a9d1746ae43f98
 DIST kafka_2.12-2.0.1.tgz 49446678 BLAKE2B 6d4aa6bd015cb42492364893c3f8ee01b2ce0408097ce5cdf0d3074c1096d30c8eec9926cad6dab31d3b2f26e16ae06173ee25554a8f901632bfde27270a70d3 SHA512 9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa55065f6873f2ee12f46d2f6a6ccb5d5a93ddb7dec19227aef5d39d4f72b545ec63b24bb2f
 DIST kafka_2.12-2.1.0.tgz 55201623 BLAKE2B 3c0b0ce65b65dc005fe4e0e8a3c03d9047e9028fcbcdb840bcddbbabf59d02589057c250073836f779f335523e701f2c4c48d50e3580e5168fb5be1ad730ea83 SHA512 05a07e928c439b1084a6b3f6835f067f9636ac47f9473dcaaf7040d339cbd0a4561b7478531b237aa69e27f50fe3a2e7f4d0f2ba99a6422592a89ecf1187fa25
+DIST kafka_2.12-2.1.1.tgz 55351618 BLAKE2B a102fa24883ab5d3110aec1367e40c0ed0a437ca776e2532dbddb8a79c6288b8334c30b48072da8b58c693fc765106b6dcd03b6baebf66708021305a2dff2acf SHA512 a2e8168e8de6b45e8fca1f2883f0744d3c5a939b70d8a47a5428b72188501d4c2fc11bc35759f2392680d4e8ecf2fa9d0e518e77fd28393afba22194ad018b10
 EBUILD kafka-bin-0.10.2.1-r2.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
 EBUILD kafka-bin-0.11.0.2-r1.ebuild 1466 BLAKE2B 5fc18d046403eeb6c501f70030553b14c5fdc942bd7f504c8cbe40adc9f09a6645e54ca2f1c15ebba261f792db5be8d61b800c756ce3f34a0ac6240e310a6726 SHA512 1ba99aaca03965df8676629e571d61abb2a95aa7bf19ad34f5032d10b947fb5e3bbfbaf8e4cc122809a9c0d0a4b0f8fcddf1611c2ee54a7bec840a5f2fa0647b
-EBUILD kafka-bin-1.0.0-r1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
 EBUILD kafka-bin-1.0.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
-EBUILD kafka-bin-1.1.0.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
 EBUILD kafka-bin-1.1.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
-EBUILD kafka-bin-2.0.0.ebuild 1460 BLAKE2B 0daffcba280aa1d893a6300ee489e09ffb0fe28a81a63e5821532f912642a236a3f5bff850775fa55a9a6f10165a139dbd2eb3c98a02599d61daf1b982c27e99 SHA512 4668e1ca308d2e49db6b1aab86699d94eed2599dc5276a8cc963a1eb0ce192991c5506371e4dfd382b9b0ce608c2da7e0007d23c5b72159fb2acd10ef09e6ac0
 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 EBUILD kafka-bin-2.1.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
+EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
deleted file mode 100644
index e285fe9e87d6..000000000000
--- a/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-1.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-1.1.0.ebuild
deleted file mode 100644
index e285fe9e87d6..000000000000
--- a/net-misc/kafka-bin/kafka-bin-1.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild
index 04dbadb9ac3d..0f799f94c22c 100644
--- a/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest
index 80711f91735c..4c369dfb98f3 100644
--- a/net-misc/ncp/Manifest
+++ b/net-misc/ncp/Manifest
@@ -1,3 +1,4 @@
 DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8
+EBUILD ncp-1.2.4-r1.ebuild 843 BLAKE2B d42afa30ebcb9b390ff02b964f66353cd00ece303168645ccb4dd2ab85339e66b968b496fa8fd230b38da87c877a2e0f39085a333f7371686cc9ae6a861cbaad SHA512 3cb657dd0c5eba849d352eccb6b880df6660c854e98883b7ba1f9c054d677fcbd1ff812001cbc138893369dc5f5b57a352ad17d0fcd6ae1a9295291665af4186
 EBUILD ncp-1.2.4.ebuild 853 BLAKE2B 24aec6cd73be1471ef9ca3a7f9da8cf0e6a11cd78ed4eebb6390d9edabe66ddbc62825410e5996c850a41aac639055f167416af8b17f464ccc078b59d1d3b796 SHA512 b7495762fa68ceb0927159dd65f000fc062fdfdcc5f50f1333ce68e43ce4e32db899e16d538b74bcf366a3deff49e1e73ec796e6df41ba8ebc1e544b94849316
-MISC metadata.xml 487 BLAKE2B 2dba73139b43435aa6bc2cdbc667e615639de51f827ff1c114f6c94189c9b9e0279d0dbff1b48ea69680273b15b5f35bdd63dbb51b69538f361f5064d61f44ef SHA512 2be2a4fbddaec2fbeab193db226542ab35dc7fa51231c6b6fb55284b521c8c5afe9ea9cc5ada2cf1663cd87a8abdd8213c304e3c2dbf5795b1d4e8b5b956dce5
+MISC metadata.xml 698 BLAKE2B 4e878fa6c8542b522a34bd256345a93060d5b64fc539f59dc5db207680dab597fba92beb7361bd002afca64dd291c2ba1053a435cc2b1ad35bba878a81d00bec SHA512 deb18945b820f2332812f851dd4d1a40dddca5fd04541987746d2c3a9d75a25792ce8fb1931e8c87010a73f820165155172d2aeb2d2d702cc95a3a1b8e34b169
diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index f0915952f0fb..da384e181f0e 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
+	<maintainer type="person">
+		<email>bu9zilla@gmail.com</email>
+		<name>Michael Mair-Keimberger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
 "ncp" is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except one: you don't have to type the coordinates of your peer.
-</longdescription>
-<use><flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag></use>
+	</longdescription>
+	<use><flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag></use>
 </pkgmetadata>
diff --git a/net-misc/ncp/ncp-1.2.4-r1.ebuild b/net-misc/ncp/ncp-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..6309febf0296
--- /dev/null
+++ b/net-misc/ncp/ncp-1.2.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility for copying files in a LAN (npoll, npush)"
+HOMEPAGE="https://www.fefe.de/ncp/"
+SRC_URI="https://dl.fefe.de/${P}.tar.bz2"
+
+LICENSE="public-domain" # mail from author, bug 446540
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="diet"
+
+DEPEND=">=dev-libs/libowfat-0.28-r1
+	diet? ( dev-libs/dietlibc )"
+
+src_prepare() {
+	default
+	rm Makefile || die
+	sed -e '/^ncp:/,+5s:strip:#strip:' \
+		-i GNUmakefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(use diet && echo "diet -Os ")$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP="#"
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/npoll
+	dosym ${PN} /usr/bin/npush
+
+	doman ncp.1 npush.1
+	dodoc NEWS
+}
diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-misc/networkmanager-fortisslvpn/Manifest
deleted file mode 100644
index 1466760af78e..000000000000
--- a/net-misc/networkmanager-fortisslvpn/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX networkmanager-fortisslvpn-1.2.6-location-fix.diff 1257 BLAKE2B 1ea633c11ec59a634c570873cac3f6c9203cfeb66a60d1056613e794b7dfa9d21331a0abca7ef1f1aff4f8c1317808431a318042963153ee93c92d596fb5440c SHA512 586e408a65cc83cc3e0e8238eab673b484188eb7e7d62c8bc14abaf05a82acff24f9281a904624fe45aae08b0804e7516c393d7ef52f1c2dcbb4949f23873bca
-AUX networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff 747 BLAKE2B c12251887128e21f7025f6a111aa9d022899ace86000ba84e8e139ca02500e60c584b21d101f74c4326a422a299badd62647e1779059fe0425652eebb4b973b2 SHA512 a1701ddb5fcc49ceafd8d87c4a5e50dd7aeebfe32ba589f28c931dc93274531a16a0414db6e79fecfa4c03c182c7824cd3504d76234d544d488a5fdb3b34b9c4
-DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 BLAKE2B 1e3aeab2df0b91b09fba1678861215f164251dc1f51c12c0cdbb4c53c939849d75c5f70552e608a11a0c9c7890a15d5dd4b218c7c440c92bfa8df157ff20babf SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d
-DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
-EBUILD networkmanager-fortisslvpn-1.2.6.ebuild 1062 BLAKE2B 0dd5ce66bb75b9bc0924b3c61574fe74f28456c1f4b400fb99cc67f95352c5531c6fb3ce9119353b6d7140a5e1a352e33fb0bf3d15b6d61d3b4cba888c5a6c85 SHA512 90842eecb134600932468239e539350849c5c024021fc10b77a06f557fb71e6eecad349403d4b64185e7045d3f1944027641ab3a882984e1e3f07463e1fe8360
-EBUILD networkmanager-fortisslvpn-1.2.8.ebuild 868 BLAKE2B 66af3c3ee466686e9a24a321b64d0deb2ef5cee26429f3925ef4f9fe8fdb50ae5fccd8d8acaef03e92bfc82dc4dc0d5cd79078304ecda137cfd8af50605940bf SHA512 26677c7e7bd9d2fea1218218971fd7fb2043d10d2804811c5f3cea69df0ad4617cc46a77da55028d9539f843bcb493c8669370a9a4f5c80ea65850bf892bc6aa
-MISC metadata.xml 380 BLAKE2B 68402a902953176bf28ebc6521a06c109cbf2a448c184665cef3ab42ec6b1f7f426a31b7714275e215ae742ff79b2fc7b5c4d80046f8a15b5a73fa5d6a05ebf1 SHA512 ebbe00af25885a8178a56f6b8341a75125c506dd8e374cb061acaefb8f0bddd0678d7231cc2eb13a319b1fb8a080f6c2d66fdbdd8aa022a7dc1216dac6c53c89
diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
deleted file mode 100644
index c0439bf0e394..000000000000
--- a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 59ba94121..6419e9f57 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,6 +26,8 @@ dbusservice_DATA = nm-fortisslvpn-service.conf
- nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
- nmvpnservice_DATA = nm-fortisslvpn-service.name
- 
-+fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
-+
- BUILT_SOURCES =
- 
- ###############################################################################
-@@ -276,7 +278,7 @@ auth_dialog_nm_fortisslvpn_auth_dialog_LDADD = \
- if WITH_LIBNM_GLIB
- # Install a file with full path to plugins for an old gnome-shell
- # https://bugzilla.gnome.org/show_bug.cgi?id=693590
--install-data-hook:
-+install-compat-name-file:
- 	mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
- 	sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
- 	    -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-@@ -286,8 +288,14 @@ install-data-hook:
- 
- uninstall-hook:
- 	 rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-fortisslvpn-service.name
-+else
-+install-compat-name-file:
-+	@:
- endif
- 
-+install-data-hook: install-compat-name-file
-+	$(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
-+
- appdatadir = $(datadir)/appdata
- appdata_files = $(appdata_in_files:.xml.in=.xml)
- if WITH_GNOME
diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
deleted file mode 100644
index f882679954f7..000000000000
--- a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6bef38ed5..951b829e3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -95,6 +95,7 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
- pppd_plugin_LTLIBRARIES = src/nm-fortisslvpn-pppd-plugin.la
- 
- src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
-+	shared/nm-utils/nm-shared-utils.c \
- 	src/nm-fortisslvpn-pppd-plugin.c \
- 	src/nm-ppp-status.h
- src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
-@@ -102,7 +103,7 @@ src_nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
- 	-module -avoid-version
- src_nm_fortisslvpn_pppd_plugin_la_LIBADD = \
- 	src/libnm-fortisslvpn-pppd-service-dbus.la \
--	$(GLIB_LIBS)
-+	$(GLIB_LIBS) \
- 	$(LIBNM_LIBS)
- 
- ###############################################################################
diff --git a/net-misc/networkmanager-fortisslvpn/metadata.xml b/net-misc/networkmanager-fortisslvpn/metadata.xml
deleted file mode 100644
index b7fa921dff8f..000000000000
--- a/net-misc/networkmanager-fortisslvpn/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mathy@vanvoorden.be</email>
-    <name>Mathy Vanvoorden</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
deleted file mode 100644
index 94074c6b078a..000000000000
--- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2:=
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp:=
-	>=net-vpn/openfortivpn-1.2.0
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
-	"${FILESDIR}"/${P}-location-fix.diff
-	# Upstream patch 4195187fbe5be348222c9a8472f7c9cf0e51d346
-	"${FILESDIR}"/${P}-nm-utils-dependency-fix.diff
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--localstatedir=/var \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
deleted file mode 100644
index 0aadb4db8bb0..000000000000
--- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2:=
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp:=
-	>=net-vpn/openfortivpn-1.2.0
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--localstatedir=/var \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-libreswan/Manifest b/net-misc/networkmanager-libreswan/Manifest
deleted file mode 100644
index e808bf81fbc9..000000000000
--- a/net-misc/networkmanager-libreswan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NetworkManager-libreswan-1.2.6.tar.xz 348312 BLAKE2B e27180b94807db3bab7d41502674fb9e950fc8eb79447a901f2c69f9fdbbf99032e007cb1e631ef5f8eec5dbed40e74f1e0eadecef7fdfc3b618500447a3a9a8 SHA512 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798
-EBUILD networkmanager-libreswan-1.2.6.ebuild 837 BLAKE2B d6683af55cc293b35cd492e6862b8958243b106b9e0d8742be124134b9e83251448dd9b74afc486cef1bc88df3026e4569e3c6fa089653586f0c4be6da7c4269 SHA512 5c046e22b2c49e4dac512de88f8dab8c578145865763bd6f5f3cb31c94d68ea28ddadffb5307624b2b193b9e0b36d33a191b5f057944706197dc9cd9f63784d0
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/networkmanager-libreswan/metadata.xml b/net-misc/networkmanager-libreswan/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/net-misc/networkmanager-libreswan/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild b/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
deleted file mode 100644
index 003f0f98b87a..000000000000
--- a/net-misc/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-libreswan"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager libreswan plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3
-	>=net-misc/networkmanager-1.2.0:=
-	net-vpn/libreswan
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-	!net-misc/networkmanager-openswan
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--with-dist-version=Gentoo
-		$(use_with gtk gnome)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/net-misc/networkmanager-openconnect/Manifest b/net-misc/networkmanager-openconnect/Manifest
deleted file mode 100644
index b3e50cf7194b..000000000000
--- a/net-misc/networkmanager-openconnect/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NetworkManager-openconnect-1.2.4.tar.xz 647944 BLAKE2B a2a096224a42e5ab55743e46d9030eb036cb0d8d43a957c2b7f056f7de8763ec8d2de84701ac59951540aceefd0329614eb50aa5c57600b3e72fbce0118fe431 SHA512 203652a468525c3f6d374ce7fbf2f5b904a13b5e74fb3898dbfeec863c64a60fd9826fc5d9edb52c3e75b9871f49cb78580914e37a3522e4676ca1c29102d0a2
-EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1117 BLAKE2B 3136341ae3273fd520157539ef83d6a852219fe586c4b8eb62cdfa84beb388b06a8d8e6bfeffbfc5d9a2b41c9a534dfba277df7fa6e4e0676c78dc575f15b890 SHA512 2795ddf0c86284e0071a0f8c5b9a9c56aab5a41565a124f13dc5d326d6250b86cc18bc954e8c86c86c91f0cfeb2637e5d0d7b25077bc1ca46f51a6aa46e80581
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/net-misc/networkmanager-openconnect/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
deleted file mode 100644
index 8f36b8bad8c6..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenConnect 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:=
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	>=net-vpn/openconnect-3.02:=
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=x11-libs/gtk+-3.4:3 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# We cannot drop libnm-glib support yet (--without-libnm-glib)
-	# because gnome-shell wasn't ported yet:
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1394977
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1398425
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		$(use_with gtk gnome) \
-		$(use_with gtk authdlg)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
-}
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
deleted file mode 100644
index 0fc7a5db730d..000000000000
--- a/net-misc/networkmanager-openvpn/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST NetworkManager-openvpn-1.8.10.tar.xz 564540 BLAKE2B e117395b91efbd0ee10bdefe0aaff8a39fdd1fe232dc1543224be7dfd9bb18729ad873091301e6348f8955f28579e106f5565c7138309571e06598aa35dc5bba SHA512 f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc
-DIST NetworkManager-openvpn-1.8.8.tar.xz 562748 BLAKE2B 8c75d30a8865d41cd564e719f08522482b0d6901a8e812dec5f5b9fd8c8c2839663d078148e9d505ee7b7fc6e5c96fda8c3c0a0390837211a1fe9689f01fd27d SHA512 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574
-EBUILD networkmanager-openvpn-1.8.10.ebuild 1258 BLAKE2B 334b88266da2b346eebfd686aa7424b4053af457cc8df1fba239b9dcaad9c6cb90e8c3f0f43903623483ab1f57fb2a4cba0639f3ac4a87ad68e883c6877b14bf SHA512 c5197fde17bf0c7b0ae8800b572924a6af6953413e17497337b076a6d9ea00b733c38ede20751231dd0657139962df4ef6e66f38060f9aeea74d5ce7245c004d
-EBUILD networkmanager-openvpn-1.8.8.ebuild 1256 BLAKE2B edd6d769382e025e7d94e15fb8ea95914b8876147579535dca3734f78789072b0ad9003b6129a92940f06ef3656aa62fa986cbf83b5804ac91b667d38bedde06 SHA512 8cb666f9966fdc926aed39483f3ae052dcb6151f2bbdb6861c4ac56804a1733b355ab2f73e9ba175129c0223324d5cd7a2471e70345bc83455513597ae5161aa
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/net-misc/networkmanager-openvpn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
deleted file mode 100644
index be8cb945aed3..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
deleted file mode 100644
index 572c134026e6..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
deleted file mode 100644
index 24052dedc717..000000000000
--- a/net-misc/networkmanager-pptp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NetworkManager-pptp-1.2.8.tar.xz 401540 BLAKE2B 64b3fe344a39eb64b462bda9204fb80b95a6cb54988efef9dbd1a5a6b04b3577edee97afabef410488868736d751846bdd98f3965a96806790527434c8207ec8 SHA512 ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7
-EBUILD networkmanager-pptp-1.2.8.ebuild 1259 BLAKE2B 1794c968d668c0b0079ef759c67394edf67cff321cbbfc52284ee7077c3bb61a309443852722735f9bfc3c553f2dfa9e8c63674280f8d9f8329e993daa7c1ace SHA512 1956fbe0f67c4ecd77154e5381652e6875fc63c2b769f08b06865c377b173accd47f688a0b477bb107ac64e6e3d3d96330ab377f4c2835ba7266f3813137b99b
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/net-misc/networkmanager-pptp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
deleted file mode 100644
index a20000d7800e..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager PPTP VPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
-
-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-sstp/Manifest b/net-misc/networkmanager-sstp/Manifest
deleted file mode 100644
index 45225c2ae0a1..000000000000
--- a/net-misc/networkmanager-sstp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NetworkManager-sstp-1.2.0.tar.bz2 440695 BLAKE2B 170221842c25945da09f94364642be94993ac4ef7bbaffebefc463e18eeff78f3a58d95607a6f0be9fb5ecdabee244d64abb02eb56deb213ac089019089821f4 SHA512 31c7f61c2d0326c2ddc681690d4a9e0a25f29b3b5f51c44ea196cd74aab1002a6eb66bd06bddd8218961b18e666d5c28e57cfe0b2694a686ea8eb4195fcd9776
-EBUILD networkmanager-sstp-1.2.0.ebuild 1162 BLAKE2B 28c0c74a69a179414c8a612b22672c87762e7e58b208e7b4b62b9984d7f294181fbed1057e461e1916f7b14aea7e787428ccb3dff0884ea8aa6f4cf400f62188 SHA512 f23af17221827fdd8e0a871489bcbca52cc706351520c74372e0f8415b502c1ec12b6392b5b34dffb98a838d06aa7074c9ae661a783172b875efc92eb4439570
-MISC metadata.xml 321 BLAKE2B cc5ea40e87e3fabe56c96fdaf6fa346a2adc42b08fd3ab7fcd10e3c602b5f72b67b08a4003ae34cc5dfeab45f0e33fe594b7f48f8d897a351d9dae0874adb193 SHA512 304851925158260c6e40edafe4cace5f63bb057c48cacbf7bf540d7cde0d1a5a24242e4212fdf8a61add139fead4b7ea4ddcd005cb5ce42ce37732a4f6a81770
diff --git a/net-misc/networkmanager-sstp/metadata.xml b/net-misc/networkmanager-sstp/metadata.xml
deleted file mode 100644
index 39465ceb7743..000000000000
--- a/net-misc/networkmanager-sstp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>pinkbyte@gentoo.org</email>
-	<name>Sergey Popov</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">sstp-client</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild b/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
deleted file mode 100644
index 42e7b976ce88..000000000000
--- a/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN="NetworkManager-sstp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)"
-HOMEPAGE="https://sourceforge.net/projects/sstp-client/"
-SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	net-misc/sstp-client
-	>=net-misc/networkmanager-${PV}
-	net-dialup/ppp:=
-	gtk? (
-		x11-libs/gtk+:3
-		gnome-base/gnome-keyring
-		gnome-base/libgnome-keyring
-	)
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local PPPD_VERSION="$(echo $(best_version net-dialup/ppp) | sed -e 's:net-dialup/ppp-\(.*\):\1:' -e 's:-r.*$::')"
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \
-		 $(use_with gtk gnome)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/networkmanager-strongswan/Manifest b/net-misc/networkmanager-strongswan/Manifest
deleted file mode 100644
index 2aa58754ae99..000000000000
--- a/net-misc/networkmanager-strongswan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NetworkManager-strongswan-1.4.4.tar.bz2 305677 BLAKE2B 24d99cd3f3844b6ffd47d076153ff8f80a92e575ca7f8da01141be2a48c39a759ee60e17ccdd4928e3c625fa9caae39d8f3cf2c76481adbcdda91fd00ee9e8a2 SHA512 e3e2dd9f5b961255f897ca1912f9deb34ac62628ff40289ff0f8f3900746482f2f32d390c64b88c10f10b8a99388e27099abedb7157d77c173524dc763a32155
-EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 938 BLAKE2B 7d8115c26a8da345f61674c36aa51edba2884d3330325402ab8618e7d8142047b7c27adfb89347ef2dc5dd5c62f5203a1b9dc8ed09900d330caa7364ade52a11 SHA512 3645d9fc3505f0cd0790893b53eaa47fe39b4a4967260483dcdec36bef1d8bfd347dc68cac56e02eb3d5816676e7be3f3c621a1afce47636c44b3340f2249540
-MISC metadata.xml 444 BLAKE2B 99927d1d0c6beeab7cd31eb4ac9dcc7afa038b54ac270cfb671fdcd6543e828147a7220854aeccada6823c5b7d32dfc3bd37924366896014c0341908b4b890d7 SHA512 5dc220ebf57644553266caa7e83d4478b6c7c665199b2bd26943afcb5680a0ed7597e4565043a2098fbad20cd9f5f3991877a4c171288f9ed2572923a7913c73
diff --git a/net-misc/networkmanager-strongswan/metadata.xml b/net-misc/networkmanager-strongswan/metadata.xml
deleted file mode 100644
index 0afa017bfd09..000000000000
--- a/net-misc/networkmanager-strongswan/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="glib">Enable libnm-glib compatibility.</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild b/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild
deleted file mode 100644
index de93d1d51007..000000000000
--- a/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="NetworkManager"
-MY_P="${P/networkmanager/${MY_PN}}"
-
-DESCRIPTION="NetworkManager StrongSwan plugin"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+glib"
-
-RDEPEND="
-	app-crypt/libsecret
-	gnome-extra/nm-applet
-	net-misc/networkmanager
-	net-vpn/strongswan[networkmanager]
-	x11-libs/gtk+:3
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myeconfargs=(
-		# Don't	enable all warnings, as	some are treated as errors and the compilation will fail
-		--disable-more-warnings
-		--disable-static
-		$(usex glib '' --without-libnm-glib)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
deleted file mode 100644
index 7fd507c4b1fb..000000000000
--- a/net-misc/networkmanager-vpnc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NetworkManager-vpnc-1.2.6.tar.xz 417412 BLAKE2B 00072e2f5449687a55ff4dc0382c4ef2bb2042f9b2a4437d1d6790084ff1b88210e45909808048498f315d59ed5408630ae15d09a1d22e4acbf840554e452546 SHA512 4f8adf58d73cef74a950d822c6f17cd813a1e74fcd3c0391f847541c279e448a6353b83984d593fe5e11138a37b7f1c21b9a24a6843c1d35e4cb68bc29bc3eb1
-EBUILD networkmanager-vpnc-1.2.6.ebuild 1067 BLAKE2B 447f985f9f4944dbec47dbc38114351feb842041b33452d9cac78386c0f7ed2882218806a1c57ee0a4700c5d76603b4f079323757fe76bd7b503b056308da48b SHA512 66c13585ffaed89bfcdd99770064973e34cd6d8e782ebe8def0f69fdbae652b734e59303719ec186863ecac44d6fcbe282fe02e6e1e560d5deea8f7570ef52ff
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/net-misc/networkmanager-vpnc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild
deleted file mode 100644
index 112ed09512d8..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2.0:=
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	>=net-vpn/vpnc-0.5.3_p550
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# https://bugzilla.gnome.org/show_bug.cgi?id=742708
-	sed '/test_non_utf8_import (plugin/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 9e468261eabb..7c52d2fa060a 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,5 +3,7 @@ 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.14.4.tar.xz 4414196 BLAKE2B 31b236ee143892725cccccfe26a83bc75f938e19f52c5d09fb6ea3635f517feb5bab428eec4ee5e617920a8a8dd6bfe72bf9b760ecf16dec0bac4bb8663c58e4 SHA512 4199d6d7bbbee318b0f69cf2c1bf46cc3721c764121634751753c3cc833c4c5ac0856467896536e3d403ba8783fe452aaa79bfcd71a5ec324a4274989fb656c7
+DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da062ea741111bdd54400f199e057317dff12fe9b0d3ab7795b21e93217076a0b338a18d99c7d2c2514d138aaf5bf41aa71c5a SHA512 e5e11eed6366eb185691102c89732a458f3a01aa979e724f7415d237e0ba1a811ac78bb17d9cf1b11181ec6e3f82cb5f1c86b624d3c2b2c7c1b72549653309c9
 EBUILD networkmanager-1.14.4.ebuild 10965 BLAKE2B 833dd376a914bf626e0cdfc90449ee04f39039106948604a479548269b47d9dbed3ac30d7349cd724899b5185d2c24e38d0288a9c17daccd23892b1dc4f0351a SHA512 b3757b6bdbf99d94a4683eb4293d0588c16f6380d11e48ae52e5541dfee3ed44bb1560078822532c99353cb7f06da09dfb98a2cde7569fd3aa0b402fa96fb19d
+EBUILD networkmanager-1.14.6.ebuild 10967 BLAKE2B 60149db8fb3e9953e41dadaa6648ea8bb366dfd125592cd01e22d205aa0ab1f4971d53b7866338652bbeedb84cc995d86dcdab239906d16ea0b150091e9b2b4f SHA512 e7576a39e48be55a0dee111ae3be9a8d43b128a2ebb5983bd00971e98e615eb03aa9f077eb4ed87dd3c8622651b3e30f1a7fc992910df603c32b8cb8c532547c
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.14.6.ebuild b/net-misc/networkmanager/networkmanager-1.14.6.ebuild
new file mode 100644
index 000000000000..9ebefce82102
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.14.6.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	iwd? ( wifi )
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		linux-info_pkg_setup
+	fi
+	enewgroup plugdev
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib, bug #665338
+		--with-libnm-glib
+		--with-nmcli=yes
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e6ecb4cad513..7bb5b0c20aaf 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -48,7 +48,9 @@ DIST openssh-7.8p1-sctp-1.1.patch.xz 7548 BLAKE2B d74010028f097812f554f9e788aa5e
 DIST openssh-7.8p1.tar.gz 1548026 BLAKE2B 938428408596d24d497f245e3662a0cff3d462645683bf75cd29a0ea56fa6c280e7fa866bedf0928dd5bc4085b82d5a4ce74b7eea0b45b86f879b69f74db1642 SHA512 8e5b0c8682a9243e4e8b7c374ec989dccd1a752eb6f84e593b67141e8b23dcc8b9a7322b1f7525d18e2ce8830a767d0d9793f997486339db201a57986b910705
 DIST openssh-7.9p1+x509-11.5.diff.gz 594995 BLAKE2B 2c44df224e4114da0473cbbdfdcc4bd84b0b0235f80b43517d70fe1071f219d2631f784015ab1470eebcf8f3b6b5f8744862acebb22f217c6e76f79e6a49c099 SHA512 4d2fd950dee9721add822fdb54ff8c20fd18da85081ce8a2bd2a1050d3ff7900a7213782c479691de9dcfe4e2f91061e124d34b365edb3831e8bfe4aef3744f9
 DIST openssh-7.9p1+x509-11.6.diff.gz 655819 BLAKE2B f442bb993f89782b74b0cd28906c91edfcf5b1d42a4c8135a5ccf5045e7eb000eb7aa301685b748f707506ba20e3b842d684db436872ed82b6d9b9c086879515 SHA512 0ff6ed2822aaa43cf352134b90975fb663662c5ea3d73b690601f24342ea207aecda8cdb9c1bdc3e3656fb059d842dfb3bf22646b626c303240808286103d8bc
+DIST openssh-7.9p1-patches-1.0.tar.xz 9080 BLAKE2B c14106a875b6ea0672a03f6cb292386daba96da23fed4ebd04a75f712e252bc88a25116b0b3b27446421aadf112451cb3b8a96d2f7d437e6728fe782190bc69e SHA512 7903cdb4ce5be0f1b1b741788fb372e68b0c9c1d6da0d854d8bc62e4743ad7cd13101b867b541828d3786b0857783377457e5e87ba9b63bfd9afcdbfd93ac103
 DIST openssh-7.9p1-sctp-1.1.patch.xz 7552 BLAKE2B 0eeda7c8a50c0c98433b5ee0734b9f79043067be376a9ca724d574d4a595c3f7aed0626342300467b73ad9003392e22fda8abe778158ba5be5a50a57eeef79f8 SHA512 6cad32c40dd3901c4eadb0c463a35ec2d901e61220c333d3df7759f672259f66fc83e2b1ace8b0ef84cbc1a65397f00f9c670ffa23726d8309fa5060512d2c21
+DIST openssh-7.9p1-sctp-1.2.patch.xz 7360 BLAKE2B 60e209371ecac24d0b60e48459d4d4044c0f364a2eea748cc4edd1501faec69a3c5b9e0b7db336968399ec684b6c8aceeac9196ba1ecf563ae3d660682cbc9a0 SHA512 d4d37a49cd43a3b9b7b173b0935267b84133b9b0954b7f71714ba781a6129c6d424f8b7a528dd7d4f287784c5517d57b1d6d7c6df8b5d738e34eb6dc7eae7191
 DIST openssh-7.9p1.tar.gz 1565384 BLAKE2B de15795e03d33d4f9fe4792f6b14500123230b6c00c1e5bd7207bb6d6bf6df0b2e057c1b1de0fee709f58dd159203fdd69fe1473118a6baedebaa0c1c4c55b59 SHA512 0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e
 DIST openssh-7_8_P1-hpn-AES-CTR-14.16.diff 29231 BLAKE2B e25877c5e22f674e6db5a0bc107e5daa2509fe762fb14ce7bb2ce9a115e8177a93340c1d19247b6c2c854b7e1f9ae9af9fd932e5fa9c0a6b2ba438cd11a42991 SHA512 1867fb94c29a51294a71a3ec6a299757565a7cda5696118b0b346ed9c78f2c81bb1b888cff5e3418776b2fa277a8f070c5eb9327bb005453e2ffd72d35cdafa7
 DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16c339b46a7c773258d2f4fe44e48b16abccad1a8757a51cb6362722fc5f42c39159af12849f5c88cf574de64815085c97157e16653f18d4909b SHA512 53f2752b7aa02719c8dfe0fe0ef16e874101ba2ba87924aa1122cd445ece218ca09c22abaa3377307f25d459579bc28d3854e2402c71b794db65d58cdd1ebc08
@@ -58,5 +60,6 @@ EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd1
 EBUILD openssh-7.8_p1.ebuild 15333 BLAKE2B 4452bc6cc03ed9fb8242b15894133e6e224e1ac0818688b02bc17850050bc67c0dd8fefcbba66c96bfedc8fb452bbcde7282062ea372d220a2b1d77fb0b48b20 SHA512 bff6000cd8913a885bcad3ffb60bde7760a24d37a4987afd34f4b38d603c8bc72bfe0d07f8f109c238d11e49bed72ddbcbe26838cd9d69b379dbf7521f12626f
 EBUILD openssh-7.9_p1-r1.ebuild 15769 BLAKE2B bd4f5f9e1927d59226c3469f22884c835d158f364f6b74946bd4c5fa551e1cb7715ffad9263b51a9319f44fae352b334eb536dd390f58d44fb6878f936e3b41d SHA512 b338b6e3708e4295a3cf5f8bbe1973fc8164bc2eff79e05272bfccc924a2416c10a7d225e5d5da53a2ba3e3e3c960f16db7561ebf3adca335032910b0154f67e
 EBUILD openssh-7.9_p1-r2.ebuild 15837 BLAKE2B 0e6156e6229b18255a66b9a8f1d9dbbc27ae49469f9815f07d61912d6cd90bf8a85aae6cdf541912649303c085d6b7033e1f9d12b5ba42be6d111612a86a4072 SHA512 6126eaaf18ccde1f618f927cb086919c5a13bd92c91566c8c9635b96779406a641550a6f510766502057ce1684b06d9b1128b1c40c0b49c1b5b7931b3d7d063a
+EBUILD openssh-7.9_p1-r3.ebuild 16274 BLAKE2B 72e17ec25234f863f139030c8b03cf6855ae1a91f6acc90245190315d320b7cf2217ed2189b6cca0cd6a75d292d6ea486af2ac4f35a873b9ab641af967b66b20 SHA512 4c87161971cd89e0f5d55012f6650b9c025e8bc7444fd2f0a9bfe4e12238942416e187bfb937af467b14d5db89c6ec4d201be551e347d0dd813d110a19d78a75
 EBUILD openssh-7.9_p1.ebuild 15743 BLAKE2B b6108901b97ede2d349729a80d69e9bb9ea059a36967ee1688113c0d17351ecdc3cded6f5e45abc8bb54dc9e1a40ccc78165edca6405a4148d99910f9f1cde44 SHA512 3787f6b671477ae1fd4eb5b6bbd5dbaf8375d36fcfda33b67de402fcc36396b28b221bc9e763b6c5f1ba8475330ee9c15edcf45134c048c7f8faec8e885e2893
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.9_p1-r3.ebuild b/net-misc/openssh/openssh-7.9_p1-r3.ebuild
new file mode 100644
index 000000000000..ce31e554fdf7
--- /dev/null
+++ b/net-misc/openssh/openssh-7.9_p1-r3.ebuild
@@ -0,0 +1,468 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+#HPN_PV="${PV^^}"
+HPN_PV="7.8_P1"
+
+HPN_VER="14.16"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="11.6" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+PATCH_SET="openssh-7.9p1-patches-1.0"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_VER)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-openssl-1.0.2-compat.patch
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-7.8_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+
+	if use X509 ; then
+		# patch doesn't apply due to X509 modifications
+		rm \
+			"${WORKDIR}"/patches/0001-fix-key-type-check.patch \
+			"${WORKDIR}"/patches/0002-request-rsa-sha2-cert-signatures.patch \
+			|| die
+	else
+		eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch # X509 patch set includes this patch
+	fi
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" || die
+		eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch"
+		eapply "${FILESDIR}/${P}-X509-dont-make-piddir-${X509_VER}.patch"
+		popd || die
+
+		if use hpn ; then
+			einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
+			HPN_DISABLE_MTAES=1
+		fi
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}"
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}"
+		pushd "${hpn_patchdir}"
+		eapply "${FILESDIR}"/${P}-hpn-glue.patch
+		use X509 && eapply "${FILESDIR}"/${P}-hpn-X509-glue.patch
+		use sctp && eapply "${FILESDIR}"/${P}-hpn-sctp-glue.patch
+		popd
+
+		eapply "${hpn_patchdir}"
+		eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX%/}"/etc/ssh
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX%/}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	# stackprotect is broken on musl x86
+	use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.7_p1" ; then
+		elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+		elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+		elog "if you need to authenticate against LDAP."
+		elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 7fbe6da93255..df947c3750db 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,7 @@
 DIST owncloudclient-2.5.0.10650.tar.xz 16651172 BLAKE2B 98b928963f3327bdcddaaa61eadcd73422e982cda11c4a4791987eb34ce692258af47649dcaddaefd01097bbc3aa514a56726dce52ce6f51eb61bdf493bca37a SHA512 61f355e514306ce0dec628ac8af7ba004158a890bc40c3905e5aa7705aff753a3a723ba4a0727625327b399cc71bb6c1ad2b415acc760c551eea1bf2590392f7
 DIST owncloudclient-2.5.1.10973.tar.xz 16662564 BLAKE2B b0c58fee00e366c2a2e0c7b316fc098558758fc3644fdd5a0f39e29dc853030f1df504536a6725a3557e08024346ed9c3fa3d54e35a4d5d452afd1a34ff6fb62 SHA512 11a16f2a2656517f6c89433d8f5e9e44d61be7cc45eb702fe118a000e32ec2f2c53bab75e2d226bc50106c3be975b34b1bafedbaed757d0c3bd8cb025facf47a
 DIST owncloudclient-2.5.3.11470.tar.xz 16719780 BLAKE2B 0c10d95ef2d851ba3f728dfe1c55c4143cf9d1542c1f9e77904324f598ecbfa29e54119d12ebef78b8eafa1188e7359ce11d01034ff34a55a80d31d1d3b1db35 SHA512 331d8e8e71d64cf9c958f9391001c6fdff45795e7caad2ce7bf6802c4f0959adf694712cd298fb8702cd4e93577282957cabc61ccc5f4f3a57edc9ddf1c7c2a0
-EBUILD owncloud-client-2.5.0.10650.ebuild 1961 BLAKE2B 1febde1d3ca49b463c6f05b45e42178a6bab1b104e3cc00986a29d3f3037bc05a9ddc7df94fc0e3d0c3742cc02af0a6b1975fc8857ace251a28ba27fece66061 SHA512 7afaae30ccc8fdb53e812f54c2d2c01c1960d07e990cd470a067a0679d6c005f38791c8333954a75d9c3dd4e99560d5e0a4d7a39ad1d5d33c50e715ae87c6498
-EBUILD owncloud-client-2.5.1.10973.ebuild 1961 BLAKE2B 1febde1d3ca49b463c6f05b45e42178a6bab1b104e3cc00986a29d3f3037bc05a9ddc7df94fc0e3d0c3742cc02af0a6b1975fc8857ace251a28ba27fece66061 SHA512 7afaae30ccc8fdb53e812f54c2d2c01c1960d07e990cd470a067a0679d6c005f38791c8333954a75d9c3dd4e99560d5e0a4d7a39ad1d5d33c50e715ae87c6498
-EBUILD owncloud-client-2.5.3.11470.ebuild 1961 BLAKE2B baf378b6d0821038ef0afab470041aa4d2b59687f3b53e06361221b832361f659f0e4dc9799b79f1035a21c373fa705d9b5021f9b6d132c3b1b2909226145e75 SHA512 8a8570108aaf635ec5842e34f620526c7ede5d3cf0ab77ed7dea31e35114d7ef6e9e8f04f973c301e49c5a3c96f55c017ad74f94277d094f3473f08a9d2caef0
+EBUILD owncloud-client-2.5.0.10650.ebuild 1963 BLAKE2B 6f8c093578366629636a0c11a07e4360668a3e93d201afd64c1862dba1d7f773bee7ff37ba4794a1a072c2df8848edb8385353419188467f07c219a4d16645e3 SHA512 223ca9ffa18b2eb302ab44750d4df5671c316ce0fc5f05812db9bf678b9286eb6ef7782600f5ebb14c8eeaf3239951b805ce05074651ebabb5801abcd3c27c95
+EBUILD owncloud-client-2.5.1.10973.ebuild 1963 BLAKE2B 6f8c093578366629636a0c11a07e4360668a3e93d201afd64c1862dba1d7f773bee7ff37ba4794a1a072c2df8848edb8385353419188467f07c219a4d16645e3 SHA512 223ca9ffa18b2eb302ab44750d4df5671c316ce0fc5f05812db9bf678b9286eb6ef7782600f5ebb14c8eeaf3239951b805ce05074651ebabb5801abcd3c27c95
+EBUILD owncloud-client-2.5.3.11470.ebuild 1963 BLAKE2B 6f8c093578366629636a0c11a07e4360668a3e93d201afd64c1862dba1d7f773bee7ff37ba4794a1a072c2df8848edb8385353419188467f07c219a4d16645e3 SHA512 223ca9ffa18b2eb302ab44750d4df5671c316ce0fc5f05812db9bf678b9286eb6ef7782600f5ebb14c8eeaf3239951b805ce05074651ebabb5801abcd3c27c95
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.0.10650.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.0.10650.ebuild
index 221362c5f1ad..c65369cdae40 100644
--- a/net-misc/owncloud-client/owncloud-client-2.5.0.10650.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.5.0.10650.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.1.10973.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.1.10973.ebuild
index 221362c5f1ad..c65369cdae40 100644
--- a/net-misc/owncloud-client/owncloud-client-2.5.1.10973.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.5.1.10973.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.3.11470.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.3.11470.ebuild
index 024076bcd690..c65369cdae40 100644
--- a/net-misc/owncloud-client/owncloud-client-2.5.3.11470.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.5.3.11470.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 3291c2c0abfd..886f658fa398 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -10,6 +10,6 @@ EBUILD rdesktop-1.8.3-r1.ebuild 1843 BLAKE2B cc3e9e807656d5cf1d92337f90be8ec6b7e
 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
-EBUILD rdesktop-1.8.4-r1.ebuild 1743 BLAKE2B 6e783bf68dd64e4e13d3ff7ace38d8f59b072b79d71adfd68d414bab753a759d2d780137bc0273eb30f8014e4f2763642b6589efac9dbd181377b4d39b13dbc1 SHA512 eb422e85c9412afc45f567a2d6085b02c194972de02dce8256947386ad8b0b4ab486c59c9a1ac8c112f999669786f3b785c6a95015bd0bcd832e25005d1ae1c8
+EBUILD rdesktop-1.8.4-r1.ebuild 1737 BLAKE2B d2f27550527bd3af5023998b3c201a8184476aaea0a04f825ea99e93779b46bedfa23e5f652c8fda76bb388f71f657e0657f8feb19942c518db095789d119af1 SHA512 f5dd4fd138e6be3e8293a75e9ed4b07104b2f0d3b9b531a630fed43570b16613b1b19a2b005aa74c05fc1d69bb8b6d9824c029fcaf36a0fede6a27fccc523616
 EBUILD rdesktop-1.8.4.ebuild 1709 BLAKE2B 09f9ae4b35a35d4a9882034e425c69f66fa30e30166cc26fb6d4ff1fba36512436c40ad4e52f181fae462257e9d575c973efa6b085d29d5e2684fafa55d5ac0d SHA512 c204cc5606d6c38eea53565a09ae57a6783d62aa3436b9049c470ef77053c15e5afbab8027fd8654c465f0878b4c98c5e99112f3f80e14a42475259d34d8c9f1
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
index 582da79a3506..b81439e6e64f 100644
--- a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-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/remmina/Manifest b/net-misc/remmina/Manifest
index 4c1a1ca6a8e9..cefbea4f8ce0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -2,10 +2,12 @@ DIST Remmina-1.2.31.2.tar.gz 1247378 BLAKE2B 923b131ea2b4cff57d952bcfc2cdac58ad8
 DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe11ca1ebbc301b2951df76208da5998746631ef4c57f5692678e948839a8869a183b777f7046d416a55e5ac5b0d76d1 SHA512 f95c4dcebd833b590fbf0b418854bae66541743bc77cda4b0b97e1e49b158927fa859907619fd532b0660fc30eee80be472e02c38a2afe33e477c4a903a99e28
 DIST Remmina-v1.3.1.tar.gz 1341006 BLAKE2B a4938558e2b3595a62514789a6f748f0e526a20dae23f21c835b6c11a3f321fe564fbc77fa4ea7def97875ada169b73692861707d432b81c3ad51d5630633e67 SHA512 91146a75563f169b39f7aa57fbd846cef1965a0e7c11931acda4bc461407cf3644a1f363b1f46421e5a6ccd1d43d6a89cdb38420dd98fea5ddad1a52ae65d41e
 DIST Remmina-v1.3.2.tar.gz 1362006 BLAKE2B fa6c4f84b6987850944906fac97340c7b17b44b076dadc73143924e35916f8306f8b053e734d1a388e97821b1bcf9eb8109cf787a8d3f4e02f0885fa06a338e6 SHA512 076759acbcb5191b01dda777137eb239a38124d20141e85556b23e3380e5d0a39ff187a4928605ca089d53c6cadd268d0de735795db84672ffa55ea247196ea8
+DIST Remmina-v1.3.3.tar.gz 1362239 BLAKE2B 8ae5b72293ffe2f627a46aa9354256d84d318819b0d5c236f4d5628764eaa9e3a3d07f3130ae04ee271cbc6ac207ccfaf495533b3fa59ee184d3da19c8738bc8 SHA512 72d0303f922619c3842880365bb68b967eb2134fef7187d0fd83aeec2b50fb499573849f853d509216608eefc02db7ced91cfc65f89154b51d0657e42bd0d637
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
 EBUILD remmina-1.2.31.2.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
 EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a7c3a618913b35803c56103f814e0d82e65756471cef1e55da3f5d6a2044660b8adb33e7fa82618dba3c376e5fa6d SHA512 f038e0f8242aee5eb86403dc0e4758278f91407b9382b837d248de914037d88f7fac489ce326f5499c4cc548215f924b17ae10e8792955efec868b9e4c00f3f6
 EBUILD remmina-1.3.1.ebuild 2241 BLAKE2B dcf61f0d57abca3f24bd7bffab8bb43b6834f14cc214f3f7fb36e9e10da1fa40ca0f98f97853d21bf1c2a29351f32d18f8f1ce489487ef5c85be88213a10ae56 SHA512 2505786c61408b6bb47f6f0c73505f0431f0ac53be831f6d177d226405ec8a0bb898304368f085737c3afddf52dab428c067a3a23f9e552835465fff74859235
 EBUILD remmina-1.3.2.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
+EBUILD remmina-1.3.3.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
 MISC metadata.xml 1255 BLAKE2B 8567efbc8604b6fa65c44a072f8f49c6b0329de326b6bae638befd74ed0a506985174df29e09ceb391c8aadb3d11ee157137dd7456483b1c49908801831a6099 SHA512 5ce1ab53566158e4d3445e4549f2436bd758a486f39bcd59c732935d0b1f2b4033df616f8e3096632d1053aabfbc5b8602b509bccab676f2a36db637c691eb57
diff --git a/net-misc/remmina/remmina-1.3.3.ebuild b/net-misc/remmina/remmina-1.3.3.ebuild
new file mode 100644
index 000000000000..834591991fa1
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4 )
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_AVAHI=$(usex zeroconf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 5259228db813..d228d3976a2c 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,6 +2,7 @@ AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f356506388
 AUX stunnel-5.39-compat-libressl.patch 5329 BLAKE2B b88f615e88940dc091c264b34ef3c71701e120cc907bd438cb6966b1b720fd9dd8b8bcab5235519b0eefaa1576e37cc8b4c9887cf4d6a2330ba5461347f6ded7 SHA512 a6390e1452f0cf7f2867b28ebc36e0b4f9f6ab8985b03f182625d1970a9bbc0228addaa966feb3c0df8925191b73fdaf48e1e65aef68d3d62962fd28760b3578
 AUX stunnel-5.43-compat-libressl.patch 5328 BLAKE2B 5a014b47e3a314ab2d016ca31fb98d8a4fd613816c38382ece2a9925be217151130fab7d14666aac2602513c1cb0af04742c6a80eb9b8bf51caa46fdc05ad4b1 SHA512 d45e660fc610636dc93b8f696fc378cda4fcf7989f22aecff6394f84bbddfabb70255ebc4a9291a29806b3631767bb64b826c4a9fb2ecfe0ab7e53aebcdc7eb3
 AUX stunnel-5.48-compat-libressl.patch 4845 BLAKE2B 0c6bc9059902be43970a78269632dcdbb82a9e07a6cfa8dca6b960f79832953a7d7173097c74a24ccad8c59deca1353887519cfde107b22d10422204bb83e9cf SHA512 b03277b8487fc9cd763c11e0b32c3755dd4aea76ecc21238204d4f27f03b5cfc72ee7ab148aa813a6eb21bb588d8dadc2b0610049175fa1278e799681a946098
+AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4
 AUX stunnel-compat-libressl.patch 1871 BLAKE2B e7545ae95b173b868fff7159a681497655f8c80c994add9901a752787d2c51728c994ef940f540abc7538585b51ca4de41ddd20e0f929330188ffd2e0d2ded78 SHA512 590f6be1962ef3ca1c8f1c64c02b1e63b7211a2ba5cb5fd4eb09127e45ee5251a7ec701aae3eda25e34caa1977378ad5f7b75e826aee7d9d5ff8b9acbd298f36
 AUX stunnel-r1 1437 BLAKE2B 92689cd4ee63920e1064cb96c88795132ee917e7886f9970f125f52d4eabf0fdb2515783c321771ae4e06598dca7e54f9b8131523c14dea7efa2769e0de0ed4b SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
@@ -23,5 +24,5 @@ EBUILD stunnel-5.45.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040
 EBUILD stunnel-5.46.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497
 EBUILD stunnel-5.48.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
 EBUILD stunnel-5.49.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
-EBUILD stunnel-5.50.ebuild 2916 BLAKE2B 1b32f04a2d31b068752c6ac6bb311fb1e7550a8ddea9a2eba49c6c7fc7babc57308cd457d74fb54fab9edbb95891e0c0de008ce50df41a37e369e08132a287cc SHA512 4d029fae73b4dafc12a675c73512586127575a7b4d5804ae2de31ae3256356dd2c3289a825c660a03fe21aa7078935421949cbda80351e1fd7439f1aa5b05581
+EBUILD stunnel-5.50-r1.ebuild 2898 BLAKE2B 3a71c72d4f1f2392c414842b0acda4a18e2ad703623ab4fa050110680546c945c374051c62a431ef13720fa1ff60247f19a4bddf626e291a1c1843ba4d2fcd6a SHA512 2f5ccbd150a87ee5bddca913e55d966e18b1dc02ef70907cf73e598bc8ab279c8e713c37b8f07f50c4014bdbbfb0421dd5da1fc83d326459a889a9a9541db954
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/files/stunnel-5.50-libressl.patch b/net-misc/stunnel/files/stunnel-5.50-libressl.patch
new file mode 100644
index 000000000000..4481220c268d
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.50-libressl.patch
@@ -0,0 +1,228 @@
+diff --git a/src/ctx.c b/src/ctx.c
+index cd59f4e..b41be1b 100644
+--- a/src/ctx.c
++++ b/src/ctx.c
+@@ -118,7 +118,7 @@ NOEXPORT void sslerror_log(unsigned long, char *);
+ 
+ /**************************************** initialize section->ctx */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ typedef long unsigned SSL_OPTIONS_TYPE;
+ #else
+ typedef long SSL_OPTIONS_TYPE;
+@@ -126,7 +126,7 @@ typedef long SSL_OPTIONS_TYPE;
+ 
+ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+     /* create TLS context */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     if(section->option.client)
+         section->ctx=SSL_CTX_new(TLS_client_method());
+     else /* server mode */
+@@ -437,7 +437,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ /**************************************** initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CONF_CTX *cctx;
+     NAME_LIST *curr;
+     char *cmd, *param;
+@@ -1247,7 +1247,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ 
+     c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
+     if(c) {
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
+ #else
+         int state=SSL_get_state((SSL *)ssl);
+diff --git a/src/options.c b/src/options.c
+index 103ea6c..756e48c 100644
+--- a/src/options.c
++++ b/src/options.c
+@@ -75,7 +75,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
+ NOEXPORT void sni_free(SERVICE_OPTIONS *);
+ #endif /* !defined(OPENSSL_NO_TLSEXT) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int str_to_proto_version(const char *);
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+ NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
+@@ -3048,7 +3048,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
+         break;
+     }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+     /* sslVersion */
+     switch(cmd) {
+@@ -3621,7 +3621,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) {
+ 
+ /**************************************** modern TLS version handling */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int str_to_proto_version(const char *name) {
+     if(!strcasecmp(name, "all"))
+diff --git a/src/prototypes.h b/src/prototypes.h
+index aaf50fc..01343bf 100644
+--- a/src/prototypes.h
++++ b/src/prototypes.h
+@@ -223,7 +223,7 @@ typedef struct service_options_struct {
+ #if OPENSSL_VERSION_NUMBER>=0x009080dfL
+     long unsigned ssl_options_clear;
+ #endif /* OpenSSL 0.9.8m or later */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     int min_proto_version, max_proto_version;
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+     SSL_METHOD *client_method, *server_method;
+@@ -663,7 +663,7 @@ int getnameinfo(const struct sockaddr *, socklen_t,
+ #define USE_OS_THREADS
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -711,7 +711,7 @@ typedef enum {
+ 
+ extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */
+ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void);
+ int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *);
+diff --git a/src/ssl.c b/src/ssl.c
+index ad06cb5..0b45769 100644
+--- a/src/ssl.c
++++ b/src/ssl.c
+@@ -39,7 +39,7 @@
+ #include "prototypes.h"
+ 
+     /* global OpenSSL initialization: compression, engine, entropy */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+     void *from_d, int idx, long argl, void *argp);
+ #else
+@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
+ #endif
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+         void *from_d, int idx, long argl, void *argp) {
+ #else
+@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */
+ 
+ #ifndef OPENSSL_NO_COMP
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int COMP_get_type(const COMP_METHOD *meth) {
+     return meth->type;
+diff --git a/src/sthreads.c b/src/sthreads.c
+index 412a31a..e12a330 100644
+--- a/src/sthreads.c
++++ b/src/sthreads.c
+@@ -97,14 +97,16 @@ unsigned long stunnel_thread_id(void) {
+ 
+ #endif /* USE_WIN32 */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void threadid_func(CRYPTO_THREADID *tid) {
+     CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id());
+ }
+ #endif
+ 
+ void thread_id_init(void) {
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_THREADID_set_callback(threadid_func);
+ #endif
+ #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED)
+@@ -115,7 +117,7 @@ void thread_id_init(void) {
+ /**************************************** locking */
+ 
+ /* we only need to initialize locking with OpenSSL older than 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_PTHREAD
+ 
+@@ -224,7 +226,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) {
+ 
+ CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -334,7 +336,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) {
+ 
+ void locking_init(void) {
+     size_t i;
+-#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L
++#if defined(USE_OS_THREADS) && \
++    (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER))
+     size_t num;
+ 
+     /* initialize the OpenSSL static locking */
+diff --git a/src/tls.c b/src/tls.c
+index 9616df3..b89c61e 100644
+--- a/src/tls.c
++++ b/src/tls.c
+@@ -41,7 +41,7 @@
+ volatile int tls_initialized=0;
+ 
+ NOEXPORT void tls_platform_init();
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *);
+ #endif
+ 
+@@ -52,7 +52,7 @@ void tls_init() {
+     tls_platform_init();
+     tls_initialized=1;
+     ui_tls=tls_alloc(NULL, NULL, "ui");
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_set_mem_functions(str_alloc_detached_debug,
+         str_realloc_detached_debug, str_free_debug);
+ #else
+@@ -184,7 +184,7 @@ TLS_DATA *tls_get() {
+ 
+ /**************************************** OpenSSL allocator hook */
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *ptr) {
+     /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */
+     /* unfortunately, OpenSSL provides no file:line information here */
+diff --git a/src/verify.c b/src/verify.c
+index b4b5115..0457ce0 100644
+--- a/src/verify.c
++++ b/src/verify.c
+@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) {
+     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+     subject=X509_get_subject_name(cert);
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100006L
++#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
+ #endif
+     /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/stunnel-5.50.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 428e58d9d2be..c2c51a0ff501 100644
--- a/net-misc/stunnel/stunnel-5.50.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -39,8 +39,8 @@ src_prepare() {
 	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
+	# bug 656420
+	eapply "${FILESDIR}"/${P}-libressl.patch
 
 	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
 
diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest
index 209182614022..75653e3d2b66 100644
--- a/net-misc/tn5250/Manifest
+++ b/net-misc/tn5250/Manifest
@@ -1,8 +1,11 @@
 AUX tn5250-0.17.4-disable-sslv2-and-sslv3.patch 2333 BLAKE2B f0debeacfcfe2596b716733cd80195b402f9b1536b3bbc6be7d12b763a2724b84c7030e92d76cdeca2685fb1bfc1714ab8d545276d23460f6cff930db412e86d SHA512 938130a2211409ab179499f1b7b50f5517d609a0ad73051a6c1a89493b44cca28200723693698beb516733e3099976f5ec0335f290553e903604c5a1eee652bd
+AUX tn5250-0.17.4-duplicate-definition.patch 3848 BLAKE2B 22d22f71ac85429ac08b856710587c0c7a759e15ed09730c25de475c5be14b4cf49da2c5db3e420c34a7425900d226cfdb0e78eab22c57c8771f512680edadb9 SHA512 ed3976c07e207594e1f43f156e65f9a26bcf82c0ffd1f05174da9cdd7441ad2ffb6d6b34deb7a544350ddb50f29e42dafe00d0b05ebcefa8bdf5968d47425ec4
 AUX tn5250-0.17.4-fix-Wformat-security-warnings.patch 2283 BLAKE2B 59ffb231abf6ef7927d79e8be51133c6f1f31f63ec38514bbaeee2069c3d063dc7ef3642953b7777668c016bb30e06c590ed63bb618d7796c3475483d77708b1 SHA512 da9114d26e838e822d8c63faa68f8157e03404f86e03c38f9f557416199c5ae96a35f4dbf47717c2588a6f29549b69a84ec66f5b7de848803b90759cae1fda04
+AUX tn5250-0.17.4-openssl11.patch 1617 BLAKE2B 99c528fcc57b9356c9c58c9a161bf370a907207fdd1493f4b2a339cacc775769da8755dd6322847ed9441b62ddf3bcaa8a891c628e9de15c647bdb80bfebf2f6 SHA512 7b52a1787f19e743137409239e2d6fa03197d73513a355fcede9e079fff909fa2c3921351039bfed703be140377130e4b74784397134e4454faa140a721f9e2b
 AUX tn5250-0.17.4-tinfo.patch 294 BLAKE2B 6032318a041b7e495e709f44e6abeedaee17be5754f779d73b33cfd0bc9fd625c53687cc9e2e0f49dc8be48ea497f3d2f3d9cba0b48c59d3f84fd9a98bdeab50 SHA512 e348a54d74e79fd3b7d4a7ae8a8bbab9751f873317b82738c1b934c643a4fe28cefb38008d944af61fe64f0852a1bb5eeea7b6bb8143e51a3469bc20fb8e0b22
 AUX tn5250-0.17.4-whoami.patch 450 BLAKE2B 529c2822328ae5b7eb70e49e1459271d325f465c6ecc3c2f0621805e1f61892c58614cdcd84c522ffe7b78d05c554af9928ff181497fefc13fb82a62c916502b SHA512 404fd5913db7240f1db14ac2a45e2897866e50fc33d56e5eb22e810b238d47b5d6c3700dd73fe095c2f5714e5f8f745c7e0bf670450d6454d20f10fa2f8c69c2
 DIST tn5250-0.17.4.tar.gz 648452 BLAKE2B 9e4d2d2b3148d063eecfc57f32daa1936d9f829a219952c9eb666e3f128c42f5ac611c4ccf12cdd533b3758459ce7f2f4e7c8fe74090042cb796067a7f6afe14 SHA512 7c41bc47658f792fe7c6c6186d93095ac2eca67868070d84502bcff7de0cbc97afea1bd9987d2dbc5a340a444fdf1fbff81c7b844f5c205ec603f24c5e6c0804
 EBUILD tn5250-0.17.4-r1.ebuild 1247 BLAKE2B 6169023b231922ef82594a6359d2d3f824cec17d1def604fca3a1aa676f3b6939a89cf882fa2e21afab20c7a6e6f46d00df9953c6e342af9016974a3e50802dd SHA512 e57461bf744d4ffffad3c8046a9faf674d0cef81d6baf1ea88546d5155a1eef7668931955599ab64a4ff4566990591edb41aba55a45f5ccb54dccfac7319e722
 EBUILD tn5250-0.17.4-r2.ebuild 1190 BLAKE2B 12e610edc7efeb7e0ff561db603c1f9e3e14ee6b95336eb81046ecce1554b350015d7316054ff5b3f8b78fae206ba7f070e9ab05ca2f0ce1c6ff6ccb3b830b98 SHA512 95631351a044b1328ccfc1006d1a4f6941b698a84eb7800697ef52e0f30a978bfa0ebb22af5e7a376dbcb97b4dfa7f7b0701adb9d7ceb85e6d057e4e7d3974db
+EBUILD tn5250-0.17.4-r3.ebuild 1329 BLAKE2B 95b5939c5f8d6f999e30846096eec4d25258cb6f04af08d5ba559adb97b5ad5bfc081f513e86787e32ab40fb3cd8d28c0dad0e5284b08c9b971b9ed6efc2d397 SHA512 0f5f7b8c637ee195f39bedda7d193e6192a47ffaa93a419f928d3b797993244f328bfd06df302251f8fe58d6476cbf5b4ae8b34571a4a94110006cb238adda47
 MISC metadata.xml 215 BLAKE2B a53a3a3ece4a9e09b8df96f5f8a629b7119c0e95e3e428c185f25378748975728f080e999a5e434e6fb3a38bb6599562ffacb8197f0be3ece1bcc43ccc1954de SHA512 0e99f231bdcff1306e232af176e4ce38c754ea988c072324093f2ac5bca81432abeb12af3e5f1960d0047bcd6d8c558fc995d1e6670556e00e443ebb1b6fe09c
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch b/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch
new file mode 100644
index 000000000000..39b3ccb45552
--- /dev/null
+++ b/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch
@@ -0,0 +1,115 @@
+From 66e1a2f80091e9ee9b99156ae23e5faaf9f24fe0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 20 Feb 2017 15:06:36 +0100
+Subject: [PATCH 3/4] remove duplicate definition for tn3270_ssl_stream_init()
+
+---
+ lib5250/sslstream.c | 93 -----------------------------------------------------
+ 1 file changed, 93 deletions(-)
+
+diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
+index f4353a9..86d38cf 100644
+--- a/lib5250/sslstream.c
++++ b/lib5250/sslstream.c
+@@ -477,99 +477,6 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
+    return 0; /* Ok */
+ }
+ 
+-/****f* lib5250/tn3270_ssl_stream_init
+- * NAME
+- *    tn3270_ssl_stream_init
+- * SYNOPSIS
+- *    ret = tn3270_ssl_stream_init (This);
+- * INPUTS
+- *    Tn5250Stream *       This       - 
+- * DESCRIPTION
+- *    DOCUMENT ME!!!
+- *****/
+-int tn3270_ssl_stream_init (Tn5250Stream *This)
+-{
+-   int len;
+-
+-/* initialize SSL library */
+-
+-   SSL_load_error_strings();
+-   SSL_library_init();
+-
+-/* create a new SSL context */
+-
+-   This->ssl_context = SSL_CTX_new(SSLv23_client_method());
+-   if (This->ssl_context==NULL) {
+-        DUMP_ERR_STACK ();
+-        return -1;
+-   }
+-
+-/* if a certificate authority file is defined, load it into this context */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) {
+-        if (SSL_CTX_load_verify_locations(This->ssl_context, 
+-                  tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-   }
+-
+-/* if a certificate authority file is defined, load it into this context */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) {
+-        if (SSL_CTX_load_verify_locations(This->ssl_context, 
+-                  tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-   }
+-
+-   This->userdata = NULL;
+-
+-/* if a PEM passphrase is defined, set things up so that it can be used */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config,"ssl_pem_pass")){
+-        TN5250_LOG(("SSL: Setting password callback\n"));
+-        len = strlen(tn5250_config_get (This->config, "ssl_pem_pass"));
+-        This->userdata = malloc(len+1);
+-        strncpy(This->userdata,
+-                tn5250_config_get (This->config, "ssl_pem_pass"), len);
+-        SSL_CTX_set_default_passwd_cb(This->ssl_context,
+-                (pem_password_cb *)ssl_stream_passwd_cb);
+-        SSL_CTX_set_default_passwd_cb_userdata(This->ssl_context, (void *)This);
+-
+-   }
+-
+-/* If a certificate file has been defined, load it into this context as well */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_cert_file")){
+-        TN5250_LOG(("SSL: Loading certificates from certificate file\n"));
+-        if (SSL_CTX_use_certificate_file(This->ssl_context,
+-                tn5250_config_get (This->config, "ssl_cert_file"),
+-                SSL_FILETYPE_PEM) <= 0) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-        TN5250_LOG(("SSL: Loading private keys from certificate file\n"));
+-        if (SSL_CTX_use_PrivateKey_file(This->ssl_context,
+-                tn5250_config_get (This->config, "ssl_cert_file"),
+-                SSL_FILETYPE_PEM) <= 0) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-   }
+-
+-   This->ssl_handle = NULL;
+-   This->connect = ssl_stream_connect;
+-   This->accept = ssl_stream_accept;
+-   This->disconnect = ssl_stream_disconnect;
+-   This->handle_receive = ssl_stream_handle_receive;
+-   This->send_packet = tn3270_ssl_stream_send_packet;
+-   This->destroy = ssl_stream_destroy;
+-   This->streamtype = TN3270E_STREAM;
+-   return 0; /* Ok */
+-}
+-
+ /****i* lib5250/ssl_stream_connect
+  * NAME
+  *    ssl_stream_connect
+-- 
+2.7.4
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch
new file mode 100644
index 000000000000..8c6d0fde1c70
--- /dev/null
+++ b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch
@@ -0,0 +1,49 @@
+From 5922e57bb5ea78ff35f82a60f1721d533cc0584a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 20 Feb 2017 15:37:51 +0100
+Subject: [PATCH 4/4] port to OpenSSL 1.1
+
+- check for better functions in configure
+- update SSL initialization call
+---
+ configure.ac        | 8 ++++----
+ lib5250/sslstream.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4ba0007..8a16cff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -152,13 +152,13 @@ dnl ** happily, we don't have to hunt for them thanks to ldconfig!
+ dnl **
+ if test -n $sslincludedir; then
+      CPPFLAGS="$CPPFLAGS $sslincludedir"
+-     AC_CHECK_LIB(crypto,CRYPTO_num_locks)
+-     if test "$ac_cv_lib_crypto_CRYPTO_num_locks" != "yes"
++     AC_CHECK_LIB(crypto,OPENSSL_init)
++     if test "$ac_cv_lib_crypto_OPENSSL_init" != "yes"
+      then
+              AC_MSG_ERROR([** Unable to find OpenSSL libraries!])
+      fi
+-     AC_CHECK_LIB(ssl,SSL_library_init)
+-     if test "$ac_cv_lib_ssl_SSL_library_init" != "yes"
++     AC_CHECK_LIB(ssl,OPENSSL_init_ssl)
++     if test "$ac_cv_lib_ssl_OPENSSL_init_ssl" != "yes"
+      then
+              AC_MSG_ERROR([** Unable to find OpenSSL libraries!])
+      fi
+diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
+index 86d38cf..3c0f390 100644
+--- a/lib5250/sslstream.c
++++ b/lib5250/sslstream.c
+@@ -368,7 +368,7 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
+ /*  initialize SSL library */
+ 
+    SSL_load_error_strings();
+-   SSL_library_init();
++   OPENSSL_init_ssl(0, NULL);
+ 
+ /*  which SSL method do we use? */
+ 
+-- 
+2.7.4
diff --git a/net-misc/tn5250/tn5250-0.17.4-r3.ebuild b/net-misc/tn5250/tn5250-0.17.4-r3.ebuild
new file mode 100644
index 000000000000..b28b5cc3723d
--- /dev/null
+++ b/net-misc/tn5250/tn5250-0.17.4-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers"
+HOMEPAGE="http://tn5250.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17.4-disable-sslv2-and-sslv3.patch
+	"${FILESDIR}"/${PN}-0.17.4-fix-Wformat-security-warnings.patch
+	"${FILESDIR}"/${PN}-0.17.4-tinfo.patch
+	"${FILESDIR}"/${PN}-0.17.4-whoami.patch
+	"${FILESDIR}"/${PN}-0.17.4-duplicate-definition.patch
+)
+
+src_prepare() {
+	default
+	if has_version ">=dev-libs/openssl-1.1.1"; then
+		eapply "${FILESDIR}"/${PN}-0.17.4-openssl11.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl) \
+		--disable-static \
+		--without-python
+}
+
+src_install() {
+	# The TERMINFO variable needs to be defined for the install
+	# to work, because the install calls "tic."	 man tic for
+	# details.
+	dodir /usr/share/terminfo
+	emake DESTDIR="${D}" TERMINFO="${D}/usr/share/terminfo" install
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index ee6ea0ad988e..705c11f73431 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,3 +1,6 @@
+AUX vino-return-error-if-X11-is-no-detected.patch 1102 BLAKE2B 145b468e06bfa8b7abb18c1209761a2ca2314ffc92f04fe419ef0722eaed6a30b5a2e8cbeb8923e1b0cf072ba988ea9c3031fe2816df8632c3e123f643c70221 SHA512 6342507c051d81fbcbf8d2f8ce5005b60da0ba6a1f725c3aabb164c310b7c17a92f1aaeedc69873b47ba35041ff5ab7d75b762d5f9bfa70d967864e3cafb2596
+AUX vino-segfaults-on-wayland.patch 1172 BLAKE2B c8e3b9316309f78975123cd3ac87fd53d8fd498be5927a2188dfbddf5ac5316febf71ff5297466e95d079e9dfe8bf4a034c1b45320000c683f5e264527a870dd SHA512 e1d9a489643ce46259ebd830ccd906dbe65675ff57cb2d405b584acbf6c67e3a3f34f051c6ab5bd5fb5d40bd873225b36801b87030c30c0c764d3d5a72095f23
 DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f
+EBUILD vino-3.22.0-r1.ebuild 1826 BLAKE2B 85fb2ff4fd4fb836446af3f811d2935d3d2e27bf218add0123f3088c2813166fde1cd8e5497a1dd7496daa64da262c1f353d019c0d3944a9d861cba11eae01bc SHA512 06302279add1afa2b9f8ce1f2cc3dddba599c8aee7bbdd5874b0149ee2a2e03aae19d015abf001019599514077d4acd99b3415e41ee04b454eeb2f837c588d1c
 EBUILD vino-3.22.0.ebuild 1651 BLAKE2B 345994ec32582e2fd99fba1dd860557119976ab09dd34aff5ea8aa01c9cf6658181522178cc8818f39114452016c172331fe0055edebbf333d80732d8e9145e3 SHA512 5d2e83be516cde4164c4c5a5067ab789ebd95fcc0133680cf2714db10677728fca0ce70d2d3790e236315399098df532610a0a0f74b3ca7585b9daec09b4c1ae
 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d
diff --git a/net-misc/vino/files/vino-return-error-if-X11-is-no-detected.patch b/net-misc/vino/files/vino-return-error-if-X11-is-no-detected.patch
new file mode 100644
index 000000000000..171d8590e3c9
--- /dev/null
+++ b/net-misc/vino/files/vino-return-error-if-X11-is-no-detected.patch
@@ -0,0 +1,41 @@
+From 5e49ab2d125388b843eca4f1f47849d18ccabcd3 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Tue, 20 Feb 2018 12:26:18 +0100
+Subject: [PATCH] Return error if X11 is not detected
+
+Vino-server crashes on Wayland in XQueryExtension. Since vino-server is
+not expected to work on displays other than X11, let's exit immediately
+if GDK_IS_X11_DISPLAY fail.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761120
+---
+ server/vino-main.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/server/vino-main.c b/server/vino-main.c
+index dd95de7..7be3fff 100644
+--- a/server/vino-main.c
++++ b/server/vino-main.c
+@@ -28,6 +28,7 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <locale.h>
++#include <gdk/gdkx.h>
+ 
+ #include "vino-input.h"
+ #include "vino-mdns.h"
+@@ -273,6 +274,12 @@ main (int argc, char **argv)
+     g_option_context_free (context);
+   }
+ 
++  if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
++    {
++      g_printerr ("X11 is not detected\n");
++      return 1;
++    }
++
+   /* GSettings */
+   vino.settings = g_settings_new ("org.gnome.Vino");
+ 
+-- 
+2.16.2
diff --git a/net-misc/vino/files/vino-segfaults-on-wayland.patch b/net-misc/vino/files/vino-segfaults-on-wayland.patch
new file mode 100644
index 000000000000..ee161ae6fb98
--- /dev/null
+++ b/net-misc/vino/files/vino-segfaults-on-wayland.patch
@@ -0,0 +1,30 @@
+From c5e3011b7364729fa2cd4f11761bf1f001a931a4 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Tue, 22 May 2018 20:45:45 +0200
+Subject: [PATCH] Do not restart service after unclean exit code
+
+Currently, the vino-server.service has Restart=on-failure, which means
+that it is restarted in abnormal cases, but also in case of non-zero
+exit code. It is restarted 5 times e.g. in case when X11 is not detected,
+which doesn't make sense. Non-zero exit code is used only for states
+which won't change with restart (invalid commandline, wayland and some
+sanity checks). Change the value to Restart=on-abnormal in order to
+prevent the useless restarts and to not spam journal.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761120
+---
+ server/vino-server.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/vino-server.service.in b/server/vino-server.service.in
+index a48b813..49e9c1f 100644
+--- a/server/vino-server.service.in
++++ b/server/vino-server.service.in
+@@ -5,4 +5,4 @@ Description=Vino VNC server
+ Type=dbus
+ BusName=org.gnome.Vino
+ ExecStart=@libexecdir@/vino-server
+-Restart=on-failure
++Restart=on-abnormal
+-- 
+2.17.0
diff --git a/net-misc/vino/vino-3.22.0-r1.ebuild b/net-misc/vino/vino-3.22.0-r1.ebuild
new file mode 100644
index 000000000000..9f17a92230a7
--- /dev/null
+++ b/net-misc/vino/vino-3.22.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 systemd
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	systemd? ( sys-apps/dbus[user-session] )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	app-crypt/libsecret
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+# libsecret is always required at build time per bug 322763
+
+PATCHES=(
+	"${FILESDIR}/${PN}-segfaults-on-wayland.patch"
+	"${FILESDIR}/${PN}-return-error-if-X11-is-no-detected.patch"
+)
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index c0fdb93188c2..3e6542929083 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
-DIST youtube-dl-2019.02.08.tar.gz 3104780 BLAKE2B e89a9950de84c3d2c5530ca229f2dfb39bb372454a6a1d67c0d1c966f68f2372008556ffda32c042eca6d3c0aee3ace0c1cabdf1d65cb16efc80326b821a3624 SHA512 4fc027ec6d9d7059c34a3c16f1265989ec000c131e6a937f667928531dd2a6d9f56592d367f08ec5e3b1900b3e191aa36bcc997db04b77b95850a43ed1272640
 DIST youtube-dl-2019.02.18.tar.gz 3114830 BLAKE2B f948fc68d9bc2b7e400d22b4d2980b7f56bf734476a54b3e30b6ee33d5e4a0950233dfd74b0db26108a5759e3589acde4fe104d41ea856c88f68e165f330132b SHA512 86a321003b9e0bdc852294c8ac75d601141177f3469330c6ab01fa821758ee848dfcdf0e9dd514ca2da7b7e3c2a7f2dcddab9929f7fa8be2ab3c86d6eccbd5e3
-EBUILD youtube-dl-2019.02.08.ebuild 2021 BLAKE2B a7fe20e586f2d3243069237315e89ad05ff23c1684854a4029111c30622f23a8ba0c73325bb3a98f6fdc76203afd3ae4246ae62e0cfdc02c281188d3b1e25e40 SHA512 c589d6d581b2a91443ba9def42b278ed427bebc45a02b25a053dbb556c23dc299b5a8873540679394863a1ca2a3da929d27b779e467c0269707600fea55a7e7a
-EBUILD youtube-dl-2019.02.18.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
+DIST youtube-dl-2019.03.01.tar.gz 3117441 BLAKE2B 92beb16920b6d9c3ead89d5ff930b73635f74d7aeba62a4ee8159e28b448931810f340857bc223ab587610704405083768137a62d7c92814a7525825adc60919 SHA512 ff037b2288b937ebc70bfa880a4c0cd10cb4a615725e25f8db998c828d4b505461088b5aaa926aa47f148189496275f1a70e03e187325c15d6ff425ed4da2dc7
+EBUILD youtube-dl-2019.02.18.ebuild 2021 BLAKE2B a7fe20e586f2d3243069237315e89ad05ff23c1684854a4029111c30622f23a8ba0c73325bb3a98f6fdc76203afd3ae4246ae62e0cfdc02c281188d3b1e25e40 SHA512 c589d6d581b2a91443ba9def42b278ed427bebc45a02b25a053dbb556c23dc299b5a8873540679394863a1ca2a3da929d27b779e467c0269707600fea55a7e7a
+EBUILD youtube-dl-2019.03.01.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
 EBUILD youtube-dl-99999999.ebuild 1916 BLAKE2B 035ac8f58fec97b741be4d080401d6dea03531c95ef61782dcad898f51b2fe845d97ede3ddb4ac3ae52c327fb08d5729b41a1c057e8fb6c81e81afc3d87c4651 SHA512 ae1467fcc2b1bde3b33354a61e29b311a6d8876cbd0502186f55f0826c0182ea21afb229b34b39b37c9e625bb142d86348baa31dc0defc01e19beb427de40321
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild b/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild
index 2cb0551f3e35..d63726ec5fe0 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild b/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
index d63726ec5fe0..2cb0551f3e35 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /net-misc
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)