Block app-admin/nologin since shadow provides it as well #144541.

Package-Manager: portage-2.1.2_rc1-r2

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 3c7a976abaa01c101b6fe455a07e387bcbed0ba6..b5f826e51add6684988b784ff85ffdf1421e299b 100644 (file)
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.160 2006/10/17 14:21:36 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.161 2006/11/05 09:15:27 vapier Exp $
+
+  05 Nov 2006; Mike Frysinger <vapier@gentoo.org> shadow-4.0.18.1.ebuild:
+  Block app-admin/nologin since shadow provides it as well #144541.
 
   17 Oct 2006; Daniel Drake <dsd@gentoo.org> shadow-4.0.15-r2.ebuild,
   shadow-4.0.16-r2.ebuild, shadow-4.0.17.ebuild, shadow-4.0.17-r1.ebuild,

diff --git a/sys-apps/shadow/shadow-4.0.18.1.ebuild b/sys-apps/shadow/shadow-4.0.18.1.ebuild
index b6a4b299fe9d4ea9c1a858c1e10c4d74b013330e..bfe08f74012b45c440d2b87ab410c8ed1f35ffae 100644 (file)
--- a/sys-apps/shadow/shadow-4.0.18.1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1.ebuild,v 1.2 2006/10/17 14:21:36 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1.ebuild,v 1.3 2006/11/05 09:15:27 vapier Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
 
@@ -16,6 +16,7 @@ IUSE="nls pam selinux skey nousuid cracklib"
 RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
        pam? ( virtual/pam )
        !sys-apps/pam-login
+       !app-admin/nologin
        skey? ( app-admin/skey )
        selinux? ( >=sys-libs/libselinux-1.28 )
        nls? ( virtual/libintl )"