gentoo resync : 20.12.2017

22 files changed, 36 insertions, 1181 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 51c7054b3123..f859ac5b8837 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index c723383d4c33..6cb96dcd994a 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,5 +1,5 @@
 DIST gupnp-tools-0.8.13.tar.xz 560756 BLAKE2B 1bb165995ab657740ca1b3c0f8e4dd1a47aee55c0095a83dfc9dd4f1e73d7c8f5b83afec6c79c3c985fe96edde88f2a00e031e87171f9f385188fd455e200053 SHA512 1616348b21ebce98253168e328239cbe113fa7f22b3fb1a771ab8d08f1aa5b2cf89c1f6c37d9b73dab074c448d90ac1cef546dc1ab221449cd187d0183ab67e0
 DIST gupnp-tools-0.8.14.tar.xz 558552 BLAKE2B a0f132722d14a1a0d35258ba2656e07e292c9ae1def256ff48e08d0526f3d665fe328464d5d836c5fb59936d592ed3cfc43c70870fbb88bfcdee74c3abe6f9e8 SHA512 746f12728c7d06d6fb2cab3f015c5d145ba8df45fb0ca8462a0d1c53db081f62ae7c39001604e73c2596f1584318680bf387a6f7751af7146b2b9c5c28651739
 EBUILD gupnp-tools-0.8.13.ebuild 614 BLAKE2B bab077eebb55de945499f52731269301af35250e5c4dea9501e76f2251796aa49552cf01fcaac223e00c8f8ba77d824237ac209efb797dbb285234bb1019f758 SHA512 8a4e2c83c8b6daed9bb3ea32e77411b9648f0fc9dbf07e032e9c0d2fd92e8da27301712b793f94e052750a6e53e96aaafe24f7ccbd3e4cfe7ad07fac68d7868d
-EBUILD gupnp-tools-0.8.14.ebuild 615 BLAKE2B 03328cc759a4b5f58a833b25d98f23feb080ab1b48a43a92ea83ddd7656c39720c81e3fbf2235138825ee473492c67701a5484c37d7106334fa8e73a400eebe8 SHA512 1dfb86b61be2bd59c1a0314cf4281847671957378ec7ca2e461e4d63b1b9883ac94b7cee70fde69d81120e5ad37b0859dd70541363b0157382826598aebbdfa4
+EBUILD gupnp-tools-0.8.14.ebuild 614 BLAKE2B bab077eebb55de945499f52731269301af35250e5c4dea9501e76f2251796aa49552cf01fcaac223e00c8f8ba77d824237ac209efb797dbb285234bb1019f758 SHA512 8a4e2c83c8b6daed9bb3ea32e77411b9648f0fc9dbf07e032e9c0d2fd92e8da27301712b793f94e052750a6e53e96aaafe24f7ccbd3e4cfe7ad07fac68d7868d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild
index b0604ace26ad..36f012ae841b 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 2df9e22a39fe..4341c4834c9f 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -2,12 +2,12 @@ AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238
 AUX kafka.init.d 497 BLAKE2B 34e1b6af2878670c303a3df16120b6721b7e8f7aa88d2cb08ef91dc6c87217376a0350ab87614a178acd41c9f75e81529cb3e476ef2e5723026b6e4ef5fde3d5 SHA512 2e0ff5d5b95e39b08b234b38535a5fa4b3cb1d63ed1af7f107f1babdcded77f296999c0f9fa5e253408f4003b1a9a11a33533502a07fbdb0911314005bb98148
 AUX kafka.init.d.2 668 BLAKE2B bc1672ee04b6776fe4fc94a9a2bbc2d9e5d91e9448336ff48c615cd803fd33ad7ae2f35bf621214b96b6b903b7b261e3e8409deb1ed486834dbcba4235fc7411 SHA512 1a7b0c6ba64ed5b9697776dc49688e53b55846b0f65ae97e3cd551db3fe700f319f78bb2c6f0f4e77102f754f1c2d3a7bbd303e2cbeb17c0ed99ef878313a5f5
 AUX kafka.init.d.3 671 BLAKE2B e83609ee7badbc428c979a15004802a97b57e616ed30031835b67465c8c023b8aa55cd67687e6f260c95dd07c72533f3c347bec52e8ea27c562b0f14742db8d8 SHA512 45478ae4733a498a6bf3604359943f003056dc77f3eb382bd7e7c04a5e9cee34fb07170c67bf306e4b09a49b3e0665fe760d1ceb37a09b174b3e9c3f519bdddc
