remove vulnerable versions

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

6 files changed, 22 insertions, 406 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 140577d8b4f3..a4ad6214b71e 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.307 2011/12/22 23:24:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.308 2011/12/23 08:43:57 eras Exp $
+
+  23 Dec 2011; Eray Aslan <eras@gentoo.org>
+  -mit-krb5-1.9.1-r2.ebuild, -files/mit-krb5-1.9.1-fd-leak.patch,
+  -mit-krb5-1.9.2.ebuild, -files/CVE-2011-1527.1528.1529.patch:
+  remove vulnerable versions
 
   22 Dec 2011; Mark Loeser <halcy0n@gentoo.org> mit-krb5-1.9.2-r1.ebuild:
   Stable for ppc/ppc64; bug #393429
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 0154caaa5a45..52a90530663e 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2011-006-patch-r18.patch 2908 RMD160 829a6d2dc876190996e90e0a6a43e2d018cbaaa5 SHA1 30b66b6c5dce537d66874ac58e622b3f6e992ac6 SHA256 54490a4152e2bf912fa92137c3be90221fd64f818a09be256a1147b351e676e3
 AUX CVE-2010-1322.patch 1066 RMD160 fc262a23e9aa118262a4258f74832445062444e4 SHA1 600f0890de65f96112f267b56317a4fd0166cba0 SHA256 7d9fbfffdaa0cde0ca499ccbb2cf09a6c7253e537755bbf6da9e08715fd9a474
@@ -8,12 +8,10 @@ AUX CVE-2010-4022.patch 632 RMD160 62a7b2b0d4acbca919fd9df52e707bf0b9fff076 SHA1
 AUX CVE-2011-0281.0282.0283.patch 6663 RMD160 15913f4fccc2424f4264ce222563685b29b53fb2 SHA1 fb2486168ce128cb1a2866bd0df8cd7c4bcd7824 SHA256 1b3ccea9022527c36e153c5d89ecfd9609a111e235b1d0430e1fcc6933e76e48
 AUX CVE-2011-0284.patch 544 RMD160 9b0d172a1abfaf437edacc9f18fd0a6e83028b3e SHA1 1c72390c5d629eee592e5cb0c2b600b376e2fdc5 SHA256 bf93bbaf5d502f5b5bdcfa612e36c3828d3be869b154545bad1c7109f4eedae4
 AUX CVE-2011-0285.patch 1154 RMD160 a635a940613663f6fe07534d08c7781090fcc9f0 SHA1 b6ae716616ecd5e92f32ec8203a1ab51b5726184 SHA256 6a972da0e87dce82e801590a7bdcca300a5b31ed569f834e0a6634a185a9aac0
-AUX CVE-2011-1527.1528.1529.patch 3092 RMD160 06b85bf757b84486461697fac126953e7b9d2558 SHA1 0b0016b0e341dcf720f67925b0d451b328e02583 SHA256 50d2ef225e16fb267dcfe87bb6596c5061ccb5ef617ce7e42e83dd4b2db27468
 AUX CVE-2011-1530.patch 1417 RMD160 c72c99b40c5f230ca430fde33460616c7634b037 SHA1 ec917dd1d1c96fa331f512331d5aa37c2e9b9df7 SHA256 0b0413e175e81b5fb7497f3351341066644431d72663bb1cba9d59b715669486
 AUX kpropd.xinetd 194 RMD160 5772b04bf7f6b8a5588331a4d9dca03738756f15 SHA1 a9c84a4197ba133144e754d68847cece6203ed4a SHA256 eaa3838a6ca8db901db359cac3435d4f703a9a10534f02eeb37f494dd21a1736
 AUX mit-krb5-1.8.3-CVE-2011-0281.0282.0283.patch 6130 RMD160 23cb2560f0d87e6128cdbb12f1e7d8aae85f85f5 SHA1 574a3c82ad7d3c9a1c9c62c6ff95c2d6f0e0fc96 SHA256 7831c9a9553404b41774f40f3fc0df6769342c1923c5b1177062710fd5f0f2bb
 AUX mit-krb5-1.8.3-CVE-2011-0285.patch 1136 RMD160 03d06d5c88505688eb4dbcd516144999ecb89a70 SHA1 7853bcbdf0dba6f0fce15fc3b475f86d692287b2 SHA256 88f8d015f2bce8f54a6a0321716ed887aef587aeae3017d47c7c18de26189f02
