[gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     feafc9d3ef293bf618927ebac0230a2d2b9cbfb5
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 07:49:58 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 08:04:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feafc9d3

sys-apps/shadow: Disable cracklib default

Built-in cracklib support is just an alternative to
the stack installed by the sys-auth/pambase package.
If shadow is built with USE=pam,
then it will prefer pam configuration files over cracklib,
so cracklib is useless as an option.
The pam use flag is enabled in the linux profiles
by default, which covers most use cases.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-apps/shadow/{shadow-4.8-r4.ebuild => shadow-4.8-r5.ebuild}     | 4 +++-
 sys-apps/shadow/{shadow-4.8.1-r2.ebuild => shadow-4.8.1-r3.ebuild} | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-apps/shadow/shadow-4.8-r4.ebuild b/sys-apps/shadow/shadow-4.8-r5.ebuild
similarity index 98%
rename from sys-apps/shadow/shadow-4.8-r4.ebuild
rename to sys-apps/shadow/shadow-4.8-r5.ebuild
index 9fe70f6c898..ce8717353f1 100644
--- a/sys-apps/shadow/shadow-4.8-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r5.ebuild
@@ -12,10 +12,12 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
+REQUIRED_USE="?? ( cracklib pam )"
+
 BDEPEND="
 	app-arch/xz-utils
 	sys-devel/gettext

diff --git a/sys-apps/shadow/shadow-4.8.1-r2.ebuild b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
similarity index 98%
rename from sys-apps/shadow/shadow-4.8.1-r2.ebuild
rename to sys-apps/shadow/shadow-4.8.1-r3.ebuild
index 956699aaf99..3c90797dbf2 100644
--- a/sys-apps/shadow/shadow-4.8.1-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
@@ -12,10 +12,12 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
+REQUIRED_USE="?? ( cracklib pam )"
+
 BDEPEND="
 	app-arch/xz-utils
 	sys-devel/gettext