Remove old

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

10 files changed, 22 insertions, 706 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 88d83d4e0718..bbf9f266fd8e 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.209 2013/03/11 07:38:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.210 2013/03/11 11:51:43 eras Exp $
+
+  11 Mar 2013; Eray Aslan <eras@gentoo.org> -files/CVE-2011-4862.patch,
+  -files/heimdal-kadmind.initd-r1, -files/heimdal-kdc.initd-r1,
+  -files/heimdal-kpasswdd.initd-r1, -heimdal-1.5.1-r1.ebuild,
+  -heimdal-1.5.2-r1.ebuild, -heimdal-1.5.2-r2.ebuild, -heimdal-1.5.2.ebuild:
+  Remove old
 
   11 Mar 2013; Agostino Sarubbo <ago@gentoo.org> heimdal-1.5.3.ebuild:
   Stable for sh, wrt bug #459166
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 1a2698ace9e7..4ab7120787da 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,17 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX CVE-2011-4862.patch 456 SHA256 856ef749a795087582849e6e14921d36271c110b6e1039e7e073e8b508031a08 SHA512 48b3626f4de4460365eadb70dbc4a1f96c784556e21a2f6f164b8d354dcfd33b38bddd970594a982be4120b5bc112642aaee0e2faef0f01e53bcbd06bbac0672 WHIRLPOOL 9c3a3efea952d45d9d7a765966afdd57c7cadf39ce0c152745685aa904d0e519fc216c7378b4b4755ce8a4ff231990824f024b3240874351ccbb88d5bad37857
 AUX heimdal-kadmind.confd 151 SHA256 892f9650d4eb631eb1ea435dc8d3defd3805e6d1f2fa59a698d424c44915d644 SHA512 2e2852fa6bebeb58da4bd80fb584339ab8c95fdc1e37f957045f9fcc9b212ccf61145d16c6f7a2fae6245e977200e48150f25bc4ac1d734692555ccfd9911810 WHIRLPOOL 89127ebe4a9134d67b43a84648fa77157a5e876e9b9259d698946e7240d3f7b1474d7322fa62916b418490d302acdfd33be17387acbdb2454bc7aebc840532d3
-AUX heimdal-kadmind.initd-r1 553 SHA256 cb598a34926c9152072f77027da0106684245e6c53cb931233de32a2c8011a79 SHA512 790839a622dc11c05f18f219eac683d2e965d438ca6c0985ed64b05851ab6e53b48cb8a0e37b34d4e0ce6b5e7d089a0fbea6943089500db9de7c5de3f6367879 WHIRLPOOL a7962626e73d8d1766d341e9a9077e1544325771775f866d05f99a08ed7588c5a85dda6d934f363a71f0089dc04ae5561896855da129997fe245a4b79229966b
 AUX heimdal-kadmind.initd-r2 547 SHA256 b8a183184bb69cfd0706843c42b42fcf7a99892018c057b4ba5379eb7fb1a155 SHA512 866ad56b10a669a47c7b1331181c0b6b88125f717732964663faa96f25aba70d00ba7021031e73f7ed514f98261a64cb6b47387b32c729c303b22414d77385ad WHIRLPOOL 5599b8143fd43abecdd78261233580ea2f25b26856fdb9addbae8586df42c90e3e484987e736adcc168a6dffc6c8ae0b71d7c791eea1cc170eb0da90683734fa
 AUX heimdal-kcm.confd 130 SHA256 04d90973441ef7b274986152fd78ca6b145fe022fe630d39bfa165cd25b63890 SHA512 dd70d57c3be5f0d4cf872463af1df6bec82774314e6462cd2433ff9fc4d2ff585210581c75bc76b33085e58b16e3ca795bbd531eba6b5f7a3f7f505b7e9ed50b WHIRLPOOL ffc5a9dc222c1d4e48284706406681efe3045d4758011b45c385a7b2182f6aab5b442c588b784f8fc7516ee2a3b6f3ab2e4e2d402dd6db8d6d9f4fbcdb41f180
 AUX heimdal-kcm.initd-r1 579 SHA256 77740430c294da3f3f18f186aeb2ba5560c5b8fd944de02603668ce385d99f3b SHA512 bdc67e3daf01e70d1c2f67a0a7baa44e024d278147079522382ba6285de74fa676f91d82509d651414966751a6e665ee2a2c2a9aecd25dfa940e584fa009a7e0 WHIRLPOOL 0ad02b9d8062ce1534280d0a6a499f0295508266560e6aa3654a38a0570c29c2eff46c537dba03e0654ec8b5517fc82832d5b42a458363668bd2a6c7e1c8543b
 AUX heimdal-kdc.confd 130 SHA256 c96bedd8c989378cc427da77862353a879bdbfdfd9c9e4b7b3ed1fa09f3d2f93 SHA512 817a3565948e75c01aaa3e8fd3d5d77715be4aecb51c33f61f0f4342fd8c4cfb458c20b71fb78d309becf600276cd5ea695c83e2cd17a9f99dd67f35d2c58b12 WHIRLPOOL a287e2efd1ece08161b47d978cb54c4f4b63915421d35bb5f1b7ba3e15cfe072a57abb3d1bcbcc9a2987bff2e7b3c2b28b8da013e53159ccfdb494d658a1e52b
