gentoo resync : 24.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
commit: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree: da76713365257a445f3ae3b95470917f59d46728 /net-misc
parent: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
64 files changed, 1090 insertions, 878 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 03dc226f5bb5..c9cf1b34ed92 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/calico-cni-plugin/Manifest b/net-misc/calico-cni-plugin/Manifest
index 8fdcea2d9e6d..37e585e690a8 100644
--- a/net-misc/calico-cni-plugin/Manifest
+++ b/net-misc/calico-cni-plugin/Manifest
@@ -1,12 +1,15 @@
 DIST calico-cni-plugin-2.0.0.tar.gz 59473 BLAKE2B c101ec612112a7314f0958045dd655f6dd77f0cd204034e568a23b71c82238d9727bb03ad15a62c7b4ee609319acc63ae811dc7c8a67a324f810c01e9260efb6 SHA512 0db09a44b36e35f3e62ef58bac60893c8dc4b00a8f95192368ab53c67d4fc771f2d501fbb68acd3f12f53e7438e101fca74178d66f143b606c6ff9a707364dc8
+DIST calico-cni-plugin-2.0.1.tar.gz 59792 BLAKE2B a7ca4799030ae83bd96291c72d46b95efff9bcbf465da41b19fe54d61503b0a3efdaee55fa086ee154fa83b8b36725ec848145fba078f107a8d3807959d60a7d SHA512 1ca447e2e8a4f95254c5433ba39427014da40febb44c29969a9e81f8a7ae62f706d9cf6b116400b7a5372ebc91954d588916808d64d9b12fcfe25fff90feec9d
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
+DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
 DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz 173167 BLAKE2B 9aad6388fd9c307a31a37a746684ed9fc52ff556ef5209e14c2afebf69af0abc28cb9d825245b87a49fd9947f638344b92143868fea7852db0bd2bc39239a2e1 SHA512 0607a4213f1291cff03d21d6860a8830ad998bcb4c6e3489bf0a8c207137fe9b958c3c453e9cf6fe0911a219d250d89f0e8b3c457900893b9ed8bd31dc696777
 DIST github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz 789110 BLAKE2B b04688b90503cb01aa18d9c1227b7cb510846f8b42678729fb7a80bf914ef4a06c399a8f165b7f01d6a05aaf98d4e97c17675a3774745a7850862bdd609b5168 SHA512 2aa1a665531c2e6b7800d38abdec4f0b68e778ae27c638b4ab097abb720c66a4863fd1f4b59dc818b91bddbc5c7dce4e1fefddfda11881e2334d7b71122bd60e
 DIST github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz 2890046 BLAKE2B da19c84834dd044a93274720437a068b36f97e859f6251af07252732b100297e28b8dd0ff350d8954290bdca50571a154b383f3cacec04f94f548332aa922bda SHA512 88a00ff578826bc7e06c6b88ca4ade468588e72ad4e33bdd8193dd942f1695cca285213ab40ce357f28f534a9d4ca50579f3d29183b468061500262e0441ce21
+DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
 DIST github.com-coreos-go-iptables-259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz 11294 BLAKE2B 2e95b4c7c9836d54a004da28f6abd09d3d165055d2d1d4f8e6a67d3389b7f93fee14f30c92096d2da6f7639a602bc163df40c1f817370c481ebbf63094d8b197 SHA512 58c5b995dc12a881820f5dccadcd75cb8e6d856f34c2d33c01ff8538c0a1451b75e14d3bc675fb008fe3c4e87d1d0bfd4a27443f19dfa8b53b4da02d3de9dfea
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
 DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
@@ -25,15 +28,18 @@ DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz
 DIST github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz 860438 BLAKE2B a19c673d984177faf078a04b7351258fed56390d09bb74f715409e30a7c99b68ef1861f1890db0683370c290a4fcec8f2a1d82a01e9132160f5a3a2954b9cfe1 SHA512 693f3586a09e2149ceda3b6833154acdd7d924eb6e225697db4d103a9a907147a9b1860efbd0dcecf2db6b39f44b0e6e6414eff318ae4ccaaf36e18f505f438a
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
+DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
 DIST github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz 596056 BLAKE2B f9b44588375bc50d843fc9e5353744f61e15ea4ca5f62aadedcaabc7f99fdbe6ffbfbcc9a73c8fb1fd60045bcc660e3f282dc0a4f3c5338c680f32ed85c543e9 SHA512 1084079e6d95c9a211282b0a2093719e4ee36e297353f92ab5517cf193e7a083c3ef85df799fdddbe4c9629482424e32045382679b5160a4c074dbb53c242d96
 DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
+DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
 DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
 DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
 DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
+DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
 DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
@@ -41,14 +47,18 @@ DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 72
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
+DIST github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz 599812 BLAKE2B 6763e5204c210f9c4762f659a863ca2333e49b3f35d516fbdcd9a68124bc2f69f464e20caecd6a84b67f4962c4325f41c52464613a687d3ed12d1c97934e790c SHA512 5533ff2a56b573b644f16c4e287d50c850203e79a82588df252df78dd3d0e8ba0bb691b7211c6e24f4ad3bf954e7941851e840fc279ab3f189f4d7096e4b8707
 DIST github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz 599747 BLAKE2B a9d36fcc97232af6cae2558ef77caec625f790f75065ebbba3a94d61b9f06b68c3f5b7ed58f8fbf79b158905e849ce958b3b071a09e92a9d8bd46554fdf019d7 SHA512 99a1c84bad03df827288cd94665ccfd1c290945ec63787cd56f49ee27ecea8174fe5597d4c48367aec11f3ac18d1087a2cbfb7ed9a76906aabb31bd0199f5ddf
+DIST github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz 450402 BLAKE2B 422d64fd22f92c65f3ed41472e5a98b6197d32aa0b4fb19c7a487481e33738b65b807fa3af05e577641485a9702ce298e9741c57cdc9abba133a10d5a9d58de4 SHA512 628b11b308d8b76724f65e7d04570cd693a01368ea22ab556313ecd3af28e778c0bbf042a04f180bfa9c4b5188b437ae1bb5c0757fbd4d9602cae63f2fd37d36
 DIST github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz 450287 BLAKE2B d311171547b907179e9edb85f1e688752d628fb00001abdb0106bec0ae9f66bbb569c627fcce656dc57538435a6cf18f0d2f426c4e98d12296240f4dfe96352b SHA512 a9559fe0b585499a3f142cc24fc850ae2bc05c3232861f7749dc7b01a82903d17cb8ca889d58e0a76e245d8e8809c3a45160c1f79101b407c9141d8a893574eb
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
+DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
 DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
+DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
@@ -56,15 +66,20 @@ DIST github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
+DIST github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz 383022 BLAKE2B 04dffe36eeab8fc1407ff6345bf994f4d507aa462f70c55c27ae2f0a4044a5b2ee09ff36997cb6bee5bbbc5c8574d2cb7fc1b97b8d02fc9883ab28ab17356eb7 SHA512 9034dd3b0d0f088219a3e4b0a1c73b0fb7ede3d3d5f6dd2d61fd51d5705aa9d64ea27f1d40dc6b40bc5d4514b25da73e2baf45f83232658009fca1323066e4a9
 DIST github.com-projectcalico-libcalico-go-c63959043fbfe61db5795781c7a6c848cf2cbe0d.tar.gz 382765 BLAKE2B 17e78982d8b4092df341f5100c319e3c1116b4271b227ed21d2733af6979bc2582d3321ecb372bf4d5611050f404d374c17af3e2376ccdedf6ba379010de1711 SHA512 ab6be10b9e3d6c90774c6bbe0f0e05159793755c0fca53e6f7737517d15b6028d1af5a507ee9c803edb39cefcaa241ecb96fcba0f2affb9f598ba6850d67fc75
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
+DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
 DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
 DIST github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz 62690 BLAKE2B 981efc277b38a6249cb232c2ce6f759ea7313902aa9e8edfa2e76bb793bbe0908d8b175a13248d042a8d2c611e57b278b5fe89d606e8410cd996a9f640bf94a1 SHA512 14e0e3a26c3a01e6921892559d34a6de05f8e1eb1fcb588b3f01d891679bce1a625806bf04aca16c89ca05efc907cc0ce3d06521dec30903886138b3c4b4dcd6
+DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
 DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
+DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
 EBUILD calico-cni-plugin-2.0.0.ebuild 6265 BLAKE2B cfb936465edbbbdfaa0bae49aeb798be74f85c4e00a2ee0b1fa8ed9c92267c145a6f46994b7a327ba15429ec4f669d4368d0c85bb49301bfdba6224f0895b16b SHA512 8a765be10e90aa4208e7fce0eac68ea810224de95e8276a145b446f0adc60294d34d6939403971f432f3cc226fd070fc2042e1acff92dea0b79dd38d4d37fe46