-DIST kafka_2.11-0.10.0.1.tgz 31831257 SHA256 2d73625aeddd827c9e92eefb3c727a78455725fbca4361c221eaa05ae1fab02d SHA512 ab89c1d0cf4e05e823f45629e7bc5778173fd7420ebfa259f566071c6b474b08abf808508c7fd6fcca2233b20e76cbf6a235563709bfa019455386f80f0b5d71 WHIRLPOOL 5928d39afdaa4b7cc3839b2555229d42ecc9b3ccd6c76cb2dfd1a7fd4f2fcb2ac9abd055b7c698b5d82232df10e10d4c2f2fd525e880a9c0ed78550e2cf2d28e
-DIST kafka_2.11-0.10.1.0.tgz 34373824 SHA256 6d9532ae65c9c8126241e7b928b118aaa3a694dab08069471f0e61f4f0329390 SHA512 b47a26813395b5bed5bb3f874727d4a1cae13480732aee3014d66afdbe1ec8ed6ed8c9de4feff67d18492088b5e927516a8ce13f355ce985ec0144608509d30b WHIRLPOOL ce23da1e53bb8ec65d0235f932454ef1f9c9a425f259328b1ec142c230fa92da75c1f279c66df53755cdd439bad7d8a7d6ea0c2864fccf22d79e1546c73cf588
-DIST kafka_2.11-0.10.1.1.tgz 34424602 SHA256 1540800779429d8f0a08be7b300e4cb6500056961440a01c8dbb281db76f0929 SHA512 6d996946ee5d798f0af8ffa2bddc1dc23632761488556e765ba731acae28e2d65f4ca3f0648caa7bbb14947daf3e1862d9959f271eff5e0625c780a7169c6f72 WHIRLPOOL 8762937838dc0ca4b2fa943d4714a691b77bcfaa52c5cff1fde3bff6296600fb5754c464b04dd1a53571bcb34637890f10cc2a82ba1a7c8366c8914d06ad7c9a
-DIST kafka_2.11-0.10.2.0.tgz 37630750 SHA256 4c9e73059dea2dcb5022135f8e7eff5f187ffcc27a27b365b326ee61040214cd SHA512 3d972cdccdbe889b73b8d5ec68e8a0bc5daabed29ec8f1f217e22887534eba8f3127886c07950a673c55d289a9dbd077763141eb883b5f9e2fe8b56b4524941c WHIRLPOOL 75ecf95f80ed2295eebb910fdd50e6cb44aba0fe79cee724bbace6f024a34d2d2fc1fd84f987877476e8f1c46a7f61000b833c0422be6d5daa8ce175e8a9a28a
+DIST kafka_2.11-0.10.0.1.tgz 31831257 BLAKE2B fefff1b30e3cb1ff9abe84c6e4fd05c96d216e97326dc552bd611b914307206dfc8214f6ab2cf7dd8e9f395494e2b44163784cee6c4845486783498b5247f7ae SHA512 ab89c1d0cf4e05e823f45629e7bc5778173fd7420ebfa259f566071c6b474b08abf808508c7fd6fcca2233b20e76cbf6a235563709bfa019455386f80f0b5d71
+DIST kafka_2.11-0.10.1.0.tgz 34373824 BLAKE2B 88b911227052abd572966e9d1c4429d4d6010df43d90a51de5f3c17ba73b4f5fb1144697c893f0a0e7ce723eeb0c451519e9041e61663e2e6f4bbb8e6e8b0442 SHA512 b47a26813395b5bed5bb3f874727d4a1cae13480732aee3014d66afdbe1ec8ed6ed8c9de4feff67d18492088b5e927516a8ce13f355ce985ec0144608509d30b
+DIST kafka_2.11-0.10.1.1.tgz 34424602 BLAKE2B ab49c0721c903d937d5e3d1c83f0f25960f0e246fda21cfd154bb061401d64d4b0c16932af45c3924579a71f49da3d0c3bee6a99def21d7f0640fcdc793a1cec SHA512 6d996946ee5d798f0af8ffa2bddc1dc23632761488556e765ba731acae28e2d65f4ca3f0648caa7bbb14947daf3e1862d9959f271eff5e0625c780a7169c6f72
+DIST kafka_2.11-0.10.2.0.tgz 37630750 BLAKE2B 3ad017c19e9c1c0aaafd902d200fb6d1855549935268f394354444b7ce73f1bfe8dfbdc68bf6c0ba56945107ab44bd2f3cd8806cc31127bcb578ae1d2102f282 SHA512 3d972cdccdbe889b73b8d5ec68e8a0bc5daabed29ec8f1f217e22887534eba8f3127886c07950a673c55d289a9dbd077763141eb883b5f9e2fe8b56b4524941c
 DIST kafka_2.12-0.10.2.1.tgz 34046244 BLAKE2B 210ebb9a2994d453e10e7c2f7a789ac33f65adced96032c2cfaff8ec2fceb2c4e4a35d71421a2b9c965c8c6e8b85b6a4e5cabd7cb0b5af0474b5a1c598c3e2f1 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc
-DIST kafka_2.12-0.11.0.0.tgz 36644420 SHA256 ab6310dd0d9fce1e6e8045b51b471fb35c3e197714e6e6b03bc5864898785f2d SHA512 60b44930700ab42e4a0e3945b6eb32db422d2e62388b4fee68aef97aea939fd252ebd0be39b36a4e6149aff9dcbd5b0578095d8a8812bd75111a65299aa5af55 WHIRLPOOL 33485fab4501501b608d8709ed59e9a0531b0adaaf1cdbd54c5f5cfb1e36b6a00cb8e0cc0d1f5eb6068b00bd5ebe1d26d3aa39d5096a52cf71c498f7912fa6ae
+DIST kafka_2.12-0.11.0.0.tgz 36644420 BLAKE2B 78355e84348bb4e8c09958dddc96023bab7e17dd26a5ae988b50fc82254096f23d5059287aa2e9c0ab4738fcde300e99e5dc093a6613bdb906cbfbc0162cd36b SHA512 60b44930700ab42e4a0e3945b6eb32db422d2e62388b4fee68aef97aea939fd252ebd0be39b36a4e6149aff9dcbd5b0578095d8a8812bd75111a65299aa5af55
 DIST kafka_2.12-0.11.0.1.tgz 37227486 BLAKE2B c4d18aa324f051f7bfd4ac9d967670445dbf96530fa8f896b7377ed8c6cdde06e155a0f4b79281d3d528b89e03ff06cfd1b9766f526b42523d74dea979bba9f7 SHA512 e85b152a0865e068309d3117b874010895389761da43ec62c87e2e4cffa5c8ea0eed6ea6beceae87d437ffabb143d6bc36408b1387985f2b90fe8b9c8201f29e
 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
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index cc0bff024f11..9adb63c6fe1f 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -12,5 +12,5 @@ AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c
 AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
 EBUILD oidentd-2.0.8-r5.ebuild 1203 BLAKE2B ddcffc10ec4c3ade58052268aa8eb33d64eca064ffcde17061801ca1103e6ca4ae3c3ac73ac28492ec09327ac048f49d8e71a5e2cafcc64949a8cf78d531111e SHA512 53a4113831796de47144d3bcf0c26528a2567ee3b3473cb53d455f0b51bfeacc2b18ee7d1a5b0d9d71fcc91fd88fe0101f332193a1fab6bdf95bc0509a93ca17
