On Fri, 2013-12-13 at 22:59 -0600, Dustin C. Hatch wrote:
> On 12/13/2013 21:07, Brian Dolbec wrote:
> > ---
> >   modules/generic_stage_target.py | 6 +++---
> >   1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
> > index 342c65b..1fbc733 100644
> > --- a/modules/generic_stage_target.py
> > +++ b/modules/generic_stage_target.py
> > @@ -1066,9 +1066,9 @@ class generic_stage_target(generic_target):
> >   						"/use will cause portage to ignore"
> >   					print "\tpackage.use in the profile and portage_confdir. You've been warned!"
> >
> > -			myf.write('PORTDIR="/usr/portage"\n')
> > -			myf.write('DISTDIR="${PORTDIR}/distfiles"\n')
> > -			myf.write('PKGDIR="${PORTDIR}/packages"\n')
> > +			myf.write('PORTDIR="%s"\n' % self.settings['portdir'])
> > +			myf.write('DISTDIR="%s"\n' % self.settings['distdir'])
> > +			myf.write('PKGDIR="%s"\n' % self.settings['packagedir'])
> >
> >   			""" Setup the portage overlay """
> >   			if "portage_overlay" in self.settings:
> >
> Do we need to still do this? Since the default location isn't hardcoded 
> anymore, but set in repos.conf, it can be confusing if PORTDIR is set in 
> make.conf, because it doesn't even get used.
> 

This patch is to fix recent commits to master that conflicted with
commits done in the rewrite branch 1 year ago.  All this coding was done
long before the recent repos.conf changes shoved on us.  There are lots
more changes to come.  If at that time, if things are settled, then it
will be time to update for the repos.conf mess imposed on us.