+EBUILD calico-cni-plugin-2.0.1.ebuild 6365 BLAKE2B 26d3e32b88c6bc5236b42452eb80d034766188d5fe974be16f360209b7c02fded5ec2e0989aff8d8055a02eff236c7ef0fadadede52e684ca5d9807d3d1c55a7 SHA512 3edca428c969bc535592ce4cd6112945744e02b9e534490714112a9e08d276fd73ac8ab258242fd9c5db92c2b656f2abc44e7a91052edcfba1d1008519b93f46
 MISC metadata.xml 344 BLAKE2B 69c43717917cd8c416f5b320124027b48453aaf2d74abd7b77d7b80a545c6b8504e3a4cafe80a0afbd545485a6c0d9af40394c40077708e117a6996cdb78f5fa SHA512 a43f50970c9415a6c39ee30e131ea5063a53a9b332265d63ec52992cee3022e2aae0eb4ea1893c283d7068dc0d9454d1952cc8287b3c4018306895c8ed39b9b9
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild
new file mode 100644
index 000000000000..12702395ef9f
--- /dev/null
+++ b/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/containernetworking/cni a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
+"github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
+"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
+"github.com/coreos/go-iptables 259c8e6a4275d497442c721fa52204d7a58bde8b"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
+"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
+"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8"
+"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+"github.com/projectcalico/libcalico-go a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501"
+"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
+"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
+"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
+"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
+"golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d github.com/golang/crypto"
+"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
+"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api 389dfa299845bcf399c16af89987e8775718ea48 github.com/kubernetes/api"
+"k8s.io/apimachinery 4972c8e335e32ab65ba45bde0a99c6544c8a8e4c github.com/kubernetes/apimachinery"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
+)
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="Calico Networking for CNI"
+EGO_PN="github.com/projectcalico/cni-plugin"
+HOMEPAGE="https://github.com/projectcalico/cni-plugin"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="net-misc/cni-plugins"
+
+src_prepare() {
+	default
+	pushd src/${EGO_PN} || die
+	sed -i -e "/calico-ipam:/ s/vendor//" -e "/calico:/ s/vendor//"\
+		-e "s/git describe.*/echo ${PV})/" -e "s/CGO_ENABLED=0//" Makefile || die
+	rm -rf vendor/github.com/containernetworking/plugins/vendor/github.com/vishvananda/netlink\
+		vendor/github.com/containernetworking/plugins/vendor/github.com/containernetworking/cni || die
+	popd || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}:$(get_golibdir_gopath)" emake binary
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	exeinto /opt/cni/bin
+	doexe dist/${ARCH}/*
+	dodoc README.md
+	popd || die
+}
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 007783039e9d..9e6b731f84b9 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST cni-plugins-0.6.0.tar.gz 787756 BLAKE2B b22825388b0d74f3ea26f79e9df9663a0cbb499447423d1bff93ffb422667f2895d17ae53c27089dab3f724a43489818787c2d51f85bd25f957ef1e6913b8775 SHA512 4b3c1901154eb1af86dc35888fda7b7666ee88d2cf728fb09182df5385d32b747de34c5c01598e1f37ae1e3497dbf5af2bc6ad6f737e683ccfccf9c1860cf6dc
+DIST cni-plugins-0.7.0.tar.gz 862293 BLAKE2B 27f0565c76a720408ea7c2f54f0651fcc661735e238075b6dee597e97a5d07bcc2c111dc24434d5b57193e0f039a2ddbb6246205da6a58fc24f0201d04d79703 SHA512 c5f13850ffd455b269520f9b54a916d09dd5823fc1bf0920695a556015f17e0e680ee377f3f8df686836855c331ec0f827c68718773e87337a8b5761a4c5ad69
 EBUILD cni-plugins-0.6.0.ebuild 1043 BLAKE2B 7fe1e5c6ed852fdeb73ab3c4cd18be764885f47e98c8c0df89fa3f3a2feaf9003f285142c18c2195af9213fa7af6cac9ea9abfb3414be26f5689de76e90719b5 SHA512 981589a5390a63178d7a5961794e28400c0f38e3c4419797779d6256cdd7efbfdf4d35857af740b76d5af0657995ebae08b465865ed6525bbd12658eacc625f0
+EBUILD cni-plugins-0.7.0.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.0.ebuild
new file mode 100644
index 000000000000..b07a467bf91d
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="Standard networking plugins for container networking"
+EGO_PN="github.com/containernetworking/plugins"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+src_compile() {
+	pushd src || die
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
+	done
+	popd || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	popd || die
+}
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index c164fe088e98..2519ca9207b4 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,4 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST electron-cash-3.0.tar.gz 1623371 BLAKE2B 3311ce41dd40de82ce9f96763fd527505eabda0c9ac10e5076c5dbc3ed73c4f1f299a62e39b5fd696468408bd3764c7dceca36b006d18394d72f61e14f6417b5 SHA512 b136d9099e8cc3b248a4cb525c6aeb4a38a57809a66dc8e897bee34fde071b5a14bbe6283ad3bf50087be8544508e078824c249ead0e1914ef7622688fef7e5e
-EBUILD electron-cash-3.0.ebuild 3626 BLAKE2B 8345a2396e463cea184ec112def708a5248d1a0208147eb8660d034cf2a98ca2c5cc3cb2dcab5c3b229c6ef80ba5942a431fdce9d55f8ff3831c34dfe56b9b63 SHA512 0e56313003225e8894b793602dd179806c2b04ba99ffb0688e3234d035ce0741aaebd3edf3858999f7fa3d943decc8687329777c97984b1d52dcbb202c1a614f
+DIST electron-cash-3.1.3.tar.gz 1643903 BLAKE2B ff7c4f8d10b680c9fe3fcb949349cdbc84acb49939b33af2816f8154c3675241e3637bc326af9c2a662588571aeab37de86eb89a627e934b824114c3907a8158 SHA512 267f434ef09bea23b79a9ad8cb8e734a7e1ece7d17d2e2cc91496af3d0fcb035256ec3977c2fbeff4c7ac16193a0a185041fd526c46129fcea62bcdfe043a208
+EBUILD electron-cash-3.1.3.ebuild 3628 BLAKE2B 50933c6fca1827bf3e45c8a9217a6c70d140f6dff0f83b784e0ba0787f6756d10133e116d08441a14473ab00e090516533752299ff64c65b3a91c495a1bb98c8 SHA512 d3446435ae27a7ad2f72dafde7aced3de4cc29e998628912f03c89f77a9b717ab0e9880f892eb2609715eead959f886a2de0b395a783c85172260c97ad5730de
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-3.0.ebuild b/net-misc/electron-cash/electron-cash-3.1.3.ebuild
index f8603f1296ca..bdee3e7c9c5a 100644
--- a/net-misc/electron-cash/electron-cash-3.0.ebuild
+++ b/net-misc/electron-cash/electron-cash-3.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit distutils-r1 gnome2-utils xdg-utils
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index dc0facdee014..6724e406ad20 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -1,5 +1,4 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST electrum-ltc-3.0_pre20171218-electrum-3.0.3.patch 6870 BLAKE2B cbeb180f17ad15bd6ee90dc90cd8d3a96df6ccade903ac287e5438e61c3443b64720dcdcd87bd5d2b4fb7ddf0c2625d26ffd23521aa94e3c7c662ac7582210f5 SHA512 841e337758c4c5ab98153a008204b0fa4cb32ab22e494657b61a1da487a6bdb413b1982be854a91e3175dd4d03a50877208809e9a82f93500ffb33222fcbd0fb
-DIST electrum-ltc-3.0_pre20171218.tar.gz 2385686 BLAKE2B 3b96f1cee9f052a0c4518c0c03308badc1000b4bf19c0d2a82725dd37ed33f82e12d57802fd9533f9f69f99fb97b81f6c2baa2b59fd0890bc4db22f7d00c108c SHA512 374d8bfbde9acda0d7f5922dd63cc7e59e9ccd714c8feadd7931e39af69ae473e3220fb6b8591d1dafbefbfe24c87b1de94a1e5ae716b219dc81d44e09a81e44
-EBUILD electrum-ltc-3.0_pre20171218.ebuild 3969 BLAKE2B 4c8711f8c3f1d10686384626988beb82cb4dbbbf00f1fd874c0f598684ce222d278ee08bc48cbcfb0ce4081399f5b76fe615b23aae2eb2b0be2e8ef700926ef9 SHA512 82dfdf380391f1efbdc7b4196546fe49d09b7af751077543a206142c9aa6474b9d5f61d4d976dbe72796a30b0f30c1858788a15633021c0f6504a9e11e179e89
+DIST electrum-ltc-3.0.6.2.tar.gz 2387515 BLAKE2B 3093aad114dd96d0a0ecac48adfe45c9b7be37d831f67fd8a230617bb45131b5045e70433c0ed0fe87a3028356de3884e78c3eb2c1bda38e5804e97952dcd13f SHA512 c9de8f490eddbf269fb5a034fc4bf5712173a09df8fe4ea01dafe516cd1b684dce253278c4c4128e4284c89bd7f8fbd51e0633710abbb22720b53507ecbd102c
+EBUILD electrum-ltc-3.0.6.2.ebuild 3646 BLAKE2B f625bd03c5699768527b9187e7c54de38b1f14fc3622dbb1b43944928eac414e951e6c6c77d7502fab7bf995365ab66f7eec1a7a6852642590c007a65eeebf2c SHA512 7279621ac1fa24dad08b496d968ed5b0b865e29717467048dffb76ef7c2f960cb4fe5abf2473f5d31445abcde97c7a9566747e4af7e52629f78ac05f7648372f
 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9
diff --git a/net-misc/electrum-ltc/electrum-ltc-3.0_pre20171218.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild
index 3158071e0931..23ae29e955ec 100644
--- a/net-misc/electrum-ltc/electrum-ltc-3.0_pre20171218.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild
@@ -3,16 +3,15 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
-EGIT_COMMIT="d088f561b2875b4cda0689f9e9d911d558711e15"
+EGIT_COMMIT="${PV}"
 DESCRIPTION="Litecoin thin client"
 HOMEPAGE="https://electrum-ltc.org/"
-SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/spesmilo/electrum/compare/a4e89e822a208daa574c4bd1d8ecfea952c6c101...b4e43754e0f60d8438b5fd412de816a466344401.patch -> ${P}-electrum-3.0.3.patch"
+SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -60,8 +59,6 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 DOCS=( RELEASE-NOTES )
 
 src_prepare() {
-	# include the last changes that apply from electrum 3.0.3
-	eapply <(sed -e '73,92d' "${DISTDIR}/${P}-electrum-3.0.3.patch")
 	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
 
 	# Prevent icon from being installed in the wrong location
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 711672933237..437bc2022e7d 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,4 +1,6 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
-EBUILD electrum-3.0.5.ebuild 4280 BLAKE2B d4bfe3b62c9561b1335d9ff9d77048b20a7c94a0fd5e9cf0df1de7fc341302ab275a0efff300cf01ab492df4323dcc979ec9846f2246877387d138a64c337a81 SHA512 71db35179f27cf9d7a273df7d346087020e4c0ed46d2d581acaaba322a788be6829215fcafe3d05b666fd8e793fe748b9697d9d6e6af405ea35607751ff0b713
+DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
+EBUILD electrum-3.0.5.ebuild 4313 BLAKE2B 21a41f162be364235d5f4c57c0d55dc9c32df268877048d97985bdd565d3711708f503e59bdf6d38a5cdedbdd191c7c6e0cfeb5a89613155e770de84d3d92d0c SHA512 6ec934d1438b9853e05a7f011d672f02e6542176496c9f5965a188d20dfda409577abfcfef00cbf46bb95b9aeeece89fc9982de0508135d8b4891ca97e0aa7ad
+EBUILD electrum-3.0.6.ebuild 4280 BLAKE2B 994a3247356194c4cd81260c9c18768eb4401666ecaaafea617d4cace28607648ea1dc613b38b0c377d3c4e73087eb61144b9de24f4e7f515410178b08a243b9 SHA512 c4858d54e9acc243291a534af582da363dceed332ee719aa5167651ef21f5b2e9ddd13f23749b6608be1d2cb0df0233b8f1a6836eeacc2d6430c8209e359c9ec
 MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
index c876f238df53..63e1b139bf83 100644
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ b/net-misc/electrum/electrum-3.0.5.ebuild
@@ -3,7 +3,8 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+#PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 gnome2-utils xdg-utils
diff --git a/net-misc/electrum/electrum-3.0.6.ebuild b/net-misc/electrum/electrum-3.0.6.ebuild
new file mode 100644
index 000000000000..f6c1a77ec4bf
--- /dev/null
+++ b/net-misc/electrum/electrum-3.0.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+
+my_langs_to_l10n() {
+	# Map all except pt_* and zh_* to their generic codes
+	case $1 in
+		pt_*|zh_*) echo ${1/_/-} ;;
+		*) echo ${1%%_*} ;;
+	esac
+}
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
+
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
+done
+unset lang
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	greenaddress_it? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	trustedcoin_com? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	|| (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	)
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	local lang
+	for lang in ${MY_LANGS}; do
+		use l10n_$(my_langs_to_l10n ${lang}) && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(usex l10n_es    '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		revealer \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 57dd27fcd4b5..a6c8bbdbed86 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -2,15 +2,18 @@ AUX felix.confd 111 BLAKE2B ea790c8b649f58bc8b4cbef2c91dccdbd7ba2bff9db80d45b677
 AUX felix.initd 522 BLAKE2B 1250ebaa33bec5c85ae6489bdeabef8e36bec949c18072235cebb0b5811a89ae061659dc868e804a5f9f069b2829eadd2921313aaad95cb6f7b86cee34d4defe SHA512 c5393cfcf94303fb02e7c2aea7992cc3969437d5f39674f243a800ad2d0659fbc6e42a411aec20d6477774353b125c7a8ffacc510dffb20442eba81e88582ee9
 DIST felix-2.5.1.tar.gz 331705 BLAKE2B b8ed9b2355fd7ed6af95421d863f52f0553db5b2b7043095075231fe79d7500ce94c1ceb33614cdcdf715ba275ec254c605622eeae83486d8861a6449ba0c2bd SHA512 60bea2115164b0c75b08ee5011e6754a5173c5e360215b71483fac2f26f1a57223df6ccfcd226e542335be5aec886d9e4f379353f3d57f11f9ec0098b98b393c
 DIST felix-3.0.1.tar.gz 402532 BLAKE2B 4c648ddeb7e8fe6bb3f8e56ba2a6c519b869afa3096c52d6c426bc35ba0cde98edfea6c0dd9c1e7ad57b9bfc22763ce3d2b7ee26f3401b1012c0600fda64e5ac SHA512 0eef4e9d870835d8661ad570e99861a9e1d3a7ee071e873d783a0cc8c29ccc7d6975de613f32ba4e20b98f22ee925170397c124b279bca521c88e693150eea55
+DIST felix-3.0.2.tar.gz 402681 BLAKE2B 6be0c7a4038b55b9975e045afa15e978de6c89ffc96a970571c1b9b9b4a5ce1fe4e35577c2b32bb2329a60bc894512f305c33c4de53c6c9e17012dc91155a036 SHA512 5ded5c319dd29ba79579f7507215b481690ad6e418e6a262258bd3389913fef335362722324369efa1a1eaded8c97ef7552a47f5d60a7e9b4c97f5c7003b5ab6
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz 78903 BLAKE2B b2480753213e2c387d969c8dc68994cb6d107ebc970ecb986d4bf22b542d460814d0ba0e40b82e9022072142b201cd794fc8dc7bcfcb1531c9613f2c3408b7a3 SHA512 192b544268bd10048ca877d70b35faceb9c648e7298124678b21d727a27d569e61536f42a7030b7e40610ea5822c0bc2264cac03c340ecc90e43f9120b6734d9
 DIST github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz 43033 BLAKE2B 69ce67e0633e03f569908a567831a4625661855e466a072850ce5ca5ce60c31f92e2057fee31ab90a357ea5c563ed7525d3e4e2ae2f09ebe27d762018464ae75 SHA512 f1dd4d3768da18a5aeb2c2af5422400d4adc194c31c79e7208d96d1bd3c65d9a78dda67d174ebc6a8b3dbb7734c50f15bc445e6e834073188135a0b6ebcb4c38
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
+DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
 DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz 804453 BLAKE2B 6dff8674476a5667ce4b43922acc1ba752a64d26f720c3554c73b88d5114d211a93fb994bba161911732a61d279b7f5610b5fc218b2985b87ef8a8353e3ca658 SHA512 13716991e01d8192137fa5551607f7320b7a369a5ca7ae29110060a5d9116a0d1c147b9f1fe6539eacbdf331bea2c6abb64c9da4bc921c3621e49e8bc397590e
 DIST github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz 2890046 BLAKE2B da19c84834dd044a93274720437a068b36f97e859f6251af07252732b100297e28b8dd0ff350d8954290bdca50571a154b383f3cacec04f94f548332aa922bda SHA512 88a00ff578826bc7e06c6b88ca4ade468588e72ad4e33bdd8193dd942f1695cca285213ab40ce357f28f534a9d4ca50579f3d29183b468061500262e0441ce21
+DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
 DIST github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz 2527242 BLAKE2B 7ce3619ba5e18414e3732dc4ce608122df130dfe9a61cd2aa6cd573f9010954ab0d352d5660a74032a0d078f040c383eeb0c8eac5022965f7781fa8f152946c0 SHA512 ace63a7e909629993d1b5038460848cecc1aecb024bcb6f35738f3ad36933e564da80f7faafb9b0d6a3e9149e37d34b86913219ce068b17a8adc643aa3099d86
 DIST github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz 28165 BLAKE2B 9433c3db4fc8ca8555d6f0d5aee6a47d5bb238d8fb28d69935a126aa5e223a59d35df6bf8cfe2bbc6cef85afa71c63c30ac027f9e551280f6d5f5b5d2248d6ff SHA512 29d6ee973c1752a661ee78869ff26873c2ae6684ea77612c2516b0ccfc9dd00ead885a6b87c1fb9be2ac74ae3381be1893cdb143b6fa18a19b6450f8733fe549
 DIST github.com-coreos-pkg-fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz 30353 BLAKE2B 5dc99a86cb95a8336c05380b0895844d27b79ad6c6e0d1223a3ec25f9cd5a39f0374c5826ff5a97c0472ea4538ad427997c95eea075feefa0a7703224e6a5035 SHA512 f1247031ebd00d6b5c5039dd3e66734035c761c39f7a7f333727248a9a78894b121f1cd18d06c58965292e9b95db2369219adeaf3bf0c63efbc90a6a6004b04b
@@ -34,9 +37,11 @@ DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 629
 DIST github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz 2432841 BLAKE2B 744f754476b0ae957d9874c4d06956057006ffcfd2d75ca50dc22b94eee967010b941f205b816216af58a19e8d3405d499d43a4199b5be172ccec6d4f2ece443 SHA512 6047875c5488d943a9f63776a4b55f71ab335344f6e99e76861240ad152db018b13ea52c18ff4db21c932090a50d32659643e0737c3290f18e945a352e450f3f
 DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
 DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz 248545 BLAKE2B f30fbefd0442e492a1435a415b8b70f19afbe13752779e80ce393ad3c01c478c0c975833c96291ddbcd3ce7086b0be8adb64dd96f16afdac2e5b784fa36eccfe SHA512 fb8a4e6b1689e8e6bec7fb9b4a4580892331322f144819fad96b7b5dd09fa89cfda45a8b4e1dfa25ee9f3bdb8a064705b05180efd1825fa8a3ea4f4cb93130e3
+DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e
 DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 1443268 BLAKE2B 19bb8d2861225a14ba3f19b2ae96c6640833fea7da52228480634e715b7690afc94e605a5be1b70b263bb3045a0fbcf9f78211c431836d077cca7d076fec1686 SHA512 e82f87394d2a8d96779cc69c8803555b5d23eb02f3d38101ccb9142a892280c32b8123d61a309a041cf5034282b5269ea38b5d29e03c85ca3c62c4fc0802502e
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz 899847 BLAKE2B 0ac617849aaf70cc78ebeb0b68cd8ed9b866ea15381eb31f233c2afb351c3ed90169311cf5105a961fc6a844434b55aecfc00e26e136a430481f86f3eaa394fb SHA512 9b98953b1cd4a0382175b4299cf605b3a41f758054a167bc764c324c4c5c8ba7205760113c44666f77d447804f7f1a6d3b34a334859cf9528b19161f77baf075
+DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
 DIST github.com-golang-protobuf-8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz 217385 BLAKE2B 067df31ef043c798835c173eef23fc6dae18c30899752fed1ea776b35f54be63d144616a98230782fba1ef0812dbe02398fc50d196c48035f4d26c77baa1bf45 SHA512 bd5531821feea03d7bb273daf81ed648cf15c1573e70701f0e05c65995cef0030a927980447a5b9e52cfabd6049df9c3f3d9c7736157d994b3b38d4eef026a2c
@@ -44,16 +49,19 @@ DIST github.com-golang-sys-43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz 76171
 DIST github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz 766292 BLAKE2B b88ad923e0caad501858e2b7fc59366fc287151f6ce988fb44632370f019c7edb5f1eccfbb6766f5d67e76d0768c7b459d86ee0a3c3dae68d840eaf7923a9447 SHA512 8d35c2b54cebae7f0f21916dd72be6132c22402829830f7b34805338f81e96da61977b346b72aadecec72c5eb1560998c7523fe0e6828813d635e06cf230934d
 DIST github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz 4549739 BLAKE2B a124e96048fe4bf231b3e87e012d40f84de8541eefc4b3136451c75b6d45991b20893656fb920d014cb53a8ab5177a877c5ca48fc0dc43f92e50aa50d20d7ade SHA512 a4542d75a6326255d2cdfa48a454dcabf577fc04527973b6de00abb6d8bd4b04cfa4e6cf6b26fd3b2a546e6b4de7a36eaae409981dfe790b88a841a85348c83e
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
+DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
 DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
 DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
 DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
+DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
 DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz 5497 BLAKE2B 104080651e0cac64abdc78169b4a184e9c8fda803a6f629fa3ef4210015f0a76df7fc478ea88e3fc460ab49288633a27ceb452979b610d49475040b74cd2ece6 SHA512 8e444831301404454b0f1506a7cf20347bc42639691ad7946e36e30492e7d8108d83ffc974934632eec9c75f03e28ce75e9caf1e92980803a43fff82849145bc
 DIST github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz 2806 BLAKE2B c41d5bd53f9f4bdff9e5b1cde8af46f3b3c8518af88b45a33625fa6cc4d89052fd6588d99dcaa1f6fe3ddc2a3e566b2da6ae30a1d218256f6707db4f0ca01c32 SHA512 e8f0a888f8103fca6714f6a13ba80434560488c9be389b47ca505e84a45bd18ecd08a19e88684c6af2ed550ca5c11c6a215791420426a89a79cce0dead452d47
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
+DIST github.com-ipfs-go-log-0e2a17b81af445147a78d94a45d4398c4008c219.tar.gz 11185 BLAKE2B 0aaa1f8ef8d29350f1e4158846f03981c6bfda3b66730400c37174da99a755660c26bdc7e491850d35ca7497aca3c23a90a0f0d06d2fb940e772cf27e1d1c3d2 SHA512 1d0ee215e4e3c4d0a36e7ce830742a3d4e0b43b9f84abdee61c02907be24e8d12dda0f1d816950d00c32ed39fa1a732080466f273e835559cfd8850eee47a6da
 DIST github.com-ipfs-go-log-48d644b006ba26f1793bffc46396e981801078e3.tar.gz 10106 BLAKE2B d501a5901493238ac3040383c15d9e823ff738355e020e14dd586fbb7c0d9230073881df1197b453146bd3b88aff6b754f40682dc7f89b4480cda48da16b466f SHA512 4ba1798ba341a5fbe06f98eec71886eb26cbbb8c05c788f91e77285737b77dff671f089c9346c7eb72cdc61351773cc8bcd7af1520915c104d8a94099b9d51a5
 DIST github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz 12680 BLAKE2B 852a4445fa50334de624395ea375945e273b7bfdc2a2dccf677e75a18bde34408ddfc9c0f4329edadec31cbe148cb139cd8659b4e7ba5dde829c58e39228de9f SHA512 729b41f0302aeb23b077a7ad913cb70f06982c243a37ccc264d5475d3db693c6e019c5cf9eb6307d809c2c99a4d68d711d4e11fe062e907750247d3f3e1d519d
 DIST github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz 5584 BLAKE2B 60e968bab9171dc1f09dfa3bfbe98324b4a536fc7664465154173a97f3a4a28a1adb1b8f659c5494b15c03ab8c788e8f9459fca2d6f0b37b7815da20d74e2072 SHA512 055351c704c9227b8d6cbb95177c2dbd554d582cc0ba4dfb5f8f0f550f80cfbd264c82b2a84010b8b1e9f02d9c759b4317f277f0f1b873a5eeb181cd0b672284
@@ -61,7 +69,9 @@ DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
+DIST github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz 599812 BLAKE2B 6763e5204c210f9c4762f659a863ca2333e49b3f35d516fbdcd9a68124bc2f69f464e20caecd6a84b67f4962c4325f41c52464613a687d3ed12d1c97934e790c SHA512 5533ff2a56b573b644f16c4e287d50c850203e79a82588df252df78dd3d0e8ba0bb691b7211c6e24f4ad3bf954e7941851e840fc279ab3f189f4d7096e4b8707
 DIST github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz 599747 BLAKE2B a9d36fcc97232af6cae2558ef77caec625f790f75065ebbba3a94d61b9f06b68c3f5b7ed58f8fbf79b158905e849ce958b3b071a09e92a9d8bd46554fdf019d7 SHA512 99a1c84bad03df827288cd94665ccfd1c290945ec63787cd56f49ee27ecea8174fe5597d4c48367aec11f3ac18d1087a2cbfb7ed9a76906aabb31bd0199f5ddf
+DIST github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz 450402 BLAKE2B 422d64fd22f92c65f3ed41472e5a98b6197d32aa0b4fb19c7a487481e33738b65b807fa3af05e577641485a9702ce298e9741c57cdc9abba133a10d5a9d58de4 SHA512 628b11b308d8b76724f65e7d04570cd693a01368ea22ab556313ecd3af28e778c0bbf042a04f180bfa9c4b5188b437ae1bb5c0757fbd4d9602cae63f2fd37d36
 DIST github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz 450287 BLAKE2B d311171547b907179e9edb85f1e688752d628fb00001abdb0106bec0ae9f66bbb569c627fcce656dc57538435a6cf18f0d2f426c4e98d12296240f4dfe96352b SHA512 a9559fe0b585499a3f142cc24fc850ae2bc05c3232861f7749dc7b01a82903d17cb8ca889d58e0a76e245d8e8809c3a45160c1f79101b407c9141d8a893574eb
 DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 BLAKE2B c495730d6f4a4f477513e06c242f4cf9b234f4300a6ea0407a9fd36e6307445794512d7f6002dbe0153113b69af18ea7e316232d0054b714c2552c31b9ce08b8 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1
 DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 BLAKE2B 6229eb3d5a0b66221189588f13be52b6ed2f1a76a065b6c003b4968ff684736138af88ce3bb8b958fcb9ee0272e5c02be939fddff21ca32876880e31cd8b78b4 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe
@@ -69,17 +79,22 @@ DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.ta
 DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
+DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 BLAKE2B b68ad69058837306d4988760ab7a052d988a9ea8c297001698aadff3eb0c404b3f0953faca4b2f12a174aae9e5b6f77dbb793b44b356cb9a420bfdabd72d76b0 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9
 DIST github.com-onsi-ginkgo-f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz 124167 BLAKE2B 71a35ddf1f3c885e15009705c9ace2ecf9847cf95d5ca4dd1661359ae5ad1b1228db280ceaa174a40b9339633cf3101707b70ff816400a3346a368ab6318e339 SHA512 9d54ec28953d55fb99a293dde31d1c31f68ae5bde987c45d79ad7ff8f5991d5fe26093806b7ef33bd11d76c417dc95ee1b6ac67672ccbaf4feb8f960b0d95e6d
+DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
+DIST github.com-opentracing-opentracing-go-db37fa5964ade72399b2ac8201123b8623256d75.tar.gz 28595 BLAKE2B b8fa7752a9be6dd52153f353e214c1050699de49c28519ad41b830a1a7cf5d466bd7916ad0e76c7b81297078cb39cb527e36d81f8481f52a01e33e6438211961 SHA512 debe7f1bc668112ad1470aa40c83e8b9985323842fee120ef75d36a45d9421868998130c87a63778d37d9b0b5e4cd0028450e50894cadc295a4d2cbf86e00d63
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
 DIST github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz 382793 BLAKE2B 39b8355eb1b887328021c6b15c85e3a304e341b52f732b429562a7f0102eff00651091f1978efea0017512538669209e037694093e7482c3d2b2a6a4fbf59b89 SHA512 c411ebaf3c5e6e072b4c3fefac623e5cb7913ee8a58813827c090d1ea388a7b2023d98c56267e8755b2f97359a3c67d241b2e04630d3846cd514162fbcf351bc
+DIST github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz 383022 BLAKE2B 04dffe36eeab8fc1407ff6345bf994f4d507aa462f70c55c27ae2f0a4044a5b2ee09ff36997cb6bee5bbbc5c8574d2cb7fc1b97b8d02fc9883ab28ab17356eb7 SHA512 9034dd3b0d0f088219a3e4b0a1c73b0fb7ede3d3d5f6dd2d61fd51d5705aa9d64ea27f1d40dc6b40bc5d4514b25da73e2baf45f83232658009fca1323066e4a9
 DIST github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz 198156 BLAKE2B 58eb1a2e617260d1b61582a12d6ae01f7eeb9caefe4c8d6c4276a95d277e1d25242fe6975394c83d1e6bf39375f77dcccf37a77262f56dfc344d15f29cfe4b7d SHA512 0cab2d2d14205b184dba501fd171897117f0dbc2cb42ab121e789c20d46c3e2e6c71fcea4162646432726379322d332a841866101cf32ae51e698fdd92b54c1f
 DIST github.com-projectcalico-typha-0bba94171368573d2a936e02454b1762ff7fba7f.tar.gz 230593 BLAKE2B 86b6ccc0d79724f8a34d5c7f7fdccc918e8ff1eeba74e802b54448dcfdeca2f3eb224013163942cc1d182bae1214f61b2ef04a42909217a3ee6a0a7cc3db25ed SHA512 7a8b5ecdc561d5866433f1d138c49cd392ad6c9f1a1bac01e26f09d7d495d8c7d4e3bae7fe2450fe08dc6abd2018af44bd7aa53d9ea6872ad15406ebcba37a99
+DIST github.com-projectcalico-typha-4308ae102ebdfd52d38ac7a267b5494be1079d05.tar.gz 230683 BLAKE2B 0b8f953db7fde078af1a58600aff7f75585ba8c4ad46aa517fedc3c1c15e160debeb25623e6b30ebf54e339f2710b854b8f387d3420c800b57733d2c11a48cf4 SHA512 36f343d720cf2675286f922c0b607b28e6951551e8397afe9c577ea672f09a0daea3dbd50238f536aea45a93ce97d8c2ddf6716a809dec1c354231b7ac0a9f71
 DIST github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz 227211 BLAKE2B 41857009f54f2f1dd4b2532cb06e14356990caffca4995020cf311278ad3990719b34add9024a39be513cc1f6491d3a57c2850f5d8990698e7b66eaac5c228d3 SHA512 100d53dc3164008d6f5e701193ea1860a266e2321da585bff2a083a7853224ce866ff5cd1a64be0fd6530101bf0cc6c98fa366df331336023c4fc6f140649e6f
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
@@ -87,19 +102,24 @@ DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2
 DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
 DIST github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz 62690 BLAKE2B 981efc277b38a6249cb232c2ce6f759ea7313902aa9e8edfa2e76bb793bbe0908d8b175a13248d042a8d2c611e57b278b5fe89d606e8410cd996a9f640bf94a1 SHA512 14e0e3a26c3a01e6921892559d34a6de05f8e1eb1fcb588b3f01d891679bce1a625806bf04aca16c89ca05efc907cc0ce3d06521dec30903886138b3c4b4dcd6
 DIST github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz 61732 BLAKE2B e0e16b1f12d62cb2c4618e37022aff054215b5910389505788bd671d6f29e2e8dac39ead98d590a75b4b07840d7667b293ad43096bc1e285e2b55137d3bcc796 SHA512 8dd198db3ee1f9708684ce25b3afa6e3202c9144537302d21dd34474d56163ceb429bd9372619d025d06a31f712feb2374b14d4053ba83355ff3b193e232c9b1
+DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
 DIST github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz 43889 BLAKE2B 046b59464a287395f73c756a3addcf319a437f4d5594e56d91ebe4fbc86ff5e6db92c87d7bfcd49b87606d1b2a4b3378a49f39a4989be55021da1e4e1834c7bd SHA512 c31a595327ee82e4f5fdd9f58f395261cd9a290e2bfd9115593b20508966ad529a31322b228736c7fa6eb0cc74d81c6f298bfd17450e534ffe1a8bd74633b325
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
 DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
+DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
 DIST github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz 26698 BLAKE2B 10f98819cf6e8e64e22ead564d8460414818cdfda5159a3e751a6457e531d8b8c34eee8fad5c35db187d52400a93ec7240bbea8821ac39360708b61940c33fcf SHA512 7152a9e355e21de7980a28e915b712103ae1eaaa4142a5c37db00d8d30415cb2ecacf53bbe178cce49a1b9c4ad57336e8438a40f0bb92dd20a2bcabb1980013b
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 BLAKE2B cb880cb4ffd844c5dc86cfa2b1aee79b6ca7c7f527d3331b1bd8a85860cef203c6f4d4a85cbd6c55b3c160e2e121cf69c84de97fb77e3db0028662c15b7cc335 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2
 DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
 DIST github.com-vishvananda-netlink-3ff4c2196115d804aa1c747781ad2b2a5c73e140.tar.gz 116777 BLAKE2B 90826cbd22858f71f6ef6acd373a0668abc2eba17411d2f63cc4a1234017642d3b5e507f4ff92068f1cb584a4fbe2e83231c8a9d4a6336c29883543ad969a33b SHA512 51aab248fd440b8d2770068de70d55e646f2d04256e47b4429d3ed564718e671bf22cf2e0e7fa811ffa9581533f2f5ee78a82b1cdfdeaaa4a9550d829c0220cc
+DIST github.com-vishvananda-netlink-6e453822d85ef5721799774b654d4d02fed62afb.tar.gz 102805 BLAKE2B 502bbbf16137192291fbe8dffa48c3ab1f4564e7e40422df011b02344ecbc6b3f339e66604259b02180ca2c23ef8e57a5daefa8a8b112e0667ed4574ae391bc9 SHA512 09c3f61bca1e9490a158ce4f146d71d1d4017f4e8ed612217b5c8ead2e63f5c1e8edae7f041e456a86cd4096e59a8801bb263e090cb40aba525012df7278407d
 DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 BLAKE2B e0016e5a663157383ca37a99c32a1da395a9e6e53536acc6f03f25d9d347f1c4d8d1d00c8cfb02ba4f8ce69a5f7c06d9440fc177bd88e599678d67c18415cb82 SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184
 DIST github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz 7753 BLAKE2B c251f716c79fd6c94204c1d0a7e99d58b964fa9e9664a80ce4d8045a433e8d7af91fc99ceb0d7d00bed26bb65ff22dc9f0527f4001d9bf71ed8996d5caf2ad4f SHA512 7298f8ff33c14faca3cd57f68de676049eee8aad6891f5ac03427b63f3554c666bf27896801a8528d9483b469df14040116fa52d263d851c7a9766577728b0fe
+DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
 EBUILD felix-2.5.1.ebuild 3998 BLAKE2B 13f283532d310dc707daaea73c428a66232c2450a4374d9740fcb8161a310333e6eaa823c5cde65477516725ee357b46d96f2b3fa055b442e74414f175ee70d7 SHA512 3d8f122b1c6214dc60cc47659d44d17aae7da4d14db083eba8d57a08c8c506a8f7086e4a350de2e518df91a96c4f42b8ff75cfb5339c755a950d93c63b4b4cb3
 EBUILD felix-3.0.1.ebuild 7143 BLAKE2B d0a5017d975a6d163156e6af79a6b868ee539797802674846c5ceeb4226075145a87c31fe787aadc916eaa4c0624f30f8a412ac484f5b927e5e8c6af785205c7 SHA512 0dde673a354a7db6fa7f3e386883f52c9c05276bf6f9018a0621906cbf5ca533aea19874284a4f27378ea75f207dbba83761d4d202522d1619d4b2c2fa96bb1b
-MISC metadata.xml 329 BLAKE2B 32e20e7f1ad62ddf584c25caf5f7e057958866044fe19ba0d8228fd0b9a147ec2dbe12f0442eb4f4460db3f717746e547cfac7fa9076e200c85911f902c6c453 SHA512 8a411baf49586b4fd8614bd6a6ddc3adea3dae29c288943f0b85383ee9ec7c994d2e7011f3a2a68bc5cfb8b8bea1a2a749a28fde99fd7a920fc5fb84e79e08a4
+EBUILD felix-3.0.2.ebuild 7384 BLAKE2B a7220a19e1b9840f02c1fdae37cf6216aa8254a0ce9e2a99118ac414f7173de62defdbf1c4251eaac7208129efe48c5825b0c85744fffe4b247e9334dcd01f80 SHA512 2c60cdb8e85b49d5e28a2eb697e326828ca1abc8eb426ba73b3b4880133aa3852c0d3b1fce2759c29cff69e774d16b71acdbfab8ec100c83ea2b02c3f105e4f6
+MISC metadata.xml 406 BLAKE2B d2f0449cbf46550d7f8794221b6c6f9ed445ebf8b166bdc8976bf605ef61d12f8862b7597f63c6ec171af9d98c3a14bccea7d96fd24cedf58d895b8aed8b1fef SHA512 5aef67b8438efa537ac2a74f6ca701c8211f474ba2aa7a7ec8d26b523f93b18b3e31414143aa488c4480295ef51dac65988b2c923f3593f2028eb69ac93db8cd
diff --git a/net-misc/felix/felix-3.0.2.ebuild b/net-misc/felix/felix-3.0.2.ebuild
new file mode 100644
index 000000000000..68ff0f21689a
--- /dev/null
+++ b/net-misc/felix/felix-3.0.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e"
+"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+"github.com/go-ini/ini 32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9"
+"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/ipfs/go-log 0e2a17b81af445147a78d94a45d4398c4008c219"
+"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c"
+"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1"
+"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
+"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a"
+"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026"
+"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
+"github.com/onsi/ginkgo f40a49d81e5c12e90400620b6242fb29a8e7c9d9"
+"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
+"github.com/opentracing/opentracing-go db37fa5964ade72399b2ac8201123b8623256d75"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+"github.com/projectcalico/libcalico-go a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501"
+"github.com/projectcalico/typha 4308ae102ebdfd52d38ac7a267b5494be1079d05"
+"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
+"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
+"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/vishvananda/netlink 6e453822d85ef5721799774b654d4d02fed62afb"
+"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
+"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
+"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
+"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce github.com/golang/sys"
+"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
+"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
+"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api 389dfa299845bcf399c16af89987e8775718ea48 github.com/kubernetes/api"
+"k8s.io/apimachinery 4972c8e335e32ab65ba45bde0a99c6544c8a8e4c github.com/kubernetes/apimachinery"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+FELIX_COMMIT="ccbab346adb7a7759e73fb11e57accc602f368a2"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
+EGO_PN="github.com/projectcalico/felix"
+HOMEPAGE="https://github.com/projectcalico/felix"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+bird"
+
+RESTRICT="test"
+
+DEPEND=">=dev-libs/protobuf-3
+	dev-go/gogo-protobuf"
+
+RDEPEND="net-firewall/ipset
+	bird? ( net-misc/bird )"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	protoc --gogofaster_out=. proto/*.proto || die
+	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
+		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
+		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
+		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "bin/calico-${PN}"
+	dodoc README.md
+	insinto /etc/logrotate.d
+	doins debian/calico-felix.logrotate
+	insinto /etc/felix
+	doins etc/felix.cfg.example
+	newinitd "${FILESDIR}"/felix.initd felix
+	newconfd "${FILESDIR}"/felix.confd felix
+}
diff --git a/net-misc/felix/metadata.xml b/net-misc/felix/metadata.xml
index 91f15b4152a0..41d7189e1220 100644
--- a/net-misc/felix/metadata.xml
+++ b/net-misc/felix/metadata.xml
@@ -5,6 +5,9 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<use>
+	<flag name="bird">Use BIRD, e.g. for route reflection</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">projectcalico/felix</remote-id>
 	</upstream>
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 593339f9ad9b..32c47825a39a 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -3,6 +3,8 @@ AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
 DIST minissdpd-1.5.20161216.tar.gz 35078 BLAKE2B c8e681e812869ddc15cece499356e7852a4b2e86b661bd80d62a840c8a9a01f321d4616013fec49d4abd834c75378014b52e605ad3fa116c0dc863e5a389a9fc SHA512 4fe1dbc14a39a18bcc834c73cc0150cda656b2be7ffcc0a72dc2854dbd698f3528bfdcd80af741124546f916d914921ffc428bb4f19b34e7493f0cbf9ff54928
 DIST minissdpd-1.5.20180203.tar.gz 35848 BLAKE2B 2a784bf6c8cf2e656d86f60802d11823d15ad0d7ca4b941c4cf71ffb0433be81b1f12fc11eaa84585d0cc77f1710b24336962e4242a957c49e7ca957e38c0a55 SHA512 2ad8964cd9893b29318659d39adf006cb3df2b97260b6b93a9b71b8f318941fd569cd6de02d34347cab75d4f556e89aa1b3f727561d1b6805c22ed9a3183f6ce
+DIST minissdpd-1.5.20180223.tar.gz 36179 BLAKE2B 0668862848e8d3f87b151e84e3fbea39a593556b4c9a3800ab7b534228a5af2c7cb20ad183e99f95d9616d306cc5aabdc379521bfb19a5e25a63fe0d81d816d7 SHA512 2564aa91ad54da392ca305a59b3eeab9b4c0a8504c674fc0c34d387560b239ea03c988e667fa3100b2b01e6916dc8e00ddc161fd6f652912a37b4b879b54dfbd
 EBUILD minissdpd-1.5.20161216.ebuild 694 BLAKE2B a1e1cd336d2993c5384f923f7d74e021d0f5e8db1b437fb7610fdc5858254c2d0f0f8707870bc8f7971ea99e6da1c0d84367c4ee1cffd339fb11f176b9942275 SHA512 7d5738d4fec110c526ea32aa830b2dda2f0c4a8dfecbb77e5e5fd1201be01063ff32cec1206e4b635f35592d51b800e006fe096abd4e8d65aad56d3526f5933d
 EBUILD minissdpd-1.5.20180203.ebuild 679 BLAKE2B ac75807e2d3a75b631af3ce3d90674e37cbe61a94fffc5e72bf5bf50f9f420d7d95b895c90035d081e83863082416f37f0d129199c9a941dcf644e99ffe9401d SHA512 c4d8bf10a23fdee9575f802b362ec59c8b20b805a37f2bf8a278555e11861632a92b89a688ab92d0ffbd250441b8ae5d5b3be937ff20b326f7a6266b65af5251
+EBUILD minissdpd-1.5.20180223.ebuild 679 BLAKE2B ac75807e2d3a75b631af3ce3d90674e37cbe61a94fffc5e72bf5bf50f9f420d7d95b895c90035d081e83863082416f37f0d129199c9a941dcf644e99ffe9401d SHA512 c4d8bf10a23fdee9575f802b362ec59c8b20b805a37f2bf8a278555e11861632a92b89a688ab92d0ffbd250441b8ae5d5b3be937ff20b326f7a6266b65af5251
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20180223.ebuild b/net-misc/minissdpd/minissdpd-1.5.20180223.ebuild
new file mode 100644
index 000000000000..dea4e3034612
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20180223.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnfnetlink"
+
+RDEPEND="$DEPEND
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake PREFIX="${ED}" install
+	# note: we overwrite upstream's init.d
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
new file mode 100644
index 000000000000..cee38e4e9cab
--- /dev/null
+++ b/net-misc/ntpsec/Manifest
@@ -0,0 +1,6 @@
+AUX ntpd.confd 222 BLAKE2B 4884ac23276fffd1c5043ed70b655b2429fcff08a24e6b9912a378fe0493e29ef3e59b11e1ec5cda2302cfba843f0fa5cf22b4499576b5e360f547122a2a194c SHA512 6513e4dce6700f437b98c0592277c336da07e72a251a8f1183d066f7dd5e0ca36c3ddf83f3102965217f70f1f26769650f5d7d3a034590e4dc9cf9f84d98b6cf
+AUX ntpd.rc-r1 495 BLAKE2B b6ea30209128135f69314e7b8009f349bfc7c0811d22cba7d1d14bcdb331799cefe330d230551cef51ccbfddf6a9fb9cae385f81853ad072a263d090b82bcd59 SHA512 0519214247a978c79f1c73262f7963eaf688466b0471d5414886f6a4b40379520491a8d818a1d8eb728724c4aae9822452d71e7bd1223d4c0af5130274d7f87a
+AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
+DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43
+EBUILD ntpsec-1.0.0-r1.ebuild 3097 BLAKE2B 35da6f84d8f85a10dd27f95015bc07163b09d84081b6c41aaf77dde48e8c4d3db6b35de30c61fadc83be7f5189d3194fd64dce0059935952613bcae0af2eebd8 SHA512 8d5278b918298c957b0567afb291dc523893de5bb06568ff7fef6c34ef628cb47e7c93251bd05a97daa957aa38a35f6ec885ce396a7f06498a2b4427da807cb6
+MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/files/ntpd.confd b/net-misc/ntpsec/files/ntpd.confd
new file mode 100644
index 000000000000..92c553a62615
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpd.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/ntpd
+
+# Options to pass to the ntpd process
+# Most people should leave this line alone ...
+# however, if you know what you're doing, feel free to tweak
+#NTPD_OPTS="-g -n -u ntp:ntp"
+NTPD_OPTS="-g -u ntp:ntp"
diff --git a/net-misc/ntpsec/files/ntpd.rc-r1 b/net-misc/ntpsec/files/ntpd.rc-r1
new file mode 100644
index 000000000000..dbe76c85e536
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpd.rc-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="ntpd - the network time protocol daemon"
+pidfile="/var/run/ntpd.pid"
+command="/usr/sbin/ntpd"
+command_args="-p ${pidfile} ${NTPD_OPTS}"
+start_stop_daemon_args="--pidfile ${pidfile}"
+
+depend() {
+	use net dns logger
+	after ntp-client
+}
+
+start_pre() {
+	if [ ! -f /etc/ntp.conf ] ; then
+	eerror "Please create /etc/ntp.conf"
+		return 1
+	fi
+	return 0
+}
diff --git a/net-misc/ntpsec/files/ntpd.service b/net-misc/ntpsec/files/ntpd.service
new file mode 100644
index 000000000000..a551bb7b1307
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Network Time Service
+After=network.target nss-lookup.target
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=forking
+PrivateTmp=true
+EnvironmentFile=-/etc/conf.d/ntp
+ExecStart=/usr/sbin/ntpd ${NTPD_OPTS}
+Restart=always
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
new file mode 100644
index 000000000000..018f5f40f71b
--- /dev/null
+++ b/net-misc/ntpsec/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nerdboy@gentoo.org</email>
+		<name>Stephen L Arnold</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription lang="en">
+NTPsec project - a secure, hardened, and improved implementation of Network Time Protocol derived from NTP Classic, Dave Mills’s original.
+	</longdescription>
+	<use>
+		<flag name="early">Drop root privileges early</flag>
+		<flag name="gdb">Enable debugging with gdb</flag>
+		<flag name="heat">Install contrib heat generating scripts</flag>
+		<flag name="nist">Enable lockclock</flag>
+		<flag name="ntpviz">Make visualizations of offsets, jiffies, etc.</flag>
+		<flag name="rclock_oncore">Oncore driver</flag>
+		<flag name="rclock_trimble">Trimble driver</flag>
+		<flag name="rclock_truetime">Trutime driver (deprecated)</flag>
+		<flag name="rclock_gpsd">Enable gpsd daemon support</flag>
+		<flag name="rclock_jjy">JJY driver</flag>
+		<flag name="rclock_generic">Enable support for generic time radios and GPSDOs</flag>
+		<flag name="rclock_spectracom">Spectracom driver</flag>
+		<flag name="rclock_shm">Obtain refclock info from shared memory-segment</flag>
+		<flag name="rclock_pps">PPS cesium clock driver</flag>
+		<flag name="rclock_hpgps">Hewlett Packard GPS driver</flag>
+		<flag name="rclock_zyfer">Zyfer driver</flag>
+		<flag name="rclock_arbiter">Arbiter 1088A/B GPS driver</flag>
+		<flag name="rclock_nmea">NMEA GPS driver</flag>
+		<flag name="rclock_neoclock">NeoClock4X DCF77/TDF driver</flag>
+		<flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag>
+		<flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag>
+		<flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag>
+		<flag name="tests">Enable tests</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild b/net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..91a7ea1e911c
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.0.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-any-r1 waf-utils systemd user
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+	BDEPEND=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	BDEPEND=""
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	${BDEPEND}
+	sys-libs/libcap
+	dev-python/psutil
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+	!net-misc/ntp
+	!net-misc/openntpd
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+
+	waf-utils_src_configure --nopyc --nopyo --refclock="${CLOCKSTRING}" \
+		$(use	doc			&& echo "--enable-doc") \
+		$(use	early		&& echo "--enable-early-droproot") \
+		$(use	gdb			&& echo "--enable-debug-gdb") \
+		$(use	nist		&& echo "--enable-lockclock") \
+		$(use	samba		&& echo "--enable-mssntp") \
+		$(use	seccomp		&& echo "--enable-seccomp") \
+		$(use	smear		&& echo "--enable-leap-smear") \
+		$(use	tests		&& echo "--alltests") \
+		$(use_enable debug debug)
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}/contrib/ntpheat"{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}/ntpd.rc-r1" "ntp"
+	newconfd "${FILESDIR}/ntpd.confd" "ntp"
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}/ntpd.service" ntpd.service
+
+	# Install a log rotate script
+	mkdir -pv "${ED}/etc/"logrotate.d
+	cp -v "${S}/etc/logrotate-config.ntpd" "${ED}/etc/logrotate.d/ntpd"
+
+	# Install the configuration files
+	cp -Rv "${S}/etc/ntp.d/" "${ED}/etc/"
+	mv -v "${ED}/etc/ntp.d/default.conf" "${ED}/etc/ntp.conf"
+	sed "s|includefile |includefile ntp.d/|" -i "${ED}/etc/ntp.conf"
+}
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 4e79ec72466b..6b552b861f7a 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,11 +1,3 @@
-AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 BLAKE2B 8b995710cdf96c9797d9aa14286876ce83679445c8fc2c6bb9d0a103002ef6c8a069f7b5b7e88cd1d733358870d07bd745f5b718c19163bfb896d999a5da1030 SHA512 14e5dc5ea280704d867af971bced585adfd805f49ed70162c4b1691b81926b144720e5df1fc1257e0b3a9e5841fed0deea3a7096d92a210476c1bfd89112c52f
-AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 BLAKE2B a9b92cd62425bd23e8fdfee545b37a13028b461343430ca4dc94d04059d627c8de0216c741cec219dd9f5322864601448d2dfee7326268afe133ff3836f70fad SHA512 d7ae8eb5e43371b913ebb182436284c3a7526b1485bd2e4a969e0e02299315d6a4f036f54f477ebb4299138ba23d830aea46ef2ff6e90ada2a74ef6e95948924
-AUX nx-3.5.0.17-cflags_ar_ranlib.patch 3518 BLAKE2B 9d9e5e52020cf62ebf3b6937d9c6e8f4fe0e8320b5cf52d4bd416192bbb3992afd7c69d20110ef75bfd6e713a205d6d029f485b87c181628dbfeef89aa4a425e SHA512 df036cafc3526526e6768976f6ddca97584dbea2f7008c9c6a977922389e0e12901fd399794a10e2050380e5ad4066f364c2ebd5bd6e94e65143ccb100000400
-AUX nx-3.5.0.30-fix_X11_underlinking.patch 538 BLAKE2B 1578bcbbddb65b058029e61144a536d755a5aceb440d27643b0ab3011b27f627d32cae2ca5b6046d03ed4e659c68ff782ef69c0017b47c2fb60abab29c36fbf5 SHA512 dcaa0da2e6e4dea2a35586f74c4f67a331072de280e98e9fdae3cdc0c8b477b4256b57c6925fe6949084acd655b1edfc55b66eea08b2ae5090a84dce65db3d18
-DIST nx-libs-3.5.0.30-full.tar.gz 6639925 BLAKE2B 81b8bb4f39b6d7881c5a488e43ffcd2450917f48887f20eb9f1d98772a9a3aaaee9b901f9568b70bd9a2ae8f94768fb91b88b3aed8687871933f7b5506f1eb79 SHA512 223c73de1b8988d17a555a7dd56c14ddc27855b7c1d9a9b28c053161a707520c1fcef697c3d9148222dae23e1465e72821455271477ac835d5cc63498b45e005
-DIST nx-libs-3.5.0.32-full.tar.gz 6801696 BLAKE2B 05101b49e2e18d38527aaade47b067f0f7bb744ee2c9b0fde0458117630bd1b75990e0258cec092149026635e142f2a031fdc1656a5770111c445a7e7989c6b2 SHA512 8b4a042993d45e1aee3e13e8b86f68cd5b2a8b52e9299de6129abd8e3bb89d73cf2b44b03d3c7fabbd8329abc06dc912ac95bbf936b6478b05fc202cc29a090f
 DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
-EBUILD nx-3.5.0.30.ebuild 2743 BLAKE2B 2df3f4f431d3ec7f4faa7cb80b2e9c846a023f2710de5c1da506fdd0cade0f1c56334ab5c4842671d7c0e12ff8eaa0d0359c75305e45bf5f3648000adae89679 SHA512 0ab1df3ca4443ceca485e63b1eaabb0773a861503d8c6bcf669f3a0d36e6c3bd9113a77c1cc06bd56ec78be05b58d5bfe7b972ac08e519d2c61c9ebc9e02679d
-EBUILD nx-3.5.0.32.ebuild 2655 BLAKE2B dd8c8dbd09d7dd928246de8945ed374f8363128fffa11ec93f8a0f4062ca25530f2b51b9e7e646d98115b576754598d7bbeefa3b045205cbf94e5bf4df678c72 SHA512 bf5638e1f600a64549cbd5651ad052593043b91d957ba064a03ffa63088780c10991d2fe0526241571aca6be8c307c5e8a6d5e338bd9b811e9dc97bf8ede4a0d
-EBUILD nx-3.5.0.33.ebuild 2339 BLAKE2B 65bb20d909161223c3437b6ff97c351d029bf1e32963aa16c79a38215527002cbbafeb1fa9f853b8a2c1c94bc684aacb0d1b9959aa863272eedc615a49eeaf5f SHA512 51962003c2ce8d42185327a705265207a40c84c9b7ca47cc8c5f5bc8cd5a0e6d5f4370f0272029f2b92a3bed5294dbaf9dc82f7392515c898396d81bda8c4c7a
+EBUILD nx-3.5.0.33.ebuild 2338 BLAKE2B 164bedd551b5be5ed917122cfff26069d411c5c5b0829ef9cf6712dbfca350209127d93fa36c18bbc6bdf2445b19d2ecc3bea91b0f9e867652e574655eede677 SHA512 e1f88b0e03f4066df1ef97cabcadd759cf80ed27619a3bbe228bed67a82ce287898cd47ac5f31c4de2e250441cf6eb5e69f6750609c978c56dd476c767828199
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
deleted file mode 100644
index 2ccaf978dd09..000000000000
--- a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nxcomp/Makefile.in.agriffis	2005-11-12 12:48:42.000000000 -0500
-+++ nxcomp/Makefile.in	2005-12-15 12:24:46.000000000 -0500
-@@ -32,7 +32,7 @@
- 
- CXX         = @CXX@
- CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
--              -Wall -Wpointer-arith
-+              -Wall -Wpointer-arith -fPIC
- CXXINCLUDES =
- CXXDEFINES  =
- 
-@@ -42,7 +42,7 @@
- 
- CC          = @CC@
- CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
--              -Wall -Wpointer-arith
-+              -Wall -Wpointer-arith -fPIC
- CCINCLUDES  =
- CCDEFINES   =
- 
diff --git a/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
deleted file mode 100644
index bce692d10a7a..000000000000
--- a/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- Main.c.old	2007-07-18 17:39:13.000000000 +0200
-+++ Main.c	2008-03-12 04:40:30.000000000 +0100
-@@ -36,28 +36,48 @@
-   int result = -1;
- 
-   char *options = NULL;
--
-+  
-+  char *nx_commfd_str = NULL;
-+  
-   options = getenv("NX_DISPLAY");
--
--  if (NXTransParseCommandLine(argc, argv) < 0)
-+  
-+  if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
-   {
--    NXTransCleanup();
--  }
-+  	int nx_commfd = atoi(nx_commfd_str);
- 
--  if (NXTransParseEnvironment(options, 0) < 0)
--  {
--    NXTransCleanup();
-+	if (result)
-+		result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
-+ 
-+	// go into endless loop
-+
-+	if (result)
-+	{
-+		while (NXTransRunning(NX_FD_ANY))
-+			result = NXTransContinue(NULL);
-+	}
-   }
-+  else
-+  {
-+    if (NXTransParseCommandLine(argc, argv) < 0)
-+    {
-+      NXTransCleanup();
-+    }
-+
-+    if (NXTransParseEnvironment(options, 0) < 0)
-+    {
-+      NXTransCleanup();
-+    }
-+
-+   /*
-+    * This should not return...
-+    */
-+
-+    #ifdef TEST
-+    fprintf(stderr, "Main: Yielding control to NX entry point.\n");
-+    #endif
- 
--  /*
--   * This should not return...
--   */
--
--  #ifdef TEST
--  fprintf(stderr, "Main: Yielding control to NX entry point.\n");
--  #endif
--
--  result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
-+    result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
-+  }
- 
-   /*
-    * ...So these should not be called.
diff --git a/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch b/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
deleted file mode 100644
index 668a6bf4c310..000000000000
--- a/net-misc/nx/files/nx-3.5.0.17-cflags_ar_ranlib.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur nx-libs-3.5.0.17.orig/nxcomp/Makefile.in nx-libs-3.5.0.17/nxcomp/Makefile.in
---- nx-libs-3.5.0.17.orig/nxcomp/Makefile.in	2013-01-09 15:03:33.152952758 +0100
-+++ nx-libs-3.5.0.17/nxcomp/Makefile.in	2013-01-09 15:05:39.771898159 +0100
-@@ -243,8 +243,8 @@
- 
- $(LIBARCHIVE):	 $(CXXOBJ) $(COBJ)
- 		 rm -f  $(LIBARCHIVE)
--		 ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
--		 ranlib $(LIBARCHIVE)
-+		 $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-+		 $(RANLIB) $(LIBARCHIVE)
- 
- $(LIBCYGSHARED): $(LIBARCHIVE)
- 		 $(CC) -shared -o $(LIBCYGSHARED) \
-diff -Naur nx-libs-3.5.0.17.orig/nxcomp/configure.in nx-libs-3.5.0.17/nxcomp/configure.in
---- nx-libs-3.5.0.17.orig/nxcomp/configure.in	2013-01-09 15:03:33.151952758 +0100
-+++ nx-libs-3.5.0.17/nxcomp/configure.in	2013-01-09 15:04:03.312940892 +0100
-@@ -7,8 +7,7 @@
- 
- dnl Set our default compilation flags.
- 
--CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
--CFLAGS="$CFLAGS -O3"
-+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
- 
- dnl Reset default linking directives.
- 
-diff -Naur nx-libs-3.5.0.17.orig/nxcompext/Makefile.in nx-libs-3.5.0.17/nxcompext/Makefile.in
---- nx-libs-3.5.0.17.orig/nxcompext/Makefile.in	2013-01-09 15:03:33.164952753 +0100
-+++ nx-libs-3.5.0.17/nxcompext/Makefile.in	2013-01-09 15:06:08.747879052 +0100
-@@ -125,8 +125,8 @@
- 
- $(LIBARCHIVE):	 $(CXXOBJ) $(COBJ)
- 		 rm -f  $(LIBARCHIVE)
--		 ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
--		 ranlib $(LIBARCHIVE)
-+		 $(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-+		 $(RANLIB) $(LIBARCHIVE)
- 
- $(LIBCYGSHARED): $(LIBARCHIVE)
- 		 $(CC) -shared -o $(LIBCYGSHARED) \
-diff -Naur nx-libs-3.5.0.17.orig/nxcompext/configure.in nx-libs-3.5.0.17/nxcompext/configure.in
---- nx-libs-3.5.0.17.orig/nxcompext/configure.in	2013-01-09 15:03:33.164952753 +0100
-+++ nx-libs-3.5.0.17/nxcompext/configure.in	2013-01-09 15:04:16.247935801 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(NXlib.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="$CXXFLAGS -O3"
--CFLAGS="$CFLAGS -O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
-diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in nx-libs-3.5.0.17/nxcompshad/Makefile.in
---- nx-libs-3.5.0.17.orig/nxcompshad/Makefile.in	2013-01-09 15:03:33.163952754 +0100
-+++ nx-libs-3.5.0.17/nxcompshad/Makefile.in	2013-01-09 15:06:16.933873660 +0100
-@@ -158,8 +158,8 @@
- 
- $(LIBARCHIVE):	$(CXXOBJ) $(COBJ)
- 		rm -f  $(LIBARCHIVE)
--		ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
--		ranlib $(LIBARCHIVE)
-+		$(AR) $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-+		$(RANLIB) $(LIBARCHIVE)
- 
- $(LIBDLL): $(LIBARCHIVE)
- 		$(CC) -o $@ \
-diff -Naur nx-libs-3.5.0.17.orig/nxcompshad/configure.in nx-libs-3.5.0.17/nxcompshad/configure.in
---- nx-libs-3.5.0.17.orig/nxcompshad/configure.in	2013-01-09 15:03:33.163952754 +0100
-+++ nx-libs-3.5.0.17/nxcompshad/configure.in	2013-01-09 15:04:20.073934295 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Shadow.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="$CXXFLAGS -O3"
--CPPFLAGS="$CPPFLAGS -O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
-diff -Naur nx-libs-3.5.0.17.orig/nxproxy/configure.in nx-libs-3.5.0.17/nxproxy/configure.in
---- nx-libs-3.5.0.17.orig/nxproxy/configure.in	2013-01-09 15:03:33.163952754 +0100
-+++ nx-libs-3.5.0.17/nxproxy/configure.in	2013-01-09 15:04:24.842932418 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Main.c)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="$CXXFLAGS -O3"
--CPPFLAGS="$CPPFLAGS -O3"
--
- dnl Prefer headers and libraries from nx-X11 if present.
- 
- if test -d "../nx-X11/exports/include" ; then
diff --git a/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch b/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch
deleted file mode 100644
index 87d73c5a8d37..000000000000
--- a/net-misc/nx/files/nx-3.5.0.30-fix_X11_underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nx-X11/lib/X11/Imakefile.orig	2015-04-24 15:24:36.171666957 +0200
-+++ nx-X11/lib/X11/Imakefile	2015-04-24 15:25:17.516179627 +0200
-@@ -107,7 +107,7 @@
- EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity
- #endif
- 
--REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS)
-+REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) $(NX_REQUIREDLIBS) -ldl
- 
- #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
- XBSDLIB = /**/
diff --git a/net-misc/nx/nx-3.5.0.30.ebuild b/net-misc/nx/nx-3.5.0.30.ebuild
deleted file mode 100644
index 36d736fb7a3b..000000000000
--- a/net-misc/nx/nx-3.5.0.30.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib readme.gentoo
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
-
-SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="elibc_glibc"
-
-RDEPEND="media-libs/freetype:2
-	>=media-libs/libpng-1.2.8:*
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*"
-
-DEPEND="${RDEPEND}
-		x11-libs/libfontenc
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/nx-libs-${PV}
-
-DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
-useflag on x11-libs/cairo."
-
-src_prepare() {
-	# For nxcl/qtnx
-	cd "${S}"/nxproxy
-	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
-	cd "${S}"
-	# -fPIC
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-	# Drop force -O3, set AR/RANLIB
-	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
-	# Fix libX11 underlinking, #546868
-	epatch "${FILESDIR}"/${P}-fix_X11_underlinking.patch
-
-	# run autoreconf in all neeed folders
-	for i in nxcomp nxcompext nxcompshad nxproxy; do
-		cd "${S}"/${i}
-		eautoreconf ${i}
-		cd "${S}"
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	cd "${S}/nx-X11"
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-}
-
-src_configure() {
-	cd "${S}"/nxproxy
-	econf
-}
-
-src_compile() {
-	cd "${S}/nx-X11"
-	FAST=1 emake World WORLDOPTS="" MAKE="make" \
-		AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-	cd "${S}"/nxproxy
-	emake
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
-			die " $x wrapper creation failed"
-	done
-
-	into ${NX_ROOT}
-	dobin "${S}"/nx-X11/programs/Xserver/nxagent
-	dobin "${S}"/nx-X11/programs/nxauth/nxauth
-	dobin "${S}"/nxproxy/nxproxy
-
-	for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
-	do
-		dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
-	done
-
-	dolib.so "${S}"/nxcomp/libXcomp.so*
-	dolib.so "${S}"/nxcompext/libXcompext.so*
-	dolib.so "${S}"/nxcompshad/libXcompshad.so*
-
-	insinto /etc/nxagent
-	newins etc/keystrokes.cfg keystroke.cfg
-	doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/nx/nx-3.5.0.32.ebuild b/net-misc/nx/nx-3.5.0.32.ebuild
deleted file mode 100644
index d992d5fb33da..000000000000
--- a/net-misc/nx/nx-3.5.0.32.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib readme.gentoo
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
-
-SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="elibc_glibc"
-
-RDEPEND="media-libs/freetype:2
-	>=media-libs/libpng-1.2.8:*
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*"
-
-DEPEND="${RDEPEND}
-		x11-libs/libfontenc
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/nx-libs-${PV}
-
-DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
-useflag on x11-libs/cairo."
-
-src_prepare() {
-	# For nxcl/qtnx
-	cd "${S}"/nxproxy
-	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
-	cd "${S}"
-	# -fPIC
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-	# Drop force -O3, set AR/RANLIB
-	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
-
-	# run autoreconf in all neeed folders
-	for i in nxcomp nxcompext nxcompshad nxproxy; do
-		cd "${S}"/${i}
-		eautoreconf ${i}
-		cd "${S}"
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	cd "${S}/nx-X11"
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-}
-
-src_configure() {
-	cd "${S}"/nxproxy
-	econf
-}
-
-src_compile() {
-	cd "${S}/nx-X11"
-	FAST=1 emake World WORLDOPTS="" MAKE="make" \
-		AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-	cd "${S}"/nxproxy
-	emake
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
-			die " $x wrapper creation failed"
-	done
-
-	into ${NX_ROOT}
-	dobin "${S}"/nx-X11/programs/Xserver/nxagent
-	dobin "${S}"/nx-X11/programs/nxauth/nxauth
-	dobin "${S}"/nxproxy/nxproxy
-
-	for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
-	do
-		dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
-	done
-
-	dolib.so "${S}"/nxcomp/libXcomp.so*
-	dolib.so "${S}"/nxcompext/libXcompext.so*
-	dolib.so "${S}"/nxcompshad/libXcompshad.so*
-
-	insinto /etc/nxagent
-	newins etc/keystrokes.cfg keystroke.cfg
-	doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/nx/nx-3.5.0.33.ebuild b/net-misc/nx/nx-3.5.0.33.ebuild
index 167512cc9773..ab94da473f76 100644
--- a/net-misc/nx/nx-3.5.0.33.ebuild
+++ b/net-misc/nx/nx-3.5.0.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="elibc_glibc"
 
 RDEPEND="media-libs/freetype:2
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 28bd10dd001d..84edbb3dbcce 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -2,7 +2,7 @@ AUX openntpd.conf.d-20080406-r6 255 BLAKE2B cdbfd0de5a238216efbf64c8ef9c5db89138
 AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f01bfd112bdeab3f7199775237c92726120ba7763f5584a21c4b3b18d7b27c4c28311202ee9c18b9259b0e853ee24d SHA512 eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B 331214c5a77adf99974a665a157255857b295f49409721d8530fdd2eb6c00e458a2e6395105a527a4a8603e65efb33e16f752c70222e9f7697f8c871d51cffda SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d
-DIST openntpd-6.2p1.tar.gz 437376 BLAKE2B a574740179957ff4969affdefafb3ae5e79305bf740424122714424944f4cfc1ea9e6816974cfd95a0fd7b9a1806106d1e6fbb8af9aa9e6230de39f437ba49b0 SHA512 99ad2c8e42de159b1122fe30385eff2f6311202b8526828dacd52db6ec36ce14785131b0576ac5b08d3ed9cadffc142c9146e395da29409b3227c4a77187d31e
+DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 EBUILD openntpd-6.0_p1.ebuild 2981 BLAKE2B 6d7269a78250ee665065a5bdd05f07e00db3cf930cf5bcebf1148f9653c17a46639a5fff7fb42c9b904e30c1c09baeaebd573cb83c084318401528baf4f55ea6 SHA512 0789da0c8ff2f0a4dc721f9fb524565680c21ef5f1a3678977d304dfdf324f630171d0e959229157382ab921c8128004637bc46c9a7f25b18d688f2e0192ad79
-EBUILD openntpd-6.2_p1.ebuild 3024 BLAKE2B b1975bff4dbeea844c71310b68d086321eadc51d130dc164c9452dd182ffcd47298a68c4f64f723053e41070788db3f1eb8e267e549941fc6297c7f6e5603a22 SHA512 49b4ea7c20238d7a378cf836b8cf820417e805f498a6082544682e690c8d7e0e12cd44d7cd92fe874c89577a27b7cf76d1a78d5fd5ff6006ace78d243ad7354d
+EBUILD openntpd-6.2_p3.ebuild 3152 BLAKE2B 2c53020148cb213caaec81d52da7708f6f0019df5c56817061af7cd93664cfda9cf8c6f68e6f853d5314c969131127d76e6417b69dfb885f47a0dde6589db93e SHA512 85bae7b5a73f8f8005df3e2a70410772fcfc64b99e9997d27447a14fdc57e621b43c4684b77e858fcd808363bbdcef7dd30b459536537fa33c1bdf895267a187
 MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
diff --git a/net-misc/openntpd/openntpd-6.2_p1.ebuild b/net-misc/openntpd/openntpd-6.2_p3.ebuild
index ccf131fee0d1..8dc5264ee150 100644
--- a/net-misc/openntpd/openntpd-6.2_p1.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,6 +56,9 @@ src_prepare() {
 	# fix default config to use gentoo pool
 	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
 	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
+
+	# disable constraint config if libressl not enabled
+	use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
 }
 
 src_configure() {
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 85a462d3b7bb..cd2257cf7061 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -14,9 +14,9 @@ AUX systemd/ripd.service 347 BLAKE2B eaca725f889ad7689ba246ecbc20aa78314cc60a5a7
 AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a34034780807d6abc63cad390854140835ab477b7203b8c492baae297f7fbe3085791944d1b2db2a737930c1bf36a81465 SHA512 ccfd048152896ee7ebdc434554a080b8ba36444d4de1cd11b5d2408cddfeb2ea1312962460b9a761d1a2db31dd5e72cadddf1807f9783ac1c2a51fd52c85ad54
 AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a
 DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
-DIST quagga-1.2.1.tar.gz 2922514 BLAKE2B ab0a59c1162bb4ac8ba3a75c015a433e2022bc35cd2a4678dbc7c80510f8c687d944b5e2bac03e9d3362bdb20badb2c17228dfd4172eebc6c87b24b2be2276e4 SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
 DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b7cd78dca0cac528cd2869e65e6efbd40c303ce2b6eb29eed809e8b384baa36329b365ae6799a5b25fa21daa4c SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
-EBUILD quagga-1.2.1.ebuild 3679 BLAKE2B c71ad696b777ddec0bdfcee4fbb142fc7c55aa7b3d676d1caf56515915aa0fef6d8c825da864c23a685d02f977b0cb9b6eec5335c2a952facaad136ec7efef2e SHA512 c17c0b0d74088b0dd05ca2c3a7fddc471ff5b1fcbb888b94c0117d73f4e74842e21e832923a050cef3fb3666fbba4d20d1a13b0a75836a902fc4b1a1da60d516
+DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
 EBUILD quagga-1.2.2-r1.ebuild 3753 BLAKE2B 460befe5cbd2ad7cda462bfcf47ce10064d4b930c458b0076e00ad7b2ca2f03dcd8c9245ba65b4d75437498d841c1ccd3987cf61db61205fcfa2f20aab21a50b SHA512 2b64bc0363275d7ab6da6dd1e9fdddc819a2fe6bce5a2878157ef82a38c78ff388e11cf6c683de336dc121ee04ed5ffbc81c59f251c8ac78faca3fbe5de3b75c
-EBUILD quagga-1.2.2.ebuild 3676 BLAKE2B 83ff52a209cebd66cae813a6767d0cef97e39fe61bd58bb88ff26df8ba73740868b8f7f4ccc6f74351cf75d01ba231b65a2a90126d68d9264cfa9e614a143897 SHA512 973c4f5a06d2c26c613a5e9ac5ef07e003d182ba7835f9cce754304fc78cdecb47b5607ec2590d4f1caeb642aff0a1e60a558cf7a847fe558c8b5b885df3b4ba
+EBUILD quagga-1.2.2.ebuild 3675 BLAKE2B 29d8900e617dd1a682dc592aa167a6d917484b21a264cd2d5a1e463a4b67fbaf7d00b843602e851b02a471a395176819a9c98efd95fd6cbec80b62d305fe9982 SHA512 ad383a681c9e0f1e196d26d34c6d1825d264d7b80f901688c3b081f40b993eafbc618eb94a43f118bfecf8361dfab018136a831162d8aebe8350d397b24ab6d1
+EBUILD quagga-1.2.4.ebuild 3678 BLAKE2B f7d3984970976d1878d59def3fdf77b28ff3369730f10c44a13edf70a4aa0c81dca32e80ebeaadea7fab2e99b1bc1e041a097d7a479524eb80beae318c9ed438 SHA512 f316d74f62c6eb9b037a1fd19cb13e781f5b81726169ebb7c856a9a5af69b090e609e47c24603c86c0ef106c5060b8f3a8678cbb5de3f1e2bc83014479f19aa9
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild
index 441faaf584b5..f4e67c358434 100644
--- a/net-misc/quagga/quagga-1.2.2.ebuild
+++ b/net-misc/quagga/quagga-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~s390 ~sparc x86"
 
 IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
 
diff --git a/net-misc/quagga/quagga-1.2.1.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild
index 95640cd03056..f3cf905e3fc3 100644
--- a/net-misc/quagga/quagga-1.2.1.ebuild
+++ b/net-misc/quagga/quagga-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,9 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~s390 sparc x86"
 
-IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
 
 COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
@@ -30,7 +30,8 @@ COMMON_DEPEND="
 	!elibc_glibc? ( dev-libs/libpcre )"
 DEPEND="${COMMON_DEPEND}
 	sys-apps/gawk
-	sys-devel/libtool:2"
+	sys-devel/libtool:2
+	test? ( dev-util/dejagnu )"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/iproute2"
 
@@ -89,7 +90,7 @@ src_configure() {
 		$(use_enable tcp-zebra) \
 		$(use_enable doc) \
 		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(usex ospfapi '--enable-ospfclient' '' '' '') \
 		$(use_enable readline vtysh) \
 		$(use_with pam libpam) \
 		$(use_enable nhrpd) \
diff --git a/net-misc/sock/Manifest b/net-misc/sock/Manifest
index 6c1ee37e13fd..402e01420aca 100644
--- a/net-misc/sock/Manifest
+++ b/net-misc/sock/Manifest
@@ -1,4 +1,3 @@
 DIST sock-1.1.tar.gz 21951 BLAKE2B aa047f780569727ceab51e0973e0418c180bc845fc2f6649c443f9a850e152f280253028ff6c0067a602af9e6bfac092eeca85f9e95deade1614172dc737c353 SHA512 9ee5155a51df6d4aadef0786904ae710413b0523a7b5a84c44c7ff4fc48035a7a6fc3b1ad6f4491bb8a4d350b88040ee188af528df8c10b8dd1bca17190fd252
-EBUILD sock-1.1-r1.ebuild 417 BLAKE2B 8dd3397ae1dc1a9a30bad6484a3186bebca02099f9f2f84d6d7c48930e04f2029c863e920d96e119c38b57316b32c168e103b2c169363901dcb40b6871954cc4 SHA512 0daf70ec560302b463d302c46289989726a74f802404eafb54c5839f047372f951afea9829a6305d7969179239b96821b5b16b382126f9e085ce0064316eae26
-EBUILD sock-1.1.ebuild 440 BLAKE2B 6a89ec4a5fcbd6a13d4db8d5cfb62c3d9e16befc73c10ca27314e100b6d5f20e72ea945719eb80843c639fdaf721ca822240a2cf750a6e69655b8bc6825c66d4 SHA512 e4927f0149433750c21b83a481992439160dd512696654b47a760eb0d1a29ec8da2885797284f71f55d3ab1d97e92717832827935ebe21d7e29cfd58d029d3bf
+EBUILD sock-1.1-r1.ebuild 414 BLAKE2B dbce0f36b1037cf34065f50ef8ceb09588906260fa26d4d2c1e1b46909c47ebcf4190c905769d5a7a6548f0f3aefcf4f849f8d46b384c76525b2e5cfa7523574 SHA512 fcd6f1ecbbb2a8a346ae3b9da5cf390f1a114e50f389aeb0834f6b56b7f6ba72743f08be139834ed52ccdca11f3809d3f1083c8c79a1d636bfed1ef70e7245f2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/sock/sock-1.1-r1.ebuild b/net-misc/sock/sock-1.1-r1.ebuild
index 6ab67020c393..539cade5b221 100644
--- a/net-misc/sock/sock-1.1-r1.ebuild
+++ b/net-misc/sock/sock-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 DESCRIPTION="A shell interface to network sockets"
 SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-misc/sock/sock-1.1.ebuild b/net-misc/sock/sock-1.1.ebuild
deleted file mode 100644
index 22501bbca627..000000000000
--- a/net-misc/sock/sock-1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A shell interface to network sockets"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=""
-
-src_install () {
-	dobin sock
-	doman sock.1
-	dodoc README ChangeLog
-}
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 5fbac60b1024..f6d1a930db46 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -4,12 +4,8 @@ AUX sslh.conf.d-2 297 BLAKE2B c59d4eb8dfd4c2ed6f3a952cd2764c11aea21c1c62e5a4ffc5
 AUX sslh.init.d-2 465 BLAKE2B eb34383ade0d3fe778d11d098129f5466df15816ca8eb8eb7c5b2cb8eebee91195b0e3e9f9be4fa5f941f8aacbfbb4d718876a8e8af0c9a13c6dcdf2dc6d104b SHA512 73b38af0142f6d591d71531e03aca3ddf625faa7825a9951dc31112fa1bca5b28f8074a3f9ca565b2cd3995b635cc7818d899ce099d64d2eb97ff9cab2e617ba
 AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
 DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
-DIST sslh-v1.19.tar.gz 57352 BLAKE2B 004084ac726c2b0a12add00da017934aa46420370bdf0e56c19443aff0a25f232324f0140cae7a09b15e885d73fae498b8c51b4c7a3f4da219bddf4abb99b412 SHA512 851a9e89098baeeb8279298b1a04527fde80e5efb4bb64006e165479ff2d7ba24b5621a99754ff906fca8c167fc1fd0bcd4b80860c999f5b9cafa408769aa18c
-DIST sslh-v1.19b.tar.gz 57369 BLAKE2B e970a6c92975b716e95a231a83c61970620f40d732e84ec318d98c3fa78fd6c06bc7de91745c6ccbe37a2cd96559c07f939b3affae03c3fcb3c9f785d62ba268 SHA512 a78f94234f8ccef6ad0dcd299b25f2ecc9b4b2c1acf110bbf3203a63259b69cc3cbc21314799aaa26e60c3420c03be3335ba4d4bc01dc595068506066a60b98e
 DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
-EBUILD sslh-1.18-r2.ebuild 1753 BLAKE2B be4845b0cfa8e7360cee513a1c570e1f86c061d578344929fceaffc1f1006b358dd21ba2c4ced28b68934d3c868c36e8e3d471cecc91fc6306ebf20610aec4fa SHA512 a4a96c61476381f0870b0cef1278219d555e7b6c8760c078a4772ab26550163ec991b57797362bf885d07331d4ceac5294180e868dbf65af9e9122da7e467ef7
-EBUILD sslh-1.19.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
-EBUILD sslh-1.19b.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
-EBUILD sslh-1.19c.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
-EBUILD sslh-9999.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
+EBUILD sslh-1.18-r2.ebuild 1761 BLAKE2B a112f1d45b4290e4230a0262ab3a44b96139e1cd158bff8900861bdf7dba63d62c50dcf30af9f17b982da87d601a23739d2835138d5cce3ac6b99aa9d7ee19a9 SHA512 5b66c76b78e0f8bcc8ad5d7c1986e0429c06149e6021280bf6094e480cc8730e30c558280c9243c5bbb336560848f38e683c329d11fe80febef2c56fdf5f897b
+EBUILD sslh-1.19c.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90
+EBUILD sslh-9999.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.18-r2.ebuild b/net-misc/sslh/sslh-1.18-r2.ebuild
index 4779d7c31e0b..afc382f87c0e 100644
--- a/net-misc/sslh/sslh-1.18-r2.ebuild
+++ b/net-misc/sslh/sslh-1.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ MY_P="${PN}-v${PV}"
 inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
-SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/sslh/sslh-1.19.ebuild b/net-misc/sslh/sslh-1.19.ebuild
deleted file mode 100644
index 3c1ac5f9f7f7..000000000000
--- a/net-misc/sslh/sslh-1.19.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
-	MY_P="${PN}-v${PV}"
-	SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/MAN/s:| gzip -9 - >:>:' \
-		-e '/MAN=sslh.8.gz/s:.gz::' \
-		Makefile || die
-}
-
-src_compile() {
-	# On older versions of GCC, the default gnu89 variant
-	# will reject within-for-loop initializers, bug #595426
-	# Furthermore, we need to use the gnu variant (gnu99) instead
-	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
-	# to be defined.
-	append-cflags -std=gnu99
-
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd) \
-		USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-
-	doman ${PN}.8
-
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
-	if use systemd; then
-		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
-		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
-		systemd_newunit scripts/systemd.sslh.service sslh.service
-		exeinto /usr/lib/systemd/system-generators/
-		doexe systemd-sslh-generator
-	fi
-}
diff --git a/net-misc/sslh/sslh-1.19b.ebuild b/net-misc/sslh/sslh-1.19b.ebuild
deleted file mode 100644
index 3c1ac5f9f7f7..000000000000
--- a/net-misc/sslh/sslh-1.19b.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
-	MY_P="${PN}-v${PV}"
-	SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/MAN/s:| gzip -9 - >:>:' \
-		-e '/MAN=sslh.8.gz/s:.gz::' \
-		Makefile || die
-}
-
-src_compile() {
-	# On older versions of GCC, the default gnu89 variant
-	# will reject within-for-loop initializers, bug #595426
-	# Furthermore, we need to use the gnu variant (gnu99) instead
-	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
-	# to be defined.
-	append-cflags -std=gnu99
-
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd) \
-		USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-
-	doman ${PN}.8
-
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
-	if use systemd; then
-		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
-		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
-		systemd_newunit scripts/systemd.sslh.service sslh.service
-		exeinto /usr/lib/systemd/system-generators/
-		doexe systemd-sslh-generator
-	fi
-}
diff --git a/net-misc/sslh/sslh-1.19c.ebuild b/net-misc/sslh/sslh-1.19c.ebuild
index 3c1ac5f9f7f7..f58bdffe2ceb 100644
--- a/net-misc/sslh/sslh-1.19c.ebuild
+++ b/net-misc/sslh/sslh-1.19c.ebuild
@@ -6,14 +6,14 @@ EAPI="6"
 inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
 	MY_P="${PN}-v${PV}"
