From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SnwJe-00076s-P6 for garchives@archives.gentoo.org; Sun, 08 Jul 2012 18:34:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC843E00E9; Sun, 8 Jul 2012 18:34:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6F3F7E00E9 for ; Sun, 8 Jul 2012 18:34:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEB521B400F for ; Sun, 8 Jul 2012 18:34:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 753A3E5433 for ; Sun, 8 Jul 2012 18:34:28 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1341772459.da2c54602be36fd73dedfdc7c0ca03da55d56aa9.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: da2c54602be36fd73dedfdc7c0ca03da55d56aa9 X-VCS-Branch: multilib Date: Sun, 8 Jul 2012 18:34:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 03ef69a9-580a-45e1-977f-52be80a559af X-Archives-Hash: 5a870d49b75ed2a51a5fce856f317281 commit: da2c54602be36fd73dedfdc7c0ca03da55d56aa9 Author: Zac Medico gentoo org> AuthorDate: Sun Jul 8 18:34:19 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jul 8 18:34:19 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dda2c5460 config: cleanup redundant force-multilib code --- pym/portage/package/ebuild/config.py | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index b349ca3..35e6a99 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -426,7 +426,6 @@ class config(object): known_repos =3D [] portdir =3D "" portdir_overlay =3D "" - features =3D [] for confs in [make_globals, make_conf, self.configdict["env"]]: v =3D confs.get("PORTDIR") if v is not None: @@ -436,9 +435,6 @@ class config(object): if v is not None: portdir_overlay =3D v known_repos.extend(shlex_split(v)) - v =3D confs.get("FEATURES") - if v is not None: - features.append(v.split()) known_repos =3D frozenset(known_repos) self["PORTDIR"] =3D portdir self["PORTDIR_OVERLAY"] =3D portdir_overlay @@ -478,11 +474,6 @@ class config(object): self.configlist.append(mygcfg) self.configdict["defaults"]=3Dself.configlist[-1] =20 - features =3D stack_lists(features) - if 'force-multilib' in features: - if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: - self.configdict["defaults"]["USE"] =3D self.configdict["defaults"].= get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFA= ULT_ABI", "") - mygcfg =3D getconfig( os.path.join(config_root, MAKE_CONF_FILE), tolerant=3Dtolerant, allow_sourcing=3DTrue, @@ -796,10 +787,20 @@ class config(object): self[var] =3D default_val self.backup_changes(var) =20 + features =3D [] + for x in ("globals", "defaults", "conf", "env"): + v =3D self.configdict[x].get("FEATURES") + if v is not None: + features.append(v.split()) + features =3D stack_lists(features) + if 'force-multilib' in features: #add multilib_abi internally to list of USE_EXPANDed vars self["USE_EXPAND"] =3D "MULTILIB_ABI" + " " + self.get("USE_EXPAND",= "") self.backup_changes("USE_EXPAND") + default_abi =3D self.configdict["defaults"].get('DEFAULT_ABI', '').s= trip() + if default_abi: + self.configdict["defaults"]["USE"] =3D self.configdict["defaults"].= get("USE", "") + " multilib_abi_" + default_abi =20 # initialize self.features self.regenerate() @@ -1354,9 +1355,6 @@ class config(object): if pkg_defaults: defaults.extend(pkg_defaults) defaults =3D " ".join(defaults) - if 'force-multilib' in self.features: - if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: - defaults =3D defaults + " multilib_abi_" + self.configdict["defaults= "].get("DEFAULT_ABI", "") if defaults !=3D self.configdict["defaults"].get("USE",""): self.configdict["defaults"]["USE"] =3D defaults has_changed =3D True @@ -2008,8 +2006,6 @@ class config(object): =20 # Do the USE calculation last because it depends on USE_EXPAND. use_expand =3D self.get("USE_EXPAND", "").split() - if 'force-multilib' in self.get("FEATURES", ""): - use_expand.append("MULTILIB_ABI") use_expand_dict =3D self._use_expand_dict use_expand_dict.clear() for k in use_expand: