gentoo resync : 10.11.2019

31 files changed, 50 insertions, 718 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index ca254fc347f8..2e65ab6a94af 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 2447929803bb..f4a6bebe3dbe 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -7,12 +7,8 @@ AUX nss-pam-ldapd-0.9.11-pynslcd-module-paths.patch 537 BLAKE2B 4016772474812442
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962
 AUX nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch 589 BLAKE2B de9801045f452da7d026afec44e15127b73f07a70f06d2f38ab2bc75562c4e825a789a9aae27d3c2e4e635143b50ed92e2841b3dcb55812aed5410eabb5eccfb SHA512 1bec5eb2376a85b0885b47e9ae560e9fcacb67b2d7a7170777f9e74c4cc8f9e1d57267cc122312f7df8cad05568f6dfcccd1cc6a62478c4d5c90459846e07706
 AUX pynslcd.initd 522 BLAKE2B 180d1ffa695a1cb6fccddfdc8719745e0d21ab082caeffbd0a071ce7afbbec6debddbabf9828c056b4aa88cb0f5cd6e84d4207cadf30e3cd8ac2e1946b9e7588 SHA512 2b737990a54b55c04de76fb295c466afbd029e44252372b0ca7a03407d059dfb200c63bfcbf55b1183d8c4f9f90a4f1130d8f5332f4fbde783d92c9ac0ce29b0
-DIST nss-pam-ldapd-0.8.14.tar.gz 508949 BLAKE2B ad8532bf86ef93c62394b91b7c3c035dc1090a70b60ab190ed8af012d533e61fe067b4383388af0d3a53142dbc96da3468d2aa09c2a30f92b9cf56434160c6d6 SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9
 DIST nss-pam-ldapd-0.9.10.tar.gz 749302 BLAKE2B 38cdc0e2a5b971d18412d7a583a265cdc87249342139dd4af9cddc61d17bc3d4d19b43c6705fdabc9dccc5ad4f7dad5ea473f75cde2915e485252fdf9116a1c6 SHA512 be559bc0d60bcf25af94919d456922bee4abb2c0417a8d2daf954d9aa9af2d41cb06a20cef04d9afd61c1316a744331753ee1cb25ef4a9c5411c508193231218
 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645
-DIST nss-pam-ldapd-0.9.9.tar.gz 772059 BLAKE2B 0c1da79d58f19f0c310c0589ca9f286a73ada025028d1a00df938d40dd1211f4dd5ba694de94a37a3596b64b5f8a511127c359a86a60271eb091082dec69e6bb SHA512 8148467523003da397d03b70bb01e52dbc63b0528540aea1d85f6af2ee8af69300e107617b69608397b210e825a2351cfd61b88c4fa146d2e8e9fb9c5cd358e3
-EBUILD nss-pam-ldapd-0.8.14-r2.ebuild 1997 BLAKE2B e1e6e36d295026128573be2baa16aac66358d9deab44caeceae127474904c38e5fe92e2780431e69694106ac33acde672b710a008366c3c5002e46e59921996b SHA512 1c313b508e04643f27612b30e46e1e3033ee3ffb338f33179e632df094657ed1702ed0b280bc9d5d44726377c2659c10bf7aa3aa68a6fdbed8a2c668ea37a0ff
 EBUILD nss-pam-ldapd-0.9.10.ebuild 4175 BLAKE2B a16a5d88b9b2ed39cee72b4d0b7df6e0d33bc3526de66142b48780398675bf25e91a27413196a1a836465b51b15a7743a7ed09d25e81b72275135f6eafc89d86 SHA512 06cb79950f8cd9fd9a13d4c9f671da5f0006262eebcde2ef759f2fbfa9106f2adcad55eaca55910eaf00af4368fa87ae80606d83f47b80f891f023b70fb2e047
