From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-886255-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 48EE113829C for <garchives@archives.gentoo.org>; Thu, 9 Jun 2016 01:06:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6A5D254026; Thu, 9 Jun 2016 01:06:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4CA66254026 for <gentoo-commits@lists.gentoo.org>; Thu, 9 Jun 2016 01:06:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C22EA340D01 for <gentoo-commits@lists.gentoo.org>; Thu, 9 Jun 2016 01:06:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E3CF1F02 for <gentoo-commits@lists.gentoo.org>; Thu, 9 Jun 2016 01:06:48 +0000 (UTC) From: "Ulrich Müller" <ulm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org> Message-ID: <1465121462.22a0ce7c0fe649572956f60d13e1003ced401689.ulm@gentoo> Subject: [gentoo-commits] proj/pms:master commit in: / X-VCS-Repository: proj/pms X-VCS-Files: ebuild-env-vars.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 22a0ce7c0fe649572956f60d13e1003ced401689 X-VCS-Branch: master Date: Thu, 9 Jun 2016 01:06:48 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 54884916-5d61-49e4-b5aa-5818127b3216 X-Archives-Hash: 08e08529a9d0173c540124b771560fc7 commit: 22a0ce7c0fe649572956f60d13e1003ced401689 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 5 10:11:02 2016 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Jun 5 10:11:02 2016 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=22a0ce7c Restore proper scope for PORTDIR and ECLASSDIR. Commit fa4ac9474048ec75af138fc61f22485c06aac5b7 had inadvertently changed the scope of the PORTDIR and ECLASSDIR variables which were referring to FILESDIR by a "ditto" in the second column. Restore both variables to src_*. To this end, reorder variables such that DISTDIR follows FILESDIR, and move the remark about accessing the directory into the footnote. Note: Similar to FILESDIR, accessing DISTDIR in global scope is needed for assignment of the PATCHES variable in EAPI 6. Thanks to mgorny for pointing this out. ebuild-env-vars.tex | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex index 7a58f05..469f0cd 100644 --- a/ebuild-env-vars.tex +++ b/ebuild-env-vars.tex @@ -84,24 +84,23 @@ variable. of each element of the \t{SRC\_URI} ebuild metadata variable. Only for EAPIs listed in table~\ref{tab:removed-env-vars-table} as supporting \t{AA}. \\ \t{FILESDIR} & - \t{src\_*}, global~scope% - \footnote{Not necessarily present when installing from a binary package.} & + \t{src\_*}, global~scope\footnote{Not necessarily present when installing from a binary package. + Ebuilds must not access the directory in global scope.} & No & The full path to the package's files directory, used for small support files or patches. - See section~\ref{sec:package-dirs}. Ebuilds must not access the directory in global scope. - May or may not exist; if a repository provides no support files for the package in question - then an ebuild must be prepared for the situation where \t{FILESDIR} points to a non-existent - directory. \\ -\t{PORTDIR} & - Ditto & - No & - The full path to the master repository's base directory. \\ + See section~\ref{sec:package-dirs}. May or may not exist; if a repository provides no support + files for the package in question then an ebuild must be prepared for the situation where + \t{FILESDIR} points to a non-existent directory. \\ \t{DISTDIR} & Ditto & No & The full path to the directory in which the files in the \t{A} variable are stored. \\ +\t{PORTDIR} & + \t{src\_*} & + No & + The full path to the master repository's base directory. \\ \t{ECLASSDIR} & - Ditto & + \t{src\_*} & No & The full path to the master repository's eclass directory. \\ \t{ROOT} &