gentoo resync : 10.04.2018

5 files changed, 2 insertions, 26 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 7c321aef1ff8..de6fda8235c4 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ckpass/Manifest b/app-crypt/ckpass/Manifest
index 9bf125b94a2c..7f97ead6dc38 100644
--- a/app-crypt/ckpass/Manifest
+++ b/app-crypt/ckpass/Manifest
@@ -1,5 +1,4 @@
 AUX ckpass-0.2-tinfo.patch 417 BLAKE2B a99959b8c4430aa29868eee1a85d0a3868c73cab7e32861216391f73c4fcad02f3f37801aba7c33285da42208924f8e1b51b7439f87d40cfddb8cd2e565afd37 SHA512 172753fa8d0cc6050e06010e721a69c99aab3d743af80a9b63949ed0a79a4c39fefce9cc34fe711caab89c20715b982142379d57f6acac92a762d19fdb805220
 DIST ckpass-0.2.tar.gz 95921 BLAKE2B f1a03e293bf9e2f26c28c63a41cfc319f938ef10bcbae1c578da5cdeb322c31649fd060e2f45a3144bee15fe6050d3f00f499f924c34305942cd6f79afdbfb87 SHA512 aca439caea2e3736539f5ec6bb235e51c59fed627eb9b414e629ad246c301e6f1dc90594826f6d95be9963aa4af0dae64419d08a44beb0a02d16a9fdf42a9a0b
 EBUILD ckpass-0.2-r1.ebuild 498 BLAKE2B bbd9a931609f6cb919dcbc6ca4e2e96fa05ffeb6026c55a9b44de3e401d62011d738c5476fd94911d2dab1c34bf536eb7f6ac0500c1b8e4df2395f5eaceaddac SHA512 24de0a86d026ae6e92fcc86dd725c7c03401bc6631ef54759bf5549dc1b2c739cdc7faa5eb3e4ec6a7cef4c8b247dda33bb7f3509929d06533181094ba7821e6
-EBUILD ckpass-0.2.ebuild 508 BLAKE2B 898086c15c38c3c459be8ab92abd0a3b02051a4a0619bc7af61e4649d6740f35dff96a6b5abe1ee4c26196a6350310cfbfaf8535ab9cbc3720bd570cc3bde263 SHA512 7c8efe9c494ee07c47b7cbf5f1f509315c3d96fc7933929b5bcd6d3e70445ed28e793959ea42bbaff51828839940863e9981b7479044480847c897e406e3dc30
 MISC metadata.xml 243 BLAKE2B ed72a20ca55c34314c109963e70f2d9f84c6b163187aa1aadfdd381d6a72cf50cf0aa70aca283bd067459cf5be9e1d1efe49ce1a05390e5d4f82c833e94ae573 SHA512 c1819159451450ef4228df48702ae486aa5caca6ba53523f4c667fb76cc8a36388697ded12851290f2698596803a64025862b8dc5aa5c22ea0c328359d2c5014
diff --git a/app-crypt/ckpass/ckpass-0.2.ebuild b/app-crypt/ckpass/ckpass-0.2.ebuild
deleted file mode 100644
index 176807619aad..000000000000
--- a/app-crypt/ckpass/ckpass-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="ncurses based password database client compatible with KeePass 1.x databases"
-HOMEPAGE="http://ckpass.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-libs/libkpass-6"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-}
-
-DOCS=( AUTHORS )
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 891ab47a9ab2..f79cdae7b3da 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -19,5 +19,5 @@ DIST krb5-1.15.2.tar.gz 9380755 BLAKE2B 3f5d00a70bf44ef077872bde282e4753e82acb70
 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
 EBUILD mit-krb5-1.15.2-r1.ebuild 3913 BLAKE2B f4559c0b17ef398ac7168763d2e2225d8b1b061a61384313c93d69db9f680461008b48f4e66ed64f672fe1e6e32825a874084954e03b1dfa228ead6bb6d1e89c SHA512 b4da2e82b91b1fec83d94dcad8b2787f07f9b0bc1421519ce6a3b1545ecf30e14817debe67a9dd98ddb88b666b337be18b286b3d866e51664599b1e07f13eeae
 EBUILD mit-krb5-1.15.2.ebuild 3856 BLAKE2B 7b3d059b5bd6e68ba99bc896ae8435543a6128e4e7f9dc29e73a02cb145228a54c1f7eeca92bc3aec49582e1e0c24f9620089a8abe917b59a152b2608d0b5a25 SHA512 dc2d6fb486e95100a02a4b2f32fb93279b022195d82810e2a794f6d813f5c31f95b68b3449e2b885bc9a3658cb1d18acd76d76fa13907baa817215534531148b
-EBUILD mit-krb5-1.16.ebuild 4191 BLAKE2B 846b5380b1544a0f1eb3e3e780a6499c0a324b818f79fcf5a80d3ade3019e5ab60716f5a387c91037df9baa7841f01f299a80bbbac179da475d51b0c8675b219 SHA512 91b2fa0264271d7e48a6858ed92987e5f2d6a2b23a0af55ac1f410e914ac14e79fdf948da7ce43f4809a6775b5347a21dd78740785da74cb61e8b0413b9f1ea6
+EBUILD mit-krb5-1.16.ebuild 4190 BLAKE2B 906b1ae21a3d91d86fb3993eb076890812f3dee319fe2ae8599e2f728758e75c27374092f8157d70e5720d8615b0d5d6cd59294f831c4582319e294a7cf53d67 SHA512 0f91fb7d2364068b6917413ee317a1d8287f2be5c3f30889ae4c568cab61b37ae8e852010bd00fb61c7a0be2f9272a99f52f23709a063ce04d8f76a8bce4c2f0
 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
index e9cbb9b16570..7091c6dece7e 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
@@ -14,7 +14,7 @@ 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"
+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