Use krb5 virtual, bug 547556. Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

13 files changed, 21 insertions, 1308 deletions

diff --git a/net-misc/openconnect/ChangeLog b/net-misc/openconnect/ChangeLog
index 888d110a8d0b..c114d285d3d6 100644
--- a/net-misc/openconnect/ChangeLog
+++ b/net-misc/openconnect/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openconnect
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/ChangeLog,v 1.43 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/ChangeLog,v 1.44 2015/04/27 19:01:33 floppym Exp $
+
+  27 Apr 2015; Mike Gilbert <floppym@gentoo.org> -openconnect-5.01.ebuild,
+  -openconnect-5.02.ebuild, -openconnect-5.03.ebuild,
+  -openconnect-5.99-r1.ebuild, -openconnect-5.99.ebuild,
+  -openconnect-7.01.ebuild, -openconnect-7.04.ebuild, -openconnect-7.05.ebuild,
+  openconnect-6.00.ebuild, openconnect-7.02.ebuild, openconnect-7.06.ebuild:
+  Use krb5 virtual, bug 547556. Remove old.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> openconnect-4.08.ebuild,
   openconnect-5.01.ebuild, openconnect-5.02.ebuild, openconnect-5.03.ebuild,
diff --git a/net-misc/openconnect/Manifest b/net-misc/openconnect/Manifest
index 73c684f149b7..5a7566541be5 100644
--- a/net-misc/openconnect/Manifest
+++ b/net-misc/openconnect/Manifest
@@ -8,51 +8,22 @@ AUX openconnect.init.in-r2 3270 SHA256 c5db95fe3197f0f9f27edef7f51515c54d996c6c9
 AUX openconnect.init.in-r3 3295 SHA256 3e667d5459dc4399421e4c2ac16a59276595c65426266e8175da3061352a199e SHA512 a3f8e4d817254bcf43788d17e07905dee5ca36b9a19064e53ebbffd01cf364bd481932ab40e3e7f089dc1c598934543c57a0c968fc23565acc2902f38a06f6c4 WHIRLPOOL 4b30d820b6b9447235de449dccfc7ae8fd96f394312b0ccfe8c3869993c7339ff4113542a38052cbb73758d4661f4f4e91ac63f96ee046dbc465362336866d48
 AUX openconnect.logrotate 116 SHA256 19cca62003efb050832c05cbca5a5e9057b18cf28d1c3a445c2c6fe1cf7022a2 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077 WHIRLPOOL 7116069442a23d369913d455d7131b2d1b3884d378da6d6aa1da357bd2fb7057f9d84fd253da608be35252573052fb02c9cddab1a88516611c5e010324194064
 DIST openconnect-4.08.tar.gz 1214464 SHA256 114eef2b5a8087f26c7871db8700a293101e9626fc94fbef54ac6daef6ce1a77 SHA512 0731a2bb85f1f98c232a73c03962d8854e58b9aa9687a1521ed142e3aadbd9ba76e760a6fbc9fe3d61d5236fcb82af21aba0c50cb27b4c1a5b7f82f9bb9836a0 WHIRLPOOL fd4a52ceb804e2ef77939dcf8b111cf7dacf956dee6a1421b436b595961a14c038f3cf4bc3bb67e91b20a5b5a8473e27123d403c369864a78130ee9f5cd552ff
-DIST openconnect-5.01.tar.gz 1267809 SHA256 916f2a47c3e982f2ae6ed6a5063cf328589225a4216c95af3cbef278909e20d1 SHA512 466a0b2cde5d0f7cb26d9286b7eb0b8240c0f062bd9f338f0b0c008e39012f670c88b8ad0db15b24349782fc0c77cfe0f1a755537a3f93b838e0b95b46817026 WHIRLPOOL 64ca56678021ee14b1ef83da3b7ef7cfc7bba9af598affb4faf70a0463eaa7528ac181c9612950aae13a4d9a6eb10d1794d9faf914f9a06f41e771f161202333
-DIST openconnect-5.02.tar.gz 1294924 SHA256 243e7d810776353e097a82849ebc69336a987c17478acd9f1ee68cf604b1edf8 SHA512 8154bb1d6a99e75ff036f7048a2ec6cce05289a756568d75aa67db498b8e89d8ae03aba0f0dee761bc801739b27b44539c2a9baca7d845fe3a4af6db5b3adc52 WHIRLPOOL b37d6c31bee422037dab641c488a6cf77d0ebfedcda44516e85d1e416babf1b8a76dd647e2102dedd5daaf7fdb1bc69cef5d89182b1214efeed747fbb9765e73
-DIST openconnect-5.03.tar.gz 1300355 SHA256 7cccf62b9c50ff2392457b07f2a02259782cda6796fb0ce7831e308a8246a709 SHA512 2b465b1e15a53da2b967bf279f1d45c54c8d90e071dcab9588e3b5dda9605210e46696df8404d78bbe9020959773aab2832e7e8e1ac5761c707e142cbe8db6e1 WHIRLPOOL 50c5f48dcffa78b5b178b3247e59aed3bbcb7f2b7d584978a78aee463fdc479bec7b31876ead9babe7a82dcb5b9326008f0e4d5b3369f85c751cdbe68351d817
-DIST openconnect-5.99.tar.gz 932554 SHA256 a8c8c38054d7e89f22af44461ceb9c6ad8174bab0a5b154bdfe26722b28e4227 SHA512 3f1c4bab8f3a51503c4569ae5c42715190cf30574807cc926dbb55685f6edfdf74427a8763c1704afd8382abb65b3fd09cf1f9912a8416ebe6e808fc1bdedb16 WHIRLPOOL e96fa433cdef099c77a96de98d3473e4d7f8f1f932d85e74f8a147aab79e6cd8ea0d1c65b6d261587e8f37d50066b15322b45759d93e734817b5998e77f817a9
 DIST openconnect-6.00.tar.gz 1021981 SHA256 8a0c684dccac2447d204d544f6f466e41b21bce71e033ba58e2cb17b795ab81c SHA512 98c39fdbf6931bc20521de107752ffad1cd99381f4a221cc6ab3f43b6a779f5259ed082e05044c25d61bd32f7f3ade28adfdc3bc2535c2e6acb27375a9591e0c WHIRLPOOL dd3a037def1c192bb9c203b6a97185164f0a5f9ff224f64ab0b36482bd45d57ed4b83a79ac71186d93a29a6d4417c8fe0edd7fd08adf6df1f69f59cc807b6f2f
