Block sys-apps/shadow since shadow provides it as well #144541.

Package-Manager: portage-2.1.2_rc1-r2

diff --git a/app-admin/nologin/ChangeLog b/app-admin/nologin/ChangeLog
index fcc07be8f980954baf03aa1873007cd32ec282a7..e713dbf6ca7b95c039559084d631e9e2a52508b1 100644 (file)
--- a/app-admin/nologin/ChangeLog
+++ b/app-admin/nologin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/nologin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/nologin/ChangeLog,v 1.7 2006/09/07 19:36:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/nologin/ChangeLog,v 1.8 2006/11/05 09:22:24 vapier Exp $
+
+  05 Nov 2006; Mike Frysinger <vapier@gentoo.org> nologin-20050522.ebuild:
+  Block sys-apps/shadow since shadow provides it as well #144541.
 
   07 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> nologin-20050522.ebuild:
   Marked stable on amd64 for bug #146736

diff --git a/app-admin/nologin/Manifest b/app-admin/nologin/Manifest
index 7722a61958f2e02d6af7cd242f090d3b40e1d863..bbf0860702e458dd343e1ba19ca63faf2f2cae22 100644 (file)
--- a/app-admin/nologin/Manifest
+++ b/app-admin/nologin/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST nologin-20050522.tar.bz2 2096 RMD160 9a745c6b0b53d24eddc613a6383afa02fc00a279 SHA1 abce55f0a0ea9316582494e8df0359e11e2ab13a SHA256 dbf19f71e710bd70a2f5678b2da41a4190a4f3b4c5ce03ad8d93643b689b2985
-EBUILD nologin-20050522.ebuild 1055 RMD160 16c5c29beb5c78a783c623a8e024f486fdd92966 SHA1 b44727a1fcb67f0811e32c2b43f1fe8377a2c1de SHA256 bd5c191223ffe98b13eb7d4d3b773289793fa38bf62c85645c6da13ebcf07bb4
-MD5 ec0e90e135774fbac527b98af677c3d0 nologin-20050522.ebuild 1055
-RMD160 16c5c29beb5c78a783c623a8e024f486fdd92966 nologin-20050522.ebuild 1055
-SHA256 bd5c191223ffe98b13eb7d4d3b773289793fa38bf62c85645c6da13ebcf07bb4 nologin-20050522.ebuild 1055
-MISC ChangeLog 962 RMD160 d9913c136f184f6abffcc96523d27383240d2701 SHA1 97e6ea588d56927cf469191c4b8bbff066b8b8f9 SHA256 159b632649b3ec54e9b7995ed51a5561e2d049eff4881ff00ff96259111c4fa0
-MD5 cd66fad0f5863c97eb81ce09ab7bc66e ChangeLog 962
-RMD160 d9913c136f184f6abffcc96523d27383240d2701 ChangeLog 962
-SHA256 159b632649b3ec54e9b7995ed51a5561e2d049eff4881ff00ff96259111c4fa0 ChangeLog 962
+EBUILD nologin-20050522.ebuild 1085 RMD160 d4571a677070f8796f0f990ecf458714f02137cc SHA1 738162b6391e1fc8b8201a2e21f105b44ae24a2d SHA256 a118a2682e9cf6552ce4703dff92edae807c31984a4e9d748a4a39ce71fdc1ff
+MD5 f5823598c11b2c1f8bb2ed1924491a08 nologin-20050522.ebuild 1085
+RMD160 d4571a677070f8796f0f990ecf458714f02137cc nologin-20050522.ebuild 1085
+SHA256 a118a2682e9cf6552ce4703dff92edae807c31984a4e9d748a4a39ce71fdc1ff nologin-20050522.ebuild 1085
+MISC ChangeLog 1106 RMD160 2076058b2ee97c1a01fabf3875e8614881f941ca SHA1 d243ef3a7344e5d8f2ac454a5f1c9810ac58fcb6 SHA256 45490ea24e8b5d613bd72704a6f417362d75c4ca660a9d1466dec6bb110efedc
+MD5 35c0d2563cd6f4008a0e7eebbd13f68f ChangeLog 1106
+RMD160 2076058b2ee97c1a01fabf3875e8614881f941ca ChangeLog 1106
+SHA256 45490ea24e8b5d613bd72704a6f417362d75c4ca660a9d1466dec6bb110efedc ChangeLog 1106
 MISC metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d SHA1 2d72cad2ed2c3fce67f5ae575a00c3a3ee4e1604 SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d metadata.xml 254
@@ -18,9 +18,9 @@ MD5 8682ffd14012867611fb90d60016eb81 files/digest-nologin-20050522 247
 RMD160 ddd1674229a2e86a9b3aa3407dca122e3bdb856b files/digest-nologin-20050522 247
 SHA256 add09403d609f5b0551cc519365f547227edf4f3d10977905d67d4433e1c38da files/digest-nologin-20050522 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAHTGomPajV0RnrERAt7nAJ44f1ZukSohJTCxKQsNWy+qLwl50wCcDhmv
-R18X6I9SWkVoUqVR7zIOpVo=
-=GEt2
+iD8DBQFFTa1wamhnQswr0vIRAgbwAJ0fwrOPgXu1oI2eBc4Psp95PowySwCgttoL
+zbePDptTVKwa5uIVH84Be9M=
+=o+o/
 -----END PGP SIGNATURE-----

diff --git a/app-admin/nologin/nologin-20050522.ebuild b/app-admin/nologin/nologin-20050522.ebuild
index ebdf7788c6c6bb14ef502c7c888a18066eb7ae2e..7e04188c9b339731d95a50e6dd89a574f1d29b6e 100644 (file)
--- a/app-admin/nologin/nologin-20050522.ebuild
+++ b/app-admin/nologin/nologin-20050522.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/app-admin/nologin/nologin-20050522.ebuild,v 1.7 2006/09/07 19:36:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/nologin/nologin-20050522.ebuild,v 1.8 2006/11/05 09:22:24 vapier Exp $
 
 inherit toolchain-funcs
 
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ppc x86"
 IUSE=""
 
+RDEPEND="!sys-apps/shadow"
+
 src_compile() {
        echo "$(tc-getCC) ${CFLAGS} nologin.c -o nologin"
        $(tc-getCC) ${CFLAGS} nologin.c -o nologin || die "compilation failed"