gentoo christmass resync : 25.12.2020

10 files changed, 132 insertions, 20 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 207694681f41..3d06a9b1f785 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 580b932fd6d3..82daa9ea9e38 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -5,7 +5,7 @@ DIST keystone.conf.sample-18.0.0 107458 BLAKE2B c1d826acdd671638fc4542864811bda8
 DIST keystone.conf.sample-2020.1.9999 105293 BLAKE2B f0e685f99ca3b6cdfb9ccd0b41709bd6c51cb4aa79d20fa12773f96cd6ecad730691cf7fb2384b0ab44787d6e2825c5f147310ca19d82a2adb6cd2ab623b52f2 SHA512 fc7e7272b1a0f8703fe8ec8f93208573b84a2121b55de919beb05c7bb7dd3542c71983dfdc73b7cb618eb68167e6c6a51aa8384839ae3503c677e17ff030f383
 DIST keystone.conf.sample-2020.2.9999 105293 BLAKE2B f0e685f99ca3b6cdfb9ccd0b41709bd6c51cb4aa79d20fa12773f96cd6ecad730691cf7fb2384b0ab44787d6e2825c5f147310ca19d82a2adb6cd2ab623b52f2 SHA512 fc7e7272b1a0f8703fe8ec8f93208573b84a2121b55de919beb05c7bb7dd3542c71983dfdc73b7cb618eb68167e6c6a51aa8384839ae3503c677e17ff030f383
 EBUILD keystone-17.0.0.ebuild 5508 BLAKE2B 8779e0f11ccdd028b6db17d837e7b6c5663cf018737c728ea6e0396234a06676446c3087d28c004ea5a25c5af1c157f903d7d3b65ffca0b05596a94014245876 SHA512 e70b26e703b47948099f156ad6031b29d2df99a3e17057897a8530002fff9a314c94e20702881f3b98961bd233f47a2de8f8f0ea0fe30b25c281d01e25ed96c0
-EBUILD keystone-18.0.0.ebuild 5517 BLAKE2B 55b1c4231cc1e012cb76ba4cd8bd6e198fd5261881cfc45ac8350bd39bca758d5db52d5aa83adb1a5774ecbcf072d27d18682622542f69c1f66e4c0743a35486 SHA512 c8461b7b509acc14a534b752cfedb656220f0e4690cdaf6d01791d3c94a5bbda0ad0758fad678013a371940c0ef146cb4ff54fd139f9ca64fa361430274c59b2
+EBUILD keystone-18.0.0.ebuild 5515 BLAKE2B acb04c4c53147a0f0d52720ec829ab2f08ae978d99b99faa150c162c1b9d64c962c171d420c6baa72c7415baf4b9e726e4f404c4a1330d2b364354a0f96b120b SHA512 32ba5d6dc50fd4b706e852f43ac6856f3280d2c03222b4b79fe056fc05be570e28393b131233e1a2251b73f731579d6c91a1f05090187af75e93966a629027eb
 EBUILD keystone-2020.1.9999.ebuild 5510 BLAKE2B e122338074aa33c3ec97d483df5d3c75bb72575cdb59543f33b090bf29b9e1dfefe24a1a2296b5b6455423234f49f4dc04f18e5fcb07310ab8a2ffdb2bb61abb SHA512 a9328e60a80c112041ee2798b7f2106f1c937003886d9d73326cfad19f4fca9b6cd834415ec7a42f156ef10f835a420c6488c8c6d67b5ef923eb6c7517063e9c
 EBUILD keystone-2020.2.9999.ebuild 5517 BLAKE2B 55b1c4231cc1e012cb76ba4cd8bd6e198fd5261881cfc45ac8350bd39bca758d5db52d5aa83adb1a5774ecbcf072d27d18682622542f69c1f66e4c0743a35486 SHA512 c8461b7b509acc14a534b752cfedb656220f0e4690cdaf6d01791d3c94a5bbda0ad0758fad678013a371940c0ef146cb4ff54fd139f9ca64fa361430274c59b2
 MISC metadata.xml 654 BLAKE2B f4ab0710d9df108ad25c402094d8586777b892ac135a5cb690f54a1656d77bb8fac1283f687b65a86bc3eff1ef77e11b3e5899f36f135f4b0d88f445135e21dd SHA512 01f0b211a0560c451cafb7653790b8f84930c542713637ba6305a536d65103bb54e80d66dfd12daecfbb189b33825393ea13b4cc19d9733a09478920165e3f6e
