gentoo resync : 30.06.2019

17 files changed, 14 insertions, 340 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 89a8f16f9040..71aaab3a9e02 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index 210b2b3ce746..e6e5ff90b65e 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -1,7 +1,3 @@
-AUX pam_p11-0.2.0-build.patch 812 BLAKE2B efd9b8f46bff6bfd04d0be9a82998ddb3ef4b53d17130be349b0ed85fd5845e4c4aeff24417e740a3f8534d76bc7598666a9f07836aeeb264bb9d71a05c8ab77 SHA512 ebb3802d4ed4e6e6b2bb863edceb04e02246f5d36a0b7d78ba17295f151c2864a13fd9b161568da614b03c38f81c2157793a4160a90bbb61a9e666c4075807ef
-AUX pam_p11-0.2.0-openssl11.patch 2501 BLAKE2B 445b10d67ac5102c4b2b95931ef7168e25ac5627d5a60e6fe3f28dd01840a0882c4f6558d841af9e2ba64bb46a00692cccf403c19195a2eb3f7bc702d23056cc SHA512 1e0ebce3b42f66b2c1d9a0ac2c0369dc6a4d8c379625aad151260c844263381b3ffb8f12e2298152d7b6213cc773bf6aa77b603bebb321902ab106e376966367
-DIST pam_p11-0.2.0.tar.gz 417550 BLAKE2B e3c5bb32d6c7c84776341796ebdb9850a9561778aee820acb2a6c61112a2a5df5ee7c539cb5974439e565046e944f4710b87c3b51dea61fdb2cd9171daac3a0c SHA512 2cadf6fe880c953554757099741f3cfe992067f251b7e7e977a6dda5f65cbe1f55b1de6d180638997eada0d3b760887091014b99f8ae4b6d31b25af8e555343c
 DIST pam_p11-0.3.0.tar.gz 422806 BLAKE2B 60ac1cc0b8fff536553b2502f906f7730c1be760b2948389f5a6399979f994b3fcfa04226f1605c64d02bad47f46c9bd28fa076d819814b9121241b034407d4b SHA512 f89cf57f6365c25e54830d18180aad7d14b7eaef82eb0d419bcc3d8b881e1e07993a2c4e635e90b4f2fb779fec24fa0d912388f898d726e387bc0db63d772d49
-EBUILD pam_p11-0.2.0.ebuild 794 BLAKE2B d0e27ab2400ee4020ff19340b3fd05f3c4d76b499a2c691626077edcf658cf40d948a582002c25457f6d89c00f830cf64d5c12a3299b36c60fc4013f81edbff3 SHA512 a34f0f2bd5ec5dedc07a8f49cc67e6945dad7ccae263ec55014ba3fb3ba9d535297b2099ae7fbe7f3baac8e6088e3b2c01210d19e698ab64bc9269b7d9e574fc
-EBUILD pam_p11-0.3.0.ebuild 658 BLAKE2B 313e54055b346cb7ff88ad12dffc30caeae899a16070e00caa9f6e601946baa10652432140af945355fc96126eaea509a8522f84a46294d0e6a954a675c0ede0 SHA512 ca6339fe4dbd2c1406bbdc56567abec840c0bef37e0047d1250c8d998233687ff7513211c42d120d255bb53f09181a14427358dafb278811a87fe9d62d1e6098
+EBUILD pam_p11-0.3.0.ebuild 657 BLAKE2B d028c59591981a7a9b70e080c349d035f64f4460c25bcedd315bb00ef79f859ecde4144c3f5f1ff0d7e43b7c00966690e31b84a46d602ba27035f86a3974f10e SHA512 1468f91b78ceb9d2e3dbf368bcd7d604886445374b3e3554f2cb2d61aa67b2781ca8283f1c49051fafb5a8eb6784c1859eb373a8f9c3612f91126a41272d6220
 MISC metadata.xml 382 BLAKE2B 8617a56b292f5844a178afcbaaf56ad5e1c221871fba9012f19e2b94f2a745e2a39e0298d4edc1b30a4aa62bddfa0afef1751966292d2b9e3117832787e0da8d SHA512 1747f4d94dd0a90448d38557beae49c4532f752a33956a54795a58262d42c259d7371a9ebe5a5ac347a7d1178d7932c7f40bce363c476f7a199ff03129fdaf6c
