gentoo resync : 31.10.2017

9 files changed, 0 insertions, 703 deletions

diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index c3afda7f5fb6..c813dbb97771 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -6,21 +6,10 @@ AUX heimdal-kdc.confd 130 SHA256 c96bedd8c989378cc427da77862353a879bdbfdfd9c9e4b
 AUX heimdal-kdc.initd-r2 434 SHA256 b5062b49e6205e0ac6bfdc26cdfe520621c6a702d9e82b00e5ab34244e3ac24d SHA512 1698a29ff23aef6bcc83153076036297639f38e5b42f12a3f59324ecce3fe7483f99f84e2bc88d27f010d07ebec4f2758d0249a9cb5bd62be40c3e6cc79353c1 WHIRLPOOL e3bd02558862814a82dfb4ea180483cf6240df7e7fbab8e2c8e2c21ce4a3d9881fe605eda8401117abe175af8c37c826a4247d062912856518d1ca13e78d8a45
 AUX heimdal-kpasswdd.confd 148 SHA256 ee533af2cb109038108649bf3f44988fbb63d5a7fd2bacfd9842140790116003 SHA512 198d8f219abdd349213d26119e7cc343956981a5cb7d031186c81cb1a0b3f017097f4a429481089787b1cde6f8f013a8ee3909f6807f44b51531ac19a7a3a17e WHIRLPOOL bca32249a033919dd8b00ce94010408b8d2e259a11653372bd02f52a044a216146fe488ca91165095880cdc19bdc7a74fb9b9ce16ff803eeff760b6c39b70444
 AUX heimdal-kpasswdd.initd-r2 448 SHA256 8e9086554d2e9e71acc31fb6dae51af0b1f311094fd7906a0fa72f9993c724b8 SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176 WHIRLPOOL 8796a499982eaed9059b98cf9d0f25af0d0c0e55d5f0f74b7186b7877bbf5243b8d191a8c9497d8a36dc5c9f38eca3b28c44f93ef08d64c3cee0a689d28d4428
-AUX heimdal_db6.patch 1241 SHA256 a8b4385ce097b02317786f7227e55431253ea319bcf6364aff6bd17b484e84bc SHA512 923f045852ddfab6b1102ae69dff66775ae417384833afc36ff96c480f2809bca01e72a3d4f0b4bde6b3269cfcdf719ab8bdc9a0639d316ee384e7d1614724f0 WHIRLPOOL 4575687c8902b97b2ed23dc28c213aa38f792c70f29a10ca094d8b608f91b48fa491e6869e340d26514ad7bf9899d6c544db643fec26cb4b537888bafc73ef74
 AUX heimdal_disable-check-iprop.patch 577 SHA256 b2ab6f335b5a756856a5df635df82488f9dcdb3ed02a7114f90b4a34911f9721 SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e WHIRLPOOL 115bcf67b370a24aa911bfcaba5c9eee3015d02e14dd5522f9038bb31cdd968f046225eef064fca9134db885719e00499cba48ea43248f6793c4b3d477f6c52d
-AUX heimdal_link_order.patch 1164 SHA256 794560047c549a996d03140ebcbd0476646f4a8e9e36d0cfe6cbaddba611e754 SHA512 f3e411592a87ef49695641ccc30d2ff9d08310df6a157dfc4c366f0a909340a7a5c2667b57dc5f736e8b0e76d13461770191dbe826fdf179023547d15fcb30cf WHIRLPOOL e2e66bd92ca5e5e1a53372c5bf542cebea665bd32a3d281cb858a36bda98932cc1506c32d874cf9126d156d06f1bf481cda13ebad8853c121676cf6dde792f6d
-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 heimdal_texinfo-5.patch 617 SHA256 4010cb2f6d09585aba071b9c9891c77704b62468d9583f82088d020b9538a24d SHA512 0e61e9c93263fa8f6d308315ca907b75d7957fd73ebb6d500efaf6b9920e70623b2f9382cc565ee35dcfeb0eb0e350e2a165cca98f9017153ccf1154f258fb5a WHIRLPOOL 976da1d738205a3ef7ca313e4b81ca658cfdad8e33f115a6ffc7c603dac845c7033fa88fa6bad3eaa69ecb2d0350bd29388d4eeb8b30372bdbcfed1540890856
 AUX heimdal_tinfo.patch 711 SHA256 1d68c036d1f375417f52a8d79812e2e717b2ac178b6bc20bd294eea270740157 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d WHIRLPOOL 945e032c0e7deabe0346f22b396eda86e9ba3267af285331ab98df4782a2fea7fc869abc319e3dc274561ea075c0af9a13f6b3d63a001d6724dd906b3f331243
 AUX krb5.conf 424 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38 WHIRLPOOL 43526f52aee4dfb456058001bc553a81e478edd315c7c7ce8e639958afdb3049ccaa686234066b17b2edfc5aee0b4af95596e0fbebd0e66455ff0599de1af5f4
-DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
-DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d SHA512 5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e WHIRLPOOL cd6507c5f6a800e645a146d94fac41d1fbf4c3283c5c4ab4a40bd2229efa4f1a16be71aa74fc5d8f41023bdff8ff141419ce0b99f5cb7aaf09f22824db1d2df8
-DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
 DIST heimdal-7.4.0.tar.gz 9928553 SHA256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7 WHIRLPOOL 337a6da67bb48e08ecab2119598c19e2ca9b0cdbd7ca163f6ea55ccb0a1290cc2906eee106b625a43243edd7d1677ff36ae318ab82f2d3e439b8f25002f7f001
-EBUILD heimdal-1.5.3-r2.ebuild 5024 SHA256 092d8f1583803c851a41fc2d1729ba0f8ca44a565a27b8eb9259229fab30a98c SHA512 bb82e78a56c619470f245b3cd65f8d8e3bb86bbc41d8217028372f15977603e10f6075aac8c08a7daf1e5b8cf85c50c5b95a344288f81b1dcaae3c0959002a8a WHIRLPOOL c276149edcef305a279dfc0d72e28c1a2e918a817f2ebd75ac084469de22c18b44bfe31ac2d5aa2dc1b4692c6673bbc99bd46df3deb191341a2b78f1451c04c0
-EBUILD heimdal-7.1.0.ebuild 4391 SHA256 2a1ce6cb6b0fdef4f00023eb4a57a5f8f1a8cd9fad0924c50cf885a9062e6a32 SHA512 7ba0763e2db5fb26f8f4cdd9d8220caec49f918f7707f4e60499f36a7bc7d5259ce61f688778fbf6daf70ae5eb56b5953f5d8c5cc1c331626071620403f7b8bf WHIRLPOOL 8efbfc69d8dd0473b74162c368b67134da9540bed57b49020edd1372db77a1a1f6ab81e071c5b976c49da782c441dd5bdc2101a97c5efef8b90c2e50f04c41a3
-EBUILD heimdal-7.3.0.ebuild 4391 SHA256 2a1ce6cb6b0fdef4f00023eb4a57a5f8f1a8cd9fad0924c50cf885a9062e6a32 SHA512 7ba0763e2db5fb26f8f4cdd9d8220caec49f918f7707f4e60499f36a7bc7d5259ce61f688778fbf6daf70ae5eb56b5953f5d8c5cc1c331626071620403f7b8bf WHIRLPOOL 8efbfc69d8dd0473b74162c368b67134da9540bed57b49020edd1372db77a1a1f6ab81e071c5b976c49da782c441dd5bdc2101a97c5efef8b90c2e50f04c41a3
 EBUILD heimdal-7.4.0.ebuild 4386 SHA256 2609914870670405bd2f5eeb0a8a9b0812bd897d82f907df989d6d0b1cd5641a SHA512 2c8c11e021d828a4e49142389c6e3dd3d361d33ea889b6e2590043aa71e533e5483de9b3b32e087ed95f76d5a42d84fca22a21043ea414b0760d4fd3f4bff728 WHIRLPOOL 9e9bcd4d8f82f95ed38ab8959b780458beda89de9d3b00ea49d2c13e91ad4d9bb7252358258c0153bc02ab0dc61aae667f133482a4574ece4791632bd29ed0d2
 MISC ChangeLog 4413 SHA256 4c9d94b05877452f2233be9ffea999aba04d4078e63f17341138d0fb831105d4 SHA512 6a4e11a4509c2722a1e6e1bb65c6ea070b849b05aee166bd94dbd1fb831e5eb4af7c927b7735650d407732f11eead38816fd4d8693195df9378cb69d9e6cdfad WHIRLPOOL 13253e869e3da54af008bbf03059f3f9f150390b56f02e048e42fc9547e94d637b98d8579d1f488afe3805e7a38238d64eec87304c5d64d81c31b3b12f372df0
 MISC ChangeLog-2015 36803 SHA256 fe8e5e58312adc75a5d62ccbf1684f06783eb9aed087d8ffad5cd9c9179aac1e SHA512 48b692393c72ed2e98eaf8473bec195ea8645a14c4c7aa8c6318e567c110b3b2fda0fc745ca11487b2cce51fee6cb1d165e9bf6c7fcb60c05e8a2b1dfdf57bdf WHIRLPOOL dfc81a3dfba814ef43a5fc4d9ee965680b24320501f40b7218aa5a84002acb791302dad8718747bcf68a208aec306e65746b5c166b0492341b08c5a0c9f5045e