diff --git a/sys-auth/keystone/keystone-18.0.0.ebuild b/sys-auth/keystone/keystone-18.0.0.ebuild
index 875d600dda54..d09a91b28159 100644
--- a/sys-auth/keystone/keystone-18.0.0.ebuild
+++ b/sys-auth/keystone/keystone-18.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-auth/pam-pgsql/Manifest b/sys-auth/pam-pgsql/Manifest
index 9724d0b44f36..27584cfaea9d 100644
--- a/sys-auth/pam-pgsql/Manifest
+++ b/sys-auth/pam-pgsql/Manifest
@@ -1,3 +1,3 @@
 DIST pam-pgsql-0.7.3.2.tar.gz 712533 BLAKE2B 6841505963310f5192aff3dce4d7d0ed8dce18bac629bd9338390794bdb6a0a2dd96b96a55660b5fcb6a34ebeeb8ef4024ce1203321508e027284fc8e94df3c5 SHA512 d5766e56a13b0b4762fba10d624d12f130f2675f1f1772eaaf275b599f44adcf98287c2636462ba3faf46af139eb1bd157918c0c783040796562f37dec17a6d9
-EBUILD pam-pgsql-0.7.3.2.ebuild 1216 BLAKE2B c995d29299e8d00e100a9357c5864c726e85ee7b9fc3b7a328a9eddba4aad7ff57f414616cd13d318158175fea33b6ae4db3b04f3f727cbe9b4eb2c7f033de1b SHA512 bcf5c2080147d0956d9b64fbb195fd69d239bad79dd179627b5d52c6fbaab8874c5fc0e9f6d3deb8ee25887c4267574a9e9a0b2eef9f3c079646239867c53ba6
+EBUILD pam-pgsql-0.7.3.2.ebuild 1174 BLAKE2B 0f35f65f70a7d22d04733f762ce9108fbea253cd1325ef31ffe1720f2c23acb159fda7e2c54d65f18820c769afbb6f01fef325bd08394d41c2d086ab6789d076 SHA512 2608b01a8412bb83d0fa91c7d9747a26970d2e7462db12aaf33efe671ef91689d65a2aa7a148b720e32be8f71c930c757d053e4540b881e03aaf642efa625007
 MISC metadata.xml 246 BLAKE2B 850b5402f188737f73aa16633a584d3f88d79e37a372857a3ecd6b7afb081a1b6d11a4c8edc74163410833a45d49a45fdeb6a3662e964d04670d13ba5cd0fbbf SHA512 1ef684533eaaf13fb66f13b4e9f340b4d2984d50b82b021c91a08c14cb1542d09701fa3bfd07a81a32f6b6a5c347e025feb102d0a7092f3727ad72c2f75c245d
diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
index cf69a6bf4c9d..56bbf56885ef 100644
--- a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
+++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils pam
+inherit pam
 
 DESCRIPTION="pam module to authenticate users via PostgreSQL"
 HOMEPAGE="https://sourceforge.net/projects/pam-pgsql/"
@@ -17,18 +17,17 @@ fi
 RDEPEND="sys-libs/pam
 	>=dev-db/postgresql-8.0:=
 	>=dev-libs/libgcrypt-1.2.0:0="
+
 DEPEND="${RDEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_configure() {
 	econf \
 		--sysconfdir=/etc/security \
