From 409fccc10861c361f37a959195d7581a5c376dd9 Mon Sep 17 00:00:00 2001 From: Ulrich Mueller Date: Sat, 4 Dec 2010 11:54:23 +0100 Subject: Slot operator dependencies are not in EAPI 4. --- dependencies.tex | 25 ++++--------------------- eapi-differences.tex | 3 +-- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dependencies.tex b/dependencies.tex index 2e98d05..ef1b203 100644 --- a/dependencies.tex +++ b/dependencies.tex @@ -137,10 +137,10 @@ manager must warn or error if this feature is used with an EAPI not supporting u \multicolumn{1}{c}{\textbf{Supports \t{SLOT} dependencies?}} \\ \midrule \t{0} & No \\ - \t{1} & Named only \\ - \t{2} & Named only \\ - \t{3} & Named only \\ - \t{4} & Named and operator \\ + \t{1} & Yes \\ + \t{2} & Yes \\ + \t{3} & Yes \\ + \t{4} & Yes \\ \bottomrule \end{tabular} \end{centertable} @@ -219,23 +219,6 @@ specification with a named slot dependency matches only if the slot of the match to the slot specified. If the slot of the package to match cannot be determined (e.\,g.\ because it is not a supported \t{EAPI}), the match is treated as unsuccessful. -\featurelabel{slot-operator-deps} An operator slot dependency consists of a colon followed by one of -the following operators: - -\begin{description} -\item[*] Indicates that any slot value is acceptable. In addition, for runtime dependencies, -indicates that the package will not break if the matched package is uninstalled and replaced by -a different matching package in a different slot. -\item[=] Indicates that any slot value is acceptable. In addition, for runtime dependencies, -indicates that the package will break unless a matching package with slot equal to the slot of -the best installed version at the time the package was installed is available. -\end{description} - -To implement the equals slot operator, the package manager will need to store the slot of the -best installed version of the matching package. The package manager may do this by appending -the appropriate slot after the equals sign when saving the package's dependencies. This syntax -is only for package manager use and must not be used by ebuilds. - \subsubsection{2-Style and 4-Style Use Dependencies} \label{sec:use-dep} diff --git a/eapi-differences.tex b/eapi-differences.tex index cb9d41d..4a53459 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -58,7 +58,7 @@ Profile \t{IUSE} injection & \compactfeatureref{profile-iuse-injection} & No & No & Yes & Yes & Yes \\ Slot dependencies & \compactfeatureref{slot-deps} & - No & Named & Named & Named & Named and Operator \\ + No & Yes & Yes & Yes & Yes \\ Use dependencies & \compactfeatureref{use-deps} & No & No & 2-style & 2-style & 4-style \\ @@ -214,7 +214,6 @@ EAPI 4 is EAPI 3 with the following changes: \item \t{REQUIRED\_USE}, \featureref{required-use}. \item \t{RDEPEND=DEPEND} no longer done, \featureref{rdepend-depend}. \item \t{DEFINED\_PHASES} support is mandatory, \featureref{defined-phases}. -\item Slot operator dependencies, \featureref{slot-operator-deps}. \item Use dependency defaults, \featureref{use-dep-defaults}. \item \t{S} to \t{WORKDIR} fallback restricted, \featureref{s-workdir-fallback}. \item \t{pkg\_pretend}, \featureref{pkg-pretend}. -- cgit v1.2.3-65-gdbad