-EBUILD oidentd-2.0.8-r6.ebuild 1457 BLAKE2B 6e317379da750f33d518c55f6136528225ece2b637c42d7c613cf814729d359dc9a3006fdecfb779e0a4db1245b1a29c9fa68e3ec6fcd5554c3d692f144af737 SHA512 8a9bf420ddfb08a6bcb3a066a04d4c3d1325836c7aabb1ffb4e3166180c998be8de978f51b78ec2be2a660f629c04dcab93d23c0f012267fa4eaf6ab0fbeca48
+EBUILD oidentd-2.0.8-r6.ebuild 1456 BLAKE2B 016365a717061245f64b9de696db4512e9cc7d4fc74c122b6d58dc838f8876c5b2223763719a308ae2ca09b506b6f449138af607b90095c6f8cf9a070a4ae915 SHA512 2eafe4fe9adf71187bcc54e82033fa019238a1fbf9528f6462ace9a1acfe25727f5c6181b048fbf3eae861025ab11068a85a733fb8828f326e3b4dac71b94582
 MISC metadata.xml 531 BLAKE2B fae587f7809249514174cd9aeb213efac8ea12882b437fe85fb6dadcbefbafe731b6da570590a3a4a71786e9e982a7530d9d603ae1327bbc40fa8157683f9319 SHA512 f6c11a386380db0197ab45fd6169028063e432e014a18f92b40bc1350cfd1b2dc517b95b55da93f22a58cb5fa00856215f9673d59fd12d27c92075ad93e42215
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index 946a5e25c92c..ba139a1b6821 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug ipv6 masquerade selinux"
 
 DEPEND=""
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 7d1462415efb..f79c19c17670 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -17,7 +17,6 @@ AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e47
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
 AUX sshd_at.service 176 BLAKE2B 316c2de6af05e97ad2271dfda9fc3276b5c049aa1e56ea7c4acc20d5dd6f4444b0ed3122db90959dc8c009e36f59dbe8e8b969f21eaca98c513ac46b4f80f46e SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a
 DIST openssh-7.4_p1-sctp.patch.xz 8220 BLAKE2B 2d571cacaab342b7950b42ec826bd896edf78780e9ee73fcd441cbc9764eb59e408e295062862db986918824d10498383bf34ae7c93df0da2c056eaec4d2c031 SHA512 0c199e3b26949482125aeaa88216b2458292589e3eac8908d9134d13a1cae891094fcb0f752ed3009b3126cc72277b460205f39140c251792eb1b545271c3bd4
-DIST openssh-7.5p1+x509-10.1.diff.gz 460721 BLAKE2B e3bd5f6539647327d35c90bf0ebf86559a00bf426f49dca4d7d0580d02e0727fe78177974ccddb6103c0e75752165cf51a96f721203dd9c23dce6648431c501e SHA512 d3b5a8f5e3a88eda7989b002236811867b7e2c39bf7cd29a6dbbce277fca3fbedbfdbeaf1fba7d8c19f3dea32a17790e90604765f18576bcc5627a9c1d39109c
 DIST openssh-7.5p1+x509-10.2.diff.gz 467040 BLAKE2B 4048b0f016bf7d43276f88117fc266d1a450d298563bfc6ce705ec2829b8f9d91af5c5232941d55004b5aea2d3e0fb682a9d4acd9510c9761ba7ede2f2f0e37f SHA512 ec760d38771749d09afc8d720120ea2aa065c1c7983898b45dba74a4411f7e61e7705da226864e1e8e62e2261eecc3a4ab654b528c71512a07798824d9fb1a9a
 DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 BLAKE2B 15702338877e50c2143b33b93bfc87d0aa0fa55915db1f0cab9c22e55f8aa0c6eeb5a56f438d849544d1650bdc574384b851292d621b79f673b78bc37617aa0b SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9
 DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551c3ae037593d4296305df189e0a6f1383adc89b1970d58b8dcfff391878b7a29b848cc244a99705a164bec5d734 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81