-	SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+	SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 3c1ac5f9f7f7..f58bdffe2ceb 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -6,14 +6,14 @@ EAPI="6"
 inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
 	MY_P="${PN}-v${PV}"
-	SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+	SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index cbe2ae890d56..20bca463e677 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.libvncauth 140 BLAKE2B 84b119a944ffe6b126fd697d28f96f805a7c7b11311b
 AUX Makefile.vncviewer 295 BLAKE2B 6eee05699e3f14d54b8b7fcaecc6843d08d2fcdbd292be2bba2a76f838c398edad8f5a9b46a6621f8611913a712d945d94cdaaca3ee8dc21d2573ed957334fbd SHA512 1161a2612ab2d3a5e87efdf144baf84d0b90307f20c216cb7c49a6b13e0b8da4eb3aebc1db14192672d796cd92db6e7a6336611e07405b1fbbe2d2dcc5374625
 AUX ssvnc-1.0.29-build.patch 1087 BLAKE2B 9c568b53d1aee0875e65cbb919fcc0f7a986fe70d81028ed28bbb881ebbba91644cddae92bbc52d3c291d85cb07390b9f38bbb419b6b4e277e6a48850ea3421d SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157
 DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092
-EBUILD ssvnc-1.0.29-r1.ebuild 1425 BLAKE2B c1f9dc81a46cabe9f373e42aa162c5131b0ceaa7d75e22d8ad50757314a42cc69f99fd5c97f5c5e131c4a19a7a4ed57a9b9603a509f20a110a474337cf2b6b04 SHA512 01fed0001099c261b5c508662130de90e0f97fd04812cce0d621861c7926845fbd4afd2e2b44cef33aadaf4f3b7946db5dea7fccbc7b3dc8982e338349a1436f
+EBUILD ssvnc-1.0.29-r1.ebuild 1424 BLAKE2B da4b7efebe768e6a93ca4067addbd705cceb5f8ff7be3f881d69b5da579d61f864a03020c4c679fe7d1b88a6d133ac69973d0ed58d44a9d8d2dae74f8b07379a SHA512 a7528293ddc855a482dc5059bf463971c3f012d40701cc0dd8d9732095641d4345ff57cb31fbca6fb7f4e552fc20e3bfdd1de1ef37832923d0f256bc7848f34f
 MISC metadata.xml 242 BLAKE2B fccb5f5d9a500d3cb05aaee9df21a0ec0421e398c36915139fe871493632c7df070d222a5bc7d06b4451518baab1d0cbeb61ee2c8e909eb796d087ef7b627676 SHA512 ddf123246fb00abd46363ba180b90241b23577c60d7c001c2cbca9c3968dd240e98d8af00f63f3170fc7df9f824e7fd7957b3aafc780530a2c2fefbfd7e5faad
diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
index da875fbd3fbc..7cd986affb1a 100644
--- a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="java"
 
 RDEPEND="sys-libs/zlib
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 02420a52571d..10b769c04eaa 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,6 +1,6 @@
 AUX wput-0.6-gentoo.diff 641 BLAKE2B 2876ac3eb4f42590d01cde847cd5866ddfc7cd7e4630d901e573ef87f8b99d55e08c063c8ff0e497fae3cc75ccb72acddfd1787f19dfef12672a5447b364ceb6 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a
 AUX wput-0.6-respectldflags.patch 391 BLAKE2B fd2c41ce1fcc4866b5951bba49f4cd4d7ff5f4a9891016460e99d14ff78d3275273d234fd86df1b1cb3ecc5d5a4c7527f5b80cb2a00106a69f5d82badfc46497 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146
 DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
-EBUILD wput-0.6.1-r1.ebuild 774 BLAKE2B 5f2fd530e1154c266b2965a93a8c90e946f9a7bce5d65e0e7905516716e65159e64b6cf67190f2ecfe984950de77bca4e40689c6dfa01a18aebc511bb5a4ba52 SHA512 9cd3e7ee0a20dcef19a2e8296688b6aca9f2521816560f2d10eec3ccca4010450d56b8d387ef2c2f05d299eba64a8f90c326fb2ae5f97554cb542bd1b73ea9d8
+EBUILD wput-0.6.1-r1.ebuild 772 BLAKE2B 021df49888874a7aa20fc506f3ac463477118b7267e8bf144121f2ff5ba825d7ffa95a5cd51ffe61be2934f31e88f06d6a950fa43f88e3546bc0e726af91dbdb SHA512 14ccbce2d2562dd3e3c0f50f7c9b23f69ac2cb8a336227e0982422de98c98cb723d303941bddb73d6c9ec0e82f4372cde32e90e2aae6eadd608485ea24d7fd67
 EBUILD wput-0.6.1.ebuild 937 BLAKE2B 280991485b1ebdd0a3535724fea44dc200c7170e17f419cb4ccf5e78c2fc969638cd8ebffcec8174bff1c02d8476dea669ac7528bf7849234d5540389e58043d SHA512 09ff86266767d47be0269d2d35d0d6e5d79669a7e587075622f5248cb1be597234e84314080fe01117ad58e1858841ec0adf5009df336488571897fafffcec68
 MISC metadata.xml 213 BLAKE2B fc154a4a8f3de9a525bbf6fb99faa45fbc8a7acc300b3ebc91e2c7b69a2094f47fa312e0141e060b3e4f83e9f7fbc3b61f3d2c8946b3c6663120f1a791834f86 SHA512 6aa0dd15c8b17b8007764f93049ca69537377c25282ff538d14b792fda16dd1eb4d847b2354d140e1ff68c2df28b4280d6e93b2ca0c90f862c4a6748d916ae4c
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
index 354b883b95e3..95361822ca98 100644
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="debug nls ssl"
 
 RDEPEND="ssl? ( net-libs/gnutls )"
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index c59cfe7001c2..4eb69c9ebd06 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,8 +1,7 @@
-DIST x2goclient-4.1.0.0.tar.gz 1889861 BLAKE2B 1b5c452168e65540827ad4503ffecfd5a825cc74a1443f3c3f5f362d93c37b00c35fca6c60847d8c3f72793d7fc70d75114becadfe5f26f12cfd754b1fe9b1e6 SHA512 cb7023b0b9de6d83ee8206bc0a36be0306cea19a3a8fc081ffe704691ae8744848bc3c329b3bf475e838b93c2ee4b9c96af20fae34e6d4822fcf7feb9c3cf6d0
 DIST x2goclient-4.1.0.1.tar.gz 1891484 BLAKE2B af9ccff0ae313c42a13089e0e1b154d8204cc626b2cb5dfbd1f0016bd7099592d2f29ff8d540a2e1d64552359e90ed024c9790bce551e38e5826bfff5b2ee408 SHA512 6cbfb70fb7f522f0a5557ab36b6e15b6cae9ad184bd1d51b6c2f2acfa7b22d8fd9344bbfee141f2d5bd71f5adf9d3bd6d2c7db7b774cd8f8af5bcd25144de98d
 DIST x2goclient-4.1.1.0.tar.gz 2745227 BLAKE2B 3cd33a828a890189fa92790388abf34c95eeb33d0c5019a014b1ba893a739011886462f62b2ce74cf57c8229acf573db778defec7e0097f5c0d6ea1e35361699 SHA512 c9763ab4b1ce4065ee1512dae2fcaf5b23dd515dc64fd8bb11d033aca1a026a4bf0d06a0fab38576e98627490dc459973716689e8c9aa7c47fb6c68124405e30