-AUX heimdal-kdc.initd-r1 551 SHA256 f41052b3ac113c97933d3c83003aa5eec2de1a6baf3f739150e30a26ccac26b8 SHA512 caede34d4024cba8e57dd19d7883afe973ba8860bbe84ea4010b9864245107f32883110e3090bd01c489517938061e06d1137f49e0d6e724750a30ab0faacb81 WHIRLPOOL c42fad6aec6d75859d16e44273bae153910f00b5d185ef98622554bccf549b5ccda9faf406dafb04c04c89e3ff57f8e413e8393baec49758c8198ebe0df447b9
 AUX heimdal-kdc.initd-r2 550 SHA256 17dfab0e7d56e0c0b27c258838c34c0adfd17e75be40bacfe1d68ba26f8c2604 SHA512 9fef56b7e0c79c2b8496f8786101ce48c030169a0103cb21d1ea002c0a0619ec043f33df064e3ebb00be3d692074dbf546d4029a326c9c47e989d19348203f5c WHIRLPOOL 4c6e999e05c085ffe1ef5887208ccbfd61e8d07192be23bd22717e9df484a58837b8fc76a3f0ef1a41e35232c66163fddc358d835cc083cba66298d752bd1c6f
 AUX heimdal-kpasswdd.confd 148 SHA256 ee533af2cb109038108649bf3f44988fbb63d5a7fd2bacfd9842140790116003 SHA512 198d8f219abdd349213d26119e7cc343956981a5cb7d031186c81cb1a0b3f017097f4a429481089787b1cde6f8f013a8ee3909f6807f44b51531ac19a7a3a17e WHIRLPOOL bca32249a033919dd8b00ce94010408b8d2e259a11653372bd02f52a044a216146fe488ca91165095880cdc19bdc7a74fb9b9ce16ff803eeff760b6c39b70444