-EBUILD nss-pam-ldapd-0.9.11.ebuild 4178 BLAKE2B efc2ca7d80fbe98bdb8203e345d8149e037c21346aedc1f0507705ede2c077813446a67e6f5b0884ff836633bea7a360f3175f7a9ef0c08f5099d4352e8a6285 SHA512 4cd611559742c060fcdd063da2419efeb4d79a78a082326f98ffd31464215303eb3575b22d1b86f813c121387a3fc68d7d056c6ba9ef85453da7f2b79ab715a3
-EBUILD nss-pam-ldapd-0.9.9.ebuild 4175 BLAKE2B a16a5d88b9b2ed39cee72b4d0b7df6e0d33bc3526de66142b48780398675bf25e91a27413196a1a836465b51b15a7743a7ed09d25e81b72275135f6eafc89d86 SHA512 06cb79950f8cd9fd9a13d4c9f671da5f0006262eebcde2ef759f2fbfa9106f2adcad55eaca55910eaf00af4368fa87ae80606d83f47b80f891f023b70fb2e047
+EBUILD nss-pam-ldapd-0.9.11.ebuild 4176 BLAKE2B 2409443fe8089d7ad5c7b298e770cf894eb67cd63097352ef80ee45e6a0645b651f8ba4f63f270856da54520e995c39e339191d2fa3e32341ca811be5f71df28 SHA512 c07654fc07b09f01b9aab565860712f8618263e9c89a1ec2f620f4205045c0544ebb4f3fff557dbdf91b6fe172e85a1d1923d6e8d6c8f7e7690451590436ca2a
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
deleted file mode 100644
index cc75900588e9..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-minimal user
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="https://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos sasl +pam"
-
-DEPEND="
-	net-nds/openldap
-	sasl? ( dev-libs/cyrus-sasl )
-	kerberos? ( virtual/krb5 )
-	sys-libs/pam
-	!sys-auth/nss_ldap
-	!sys-auth/pam_ldap"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-multilib_src_configure() {
-	# nss libraries always go in /lib on Gentoo
-	myconf="
-		--enable-warnings
-		--with-ldap-lib=openldap
-		--with-ldap-conf-file=/etc/nslcd.conf
-		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/run/nslcd/socket
-		--with-pam-seclib-dir=/$(get_libdir)/security
-		--libdir=/$(get_libdir)
-		$(use_enable debug)
-		$(use_enable kerberos)
-		$(use_enable pam)
-		$(use_enable sasl)"
-
-	if use x86-fbsd; then
-		myconf+=" --with-nss-flavour=freebsd"
-	else
-		myconf+=" --with-nss-flavour=glibc"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install() {
-	default
-
-	# for socket and pid file (not needed bug 452992)
-	#keepdir /run/nslcd
-
-	# init script
-	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-
-	# make an example copy
-	insinto /usr/share/nss-pam-ldapd
-	doins "${WORKDIR}/${P}/nslcd.conf"
-
-	fperms o-r /etc/nslcd.conf
-}
-
-pkg_postinst() {
-	echo
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	echo
-	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
-	elog "start it like this:"
-	elog "  # /etc/init.d/nslcd start"
-	echo
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild
index 022bcfde57b0..3baa31da0728 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug kerberos +pam pynslcd sasl test +utils"
 
 COMMON_DEP="
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild
deleted file mode 100644
index d228d7658e4e..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos +pam pynslcd sasl test +utils"
-
-COMMON_DEP="
-	net-nds/openldap[${MULTILIB_USEDEP}]
-	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	sys-libs/pam[${MULTILIB_USEDEP}]
-	utils? ( ${PYTHON_DEPS} )
-	pynslcd? (
-		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/python-daemon[${PYTHON_USEDEP}]
-	)
-	!sys-auth/nss_ldap
-	!sys-auth/pam_ldap"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-	sys-devel/automake"
-
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} pynslcd )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch
-	"${FILESDIR}"/${PN}-0.9.8-pynslcd-module-paths.patch
-)
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_prepare() {
-	cp pynslcd/pynslcd.py "${S}" || die "Copying pynslcd failed"
-
-	default
-	use utils && python_setup
-	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
-}
-
-multilib_src_configure() {
-	local -a myconf
-
-	myconf=(
-		--disable-utils
-		--enable-warnings
-		--with-ldap-lib=openldap
-		--with-ldap-conf-file=/etc/nslcd.conf
-		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/run/nslcd/socket
-		$(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc')
-		$(use_enable pynslcd)
-		$(use_enable debug)
-		$(use_enable kerberos)
-		$(use_enable pam)
-		$(use_enable sasl)
-	)
-
-	# nss libraries always go in /lib on Gentoo
-	if multilib_is_native_abi ; then
-		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
-		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
-	else
-		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
-		myconf+=("--libdir=/$(get_libdir)")
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	local script
-
-	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
-	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
-
-	insinto /usr/share/nss-pam-ldapd
-	doins "${WORKDIR}/${P}/nslcd.conf"
-
-	fperms o-r /etc/nslcd.conf
-
-	if use utils; then
-		python_moduleinto nslcd
-		python_foreach_impl python_domodule utils/*.py
-
-		for script in chsh getent; do
-			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
-		done
-	fi
-	if use pynslcd; then
-		rm -rf "${D}"/usr/share/pynslcd
-		python_moduleinto pynslcd
-		python_foreach_impl python_domodule pynslcd/*.py
-		python_scriptinto /usr/sbin
-		python_newscript pynslcd.py pynslcd
-		newinitd "${FILESDIR}"/pynslcd.initd pynslcd
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
-	systemd_dounit "${FILESDIR}"/nslcd.service
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use pynslcd; then
-		python_moduleinto pynslcd
-		python_foreach_impl python_domodule pynslcd/*.py
-	fi
-}
-
-python_test() {
-	PYTHONPATH="${S}" emake check
-}
-
-multilib_src_test() {
-	pushd "${BUILD_DIR}"
-	ln -s ../pynslcd/constants.py utils/constants.py
-	python_foreach_impl python_test
-	popd
-}
-
-pkg_postinst() {
-	echo
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	echo
-	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
-	elog "start it like this:"
-	elog "  # /etc/init.d/nslcd start"
-	echo
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
-	elog "to supervise this service."
-	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
-	elog "default runlevel instead of nslcd."
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/openpam/Manifest b/sys-auth/openpam/Manifest
deleted file mode 100644
index 505f1daf283c..000000000000
--- a/sys-auth/openpam/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX openpam-20130907-gentoo.patch 5832 BLAKE2B 994af413f1c2811ec09069f67ad2450a8bce721c1676905e83c15652c7e859022250404f2ae81b278df2fa08bc0610d3bc00cff3fb9dade94c37fd0edcf931cb SHA512 f4e8baefaa2113f6e864eebf6e9c596b229a06ea4038c4cf6f9ba96fd8347df7a7cbff691d54da0710b35440a766f0f2d411ccf19f66201508c227f6a4238cef
-AUX openpam-20130907-module-dir.patch 473 BLAKE2B 16537688c32fb31973195090505a897b4399edf3b43a39c92a62325df7ed1e0954cda4a3fcb12003590e0fb97f7060f143b3d68615ca23feea5eb882f7b41899 SHA512 03ba9ec79191bf248b65a50db75eaba52a5eb3a9c99fa2b64c02d5531910f90d1cbbbc274fd2bf3e6deabbcfc0239fad0d2cbadbec336794c0aba4078cee86a1
-AUX openpam-20130907-nbsd.patch 463 BLAKE2B ae2d50ba4569abbed0fdb127508b0571659a0fd545edafaef396abb74516e4176e42e2893770030424c584cd340d13338828997f0430bd9f7646c169166ff6d5 SHA512 8b9f8729830d47b47972ed3c7cbfca0c9bd5b87a245e0fb3e37594a247c89780f481ec3480285a829c1f86a90d591dc9778f6b2e2a57f718a5ec85d74a21af08
-DIST openpam-20140912.tar.gz 457600 BLAKE2B 8c963d9447c55a4f181e2524f9846d92038b3a5172e14ff0bad15ad7e595455896946f0dcf1d8f6dfcbc571ad01b8565447938a0fe9c001da39611d1d265f58a SHA512 c6cfbd669fe1b67af43a33c33bf2587e1512c27f1b96b9b38df37b81ecc4999d85e04b361b19a7265dbf271ebd3de3bd55342ee4fdbee9c68836b69714706423
-EBUILD openpam-20140912-r2.ebuild 891 BLAKE2B 5be144f6e657c0f3b03d1f0a2b125688292cd0c573fb39c2ec998d03eabe1d45a51eefc91481ec6007d762f403a76f995eedd7d4f2bf37819fa2ce902507cec0 SHA512 676b8f09ddb7ccf21b9de049f4dcd7610d6a6ab8e62adec3d9e956cd52463fe04b921f5de0081d11b4be625d146a8d92f6cbb86f949b27aead21045ef34ed2de
-MISC metadata.xml 244 BLAKE2B eec86d60be0072565415af225a1c98b1c7989261a1e4b30119e5f9bcb3b801b7c1c5d1f44ffb2e70dc3f4c698d8c9b5b6f10e95bf8516205a1e4339ab6073baa SHA512 cbc71b0e1a88a44176b7f4b51b1478a19583c758ac434486045aeb0b6138c83b6be405ab58377b096e900b1e8b062859015fb1d10de2a6912925e90c30bc77ae
diff --git a/sys-auth/openpam/files/openpam-20130907-gentoo.patch b/sys-auth/openpam/files/openpam-20130907-gentoo.patch
deleted file mode 100644
index 89a63f26460d..000000000000
--- a/sys-auth/openpam/files/openpam-20130907-gentoo.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Nur openpam-20130907.orig/include/security/Makefile.am openpam-20130907/include/security/Makefile.am
---- openpam-20130907.orig/include/security/Makefile.am	2013-09-07 22:28:00.000000000 +0900
-+++ openpam-20130907/include/security/Makefile.am	2013-11-26 23:24:54.000000000 +0900
-@@ -9,4 +9,5 @@
- 	pam_appl.h \
- 	pam_constants.h \
- 	pam_modules.h \
--	pam_types.h
-+	pam_types.h \
-+	pam_mod_misc.h
-diff -Nur openpam-20130907.orig/include/security/pam_mod_misc.h openpam-20130907/include/security/pam_mod_misc.h
---- openpam-20130907.orig/include/security/pam_mod_misc.h	1970-01-01 09:00:00.000000000 +0900
-+++ openpam-20130907/include/security/pam_mod_misc.h	2013-11-26 23:24:54.000000000 +0900
-@@ -0,0 +1,56 @@
-+/*-
-+ * Copyright 1998 Juniper Networks, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ *	$FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.12 2003/05/31 16:56:35 des Exp $
-+ */
-+
-+#ifndef PAM_MOD_MISC_H
-+#define PAM_MOD_MISC_H
-+
-+#include <sys/cdefs.h>
-+
-+/*
-+ * Common option names
-+ */
-+#define	PAM_OPT_NULLOK		"nullok"
-+#define PAM_OPT_AUTH_AS_SELF	"auth_as_self"
-+#define PAM_OPT_ECHO_PASS	"echo_pass"
-+#define PAM_OPT_DEBUG		"debug"
-+
-+__BEGIN_DECLS
-+void	_pam_verbose_error(pam_handle_t *, int, const char *,
-+		const char *, const char *, ...);
-+__END_DECLS
-+
-+#define	PAM_LOG(...) \
-+	openpam_log(PAM_LOG_DEBUG, __VA_ARGS__)
-+
-+#define PAM_RETURN(arg) \
-+	return (arg)
-+
-+#define PAM_VERBOSE_ERROR(...) \
-+	_pam_verbose_error(pamh, flags, __FILE__, __FUNCTION__, __VA_ARGS__)
-+
-+#endif
-diff -Nur openpam-20130907.orig/lib/libpam/Makefile.am openpam-20130907/lib/libpam/Makefile.am
---- openpam-20130907.orig/lib/libpam/Makefile.am	2013-09-07 22:28:00.000000000 +0900
-+++ openpam-20130907/lib/libpam/Makefile.am	2013-11-26 23:25:33.000000000 +0900
-@@ -75,6 +75,7 @@
- 	pam_verror.c \
- 	pam_vinfo.c \
- 	pam_vprompt.c \
-+	pam_debug_log.c \
- 	$(NULL)
- 
- libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@
-diff -Nur openpam-20130907.orig/lib/libpam/pam_debug_log.c openpam-20130907/lib/libpam/pam_debug_log.c
---- openpam-20130907.orig/lib/libpam/pam_debug_log.c	1970-01-01 09:00:00.000000000 +0900
-+++ openpam-20130907/lib/libpam/pam_debug_log.c	2013-11-26 23:24:54.000000000 +0900
-@@ -0,0 +1,64 @@
-+/*-
-+ * Copyright 2001 Mark R V Murray
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <sys/cdefs.h>
-+
-+#ifndef __GLIBC__
-+#include <libgen.h>
-+#endif
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <security/pam_appl.h>
-+#include <security/openpam.h>
-+#include <security/pam_mod_misc.h>
-+
-+/* Print a verbose error, including the function name and a
-+ * cleaned up filename.
-+ */
-+void
-+_pam_verbose_error(pam_handle_t *pamh, int flags,
-+    const char *file, const char *function, const char *format, ...)
-+{
-+	va_list ap;
-+	char *fmtbuf, *modname, *period;
-+
-+	if (!(flags & PAM_SILENT) && !openpam_get_option(pamh, "no_warn")) {
-+		modname = basename(file);
-+		period = strchr(modname, '.');
-+		if (period == NULL)
-+			period = strchr(modname, '\0');
-+		va_start(ap, format);
-+		asprintf(&fmtbuf, "%.*s: %s: %s\n", (int)(period - modname),
-+		    modname, function, format);
-+		pam_verror(pamh, fmtbuf, ap);
-+		free(fmtbuf);
-+		va_end(ap);
-+	}
-+}
diff --git a/sys-auth/openpam/files/openpam-20130907-module-dir.patch b/sys-auth/openpam/files/openpam-20130907-module-dir.patch
deleted file mode 100644
index 28c4414f9120..000000000000
--- a/sys-auth/openpam/files/openpam-20130907-module-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/openpam-20130907/lib/libpam/openpam_constants.c b/openpam-20130907/lib/libpam/openpam_constants.c
-index 1cdd810..f66e469 100644
---- a/lib/libpam/openpam_constants.c
-+++ b/lib/libpam/openpam_constants.c
-@@ -135,8 +135,8 @@ const char *openpam_policy_path[] = {
- };
- 
- const char *openpam_module_path[] = {
--#ifdef OPENPAM_MODULES_DIRECTORY
--	OPENPAM_MODULES_DIRECTORY,
-+#ifdef OPENPAM_MODULES_DIR
-+	OPENPAM_MODULES_DIR,
- #else
- 	"/usr/lib",
- 	"/usr/local/lib",
diff --git a/sys-auth/openpam/files/openpam-20130907-nbsd.patch b/sys-auth/openpam/files/openpam-20130907-nbsd.patch
deleted file mode 100644
index 9e76c9f30541..000000000000
--- a/sys-auth/openpam/files/openpam-20130907-nbsd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- openpam-20050201.orig/lib/libpam/pam_debug_log.c	2006-02-18 01:15:39.000000000 -0200
-+++ openpam-20050201/lib/libpam/pam_debug_log.c	2006-02-18 01:16:30.000000000 -0200
-@@ -47,7 +47,8 @@
-     const char *file, const char *function, const char *format, ...)
- {
- 	va_list ap;
--	char *fmtbuf, *modname, *period;
-+	char *fmtbuf;
-+	const char *modname, *period;
- 
- 	if (!(flags & PAM_SILENT) && !openpam_get_option(pamh, "no_warn")) {
- 		modname = basename(file);
diff --git a/sys-auth/openpam/metadata.xml b/sys-auth/openpam/metadata.xml
deleted file mode 100644
index ada59d84f434..000000000000
--- a/sys-auth/openpam/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">openpam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-auth/openpam/openpam-20140912-r2.ebuild b/sys-auth/openpam/openpam-20140912-r2.ebuild
deleted file mode 100644
index 7bc134cddffc..000000000000
--- a/sys-auth/openpam/openpam-20140912-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Open source PAM library"
-HOMEPAGE="https://www.openpam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="!sys-libs/pam"
-DEPEND="
-	sys-devel/make
-	dev-lang/perl"
-
-PDEPEND="
-	sys-auth/pambase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20130907-gentoo.patch"
-	"${FILESDIR}/${PN}-20130907-nbsd.patch"
-	"${FILESDIR}/${PN}-20130907-module-dir.patch"
-)
-
-src_prepare() {
-	sed -i -e 's:-Werror::' "${S}/configure.ac"
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--with-modules-dir=/$(get_libdir)/security
-	)
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS HISTORY RELNOTES README
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/pam-afs-session/Manifest b/sys-auth/pam-afs-session/Manifest
deleted file mode 100644
index 736892b75974..000000000000
--- a/sys-auth/pam-afs-session/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pam-afs-session-1.6.tar.gz 115666 BLAKE2B f57e24fdccc803e5074b814a74309e3278678a6c45ce5a99b8c317eaafbc7ab9d25bae58b76774d51b08ed51db4d0f2c7743ca4ce08497ddb2207253f8071264 SHA512 ac7bc1af43de5d08e6893b7411a0004e20a871f572a86c0322b883a45eb566717b8db77c3ad4825daeb89ab04039c6412cde6342056d544cb2189093ea95381f
-EBUILD pam-afs-session-1.6.ebuild 623 BLAKE2B d39aa87f316e1aaf7fa4b50a7468f11cc66ce2ccf000a7b3a1dbf38b9bf2f1485dc228683255dac682e10ec5489152e53b14262c8cddbdbc452bbc993341a46b SHA512 309c936916c03578bc8ad275da2eb5437ea334c51e012463e599230a92deed1615383958f778dc88687a35267ec0234b4dbd4513ac5346a6e71445c65d164762
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-auth/pam-afs-session/metadata.xml b/sys-auth/pam-afs-session/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-auth/pam-afs-session/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-auth/pam-afs-session/pam-afs-session-1.6.ebuild b/sys-auth/pam-afs-session/pam-afs-session-1.6.ebuild
deleted file mode 100644
index b9e5d8a2895c..000000000000
--- a/sys-auth/pam-afs-session/pam-afs-session-1.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam
-
-DESCRIPTION="OpenAFS PAM Module"
-HOMEPAGE="https://www.eyrie.org/~eagle/software/pam-afs-session/"
-SRC_URI="https://archives.eyrie.org/software/ARCHIVE/${PN}/${P}.tar.gz"
-
-LICENSE="HPND openafs-krb5-a"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/krb5
-	sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf --with-kerberos || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dopammod pam_afs_session.so
-	doman pam_afs_session.5
-	dodoc CHANGES NEWS README TODO
-}
diff --git a/sys-auth/pam_chroot/Manifest b/sys-auth/pam_chroot/Manifest
deleted file mode 100644
index 1f0b917e8c06..000000000000
--- a/sys-auth/pam_chroot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pam_chroot-0.9.2.tar.bz2 15657 BLAKE2B 50c8ea57f4f634cb387411ef9233b0b3912f292896f3fe7d2df5b5d5e18aeabef228bc1c26312832d5f95de6d2c037075c7ef327c93da6c0b71378bb9974239d SHA512 5aaabb7ed64944885bb2fd3b8a5f641b1ae3c4fbd0e1e5f130abf298f4089b780a53caf60af86e1082a00fb53ff6f9cae5d2838a740919f65152201bae2bee55
-EBUILD pam_chroot-0.9.2.ebuild 898 BLAKE2B 3b18b55382354919a7832712ebc7ccaf98c894cb61da33244bd409074bc0dfe7c3d3e84b2179f0bc6d2e8b552aa96e54c6168d25ab177bfecbb82be668c46fbc SHA512 77bb759d17d80a07f2711e377ba97525dc50853b3354468e914f538c5a4d3c15f5cb7739f6c92cdfc9ea39d93d6cebf5d447ede0444d4a707f94e9af032bf0dc
-MISC metadata.xml 252 BLAKE2B cf9826c30fa1cdda49c06e6aed6c7055aad069cfd26c6e15d3c95d8fe32c28d8836798c095c77ae50e754eb8d2de80efc735e1878d139a8e6dfac5d7a02dc143 SHA512 00bae51600d96d5edd4df2480dc8f7df0458cf40f5e75d3eca3bc510424ba36d04f9350967d0f886162a5d302c9a757079d760fac12d49a9b05634897c7a1c90
diff --git a/sys-auth/pam_chroot/metadata.xml b/sys-auth/pam_chroot/metadata.xml
deleted file mode 100644
index 6e4231058385..000000000000
--- a/sys-auth/pam_chroot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">pam-chroot</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild b/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild
deleted file mode 100644
index 988186234719..000000000000
--- a/sys-auth/pam_chroot/pam_chroot-0.9.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs pam flag-o-matic eutils
-
-DESCRIPTION="Linux-PAM module that allows a user to be chrooted in auth, account, or session"
-HOMEPAGE="https://sourceforge.net/projects/pam-chroot/"
-SRC_URI="mirror://sourceforge/pam-chroot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# using the Makefile would require patching it to work properly, so
-	# rather simply re-create it here.
-	doecho $(tc-getCC) ${LDFLAGS} -shared -fPIC ${CFLAGS} ${PN}.c -o ${PN}.so -lpam
-}
-
-src_install() {
-	dopammod pam_chroot.so
-	dopamsecurity  . chroot.conf
-
-	dodoc CREDITS README.history TROUBLESHOOTING options || die "dodoc failed"
-}
diff --git a/sys-auth/pam_passwdqc/Manifest b/sys-auth/pam_passwdqc/Manifest
index 378ade47fed9..53ee440ea303 100644
--- a/sys-auth/pam_passwdqc/Manifest
+++ b/sys-auth/pam_passwdqc/Manifest
@@ -1,5 +1,2 @@
-AUX pam_passwdqc-1.0.5-makefile.patch 1245 BLAKE2B b0bca31fa21a9d05093093d04a045288c33a8f75fb366a09b54f64e438dfb83599ba064a56c4aa3d0833699dc8874c3ace562476b9eb938add899da39b4364b8 SHA512 d4c5ca882f17b51ababc62a863653f70603763de99a0b8db9129d319100dbe4055b3ad7a9dbdcc6f3bca0be06521a7b5ef20856ef8e5b954097040a91b850d35
-DIST pam_passwdqc-1.0.5.tar.gz 29973 BLAKE2B e2edce3fa63994afc1f1fe65709ad241662c81113b67f6d17e1c5b36d6ea48be1d7f2cde77766fe2b92da2c22546a71122b95dc70b193edacfbdfd219f56ca6c SHA512 8ae6cb4cc520b06b05fadf60ac360964721a8a1e4481aff9cd7247c203e62b58d3aed4c14ba687b303de820689e0f5cdcf070fd396b7e13b0aae4cc5d1442235
-EBUILD pam_passwdqc-1.0.5.ebuild 1092 BLAKE2B f1b6d6918ae6ebac764f7f2d5ca5fc113aa1846168d3126a13ffbf98b6dedf246b4cf7eb2dfc3a12b89b3e404a73df7dc3c17228ded5f060ce5573bfeb284e3e SHA512 5defeade0c95812092b7ae3a0fd43b406d65144ac31817c248da7d548ce340065c950c52f3e4c6e7d4e6ca4046ebf16f2210c65f807d31e6a8cd8e35db6f0b84
-EBUILD pam_passwdqc-1.3.0.ebuild 432 BLAKE2B 50a89fe8b7c1046a88e545b6caee7734aab75ac7172ea3351dd75b301bb468056e9ad73f5848d404c54993df74872b89b5cbb89bc5a5ad6645504be1ce300da7 SHA512 562bac40aa344be7640b23edd8f3c9946c8a8aa3526d67d21f10d011bb95e948271bfb52896e05ada7fcb7a9dbb08d71d1ec01c926cb1f46b7da0f3374b04e1b
+EBUILD pam_passwdqc-1.3.0.ebuild 431 BLAKE2B cfb6103b6c3545d25c005b53e29381a6aa6265835080d52c75323b9b8fc1aa30b5f90c0e2023717a63cd0f860bda779de87d3e7c87c09abfe4743cf29cbdc664 SHA512 611586d7450d8c758af50b0e43950cb51b576ab4e84d6999f514967a3f484300e8fbeceebbb7395fb5e20e6cbf8d50eeed592c1942834c026cb386d5b8d6bff0
 MISC metadata.xml 533 BLAKE2B 4242a27a758a3c104ccf3ee1a3f15419d1870b299ded8f65ae5016ea5223eafbef03ecf7df0c2c5cfa8fc9269b43fa0a31d630e3e127daf0c9c970a84b6b4c5b SHA512 78bba55d003eb7fdfef30534078a683c16274db018ca16f89ecf4169a27dadfe56c84b140dbb30c2a4cd812a78c240518224d195197656669212e5aee7bb8356
diff --git a/sys-auth/pam_passwdqc/files/pam_passwdqc-1.0.5-makefile.patch b/sys-auth/pam_passwdqc/files/pam_passwdqc-1.0.5-makefile.patch
deleted file mode 100644
index 20375b76a381..000000000000
--- a/sys-auth/pam_passwdqc/files/pam_passwdqc-1.0.5-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: pam_passwdqc-1.0.5/Makefile
-===================================================================
---- pam_passwdqc-1.0.5.orig/Makefile
-+++ pam_passwdqc-1.0.5/Makefile
-@@ -7,8 +7,8 @@ LD = $(CC)
- RM = rm -f
- MKDIR = mkdir -p
- INSTALL = install -c
--CFLAGS = -Wall -fPIC -O2
--LDFLAGS = --shared
-+CFLAGS = -Wall -fPIC -O2 $(OPTCFLAGS)
-+LDFLAGS_GENERIC = --shared
- LDFLAGS_LINUX = --shared -Wl,--version-script,$(MAP)
- LDFLAGS_SUN = -G
- LDFLAGS_HP = -b
-@@ -41,16 +41,16 @@ MAP = pam_passwdqc.map
- all:
- 	case "`uname -s`" in \
- 	Linux)	$(MAKE) CFLAGS="$(CFLAGS) -DHAVE_SHADOW" \
--			LDFLAGS="$(LDFLAGS_LINUX)" LDLIBS="$(LDLIBS_LINUX)" \
-+			LDFLAGS="$(LDFLAGS) $(LDFLAGS_LINUX)" LDLIBS="$(LDLIBS_LINUX)" \
- 			$(PROJ);; \
- 	SunOS)	$(MAKE) CFLAGS="$(CFLAGS) -DHAVE_SHADOW" \
--			LD=ld LDFLAGS="$(LDFLAGS_SUN)" LDLIBS="$(LDLIBS_SUN)" \
-+			LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_SUN)" LDLIBS="$(LDLIBS_SUN)" \
- 			$(PROJ);; \
- 	HP-UX)	$(MAKE) CFLAGS="$(CFLAGS) -DHAVE_SHADOW" \
--			LD=ld LDFLAGS="$(LDFLAGS_HP)" LDLIBS="$(LDLIBS_HP)" \
-+			LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_HP)" LDLIBS="$(LDLIBS_HP)" \
- 			$(PROJ);; \
--	*)	$(MAKE) $(PROJ);; \
-+	*)	$(MAKE) LDFLAGS="$(LDFLAGS) $(LDFLAGS_GENERIC)" $(PROJ);; \
- 	esac
- 
- $(LIBSHARED): $(OBJS) $(MAP)
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.5.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.0.5.ebuild
deleted file mode 100644
index a960678e6f9b..000000000000
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam eutils toolchain-funcs
-
-DESCRIPTION="Password strength checking for PAM aware password changing programs"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-SRC_URI="http://www.openwall.com/pam/modules/pam_passwdqc/${P}.tar.gz"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	emake \
-		OPTCFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dopammod pam_passwdqc.so
-
-	doman pam_passwdqc.8
-	dodoc README PLATFORMS INTERNALS
-}
-
-pkg_postinst() {
-	elog
-	elog "To activate pam_passwdqc use pam_passwdqc.so instead"
-	elog "of pam_cracklib.so in /etc/pam.d/system-auth."
-	elog "Also, if you want to change the parameters, read up"
-	elog "on the pam_passwdqc(8) man page."
-	elog
-}
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
index c029340e791e..d3c13150285a 100644
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
+++ b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.openwall.com/passwdqc/"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sys-auth/passwdqc[pam]"
 RDEPEND="${DEPEND}"
