From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-516971-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 8DAD5138010
	for <garchives@archives.gentoo.org>; Tue, 23 Oct 2012 16:13:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6431B21C009;
	Tue, 23 Oct 2012 16:13:32 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id DF31221C009
	for <gentoo-commits@lists.gentoo.org>; Tue, 23 Oct 2012 16:13:31 +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 4B58133D7E7
	for <gentoo-commits@lists.gentoo.org>; Tue, 23 Oct 2012 16:13:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id D5541E5436
	for <gentoo-commits@lists.gentoo.org>; Tue, 23 Oct 2012 16:13:28 +0000 (UTC)
From: "Paul Varner" <fuzzyray@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" <fuzzyray@gentoo.org>
Message-ID: <1351008293.e08d2e99ae00bb1b39d680d3accc732417bdbaa1.fuzzyray@gentoo>
Subject: [gentoo-commits] proj/ufed:master commit in: /
X-VCS-Repository: proj/ufed
X-VCS-Files: Portage.pm
X-VCS-Directories: /
X-VCS-Committer: fuzzyray
X-VCS-Committer-Name: Paul Varner
X-VCS-Revision: e08d2e99ae00bb1b39d680d3accc732417bdbaa1
X-VCS-Branch: master
Date: Tue, 23 Oct 2012 16:13:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2b5abac7-065e-4281-bf7a-9af022b4d6b3
X-Archives-Hash: c14ba9443e6116bcf7b029a67b336ccd

commit:     e08d2e99ae00bb1b39d680d3accc732417bdbaa1
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 16:04:53 2012 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 16:04:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=e08d2e99

Merge both make.conf's in a nonintrusive way. (Bug 434672)

Patch supplied by Martin Väth

---
 Portage.pm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Portage.pm b/Portage.pm
index 524b5de..ff023b9 100644
--- a/Portage.pm
+++ b/Portage.pm
@@ -131,6 +131,7 @@ sub read_archs() {
 
 sub read_make_conf() {
 	my %env = read_sh "/etc/make.conf";
+	merge (%env, read_sh('/etc/portage/make.conf'));
 	merge %make_conf_flags, %{$env{USE}} if exists $env{USE};
 	@portagedirs = $environment{PORTDIR};
 	push @portagedirs, split ' ', $environment{PORTDIR_OVERLAY} if defined $environment{PORTDIR_OVERLAY};