diff --git a/app-crypt/heimdal/files/heimdal_db6.patch b/app-crypt/heimdal/files/heimdal_db6.patch
deleted file mode 100644
index 316cf1533791..000000000000
--- a/app-crypt/heimdal/files/heimdal_db6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5
-   #include <stdio.h>
-   #ifdef HAVE_DBHEADER
-   #include <$dbheader/db.h>
-+  #elif HAVE_DB6_DB_H
-+  #include <db6/db.h>
-   #elif HAVE_DB5_DB_H
-   #include <db5/db.h>
-   #elif HAVE_DB4_DB_H
---- a/lib/hdb/db3.c
-+++ b/lib/hdb/db3.c
-@@ -276,7 +276,7 @@
-     }
-     db->hdb_db = d;
- 
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
-     ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
- #else
-     ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
-@@ -284,7 +284,7 @@
- 
-     if (ret == ENOENT) {
- 	/* try to open without .db extension */
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
- 			 myflags, mode);
- #else
---- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
- 		    fi
- 		   ])],
-     [AC_CHECK_HEADERS([					\
-+	           db6/db.h				\
- 	           db5/db.h				\
- 	           db4/db.h				\
- 	           db3/db.h				\
diff --git a/app-crypt/heimdal/files/heimdal_link_order.patch b/app-crypt/heimdal/files/heimdal_link_order.patch
deleted file mode 100644
index fdf6a0af9bc9..000000000000
--- a/app-crypt/heimdal/files/heimdal_link_order.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- kadmin/Makefile.am.orig	2010-11-25 12:39:31.000000000 +0000
-+++ kadmin/Makefile.am	2011-02-14 21:37:29.000000000 +0000
-@@ -64,10 +64,10 @@
- 	$(top_builddir)/lib/krb5/libkrb5.la \
- 	$(LIB_hcrypto) \
- 	$(top_builddir)/lib/asn1/libasn1.la \
--	$(LIB_roken) \
- 	$(DBLIB)
- 
- kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
-+	$(LIB_roken) \
- 	../lib/gssapi/libgssapi.la \
- 	$(LDADD_common) \
- 	$(LIB_pidfile) \
-@@ -78,12 +78,14 @@
- 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
- 	$(top_builddir)/lib/sl/libsl.la \
- 	$(LIB_readline) \
-+	$(LIB_roken) \
- 	$(LDADD_common) \
- 	$(LIB_dlopen)
- 
- add_random_users_LDADD = \
- 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
- 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
-+	$(LIB_roken) \
- 	$(LDADD_common) \
- 	$(LIB_dlopen)
- 
---- tests/plugin/check-pac.in.orig	2010-11-25 12:39:31.000000000 +0000
-+++ tests/plugin/check-pac.in	2011-02-16 13:24:50.000000000 +0000
-@@ -62,7 +62,8 @@
- test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
--export KRB5_CONFIG
-+LD_PRELOAD="../../lib/roken/.libs/libroken.so"
-+export KRB5_CONFIG LD_PRELOAD
- 
- rm -f ${keytabfile}
- rm -f current-db*
diff --git a/app-crypt/heimdal/files/heimdal_missing-include.patch b/app-crypt/heimdal/files/heimdal_missing-include.patch
deleted file mode 100644
index e245cf8fff07..000000000000
--- a/app-crypt/heimdal/files/heimdal_missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/test_base.c	2011-09-30 15:58:45.000000000 +0300
-+++ base/test_base.c	2011-12-27 23:04:50.482955923 +0200
-@@ -39,6 +39,8 @@
- #include "heimbase.h"
- #include "heimbasepriv.h"
- 
-+#include <stdlib.h>
-+
- static void
- memory_free(heim_object_t obj)
- {
diff --git a/app-crypt/heimdal/files/heimdal_missing_symbols.patch b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
deleted file mode 100644
index aa915fb130dd..000000000000
--- a/app-crypt/heimdal/files/heimdal_missing_symbols.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add missing symbols.  Cherry picked from upstream master.
-Bug #420821.
-
---- a/lib/krb5/version-script.map	2012-01-10 21:53:51.000000000 +0000
-+++ b/lib/krb5/version-script.map	2012-06-13 16:23:26.000000000 +0000
-@@ -42,6 +42,7 @@
- 		krb5_auth_con_getrcache;
- 		krb5_auth_con_getremoteseqnumber;
- 		krb5_auth_con_getremotesubkey;
-+		krb5_auth_con_getsendsubkey;
- 		krb5_auth_con_init;
- 		krb5_auth_con_removeflags;
- 		krb5_auth_con_setaddrs;
-@@ -383,6 +384,14 @@
- 		krb5_h_errno_to_heim_errno;
- 		krb5_have_error_string;
- 		krb5_hmac;
-+		krb5_init_creds_init;
-+		krb5_init_creds_set_service;
-+		krb5_init_creds_set_keytab;
-+		krb5_init_creds_get;
-+		krb5_init_creds_set_password;
-+		krb5_init_creds_free;
-+		krb5_init_creds_get_creds;
-+		krb5_init_creds_get_error;
- 		krb5_init_context;
- 		krb5_init_ets;
- 		krb5_initlog;
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
deleted file mode 100644
index b16a90cefdb0..000000000000
--- a/app-crypt/heimdal/files/heimdal_texinfo-5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/doc/whatis.texi
-+++ b/doc/whatis.texi
-@@ -35,10 +35,11 @@ services can authenticate each other.
- @end macro
- @end ifinfo
- 
--@tex
--@def@xsub#1{$_{#1}$}
--@global@let@sub=@xsub
--@end tex
-+@iftex
-+@macro sub{arg}
-+@textsubscript{\arg\}
-+@end macro
-+@end iftex
- 
- @ifhtml
- @macro sub{arg}
---- a/doc/win2k.texi
-+++ b/doc/win2k.texi
-@@ -311,4 +311,5 @@ Other useful programs include these:
- 
- @itemize @bullet
- @item pwdump2
--@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
-+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
-+@end itemize
-
diff --git a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
deleted file mode 100644
index b1ddcdedd4e6..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs threads test X"
-
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db6.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
-	epatch "${FILESDIR}/heimdal_texinfo-5.patch"
-	epatch "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use berkdb; then
-		myconf+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myconf+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	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) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake -j1
-	else
-		emake -C include -j1
-		emake -C base -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C base DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	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
-
-	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
-}
diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild
deleted file mode 100644
index 5a5572526bbe..000000000000
--- a/app-crypt/heimdal/heimdal-7.1.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use berkdb; then
-		myconf+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myconf+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		--enable-pthread-support \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake -j1
-	else
-		emake -C include -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${D}"/usr/share/man/man1/{,k}su.1
-	mv "${D}"/usr/bin/{,k}su
-
-	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 "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild
deleted file mode 100644
index 5a5572526bbe..000000000000
--- a/app-crypt/heimdal/heimdal-7.3.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use berkdb; then
-		myconf+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myconf+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		--enable-pthread-support \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake -j1
-	else
-		emake -C include -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${D}"/usr/share/man/man1/{,k}su.1
-	mv "${D}"/usr/bin/{,k}su
-
-	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 "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-}