From 550dcc588d8b4ab3045cabb3c1cfce44dad7a611 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 30 Jul 2013 21:22:55 -0700
Subject: [PATCH] generic_stage_target: default {PORT,PKG,DIST}DIR

This provides forward compatiblity so that stage builds do not break
in the future when portage changes the default PORTDIR, PKGDIR, and
DISTDIR locations (bug #378603).

Also, it provides backward compatibility for various tools that require
PORTDIR to be defined in make.conf, such as the following:

	gentoo-bashcomp - bug #478444
	euse - bug #474574
	euses and ufed - bug #478318
---
 modules/generic_stage_target.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 8f3c05a..848aca2 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1064,6 +1064,10 @@ 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')
+
 			""" Setup the portage overlay """
 			if "portage_overlay" in self.settings:
 				myf.write('PORTDIR_OVERLAY="/usr/local/portage"\n')
-- 
1.8.2.1