[patch] Merge both make.conf's in a nonintrusive way

ufed-0.40.1-make.conf-read.patch (text/plain), 371 bytes, created by Martin Väth on 2012-10-15 17:41:21 UTC

--- Portage.pm
+++ Portage.pm
@@ -137,6 +137,7 @@
 }
 
 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};