-AUX mit-krb5-1.9.1-fd-leak.patch 2178 RMD160 1ccfac11299058c5eb24393d0ef10e8ad53016dc SHA1 d99f865813833c3aa4a1e1c012656525bf716b97 SHA256 6f7a099e9527a5544f095e6ec0946218124a6c8b41a3a9f75522d58d2040a56a
 AUX mit-krb5-kprop_exit_on_error.patch 712 RMD160 3aa6371103ed4fddbbad98683798b51970d1d4a8 SHA1 65ce64c22145348ee89a88a4a3eecd4346d5397d SHA256 a59b64e0a00dda8e394925aad68893aebc7b7d7c6651684df9b671551f77d9f7
 AUX mit-krb5_testsuite.patch 3069 RMD160 59af8c128fbaeadc472111c4bef4dfe3ac7567f0 SHA1 e0896cac3d99a3e4f9d06afdab58a6d5cda82e7a SHA256 3c8cfdb012a5388b1a92658437dce619593b91f0b0c582ef66194347274b26f9
 AUX mit-krb5kadmind.initd 619 RMD160 20c5dfdf318a60143b916464541acdede4352762 SHA1 a291536704c096444cfb03885b1dac65dea18d62 SHA256 4f79fbe5ecdc8fd4a22e5adf58de80f373b7f6d27a50bcca69cf029c020028b4
@@ -22,30 +20,27 @@ AUX mit-krb5kpropd.initd 611 RMD160 b935fc1b29ecd72010405edb4cec1d5d2763adc6 SHA
 DIST krb5-1.8.3-signed.tar 11642880 RMD160 bdf3a505e4b2447af0c9080b441918d665dcdd9c SHA1 69696f63b6c2b0e3238156b19eed68cecd661c6b SHA256 2c5988ddd8b409134cd0e77e9ce8f762605ce8d8fb0aa22f6500f53381567019
 DIST krb5-1.8.4-signed.tar 11642880 RMD160 34d6df8248007bac0321400b2650c2aca774af16 SHA1 fe1fc21e923ae8dcaa7a26f4f97e0ac49c8e3115 SHA256 2ea1ad0e02d8040110c70046a3bb44aa116ccc72a351185799cd19a2dec11123
 DIST krb5-1.8.5-signed.tar 11950080 RMD160 00f350422b3517d2b8f99d4ae694551d2065fd75 SHA1 9ca7edaaa1d4ef4bfe2611d937eb741d7ad5da3c SHA256 7d6989efaaf0b3330ce5b329edb1d0bf33250ca78b789fdd117e02c49c238812
-DIST krb5-1.9.1-signed.tar 11888640 RMD160 8de31bc83c2fede038780a4375e29a6b4281581f SHA1 e23a1795a237521493da9cf3443ac8b98a90c066 SHA256 525e258aa7401427a5a9edee0051f83b6151bf96a979ca526393932c90484c8e
 DIST krb5-1.9.2-signed.tar 12185600 RMD160 4129e76f6725c18fb3c24b5dd1c5b41f6ee94b5f SHA1 aa06f778ee1f9791cd4c5cf4c9e9465769ffec92 SHA256 96b213345b02862b5fef61ef1dd26f643f07e4207496c35179cea35ddb7ae68c
 EBUILD mit-krb5-1.8.3-r5.ebuild 2939 RMD160 df03d1333c291448be9c88931854c8e1bbe698c7 SHA1 fbd2e1a4ca141ccbecf0c0cf2b07d4bc6532feb0 SHA256 481041e8ac828123765991fc726a94f9344724bf236224b208d3b4963d22ab68
 EBUILD mit-krb5-1.8.4-r1.ebuild 2839 RMD160 45cfe931d145d5a0adf11b6c094510bf89091e1b SHA1 6d5f06c229a369103a0864c555708270e57a6d1f SHA256 5a9cadc82825fc506f0895f33b5343eea940f182e7f4603177b7591069b81aaa
 EBUILD mit-krb5-1.8.5.ebuild 2709 RMD160 f6b3a46e9e01d6581ee4d93a11770c6f71eb6461 SHA1 b7409a07e9fe5bb9a664daf896fb4b81bc6d555c SHA256 90c03d3f408262b0b142de45899d2a0637559a5c32cc2721fd77d5be193e66b2