@@ -27,9 +26,7 @@ DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f5
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
-EBUILD openssh-7.5_p1-r1.ebuild 11026 BLAKE2B 5920e0108a091d2edc6865ac2ee0788c0b2d110d06e206378be652f8eb68f9a8676199f27a9c3a7cb4d8da8843e6d0aa6d724aaca6182c46a941bdf94f35e5e2 SHA512 2441bff83bba61ead49ce69f7682d6ff9e6629eebc7dd9208da86043c07519a4ee1b9639b5ab22b04298b214ef8ccf94149269d3980d5d48ed01bfde409e015d
-EBUILD openssh-7.5_p1-r2.ebuild 10966 BLAKE2B b9a5bc4e0f2d21767de988c5e79ca3421508c40d2c1b443e846abf98a580b93f2cc33ee68eb3beb1cb631a50fabddff95c74fb56f23665bcae745efeb98873b6 SHA512 a461598a75ecb04c04c1c7e7bac216bb8a0e47ea493e8ce95d1545e96f9d0109cfd63b8be3845f31ba53b6d54e2ca99a9416c94ac9428c51666475a0ae65d3ef
-EBUILD openssh-7.5_p1-r3.ebuild 11013 BLAKE2B d7a9c83779557d09e3176a0c5b95b39d91eae85dc1371f6a6e3a064b8750be1bfa20d8ccd983c726f3e4cf818482eabf1661f8b067051f8e7b6eaa668a3556ad SHA512 2167367758b7508d0adfd29141b7766b480525f2866277fec6e3e67bcbdb2d1aac3f9f9e254cbb2823a2e2d1500c4b4bfafa1b61e05a8d91595e960c27e5e927
-EBUILD openssh-7.6_p1-r1.ebuild 11178 BLAKE2B 24dbc75479679de17d6e03810449b1c4757e8b23a3c8029673ac82d46c494240332b526a99ab2dae8dceeb3e136317104e8732a0ce9158e05dc40b07cb52dfcf SHA512 104338ec2dc27e632a47117684805abc0a65c549bed4d7cc45e33a3f3875b7650b241b8c92956498e4d2e2ec170f96e731c392bcf4c67a35810daa691b00f70f
-EBUILD openssh-7.6_p1.ebuild 11177 BLAKE2B c6ff44dacf5a8d98f1e5d245768ea7b8a595496c3c36ed5c2d6490b7c198d57f239d9fb0c20c7223bb2517e2e0ac13f440a28dac23ed62ffb477542752b02f5e SHA512 1c8703088b8c16db32f46f6794d182cb37e7da86fa4baa5a2f74cf4ed8240fbac8710be08086f8ada096d4cfa831910205b64c5dd502b7a3edd98784f6fe1aad
+EBUILD openssh-7.5_p1-r3.ebuild 11019 BLAKE2B 5bb02a502e127077f0345bc0eb06847eac32bd9327b949ba588aec28f6aac62bad54cda532784cff3db9d762de398dd28b6543576c8a0f5c4cfb7628bbb4866d SHA512 b8879b43887b094eb40c79ffe2de3e6bfb990555ed14862290ac57f1e79f6775459fd797f5dd020b8c9fa5357976dad9a071e1441e8ed9d832a34726474be1a1
+EBUILD openssh-7.6_p1-r1.ebuild 11184 BLAKE2B c864783cdb2798c4b51986f08ab959117e57965f60a6d718caf508928a154344b5e2934db619dab7fc698b7c1411b8b79db01bb4076246662db5b1d034ffab58 SHA512 5ee9beacb3acf9d9b195e02ab10b390432ada244fb4c9e97a0cb1f04a8fe902c6816e0e1a6807bce8401c9827bc220a508fcdfd6650d43885a4e699c08e30884
+EBUILD openssh-7.6_p1.ebuild 11183 BLAKE2B 1d83808228655f59f0c44f65c6b61901f1b650b59447e15382c72e5477238d0fda4a669f8982afb295604e4a72e71fb7eed98d373e4ea6403c1cc585024ef9b5 SHA512 3b779a728ab8f1b0f8d2973be0c2534c0572b33b17f4e51e407c92502d33c23eece1e35ea118aa374422f8a8c5aea27adf86f863f19c01f199981b639146046d
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.5_p1-r1.ebuild b/net-misc/openssh/openssh-7.5_p1-r1.ebuild
deleted file mode 100644
index 553f37b620d9..000000000000
--- a/net-misc/openssh/openssh-7.5_p1-r1.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
-SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
-X509_VER="10.1" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( http://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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	ssh1? ( ssl )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use X509 && maybe_fail X509 X509_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use hpn && maybe_fail hpn HPN_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
-}
-
-save_version() {
-	# version.h patch conflict avoidence
-	mv version.h version.h.$1
-	cp -f version.h.pristine version.h
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-	# keep this as we need it to avoid the conflict between LPK and HPN changing
-	# this file.
-	cp version.h version.h.pristine
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	if use X509 ; then
-		if use hpn ; then
-			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
-			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		epatch "${WORKDIR}"/${X509_PATCH%.*}
-		use libressl && epatch "${FILESDIR}"/${PN}-7.5p1-x509-libressl.patch
-	fi
-
-	if use ldap ; then
-		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
-	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
-	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
-	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
-			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
-		save_version HPN
-	fi
-
-	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
-
-	epatch_user #473004
-
-	# Now we can build a sane merged version.h
-	(
-		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
-		macros=()
-		for p in HPN LPK X509 ; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
-		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
-	) > version.h
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the ldap patch conditionally, so can't pass --without-ldap
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use X509 || use_with sctp)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssh1)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-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[*]}"
-}
-
-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}-6.9_p1" ; then
-		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
-	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 ! 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
-}
diff --git a/net-misc/openssh/openssh-7.5_p1-r2.ebuild b/net-misc/openssh/openssh-7.5_p1-r2.ebuild
deleted file mode 100644
index c5d657ba7c11..000000000000
--- a/net-misc/openssh/openssh-7.5_p1-r2.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
-SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
-X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( http://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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	ssh1? ( ssl )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use X509 && maybe_fail X509 X509_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use hpn && maybe_fail hpn HPN_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
-}
-
-save_version() {
-	# version.h patch conflict avoidence
-	mv version.h version.h.$1
-	cp -f version.h.pristine version.h
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-	# keep this as we need it to avoid the conflict between LPK and HPN changing
-	# this file.
-	cp version.h version.h.pristine
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	if use X509 ; then
-		if use hpn ; then
-			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
-			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		epatch "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
-	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
-	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
-	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
-			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
-		save_version HPN
-	fi
-
-	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
-
-	epatch_user #473004
-
-	# Now we can build a sane merged version.h
-	(
-		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
-		macros=()
-		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
-		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
-	) > version.h
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the ldap patch conditionally, so can't pass --without-ldap
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use X509 || use_with sctp)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssh1)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-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[*]}"
-}
-
-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}-6.9_p1" ; then
-		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
-	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 ! 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
-}
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
index 23a802dd3e3d..5ae4d45a76fd 100644
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -39,8 +39,8 @@ 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] )
+		!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(+)] )
diff --git a/net-misc/openssh/openssh-7.6_p1-r1.ebuild b/net-misc/openssh/openssh-7.6_p1-r1.ebuild
index 8bf58476566a..6cc76cb25419 100644
--- a/net-misc/openssh/openssh-7.6_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1-r1.ebuild
@@ -38,8 +38,8 @@ 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] )
+		!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(+)] )
diff --git a/net-misc/openssh/openssh-7.6_p1.ebuild b/net-misc/openssh/openssh-7.6_p1.ebuild
index a932f59b746c..490a91163fae 100644
--- a/net-misc/openssh/openssh-7.6_p1.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1.ebuild
@@ -38,8 +38,8 @@ 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] )
+		!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(+)] )
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 35428abbe77c..7285d614eb18 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,18 +1,9 @@
 AUX teamviewer-9.0.32150-gentoo.patch 3876 BLAKE2B 3989e1b27851217910ca76e834d7df1449c46aea16077d9048183113a77f01ab58aec151d3f225c5bb0e080fb040faa5c66447ebc197c1dc294c2ca1ae23ca5f SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f
