Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

17 files changed, 261 insertions, 75 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index abd2318dd8e3..6af83296eae2 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index b87f69c22d96..5066b346bf45 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -1,5 +1,9 @@
 DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a7f856ce9c077445d6387b75b97dce0fc02ee9481241b246b0eb7de6b44ac014a708a8ceba629828ca9d63b8e24c SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0
+DIST codecrypt-1.7.5.tar.gz 464250 BLAKE2B 79b4f88b0779a68a372160dd18d5b53208e4ed851aab3685bdd140649ba95aaee5918816da4a22c3997e7e9c4d2aa7a9497a1858c680a80a1c3bd1b22f5944fb SHA512 237459ec4387f068d39946c1360e27b02f1cfd34a78eef0d3c3eccf31604f3d27b9e5c9c091b88257231bff02f7bf9fb82f7a9e8a8e8a6bbc27091c83ab1f880
+DIST codecrypt-1.7.6.tar.gz 463999 BLAKE2B dc5e6e0a61c267566924778b19ad53b0e743f2ae4ee8828a638cf00ab0c53f0a1c089d0c7d1635dfe78d077bf2ce9c6d9ea0b2a658715bb5cbe2d831f0b00c62 SHA512 1bd1432c75985d2ff968095bcb9e23ea2c6e91bd7009c9c50a5ab90123e14db0937e0a945a20a6c7f540a5b52e3f1d9ea2dbf779406d43a203f1d1bcafb94406
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
 EBUILD codecrypt-1.7.2.ebuild 672 BLAKE2B 525178d3411173523afa24e0df3fd117095f34fab99ed4d8666e2be34b7408de6311b06088a8cdcdc4dfc43f179c86abc70ed769aa0dd978ae5e3ec60730d176 SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e
+EBUILD codecrypt-1.7.5.ebuild 677 BLAKE2B ef4461f71e009d7eeff1bbdc282e06a1e941ceb5185dd8f5b32183dfb7836e7737d9123a8f1cfabe1f5aa60250b4b165d5cbd7bd8f94028f1dbb6a9ffc5b0731 SHA512 f39a62e22e29a39bde6aad8df33a4741ab6b94d0f797b1c5907511e7f5e5f1005516935e7d0801c246cfd2f843348666db78af3bc822c6cd7a6ed638cbfecf56
+EBUILD codecrypt-1.7.6.ebuild 677 BLAKE2B 5f5aaa254095aae48d27d1a13d8033a3d034febd9b01b47284792c952476c8cde5131de612f77889171927cd49ed07bcbfaf2a44e3f48f1b83790af0b3d313ca SHA512 fd767cde802038e27f375727adc48894bb588ef434e42dfd5e09dc6efb3c98b1048aea533954c5bb91447c7388ddc1c362f8cfd0f394284f935366d1ab72f17f
 EBUILD codecrypt-1.8.ebuild 698 BLAKE2B 1503c168832401752ed9c97900c491c6656facd16deb7864374fd6de64340d741b80b27ce1bd26d65ab15cf0079efccbaff6c0d3e1e462cd38eaec47ba09bad2 SHA512 2ee7d6740af6fd54cc77eb8dd3bb79b787c6a09256cc426a27bdece3c30735fb3d63b8dde6919ddaac5bb1bfe0ed7e1eb347b22f407682fb79f42a2962e7f874
 MISC metadata.xml 757 BLAKE2B 5346ca41ed3210ef96baa63fc22e5733d47d8998f7b0cca37cd0aed53b67a7adf5bd8cbedd68d4194476ec7ff0fe83196038766cdbb3580b185566abca76ad9e SHA512 f7e7f6a747c42a666bd0b5de69999fd377374da728c9c98f8e57fa4c7fd93e97a7a7a721c568ba920c4cbe5f5591f4174db99d89fd209df7aecbad06f59f75a3