diff --git a/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch b/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch
deleted file mode 100644
index 813499acd3a7..000000000000
--- a/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 659a6eb5434039c27b41a9d06edc64923e5042b9 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 15 Aug 2018 18:30:51 +0300
-Subject: [PATCH] build: pam_p11: unsigned comparison
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/pam_p11.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pam_p11.c b/src/pam_p11.c
-index 960c164..1cf6cb2 100644
---- a/src/pam_p11.c
-+++ b/src/pam_p11.c
-@@ -553,7 +553,7 @@ static int randomize(pam_handle_t *pamh, unsigned char *r, unsigned int r_len)
- {
- 	int ok = 0;
- 	int fd = open("/dev/urandom", O_RDONLY);
--	if (0 <= fd && read(fd, r, r_len) == r_len) {
-+	if (0 <= fd && read(fd, r, r_len) == (ssize_t)r_len) {
- 		ok = 1;
- 	} else {
- 		pam_syslog(pamh, LOG_CRIT, "Error reading from /dev/urandom: %s",
--- 
-2.16.4
-
diff --git a/sys-auth/pam_p11/files/pam_p11-0.2.0-openssl11.patch b/sys-auth/pam_p11/files/pam_p11-0.2.0-openssl11.patch
deleted file mode 100644
index 8c41e29bed1f..000000000000
--- a/sys-auth/pam_p11/files/pam_p11-0.2.0-openssl11.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 46a6079817c67a09e5ac493af3381c655bd91c26 Mon Sep 17 00:00:00 2001
-From: Peter Popovec <popovec.peter@gmail.com>
-Date: Tue, 21 Aug 2018 10:24:36 +0200
-Subject: [PATCH] Replacing deprecated OpenSSL API functions (#12)
-
-fixes https://github.com/OpenSC/pam_p11/issues/10
----
- configure.ac  |  5 +++++
- src/pam_p11.c | 17 ++++++++++++++---
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5bcbdd6..2854a99 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -85,6 +85,11 @@ PKG_CHECK_MODULES(
- 	)]
- )
- 
-+saved_LIBS="$LIBS"
-+LIBS="$OPENSSL_LIBS $LIBS"
-+AC_CHECK_FUNCS(EVP_MD_CTX_new EVP_MD_CTX_free EVP_MD_CTX_reset)
-+LIBS="$saved_LIBS"
-+
- if test -z "${PAM_LIBS}"; then
- 	AC_ARG_VAR([PAM_CFLAGS], [C compiler flags for pam])
- 	AC_ARG_VAR([PAM_LIBS], [linker flags for pam])
-diff --git a/src/pam_p11.c b/src/pam_p11.c
-index 2b4bfbe..60380e5 100644
---- a/src/pam_p11.c
-+++ b/src/pam_p11.c
-@@ -31,6 +31,17 @@
- #include <openssl/crypto.h>
- #include <libp11.h>
- 
-+/* openssl deprecated API emulation */
-+#ifndef HAVE_EVP_MD_CTX_NEW
-+#define EVP_MD_CTX_new()	EVP_MD_CTX_create()
-+#endif
-+#ifndef HAVE_EVP_MD_CTX_FREE
-+#define EVP_MD_CTX_free(ctx)	EVP_MD_CTX_destroy((ctx))
-+#endif
-+#ifndef HAVE_EVP_MD_CTX_RESET
-+#define EVP_MD_CTX_reset(ctx)	EVP_MD_CTX_cleanup((ctx))
-+#endif
-+
- #ifdef ENABLE_NLS
- #include <libintl.h>
- #include <locale.h>
-@@ -578,7 +589,7 @@ static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey)
- 	unsigned char signature[256];
- 	unsigned int siglen = sizeof signature;
- 	const EVP_MD *md = EVP_sha1();
--	EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
-+	EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
- 	EVP_PKEY *privkey = PKCS11_get_private_key(authkey);
- 	EVP_PKEY *pubkey = PKCS11_get_public_key(authkey);
- 
-@@ -596,7 +607,7 @@ static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey)
- 			|| !EVP_SignInit(md_ctx, md)
- 			|| !EVP_SignUpdate(md_ctx, challenge, sizeof challenge)
- 			|| !EVP_SignFinal(md_ctx, signature, &siglen, privkey)
--			|| !EVP_MD_CTX_cleanup(md_ctx)
-+			|| !EVP_MD_CTX_reset(md_ctx)
- 			|| !EVP_VerifyInit(md_ctx, md)
- 			|| !EVP_VerifyUpdate(md_ctx, challenge, sizeof challenge)
- 			|| 1 != EVP_VerifyFinal(md_ctx, signature, siglen, pubkey)) {
-@@ -613,7 +624,7 @@ static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey)
- 	if (NULL != privkey)
- 		EVP_PKEY_free(privkey);
- 	if (NULL != md_ctx) {
--		EVP_MD_CTX_destroy(md_ctx);
-+		EVP_MD_CTX_free(md_ctx);
- 	}
- 	return ok;
- }
diff --git a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
deleted file mode 100644
index f2aa0f8952fa..000000000000
--- a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
-HOMEPAGE="https://github.com/opensc/pam_p11/wiki"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="virtual/pam
-	dev-libs/libp11
-	dev-libs/openssl:0="
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-openssl11.patch" #658036
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-pamdir="$(getpam_mod_dir)"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/pam_p11/pam_p11-0.3.0.ebuild b/sys-auth/pam_p11/pam_p11-0.3.0.ebuild
index 9f8624cd5168..e004a486dd8f 100644
--- a/sys-auth/pam_p11/pam_p11-0.3.0.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="virtual/pam
 	dev-libs/libp11:=
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index 1391e1d4aea0..acce4a071562 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -1,11 +1,5 @@
 AUX pam_ssh-2.1-dot-ssh-check.patch 701 BLAKE2B 64b7ed30c85e67125ff74f1507454510bab083a9eff458096645bc86e7eba50c4ffcc0ae31e9880b03f5b93834d900883545fd9961289a398b52d4df67db1a54 SHA512 96fd0d648115f5004a5a8b67f23240abdb2a58e46ba10009030bb1162561c1554fdf5c14c56605d7e1758dd1c2560a1b7647532a4c69c75df85e141df394d794
 AUX pam_symbols.ver 35 BLAKE2B 7a18277fef3362b21eb99b602781493de6818e93d86a0553fc97e67b780644b38a5233757a0b9b728d9a1cbc26513078bf99177809b6b5f68af273352b377819 SHA512 40e2d23783153bdfefc9ec7d9caf818e1d157bfa4f3074434e034aae47e3aa7d08b04dedbe06ef60ed2a93729f0e04aa09cf8e9f6929dfb15e4ae49c75c9d0d9