-EBUILD mit-krb5-1.9.1-r2.ebuild 3202 RMD160 9a72d9d3dbf64db70e01a1a95c6902ad17ed0102 SHA1 ca0b2e199042f67cc2698ef55628c3424628238b SHA256 7ec3c4dfa4d0a7c3833d58c4ce137c0379a1ab4c70d4efd2fb969014a868e770
 EBUILD mit-krb5-1.9.2-r1.ebuild 3183 RMD160 d46bdf5a2696d91e91ad8d5d519fb4c2624ba437 SHA1 7b1558659c1c711b4547fd24cc5b34b8560028cb SHA256 b34858c561237381296edf149f44ee31c1ac3d283232b1705e4a290e2808e0ba
-EBUILD mit-krb5-1.9.2.ebuild 3146 RMD160 53622c78084fbd6ce873bd05c920f7a6a4d8d594 SHA1 f5e1a405183e7a046255d02bb268d4db2f42f188 SHA256 6c49aa492f333d0a13d84e1dd7f3b2cda358bc3c7ce2fff403c25e70b3523efa
-MISC ChangeLog 48344 RMD160 8c4398071eb50f0ca4f6709bd8f2d00ef6b01dfc SHA1 f47385e9e4ccc040f4fbd34ecc3b4b117ffca558 SHA256 88a3bf2fbb822ca9375450d39f7849dff7313d1a293bbd40a35dba439355eb1c
+MISC ChangeLog 48545 RMD160 f297bb5ca2ddc41b9a7ded18cbd6b2e206333ca0 SHA1 3a771859876563513fd5d4023ffab6e191970cdd SHA256 a0e62d01806964117c090de5bc4393c03028c214de0599273eb729daed07280e
 MISC metadata.xml 668 RMD160 825e73c2b8d1bdcfffb6c5cfa2110f596d7940ae SHA1 b9fca90e7a86fea05d8174d824e939cf61905310 SHA256 da5862dde92f34b882870961cb9f1e4aa8209fc549e32a43d99770a9de8b232d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO87wVAAoJEPTTRK0uRVaNuogP/A/3yPlmFpvd+LiBCuLfe0ZI