diff --git a/app-crypt/codecrypt/codecrypt-1.7.5.ebuild b/app-crypt/codecrypt/codecrypt-1.7.5.ebuild
new file mode 100644
index 000000000000..929eb593187b
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.7.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cryptopp"
+
+DEPEND="dev-libs/gmp:=
+	cryptopp? ( dev-libs/crypto++ )
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	# workaround -- gentoo is missing crypto++ pkg-config file
+	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac
+	./autogen.sh
+}
+
+src_configure() {
+	econf \
+		$(use_with cryptopp )
+}
diff --git a/app-crypt/codecrypt/codecrypt-1.7.6.ebuild b/app-crypt/codecrypt/codecrypt-1.7.6.ebuild
new file mode 100644
index 000000000000..9a1a3f9e686d
--- /dev/null
+++ b/app-crypt/codecrypt/codecrypt-1.7.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Post-quantum cryptography tool"
+HOMEPAGE="http://e-x-a.org/codecrypt/"
+SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cryptopp"
+
+DEPEND="dev-libs/gmp:=
+	cryptopp? ( dev-libs/crypto++ )
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	# workaround -- gentoo is missing crypto++ pkg-config file
+	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac
+	./autogen.sh
+}
+
+src_configure() {
+	econf \
+		$(use_with cryptopp )
+}
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index f094fb0854f3..cff00a88203e 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -1,6 +1,6 @@
 AUX 65easy-rsa 37 BLAKE2B 4a53c21a6027a9c5857d93e23703651b3d2642f54ce4519e727dd421230662f27f2ab45761041cf5b6b6cd654831d33297f1656eab26c496ee3e4f9d39f6ac3d SHA512 2f8c4f489ebd2ad2e5a0d45351361ecfc06a9481d9e15ea48215addb82ddf2083a85acb0a5c171d0c7e5406152d3679a5a7835e22ba9953e554614d94026d778
 DIST EasyRSA-3.0.1.tgz 40960 BLAKE2B 8f1be521da9c57abc911b771188bd6e3e0732fa03445de2ca5815ac4d16cd59993e2dcc7c714c6bf1ff151ab9e95b5c9578504ece3787996d30ed37972ec6047 SHA512 d20f646e33ec803444dfcd446553f1d6001227fedec93280c212b34cccee11b184599f1b2ae6a3ce9cf6c9ac52f2b840ebb645536df6ddf55382fa25c22df81f
 DIST EasyRSA-3.0.3.tgz 40960 BLAKE2B 1ada3a467bda797d35204d5a03b94a750e339a7ec8a7806007eee4b6b5442e76a2472a404fb7e963fefc42385474a0197eeaec8fa27c2b737f7f4ff55b4e2878 SHA512 c8cdc31d67e63f9e8338095fa4534bb141d857a8a9f510bef1af32270b8421952e569253bc8b7a51ebf1b443a6ad5c7cd011b258d7c9f56426ecd3f2b710b6f9
-EBUILD easy-rsa-3.0.1-r1.ebuild 857 BLAKE2B 3fb4a7174f5ac361e72cbfcf477a1cf8f9ea052ab80503374915f6b908bc8efff58063dcca123b3f2473e16d16a7aae9dc25b1ee05ac195cbf17d4f75ce633f8 SHA512 59d2982e230e6273415ca420b37ef63708799501b6d828397f857351439841935321aba0d2bb7700842f9c46db7a24b4266a8f8745a4163406e3a49d39bb0d8c
-EBUILD easy-rsa-3.0.3.ebuild 863 BLAKE2B 84e876775df4eb074580586cabca63b71a689a74bd09914697a94fb45ffd074d3f4c56a73c0c87f6a927cd4e012fefad4cccdd103ebb7132eb4a7c496d85aa46 SHA512 54e54180274a49c87acc6cfe1db7e5299eaef5b151e2192492af21a2b268b4196333b66d9e5d1166cddf32bc5a6270d82a8bed1fe06dee639b1e7bfd4b243d6f
+EBUILD easy-rsa-3.0.1-r1.ebuild 856 BLAKE2B 6cbb1e3eb67f38d9e4206bfd9350411af7a7da288c6b1bdfb66717586d84d1bfec1de66b8aa61c8be44c9175dd757982a6bbd21787c72e923b4fe2229ac26e44 SHA512 8be27d7faccabeb9468d4b914b690a95f11dd02225759e51042b8f54043253570fc2a06b2173aea31b2c33ebba879effffbba4d8cb95a6f51871b3d7760a11a9
+EBUILD easy-rsa-3.0.3.ebuild 862 BLAKE2B eb9eb0307d2cd4ea01e41b35a2af90d24b5a20e0eb72f9724150e4e800c8fed1f733db45349b2c1f4f2af50215e48e7148ec1564798a702e6cf24fa94249001f SHA512 2c030b2a4fc5ed9fc02de403560a0cec4ffae94ff18611b7942408c937e36544aeba5b6cb87b7db23734b3f2ea0b7f6f19699e789013761484a374bd093f5df0
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
index 949a6813ce01..393d4f048431 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils
 MY_P="EasyRSA-${PV}"
 
 DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
