gentoo resync : 15.06.2021

3 files changed, 2 insertions, 109 deletions

diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index ce0fa31a59bd..593e0509426d 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,6 +1,4 @@
-DIST pambase-20201103.tar.gz 3295 BLAKE2B 7e104b5342842a21e10dce6e5c5a2d330ec06146b4791b888518463d915eebefbd694a809ff676b32c9c43945087935dc5c3496ae93ac17b7e4fd4e2e2974d1a SHA512 b94e47780f45c5e897b5fd073ce2184a901d241d51516ac5007658b1ae423d0f34c37a09a9e1d055962aa7158675ea7740dfe6466fad5e4a1b50b66a0812f51d
 DIST pambase-20210201.1.tar.gz 3345 BLAKE2B bc12164181de98b3c5b8ed3b72bc6a84b5c6039f389a87da94e5cb9312fa4e221e6317bcd496d5c634c60cd6fbb8c8cd2f4b845687ef942a707fe687f5184afd SHA512 74ab4d7c19a20c088d667ae92e4dcb99b33584ba56df46184173432fd297bd47917494b81cb5ad3f5f49ad5a797c008527399f329e56f2799f5fc376eaa59236
-EBUILD pambase-20201103.ebuild 2749 BLAKE2B 392d36d5d8dfae048ddd7557706527f9537b0bd308efde7ce57b92f0a5cc1638be3c063b49b1becbb622c3daf80667841c6b7aca6b9590dfbba503d62fa9030c SHA512 20988f5a8bd83a6ef209df9326672bf08884f2d1d5b0137456142c39c13b789d1f6e70ebb6edb344a258ec2240eec0be6883f2994bc73dbd3a5344f6fe6afd0a
-EBUILD pambase-20210201.1.ebuild 2874 BLAKE2B bc7d18db38111cfa61e6203bf123830a65aca5c403fed11fac96fb5b536127b861b918d9c41c452b2642deba846d3b0ee758f2134ea4771066c027178668f371 SHA512 162e3a41f0ea48b5331737eb77cac0fc1a8a82d00533ca55be353b83eb874038a7fdb23ba7c7247d9ab34633f97af8c412cfceb92c6cabfe2094e07df0469942
+EBUILD pambase-20210201.1.ebuild 2866 BLAKE2B 6f142f9197f8db5797b753dcc016d2ea56574e02702c490d40d6d8ff2488189b56852c4dd614e4ba8832b235d9a595c135cb6d54fc1c2e767c296f37a20ba0c3 SHA512 e27c2257c6b71a750e36b3de7b4725c11b5c3c819a0ec2f0461687157d08828e5265d12b65882aebc55217390f1cd33df5be7bafd442c5a69535e7d09a2c0e6d
 EBUILD pambase-999999999.ebuild 2866 BLAKE2B 6f142f9197f8db5797b753dcc016d2ea56574e02702c490d40d6d8ff2488189b56852c4dd614e4ba8832b235d9a595c135cb6d54fc1c2e767c296f37a20ba0c3 SHA512 e27c2257c6b71a750e36b3de7b4725c11b5c3c819a0ec2f0461687157d08828e5265d12b65882aebc55217390f1cd33df5be7bafd442c5a69535e7d09a2c0e6d
 MISC metadata.xml 3934 BLAKE2B ca15cea69fca97ebe00c624a8bf63293a348446b9cf6a2450338087b894f68e35cc5de037119a9534e4046e7ba6364e60397749d6ef4678f3220739603a77888 SHA512 9550417607667acdffdfb1ca9936bf697ae995a42d8be788d7215a8231bff8d92ed0caaa926450234f4720d6731efa6b9ace35900a3d6a0ce9040574399ccb77
diff --git a/sys-auth/pambase/pambase-20201103.ebuild b/sys-auth/pambase/pambase-20201103.ebuild
deleted file mode 100644
index 2f870076f0f1..000000000000
--- a/sys-auth/pambase/pambase-20201103.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit pam python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://github.com/gentoo/pambase"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
-else
-	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
-
-RESTRICT="binchecks"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( passwdqc pwquality )
-	pwhistory? ( || ( passwdqc pwquality ) )
-"
-
-MIN_PAM_REQ=1.4.0
-
-RDEPEND="
-	>=sys-libs/pam-${MIN_PAM_REQ}
-	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/pam_krb5
-	)
-	caps? ( sys-libs/libcap[pam] )
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
-	pwquality? ( dev-libs/libpwquality[pam] )
-	selinux? ( sys-libs/pam[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	systemd? ( sys-apps/systemd[pam] )
-"
-
-BDEPEND="$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	${EPYTHON} ./${PN}.py \
-		$(usex caps '--caps' '') \
-		$(usex debug '--debug' '') \
-		$(usex elogind '--elogind' '') \
-		$(usex gnome-keyring '--gnome-keyring' '') \
-		$(usex minimal '--minimal' '') \
-		$(usex mktemp '--mktemp' '') \
-		$(usex nullok '--nullok' '') \
-		$(usex pam_krb5 '--krb5' '') \
-		$(usex pam_ssh '--pam-ssh' '') \
-		$(usex passwdqc '--passwdqc' '') \
-		$(usex pwhistory '--pwhistory' '') \
-		$(usex pwquality '--pwquality' '') \
-		$(usex securetty '--securetty' '') \
-		$(usex selinux '--selinux' '') \
-		$(usex sha512 '--sha512' '') \
-		$(usex systemd '--systemd' '') \
-	|| die
-}
-
-src_test() { :; }
-
-src_install() {
-	local DOC_CONTENTS
-
-	if use passwdqc; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
-				page and then edit the /etc/security/passwdqc.conf file"
-	fi
-
-	if use pwquality; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
-				page and then edit the /etc/security/pwquality.conf file"
-	fi
-
-	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
-
-	dopamd -r stack/.
-}
-
-pkg_postinst() {
-	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
-}
diff --git a/sys-auth/pambase/pambase-20210201.1.ebuild b/sys-auth/pambase/pambase-20210201.1.ebuild
index c0f12d649b54..b4166689528b 100644
--- a/sys-auth/pambase/pambase-20210201.1.ebuild
+++ b/sys-auth/pambase/pambase-20210201.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
 else
 	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${PN}-${P}"
 fi