-DIST pam_ssh-1.98.tar.bz2 292989 BLAKE2B 08744c6649aa58c7221e5ec07e0c6aefa8d045cf30df01b941962d29f3abdae902b0fbad37923e3ff05536e422a1062732a6998e4b58d978d369df3d866ec1aa SHA512 bf6da4ced0619549d56516c6b24e899664e0948da7a0cc04ff1b536d06cc8c26242c83eb36ed835668c824b777e270aa293162ac77e3c479311386e6e5da39ff
-DIST pam_ssh-2.1.tar.xz 361000 BLAKE2B f22836af20b41ae7254f816c33793bb3a128b604ec36a20b207610deebf61f4d5dd070fd6f5093c6f7b6eb9e14f85cd81ddbbed7e97ee581124e5335722d036b SHA512 8252b15efffa5687f740963f7a3c3479b73f99eca26a17155f915a10b9a71362a2778449adf10f01c174cc8545961ce3ea64459338a7c995c242b209529fd640
-DIST pam_ssh-2.2.tar.xz 382244 BLAKE2B b3e6122530244add64400a6c4ea9811eb6feb0309b11d9ad17d800c3ced555f5459a8dc55ec58b0649017bcce9fb12417d4ba52ab2acd3acdf5e4a0cfe956e57 SHA512 b3caeb6065b2ac925cfd1a12107902f8474badfa1770d6499508d00bf41b54497fa17080f84af9dde0b6b7692d4bd58d33d94257c3106dac7eee79ebcf3b4692
 DIST pam_ssh-2.3.tar.xz 380396 BLAKE2B e228e30c6f353f631c0a1c41e82e31e7a8c573b04ab1cad4038a245b500666b42c0efa9f686d28f2386688596de761085afb1318b94fef5541f8c0ffc1e18b25 SHA512 e3ddcf851ffd8f6fb831e2dee7269c1b89283ae2f8f6aa3487bf7b1bc71d26ac9bcbd2a01c5a67a983b980bbb5151e991402940f4752741286d057843c817895