-AUX heimdal-kpasswdd.initd-r1 575 SHA256 97b4e84bcd991e9d52694a91568476e7bd4e94837bc1c8ec6a13cc2d23f74f04 SHA512 acea58891f90e6c8a73d7eaf082ba8086ff378f3c51f843e5493c24a9b25cfc4a56aef0951b30dceb9e6251069ae34bd3999d66e3cd200b0e9e1a7a4f6e2c644 WHIRLPOOL bdd3443a7419de73fbe909ff2f2aeb8917faa68d679c2add234b11e21a10dc11ebf58a0920775c8d4068871fd482eab5a92d959017b84b1bc8254d20f41cc45d
 AUX heimdal-kpasswdd.initd-r2 569 SHA256 4dbadcf17cd41807c0c470b3b81f8f1be0eafa72a888a49433c534ae179d1d47 SHA512 6244e81248f3a70b68b58de3c8164798b9774bc80ae34a3b4fc27d204a4f32c69640be38376f436eb3edaab341e0ea0d05fe03b90a2416b43b2d84bb8364a2a7 WHIRLPOOL bcbea16e319f153042d7000972623f0c399d6b432f813c5dca6de61e47b99382f6374c408e0cd087c13c6c97f588a98c124b675ff847e78497275e9b3384a423
 AUX heimdal_db5.patch 923 SHA256 5dac2109683705b2ade8962abfd88f1d989a371b811bc17176c5b360a67bcbe3 SHA512 63fc130ed68b4b39dbb828d25da5eeafaa04a5aa659c14c03fd2312dc78715bba681cff9b43992f4e4735b1a2267453b89b5c606c8a854bc92b04958788273c3 WHIRLPOOL b15abd5698aa7e8a8d5d828f8bc6d2c6aa9ea5c2400bbc696884f83301f68ea12802cb116122d1be0730c2411d8face9c0a2f115146feb9353cd682b8458048a
 AUX heimdal_disable-check-iprop.patch 577 SHA256 b2ab6f335b5a756856a5df635df82488f9dcdb3ed02a7114f90b4a34911f9721 SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e WHIRLPOOL 115bcf67b370a24aa911bfcaba5c9eee3015d02e14dd5522f9038bb31cdd968f046225eef064fca9134db885719e00499cba48ea43248f6793c4b3d477f6c52d
@@ -19,30 +15,24 @@ AUX heimdal_link_order.patch 1164 SHA256 794560047c549a996d03140ebcbd0476646f4a8
 AUX heimdal_missing-include.patch 255 SHA256 1ad9d71d01776e2d2dd49da5951f6f02630ce137be910ff8484968e8327837c3 SHA512 18f4a5b0c74ae11fbd8874d2954639f36d480655d978af2b2dd19a8ec2b206057ef4be5861d8daca0725926b295604daeaa895b6024b2098922cd189d3e4484b WHIRLPOOL 346f1117fb5558203e0b01bb5f35596fd9e89b3fc0b8ddee58e331fada9024f9cf6b8dde20773f26079a4d9d4f9e1fe224d4a24a1c51ac6d9475f3519dd5a521
 AUX heimdal_missing_symbols.patch 821 SHA256 f8ef2353ce328e444dc48e211a32e77af16b5877e9d3679bf36825e7e37911fd SHA512 75847162665a575424ac7f5dd743120b44b3b11747542c61a5605000bbf94672747b12b82a60afd080fa0b1cbf80611078f38bfd5e6a6992748ade70a1610cbf WHIRLPOOL 7219d08c36811e734f6ea1b51416a1dc08d57ea7234bd5937754bdc8151da5bf0bf4658c854bbd4efd8461a44d80734bf66ab6b7bb8bac5220fc0931dc146134
 AUX krb5.conf 424 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38 WHIRLPOOL 43526f52aee4dfb456058001bc553a81e478edd315c7c7ce8e639958afdb3049ccaa686234066b17b2edfc5aee0b4af95596e0fbebd0e66455ff0599de1af5f4
-DIST heimdal-1.5.1.tar.gz 6800347 SHA256 bd69940e67ce985589451d868354a959eebf96d8a059f513b23d40e4aa101d5f SHA512 897c8f562073d3f2638f1a2e7ffa76f56f3e46c3f986c50844bfba46735d4c0f1c09b9bfa3569d8dd79822afb1c04b69be09276f86e3dd2397874e4b3b839318 WHIRLPOOL 76195fde1921817b3674d71ea63ec694462f531c78fcc67c7ca94aaf7e6ca0d6507a61eb525524b5e10699275ef479938db297a6d6583a026fa7f96adc2b536d
-DIST heimdal-1.5.2.tar.gz 6798615 SHA256 22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec SHA512 a04abb6f6ad3b1d6c366d9c4e6d92f5c2ca00ae0261c7acbfb1a5782d1bab4b3c498c4fa4b114867cb7e09291cee663cf4fd5c25afca8deb425a8e5112308957 WHIRLPOOL fb0bf1a13675f240c3728cc3378d5652322c08b792a5c2d0ef21a954a1e76149bd580548aacd0dfa67df8653b27972b24bbc9e2a16ffd518646a2ca38f3d601c
 DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
