gentoo resync : 13.10.2019

5 files changed, 6 insertions, 102 deletions

diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 3626d1354c52..2c39c0699b49 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,11 +1,9 @@
 AUX pambase-20150213-elogind.patch 436 BLAKE2B f8d800b30b1f5f54f40747b256e460dbf10fd629c839088706299ae26bece8e248312dac1153ccb5b5fb25e71bee575d30db0912df0823be988f3cb68bb48e90 SHA512 e5865431fa616335f3732deefec96b11ba5e3f29523182ecbe24bafa80a0fd9b9dc5914b610d7ba485dcf5cd66775d9e668d8ba30f776ce33492b4da75301a1d
 AUX pambase-20150213-gnome-keyring.patch 1357 BLAKE2B 84923095bbff772f75689cd3a6cd6dfb111d51c1850ecae4caf91ee8b648c85091465bf13bd3acf9cce681b8ce02e937059e8e1792873d118ed996b24addb86e SHA512 eebbe9fe7a08de5aa60818747e06058bf9eb9acd9e66e579227da507304c639bc693ce1f3c74b62854b9541f9c1404081eb3d2f454113999a5d064eb646aa5d0
 AUX pambase-20150213-selinux-note.patch 441 BLAKE2B 8457438ff72becbdf8da61143eacd961ad9a58f876e1560fcf3832af9b3cd995b37a1b4881a9b5bd572e9aff5bb89465d9bba8211e22347af7df22d5d9d8ffb4 SHA512 560afa6b9d2ac657f16ef41abf3f9243480c0d6c57ff725be00a936a92a392c1a5f59f787b1b0ddfe05a81da10cb3c1fc8d24ed9560731bbcae1608a5f155fdb
-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 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
+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
 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
deleted file mode 100644
index 71c40477c574..000000000000
--- a/sys-auth/pambase/pambase-20101024-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://github.com/gentoo/pambase"
-SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="debug +cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal"
-RESTRICT="binchecks"
-
-RDEPEND="
-	|| (
-		>=sys-libs/pam-0.99.9.0-r1
-		( sys-auth/openpam sys-freebsd/freebsd-pam-modules )
-	)
-	cracklib? ( >=sys-libs/pam-0.99[cracklib] )
-	consolekit? ( >=sys-auth/consolekit-0.3[pam] )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20[pam] )
-	selinux? ( >=sys-libs/pam-0.99[selinux] )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_ssh? ( sys-auth/pam_ssh )
-	sha512? ( >=sys-libs/pam-1.0.1 )
-	pam_krb5? (
-		|| ( >=sys-libs/pam-1.1.0 sys-auth/openpam )
-		>=sys-auth/pam_krb5-4.3
-	)
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND="app-portage/portage-utils"
-
-src_compile() {
-	local implementation=
-	local linux_pam_version=
-	if has_version sys-libs/pam; then
-		implementation="linux-pam"
-		local ver_str=$(qatom `best_version sys-libs/pam` | cut -d ' ' -f 3)
-		linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ })
-	elif has_version sys-auth/openpam; then
-		implementation="openpam"
-	else
-		die "PAM implementation not identified"
-	fi
-
-	use_var() {
-		local varname=$(echo $1 | tr [a-z] [A-Z])
-		local usename=${2-$(echo $1 | tr [A-Z] [a-z])}
-		local varvalue=$(use $usename && echo yes || echo no)
-		echo "${varname}=${varvalue}"
-	}
-
-	emake \
-		GIT=true \
-		$(use_var debug) \
-		$(use_var cracklib) \
-		$(use_var passwdqc) \
-		$(use_var consolekit) \
-		$(use_var GNOME_KEYRING gnome-keyring) \
-		$(use_var selinux) \
-		$(use_var mktemp) \
-		$(use_var PAM_SSH pam_ssh) \
-		$(use_var sha512) \
-		$(use_var KRB5 pam_krb5) \
-		$(use_var minimal) \
-		IMPLEMENTATION=${implementation} \
-		LINUX_PAM_VERSION=${linux_pam_version}
-}
-
-src_test() { :; }
-
-src_install() {
-	emake GIT=true DESTDIR="${ED}" install
-}
-
-pkg_postinst() {
-	if use sha512; then
-		elog "Starting from version 20080801, pambase optionally enables"
-		elog "SHA512-hashed passwords. For this to work, you need sys-libs/pam-1.0.1"
-		elog "built against sys-libs/glibc-2.7 or later."
-		elog "If you don't have support for this, it will automatically fallback"
-		elog "to MD5-hashed passwords, just like before."
-		elog
-		elog "Please note that the change only affects the newly-changed passwords"
-		elog "and that SHA512-hashed passwords will not work on earlier versions"
-		elog "of glibc or Linux-PAM."
-	fi
-}
diff --git a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild
index e69c2c799b5e..0723482334ca 100644
--- a/sys-auth/pambase/pambase-20150213-r1.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
diff --git a/sys-auth/pambase/pambase-20150213-r2.ebuild b/sys-auth/pambase/pambase-20150213-r2.ebuild
index eb2684b2a297..401153cb1efa 100644
--- a/sys-auth/pambase/pambase-20150213-r2.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh ~sparc x86 -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh ~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-20190402.ebuild b/sys-auth/pambase/pambase-20190402.ebuild
index d0d359a189d7..5fde66a76bfd 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 -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"