Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 434672 | Differences between
and this patch

Collapse All | Expand All

(-)Portage.pm (-1 / +1 lines)
Lines 136-142 Link Here
136 
}
 136 
}
137 

          137
          

        

        

          138
          
sub read_make_conf() {

          138
          
sub read_make_conf() {

        

          
            

              139
              
	my %env = read_sh "/etc/make.conf";


              139
              
	my %env = ( -e '/etc/portage/make.conf' ) ? read_sh "/etc/portage/make.conf" : read_sh "/etc/make.conf";

            

        

          140
          
	merge %make_conf_flags, %{$env{USE}} if exists $env{USE};

          140
          
	merge %make_conf_flags, %{$env{USE}} if exists $env{USE};

        

        

          141
          
	@portagedirs = $environment{PORTDIR};

          141
          
	@portagedirs = $environment{PORTDIR};

        

        

          142
          
	push @portagedirs, split ' ', $environment{PORTDIR_OVERLAY} if defined $environment{PORTDIR_OVERLAY};

          142
          
	push @portagedirs, split ' ', $environment{PORTDIR_OVERLAY} if defined $environment{PORTDIR_OVERLAY};

        






  

  Return to bug 434672