From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B05341381F3 for ; Thu, 8 Aug 2013 05:38:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39805E0C71; Thu, 8 Aug 2013 05:38:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8EDA9E0C70 for ; Thu, 8 Aug 2013 05:38:39 +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 7CDB033EB59 for ; Thu, 8 Aug 2013 05:38:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A9E96E468F for ; Thu, 8 Aug 2013 05:38:36 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1375929060.c52962b6bd2e12dec9fdaea6592d39bedce0a752.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c52962b6bd2e12dec9fdaea6592d39bedce0a752 X-VCS-Branch: master Date: Thu, 8 Aug 2013 05:38:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f985aee9-139c-492c-b784-66fb6f8933a1 X-Archives-Hash: afab45cd23e2c79fcc5f545cdf2bc73e commit: c52962b6bd2e12dec9fdaea6592d39bedce0a752 Author: Zac Medico gentoo org> AuthorDate: Wed Jul 31 04:46:48 2013 +0000 Commit: Matt Turner gmail com> CommitDate: Thu Aug 8 02:31:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c52962b6 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 X-Gentoo-Bug: 479062 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=479062 Reviewed-by: Matt Turner gmail.com> --- 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')