+HOMEPAGE="http://openvpn.net/"
 SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild
index 5604cb713a69..cf48b3864eeb 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils
 MY_P="EasyRSA-${PV}"
 
 DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
+HOMEPAGE="http://openvpn.net/"
 SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/v${PV}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index bdbbbb78eeb3..2fbe4cfaa2d5 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -2,5 +2,5 @@ DIST libsecret-0.18.5.tar.xz 508556 BLAKE2B e3410dd113dfa1f4ebb78a47f90e23455eb8
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 EBUILD libsecret-0.18.5.ebuild 1587 BLAKE2B 5bc76ca976d6fb5747df1fc877a66789b2260322b40e4a0c01e125d35423f813d84964f0cd7e8ce24eca3a009d3071660037a5c40de1364f343bcb06272761fb SHA512 2b8a057d68fae082f3485e20f1e2c868842d23d2ea49b4e42f3e67d2a684581e517b6d9b4d9daa0a25799f560ce276feff6cdec064082ce38f3d364f7c32ec74
 EBUILD libsecret-0.18.6-r1.ebuild 2671 BLAKE2B d7a95fd30b35cb755b1459c0a01a743d39fcaa4e274cd90dfe88c3325e843ceb99bfbc3a5316f15fde241f7aa838c051fbb89c3c7c48a5b104ac18a6a027afee SHA512 9d17bb7fca1525a6037cc7251d822b23bcbbf3bdfd376d0b97f25c5925a92dd933fc9c676fb4fbce1a003c9e77645c76e155d8f845a597e0fd39bebc323324ad