-EBUILD heimdal-1.5.1-r1.ebuild 3875 SHA256 d9b54f31d60d628eb780d8548382939f6ee29c59357a0fe34449c57a6221f8d8 SHA512 68627cf737f08952ebf70b65fc9ae767afc6a6b23b4b794669f6850a4a2e185d30979122bb67c8a2f3e6b202bca8446aed09a534d51383854d5d9b6b51dc8dc0 WHIRLPOOL 412b3cf9690691d27af47da0a2c32ec17cacdfb8484bfceed6232708a77a205ee2978df3aa451a11250bc1d2628124f7b7d7b447f1294a4843c21c08c6666c27
-EBUILD heimdal-1.5.2-r1.ebuild 3819 SHA256 7d62483282132b9e0487abf33e06917bf16386de6cacf555b7da5974bd43c53f SHA512 bb8d5af6f3da6d8bc76db585ab300efe430695c2777f45bcfbc425a6a8b8518c3d87631970be3bb37345a8292bd4c72dee2612217e4c76b8083bfd52e9e63eb2 WHIRLPOOL 75fbe6419321fb3bf34794cfb759fafd656e8a914707cace88f3929b05b07afb918e5e70b8a766f9dafac096846ad3848643fec500c1d6527cf37852e0c1d5ce
-EBUILD heimdal-1.5.2-r2.ebuild 3841 SHA256 9f609dcb4c472cf00a96e4d922be3ca99f7f0f72f0dadeb444c162304d7f312a SHA512 dcf9f227cca89a516e4345a58a5175bfd876ae82227b4e3181f70dbe76e0bbd6366ffba95471ad556e0e0588aa694a21340aa5a385f8a8583422ad5ca001ad3b WHIRLPOOL 6482c8ebad778fcec575b5d950bfced22697d4139f4fa1e93e3ad0b35370640d939a8d2ec01b5d36cf2c769af5dc75536a964af277db420d9c13f76230df2056
-EBUILD heimdal-1.5.2.ebuild 3789 SHA256 c39af36fc72a3a5caaedcab3c3860b8ba922af50c41c744626bfd5cca92fca82 SHA512 484a705580ab4bad6c7cb07d89cdb0023e7e6dc8a1d6d5ca4f924bbb2767f82fef9e12b5921d425fde884f84772845cfd2039e4f997002b9ba0b652f92e74f69 WHIRLPOOL 14d4ab75260b4b9febf1d44525506a27b605bd6acc5e1cd1f5609783f23a4c56163f14030f697f8544a3c1661f8591de2875d417e1791f96a99ea2a9096c13b8
 EBUILD heimdal-1.5.3.ebuild 3671 SHA256 6330f4e4c94d55897d422cdcac933392f8f51c79d918c7182806281524267c55 SHA512 29b36debb43d4ad0250e5b19d45b047c647347114598a963d2b6614b25bf15ca2ac6d6f37f3bcf70fd9b05a1842acc59491ffa9970c53904c9fcf7bd29e71138 WHIRLPOOL 0c8991fa347d4a3441781bff9b373892f04a5099036579f62dc8d9205fa7913b83e085c6edcaea369711b8a8435904869f93c806c2d1e57d5c999ebf57fa19d2