-AUX teamviewer.sh 1329 BLAKE2B 4f2c25dd47a5b9d73f335d04e62095d2031854156db9cbbde477619ac12a160958908ba3d3099e1391718b85a2d572fc5cd56044d2189dc77243764c97d05857 SHA512 44e9e519ed3056438952c448b40a0c231238379fc1a5737f0f4ae28860fb3cfa2d9abffbb7e2b9682dbd62a67ad672f4406c2696359ace8fc42d6d0171b0bab0
-AUX teamviewerd.conf 230 BLAKE2B 721573965b2dca1559140284b1a61c5e0a5aa7ca08e6e39e7e825f640a7a18f7e1842008191c28effcfcb5cc0befeb4301dda8b71bb4ef44c37c2f93be9121da SHA512 31d412278f61fc943f474a02db6de802f53da8b2b424adb5c8a1720bff4316ccb36d5bfbb505c056ef031dcfd52fef5ea28da96b348a76ddf9c624ca1c3cf78f
-AUX teamviewerd.init 785 BLAKE2B 760a0abf4b8a517d88e19e9e27eb4df0efde9b4e35aaabf67081435e388c0849806c7b46c5d1c4ec140ba501759d0d5ec2555d37e40c6349efd0590e09911fe0 SHA512 79f0f5a274e53e6d058e6f0d24f9f9964992391e36a06264aaaba8e219238be9f24ebf64bb3b0aac91dc9e8625835b243e51fb6325d1b0e42242d7b7186ff20d
 AUX teamviewerd13.init 285 BLAKE2B 7e81248f94f173569a76ec0a87926302b621c2086eb61796313d2fb4ea6decb26561398f6b435a7b55f93b22f7b9b64a6f996f7c3964af4de8e4271bff283c59 SHA512 2dc110140dc89b649cfd6ebc4312f23406a911b19b6aa59e877d8206f242c6ec8143cdbe63317909001becf253be216e081f31bcc667dc6a8b176cc31b79517d
 AUX teamviewerd9.init 482 BLAKE2B 841a1d6894aec1ed1249195613c01df526abb4833f7a81d266d708d39a0324197db46b433aa4cd937f1b5579ff7e66beee7272463429d9c99e99d9eadb1a2d0c SHA512 a229cf976e5ce7142dbb57989bb0e802a5b8cdf222f52ad768dfaaacb3ba160ab05d3e1ff1ca7770daf37d9c06e391c6a3c1843ec2be78a86450bcf2a3e4fca9
 DIST teamviewer-9.0.32150.deb 22898922 BLAKE2B 799aa6f48b69247a2695ca745e85d02ffa73df1375203dfc9da339673e6c18d861c4146ddbdc509bdc1114d5a2a7e5fdd4acf3c6e5da61fbba5aaa02fa4e3cfd SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d
-DIST teamviewer_10.0.46203_i386.deb 43326592 BLAKE2B 874bad1cf2efdb7f4c1da69a625549b2c46e6a710ca3cf871dd21fd804b1b1b8294981d8f6e27c58231e51e41fb0dcd8f42f08adcefc4e2ded61c15fdc068425 SHA512 2133194b180648685a9e179df1a2888277f3038d9098d0d12b72de92026bdb969d90262514996df60dfcf6986e291ecb756fde9e0781fca5c872b5c82e5494ea
-DIST teamviewer_11.0.67687_i386.deb 47341822 BLAKE2B 3aa7d9af2c0c39fad22cec8391921d1034e2dc4bab70f9fb04c7dd7a9a8c23ae484717b3cf71856734bec08a26b4f409c205dde2b9b511b6d0fe78dc6182dc75 SHA512 3fbb0a2fc1bccd41ba9798305fada7e8266e1c9ed8509492ccb75e6f85995538ddc05ad72648e9f6c31cd5f17ad34f1ed3a300eeb38a4a703d3414c113d3e5a9
-DIST teamviewer_12.0.85001_i386.deb 46549564 BLAKE2B d3b821376c9385a1090e12708e17b8ad76f29f27c9d76ae140654eed7eca44d115275cd587462e52845260bd6616c88260c767350944730c30eac7c14467ae39 SHA512 4db490568936ec58a37157019071cf61ed5dde8b5951f6e524d1f64aa23f46dd40c8eda1e96a9d47c756c1427d82ccb9c58773b53dfa0ae60bbb94e03b4522a0
 DIST teamviewer_13.0.5693_amd64.tar.xz 9694952 BLAKE2B 650814c3c63897e1024836528c6eaa4cc81064ffa16bece7f8d2fe633457e2795e2cef847175a88dbb389ba61d2597a02292e6bf610da25c92f97152560ea355 SHA512 75886b6d00991968ae0b0d3c55b4c07c6f1b1b24488b2d5ae866e35c26ee6e673e500c87845ba6850ffdc80e4612feff0fc5bbe9e39f2d0a94582e1800471dcc
 DIST teamviewer_13.0.5693_i386.tar.xz 9583892 BLAKE2B 8e477978825431a01b37b61c28b903b36cd81365c7ec5df4ca8d4aec1ce8d24b49af60ed6c99c863acd26405254ae78c4ae4dfef1f8b7a5fb882e281c3c4f125 SHA512 be5e8e00755a38f2c70ceba88d9fb87c2cc8e9e284c86e22f95dddf919a37ee1f24ef1e02f042a339eaf863dbf255c873e3edcb038c04202b4ab0460e50b2503
-EBUILD teamviewer-10.0.46203.ebuild 3520 BLAKE2B 3e38979fb0b258e669c8997187a14c1b64440323b2d536da9102eebafc525e0b4f1d280870f9170eb5b62e5900dce9b3869e82c4e71c352ceb533fb6d613b8e2 SHA512 a2b9587b4c9fafaab23d67ca0dce7c99b8769f9663e865762fb95269e825c2ab269cf1b54d69949566c1cb04d5fd9df93e0fec4c4d5e455268f24752a11dfebe
-EBUILD teamviewer-11.0.67687.ebuild 3610 BLAKE2B 580a0593e67cbe750669cba76762a5577ea6ae77b245a047aea66996be4e84c493521b3f5afbc3d751e3fe1e87ef0d378248e860d6dfa5978f8ac92bb95815f1 SHA512 df84cf8082d6626e5e2e212c7b9910bd953ac4346d06a74181813a4b0bcafcb2691912064d5a0cba6facca253f2782bbb99ad9103ed68a4ed3e8429561229f67
-EBUILD teamviewer-12.0.85001.ebuild 3610 BLAKE2B cb5c04a0cd3afdb3d37342d682703ee164e78e2640c9ec46c3ea91a354b317aa7125695b278eabc29ef14df03d9dfdc29c1fe8282a4b58ed5256b89ce1bf200a SHA512 2a6876746bb249e6e1e7ea6d215a74eb98cd4d323dd9a40cbd1a8eff4784568dda16521a163fa4c511479d95188b8fe649da55f92520579bcffe1c61299921e7
-EBUILD teamviewer-13.0.5693.ebuild 3549 BLAKE2B 8c72a12ce76a77bda683a0c48f29f174100d12f6de595ded438b4f4fd4279310407e5260a88e764787c4423537bba11ecea7c422bfee86e455108b2cd9c2b49c SHA512 7a6698156b57f3077049724c7a1ae7eb149882b59274d45310acae4ddfc1bf07df25fce17893177d379dad6131873927244812d2c8ee5060ce408b6cb9d9f315
+EBUILD teamviewer-13.0.5693-r2.ebuild 3703 BLAKE2B 7a313f3cd58f1535bbfbd522ba5fe093633888134ff406dc1156fb0afa460100c33311b53490327c56fe9ad751f4179209ef1776d7c4a847da85079557e5306c SHA512 0a3c6f8b0cab36cf41ebfd78332451a719ad059f1217d30354addb6ba0264e31fe99ea6aead912ef138feab71de61787224869253a755efb6d83047dcc6bd49b
 EBUILD teamviewer-9.0.32150.ebuild 3260 BLAKE2B c81782a09b0512cce296c3774f300b870a1631ab395d55eb023543ac54338fd5218e9a2de33fecfefdc81281136ee692b1c82e61db8e676e2e769895ed2de917 SHA512 29b18f606daf48400ad770603ad735a917ad7aa50ce86b280f21ae6e36f978c5baa5ed34749a26206563f0d37c67a144365134d5ee61d8b8e21f61a996223c3c
 MISC metadata.xml 360 BLAKE2B 8262ba7d586d5c333960c11f37fb8fc74099c73d05da6f99e33d3f7ede2eb8daf02e06fda33006124f0bbb1c2b9721da5b82e2a4ca4a5fd72944fbd4a5eadac8 SHA512 b4c800d41aef54f33463e7c4351f3484c4be4806c3a5d0ba6687f5fbf68d17d428fd87eb9929aefaf997e76b5b8a25cfa83a695e03c9dd727c1f3da121da4836
