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 C1E3D1396D0 for ; Wed, 4 Oct 2017 20:47:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DC7DE0C7C; Wed, 4 Oct 2017 20:47:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 DAEF7E0CAE for ; Wed, 4 Oct 2017 20:47:31 +0000 (UTC) Received: from localhost.localdomain (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id E69043417BB; Wed, 4 Oct 2017 20:47:29 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-pms@lists.gentoo.org Cc: =?UTF-8?q?Ulrich=20M=C3=BCller?= Subject: [gentoo-pms] [PATCH 04/28] EAPI 7 supports a directory for package.mask. Date: Wed, 4 Oct 2017 22:46:48 +0200 Message-Id: <20171004204712.10391-5-mgorny@gentoo.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171004204712.10391-1-mgorny@gentoo.org> References: <20171004204712.10391-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Package Manager Specification discussions X-BeenThere: gentoo-pms@gentoo.org X-BeenThere: gentoo-pms@lists.gentoo.org Reply-To: gentoo-pms@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: eb6c6d68-8d14-4ef8-abc8-027c79287741 X-Archives-Hash: a588884e3002b52b9debf0de242b518c From: Ulrich Müller 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 -- 2.14.2