-EBUILD libsecret-0.18.6.ebuild 2117 BLAKE2B a84646e1f775dd6a3e4d2bc3bbb06a9e4a63cd363b71ddfc43feb46967486fe37dd322acd5f767d86f5e68bf2cce97a21d5bdbfb1f13b383ce59e3672fa4ff5a SHA512 9e6e9f150f3e2d8077f50c2bebf807f6785d3ca8ac230c71582521b817469cfb3b86ef71bdad14bea17896d6ef372dbe68672e63deca8be9c40ba980b3b8742a
+EBUILD libsecret-0.18.6.ebuild 2118 BLAKE2B 176a2449d4288c71d0e22caa82a9ea3ae1f33ad06154fa0aeba35d5d30fd6500401df2f3815b53e040feb54900220c3e46b7ae936e44f5a9c614309c152273d0 SHA512 b67859bdc619a3e72ece33e3d0258b1a1df33eb15ea09c2a890e0683c4b99af1d098ece8adbfac60b225055f81ce3db927dff927cbcb667671784e1c685d15a6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6.ebuild b/app-crypt/libsecret/libsecret-0.18.6.ebuild
index 5337020694d9..bb2a01f9ac06 100644
--- a/app-crypt/libsecret/libsecret-0.18.6.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6.ebuild
@@ -19,7 +19,7 @@ IUSE="+crypt +introspection test vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index b3d8c05cf34f..3776ab05a972 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -18,4 +18,5 @@ DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e85
 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
 EBUILD mit-krb5-1.16-r2.ebuild 4215 BLAKE2B 5b8d1df734687258802cdc5d170cb99cfa27897ebc74deb7af55da09c23a2f3e644f602711f9e48d6af268fe51bc11a6c008440224bb2978ba20bdf3afafe0c3 SHA512 9987324870011391499c4d6d35c6df258172ec423095388b66f097fafe5718c74f8eaf2975919624456b574fbc155d6cf19ec42ebc14ce301e6d92113ab5f4dd
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
+EBUILD mit-krb5-1.16.ebuild 4060 BLAKE2B c271a048c52a7e940737827bf6c6639b333520be6f631edab5a6a7c901ed4a7378a994f247418c5bb131141b75de71c8d42dc9ab0135cbdab5ad68c6e51006fe SHA512 95d2149d2861b5c7ef3f6e9d026100c37814c7b87bb9e2879985c5ee50847bc894b4f73ec0ee9de8d3b2cd717b30541c382d011aa7408618ccd23a3d7556719f
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
new file mode 100644
index 000000000000..f267ea8e5c48
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite require network access
+RESTRICT="test"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(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 \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	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"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index ba0889df3d4f..8915b8a8950e 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,4 +1,6 @@
+DIST nitrokey-app-0.6.3.tar.gz 769503 BLAKE2B 97b4f9951cb1ca1e3da1a2af32756b72a9a9e1f8b55d087115a6a95fe26a7aabde6c9503330f43308c3824211524dd1780e104ae6e28e3d60c38cc1b4158edeb SHA512 23960b0ca740a4c9520a3d7043f396ffb6fb730ef28ad44b299aadbb0b7d2fa1a182c38a88fd684fe664c2079c5a03c5a6b8e6ceb7f8ca69a37fb64ef64237a6
 DIST nitrokey-app-1.3.tar.gz 1132479 BLAKE2B 96a20ed4156137e13c0b0eb3f69edd537cf2a236781ba55d295b797a2a273ef3a412f27c2302c035569756146acb006752dd91d9176377f142e2a8c8108ef4a1 SHA512 b78830dee0957601b2e2de97ef267154e9b3444e9ef49e307f7aad5810e4184f1b5d5a278711431cac098e51217eda30d27425cd6a83040fb16bc27d6b1aec5b
+EBUILD nitrokey-app-0.6.3.ebuild 723 BLAKE2B 568bdb73d8a109ae377ba3f189ebd5c1760a13f886394f9421d7ee22ab9537a58aefe5adcb1b2204cd388edb4ba6865d0a96dfdcff575126602be61cf999d867 SHA512 11c36ae01ed31273939bf775b12d29063d9a08c9dd3d26a270f814b75c03e18863c10f702a0f7f6e00ee7b198e027d4fee31aa142b973e5fc08048fab0336c8a
 EBUILD nitrokey-app-1.3.ebuild 1012 BLAKE2B c7c13573c023e7b98f4f79b9e0333855171ef2bc5c38d734c2722cae2c41fcf87399c07bcd48436676bc63d7a84ef0b7059094ce6b7465f35e4b3cd584f75069 SHA512 66f7f0610ada624a2c5f687a145033d321b31c20a579eac74cc192969f212ece0ee8f2e491de099e93d22f3d551881a9f5f9383577a27fce6b8dab728a36c464
 EBUILD nitrokey-app-9999.ebuild 914 BLAKE2B 88dee3884a2974d8985e344bc3d23f9198108acd50cae3c8a91c72054e4012cb7260d2184351e007bfd424ce13a5091b8d82871306673d5ecf5eb5cb27695a6a SHA512 5930fc79a9c1962bb2277c8a8305ae3ad219db553214801b45773d3c62ae6621910292b474bd00183d4c43eabdc70d1dff9a96bb7b75475f06f01989fb105a48
 MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
diff --git a/app-crypt/nitrokey-app/nitrokey-app-0.6.3.ebuild b/app-crypt/nitrokey-app/nitrokey-app-0.6.3.ebuild
new file mode 100644
index 000000000000..fb7b2f7c6b97
--- /dev/null
+++ b/app-crypt/nitrokey-app/nitrokey-app-0.6.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils udev
+
+DESCRIPTION="Cross platform personalization tool for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
+SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+mycmakeargs=( -DHAVE_LIBAPPINDICATOR=NO )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i "s:DESTINATION lib/udev/rules.d:DESTINATION $(get_udevdir)/rules.d:" \
+		CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index c78eba6e3016..e60eaddb0eec 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,5 +1,3 @@
 DIST gentoo-release.asc.20180323.gz 40546 BLAKE2B 7fed70d734a73368e4772cbca7810e8d61ad3b483e0e0c115072de9f96332b0c8c3c9f091b0ee1cdd056c775db1121deee77d6a629e0b99a4c67d485ccacdfe6 SHA512 31ffdf1e23ea6a36c5f4ab6bd49b9c0323b6b03627a9001589030b2b10e95459b959ee931762bcd43fb94b28eaba5d5ede290b1a41ce3ec0ad1b7b8b0f98d48a
-DIST gentoo-release.asc.20180530.gz 47465 BLAKE2B de37e8e84570debd8b39003bc65ada276f730e8a792b8990c87f4ffd7bbefd2cf49e44b53d3554fc6ecc302da65c8fc480821fd6e9f11324d5ed08a5fac861ef SHA512 63fcb06ae84657cde66fa74bd2b499936906d7aef36c46d19439c72a8c0f199cdc273d7e25004c60b23c50684365192b2a304f26c2b173564a216316eb22f66a
 EBUILD openpgp-keys-gentoo-release-20180323.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
-EBUILD openpgp-keys-gentoo-release-20180530.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
deleted file mode 100644
index 8d339d4fb133..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index f0ae0c162cfb..76905b57e584 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,8 +1,6 @@
 AUX ophcrack-openssl-des.patch 3253 BLAKE2B 91bdac930a784eb8f68c9cfbec7f0a41e05356cc5a87b2db37669e943fc576938b3cc494446d78407555d56af4357a77e4d92f391a4ec5971b5ae97ccd36a0db SHA512 60f4ec2792f1d697db62bbef16a1f365e368fa4cf99695b1fdda4cdfaa1fdef04bf39dbfea72fe5d97aead6435553051eda0b3b619ae93915f11b87de29cc4bc
 DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
 DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6
-DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
 EBUILD ophcrack-3.6.0.ebuild 846 BLAKE2B 8d54066d02a3055fe3167a659058b5dd1137259242a566b24bc5154e09aaadea383a8c707657b06737cba767557e9e863c8669a32c5d99fda703839cfa1cc886 SHA512 8e61e377fb4e58bee406516987c4d5514ad525dd7979e6f93911ce60d80a40a26d48b5f9ca76be7eea18316fcfea52107db5657cfbc34c87166e72091463e6b5
 EBUILD ophcrack-3.7.0.ebuild 796 BLAKE2B eb167f52bb137c834a0ce928306858842fe21431f102a6c03ec36e450ca8719a5bdc7e20f9854abbcca6df612cba19ef427399c1ef50bfdb43303b4b172579db SHA512 86b8fbaac65982c84a32df52339d00ee08a0d2a072e14485475e25b7ab0a5d6237b9efe2a65c60e700dfd43ae8eb301e6974ff7e0c27eded1cfe94616422c386
-EBUILD ophcrack-3.8.0.ebuild 964 BLAKE2B 5098915d456088f26eaeafece924257f3657a0cea2edff2805d58f6c92bf29e0fb3994cee9b7af328b54fe559edb139571217228bf6d6d6c8fe35d6e6d49883a SHA512 bbbf006ea530c3b296a01675b84e71e1fd80d7020a0244945ac67e7690500c668c756a74fcb2efd5279cae822f92598ef0020be407d34ea56d681119f51f3b13
 MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
deleted file mode 100644
index 47dd63963818..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl qt5 +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib
-		 qt5? ( dev-qt/qtcharts:5
-		 dev-qt/qtgui:5 )"
-DEPEND="app-arch/unzip
-		 virtual/pkgconfig
-		 ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
-
-src_configure() {
-
-	local myconf
-
-	myconf="$(use_enable debug)"
-	myconf="${myconf} $(use_enable qt5 gui)"
-
-	econf ${myconf} || die "Failed to compile"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
-
-	cd "${S}"
-	newicon src/gui/pixmaps/os.xpm ophcrack.xpm
-	make_desktop_entry "${PN}" OphCrack ophcrack
-}