diff --git a/sys-auth/pam_require/Manifest b/sys-auth/pam_require/Manifest
index 3b204d382761..07b72e995d92 100644
--- a/sys-auth/pam_require/Manifest
+++ b/sys-auth/pam_require/Manifest
@@ -1,3 +1,3 @@
 DIST pam_require-0.7.tgz 84299 BLAKE2B c258cbda6c7b803e1cfdac1bc5f20ebb932ed20983b7974c0e24c9509cc130e3e7868cfbd44fd8d35e0f045b3cb585b14cfb3618c179aa3038f8c59c85f9c094 SHA512 aba95c823bfcf35bca26881d79c904e9e77b86c2bf664ea63f16fa78304834a0e1e24a0392ce86cfd00309a35ad5d597f6d20a4d46139546b310daec86512198
-EBUILD pam_require-0.7.ebuild 639 BLAKE2B 7e3836fe61099ff42708120a5b98b2eed7eaf16dd9f10bf6f85bc41bc719139941912fed28c6ffc3649a25bf72bf323e9886b2a93648355a5954d6b854653e7e SHA512 f9612c7dc3d33dba40764fb4b2683373e482b5a5f441593215fc4551a7ed698ba10f4d0095b297d170c51ab5c69f803dd076f484a6233fbcee4eea60768a67fc
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD pam_require-0.7-r1.ebuild 531 BLAKE2B ccfef1d60b4b3159828ddefc6ba30f5c668f4de4334ce172795edfba7889cf7dcdfe819df82f04d662d90c8fc7c5399377ad9f056c266613cd35b296b2e4294b SHA512 0924973ff3a3edcd4eba6b7dd10c9979110ec6fbd28a351b29a31f85ec920c917619b7ac7acb5c7dcac8b5795f7b36d06e2bd88715949387dd828f843ce0a487
+MISC metadata.xml 390 BLAKE2B 8e05cf42a1a646dec4fe49c7cd25793e494f5b5dfa132b6010f47fdf02313b438c9e55b14277d2930b13fd2e393130f531e77ef324b8198a5d1346dee3bee3c4 SHA512 b318d32a26aa502bbc012dabe55195bdc3cd154c46e089b8cfaf759daa9aa723dae4284425cb3617b7db2a1c851e03d7a6bf9fb9b3132b46cc5e035afbb1844c
diff --git a/sys-auth/pam_require/metadata.xml b/sys-auth/pam_require/metadata.xml
index 6f49eba8f496..2f8aa12d17e9 100644
--- a/sys-auth/pam_require/metadata.xml
+++ b/sys-auth/pam_require/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>joakim.tjernlund@infinera.com</email>
+    <name>Joakim Tjernlund</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-auth/pam_require/pam_require-0.7-r1.ebuild b/sys-auth/pam_require/pam_require-0.7-r1.ebuild
new file mode 100644
index 000000000000..748b7bd53af2
--- /dev/null
+++ b/sys-auth/pam_require/pam_require-0.7-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam
+
+DESCRIPTION="Allows you to require a special group or user to access a service"
+HOMEPAGE="https://www.splitbrain.org/projects/pam_require"
+SRC_URI="https://www.splitbrain.org/_media/projects/pamrequire/${P}.tgz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_/-}
+
+src_install() {
+	dopammod pam_require.so
+
+	einstalldocs
+}
diff --git a/sys-auth/pam_require/pam_require-0.7.ebuild b/sys-auth/pam_require/pam_require-0.7.ebuild
deleted file mode 100644
index 4c7421954aa2..000000000000
--- a/sys-auth/pam_require/pam_require-0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils pam
-
-DESCRIPTION="Allows you to require a special group or user to access a service"
-HOMEPAGE="http://www.splitbrain.org/projects/pam_require"
-SRC_URI="http://www.splitbrain.org/_media/projects/pamrequire/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="sys-libs/pam"
-
-S=${WORKDIR}/${P/_/-}
-
-src_compile() {
-	./configure --prefix=/ || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dopammod "${S}/pam_require.so"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 2c39c0699b49..fbda169ecc27 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -3,7 +3,7 @@ AUX pambase-20150213-gnome-keyring.patch 1357 BLAKE2B 84923095bbff772f75689cd3a6
 AUX pambase-20150213-selinux-note.patch 441 BLAKE2B 8457438ff72becbdf8da61143eacd961ad9a58f876e1560fcf3832af9b3cd995b37a1b4881a9b5bd572e9aff5bb89465d9bba8211e22347af7df22d5d9d8ffb4 SHA512 560afa6b9d2ac657f16ef41abf3f9243480c0d6c57ff725be00a936a92a392c1a5f59f787b1b0ddfe05a81da10cb3c1fc8d24ed9560731bbcae1608a5f155fdb
 DIST pambase-20150213.tar.xz 3480 BLAKE2B 7c59774bb8888fd2c4656264f1d8ea8cdd5ffffff4dc5d03091592726c8bd7775ba1573091c8616aa891298a1fe309b19885b5ec21efb45fe38900b7c959aaf5 SHA512 3b49dd3f06a0942fcced95527f62cbc4ff723c48dc896a0b57ecd19736d2892db974c782be3fe24e8e6e17294869a772ae9ee6118af96dfdc7a3a6561dc3f3e5
 DIST pambase-20190402.tar.gz 3679 BLAKE2B 992d7bf6b6f74ef22a8808b57dd6faffb6c351eaa8be4172f320031334ca6def698b2cb17005b58ac3c18e89a94012e279b0f27cc2bea5040ae8ddc3233cba2d SHA512 565d64653e9898b9bd231c1461ec0988a19dbc9500ff1417a7197ac75804abeb13ca543121ae4afb29017c1e99073a16137e5c876f43dcc01e2641218760f4ae
-EBUILD pambase-20150213-r1.ebuild 2849 BLAKE2B 0e65e42fd3c60c834af90c4b782767b3985b5e5972bfb00c4fa0d67d74d8fb4ada74f1c48ed95fe75f5ab61d5621bbaed842f49f8cb411f82a579c9ae44e2201 SHA512 29641fe497b3e9cad0598d833c40c92f5b67f508b585d85837ea0a9dcf63383fba17fe2fb94e6778b87985541f9e51ebae07acc739437777906584712d0c75f4
-EBUILD pambase-20150213-r2.ebuild 2795 BLAKE2B 4aa1f507357e36f9495a92d09dc8ef41d2dcbe8e72428559f561b92339a89cffb0bda421d652648c375480a589c56b6f986e385e67a915cf66444ed7eefbba67 SHA512 52146a731d213abec14374e92d9a55b3a5669b925a5aaee43b379c87c1ef89e09a1e9a3140ee9ee2c5903f18a37ad3a14a0db608e7f18a7f7b04049adf134e44
-EBUILD pambase-20190402.ebuild 2340 BLAKE2B 1a139be53dce63cd80dc82e6574b710a73a7ec0bfba7ba90d4be26cd7821e08be2fc7e6a802f26c0775f77119377f22211e097877e1d0efc51fe80f84fd34ffc SHA512 4b6092e7b4119aa90f12c53bebf32ed647fb0ec94652d28dce6219355e274dbe6a745dad1e6a65e27f975ecff445c06a2bb32a0dfe2508cf62d382d98ffe102d
+EBUILD pambase-20150213-r1.ebuild 2760 BLAKE2B cb86902b8ce783b21054cfea800d45542532819f96080e2bfee8d8efe0ba9fb5c96bc578cf12eb073eb21a14657137f46e2ee3b8b1859212fa21b8ebcfc49945 SHA512 69cebfe363f02f785767a1ac259eca29f07a91c06a1ab172f2129874f059e609b824e3562cdf196b821f807e265fe5b9a62fe7f63873a6837029b130b6b29479
+EBUILD pambase-20150213-r2.ebuild 2707 BLAKE2B 2ced9b32e5c25ca459cfc3b26d16868980c9c4c7d1444fd9dc813c2dca5b4e7e02ed4c65e7f01e87ee447f2854c8fab31af607e83731a784e34437beee41e540 SHA512 d16128c15ac5f95109abade43f457ea050f9e05c8b292bd66863f7b2143cd5351184b227607279e526e7160684c52bdf9a24dddbae17c861ee05cc47620861a4
+EBUILD pambase-20190402.ebuild 2252 BLAKE2B 8fbfd3ca8c94ef26e41c76413d52455e452f3f99c2e3c2a03eea9f78e7df669ad15529fd06a9fc76eb6e9adf6d37a3defdb298667e5c6e3af57f9a00fc78a955 SHA512 e4bde1c5351441c543b168940ecc3a0b1bc99e5103a3d4c1490d0e6dd98468c4c4009c5be6dede124c3f5281ff4a5dda6aded5cb2a78f1d3d79f6d4f69f151d9
 MISC metadata.xml 4088 BLAKE2B 5193b49786bcf70cff0fe509f45d624b29db779e54ef6c5171bfaf0ae929145667072f47d978c0c5ddc9902cce562532aa3767de1ec247260d7f044475995abf SHA512 1caaf079dbe24077112ffa16e943965c51214bed29d02aa2c7d7b40adddb3a053311cc26ca60a29317a7cc78faa7101834a2b080ea1d8658dcd6b3b5f16c3db4
diff --git a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild
index 0723482334ca..db06772ced1c 100644
--- a/sys-auth/pambase/pambase-20150213-r1.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r1.ebuild
@@ -17,17 +17,14 @@ RESTRICT="binchecks"
 MIN_PAM_REQ=1.1.3
 
 RDEPEND="
-	|| (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		( sys-auth/openpam sys-freebsd/freebsd-pam-modules )
-	)
+	>=sys-libs/pam-${MIN_PAM_REQ}
 	consolekit? ( sys-auth/consolekit[pam] )
 	cracklib? ( sys-libs/pam[cracklib] )
 	elogind? ( sys-auth/elogind[pam] )
 	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
 	mktemp? ( sys-auth/pam_mktemp )
 	pam_krb5? (
-		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
+		>=sys-libs/pam-${MIN_PAM_REQ}
 		sys-auth/pam_krb5
 	)
 	pam_ssh? ( sys-auth/pam_ssh )
diff --git a/sys-auth/pambase/pambase-20150213-r2.ebuild b/sys-auth/pambase/pambase-20150213-r2.ebuild
index 401153cb1efa..a54afa8ebc8b 100644
--- a/sys-auth/pambase/pambase-20150213-r2.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r2.ebuild
@@ -17,16 +17,13 @@ RESTRICT="binchecks"
 MIN_PAM_REQ=1.1.3
 
 RDEPEND="
-	|| (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		( sys-auth/openpam sys-freebsd/freebsd-pam-modules )
-	)
+	>=sys-libs/pam-${MIN_PAM_REQ}
 	consolekit? ( sys-auth/consolekit[pam] )
 	cracklib? ( sys-libs/pam[cracklib] )
 	elogind? ( sys-auth/elogind[pam] )
 	mktemp? ( sys-auth/pam_mktemp )
 	pam_krb5? (
-		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
+		>=sys-libs/pam-${MIN_PAM_REQ} 
 		sys-auth/pam_krb5
 	)
 	pam_ssh? ( sys-auth/pam_ssh )
diff --git a/sys-auth/pambase/pambase-20190402.ebuild b/sys-auth/pambase/pambase-20190402.ebuild
index 5fde66a76bfd..440da938090a 100644
--- a/sys-auth/pambase/pambase-20190402.ebuild
+++ b/sys-auth/pambase/pambase-20190402.ebuild
@@ -19,16 +19,13 @@ REQUIRED_USE="?? ( consolekit elogind systemd )"
 MIN_PAM_REQ=1.1.3
 
 RDEPEND="
-	|| (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		( sys-auth/openpam sys-freebsd/freebsd-pam-modules )
-	)
+	>=sys-libs/pam-${MIN_PAM_REQ}
 	consolekit? ( sys-auth/consolekit[pam] )
 	cracklib? ( sys-libs/pam[cracklib] )
 	elogind? ( sys-auth/elogind[pam] )
 	mktemp? ( sys-auth/pam_mktemp )
 	pam_krb5? (
-		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
+		>=sys-libs/pam-${MIN_PAM_REQ} 
 		sys-auth/pam_krb5
 	)
 	pam_ssh? ( sys-auth/pam_ssh )
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index 5f8e696482d6..8158f72b48cc 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,4 +1,4 @@
 AUX passwdqc-1.3.0-build.patch 1773 BLAKE2B e954aa56f4f12c57430b9c53cac9220360b6450a747fd50305db8838638833e5f76fc893be762593f89ab02b665499fbc4063dfd7ad3019134ef81771e3dcc50 SHA512 da43381deab4c39e8c905187f17e49379e44b96c729d229a1fa5aff067b510fae5cbb107896fd83273cc8f41e916023eff5d1b1f37ad739e4de3cf3945f289b8
 DIST passwdqc-1.3.0.tar.gz 48833 BLAKE2B bf6353749376ca8b52a8aac89b05561d4a0dde54133361b77228dd4d35f2e1e75f0b53a0f9c4fc2f6be5717110c1d762e2aa76f6461281b60fa3bdc9b19f2f7d SHA512 d9c2fd075ed4ff1f1dfa63fe40010d446abf8db306cacc77fd1e429fbd2dd1a6d2e4e91df46beb4c30bc30ff0cdd183ba85cefd362455ead9629d3a1c4eefece
-EBUILD passwdqc-1.3.0.ebuild 1712 BLAKE2B 1718f329b2210024cfa97f7af82008b4260b49ba16f59df043581341f169fadd33b47630afa4b1982595d15442a47a4569a37139609d7a076d1d1d3f1b192ec2 SHA512 17e4bf65f7e61bffd873f2e61837698c1c4d01b0e3b42968b2e223e6a63cf862963d988e58cd468c45dbbc0ba66a84a573e8a25f060114a1f8ea58bed52b6e34
+EBUILD passwdqc-1.3.0.ebuild 1711 BLAKE2B 47710f7703c09ed4c23f556a776902a0eacae247759e934e368fa2edac542b65273a3c14cae2e3315d8ed66e0f5a9ce43b14067d1466108a89ec61556a617647 SHA512 eb245a4019b461e2e6728acad07454d5baef93962e3d709ee7a77dc1cd1d2d7911957faae371bce9cdad7e314486e4f51e75e6ef9a344aaeb5f74f820560a26e
 MISC metadata.xml 611 BLAKE2B 1ff77c9fbf801d78d8ec7fde035f0b9d2b738ae9b773f30716cdbf603024709406c83e5360d7217ed925ab3571e6eb488c092f6ac9582141f139ac9984f1a600 SHA512 6f21bb9ce2f16550d09e37bccb2979a4f7211ffbcca394903bbcd10391a49564bcf7b10907589a166fdb09c4c6c4e7040f00df951560a213f7f85fb945343d1d
diff --git a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
index 7a54c9af380a..1d8d5fbd22f2 100644
--- a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam utils"
 
 RDEPEND="