-sM9I6IgTQabjjLpCXE6gMseHsF06NVVzmp0Tk+2Oyg81h92LMDtRcTeeTGZfnrVo
-3IwrAw24wm/ldBv35w7QvAbYHZtUOc17SKTzGGct+YdUmXIuJeZ0nazt9b0B8j01
-zNA1GleDI/XbIF0SPXaKy3vLzLkEnAnhJoUWjyNev5InPFslExYXqfNDHvnqa4Fh
-LNg9xoPiimIz+MYnetJ9DJZi56uhXWP+lL314w1+J8Xy35XClnO2ICp0nET8O7VF
-Xj+UeIjUPhBm40Goz84prqW1HfYqXiX1wga5wSWeqHpOfxsKf8q87C6Y8am7bJqK
-sbW4gXyD4MPTO9Wzu94iRxBwNRFHQZ+tTSssd9Yh8+RMdhA+SluwTfT1SmxK9CIq
-uTpAmsY+oMdyvImvT6OZWa961YGEhDFm2tceVeK+v84RyX0oyBVQ8xFCqu0BBwPs
-HIc+lS3BK1FMVsu8cJZqZovMJD2zPzLgHAFiy9ZEvWIbjm1/9/X6FPbyicYFq7II
-UcKDITowCLpQ5k/IEOhXLJC057jUuMRFIwK8Ek6oKSJG411tJrf5xQdfW9vLpziL
-LGsvjVWOa+dMEEpFK7Y449UWXUrH00BJGdX2auTx0EEhg7tcF49nRDZiRyMNx2kt
-Mp7yDtYC4BCIJb3JOT+h
-=cuKN
+iQIcBAEBCAAGBQJO9D9bAAoJEHfx8XVYajsfj8IQAJ2qZSfnaQumlp8v0SHxyqSq
+2S4XlwDSFjipYb+d7FGC+ST9vFLLD0zRqSRoLr2OOsUv4/iIdrHYMMG1HCy705G9
+ONOPfC/puk2x67z+SRRDgwXS8c/4jkzCFNnxT6BKDB/etw9Q5xkCYQLBTLllJD+r
+OVS1CQwVj5W2xPFewBPTur4NJHaJ2zT4+4BLK6ILLSS0vAzNCkqNSdFF0PLuBtWL
+G9+Pf4QwHGvKhyYDk/8C4dpnD6Fll4h3vSwsdn8PFFmQYjK4eAId/sR3wSX3GKCD
+AJv0/IFPpZ9QYrzi61St+ECnydKccwyPU4gcEJuJ2yT5QIVqtBlhhX67I7bgWgPT
+9ZD8GTyclsHCoEUE/zYkO9rwkqjTMXAzY3uwl09+nCuvAdbQMg+QpAfMsFnatzIv
+inq0QI9CdiUuE/fGyTwAIT72fJbWUZC7Z+V4GjytqSaYhVJv2+WSwK5LcAhLuA7D
+5uN6CF6j05G6gSk+KHBOZRa3r43ctVIGwozO6O701XJzCSo1XvCbCEgCF/FLzZzY
+JLMsJkQETp8cCNybYiCv947SOOsVh/SDDyj8FJYO8fJ/fJBtiZNo0NhAT8k1fCH+
+g/SuydHo+FrgEatfXqTjyjvJjAWGJUE4dPwjW3IC9DNUr+7dOgcCAGwZyxIzLou3
+t3dXerFE1sIiVnR08gf1
+=us32
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/mit-krb5/files/CVE-2011-1527.1528.1529.patch b/app-crypt/mit-krb5/files/CVE-2011-1527.1528.1529.patch
deleted file mode 100644
index 05a22caf53e1..000000000000
--- a/app-crypt/mit-krb5/files/CVE-2011-1527.1528.1529.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c
-index b473611..50c60b7 100644
---- a/src/plugins/kdb/db2/lockout.c
-+++ b/src/plugins/kdb/db2/lockout.c
-@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context,
-         return 0;
-     }
- 
-+    if (entry == NULL)
-+        return 0;
-+
-     if (!db_ctx->disable_lockout) {
-         code = lookup_lockout_policy(context, entry, &max_fail,
-                                      &failcnt_interval, &lockout_duration);
-@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context,
-             return code;
-     }
- 
-+    /*
-+     * Don't continue to modify the DB for an already locked account.
-+     * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+     * this check is unneeded, but in rare cases, we can fail with an
-+     * integrity error or preauth failure before a policy check.)
-+     */
-+    if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+        return 0;
-+
-     /* Only mark the authentication as successful if the entry
-      * required preauthentication, otherwise we have no idea. */
-     if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 552e39a..c2f44ab 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
-     CHECK_LDAP_HANDLE(ldap_context);
- 
-     if (is_principal_in_realm(ldap_context, searchfor) != 0) {
-+        st = KRB5_KDB_NOENTRY;
-         krb5_set_error_message (context, st, "Principal does not belong to realm");
-         goto cleanup;
-     }
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-index a218dc7..fd164dd 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context,
-         return 0;
-     }
- 
-+    if (entry == NULL)
-+        return 0;
-+
-     if (!ldap_context->disable_lockout) {
-         code = lookup_lockout_policy(context, entry, &max_fail,
-                                      &failcnt_interval,
-@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context,
-             return code;
-     }
- 
--    entry->mask = 0;
-+    /*
-+     * Don't continue to modify the DB for an already locked account.
-+     * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+     * this check is unneeded, but in rare cases, we can fail with an
-+     * integrity error or preauth failure before a policy check.)
-+     */
-+    if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+        return 0;
- 
--    assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+    entry->mask = 0;
- 
-     /* Only mark the authentication as successful if the entry
-      * required preauthentication, otherwise we have no idea. */
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.9.1-fd-leak.patch b/app-crypt/mit-krb5/files/mit-krb5-1.9.1-fd-leak.patch
deleted file mode 100644
index 9eeb17a94cc6..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.9.1-fd-leak.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-bug #387485
-
-Index: trunk/src/lib/kadm5/clnt/client_init.c
-===================================================================
-diff -u -N -r24978 -r25115
---- trunk/src/lib/kadm5/clnt/client_init.c	(.../client_init.c)	(revision 24978)
-+++ trunk/src/lib/kadm5/clnt/client_init.c	(.../client_init.c)	(revision 25115)
-@@ -155,7 +155,7 @@
-          kadm5_config_params *params_in, krb5_ui_4 struct_version,
-          krb5_ui_4 api_version, char **db_args, void **server_handle)
- {
--    int fd;
-+    int fd = -1;
- 
-     krb5_boolean iprop_enable;
-     int port;
-@@ -192,6 +192,7 @@
-     handle->struct_version = struct_version;
-     handle->api_version = api_version;
-     handle->clnt = 0;
-+    handle->client_socket = -1;
-     handle->cache_name = 0;
-     handle->destroy_cache = 0;
-     handle->context = 0;
-@@ -301,7 +302,9 @@
- #endif
-         goto error;
-     }
-+    handle->client_socket = fd;
-     handle->lhandle->clnt = handle->clnt;
-+    handle->lhandle->client_socket = fd;
- 
-     /* now that handle->clnt is set, we can check the handle */
-     if ((code = _kadm5_check_handle((void *) handle)))
-@@ -372,6 +375,8 @@
-         AUTH_DESTROY(handle->clnt->cl_auth);
-     if(handle->clnt)
-         clnt_destroy(handle->clnt);
-+    if (fd != -1)
-+        close(fd);
- 
-     kadm5_free_config_params(handle->context, &handle->params);
- 
-@@ -796,6 +801,8 @@
-         AUTH_DESTROY(handle->clnt->cl_auth);
-     if (handle->clnt)
-         clnt_destroy(handle->clnt);
-+    if (handle->client_socket != -1)
-+        close(handle->client_socket);
-     if (handle->lhandle)
-         free (handle->lhandle);
- 
-Index: trunk/src/lib/kadm5/clnt/client_internal.h
-===================================================================
-diff -u -N -r23100 -r25115
---- trunk/src/lib/kadm5/clnt/client_internal.h	(.../client_internal.h)	(revision 23100)
-+++ trunk/src/lib/kadm5/clnt/client_internal.h	(.../client_internal.h)	(revision 25115)
-@@ -72,6 +72,7 @@
-     char *          cache_name;
-     int             destroy_cache;
-     CLIENT *        clnt;
-+    int             client_socket;
-     krb5_context    context;
-     kadm5_config_params params;
-     struct _kadm5_server_handle_t *lhandle;
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9.1-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9.1-r2.ebuild
deleted file mode 100644
index cb5065dda0a4..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.1-r2.ebuild,v 1.6 2011/10/23 08:55:53 xarthisius Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? ( dev-lang/tcl
-	        dev-lang/python
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fd-leak.patch"
-	epatch "${FILESDIR}/CVE-2011-1527.1528.1529.patch"
-}
-
-src_configure() {
-	append-flags "-I${EPREFIX}/usr/include/et"
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-	use keyutils || export ac_cv_header_keyutils_h=no
-	econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-krb4 \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			emake -C "${dir}" || die "doc emake failed"
-		done
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install || die "install failed"
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc NOTICE README
-	dodoc doc/*.{ps,txt}
-	doinfo doc/*.info*
-	dohtml -r doc/*.html
-
-	# die if we cannot respect a USE flag
-	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind || die
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd || die
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild
deleted file mode 100644
index 6e8f58db1707..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild,v 1.1 2011/11/05 13:08:11 eras Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? ( dev-lang/tcl
-	        dev-lang/python
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-kprop_exit_on_error.patch"
-}
-
-src_configure() {
-	append-flags "-I${EPREFIX}/usr/include/et"
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-	use keyutils || export ac_cv_header_keyutils_h=no
-	econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			emake -C "${dir}" || die "doc emake failed"
-		done
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install || die "install failed"
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc NOTICE README
-	dodoc doc/*.{ps,txt}
-	doinfo doc/*.info*
-	dohtml -r doc/*.html
-
-	# die if we cannot respect a USE flag
-	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind || die
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd || die
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}