-DIST openconnect-7.01.tar.gz 1120489 SHA256 b950b93aa8d98b68e0b37d9b851f3c56d1c42b7e40969871a2c3e105e0c37184 SHA512 49346b4f1fc0e7f689a9911f48ae4a200323c325485ac7b0306deac643fa6964ad5245f09a012ecdfd0625e48b2b76c3f4f1fe92a77ef7fc14e1412558979898 WHIRLPOOL 0092a369f7867fe54088f6971739e07d8bd24d5fc49d99b260a7fe3459fc5d21cab238a2835ed8999b129634988a0d166f9fc5f7c8509e6c9d49772ea0034473
 DIST openconnect-7.02.tar.gz 1136137 SHA256 083626e6f2a87393dd13f379a222bf27b0d57fe1ca286d5f3731d4a444ee7169 SHA512 2452308913e5fabf6824dc46baee3ee8493153788b2f6ee0e2e2ab94fa0b00b1604e09140aba3f8a81e121addedd2ca20d3989509ac2d336b69e3c6a7b753757 WHIRLPOOL 0c10c572f0de0583dea746aff45d1ccab5e13623b854bdf665a55f60f74d135dcb2d94b98561985b0bac5fb923872e45f6fd1d3637209875390871cd7783e351
-DIST openconnect-7.04.tar.gz 1205264 SHA256 baac1fdf8f5f9debe1f91a2f3ca6895cf24ef0f8b2d8c2c67f5ce6789f28663b SHA512 72b00e66690d3a21f79145f12a970ad14c84e7aabb91d64d72484849a6de949b29d96cffa830e22c967fe74c76847e7982d1ce0cda16538c5b50097c16f7b69e WHIRLPOOL 09993ff2e5d67220f13f6cfa9b19512539bc14e611b5d5fe4bde192a0657760485152aefd624e7f95af1084a94753fd9bdd4866ad4e913989b7e67b5021774ce
-DIST openconnect-7.05.tar.gz 1307754 SHA256 0f25290d01e514ec54b10017ee3bbe010e428c49ed1a7b50f1565c8fb21720c4 SHA512 adbc184fb5f93193bf446340b7f4e27c9e5dd973c8ee8f7b58ff2ec55255718401fd4713c19a94afc56a3585cfff2868b65f220e99e788fc74ae3406335175e7 WHIRLPOOL 608aa84eb2d921e0e2ef9493c3447e9dd8c7e5ae5b2bad48d1f3f470cb08cc4c88ef41e159d0085aeb25c2ad904b53877884b666ed4e4ffcda91ff9f0ae2a5dc
 DIST openconnect-7.06.tar.gz 1343870 SHA256 facf695368dc4537a6a30e2147be90b1d77ee3cb2d269eaef070b6d9ddab70f2 SHA512 d1af9efe4ac1f6671dc6b92db0df981e8cae3f2f50b8b4c35a112b42a76517b7c8ea9fd5da93352445dd61da3012bf34fdbcc3add9d8727cbaad7d311e516108 WHIRLPOOL b1b98bf8d900714eb7c7ab82bbd4371050f307b7872bd70b4b9c31f72bb15670842f41c381cbe31aad7e5e98bccbe0663e49b988d5c321c706719b8fa19a2654
 DIST openconnect-script-20121108205904.tar.gz 6380 SHA256 99fb6c72c13b5724766a952e392b75774771f220f59793e5d2576d7e3412555b SHA512 089650538f035875c205bed0190e44ed8176a138bbe2f635ac5335050c3b831fc85fbd61448ddaf7cb540c0a5d9b32f8f909e1fd5be188bfef07e721d4656545 WHIRLPOOL 3dc2b820afe49cc59c96d514f166d94fdbc3db9f3edbace69e41ae7e604263a834fff0a1fa7be806ff88c328a75de4306ec159e4022d43cd245addf34615efb2
-DIST openconnect-script-20130310115608.tar.xz 6172 SHA256 35743e02dce5e04eb5921237267eea922c68fb3a48c820c7d45c88b37fa6e456 SHA512 10ddfcd322a1a5748f5a7a490e631571f4e9451f831bb1bf80edac6cd0bf2c8523e21fff10ead2162a78cc60551f2a62fd8d65501c5daf9df8c863d30fad8b3f WHIRLPOOL 263076480254e922c91a8f1c7abed1256c800257889f74e25f26c44a918ca4d34109c0fa3aa8046ca3751b5755034776c28a815482d03d40a76bae8524c62408
 DIST openconnect-script-20140311.tar.xz 6240 SHA256 908c667507132ef0269b6d1511ee8b89ae22dfa272c9ffa7ea24c1fa1b31fceb SHA512 043443c615b076d61ea8c464a6b7b68ca526e636313488501459f6eca6974c276d3a60e165fb23f017858a18b255f9c9e1ad80736cb852756d7fe8f3bc5aa917 WHIRLPOOL ae5632be17d72bf7992814e0262cb862ee0bec48dbd119d33bc94b3647755087c2427418ea0064c7560be6e06dc83a2702587fab3403afccfc90d3df8acd0a9f