diff --git a/net-misc/teamviewer/files/teamviewer.sh b/net-misc/teamviewer/files/teamviewer.sh
deleted file mode 100644
index 70fc4e8a80af..000000000000
--- a/net-misc/teamviewer/files/teamviewer.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-tv="$(basename $0)"
-tvdir="/opt/${tv}"
-version="@TVV@"
-tvw_version=""
-prefix="${HOME}/.wine-${tv}"
-arch="win32"
-native=true
-
-if $native; then
-	export WINEDLLPATH="${prefix}/drive_c/TeamViewer"
-else
-	export WINEDLLPATH="${tvdir}/tv_bin/wine/lib:${tvdir}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer"
-	export PATH="${tvdir}/tv_bin/wine/bin:${PATH}"
-fi
-export WINEARCH="${arch}"
-export WINEPREFIX="${prefix}"
-
-if [ ! -d "${prefix}" ]; then
-	echo "Creating prefix..."
-	wineboot -i &> /dev/null
-	mkdir -p "${prefix}/drive_c/TeamViewer"
-fi
-
-if [ -e "${prefix}/tvw-version" ]; then
-	tvw_version=$(<"${prefix}/tvw-version")
-fi
-
-#If version has changed or new instance
-if [ "${version}" != "${tvw_version}" ]; then
-	echo "Copying TeamViewer files to prefix..."
-	cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/"
-	echo "Creating config and log directories in ~/.config/teamviewer@TVMV@"
-	mkdir -p "${HOME}"/.config/teamviewer@TVMV@/{config,logfiles}
-	echo "${version}" > "${prefix}/tvw-version"
-fi
-
-TV_BASE_DIR="${tvdir}"
-TV_BIN_DIR="${TV_BASE_DIR}/tv_bin"
-TV_PROFILE="${prefix}"
-TV_LOG_DIR="${TV_PROFILE}/logfiles"
-TV_CFG_DIR="${TV_PROFILE}/config"
-TV_USERHOME="${HOME}"
-
-wine "C:\\TeamViewer\\TeamViewer.exe" "\${[@]}" &> \
-	"${HOME}/.config/teamviewer@TVMV@/logfiles/$(date +%Y.%m.%d-%H:%M:%S)-wine.log"
diff --git a/net-misc/teamviewer/files/teamviewerd.conf b/net-misc/teamviewer/files/teamviewerd.conf
deleted file mode 100644
index e949660678be..000000000000
--- a/net-misc/teamviewer/files/teamviewerd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This entry can be used to specify a default daemon password.
-# It is set by running /etc/init.d/teamviewerd@TVV@ passwd.
-# The password must be between 8 and 12 characters, and special characters should
-# be avoided.
-
-PASSWD=""
diff --git a/net-misc/teamviewer/files/teamviewerd.init b/net-misc/teamviewer/files/teamviewerd.init
deleted file mode 100644
index 3ca37da3ebc4..000000000000
--- a/net-misc/teamviewer/files/teamviewerd.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/opt/teamviewer@TVV@/tv_bin/teamviewerd
-command_args=-d
-description="daemon for TeamViewer"
-pidfile=/var/run/teamviewerd.pid
-
-extra_stopped_commands="passwd"
-
-passwd() {
-	if [ -z "${PASSWD}" ]; then
-		eerror "No password specified."
-		exit 1
-	fi
-
-	ebegin "Attempting to change password."
-	/opt/teamviewer@TVV@/tv_bin/teamviewerd --passwd "${PASSWD}"
-	retr=$?
-	case $retr in
-		0)	einfo "Password successfully set." ;;
-		11|12)	eerror "Password must be between 8 and 12 characters.";;
-		13)	eerror "Invalid characters detected.";;
-		14)	eerror "Password invalid. Validation failed.";;
-		*)	eerror "Unknown error code";;
-	esac
-	eend $retr
-	exit $retr
-}
diff --git a/net-misc/teamviewer/teamviewer-10.0.46203.ebuild b/net-misc/teamviewer/teamviewer-10.0.46203.ebuild
deleted file mode 100644
index 3950aeb34533..000000000000
--- a/net-misc/teamviewer/teamviewer-10.0.46203.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils systemd unpacker
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
-
-IUSE="+system-wine"
-
-LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
-SLOT=${MV}
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	system-wine? ( app-emulation/wine[abi_x86_32(-)] )
-	dev-qt/qtcore:4[abi_x86_32(-)]
-	dev-qt/qtgui:4[abi_x86_32(-)]
-	dev-qt/qtwebkit:4[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdamage[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXfixes[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXtst[abi_x86_32(-)]"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer/tv_bin
-
-src_prepare() {
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed \
-		-e "s/@TVV@/${MV}/g" \
-		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
-	sed \
-		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
-		"script//${PN}d.service" > "${T}/${PN}d.service" || die
-	sed \
-		-e "s/@TVV@/${PV}/g" \
-		-e "s/@TVMV@/${MV}/g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
-	if ! use system-wine; then
-		sed -i "s/native=true/native=false/g" "${T}/sh" || die
-	fi
-}
-
-src_install () {
-	local destdir="/opt/${MY_PN}"
-
-	# install wine prefix skeleton and reg keys
-	insinto "${destdir}/wine/drive_c/"
-	doins -r wine/drive_c/TeamViewer/
-	# install bundled wine if necessary
-	if ! use system-wine; then
-		insinto "${destdir}/tv_bin/wine"
-		doins -r wine/{lib,share}
-		exeinto "${destdir}/tv_bin/wine/bin"
-		doexe wine/bin/{wine,wine-preloader,wineserver}
-	fi
-	# fix permissions
-	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
-
-	# install wine wrapper
-	exeinto "/opt/bin"
-	newexe "${T}/sh" "${MY_PN}"
-
-	# install teamviewer linux binaries
-	exeinto "${destdir}/tv_bin"
-	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
-	use amd64 && doexe TVGuiSlave.64
-
-	# install daemon binary and scripts
-	exeinto "${destdir}/tv_bin"
-	doexe ${PN}d
-	newinitd "${T}/init" ${PN}d${MV}
-	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
-	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
-
-	# set up logdir
-	keepdir /var/log/${MY_PN}
-	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
-
-	# set up config dir
-	keepdir /etc/${MY_PN}
-	dosym /etc/${MY_PN} /opt/${MY_PN}/config
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "TeamViewer from upstream uses an overly-complicated set of bash"
-	elog "scripts to start the program.  This has been simplified for Gentoo"
-	elog "use.  Any issues should be reported via bugzilla."
-	if use system-wine; then
-		elog
-		elog "Due to bug #552016, when using system wine, one is not able to"
-		elog "share one's own screen.  At this time, this may be remedied by"
-		elog "toggling the system-wine USE flag."
-	fi
-	elog
-	elog "The end-user client requires running the accompanying daemon,"
-	elog "available via init-scripts."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-11.0.67687.ebuild b/net-misc/teamviewer/teamviewer-11.0.67687.ebuild
deleted file mode 100644
index 07243d0be1e6..000000000000
--- a/net-misc/teamviewer/teamviewer-11.0.67687.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils systemd unpacker
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
-
-IUSE="+system-wine"
-
-LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
-SLOT=${MV}
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	system-wine? ( app-emulation/wine[abi_x86_32(-),png] )
-	!system-wine? ( media-libs/libpng:1.2[abi_x86_32(-)] )
-	sys-apps/dbus[abi_x86_32(-)]
-	dev-qt/qtcore:4[abi_x86_32(-)]
-	dev-qt/qtgui:4[abi_x86_32(-)]
-	dev-qt/qtwebkit:4[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdamage[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXfixes[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXtst[abi_x86_32(-)]"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer/tv_bin
-
-src_prepare() {
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed \
-		-e "s/@TVV@/${MV}/g" \
-		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
-	sed \
-		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
-		"script//${PN}d.service" > "${T}/${PN}d.service" || die
-	sed \
-		-e "s/@TVV@/${PV}/g" \
-		-e "s/@TVMV@/${MV}/g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
-	if ! use system-wine; then
-		sed -i "s/native=true/native=false/g" "${T}/sh" || die
-	fi
-}
-
-src_install () {
-	local destdir="/opt/${MY_PN}"
-
-	# install wine prefix skeleton and reg keys
-	insinto "${destdir}/wine/drive_c/"
-	doins -r wine/drive_c/TeamViewer/
-	# install bundled wine if necessary
-	if ! use system-wine; then
-		insinto "${destdir}/tv_bin/wine"
-		doins -r wine/{lib,share}
-		exeinto "${destdir}/tv_bin/wine/bin"
-		doexe wine/bin/{wine,wine-preloader,wineserver}
-	fi
-	# fix permissions
-	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
-
-	# install wine wrapper
-	exeinto "/opt/bin"
-	newexe "${T}/sh" "${MY_PN}"
-
-	# install teamviewer linux binaries
-	exeinto "${destdir}/tv_bin"
-	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
-	use amd64 && doexe TVGuiSlave.64
-
-	# install daemon binary and scripts
-	exeinto "${destdir}/tv_bin"
-	doexe ${PN}d
-	newinitd "${T}/init" ${PN}d${MV}
-	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
-	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
-
-	# set up logdir
-	keepdir /var/log/${MY_PN}
-	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
-
-	# set up config dir
-	keepdir /etc/${MY_PN}
-	dosym /etc/${MY_PN} /opt/${MY_PN}/config
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "TeamViewer from upstream uses an overly-complicated set of bash"
-	elog "scripts to start the program.  This has been simplified for Gentoo"
-	elog "use.  Any issues should be reported via bugzilla."
-	if use system-wine; then
-		elog
-		elog "Due to bug #552016, when using system wine, one is not able to"
-		elog "share one's own screen.  At this time, this may be remedied by"
-		elog "toggling the system-wine USE flag."
-	fi
-	elog
-	elog "The end-user client requires running the accompanying daemon,"
-	elog "available via init-scripts."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-12.0.85001.ebuild b/net-misc/teamviewer/teamviewer-12.0.85001.ebuild
deleted file mode 100644
index 28819fde7126..000000000000
--- a/net-misc/teamviewer/teamviewer-12.0.85001.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils systemd unpacker
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
-
-IUSE="+system-wine"
-
-LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
-SLOT=${MV}
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	system-wine? ( app-emulation/wine[abi_x86_32(-),png] )
-	!system-wine? ( media-libs/libpng:1.2[abi_x86_32(-)] )
-	sys-apps/dbus[abi_x86_32(-)]
-	dev-qt/qtcore:4[abi_x86_32(-)]
-	dev-qt/qtgui:4[abi_x86_32(-)]
-	dev-qt/qtwebkit:4[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdamage[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXfixes[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXtst[abi_x86_32(-)]"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer/tv_bin
-
-src_prepare() {
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed \
-		-e "s/@TVV@/${MV}/g" \
-		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
-	sed \
-		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
-		"script//${PN}d.service" > "${T}/${PN}d.service" || die
-	sed \
-		-e "s/@TVV@/${PV}/g" \
-		-e "s/@TVMV@/${MV}/g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
-	if ! use system-wine; then
-		sed -i "s/native=true/native=false/g" "${T}/sh" || die
-	fi
-}
-
-src_install () {
-	local destdir="/opt/${MY_PN}"
-
-	# install wine prefix skeleton and reg keys
-	insinto "${destdir}/wine/drive_c/"
-	doins -r wine/drive_c/TeamViewer/
-	# install bundled wine if necessary
-	if ! use system-wine; then
-		insinto "${destdir}/tv_bin/wine"
-		doins -r wine/{lib,share}
-		exeinto "${destdir}/tv_bin/wine/bin"
-		doexe wine/bin/{wine,wine-preloader,wineserver}
-	fi
-	# fix permissions
-	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
-
-	# install wine wrapper
-	exeinto "/opt/bin"
-	newexe "${T}/sh" "${MY_PN}"
-
-	# install teamviewer linux binaries
-	exeinto "${destdir}/tv_bin"
-	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
-	use amd64 && doexe TVGuiSlave.64
-
-	# install daemon binary and scripts
-	exeinto "${destdir}/tv_bin"
-	doexe ${PN}d
-	newinitd "${T}/init" ${PN}d${MV}
-	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
-	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
-
-	# set up logdir
-	keepdir /var/log/${MY_PN}
-	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
-
-	# set up config dir
-	keepdir /etc/${MY_PN}
-	dosym /etc/${MY_PN} /opt/${MY_PN}/config
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "TeamViewer from upstream uses an overly-complicated set of bash"
-	elog "scripts to start the program.  This has been simplified for Gentoo"
-	elog "use.  Any issues should be reported via bugzilla."
-	if use system-wine; then
-		elog
-		elog "Due to bug #552016, when using system wine, one is not able to"
-		elog "share one's own screen.  At this time, this may be remedied by"
-		elog "toggling the system-wine USE flag."
-	fi
-	elog
-	elog "The end-user client requires running the accompanying daemon,"
-	elog "available via init-scripts."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-13.0.5693.ebuild b/net-misc/teamviewer/teamviewer-13.0.5693-r2.ebuild
index 01d79a30903e..c8eeedebcf6a 100644
--- a/net-misc/teamviewer/teamviewer-13.0.5693.ebuild
+++ b/net-misc/teamviewer/teamviewer-13.0.5693-r2.ebuild
@@ -66,8 +66,9 @@ src_install() {
 		fperms 755 ${dst}/${exe}
 	done
 
-	newinitd "${FILESDIR}"/teamviewerd13.init teamviewerd${SLOT}
-	systemd_newunit tv_bin/script/${PN}d.service ${PN}d${SLOT}.service
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd13.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
 
 	insinto /usr/share/dbus-1/services
 	doins tv_bin/script/com.teamviewer.TeamViewer.service
@@ -77,7 +78,7 @@ src_install() {
 	doins tv_bin/script/com.teamviewer.TeamViewer.policy
 
 	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png ${MY_PN}.png
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
 	done
 
 	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
@@ -98,26 +99,29 @@ src_install() {
 	dosym ../../var/log/${MY_PN} ${dst}/logfiles
 
 	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd${SLOT}
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/${MY_PN}
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
 
-	make_desktop_entry ${MY_PN} "TeamViewer ${SLOT}" ${MY_PN}
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
 
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
 	elog "Before using TeamViewer, you need to start its daemon:"
 	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd${SLOT} start"
-	elog "# rc-update add teamviewerd${SLOT} default"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
 	elog
 	elog "Systemd:"
-	elog "# systemctl start teamviewerd${SLOT}.service"
-	elog "# systemctl enable teamviewerd${SLOT}.service"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
 	elog
 	elog "To display additional command line options simply run:"
-	elog "$ ${MY_PN} help"
+	elog "$ teamviewer help"
 }
 
 pkg_postrm() {
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 7c837dc761ee..9c14268c734d 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -2,5 +2,5 @@ AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9
 AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312
 DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f
 EBUILD vinagre-3.22.0-r1.ebuild 1587 BLAKE2B 8418cd989b41fd41d2f5680a21deeef334b10f143dde9583186c08bd293dd8065cc05c1c432eaa8d4fe71f367599bd3a56835cae89dcc71a3e9eeacfa1f49c00 SHA512 f8e67898179e8fb8401471e48f55ed392f233cf61a0e28461f84e642cc485fb866cc4922babd030013092a1e91cd41e6df7ffcf1ce2200e5ed3ee125e2b6d1df
-EBUILD vinagre-3.22.0-r2.ebuild 1640 BLAKE2B ae04a91a574326873d5ca7ef3711abde42d09ef9a441489ec55bd86c962a5072b6f0e7f5155812965a0d1388157871d18fa3eee3dde4da411f1d859c84933ef5 SHA512 b3c503c88687fb56cd36ccf51c6093f2bdcd9b43334dedbdc7cdc7965ef0210f7241bff0d3652f396bc660e7c9db2e2d22c404029831c2e345f9e8a5eb07fe3f
+EBUILD vinagre-3.22.0-r2.ebuild 1639 BLAKE2B f82f48d5a05bff2319f2c667f6bb1e88ea68994643de5cc798e2c81e617434e1f22124852e31c8890ba2dd934d3c5853f516460e167f040d80967314b6b9a9ae SHA512 0da402724f4143f42a23bd0fa2e30f28acc560d15a9a2a89b195718e40045bbe9cb2296f943da099e0bb8dc940e82c257019040b0a53f1d1a16da81fdf008503
 MISC metadata.xml 550 BLAKE2B 6f81c1e289dfcf1839030e45752fb4970ea84b3f8f8d187ae476f4fdbbce15739b8a5857b87bd4b426936f90554a9346f7abf3b9c60624fb39af4f6e2fab1b98 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840
diff --git a/net-misc/vinagre/vinagre-3.22.0-r2.ebuild b/net-misc/vinagre/vinagre-3.22.0-r2.ebuild
index 075030e4ff4b..3cc3baa9c52b 100644
--- a/net-misc/vinagre/vinagre-3.22.0-r2.ebuild
+++ b/net-misc/vinagre/vinagre-3.22.0-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 IUSE="rdp +ssh spice +telepathy zeroconf"
 
 # cairo used in vinagre-tab