-		--libdir=/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF}
+		--libdir=/$(get_libdir)
 }
 
 src_compile() {
@@ -37,7 +36,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" pammoddir="$(getpam_mod_dir)" install
-	find "${ED}" -name '*.la' -delete
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sys-auth/pam_ldap/Manifest b/sys-auth/pam_ldap/Manifest
index 270be8fbaad0..063d5f032b3c 100644
--- a/sys-auth/pam_ldap/Manifest
+++ b/sys-auth/pam_ldap/Manifest
@@ -1,3 +1,3 @@
 DIST pam_ldap-186.tar.gz 163437 BLAKE2B 4e917985b78349283c891daca94935792f2316afc08cd694edb7256c89a7ed612a62ba4b53111fc2022f6e11f754103bf58ac0a53a4298b011a5379625c51cdc SHA512 aaa6fbc48150db53bf92dcf600bcb8f0526baa2e6124f46468f59958c8a91495eb003d16a45b659c8cbb2d3481c4732a0d1f5945a2c98c09549ef8a51ed18a3d
-EBUILD pam_ldap-186-r1.ebuild 1107 BLAKE2B 7b061ebe4818c13cbbdcd9c5ff459b0a422bb46e6150c9b85b0103cb72c95ee63c3337c4e5b0d2423f35026958c9df5b4a6e08b454f397c2fcdf69c7f2acfd3c SHA512 687f94e43ccab6c0daf45b09b139d98840044a36fc3809511a6a6b80c1066db795c27e0f6e7011ef04d2ed0c583e33eafcb188adb187316b8b8f87dc0bc7851e
+EBUILD pam_ldap-186-r1.ebuild 1078 BLAKE2B 79106aa5614b939c8e3d629ad39c94cbf3f7809f5ac7a7118e6c42efb1e5e19cd17fbb2011e0dc701ce64e5dcf0abfb564d298c637e79ab0108ff2379218e5aa SHA512 4df60d7c47aea1a7a0f3f74073f9bdf30093260c77d135a3c1d6c63632de2e08e4358472c85771f56a7ab0a0efb3177b3537326cf355309b9a5f2571461bbe48
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
index 0cd43d581f46..8c7afee1f10d 100644
--- a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib-minimal pam
+EAPI=7
+
+inherit multilib-minimal pam
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
@@ -13,10 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ssl sasl"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	sys-libs/pam[${MULTILIB_USEDEP}]
+DEPEND="sys-libs/pam[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )"
+
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 659e7e3827f0..fc1697848354 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,3 +1,4 @@
 DIST pambase-20201103.tar.gz 3295 BLAKE2B 7e104b5342842a21e10dce6e5c5a2d330ec06146b4791b888518463d915eebefbd694a809ff676b32c9c43945087935dc5c3496ae93ac17b7e4fd4e2e2974d1a SHA512 b94e47780f45c5e897b5fd073ce2184a901d241d51516ac5007658b1ae423d0f34c37a09a9e1d055962aa7158675ea7740dfe6466fad5e4a1b50b66a0812f51d
-EBUILD pambase-20201103.ebuild 2660 BLAKE2B 036c5ee1f9b4d50384dbff61dce8270440269f009811d306b24abe13159df6275f0029033637e808340ae0d25b47597ea3cbad68836270c9b0fa460fe1b568fe SHA512 3c1910c0f2c0a7a23bb154d69e04fd0774591df3d64a2acd5287556416b22ec699dc8726853e515d43cc92a93ddc8c08ec09af164735066a1b812802e73d5c56
+EBUILD pambase-20201103.ebuild 2772 BLAKE2B d953df87a7801ef83ee9f1efeb6a9fd9f9ca3c2713004b3fb6ad853903a36e21fd70f17dd9eefabc5483ff6141238514487ae491afa98908d2f4c121b9597d91 SHA512 c43f51170fdc005d2fda51e3ab1eeafcf9ce6a3bd84ddbb63aa608e9f5548b1bfb367c8084e9b08f6a621d77298682d3ba8192baad0b641183b4bdfb8db47436
+EBUILD pambase-999999999.ebuild 2772 BLAKE2B d953df87a7801ef83ee9f1efeb6a9fd9f9ca3c2713004b3fb6ad853903a36e21fd70f17dd9eefabc5483ff6141238514487ae491afa98908d2f4c121b9597d91 SHA512 c43f51170fdc005d2fda51e3ab1eeafcf9ce6a3bd84ddbb63aa608e9f5548b1bfb367c8084e9b08f6a621d77298682d3ba8192baad0b641183b4bdfb8db47436
 MISC metadata.xml 3810 BLAKE2B f4485cfec915c9e239c9328e6df338ba787ab26c3bb4f84773aa29361f4e2c48b56afb787c176fb38e8dc1c923e07c5baa6aeb5dba2774fe61f20250baf36b7d SHA512 ea58b1a801e68eeb8b7325192f5f26b406879bb70a46383222ffb9f69c71e5f9803532f2cca510ec0bc5cc3a96ceb165ed11725341a51b123fe8d4a712f4c26a
diff --git a/sys-auth/pambase/pambase-20201103.ebuild b/sys-auth/pambase/pambase-20201103.ebuild
index 30aca642bcf0..085421e24509 100644
--- a/sys-auth/pambase/pambase-20201103.ebuild
+++ b/sys-auth/pambase/pambase-20201103.ebuild
@@ -9,11 +9,18 @@ inherit pam python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="PAM base configuration files"
 HOMEPAGE="https://github.com/gentoo/pambase"
-SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+
+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 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${P}"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
@@ -52,8 +59,6 @@ python_check_deps() {
 	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
-S="${WORKDIR}/${PN}-${P}"
-
 src_configure() {
 	${EPYTHON} ./${PN}.py \
 		$(usex caps '--caps' '') \
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
new file mode 100644
index 000000000000..085421e24509
--- /dev/null
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 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 ~amd64-linux ~x86-linux"
+	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
+}