From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 31 Jan 2007 17:50:22 +0000 (+0000)
Subject: Don't require >coreutils-6 for selinux since it's masked by their profile.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10f962bfdeb5cbdcfc9e70c0290a5e40e62045aa;p=gentoo.git

Don't require >coreutils-6 for selinux since it's masked by their profile.
Package-Manager: portage-2.1.2-r5
---

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a633e8817fbc..b81a2ecb86f0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -29,10 +29,10 @@ EBUILD portage-2.1.1-r2.ebuild 7230 RMD160 5511aed85ca200fc1d8429578b69f5bdd5862
 MD5 0c9d6a4a1e21df4128b7dfb51d4eba97 portage-2.1.1-r2.ebuild 7230
 RMD160 5511aed85ca200fc1d8429578b69f5bdd5862602 portage-2.1.1-r2.ebuild 7230
 SHA256 1f5f3a9f58f62acc2adb3d61ef5e574bc114cbad6d6acd598b82b78071271ee6 portage-2.1.1-r2.ebuild 7230
-EBUILD portage-2.1.2-r5.ebuild 6905 RMD160 fb72e92fd51ed39d77bd7fff64203f4386d16989 SHA1 d88d9eb8d944418cd982cea0b82c0cdafa41f17b SHA256 ca6292cab8bddda3939d48ecc1faa6d7f403d71e65f0278fa7cc9c500b0a0c44
-MD5 593e9803b317655bde79cb1dfeafb565 portage-2.1.2-r5.ebuild 6905
-RMD160 fb72e92fd51ed39d77bd7fff64203f4386d16989 portage-2.1.2-r5.ebuild 6905
-SHA256 ca6292cab8bddda3939d48ecc1faa6d7f403d71e65f0278fa7cc9c500b0a0c44 portage-2.1.2-r5.ebuild 6905
+EBUILD portage-2.1.2-r5.ebuild 6919 RMD160 b7af50d604247cf677ec69115c41bbe075fd6162 SHA1 7154fe130aa0574bb8e0e24283d046bf0d72d4dc SHA256 a1267791fa73051fb9d1ee5ad051cac9c8a0af9bb1736adcac0794893e3b8be5
+MD5 db1e01ad3196b3f5820c4bbfcad7de59 portage-2.1.2-r5.ebuild 6919
+RMD160 b7af50d604247cf677ec69115c41bbe075fd6162 portage-2.1.2-r5.ebuild 6919
+SHA256 a1267791fa73051fb9d1ee5ad051cac9c8a0af9bb1736adcac0794893e3b8be5 portage-2.1.2-r5.ebuild 6919
 MISC ChangeLog 18850 RMD160 b81f0e6c1e75da626de55fc6387db9468b0ef7dd SHA1 141c285dc1e0f97f1da509727d1549ecd7e52208 SHA256 25ffc4fd40543a69b97d8464e50bcc40f821eae2b3a48583c0d0fbf94720eb06
 MD5 49248f5b851928cd3af22a922ccf039a ChangeLog 18850
 RMD160 b81f0e6c1e75da626de55fc6387db9468b0ef7dd ChangeLog 18850
@@ -53,7 +53,7 @@ SHA256 b1ab67ac8a5ca9d7e6ebad72300875f4ebfa1fca4adc71eda392b470be311138 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFwNUe/ejvha5XGaMRAjiJAKCaN9m2418UcVat+93Izu+efspVkQCgrcu6
-8FogVtUWeW0FWoQmyLwvc9k=
-=zxoY
+iD8DBQFFwNbj/ejvha5XGaMRAiY2AKCBVl5wLuCGWdR3iVy7VWIVwZ4D/wCg8sQC
+AzBuvGZO031kdBfPW+OeU38=
+=IOHa
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.2-r5.ebuild b/sys-apps/portage/portage-2.1.2-r5.ebuild
index 5ec4a8bd8f26..ae17322e13d7 100644
--- a/sys-apps/portage/portage-2.1.2-r5.ebuild
+++ b/sys-apps/portage/portage-2.1.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r5.ebuild,v 1.2 2007/01/31 17:42:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r5.ebuild,v 1.3 2007/01/31 17:50:22 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-lang/python-2.3
 	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
 	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
 	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-	userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) )
 	selinux? ( >=dev-python/python-selinux-2.16 )
 	doc? ( app-portage/portage-manpages )
 	>=dev-python/pycrypto-2.0.1-r5"