-DIST vpnc-script-df5808b3.sh 23761 SHA256 48ff64e339d2c2c129ff560bc671e2217fcaa39c98c633768770dab30c21fe72 SHA512 8695566c5485b7502431c800dc14b1aac1dbc3a75f15ab9f3756819df26bec446cf75142bce328405ca0b669ecb248c08b81af6af13989d08a178872b247d169 WHIRLPOOL e754f6e8a77b1ce902d003ce01f63f08e00fba35d36b046fe32160738b516c44c2ee9234434b98988d4d37f294c6a412af7351117bc76198ee47fc3135f3aa95
 DIST vpnc-scripts-20140806.tar.gz 20070 SHA256 1f61a6c5ec8a2dab7d5f12c9b438d931e41c6c1c258801ee978d5ed460f4d35f SHA512 bfa230d6eb2db0696a23228cef6e742dcf5e609c25de725c23e2c7bee96d00045ea656d6c7025cdf7785f70baeb8a8d79af6aec93d7285bcb3c029dc744e5380 WHIRLPOOL 78d0c5e23f408167904639a7804859a1d6b89668feab6834a589a3d9f7abf4f9d1da984553a8871b6a16af39a03e5a6f3f6506dd77f7f960c7fcdd56f0683e27
 EBUILD openconnect-4.08.ebuild 4640 SHA256 82bb65be696e095e58718e3d71db3465bf4d4e3c008e16d3a9f434970d16eb96 SHA512 f7594aac69feace09acb775db59a84ac56f986a0f9d673e43fc44b8e242a1a05bbb9846cd8d2789b0ca006a86c0f100cf8008c6cdcf112858caa9b23afad1479 WHIRLPOOL 8576648f4ec5f8aebe1593e9b8fd6f170ed4ae700aa642fb557e051cc5d8f340ad8dbf7d00de8628dd73dec071739886dd406ec2dc5f7bfa96d4cbea04d9b9af
