From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-pms+bounces-1138-garchives=archives.gentoo.org@lists.gentoo.org>
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 4741A138334
for <garchives@archives.gentoo.org>; Sun, 22 Dec 2019 20:33:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 61643E0B30;
Sun, 22 Dec 2019 20:33:09 +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 3B89CE0B30
for <gentoo-pms@lists.gentoo.org>; Sun, 22 Dec 2019 20:33:09 +0000 (UTC)
Received: from localhost.localdomain (c142-245.icpnet.pl [85.221.142.245])
(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 8184834DA8B;
Sun, 22 Dec 2019 20:33:07 +0000 (UTC)
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
To: gentoo-pms@lists.gentoo.org
Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Subject: [gentoo-pms] [PATCH eapi8] EAPI 8 has install-time dependencies (IDEPEND)
Date: Sun, 22 Dec 2019 21:32:41 +0100
Message-Id: <20191222203241.180616-1-mgorny@gentoo.org>
X-Mailer: git-send-email 2.24.1
Precedence: bulk
List-Post: <mailto:gentoo-pms@lists.gentoo.org>
List-Help: <mailto:gentoo-pms+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-pms+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-pms+subscribe@lists.gentoo.org>
List-Id: Gentoo Package Manager Specification discussions <gentoo-pms.gentoo.org>
X-BeenThere: gentoo-pms@gentoo.org
X-BeenThere: gentoo-pms@lists.gentoo.org
Reply-To: gentoo-pms@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Archives-Salt: 1583623e-5556-45e1-b86d-f2f27ade6112
X-Archives-Hash: 138650084e76f52a9474ee7bd59c7c88
Bug: https://bugs.gentoo.org/660306
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
dependencies.tex | 38 ++++++++++++++++++++++++--------------
eapi-differences.tex | 4 ++++
ebuild-env-vars.tex | 7 ++++---
ebuild-vars.tex | 1 +
eclasses.tex | 8 ++++----
metadata-cache.tex | 2 ++
6 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/dependencies.tex b/dependencies.tex
index 40c932a..7924105 100644
--- a/dependencies.tex
+++ b/dependencies.tex
@@ -21,7 +21,7 @@
\t{src_install} & \t{DEPEND}, \t{BDEPEND} \\
\addlinespace
\t{pkg_preinst}, \t{pkg_postinst}, \t{pkg_prerm}, \t{pkg_postrm} &
- \t{RDEPEND} \\
+ \t{RDEPEND}, \t{IDEPEND} \\
\addlinespace
\t{pkg_config} & \t{RDEPEND}, \t{PDEPEND} \\
\bottomrule
@@ -30,15 +30,16 @@
\begin{centertable}{Summary of other interfaces related to dependency classes}
\label{tab:dep-class-api}
- \begin{tabular}{llll}
+ \begin{tabular}{lllll}
\toprule
- & \t{BDEPEND} & \t{DEPEND} & \t{RDEPEND}, \t{PDEPEND} \\
+ & \t{BDEPEND}, \t{IDEPEND} & \t{DEPEND} & \t{RDEPEND},
+ \t{PDEPEND} \\
\midrule
- Binary compatible with & \t{CBUILD} & \t{CHOST} & \t{CHOST} \\
- Base unprefixed path & \t{/} & \t{\$\{SYSROOT\}} & \t{\$\{ROOT\}} \\
- Relevant offset-prefix & \t{\$\{BROOT\}} & \t{\$\{EPREFIX\}} & \t{\$\{EPREFIX\}} \\
- Path combined with prefix & \t{\$\{BROOT\}} & \t{\$\{ESYSROOT\}} & \t{\$\{EROOT\}} \\
- PM query command option & \t{-b} & \t{-d} & \t{-r} \\
+ Binary compatible with & \t{CBUILD} & \t{CHOST} & \t{CHOST} \\
+ Base unprefixed path & \t{/} & \t{\$\{SYSROOT\}} & \t{\$\{ROOT\}} \\
+ Relevant offset-prefix & \t{\$\{BROOT\}} & \t{\$\{EPREFIX\}} & \t{\$\{EPREFIX\}} \\
+ Path combined with prefix & \t{\$\{BROOT\}} & \t{\$\{ESYSROOT\}} & \t{\$\{EROOT\}} \\
+ PM query command option & \t{-b} & \t{-d} & \t{-r} \\
\bottomrule
\end{tabular}
\end{centertable}
@@ -68,16 +69,24 @@ as supporting \t{BDEPEND}, the build dependencies are split into two subclasses:
dependency.
\end{compactitem}
+\featurelabel{idepend} Additionally, in EAPIs listed in table~\ref{tab:depend-table} as supporting
+\t{IDEPEND}, install-time dependencies can be specified. Those dependencies are binary compatible
+with the native build system (\t{CBUILD}). The~ebuild is allowed to call them in \t{pkg_preinst}
+and \t{pkg_postinst} phases. The ebuild may also call them in \t{pkg_prerm} and \t{pkg_postrm}
+but must not rely on them being available.
+
\ChangeWhenAddingAnEAPI{8}
\begin{centertable}{EAPIs supporting additional dependency types}
\label{tab:depend-table}
- \begin{tabular}{ll}
+ \begin{tabular}{lll}
\toprule
\multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{Supports \t{BDEPEND}?}} \\
+ \multicolumn{1}{c}{\textbf{Supports \t{BDEPEND}?}} &
+ \multicolumn{1}{c}{\textbf{Supports \t{IDEPEND}?}} \\
\midrule
- 0, 1, 2, 3, 4, 5, 6 & No \\
- 7, 8 & Yes \\
+ 0, 1, 2, 3, 4, 5, 6 & No & No \\
+ 7 & Yes & No \\
+ 8 & Yes & Yes \\
\bottomrule
\end{tabular}
\end{centertable}
@@ -97,7 +106,7 @@ be surrounded on both sides by whitespace, except at the start and end of the st
\begin{compactitem}
\item A package dependency specification. Permitted in \t{DEPEND}, \t{BDEPEND}, \t{RDEPEND},
- \t{PDEPEND}.
+ \t{IDEPEND}, \t{PDEPEND}.
\item A URI, in the form \t{proto://host/path}. Permitted in \t{HOMEPAGE} and \t{SRC_URI}\@.
In EAPIs listed in table~\ref{tab:uri-arrows-table} as supporting \t{SRC_URI} arrows, may
optionally be followed by whitespace, then \t{->}, then whitespace, then a simple filename when
@@ -115,7 +124,8 @@ be surrounded on both sides by whitespace, except at the start and end of the st
followed by an open parenthesis, followed by whitespace, followed by one or more
of (a dependency item of any kind followed by whitespace), followed by a close parenthesis.
More formally: \t{any-of} \t{::=} \t{'||' whitespace '(' whitespace (item whitespace)+ ')'}.
- Permitted in \t{DEPEND}, \t{BDEPEND}, \t{RDEPEND}, \t{PDEPEND}, \t{LICENSE}, \t{REQUIRED_USE}.
+ Permitted in \t{DEPEND}, \t{BDEPEND}, \t{RDEPEND}, \t{IDEPEND}, \t{PDEPEND}, \t{LICENSE},
+ \t{REQUIRED_USE}.
\item An exactly-one-of group, which has the same format as the any-of group, but begins with the
string \t{\textasciicircum\textasciicircum} instead. Permitted in \t{REQUIRED_USE}.
\item \featurelabel{at-most-one-of} An at-most-one-of group, which has the same format as the
diff --git a/eapi-differences.tex b/eapi-differences.tex
index 59940b0..94816d4 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -83,6 +83,9 @@ Selective URI restrictions & \compactfeatureref{selective-uri-restrict} &
\t{BDEPEND} & \compactfeatureref{bdepend} &
No & No & No & Yes & Yes \\
+\t{IDEPEND} & \compactfeatureref{idepend} &
+ No & No & No & No & Yes \\
+
\t{??\ ( )} groups & \compactfeatureref{at-most-one-of} &
No & Yes & Yes & Yes & Yes \\
@@ -485,6 +488,7 @@ EAPI 8 is EAPI 7 with the following changes:
\begin{compactitem}
\item Selective fetch/mirror restriction, \featureref{selective-uri-restrict}.
+\item \t{IDEPEND}, \featureref{idepend}.
\end{compactitem}
\ChangeWhenAddingAnEAPI{8}
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index 2370d9d..6065ff4 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -147,9 +147,10 @@ variable.
\t{BROOT} &
Ditto &
No &
- \featurelabel{broot} The absolute path to the root directory containing build dependencies
- satisfied by \t{BDEPEND}, typically executable build tools. This includes any applicable offset
- prefix. Only for EAPIs listed in table~\ref{tab:offset-env-vars-table} as supporting \t{BROOT}.
+ \featurelabel{broot} The absolute path to the root directory containing build host dependencies
+ satisfied by \t{BDEPEND} and \t{IDEPEND}, typically executable build tools. This includes any
+ applicable offset prefix. Only for EAPIs listed in table~\ref{tab:offset-env-vars-table} as
+ supporting \t{BROOT}.
\\
\t{T} &
All &
diff --git a/ebuild-vars.tex b/ebuild-vars.tex
index 12184a8..1e19d0d 100644
--- a/ebuild-vars.tex
+++ b/ebuild-vars.tex
@@ -86,6 +86,7 @@ Ebuilds may define any of the following variables:
details.
\item[PDEPEND] See chapter~\ref{ch:dependencies}.
\item[BDEPEND] See chapter~\ref{ch:dependencies}.
+\item[IDEPEND] See chapter~\ref{ch:dependencies}.
\end{description}
\ChangeWhenAddingAnEAPI{8}
diff --git a/eclasses.tex b/eclasses.tex
index bf0007b..2ecdc66 100644
--- a/eclasses.tex
+++ b/eclasses.tex
@@ -34,10 +34,10 @@ The \t{inherit} command must also ensure that:
\section{Eclass-defined Metadata Keys}
-The \t{IUSE}, \t{REQUIRED_USE}, \t{DEPEND}, \t{BDEPEND}, \t{RDEPEND} and \t{PDEPEND} variables
-are handled specially when set by an eclass. They must be accumulated across eclasses, appending
-the value set by each eclass to the resulting value after the previous one is loaded. Then the
-eclass-defined value is appended to that defined by the ebuild. In the case of \t{RDEPEND}, this
+The \t{IUSE}, \t{REQUIRED_USE}, \t{DEPEND}, \t{BDEPEND}, \t{RDEPEND}, \t{IDEPEND} and \t{PDEPEND}
+variables are handled specially when set by an eclass. They must be accumulated across eclasses,
+appending the~value set by each eclass to the resulting value after the previous one is loaded. Then
+the eclass-defined value is appended to that defined by the ebuild. In the case of \t{RDEPEND}, this
is done after the implicit \t{RDEPEND} rules in section~\ref{sec:rdepend-depend} are applied.
\section{EXPORT_FUNCTIONS}
diff --git a/metadata-cache.tex b/metadata-cache.tex
index 33574c4..d69ecdd 100644
--- a/metadata-cache.tex
+++ b/metadata-cache.tex
@@ -36,6 +36,8 @@ order. Other lines may be present following these; their meanings are not define
metadata; see table~\ref{tab:optional-vars-table}.
\item Defined phases (\t{DEFINED_PHASES}). In some EAPIs, may optionally be blank, regardless of
ebuild metadata; see table~\ref{tab:defined-phases-table}.
+\item Install-time dependencies (\t{IDEPEND}).
+ Blank in some EAPIs; see table~\ref{tab:depend-table}.
\item Blank lines to pad the file to 22 lines long
\end{compactenum}
--
2.24.1