-MISC ChangeLog 33464 SHA256 4704e46beab2504ab0dee993ab120acd0a8939dd1baa65f141eefaf45b1763e1 SHA512 0aac1de1ee2d406a3c3c51df085aa17311fdf2f993e74467e295a0a0ed0550b8b814556867bcf27ca34e9c7f1c8af9bf9a3d6b724e3bcf60be7e784db7ed58bd WHIRLPOOL c19d324547bce9c8c2c77811f2c4f8a82870011610ee2248c791fdc2738af7011786dc81ca72e1999c6d27c0e43dc1ba3c9b113e3e0c1704500112c96e47e87a
+MISC ChangeLog 33754 SHA256 93077bb298c81925b53332a39e656ac17aa17e656f316369bf9f9ee844d30617 SHA512 0058edd1e3154ba3871981a2d96ed6b8e0192a30be182a483583fdbdf8cba43d77e9c40dabebd095b6ccee2df93a4edfda36a9fe4df133d04f70fe29c36ec8c6 WHIRLPOOL c154197e45ff3e6683de56ff44d5c7bd88097d8d7df78a183268dc17296efea6ffbf342241e1c53164bf171065cdb47289adf9f4d887ca68a1afba80e2dea402
 MISC metadata.xml 469 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad SHA512 726af6834fd00706fceef63690c5605bd9d80930d707e6186bc19b7b0b325fe5edb8c71792c555d128efe7e95d4b9319d4f85cebe98261995b2d8280cf3735d3 WHIRLPOOL a873152dd611446f88202324526de306f5d6be8a6224aa9f28a4af963f9cecd4ba9c08b317ce51653e579dfe51c2ecca12b3f5ace910be83ada0cf6ae493669b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRPYl7AAoJELp701BxlEWf3zAP/19O00+Oq76R2yVxittC0TEn