-EBUILD openconnect-5.01.ebuild 5056 SHA256 31e567b85b3c720f0145b1bf66a86ea952d3e7306516eb2c2d80a8913670ff13 SHA512 f69e60b4fdd1635413c0a8610475b0a3f965d79d39adffa77dc8ee3689574292498e1da833a77d61316291024aa3e89a083ef0460a902d0ff2fd5d5ce30f238b WHIRLPOOL 3db71a1f743ac25905fa82fd8e6e9582fd1c94b342d667355e2df51125483b9042c17be33f0fb20314b52d924b50622c5a5336a00b75935845ba930d52164521
-EBUILD openconnect-5.02.ebuild 5056 SHA256 55566ef9dd603d9384407f7eef381799f8e2712efcc5f3c711cdd4d0dd29cf35 SHA512 30ae0d87d07fc43aff6210a6656e487640e8ae9deb6d33b3a3bc4215c6b051a517fc328182937314b16ffe926ea080a1186b43afe3aefea9939a77cbcdcfbce7 WHIRLPOOL 34559efdbde1766be9fbd4f5ccc07b7269b94f79dd79a993b1ad92a917d869d5488b41fb2577c637fef3692556b653e1c464a4e32d5d0fd6da21918cdb0fc1d5
-EBUILD openconnect-5.03.ebuild 5056 SHA256 c9155e4d61773337677c5692d2b047dd74629e318487b4d88ff13dde30fbe443 SHA512 4e81368ffc265e2a05cd5f2cef9e489ed4283576083c9c8a6c61cf37505a0e7c564a0bd58b40fdd4c28d9c1ca2a6c9bebfdd50cdd39f5c7a5061e21be650dbdf WHIRLPOOL 44e1a58acb62a7dea762dc26e08e1c0cc42b2edafe6d2b5e7d92c9ba805e7096517d1f57759079cc3b78585fe257a3c6515bf698bdefb0a3dacd9b626e701f22
-EBUILD openconnect-5.99-r1.ebuild 4750 SHA256 9a59fc992128bac0e53b8de4bb1e0fdb53d6aebb0ee1dc83a149884d4de396bc SHA512 184d3d70d1b38ae0ef426ab380c5a9c036c0e7d343767161dfd602d8201bf6511ae90bd744d3870d6759f87058e5c4375e1ff26124c3ee9608653a37f250b9cd WHIRLPOOL ca00692bbed86092b0d6339a9e511d725d9552be42f8244c7ea85ed55ef16ad0baffdfa1d68f6c792a111b22eda19e422d10712a1e73ed2ce5d4dec103c8ffce
-EBUILD openconnect-5.99.ebuild 4747 SHA256 1ffa92c1e20b2957e66425f3f79fc9f7b93e96adc1a3bf9e5279ff88dacabe3c SHA512 2c2c3f31dca49bb1b5c920823432486066fbc04b70a8ecdac23698ec04e0453913584fb670b3913ff55e6ba7fc698832a1b7a371d1320212d3e7c738ffaca23a WHIRLPOOL 6afa7f2b87ba5a6d86d68be1d1b9b66075196efa55785e7e348b9c3815aeacfba186628ba97767e0952243d1908deb28c443ccf512c7629982407ef6870e39cc
-EBUILD openconnect-6.00.ebuild 4668 SHA256 114e92ede1fd90070fb16563fa7aafdb075ea8a0cbaa6c63cf8ec653eed47c2c SHA512 975e1a3b3d2a4d6fd58cdf774b08e1b26fe13ba09db5e4ea126712b85947a39295938378f563e8636e6ec75f0bcac26fa783f53087c4e79fdd233d33ea7a737d WHIRLPOOL 09e290715b939abbd8f628ba716fe35bf0e21a4b043f3aae6e9e27736a05fe12554e21f42e9103129e399fba93b6c4f15d0dd69d55ee33fe871ff3ff8655bf5e
-EBUILD openconnect-7.01.ebuild 4436 SHA256 d317f99334867ee031f012ad6b0eec63954f32c8f0856dec5afabe232717be60 SHA512 3aa0685b8159cc5704cfe3f634ebf372bf9533896e4e5e737cb95714b76478a25a8c38319340a28722f1fd59ab1b7e483f0f37322f90807e2e0249f1d106288c WHIRLPOOL 65212fa96f582e57ea4d6a1ea1d45d7f7735f05a98dda790b5acf1712f47c1c9fc76ca006ac2941caff14a477da14d2e9385384d569e057b5731ca2c652e364e
-EBUILD openconnect-7.02.ebuild 4372 SHA256 97271c793a5da39fe3efdc08ec7bd044d66cca15fc394828c4244fcfb0548f57 SHA512 05910be046c16f700265bb7c718b1640ef40bc40acd276328bfa62fc432d00db75d002fe3141759bac3637da99d49b3a7897568a47476856e11386941c510f48 WHIRLPOOL 029bf583ebc6a85fe373d1b916348783d3e6cd0b7b96f82f7de207ca6f2ee3397d24c81051b1f3c90ba3e6c92b4539ef0702ca9b2b497f45e8ef8fced99f902f
-EBUILD openconnect-7.04.ebuild 4398 SHA256 b98568864091fef3c4fc8358786dad91adb34b2206839ce52fe1afebbf414787 SHA512 297fac19719798b2987636b1cf40b25e0c28ac0cc55c4c01bff2220d8a0520edc3d01a42f7fe82a3e962517b42dc1c49db4ec4512042430489c12285483dbdcc WHIRLPOOL 1b5ea99112e7fca3802ddaca4df8ef15427ad0ed7b685acad4ad512c054594df43d4a3cf89f7abe3c0a790a1c889a6a11cb612b56db489c1cd875a4ef6b9f125
-EBUILD openconnect-7.05.ebuild 4377 SHA256 906c3da266c24fe81653783b926fb88be0a28f85984126da21aefb0391842af5 SHA512 bfd3aace7bfcd089c103493a2eb9e2ff698a1625cc7b6b93f021b4a3101bf11772a53a295fcc284f2806f8fb464ff80187873da6adfa78297d3501e98a490853 WHIRLPOOL ee184627d7f880d742c9dde92debe0bebc7d14f17201a4bd29515a9d2ef4822c9e35c75fc9646c3c078a756471fce78fccb236fc05cbf131a6e6336e69875f17
-EBUILD openconnect-7.06.ebuild 4377 SHA256 f255ec3f861fad9ab11e930c1c7adb00271df1e0bfb9c424c55df15f4551bb3e SHA512 03eaec1b0e185347c0de9219a5854d8da9cbd37820370717fba2331a71668a8a29d4188f5ae94114ed675d55a950118bf7db50f16b6eb72c384ca3be7e7a9538 WHIRLPOOL b407926aec65fb0e83af5f3ff1fe53bf6b92ffa9ec20a7d1d7ef1f5e80a168b2a6005401aa2623cff82c3829a55fd8a0843794141d9ce8b03638ac49f7235832
-MISC ChangeLog 7073 SHA256 534bebc09f40388642338e0aa229b453803dcb0858997d36e53ff65ae069ea2b SHA512 fcbfcb2bacc0b2eec21faab9cc23356c5dd8115c5b358c893eb00b5a5cfb8923643ac3243c693d6e0640f15097ae52e266157764d0d06539778d97e1a2629299 WHIRLPOOL 830498baff6a058b1ab29f4dc8cc53f83a2400a7ea9afded532d38a3e6f35f6f17246732ed777e983d2a4fc4d11cace5c3ef8fac3449a0370606bd2e8f7e283b
+EBUILD openconnect-6.00.ebuild 4663 SHA256 59e425996c1fb2546aea51899dbf908d5e0269ca14a271b7fe1dd9517a60f1db SHA512 e62fbee7c1fcc562b98fc86e6ca7676763541744c643f9a7b3e389a4490ae9f56da73d8f6df49d1f0c8072b16e134373ee8cd66245905dd6659381720a8ae0bf WHIRLPOOL 3a9e85eb5b68db6e7c46338296d5b1664787ffaf6b18e788045d14442a89097fa98edd26c1864d188d75e1513e9886fd41dc503cfef31c2a8c8d936b3ba1dbdf
+EBUILD openconnect-7.02.ebuild 4367 SHA256 fd80d9e8bb78909f062228029ed79a7ff97c321b27b23c5277ef033a012e9040 SHA512 47215d2e4b5ee662aff6b3dcea47064e2c77daf34f57f8691d30b204b906551d0fed0823093936b74a7b4b176620919e1cd48435e2592f28c3cf7afc30529ef4 WHIRLPOOL 192fd38dfd08929dea0de8728cfc007af88e4f6dbb8d38fee24d11becab9ac52606659ad70d804418fe6231df42e859e3259437b23460988c68e9eff70b48468
+EBUILD openconnect-7.06.ebuild 4372 SHA256 5997d43d1957a2b6ae3d2c63b9ee3be0bcc48ebf2a205d0ef8f20732336e2604 SHA512 e7dc6587655bf8a1a1cf5c9c4a0b83cd41b60f923ded01c2e80d5aaa182593ac857d783f63c188b4a219332bca0ca16fe9594bb1be90a4d9f09665e3e1f4b571 WHIRLPOOL 308fc2eb10084a033ab2c646119b9b67c14577c22c52a8d0ed9d0172b8269d2b0c7b4b9d43d2d1edf6e7791fb9e08813c46e38168bef6555c28d10f4678c1004
+MISC ChangeLog 7462 SHA256 ba818560068b3c58c083065b31d5b4ef9e45aa3ca22333bd52447af725d83deb SHA512 3e65c8e7d7e7f38f8260aa9fe1f077a5ae72c37d7a5c790705c322a7c14697f7bb56b836de65e6f7050c95830c5327624f8a842e017be59dfb7874e726804a51 WHIRLPOOL d7d1660f5a6d2673aeeadbd17ba00c1176b3e6c076e9b2377d4f353063b544b7ed397465b6a67b2c6f887face333096444a659e25ff474b3f10759de44c30983
 MISC metadata.xml 606 SHA256 c62dfd9f1996b2318f603d0d66b31cbe034773873d844dd344c86fecbf1f22f4 SHA512 2ebe6f9936c7dd7762874f9f8a5c5b9c206bb9af806990af5c9a85fdc1911a6078a7d6be73afbe6e018f777c61caeace9c0aa6710f1ab90446ae8609cdb6285a WHIRLPOOL fe571cb438ebe0e881b791e66acffccac15aba941d90694c751df6550b53bb986a17adfafbf6129123cf5ecde7a50ad4ea8f9f87622b12cd40c8462b79a32cdc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJW3PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdYEQALe5p6QYwUwY6N91evyfr+bz