-EBUILD x2goclient-4.1.0.0-r1.ebuild 2009 BLAKE2B 2fc820ab47b02f7a4424d030469f91caacd73d3e04c600efb37a8bafa8c1d7a8613d07e27ece8d07123058b0bb45548c2c0801274be587e57047126c896c1137 SHA512 b5d7c5becb23eacbfc9a0d2a1b6ba0bc9e79392fcead3ee950b589768e4735cec62ce595e175bf067467dc72336721c3106267fd992fd023dbed10abec6e24b6
+DIST x2goclient-4.1.1.1.tar.gz 2749650 BLAKE2B 212e4ef9bb13478c79b46fe5ac247db2ac1cde1e24c0293397f54c793fa647318fa8f1d13417cb54218ed6757a26db4d6fe00076ad5c04c4d426ee428200735a SHA512 b18f3b2889e2f43846a1c83fccb1a1219621b442849a8e454e82e3d27a638740ea22dd419d6b1e0544416445d4abe80f8b931d46f77237bce1df11d4394451dc
 EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 BLAKE2B 817b894fa28a636679d986e1c1cbcc60c1c0c575c1ee3a6a61053c6ec4a396db6af09daa15f5b87729fb8b4da162d92345abe685f8028e78c06ca51f5342636f SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3