-EBUILD pam_ssh-1.98.ebuild 1149 BLAKE2B 992b24c2e63a6c3ab9e253e6953f1f31c2087299a9befa13532e94ff376c2790ded71e47d35244f7acee63a02761f5a04bb68ded168246daa7d5a68583b9fcdb SHA512 c1836e72948fe0fe59f2657c9d5d7fe6f05021cc25b94ef035fd33d63d3a6bc04e3e21d7738a662eab1b3a3bc0b23e2cef47fbd3c6f675fbf3a5f6db1febae27
-EBUILD pam_ssh-2.1.ebuild 1674 BLAKE2B 4234af139462e91adcc0184e56372afff1098a666f12e03bfdcb83ee9a8caaffac7fe1814c35159f80e2be5f21e6f419386d15b96ed1d62e231589cd75f3f40d SHA512 12508a96cff523b740ee0dc8cded9ddec545124417e65290fabe7644f5cc9b96206804cf7f071b793722f41305ad4e49ba4612a97ebea6ee01036a5f37cbc62e
-EBUILD pam_ssh-2.2.ebuild 1754 BLAKE2B b0175df5997d4caa2a1f9051777e29fc33f37bf7adb7647dce22e3e14867b81529429e07189b1201c8071f8f841e94f276fe62f47f96c15becf0bc61cdebdf33 SHA512 6e569c3708e7976f1a6a30fcd620d9f2a6bad8350a4f58dec9adf4421b8a88e8caf335b95407404dbcb44ddb64bd4e9d1d9cb244002da97e77c7042a7ee53ffc
 EBUILD pam_ssh-2.3.ebuild 1836 BLAKE2B 99b4d910cd96ed4fae7cb8e41c066825cd44bfaa3b43ea9d4d620caa08f286ccf4ab3e88228cec47da1beb3f48f901219d4359576a660791586edfe903eee55a SHA512 21fdc93f7123e35fbeaf09cacdf21dcffd75522633be9266e1d01199553d4607b5c2f29ce4680a8c978caaec11c2dba764e5929d1a68e4c300c7fcfa4d5ab38b
 MISC metadata.xml 324 BLAKE2B 1f4653cabf69551457456f200b45bf0240e920ee15962ebce3d959c8bf12f85c8b2de96f3cfaf3f4a244b062f29b2aab2e24eb9c2bd886c491d4c337dc88f3ce SHA512 f90c92c4bf59d659b312bbd22526a9ef2f347d5481d89c91847996981077d1504a996a2bf0a7382f95f5a10f86e20a2ddbc0a4875e2850f9a777457e2e911d40