-9fFBawxLIYTummN7LHszTD+bXmE+AP4CGaaSN6+hPpVvRZ043mRUFCZgeLKu/EYt
-BZaNXnvHhY243sHxTegm4hidilAsAsLsbPXH9CPS8CvCXGtAVtytUyswRyC1tu/e
-+mkWc0aL0gqVcys8MqYrjTWnoqq5lfn4uOi4PTAvghzUhtVuRv5NRteKs6aZK7I/
-lmtJKZECH6Z1fR+xevQ2H7PbrdvIhuFAw4ffZN6zyo106kv78onYmea6ZxgpX+IG
-1E0GwMgQR7wdgkpthLj/xPw5DgnnPmXCL/1ASdY6MwSfCViY/YCsA40IAP+7sZnu
-UqHt3EmwrK+EtcueGP3SWRdemlVoBMfgIG3GSaMGjMejUnM0uhSlz+wovi69fCqZ
-VqQPsuabyrqBYvhF0M6HruLeEK9ULBiFBPFfRwMH3UT4SHaSax+Nc8Aa8knAA8Fa
-6g6Iud+FriDocFy5GBp5HBUFffxLN92O3TkfcwM7n5XMxTzShjzxyWRK2XgkNDqo
-RejT6h8HCuuOpr4SOLzZSXCf2GFG8xeUzuIUhTBZuFQedF3KC2SQ9MR3Pp/+asU0
-mOPz7NyvmmY9e2aqQFCSSkxHVa1d5h6cK5fPi3+Et28VzMdknVMq5pz2QVTSEyVr
-Ze4JeB31KRUEL5XRVbrK
-=k5DE
+iQIcBAEBCAAGBQJRPcVaAAoJEHfx8XVYajsfKoQQAJ4Al/1STmgvLgEUCI8qJc2U
+pnmIsZjI5zZg8tz4u74xCwZ32/3sIPzV979yctRM2bZH7j005CMQadmlWycQ+Cyl
+kyq+0lkQCDvm2me7czzg5RiL6eXgKwW25xnXvoKYgWw1RGxLhrxJGCbKrtTWx5rD
+8tjmjDR1NCBBJ0WnmlBLZSGBxB6Vk6vXI94Om4K8c0R9SV+d81mDYgB5PPNeZzMz
+EIMBq1YPAJN9xeCNxqak21As+BB2v322Xy8mq7g0tVjWKwgdEqHIZDjio5SlJMz3
+D7DqfjLdLfj38K7Oi1c2sdPzT3ZzfRxdp3NW3YdmdmmWe8z1aOIGUiP6wrKN6CpL
+km5lH6rY0ovQ8soEmsGqO0lhx3/62+O/GGYh5DDnjl27Ql0K0eDqeFpB2VfKGgiS
+Pb4k/kSY+mmS23aVWlNZrFUXmwlkhOaU3LGWkYML3nN0MEb78Kgo9zFFG6UC03Bu
+tYg76AYKh0DWQw/k5hbd4Kac2241RlOzjY0lJpoCqBO3zJ8GXJfamZN6KiyPRkkY
+pOQAI/FLW0gzAvRq+r123YbbW0e56s87qCZM3j7rfir03fNxglUrfK0UKz6wJguD
+WxfArVscu+xMl4uJ4enW8YXlqxXROSmtPw1aKkW8D2vF0QpujlmmaOQ5IMlrVdYK
+j+7y1YM4SMYYo8T2/0VX
+=O2S1
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/files/CVE-2011-4862.patch b/app-crypt/heimdal/files/CVE-2011-4862.patch
deleted file mode 100644
index 1c4672fcaf98..000000000000
--- a/app-crypt/heimdal/files/CVE-2011-4862.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Stolen shamelessly from FreeBSD
-
-Index: crypto/heimdal/appl/telnet/libtelnet/encrypt.c
-===================================================================
---- appl/telnet/libtelnet/encrypt.c	(revision 228798)
-+++ appl/telnet/libtelnet/encrypt.c	(working copy)
-@@ -736,6 +736,9 @@
-     int dir = kp->dir;
-     int ret = 0;
- 
-+    if (len > MAXKEYLEN)
-+        len = MAXKEYLEN;
-+
-     if (!(ep = (*kp->getcrypt)(*kp->modep))) {
- 	if (len == 0)
- 	    return;
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.initd-r1 b/app-crypt/heimdal/files/heimdal-kadmind.initd-r1
deleted file mode 100644
index 798d94fe641a..000000000000
--- a/app-crypt/heimdal/files/heimdal-kadmind.initd-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting Heimdal kadmind"
-		/usr/sbin/kadmind "${OPTIONS}" &
-		echo $! > /var/run/heimdal-kadmind.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kadmind"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kadmind
-	eend $?
-}
diff --git a/app-crypt/heimdal/files/heimdal-kdc.initd-r1 b/app-crypt/heimdal/files/heimdal-kdc.initd-r1
deleted file mode 100644
index be425c4126c3..000000000000
--- a/app-crypt/heimdal/files/heimdal-kdc.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
-
-depend() {
-	need net
-	after logger
-}
-
-OPTIONS="${OPTIONS} --detach"
-
-start() {
-	ebegin "Starting Heimdal kdc"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/kdc -- ${OPTIONS# }
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kdc"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kdc
-	eend $?
-}
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1 b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1
deleted file mode 100644
index 2f3afa2d310a..000000000000
--- a/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting Heimdal kpasswdd"
-	start-stop-daemon --background --start --quiet --exec \
-		/usr/sbin/kpasswdd -- "${OPTIONS}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kpasswdd"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
diff --git a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
deleted file mode 100644
index 6c8fd008fdbd..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.11 2012/05/31 03:25:16 zmedico Exp $
-
-EAPI=2
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/CVE-2011-4862.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
diff --git a/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild
deleted file mode 100644
index 7b566688e1ea..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild,v 1.1 2012/06/13 17:48:19 eras Exp $
-
-EAPI=4
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
diff --git a/app-crypt/heimdal/heimdal-1.5.2-r2.ebuild b/app-crypt/heimdal/heimdal-1.5.2-r2.ebuild
deleted file mode 100644
index 560fba63571c..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2-r2.ebuild,v 1.1 2013/01/16 19:58:57 eras Exp $
-
-EAPI=4
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
diff --git a/app-crypt/heimdal/heimdal-1.5.2.ebuild b/app-crypt/heimdal/heimdal-1.5.2.ebuild
deleted file mode 100644
index 695f70ea569e..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.4 2012/05/31 03:25:16 zmedico Exp $
-
-EAPI=4
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}