-EBUILD x2goclient-4.1.0.1.ebuild 2011 BLAKE2B ef9f395fade2ac41c745c792d5d034673bc3cc452f1044827fad4375fa4ebf6af9a71640ed162ee4b3ab3e79a94909e52b93364569e97e2929f5a1771101bce5 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9
-EBUILD x2goclient-4.1.1.0.ebuild 1378 BLAKE2B 0396c882d2a48e71df08fff8fe3a31250ff4ef94198d7967d0db77f8efe1b77a109944986074611800c4d3aa505d96b59178d69bb2358a4c14859e452716ab1d SHA512 f40c009d69556fe39f5d11e569370973f7e978290b1d5de59d5584920f89332b8f2a9906ceb7b53caefe4d087f2cfd2649ca330cbe05b70a32db5944d1a8feef
+EBUILD x2goclient-4.1.1.0.ebuild 1377 BLAKE2B e7f76cefcbb3fbe497dc3d653291dd5d70998f33632a83fe2a98bb724c2a4ea9953b41ca390473b2b494824f4b52f56c0dc06d030fa72d5f67a95e813d7a5c35 SHA512 6665dbc7ddef0a202a0dca44a8cae74dc1117253f0f9129bdee3b8dd80e2ddddfac7182d58dcda89dbcacbd7dd0d30b976c698c15c5a337b37fbceeb26338b04
+EBUILD x2goclient-4.1.1.1.ebuild 1379 BLAKE2B 995bd345ffd44ef17406c5269d8ca122ee2fac56fe6e41dfca8c0af469b9b1ae8d685d2f27a335f6634d670e6f39ace8f4468adb70c9b7966efdf405221f267e SHA512 a36080794b28a5ac4e373110b7bd1f6ecf0f3bd2d68998bf12c2b35128c0bfce4958a4a5385677fb8bf4a48bbafdf6401372d2476698f7a132b7d2519df4812c
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
deleted file mode 100644
index b206b35fed54..000000000000
--- a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit nsplugins qmake-utils
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap nsplugin qt5"
-
-REQUIRED_USE="nsplugin? ( !qt5 )"
-
-DEPEND=">=net-libs/libssh-0.6.0_rc1
-	net-print/cups
-	x11-libs/libXpm
-	ldap? ( net-nds/openldap )
-	!qt5? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-RDEPEND="${DEPEND}
-	net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-src_prepare() {
-	default
-
-	if ! use ldap; then
-		sed -e "s/-lldap//" -i x2goclient.pro || die
-		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
-	fi
-
-	mkdir -p "${CLIENT_BUILD}" || die
-	if use nsplugin; then
-		mkdir -p "${PLUGIN_BUILD}" || die
-	fi
-}
-
-src_configure() {
-	cd "${CLIENT_BUILD}" || die
-
-	if use qt5; then
-		eqmake5 "${S}"/x2goclient.pro
-	else
-		eqmake4 "${S}"/x2goclient.pro
-	fi
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
-	fi
-}
-
-src_compile() {
-	cd "${CLIENT_BUILD}" || die
-	emake
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		emake
-	fi
-}
-
-src_install() {
-	dobin "${CLIENT_BUILD}"/${PN}
-
-	local size
-	for size in 16 32 48 64 128 ; do
-		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
-	done
-	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
-	insinto /usr/share/pixmaps
-	doins res/img/icons/${PN}.xpm
-
-	domenu desktop/${PN}.desktop
-	doman man/man?/*
-
-	if use nsplugin; then
-		# PLUGINS_DIR comes from nsplugins.eclass
-		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
-	fi
-
-	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
-}
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild
deleted file mode 100644
index 4774046e76f9..000000000000
--- a/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit nsplugins qmake-utils
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap nsplugin qt5"
-
-REQUIRED_USE="nsplugin? ( !qt5 )"
-
-DEPEND=">=net-libs/libssh-0.6.0_rc1
-	net-print/cups
-	x11-libs/libXpm
-	ldap? ( net-nds/openldap )
-	!qt5? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-RDEPEND="${DEPEND}
-	net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-src_prepare() {
-	default
-
-	if ! use ldap; then
-		sed -e "s/-lldap//" -i x2goclient.pro || die
-		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
-	fi
-
-	mkdir -p "${CLIENT_BUILD}" || die
-	if use nsplugin; then
-		mkdir -p "${PLUGIN_BUILD}" || die
-	fi
-}
-
-src_configure() {
-	cd "${CLIENT_BUILD}" || die
-
-	if use qt5; then
-		eqmake5 "${S}"/x2goclient.pro
-	else
-		eqmake4 "${S}"/x2goclient.pro
-	fi
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
-	fi
-}
-
-src_compile() {
-	cd "${CLIENT_BUILD}" || die
-	emake
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		emake
-	fi
-}
-
-src_install() {
-	dobin "${CLIENT_BUILD}"/${PN}
-
-	local size
-	for size in 16 32 48 64 128 ; do
-		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
-	done
-	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
-	insinto /usr/share/pixmaps
-	doins res/img/icons/${PN}.xpm
-
-	domenu desktop/${PN}.desktop
-	doman man/man?/*
-
-	if use nsplugin; then
-		# PLUGINS_DIR comes from nsplugins.eclass
-		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
-	fi
-
-	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
-}
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
index e335afabf01c..937d4780256a 100644
--- a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="ldap"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
new file mode 100644
index 000000000000..53df37c70e2c
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=net-libs/libssh-0.6.0_rc1
+	net-print/cups
+	x11-libs/libXpm
+	ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+src_prepare() {
+	default
+
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 "${S}"/x2goclient.pro
+}
+
+src_install() {
+	dobin ${PN}
+
+	local size
+	for size in 16 32 48 64 128 ; do
+		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
+	done
+	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
+
+	insinto /usr/share/pixmaps
+	doins res/img/icons/${PN}.xpm
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 6298a1e97071..40caa2886b5e 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,9 +1,11 @@
 AUX x2gocleansessions.service 198 BLAKE2B 2660b62182aecd274786220abe4616f3862934b84308369e6791bb14ac1a919e5ed08b02c70f9ca135613a7b10abf9ed67f0ae2d5166e6b5fc83f81192a43587 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5
+AUX x2goserver-4.1.0.0-Xresources.patch 1139 BLAKE2B f48f329836a86958866836949a44ccd6c37dc56b3da85366d8ab9a5ec003bc50a10f262211c9de3f2512aa497746d4ad43d1043fe6a36caf3905981f3d551e3c SHA512 42dba64bb8a0c278ca81f4e41236c17ea01c8294914f0051d4781c701b4356ccc05ee6835b0688b79205e0cd7a4c9ebbe418aac685a982db00fa293d48a61300
+AUX x2goserver-4.1.0.0-provided_by_nx.patch 1199 BLAKE2B a2295b9b36792fdae0a754299f5654e628755c9e9d961fe11d1e9323634b5f29fd6304df13b5ffb9014744625576857d92ab15b103062599b400af74c35f1a95 SHA512 e056b9d378b0b9df5bf1c90c194b2325c4259ead7caa40013dc88c4c7cc3c344ba05edc73cb28f2fec600326862c21b166c9a267b579c2171413fde1a651acd7
+AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e2767047dcd94ebb61b0418ba5d55d55d2860530ab818b87192bdc85124be6a9d52d5c19872063555b7bdcd721429ccfa8593cabb SHA512 7b56c725c42f0813ecb88ed7f34feb0cecd1eaedd157c19068f3e6607bd8510fbba177079744f9e93fc83a4bcc65e7df40f8b1bb6acf4124fda847bc4fb86986
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
-DIST x2goserver-4.0.1.20.tar.gz 96412 BLAKE2B 292aadd38fc91436e034b1dff52d2188670598958b325782bda747a8f4f73412e9edd51d57b362d8fcc33a8c2ddbb962ddba2c678dd195181c986ddc259160d5 SHA512 21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54
-DIST x2goserver-4.0.1.21.tar.gz 101441 BLAKE2B 52b9488ad9471c351c66d49624898b4b19c18fb30b1dac0f24c3645bb49c1e562568515b838f323f92612caea4debadc5ebd21a697eee86c3122fd7758bf94c7 SHA512 641421b309baab0941416ccd60dd8b66b0a968a4031252c2d8066fb570c1985787848ad368d731fbdb4737c00ea722a26682fb8cd2820ea19da271c4ecffafa4
 DIST x2goserver-4.0.1.22.tar.gz 101286 BLAKE2B 238da88d333b6bcb31b37b7d5e44d223ad975388fdee0cfb1ba21c58d5ab9a42961c7fcd55e474affd29197bc92fcbddf8c679eab8052387996b983a9e0244ba SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67
-EBUILD x2goserver-4.0.1.20.ebuild 2543 BLAKE2B bd9e005bdfa1e0249ad7b1f81ee70380b0b04066e6e00cce2a1d404640fb23f5d6d37d7e1f7e4cd12741f64e75a877433f2c6740e0f2a23f160aa033d116d9b4 SHA512 2141523537811df40bd2c995f11e69b42c84b4cf38f9d6df708743215ee5a2a0dc4f3328f2be9f76f3ab48fe375282f1895754ee0cf1ba59005ba0add7f55c85
-EBUILD x2goserver-4.0.1.21.ebuild 2697 BLAKE2B 92f82889dd714e5de2eabf23c1ec7487e465ce410048d6104e1bf9e1c11d45e0a65440c44ab6be2d98b43fcc7daaa08d1af68e91acc39257342d6b94a7ec710e SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd
-EBUILD x2goserver-4.0.1.22.ebuild 2696 BLAKE2B bf6853014daa2357eb40a3ece184ea9fc1cf5995f8db943db165c421bdd2b3db87842cf73f3762bc5154571208e65f81c5e14b03fcd8e3dea493ab55022617b4 SHA512 ac034fe74532d16747b8457d37add5f0b6a41c2aa91eeb461c56da686351d4c0e9d0d47e168fe796675d7781c66dcf7c59f16f0479f10920c7266a10c995642f
+DIST x2goserver-4.1.0.0.tar.gz 132386 BLAKE2B b24b29f2eebaec04061690b51cf00f65de256ce2f68b57909909fe88a08466a1f802ead00ad9cf62a5327c2b7bc6690feb7c26b8b5b711757e88a553586fbe1a SHA512 3f48dced332729d726bffa991a7a203035fc6580dd2e094561f52b327e7c2e48b807daf68219132fbec29b5abcb865021361a35654792e58da1f2e4715ea95d0
+EBUILD x2goserver-4.0.1.22-r1.ebuild 2677 BLAKE2B 61a7b46793ea8250431215b1c6019435535e5656a14af1c36d3956b906e76ecd40aa21dbf0463caa0d7fda0733b8e4299d334247bba36b3775004b80cfb9dd27 SHA512 dbbd84761f629d406e526835aa86a7367fc9d7a4a4c1e483df2f1b8b076b6f3e1b48b0246bf625f619a0b3f994bf378a4990193e4f86a5773a54fdabad9debb2
+EBUILD x2goserver-4.0.1.22.ebuild 2695 BLAKE2B 94ee6af4b19646dbb7bc7e596a8914d4e4d6e0da250b23dadb780f3ec5143ab0c9ac3b2c881a910945b95364819de253cd494af3d7cdd5835389280623be6c34 SHA512 39431ef93e633a1f8dd3acd195666c8a98af247025f17ad2055a43eb054bbb113df3d20fa54fc9b73529eececd5be96ab399102eb90220199c9642fc38c07b37
+EBUILD x2goserver-4.1.0.0.ebuild 2482 BLAKE2B bcfcf2193352dff8ccf0a0600e8e7b609b973aeac09325ead42977e47e13eaab8d87e3b04d1498a62140a0457ec50e46398d71aaf48a7192a33595767cfe5faf SHA512 fef9591f7e35e5c3e46a9dfce6330da6a980670eab4fa521ba3f2471beb4276468590d84b3c4bdedcd48d4a704573f37e0bcb404b95a6ab0d95a166199db7cee
 MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch
new file mode 100644
index 000000000000..e75355c835dc
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch
@@ -0,0 +1,11 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile x2goserver-4.1.0.0/x2goserver-xsession/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-xsession/Makefile	2018-02-23 14:36:33.539717610 +0100
+@@ -53,7 +53,6 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
+ #       provide target dirs for X11 related symlinks
+ 	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
+-	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
+ 	if [ -e /etc/debian_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi
+ 	if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi
+ 	if [ -e /etc/redhat-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
new file mode 100644
index 000000000000..e189b918dbd3
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
@@ -0,0 +1,27 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile	2018-02-23 14:42:03.106562501 +0100
+@@ -49,7 +49,7 @@
+ clean_man2html:
+ 	rm -rf `dirname $(MAN2HTML_DEST)`
+ 
+-install: install_scripts install_config install_data install_man install_version
++install: install_scripts install_config install_data install_man
+ 
+ install_scripts:
+ 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+@@ -57,14 +57,11 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
+ 	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
+-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
+-	$(INSTALL_SYMLINK) nxagent $(DESTDIR)$(NXLIBDIR)/bin/x2goagent
+ 
+ install_data:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
+ 	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
+-	$(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
+ 	$(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/
+ 
+ install_config:
diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch
new file mode 100644
index 000000000000..5e51101f528e
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch
@@ -0,0 +1,84 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver/Makefile x2goserver-4.1.0.0/x2goserver/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -36,7 +36,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-common/Makefile x2goserver-4.1.0.0/x2goserver-common/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-common/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-common/Makefile	2018-02-23 14:37:56.510675412 +0100
+@@ -36,7 +36,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-extensions/Makefile x2goserver-4.1.0.0/x2goserver-extensions/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-extensions/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-extensions/Makefile	2018-02-23 14:37:56.511675412 +0100
+@@ -33,7 +33,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-fmbindings/Makefile x2goserver-4.1.0.0/x2goserver-fmbindings/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-fmbindings/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-fmbindings/Makefile	2018-02-23 14:37:56.511675412 +0100
+@@ -33,7 +33,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-printing/Makefile x2goserver-4.1.0.0/x2goserver-printing/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-printing/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-printing/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -34,7 +34,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -35,7 +35,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile x2goserver-4.1.0.0/x2goserver-xsession/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-xsession/Makefile	2018-02-23 14:37:56.513675411 +0100
+@@ -34,7 +34,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.21.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
index d64c4f2f058c..6f481fc8cff5 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.21.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,13 +46,14 @@ pkg_setup() {
 
 src_prepare() {
 	# Do not install Xresources symlink (#521126)
-	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die
 	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
+	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
 	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die
 	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die
 
 	default
 }
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
index 356aff263d23..7c027d7422ae 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
index ec52317ce100..5f3be4028956 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib systemd toolchain-funcs user
+inherit multilib systemd toolchain-funcs user xdg-utils
 
 DESCRIPTION="The X2Go server"
 HOMEPAGE="http://www.x2go.org"
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
@@ -21,6 +21,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
+	dev-perl/Switch
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
@@ -34,6 +35,9 @@ RDEPEND="dev-perl/Capture-Tiny
 	sqlite? ( dev-perl/DBD-SQLite )"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
+	"${FILESDIR}"/${PN}-4.1.0.0-provided_by_nx.patch
+	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
 	)
 
 pkg_setup() {
@@ -45,14 +49,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Do not install Xresources symlink (#521126)
-	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
 	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
+	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
 
 	default
 }
@@ -68,7 +67,7 @@ src_install() {
 	fperms 2755 /usr/bin/x2goprint
 	fperms 0750 /etc/sudoers.d
 	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym /usr/share/applications /etc/x2go/applications
+	dosym ../../usr/share/applications /etc/x2go/applications
 
 	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
 	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
@@ -87,4 +86,12 @@ pkg_postinst() {
 	elog "For password authentication, you need to enable PasswordAuthentication"
 	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
 	elog "An init script was installed for x2gocleansessions"
+
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
 }
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index e77650dc4290..b95dc429034a 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -3,10 +3,12 @@ DIST youtube-viewer-3.2.0.tar.gz 222528 BLAKE2B 13492d444130218ab54337f2e6a578d1
 DIST youtube-viewer-3.2.4.tar.gz 224282 BLAKE2B 3905e6cb7c014a279ee239bd63418508f2626fd6ba22161508833f962b0a8ad5c2d2137a43509061e0fdd878f1844096d969e57289d2bb4f97eec2478e814356 SHA512 06bb763460b90f26aa1671c29056374df62d4e840acb3a800f4840160535fef30e60e6655b1d4ba7423a0424384acdfc00aa068a420aa836110974a5f7152ec2
 DIST youtube-viewer-3.2.5.tar.gz 228801 BLAKE2B 7407419ee5334a6bc78ede0151e8b3110aa11bfbebb9a7d4a75ea83b751e179d5448ce3c6566ffb6821c76c964d84769bc057e28e3f5683735001ffb90e1a843 SHA512 093c62a3fcbfdf538ae5a205b4263ef91408e4aa7f1824a12f4b5d7b387437fe48af5914e792d743b135e1389534ddba89aaa9a1226969d3cc360515a0d885ae
 DIST youtube-viewer-3.2.8.tar.gz 233912 BLAKE2B 87e3d96a54d3a83de6e805eeb420a5cfb633ca33a030f619b5b9db52b3c079da4969b0bb7fc76203adea59eb2f82d89962d2140a1f4281367d5b0ea307660da6 SHA512 ae4012f164ff86208975968efe3460774f6740ada9badbfbb373b1e4a22b9983667d96c0f8d857431a6b344bbd061895abab39d353e850662b0b131ef9016f45
+DIST youtube-viewer-3.3.3.tar.gz 232856 BLAKE2B 68f3529edeaeb443203f1c6bf4a9967346a5015d05d40ffeca65a1deeacb73cb9bd7fbc79ed2c70f161c82a03df8461b3d39b071ccbe480b10d4259eba08d430 SHA512 ca624c456d33aa804398f71f1dd4a095f7b9ca5ae5a1cb255b9e8a3dea671a8b0f986977428e797f1fc1f96d69087a66c71185e37cc521d668c036c4e7a5825f
 EBUILD youtube-viewer-3.1.9.ebuild 2425 BLAKE2B 3eba068cd806ed7e7162ad2023ab35857a518c8373381c7e3bd2d733e3ee9e16272658c2ebf0dd69ca67c6465cd43987a9b9ce745b0ac6b2c2fac5d52e8a50bf SHA512 3314727682ff9d77b761b391fcae9d70d541321f2d3dc5e2ca0bab3f87bf36cda06ec0f84a085172caae9df621722bb0c0c21e6c20af7452ef11b9468e3be56c
 EBUILD youtube-viewer-3.2.0.ebuild 2335 BLAKE2B eeb267da1690c4322bede79f6a7173c5057d786de48d4f94708ba3968ed782170266c5861d4b55e218bc3caf898fc58036680f91f3b9eb36606307bd3e4d0676 SHA512 ab8c7996de65d8b439356360815f4fa744837785bfaee9db454ec3d4f419d290cad98517b03c4e97acff046d76983051dfe738dd5d88de5c2635be71536f5ad6
 EBUILD youtube-viewer-3.2.4.ebuild 2302 BLAKE2B 709a44a8c589bf8b8b143e8465e9aeaa17a8d42ea94c30f453276b61e31a10d6fcb5ef1039b8b2f48738beff63b64cba0599c8fdcdeba380f7f53efda7edc20b SHA512 401d3e44d86c4fcf8397e39ae2b05e06664c6ac53c7048d419138851e2ec5b21ee5beed3e170bb9156e313c3c36b91b11adf6ecd1704e75031194e322cb5775d
 EBUILD youtube-viewer-3.2.5.ebuild 2258 BLAKE2B 12b8ac05908daa5b28c301620ed3c0e5a1538fd4ae22112c2baa7a17f1c6c750d248d8aa2c47cf4d8502c31eb0e89e704af7d4bb7858ae6574dfe89493467708 SHA512 1b2d4d344fb4406a0a9fa8ca70c6e73ea0c597069a92a95684b2f34111799f2bd94d1d4e9eae23f67a3355f5545c8f3237122de80264b2e465d04cd5d363ea87
-EBUILD youtube-viewer-3.2.8.ebuild 2027 BLAKE2B a95a46c8c5cddce769d4478622744c0425eb8c6abbecc9a352a721e4f7076ccdf7c8a568ede7f2bdfe14b4d18a02845f186d402fbbf4065d8cc248c873b3476e SHA512 c860812a399f1fbc482ba4baf8794f7cad8b265fa6fa417b20074fef9ac24ee9ec2e025c41ba509b7484e6a7298c3e56484beccd0056a42b0de9ee446677c930
+EBUILD youtube-viewer-3.2.8.ebuild 2025 BLAKE2B 390f88f32c0c4bfaca84c8265ac73dc1b712868b481d949f15f0c96bd83b780e42039d2d422faaaeeea557c5794164abe40694d4dd74c36e9e2519ef42661933 SHA512 2fa5e47ed3c5dca68f1176c26a468862c4e9f31782a8dc7328aca3754791114fb0f4090cd4936468c8b04f485919701eaa6c4a56301866dc7ddbe6eb97a0f726
+EBUILD youtube-viewer-3.3.3.ebuild 2027 BLAKE2B d090963e37b0a6198e6aaea0c358c860b36c59c8201cef648c42acb59d970aa28283eb63d1dc1173be74624e7161d4a284f0a2757416bce826a1cd68ba9c47a1 SHA512 a62061be86dfe9a526790673f3c47ce60146537956cbc2d1f1b0c64cdfec6954044662d770ac74ad8e3b8245f4da9e6c194d5175631a81e82deb89494f2f97b8
 EBUILD youtube-viewer-9999.ebuild 2252 BLAKE2B 5cb27656f5f6ff899760f9f200ea3ddaae1f3a721bbeff90b8b7c3fe4b0c38f09b2ce7cc9be2a19cbd7b41c03d54426cc1e2e1d62dab1038d866b27e876e6875 SHA512 15f2acb1b4346ada4d71913569ef91852657ac52861ff89b6b7952903ef20c6a9bcb438f89a024aaab030c9e0a4820c2f0cab08a7ce4fbe92884a5d3e4044f04
 MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.2.8.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.2.8.ebuild
index 537ee784c3de..4e5e8e27bcb5 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.2.8.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.3.3.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.3.3.ebuild
new file mode 100644
index 000000000000..0a797691ff7f
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.3.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils perl-module
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/LWP-Protocol-https
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)
+	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
+DEPEND="dev-perl/Module-Build"
+
+src_configure() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+}
+
+src_install() {
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog "Optional dependencies:"
+	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
+	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
+	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
+	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "threads support" virtual/perl-threads
+	elog
+	elog "Check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
commit	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree	da76713365257a445f3ae3b95470917f59d46728 /net-misc
parent	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)