From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.43) id 1EK8Xq-0007XD-FJ for garchives@archives.gentoo.org; Tue, 27 Sep 2005 06:02:27 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.5/8.13.5) with SMTP id j8R5sq4K028119; Tue, 27 Sep 2005 05:54:52 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [134.68.220.30]) by robin.gentoo.org (8.13.5/8.13.5) with ESMTP id j8R5sqAV014415 for ; Tue, 27 Sep 2005 05:54:52 GMT Received: from zh034158.ppp.dion.ne.jp ([222.3.34.158] helo=opteron246.suzuki-stubbs.home) by smtp.gentoo.org with esmtpa (Exim 4.43) id 1EK8XG-0003NQ-1n for gentoo-portage-dev@lists.gentoo.org; Tue, 27 Sep 2005 06:01:50 +0000 Received: by opteron246.suzuki-stubbs.home (Postfix, from userid 1000) id C9C67248D4A; Tue, 27 Sep 2005 15:02:00 +0900 (JST) From: Jason Stubbs To: gentoo-portage-dev@lists.gentoo.org Subject: [gentoo-portage-dev] [PATCH] Ignore system packages that are in package.provided Date: Tue, 27 Sep 2005 15:02:00 +0900 User-Agent: KMail/1.8.91 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_YBOODuOWLmQ9Abp" Message-Id: <200509271502.00662.jstubbs@gentoo.org> X-Archives-Salt: d2e8aa93-f5d6-4a51-99e4-3828626404cf X-Archives-Hash: 87fb7150088a437c57c034b77ad31c78 --Boundary-00=_YBOODuOWLmQ9Abp Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Removes any atoms that are satisfied by package.provided in emerge's getlist() function. --Boundary-00=_YBOODuOWLmQ9Abp Content-Type: text/x-diff; charset="us-ascii"; name="ignore-pprovided-system-packages.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ignore-pprovided-system-packages.patch" diff -uNr 2.0/bin/emerge 2.0-patched/bin/emerge --- 2.0/bin/emerge 2005-09-27 13:16:09.000000000 +0900 +++ 2.0-patched/bin/emerge 2005-09-27 15:00:23.000000000 +0900 @@ -861,6 +861,16 @@ continue myline=myline[1:] mynewlines.append(myline.strip()) + + # Remove everything that is package.provided from our list + for atom in mynewlines[:]: + for expanded_atom in portage.flatten(portage.dep_virtual([atom], portage.settings)): + mykey = portage.dep_getkey(expanded_atom) + if portage.settings.pprovideddict.has_key(mykey) and \ + portage.match_from_list(expanded_atom, portage.settings.pprovideddict[mykey]): + mynewlines.remove(atom) + break + return mynewlines def genericdict(mylist): --Boundary-00=_YBOODuOWLmQ9Abp-- -- gentoo-portage-dev@gentoo.org mailing list