-pqE9cLPanCzJ/brEegKL8W2w/rBPJV5UgzweY9zS8t3/h9HHW6petaLCTCs0kjdI
-4DyGJaOmwPpK1DKnzwjs7pJYNX4q50BEMqdRYcG1YJ6uDT26ihuaU869cqQ2npXl
-ZD7OwOxde3sVmk9lki200VKiH878hpSWKEfC5rb75W7BI4WjAiDt1eOO9ZbAP0Hg
-qEdqjTSZAwm74toCJ5bfgN6/Ehk7kSMoLwpILH5xB1vzndBiD9DAz8KHrnTQ3DQz
-gkS0h2zVzCgoVR6hAO4YciZl0/2yAyMOK/IdeOup7reyDQIcyDesxMypR/p5slTA
-haj1MWrK40LEgIYYY6DjE/y8VrlGb2ZdbmqUeO4e6F5RpXO0gNjML0Hp6yGltwzI
-nue1U14Ks1kPYK+9QtQ/kPOhHL0jf+DaiKFnc3U9uBKiQiib5bULQWBC72DnTuDb
-qyE7BKoox2s8UT5DY+v1D8MLfRP/n8Z9j1+/9G94lqVr9D6zfD+J9oqzZHGEsmRs
-01BBcNTNnGelb7eet+QqEF9wS10Uazp79W2xa51yszyxUxE4hiwUaRsHnIJlJvda
-CpvS01UhbDx1Hphi350oimuL7NrPaFf+sAO0h3Hr/MesEm6OQLhaw2jKoknsUGLc
-TrsTmkkSEHxvy0i9z5PI
-=awfp
+iF4EAREIAAYFAlU+h44ACgkQC77qH+pIQ6RTrgD/dm4nh6oqLUR6Ke6Bk07VNBSl
+vV135LxqpN2dSL2soiYBAIxSNCxPB8zXFjIjiK6JYFDmoEYwoMV7hJdnJTOV5lgx
+=8iWk
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openconnect/openconnect-5.01.ebuild b/net-misc/openconnect/openconnect-5.01.ebuild
deleted file mode 100644
index 819f1fac0e82..000000000000
--- a/net-misc/openconnect/openconnect-5.01.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.01.ebuild,v 1.6 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils linux-info python-any-r1
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-# New versions of openconnect-script can be found here:
-# http://git.infradead.org/users/dwmw2/vpnc-scripts.git/history/HEAD:/vpnc-script
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~hwoarang/distfiles/openconnect-script-20121108205904.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc +gnutls libproxy nls static-libs"
-ILINGUAS="ar as ast bg bg_BG bn bn_IN bs ca ca@valencia cs da de el en_GB en_US eo es es_CR
-	es_MX et eu fa fi fr gd gl gu he hi hi_IN hu id it ja km kn ko ku lo lt lv ml mr
-	ms nb nl nn no or pa pl pt pt_BR pt_PT ro ru sk sl sq sr sr@latin sv ta te
-	tg th tl tr ug uk ur_PK vi vi_VN wa zh_CN zh_HK zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		|| (
-			>=dev-libs/openssl-1.0.1f:0[static-libs?]
-			(
-				>=dev-libs/openssl-1.0.1:0[static-libs?]
-				<dev-libs/openssl-1.0.1d:0[static-libs?]
-			)
-			<dev-libs/openssl-1.0.0k:0[static-libs?]
-		)
-	)
-	gnutls? (
-		|| (
-			( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt:0[static-libs?] )
-		)
-		app-misc/ca-certificates
-	)
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	# Override vpn-script test since the build system violates the sandbox and
-	# needs the path set to the real default path after it's installed
-	sed -e "s#-x \"\$with_vpnc_script\"#-n \"${WORKDIR}/openconnect-script\"#" \
-		-i configure || die
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script=/etc/openconnect/openconnect.sh \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		--without-liboath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r1 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/openconnect-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-	elog
-	elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-	elog "instead of calling it directly:"
-	elog
-	elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-	elog
-	elog "You can then start the vpn tunnel like this:"
-	elog
-	elog "/etc/init.d/openconnect.vpn0 start"
-	elog
-	elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-	elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog
-	elog "Then add executable shell files:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog "cd /etc/openconnect/vpn0"
-	elog "echo '#!/bin/sh' > preup.sh"
-	elog "cp preup.sh predown.sh"
-	elog "cp preup.sh postup.sh"
-	elog "cp preup.sh postdown.sh"
-	elog "chmod 755 /etc/openconnect/vpn0/*"
-}
diff --git a/net-misc/openconnect/openconnect-5.02.ebuild b/net-misc/openconnect/openconnect-5.02.ebuild
deleted file mode 100644
index f507bfffee81..000000000000
--- a/net-misc/openconnect/openconnect-5.02.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.02.ebuild,v 1.4 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils linux-info python-any-r1
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-# New versions of openconnect-script can be found here:
-# http://git.infradead.org/users/dwmw2/vpnc-scripts.git/history/HEAD:/vpnc-script
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~hasufell/distfiles/openconnect-script-20130310115608.tar.xz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc +gnutls libproxy nls static-libs"
-ILINGUAS="ar as ast bg bg_BG bn bn_IN bs ca ca@valencia cs da de el en_GB en_US eo es es_CR
-	es_MX et eu fa fi fr gd gl gu he hi hi_IN hu id it ja km kn ko ku lo lt lv ml mr
-	ms nb nl nn no or pa pl pt pt_BR pt_PT ro ru sk sl sq sr sr@latin sv ta te
-	tg th tl tr ug uk ur_PK vi vi_VN wa zh_CN zh_HK zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		|| (
-			>=dev-libs/openssl-1.0.1f:0[static-libs?]
-			(
-				>=dev-libs/openssl-1.0.1:0[static-libs?]
-				<dev-libs/openssl-1.0.1d:0[static-libs?]
-			)
-			<dev-libs/openssl-1.0.0k:0[static-libs?]
-		)
-	)
-	gnutls? (
-		|| (
-			( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt:0[static-libs?] )
-		)
-		app-misc/ca-certificates
-	)
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	# Override vpn-script test since the build system violates the sandbox and
-	# needs the path set to the real default path after it's installed
-	sed -e "s#-x \"\$with_vpnc_script\"#-n \"${WORKDIR}/openconnect-script\"#" \
-		-i configure || die
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script=/etc/openconnect/openconnect.sh \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		--without-liboath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r1 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/openconnect-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-	elog
-	elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-	elog "instead of calling it directly:"
-	elog
-	elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-	elog
-	elog "You can then start the vpn tunnel like this:"
-	elog
-	elog "/etc/init.d/openconnect.vpn0 start"
-	elog
-	elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-	elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog
-	elog "Then add executable shell files:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog "cd /etc/openconnect/vpn0"
-	elog "echo '#!/bin/sh' > preup.sh"
-	elog "cp preup.sh predown.sh"
-	elog "cp preup.sh postup.sh"
-	elog "cp preup.sh postdown.sh"
-	elog "chmod 755 /etc/openconnect/vpn0/*"
-}
diff --git a/net-misc/openconnect/openconnect-5.03.ebuild b/net-misc/openconnect/openconnect-5.03.ebuild
deleted file mode 100644
index fc64844726f5..000000000000
--- a/net-misc/openconnect/openconnect-5.03.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.03.ebuild,v 1.4 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils linux-info python-any-r1
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-# New versions of openconnect-script can be found here:
-# http://git.infradead.org/users/dwmw2/vpnc-scripts.git/history/HEAD:/vpnc-script
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~hasufell/distfiles/openconnect-script-20130310115608.tar.xz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc +gnutls libproxy nls static-libs"
-ILINGUAS="ar as ast bg bg_BG bn bn_IN bs ca ca@valencia cs da de el en_GB en_US eo es es_CR
-	es_MX et eu fa fi fr gd gl gu he hi hi_IN hu id it ja km kn ko ku lo lt lv ml mr
-	ms nb nl nn no or pa pl pt pt_BR pt_PT ro ru sk sl sq sr sr@latin sv ta te
-	tg th tl tr ug uk ur_PK vi vi_VN wa zh_CN zh_HK zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		|| (
-			>=dev-libs/openssl-1.0.1f:0[static-libs?]
-			(
-				>=dev-libs/openssl-1.0.1:0[static-libs?]
-				<dev-libs/openssl-1.0.1d:0[static-libs?]
-			)
-			<dev-libs/openssl-1.0.0k:0[static-libs?]
-		)
-	)
-	gnutls? (
-		|| (
-			( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
-			( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt:0[static-libs?] )
-		)
-		app-misc/ca-certificates
-	)
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	# Override vpn-script test since the build system violates the sandbox and
-	# needs the path set to the real default path after it's installed
-	sed -e "s#-x \"\$with_vpnc_script\"#-n \"${WORKDIR}/openconnect-script\"#" \
-		-i configure || die
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script=/etc/openconnect/openconnect.sh \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		--without-liboath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r1 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/openconnect-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-	elog
-	elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-	elog "instead of calling it directly:"
-	elog
-	elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-	elog
-	elog "You can then start the vpn tunnel like this:"
-	elog
-	elog "/etc/init.d/openconnect.vpn0 start"
-	elog
-	elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-	elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog
-	elog "Then add executable shell files:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog "cd /etc/openconnect/vpn0"
-	elog "echo '#!/bin/sh' > preup.sh"
-	elog "cp preup.sh predown.sh"
-	elog "cp preup.sh postup.sh"
-	elog "cp preup.sh postdown.sh"
-	elog "chmod 755 /etc/openconnect/vpn0/*"
-}
diff --git a/net-misc/openconnect/openconnect-5.99-r1.ebuild b/net-misc/openconnect/openconnect-5.99-r1.ebuild
deleted file mode 100644
index ef0f30c2988e..000000000000
--- a/net-misc/openconnect/openconnect-5.99-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.99-r1.ebuild,v 1.3 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils linux-info python-any-r1
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-# New versions of openconnect-script can be found here:
-# http://git.infradead.org/users/dwmw2/vpnc-scripts.git/history/HEAD:/vpnc-script
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~hasufell/distfiles/openconnect-script-20130310115608.tar.xz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/3"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc +gnutls java libproxy nls static-libs"
-ILINGUAS="ar cs de el en_GB en_US es fi fr gl id lt nl pa pl pt pt_BR sk sl ug uk zh_CN zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		|| (
-			>=dev-libs/openssl-1.0.1f:0[static-libs?]
-			(
-				>=dev-libs/openssl-1.0.1:0[static-libs?]
-				<dev-libs/openssl-1.0.1d:0[static-libs?]
-			)
-			<dev-libs/openssl-1.0.0k:0[static-libs?]
-		)
-	)
-	gnutls? (
-		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	java? ( virtual/jre )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} )
-	java? ( virtual/jdk )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	# Override vpn-script test since the build system violates the sandbox and
-	# needs the path set to the real default path after it's installed
-	sed -e "s#-x \"\$with_vpnc_script\"#-n \"${WORKDIR}/openconnect-script\"#" \
-		-i configure || die
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script=/etc/openconnect/openconnect.sh \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		--without-liboath \
-		$(use_with java)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r2 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/openconnect-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-	elog
-	elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-	elog "instead of calling it directly:"
-	elog
-	elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-	elog
-	elog "You can then start the vpn tunnel like this:"
-	elog
-	elog "/etc/init.d/openconnect.vpn0 start"
-	elog
-	elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-	elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog
-	elog "Then add executable shell files:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog "cd /etc/openconnect/vpn0"
-	elog "echo '#!/bin/sh' > preup.sh"
-	elog "cp preup.sh predown.sh"
-	elog "cp preup.sh postup.sh"
-	elog "cp preup.sh postdown.sh"
-	elog "chmod 755 /etc/openconnect/vpn0/*"
-}
diff --git a/net-misc/openconnect/openconnect-5.99.ebuild b/net-misc/openconnect/openconnect-5.99.ebuild
deleted file mode 100644
index 763898af60d3..000000000000
--- a/net-misc/openconnect/openconnect-5.99.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.99.ebuild,v 1.5 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils linux-info python-any-r1
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-# New versions of openconnect-script can be found here:
-# http://git.infradead.org/users/dwmw2/vpnc-scripts.git/history/HEAD:/vpnc-script
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	http://dev.gentoo.org/~hasufell/distfiles/openconnect-script-20130310115608.tar.xz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/3"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc +gnutls java libproxy nls static-libs"
-ILINGUAS="ar cs de el en_GB en_US es fi fr gl id lt nl pa pl pt pt_BR sk sl ug uk zh_CN zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		|| (
-			>=dev-libs/openssl-1.0.1f:0[static-libs?]
-			(
-				>=dev-libs/openssl-1.0.1:0[static-libs?]
-				<dev-libs/openssl-1.0.1d:0[static-libs?]
-			)
-			<dev-libs/openssl-1.0.0k:0[static-libs?]
-		)
-	)
-	gnutls? (
-		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	java? ( virtual/jre )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} )
-	java? ( virtual/jdk )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	# Override vpn-script test since the build system violates the sandbox and
-	# needs the path set to the real default path after it's installed
-	sed -e "s#-x \"\$with_vpnc_script\"#-n \"${WORKDIR}/openconnect-script\"#" \
-		-i configure || die
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script=/etc/openconnect/openconnect.sh \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		--without-liboath \
-		$(use_with java)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r1 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/openconnect-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-	elog
-	elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-	elog "instead of calling it directly:"
-	elog
-	elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-	elog
-	elog "You can then start the vpn tunnel like this:"
-	elog
-	elog "/etc/init.d/openconnect.vpn0 start"
-	elog
-	elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-	elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog
-	elog "Then add executable shell files:"
-	elog
-	elog "mkdir /etc/openconnect/vpn0"
-	elog "cd /etc/openconnect/vpn0"
-	elog "echo '#!/bin/sh' > preup.sh"
-	elog "cp preup.sh predown.sh"
-	elog "cp preup.sh postup.sh"
-	elog "cp preup.sh postdown.sh"
-	elog "chmod 755 /etc/openconnect/vpn0/*"
-}
diff --git a/net-misc/openconnect/openconnect-6.00.ebuild b/net-misc/openconnect/openconnect-6.00.ebuild
index a522e7fb205f..91300f7f5945 100644
--- a/net-misc/openconnect/openconnect-6.00.ebuild
+++ b/net-misc/openconnect/openconnect-6.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-6.00.ebuild,v 1.3 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-6.00.ebuild,v 1.4 2015/04/27 19:01:33 floppym Exp $
 
 EAPI="5"
 
@@ -34,7 +34,7 @@ DEPEND="dev-libs/libxml2
 		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
 		app-misc/ca-certificates
 	)
-	gssapi? ( app-crypt/mit-krb5 )
+	gssapi? ( virtual/krb5 )
 	libproxy? ( net-libs/libproxy )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
diff --git a/net-misc/openconnect/openconnect-7.01.ebuild b/net-misc/openconnect/openconnect-7.01.ebuild
deleted file mode 100644
index edf64b9f05eb..000000000000
--- a/net-misc/openconnect/openconnect-7.01.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.01.ebuild,v 1.3 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils linux-info python-any-r1
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-VPNC_REV=df5808b3
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/${VPNC_REV}:/vpnc-script -> vpnc-script-${VPNC_REV}.sh"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc +gnutls gssapi java libproxy nls static-libs"
-ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0[static-libs?]
-	)
-	gnutls? (
-		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	gssapi? ( app-crypt/mit-krb5 )
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	java? ( virtual/jre )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( virtual/jdk )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		--without-liboath \
-		$(use_with gssapi) \
-		$(use_with java)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r3 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${DISTDIR}"/vpnc-script-${VPNC_REV}.sh openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-		elog
-		elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-		elog "instead of calling it directly:"
-		elog
-		elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-		elog
-		elog "You can then start the vpn tunnel like this:"
-		elog
-		elog "/etc/init.d/openconnect.vpn0 start"
-		elog
-		elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-		elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-		elog
-		elog "mkdir /etc/openconnect/vpn0"
-		elog
-		elog "Then add executable shell files:"
-		elog
-		elog "mkdir /etc/openconnect/vpn0"
-		elog "cd /etc/openconnect/vpn0"
-		elog "echo '#!/bin/sh' > preup.sh"
-		elog "cp preup.sh predown.sh"
-		elog "cp preup.sh postup.sh"
-		elog "cp preup.sh postdown.sh"
-		elog "chmod 755 /etc/openconnect/vpn0/*"
-	fi
-}
diff --git a/net-misc/openconnect/openconnect-7.02.ebuild b/net-misc/openconnect/openconnect-7.02.ebuild
index ffddd7ec72ec..f0ab34c4a72d 100644
--- a/net-misc/openconnect/openconnect-7.02.ebuild
+++ b/net-misc/openconnect/openconnect-7.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.02.ebuild,v 1.5 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.02.ebuild,v 1.6 2015/04/27 19:01:33 floppym Exp $
 
 EAPI="5"
 
