From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B3161396D1 for ; Wed, 4 Oct 2017 20:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EE70E0BE9; Wed, 4 Oct 2017 20:25:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2231E0BE7 for ; Wed, 4 Oct 2017 20:25:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20E5D341783 for ; Wed, 4 Oct 2017 20:25:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97EEF9098 for ; Wed, 4 Oct 2017 20:25:52 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1507148570.1882a752641de7b1c63aa58207dda10a92f90f31.mgorny@gentoo> Subject: [gentoo-commits] proj/pms:eapi-7 commit in: / X-VCS-Repository: proj/pms X-VCS-Files: eapi-differences.tex tree-layout.tex X-VCS-Directories: / X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1882a752641de7b1c63aa58207dda10a92f90f31 X-VCS-Branch: eapi-7 Date: Wed, 4 Oct 2017 20:25:52 +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: d18d547a-0a2e-401d-8d9b-7926189a8e26 X-Archives-Hash: 082fa8c29c983ce0a2d688bbde591570 commit: 1882a752641de7b1c63aa58207dda10a92f90f31 Author: Ulrich Müller gentoo org> AuthorDate: Sun Nov 29 23:00:32 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Oct 4 20:22:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=1882a752 EAPI 7 supports a directory for package.mask. Bug: https://bugs.gentoo.org/282296 eapi-differences.tex | 4 ++++ tree-layout.tex | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/eapi-differences.tex b/eapi-differences.tex index d6e270a..9d7ec60 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -41,6 +41,9 @@ of this document for a complete table of previous EAPIs. \bottomrule \endlastfoot +\t{package.mask} directory & \compactfeatureref{package-mask-dir} & + No & No & No & No & Yes \\ + Stable use masking/forcing & \compactfeatureref{stablemask} & No & No & Yes & Yes & Yes \\ @@ -373,6 +376,7 @@ EAPI 6 is EAPI 5 with the following changes: EAPI 7 is EAPI 6 with the following changes: \begin{compactitem} +\item \t{profiles/package.mask} can be a directory, \featureref{package-mask-dir}. \item \t{dohtml} banned, \featureref{banned-commands}. \end{compactitem} diff --git a/tree-layout.tex b/tree-layout.tex index 1c23357..d09feef 100644 --- a/tree-layout.tex +++ b/tree-layout.tex @@ -107,6 +107,12 @@ manager must ignore any files in this directory that it does not recognise. Contains a list, one entry per line, of package dependency specifications (using the directory's EAPI). Any package version matching one of these is considered to be masked, and will not be installed regardless of profile unless it is unmasked by the user configuration. + + \featurelabel{package-mask-dir} For EAPIs listed in table~\ref{tab:package-mask-dir} as + supporting it, \t{package.mask} can be a directory instead of a regular file. Files contained + in that directory, unless their name begins with a dot, will be concatenated in order of their + filename in the POSIX locale and the result will be processed as if it were a single file. + Any subdirectories will be ignored. \item[profiles.desc] Described below in section~\ref{sec:profiles.desc}. \item[repo_name] Contains, on a single line, the name of this repository. The repository name must conform to section~\ref{sec:repository-names}. @@ -123,6 +129,20 @@ manager must ignore any files in this directory that it does not recognise. \item[updates/] This directory is described in section~\ref{sec:updates-dir}. \end{description} +\ChangeWhenAddingAnEAPI{7} +\begin{centertable}{EAPIs supporting a directory for \t{package.mask}} + \label{tab:package-mask-dir} + \begin{tabular}{ll} + \toprule + \multicolumn{1}{c}{\textbf{EAPI}} & + \multicolumn{1}{c}{\textbf{\t{package.mask} can be a directory?}} \\ + \midrule + 0, 1, 2, 3, 4, 5, 6 & No \\ + 7 & Yes \\ + \bottomrule + \end{tabular} +\end{centertable} + \subsection{The profiles.desc file} \label{sec:profiles.desc} \t{profiles.desc} is a line-based file, with the standard commenting