From ec9f89244b97888da295b63aeb852cc2760729f7 Mon Sep 17 00:00:00 2001 From: "Andreas K. Huettel (dilfridge)" Date: Sun, 1 Jul 2012 21:19:49 +0200 Subject: [PATCH 2/2] Pin stable masking to EAPI 5 --- eapi-differences.tex | 5 +++++ profiles.tex | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index 2b2ae80..344c499 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -187,6 +187,9 @@ Controllable compression & \compactfeatureref{controllable-compress} & File mtimes preserved & \compactfeatureref{mtime-preserve} & Undefined & Undefined & Undefined & Yes & Yes & Yes \\ +Stable use masking/forcing & \compactfeatureref{stablemask} & + No & No & No & No & No & Yes \\ + \end{longtable} \end{landscape} @@ -280,6 +283,8 @@ EAPI 5 is EAPI 4 with the following changes: \item \t{EBUILD\_PHASE\_FUNC}, \featureref{ebuild-phase-func}. \item \t{find} is guaranteed to be GNU, \featureref{gnu-find}. \item \t{new*} can read from standard input, \featureref{newfoo-stdin}. +\item \t{package.use.stable.mask} and \t{package.use.stable.force} can be used to restrict + use flag combinations, \featureref{stablemask} \end{compactitem} \ChangeWhenAddingAnEAPI{5} diff --git a/profiles.tex b/profiles.tex index dbad6102..4073d66 100644 --- a/profiles.tex +++ b/profiles.tex @@ -118,10 +118,30 @@ always, respectively, be enabled when using this profile. \t{package.use.mask} and \t{package.use.force} do the same thing on a per-package, or per-version, basis. +\label{feat:stablemask} The same is true for \t{package.use.stable.mask} and \t{package.use.stable.force}, which however, only act on packages that are merged due to a stable keyword in the sense of subsection \ref{sec:keyword-names}. Thus, these files can be used to restrict the feature set deemed -stable in a package. +stable in a package. Atoms in \t{package.use.stable.mask} and \t{package.use.stable.force} +must only resolve to ebuilds with an EAPI supporting stable masking or forcing, see table +\ref{tab:profile-stablemask}. + +\ChangeWhenAddingAnEAPI{5} +\begin{centertable}{Support for masking/forcing use flags in stable versions} \label{tab:profile-stablemask} + \begin{tabular}{ l l l } + \toprule + \multicolumn{1}{c}{\textbf{EAPI}} & + \multicolumn{1}{c}{\textbf{Supports masking/forcing use flags in stable versions?}} \\ + \midrule + \t{0} & No \\ + \t{1} & No \\ + \t{2} & No \\ + \t{3} & No \\ + \t{4} & No \\ + \t{5} & Yes \\ + \bottomrule + \end{tabular} +\end{centertable} The precise manner in which the six files interact is less simple, and is best described in terms of the algorithm used to -- 1.7.9.2