@@ -33,7 +33,7 @@ DEPEND="dev-libs/libxml2
 		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
 		app-misc/ca-certificates
 	)
-	gssapi? ( app-crypt/mit-krb5 )
+	gssapi? ( virtual/krb5 )
 	libproxy? ( net-libs/libproxy )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
diff --git a/net-misc/openconnect/openconnect-7.04.ebuild b/net-misc/openconnect/openconnect-7.04.ebuild
deleted file mode 100644
index e33910d02f2e..000000000000
--- a/net-misc/openconnect/openconnect-7.04.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.04.ebuild,v 1.2 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-VPNC_VER=20140806
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +gnutls gssapi java libproxy nls static-libs"
-ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0[static-libs?]
-	)
-	gnutls? (
-		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	gssapi? ( app-crypt/mit-krb5 )
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		--without-liboath \
-		$(use_with gssapi) \
-		$(use_with java)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r3 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
-		elog
-		elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
-		elog "instead of calling it directly:"
-		elog
-		elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-		elog
-		elog "You can then start the vpn tunnel like this:"
-		elog
-		elog "/etc/init.d/openconnect.vpn0 start"
-		elog
-		elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
-		elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
-		elog
-		elog "mkdir /etc/openconnect/vpn0"
-		elog
-		elog "Then add executable shell files:"
-		elog
-		elog "mkdir /etc/openconnect/vpn0"
-		elog "cd /etc/openconnect/vpn0"
-		elog "echo '#!/bin/sh' > preup.sh"
-		elog "cp preup.sh predown.sh"
-		elog "cp preup.sh postup.sh"
-		elog "cp preup.sh postdown.sh"
-		elog "chmod 755 /etc/openconnect/vpn0/*"
-	fi
-}
diff --git a/net-misc/openconnect/openconnect-7.05.ebuild b/net-misc/openconnect/openconnect-7.05.ebuild
deleted file mode 100644
index 9bf0eacbfdd1..000000000000
--- a/net-misc/openconnect/openconnect-7.05.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.05.ebuild,v 1.3 2015/04/08 18:04:50 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-VPNC_VER=20140806
-SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +gnutls gssapi java libproxy nls static-libs"
-ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0[static-libs?]
-	)
-	gnutls? (
-		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
-		app-misc/ca-certificates
-	)
-	gssapi? ( app-crypt/mit-krb5 )
-	libproxy? ( net-libs/libproxy )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	java? ( >=virtual/jdk-1.6 )
-	nls? ( sys-devel/gettext )"
-
-tun_tap_check() {
-	ebegin "Checking for TUN/TAP support"
-	if { ! linux_chkconfig_present TUN; }; then
-		eerror "Please enable TUN/TAP support in your kernel config, found at:"
-		eerror
-		eerror "  Device Drivers  --->"
-		eerror "    [*] Network device support  --->"
-		eerror "      <*>   Universal TUN/TAP device driver support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "no CONFIG_TUN support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-
-	if use doc; then
-		python-any-r1_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			tun_tap_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
-			ewarn "kernel .config, Without it, it will not work correctly."
-			# We don't die here, so it's possible to compile this package without
-			# kernel sources available. Required for cross-compilation.
-		fi
-	fi
-}
-
-src_configure() {
-	strip-linguas $ILINGUAS
-	echo ${LINGUAS} > po/LINGUAS
-	if ! use doc; then
-		# If the python cannot be found, the docs will not build
-		sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
-	fi
-
-	# stoken and liboath not in portage
-	econf \
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-		$(use_enable static-libs static) \
-		$(use_enable nls ) \
-		$(use_with !gnutls openssl) \
-		$(use_with gnutls ) \
-		$(use_with libproxy) \
-		--without-stoken \
-		$(use_with gssapi) \
-		$(use_with java)
-}
-
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS TODO
-	newinitd "${FILESDIR}"/openconnect.init.in-r3 openconnect
-	dodir /etc/openconnect
-	insinto /etc/openconnect
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	# Remove useless .la files
-	prune_libtool_files --all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" net-dns/openresolv
-	fi
-}
diff --git a/net-misc/openconnect/openconnect-7.06.ebuild b/net-misc/openconnect/openconnect-7.06.ebuild
index e8bb023a2141..0cd774d2a9eb 100644
--- a/net-misc/openconnect/openconnect-7.06.ebuild
+++ b/net-misc/openconnect/openconnect-7.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.06.ebuild,v 1.2 2015/04/08 18:04:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.06.ebuild,v 1.3 2015/04/27 19:01:33 floppym Exp $
 
 EAPI="5"
 
@@ -33,7 +33,7 @@ DEPEND="dev-libs/libxml2
 		>=net-libs/gnutls-3[static-libs?] dev-libs/nettle
 		app-misc/ca-certificates
 	)
-	gssapi? ( app-crypt/mit-krb5 )
+	gssapi? ( virtual/krb5 )
 	libproxy? ( net-libs/libproxy )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}