diff --git a/sys-auth/pam_ssh/pam_ssh-1.98.ebuild b/sys-auth/pam_ssh/pam_ssh-1.98.ebuild
deleted file mode 100644
index 3f8800d3f5c4..000000000000
--- a/sys-auth/pam_ssh/pam_ssh-1.98.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit pam eutils flag-o-matic readme.gentoo
-
-DESCRIPTION="Uses ssh-agent to provide single sign-on"
-HOMEPAGE="http://pam-ssh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.bz2"
-
-LICENSE="BSD-2 BSD ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Doesn't work on OpenPAM; looks for OpenSSH at build time (bug
-# #282993) and won't work with other implementations either
-RDEPEND="
-	sys-libs/pam
-	net-misc/openssh
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-DOC_CONTENTS="
-	You can enable pam_ssh for system authentication by enabling
-	the pam_ssh USE flag on sys-auth/pambase.
-"
-
-src_configure() {
-	# hide all the otherwise-exported symbols that may clash with
-	# other software loading the PAM modules (see bug #274924 as an
-	# example).
-	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
-
-	econf \
-		"--with-pam-dir=$(getpam_mod_dir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-	readme.gentoo_create_doc
-}
diff --git a/sys-auth/pam_ssh/pam_ssh-2.1.ebuild b/sys-auth/pam_ssh/pam_ssh-2.1.ebuild
deleted file mode 100644
index fc7b3e0e8a1c..000000000000
--- a/sys-auth/pam_ssh/pam_ssh-2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit pam eutils flag-o-matic readme.gentoo
-
-DESCRIPTION="Uses ssh-agent to provide single sign-on"
-HOMEPAGE="http://pam-ssh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
-
-LICENSE="BSD-2 BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Only supports OpenSSH via `ssh-agent` #282993
-DEPEND="virtual/pam
-	dev-libs/openssl:0="
-RDEPEND="${DEPEND}
-	net-misc/openssh"
-
-DOC_CONTENTS="
-	You can enable pam_ssh for system authentication by enabling
-	the pam_ssh USE flag on sys-auth/pambase.
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dot-ssh-check.patch #503424#c5
-}
-
-src_configure() {
-	# hide all the otherwise-exported symbols that may clash with
-	# other software loading the PAM modules (see bug #274924 as an
-	# example).
-	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
-
-	# Set the cache var so the configure script doesn't go probing hardcoded
-	# file system paths and picking up the wrong thing.
-	export ac_cv_openssldir=''
-
-	# Avoid cross-compiling funkiness and requiring openssh at build time.
-	export PATH_SSH_AGENT="${EPREFIX}/usr/bin/ssh-agent"
-
-	econf \
-		"--with-pam-dir=$(getpam_mod_dir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-2.0" ; then #554150
-		ewarn "Upstream pam_ssh has changed where ssh keys live.  Only keys in your"
-		ewarn "~/.ssh/login-keys.d/ will be accepted for authentication."
-	fi
-}
diff --git a/sys-auth/pam_ssh/pam_ssh-2.2.ebuild b/sys-auth/pam_ssh/pam_ssh-2.2.ebuild
deleted file mode 100644
index 8c54ab76bfa8..000000000000
--- a/sys-auth/pam_ssh/pam_ssh-2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Uses ssh-agent to provide single sign-on"
-HOMEPAGE="http://pam-ssh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
-
-LICENSE="BSD-2 BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Only supports OpenSSH via `ssh-agent` #282993
-DEPEND="virtual/pam
-	dev-libs/openssl:0="
-RDEPEND="${DEPEND}
-	net-misc/openssh"
-
-PATCHES=(
-	# 503424#c5
-	"${FILESDIR}"/${PN}-2.1-dot-ssh-check.patch
-)
-
-src_configure() {
-	# hide all the otherwise-exported symbols that may clash with
-	# other software loading the PAM modules (see bug #274924 as an
-	# example).
-	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
-
-	# Set the cache var so the configure script doesn't go probing hardcoded
-	# file system paths and picking up the wrong thing.
-	export ac_cv_openssldir=''
-
-	# Avoid cross-compiling funkiness and requiring openssh at build time.
-	export PATH_SSH_AGENT="${EPREFIX}/usr/bin/ssh-agent"
-
-	econf \
-		"--with-pam-dir=$(getpam_mod_dir)"
-}
-
-src_install() {
-	default
-
-	# pam_ssh only builds plugins
-	find "${D}" -name '*.la' -delete || die
-
-	local DOC_CONTENTS="
-		You can enable pam_ssh for system authentication by enabling
-		the pam_ssh USE flag on sys-auth/pambase.
-	"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.* ]]; then #554150
-		ewarn "Upstream pam_ssh has changed where ssh keys live.  Only keys in your"
-		ewarn "~/.ssh/login-keys.d/ will be accepted for authentication."
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 70762b94d8f2..3626d1354c52 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -4,8 +4,8 @@ AUX pambase-20150213-selinux-note.patch 441 BLAKE2B 8457438ff72becbdf8da61143eac
 DIST pambase-20101024.tar.bz2 3201 BLAKE2B 714da8dd0b354cee29ad175a0ed2094fba8f3bfb5839319a515ed133991eb224ae280928177dcb0524f52193f44a68064a2413ae47d380472bc7b5da0b13f1bf SHA512 8d2a89b38d94d2e423a033ea6922c0a0039a0fb64d60c05991d877b4fa893954723fe1c1763f3f67ed6fbc3639282a4ee1d76824f7f29025b6050632a6984b6f
 DIST pambase-20150213.tar.xz 3480 BLAKE2B 7c59774bb8888fd2c4656264f1d8ea8cdd5ffffff4dc5d03091592726c8bd7775ba1573091c8616aa891298a1fe309b19885b5ec21efb45fe38900b7c959aaf5 SHA512 3b49dd3f06a0942fcced95527f62cbc4ff723c48dc896a0b57ecd19736d2892db974c782be3fe24e8e6e17294869a772ae9ee6118af96dfdc7a3a6561dc3f3e5
 DIST pambase-20190402.tar.gz 3679 BLAKE2B 992d7bf6b6f74ef22a8808b57dd6faffb6c351eaa8be4172f320031334ca6def698b2cb17005b58ac3c18e89a94012e279b0f27cc2bea5040ae8ddc3233cba2d SHA512 565d64653e9898b9bd231c1461ec0988a19dbc9500ff1417a7197ac75804abeb13ca543121ae4afb29017c1e99073a16137e5c876f43dcc01e2641218760f4ae
-EBUILD pambase-20101024-r2.ebuild 2725 BLAKE2B 77a4d16cd30dedfa2256fd687cbb4b54555aeb1abf36123d340e9354d6cf67e503b9feb26daf55eb508c87dacc8c7df996510bf65ad32e818e74bc1f0873eb0e SHA512 307ebed59ea5f7fbe48ff343833c4fc6ca54520434452823b21e76c25c5c173738fd8637869e9a9eb9025e1d2b4cd090b7421e0a35333217bae87e450c7eaa1d
-EBUILD pambase-20150213-r1.ebuild 2869 BLAKE2B 4edfad559a57065dba9b243c3e53505e1521be771042a4028516492d3eedd4b6508a03db4c489b96bb3ebf24438aaf04d943a67ffd9b3435169f3899cd06c4ba SHA512 888ca20c747ee47056873f407e13f9675012ac160b5c55dd5128ddf9be31af91996aeddaf5d863d2e38b3c4863bb9325ca247d16b3785396863d7e97d10c06ce
-EBUILD pambase-20150213-r2.ebuild 2812 BLAKE2B 618ac42693c6478f3c5dbc21e3e465560a5ec6c5eaaa46fb6b78ecd3fe090283613abc968260aaf18c03f2a662eef98756b36b2764d42c23044fbeaccd383fcb SHA512 094e8eeeaff28015b61ba1a0e89dbbb45dc13f7a8aade742bde0fedf192338fc02f617731f84d59490cebfbf795f0638711f5974a40e1f1d43d6ce7b8316c494
-EBUILD pambase-20190402.ebuild 2336 BLAKE2B 918c40f0d14acd89e687f1a5268e2f17bc23ff12b9b0c204f02f73fda391aa13a926a3b55e16bb8446bb7d4ed55a2cf420194ec4623dadbed55cdaa8dff09c1a SHA512 0fae262f90de17d10af572a23c4b3d0ed1c2a2bab2f6fda65bccdd41b1d05b98dc551190e77f8fcdde6cf03dcab3c097ae92ea670286ed36bba6ac51c8ea30f5
+EBUILD pambase-20101024-r2.ebuild 2718 BLAKE2B f267f1ddcc7da78a0d54aa7ce56560e94610dc77a96dd445c028bed9a9851c50d85287b464bef8d3c1b18347b6beca792eefc7118e1aa2809debb61643ced0f6 SHA512 dd821a9eae5c42a5b54eb42f01e353dd602b3e9261f8f0ed4b3f45ac25ba233bcb990948a82b97ad4eb402f602cf6490accff94bfcef5679e87adebaea0d8ed4
+EBUILD pambase-20150213-r1.ebuild 2859 BLAKE2B 56a3feac5286cd649de176695e563e434d94c49beb06927d4b59473c12bc77dfede023654fc6886094727c874d3a8c2232a6a89fee70a93697e1b3ffa9a01215 SHA512 12fa1bc93f8773c37b9a61343ac2b8a99d79ebbd9ee0c201cc42006ceb351c30f4977fa0b071766f95d7464391aab383f6394f2baf5a66804166507c455804aa
+EBUILD pambase-20150213-r2.ebuild 2805 BLAKE2B 3524dfe1e33928e33b5b225c2b3fb461bd81c125c7485822ad010ee04ac70bdfe719d87af68ffaffc2ccb4b1b46b69236a0c77c55d1b76025ea25e73cd8b7e3a SHA512 f3dca09045ad33e46a88ec68c772d821c3632ac1fb40991d316971f808e37259c40e7c1b51aee293151a452c49c79fc0bc2fb4f18edb189a9c72cc05a80a5562
+EBUILD pambase-20190402.ebuild 2350 BLAKE2B 6a3d47aa2d49466b700f9a7afedb35ddf28947655c9588cf005cbc269906c6fde075c0da6add6ca627b68699a39915076c0b22e4bef244fac1d2eb013f4993f8 SHA512 240e7be289739d06fbc0dc38e6e7ae137c2d531d0b47a79bcfef3bad9a0513f24b61c5841f24da01e4c92a855ad921ba8d81ab40b24710ddc40d62cba9fe7c84
 MISC metadata.xml 4088 BLAKE2B 5193b49786bcf70cff0fe509f45d624b29db779e54ef6c5171bfaf0ae929145667072f47d978c0c5ddc9902cce562532aa3767de1ec247260d7f044475995abf SHA512 1caaf079dbe24077112ffa16e943965c51214bed29d02aa2c7d7b40adddb3a053311cc26ca60a29317a7cc78faa7101834a2b080ea1d8658dcd6b3b5f16c3db4
diff --git a/sys-auth/pambase/pambase-20101024-r2.ebuild b/sys-auth/pambase/pambase-20101024-r2.ebuild
index 08c9ebacb43b..71c40477c574 100644
--- a/sys-auth/pambase/pambase-20101024-r2.ebuild
+++ b/sys-auth/pambase/pambase-20101024-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,7 +6,7 @@ EAPI=4
 inherit eutils
 
 DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PAM"
+HOMEPAGE="https://github.com/gentoo/pambase"
 SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild
index 3fb8706367b7..e69c2c799b5e 100644
--- a/sys-auth/pambase/pambase-20150213-r1.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PAM"
+HOMEPAGE="https://github.com/gentoo/pambase"
 SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/sys-auth/pambase/pambase-20150213-r2.ebuild b/sys-auth/pambase/pambase-20150213-r2.ebuild
index 778d7b89e03e..eb2684b2a297 100644
--- a/sys-auth/pambase/pambase-20150213-r2.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PAM"
+HOMEPAGE="https://github.com/gentoo/pambase"
 SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/sys-auth/pambase/pambase-20190402.ebuild b/sys-auth/pambase/pambase-20190402.ebuild
index a1d22f2c24f4..d0d359a189d7 100644
--- a/sys-auth/pambase/pambase-20190402.ebuild
+++ b/sys-auth/pambase/pambase-20190402.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://gentoo.org/"
+HOMEPAGE="https://github.com/gentoo/pambase"
 SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index b8d7c93818c7..4d3b6eb1aab2 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,6 +4,6 @@ AUX polkit-0.115-spidermonkey-60.patch 5562 BLAKE2B 8f262d682ea413f83bc555bacbeb
 DIST polkit-0.115.tar.gz 1550932 BLAKE2B 3185ebed46209f88a9ffccbbcaf1bf180d1ae6d5ec53cf3c66d867ad43910b47a1123a3db190991ebb382a0d28fc5a119ea4bab942db324e9af5663056cf6ee1 SHA512 1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc
 DIST polkit-0.116.tar.gz 1548311 BLAKE2B e9761a2934136d453a47b81dd1f132f9fc96c45b731d5fceb2aa7706f5325b6499f6acbb68032befc1b21878b1b54754685607c916ca8e02a8accca3ca014b31 SHA512 b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5
 EBUILD polkit-0.115-r3.ebuild 3530 BLAKE2B 759b63be73dfd0219995b96797566be68c1b3f7f1c43779a45310ba6128d7ab2756c9b98208fc57604c732ba2ff227edd500517904cd52d3be7f5b5f62a4fe60 SHA512 de90882e58db8e39407c295df9f91be237bcf0faf79525f69e662cca8f8a87ceb06e18522594dd9fc5de3c8cf5d38832b97ec4c0099909fb7156728bc5a02115
-EBUILD polkit-0.115-r4.ebuild 3624 BLAKE2B 91f5dacc2e17a35cdbcd40d76e044699af6bbcc3bf9b7ba9ff60255fa71bb5d53e0f32868bd2fdcb14bbfddc3636ad1807bcfe65d8e547716976c79e4d33ed58 SHA512 e58772be2b8639b2a3489f411164f626502ed937280ca01eafa46fda356c59d9e5a914735ad7644bd6907d57b5fab24a5234f13ba33fe18ff4eaf3a188a222d6
+EBUILD polkit-0.115-r4.ebuild 3623 BLAKE2B f9ab681a35fb9546c90e1f8da999ce06182191b7fe5187c15874c46897567d19a5f8daf695f5adbafade39af9452e742372f9ccd3ba1d22c8c9f683ca402d3d2 SHA512 87450e65d0526c32c9ef58fbd67e479695c87e6346d78c878449657e1f76649fcfc24633db3d328f2a664152fbc32b1d9c736e72756d46d0f5f97f8f8aa5a551
 EBUILD polkit-0.116.ebuild 3538 BLAKE2B bf15f17cbb364e5b1198076aea7d0b49ff9b0d0784cf651f79a919bca6d42f50e59a471ac7d0c00c699b7dddcea955301f2652878f2c8820fd6910afad9a2c97 SHA512 a6f96f4ef9abe67055777be109ddfb667f6191db4439978c6b7a3ad61d941dc50d618686c66383b7b59945cd464f570f2887543020767d3a3689690e3f6b4a44
 MISC metadata.xml 498 BLAKE2B 8bbfe2ee11b53b77dc26215776a87acd7cade59a5a139ada605f2ad293c569005d2bd517aaee1c6f4ea45251a0cc67f10082c96c2224d47fd84b5e1d87dcb724 SHA512 16ab1ff82daad858eb9adf7396b0e3d5845914eb7d7f1590cdea44fe1a2214043f011cd65cdde2e2195b959bae6581845bc6b4981fd400b3d8719f400f85b6dc
diff --git a/sys-auth/polkit/polkit-0.115-r4.ebuild b/sys-auth/polkit/polkit-0.115-r4.ebuild
index c2b9220030ec..8086d005e7ac 100644
--- a/sys-auth/polkit/polkit-0.115-r4.ebuild
+++ b/sys-auth/polkit/polkit-0.115-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-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="consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
 REQUIRED_USE="^^ ( consolekit elogind systemd )"