gentoo Easter resync : 12.04.2020

4 files changed, 90 insertions, 5 deletions

diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 81ea60d3d990..7da915a578f1 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,5 +1,7 @@
 DIST pambase-20190402.tar.gz 3679 BLAKE2B 992d7bf6b6f74ef22a8808b57dd6faffb6c351eaa8be4172f320031334ca6def698b2cb17005b58ac3c18e89a94012e279b0f27cc2bea5040ae8ddc3233cba2d SHA512 565d64653e9898b9bd231c1461ec0988a19dbc9500ff1417a7197ac75804abeb13ca543121ae4afb29017c1e99073a16137e5c876f43dcc01e2641218760f4ae
 DIST pambase-20191128.tar.gz 3472 BLAKE2B 1028239c14eed3d06239f98667ffe136dc3c9cdb9c74d8f49e0c819d9ea308285cdd234538418357030dd39693040592b00f193cac4e37e15b9f277386096860 SHA512 09100457cacbe309eac8545818de3e4bff4f0c4a29b4c1758217dd80206c664f497570ef67207866aaf70be60ec963677b385adaf2c4a0cd931a50404098051b
-EBUILD pambase-20190402.ebuild 2239 BLAKE2B ffda85b5895c8422df154f687f53b384c16497b8b9a09ade59d6c8de5ae21e6d9ac87fdc7a4b01cd65d12d94275348349ef75be22fae21a24a189be2294c1e99 SHA512 b6a9ac568f4c53ef587adc7438d152567c824d641749ee8a6c11eb63df187c5d854ae53e2cfcff35cc74d54f31b3ff83ab2f156a63dc5347f204d616c9222b6f
-EBUILD pambase-20191128.ebuild 2122 BLAKE2B 5a6a88fecf476b2c3de5074f92fd1d1dc32fee3ac726a7a9671b95f77be30ad348d6a0ccf31f98363c0d52e08a40de7298645949af44a4537244d02a1940f712 SHA512 e55b5652391dc0bcc212d723d39e727652a67cc4f6a30f83f6b0aeb4e6d426887dd06f870f2480ec1e12297edd1115ab31758f28da683a46cda2c88193ce2feb
+DIST pambase-20200304.tar.gz 3466 BLAKE2B e4d406460d435403ed7a46d517f9006cacc54a94f5019a573c81b331731c88679ed6d388354b5946894bdfada556b4c73735c3f4de88fc7678cd831c68ab46c3 SHA512 c2a7f3fd143637fbdf5c0a3c58ba5a3c23c5e8adb1f057d02b4b9d64660435fc529031a0f710a9e5fc7091710f78dcb2f3e1ff48f033fb491ddd0399ef05b189
+EBUILD pambase-20190402.ebuild 2237 BLAKE2B 772215fad587eb50ca6bb6b7902c3647b0d3797f3e77824e8f189ead6f359fddb7dfeecd719f6aee954e7ff9b013c2137df4bd93ab25de9efdc016d407f3bd35 SHA512 05f8994d97d13e8a45b6ae83fa55c08bbb0494702b5d3acffccfe286bed9fbe9990e404e63a02c932a62dcbbfefc47fa45adf3cc8b0797f4ba30674d4393d5ad
+EBUILD pambase-20191128.ebuild 2118 BLAKE2B 77b4afedd23183bbfd31d36ddd58060e5397538da1d6b2714cb643bff4727d4d36306f899a850d7d8030394ae002b227923a008150fab96ed8a45c55ca2f8172 SHA512 3335878a7796db88f381f0da2a062cfa0c0b8e1364da1d395d5a3e753992b3b3378401e034496dfe89d746e464acfcad4305b480dfd899e878470c2163b6a476
+EBUILD pambase-20200304.ebuild 2118 BLAKE2B 77b4afedd23183bbfd31d36ddd58060e5397538da1d6b2714cb643bff4727d4d36306f899a850d7d8030394ae002b227923a008150fab96ed8a45c55ca2f8172 SHA512 3335878a7796db88f381f0da2a062cfa0c0b8e1364da1d395d5a3e753992b3b3378401e034496dfe89d746e464acfcad4305b480dfd899e878470c2163b6a476
 MISC metadata.xml 3828 BLAKE2B 0f003949e36f8bd50879cd694fe7fc59cba27d55cce1083b460a1ca2856a65b0bb13a273c9d7475c75daf6e147b963c1a120767a6a62000fa8f7653574ce60c1 SHA512 9fa684d007219633bc48eef1b53fa9169d84646b0eedf8d8588ac61a88a270235ac3f41a0ba662f7fa61eb39dc51ee2c78b8cefe4d091fde1fe752e5c3190e96
diff --git a/sys-auth/pambase/pambase-20190402.ebuild b/sys-auth/pambase/pambase-20190402.ebuild
index c68735d9d428..928283e093e1 100644
--- a/sys-auth/pambase/pambase-20190402.ebuild
+++ b/sys-auth/pambase/pambase-20190402.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
diff --git a/sys-auth/pambase/pambase-20191128.ebuild b/sys-auth/pambase/pambase-20191128.ebuild
index 89fd6353aecc..63a2fcc63a5c 100644
--- a/sys-auth/pambase/pambase-20191128.ebuild
+++ b/sys-auth/pambase/pambase-20191128.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="caps consolekit +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
diff --git a/sys-auth/pambase/pambase-20200304.ebuild b/sys-auth/pambase/pambase-20200304.ebuild
new file mode 100644
index 000000000000..63a2fcc63a5c
--- /dev/null
+++ b/sys-auth/pambase/pambase-20200304.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="https://github.com/gentoo/pambase"
+SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps consolekit +cracklib debug elogind minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
+
+RESTRICT="binchecks"
+
+REQUIRED_USE="?? ( consolekit elogind systemd )"
+
+MIN_PAM_REQ=1.1.3
+
+RDEPEND="
+	>=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/pam_krb5
+	)
+	caps? ( sys-libs/libcap[pam] )
+	pam_ssh? ( sys-auth/pam_ssh )
+	passwdqc? ( sys-auth/pam_passwdqc )
+	selinux? ( sys-libs/pam[selinux] )
+	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	systemd? ( sys-apps/systemd[pam] )
+"
+DEPEND="
+	app-arch/xz-utils
+	app-portage/portage-utils
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() {
+	local linux_pam_version
+	if has_version sys-libs/pam; then
+		local ver_str=$(qatom $(best_version sys-libs/pam) | cut -d ' ' -f 3)
+		linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ })
+	fi
+
+	use_var() {
+		local varname=$(echo "$1" | tr '[:lower:]' '[:upper:]')
+		local usename=${2-$(echo "$1" | tr '[:upper:]' '[:lower:]')}
+		local varvalue=$(usex ${usename})
+		echo "${varname}=${varvalue}"
+	}
+
+	emake \
+		GIT=true \
+		$(use_var debug) \
+		$(use_var LIBCAP caps) \
+		$(use_var cracklib) \
+		$(use_var passwdqc) \
+		$(use_var consolekit) \
+		$(use_var elogind) \
+		$(use_var systemd) \
+		$(use_var selinux) \
+		$(use_var nullok) \
+		$(use_var mktemp) \
+		$(use_var pam_ssh) \
+		$(use_var securetty) \
+		$(use_var sha512) \
+		$(use_var KRB5 pam_krb5) \
+		$(use_var minimal) \
+		LINUX_PAM_VERSION=${linux_pam_version}
+}
+
+src_test() { :; }
+
+src_install() {
+	emake GIT=true DESTDIR="${ED}" install
+}