From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SUzQO-0007E9-Ai for garchives@archives.gentoo.org; Thu, 17 May 2012 12:03:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DC2EE093A; Thu, 17 May 2012 12:02:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E0AFBE093A for ; Thu, 17 May 2012 12:02:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 263351B4056 for ; Thu, 17 May 2012 12:02:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DB25DE5437 for ; Thu, 17 May 2012 12:02:24 +0000 (UTC) From: "Ulrich Mueller" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Mueller" Message-ID: <1337250689.489a60deede1a0d78edb545e97b0e17addaa6ab4.ulm@gentoo> Subject: [gentoo-commits] proj/pms:eapi-5 commit in: / X-VCS-Repository: proj/pms X-VCS-Files: eapi-differences.tex ebuild-env-vars.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 489a60deede1a0d78edb545e97b0e17addaa6ab4 X-VCS-Branch: eapi-5 Date: Thu, 17 May 2012 12:02:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a3497668-5059-4d73-82b5-2f8d52fe8f1c X-Archives-Hash: 5c20110b96824972cef72d894986106a commit: 489a60deede1a0d78edb545e97b0e17addaa6ab4 Author: Ciaran McCreesh googlemail com> AuthorDate: Sun May 6 16:52:55 2012 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Thu May 17 10:31:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms.git;a=3Dc= ommit;h=3D489a60de IMAGE is removed in EAPI 5. --- eapi-differences.tex | 4 ++++ ebuild-env-vars.tex | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index e617811..e94684e 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -109,6 +109,9 @@ Use dependencies & \compactfeatureref{use-deps} & \t{KV} & \compactfeatureref{kv} & Yes & Yes & Yes & Yes & No & No \\ =20 +\t{IMAGE} & \compactfeatureref{image} & + Yes & Yes & Yes & Yes & Yes & No \\ + \t{MERGE\_TYPE} & \compactfeatureref{merge-type} & No & No & No & No & Yes & Yes \\ =20 @@ -251,6 +254,7 @@ EAPI 5 is EAPI 4 with the following changes: \item \t{econf} adds \t{-{}-disable-silent-rules}, \featureref{econf-opt= ions}. \item Slot operator dependencies, \featureref{slot-operator-deps}. \item \t{USE} is calculated differently, \featureref{profile-iuse-inject= ion}. +\item \t{IMAGE} is gone, \featureref{image}. \end{compactitem} =20 \ChangeWhenAddingAnEAPI{5} diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex index 450542a..fdffa42 100644 --- a/ebuild-env-vars.tex +++ b/ebuild-env-vars.tex @@ -154,7 +154,8 @@ variable. \t{IMAGE}\footnote{Deprecated in favour of \t{D}.} & \t{pkg\_preinst}, \t{pkg\_postinst} & Yes & - Equal to \t{D}. \\ + \featurelabel{image} Equal to \t{D}. Only for EAPIs listed in table~= \ref{tab:env-vars-table} as + supporting \t{IMAGE}. \\ \t{INSDESTTREE} & \t{src\_install} & No & @@ -216,21 +217,22 @@ variable. =20 \ChangeWhenAddingAnEAPI{5} \begin{centertable}{EAPIs supporting various env variables} \label{tab:e= nv-vars-table} - \begin{tabular}{ l l l l l l } + \begin{tabular}{ l l l l l l l } \toprule \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{\t{AA}?}} & \multicolumn{1}{c}{\textbf{\t{KV}?}} & \multicolumn{1}{c}{\textbf{\t{MERGE\_TYPE}?}} & \multicolumn{1}{c}{\textbf{\t{REPLACING\_VERSIONS}?}} & - \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} \\ + \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} & + \multicolumn{1}{c}{\textbf{\t{IMAGE}?}} \\ \midrule - \t{0} & Yes & Yes & No & No & No \\ - \t{1} & Yes & Yes & No & No & No \\ - \t{2} & Yes & Yes & No & No & No \\ - \t{3} & Yes & Yes & No & No & No \\ - \t{4} & No & No & Yes & Yes & Yes \\ - \t{5} & No & No & Yes & Yes & Yes \\ + \t{0} & Yes & Yes & No & No & No & Yes \\ + \t{1} & Yes & Yes & No & No & No & Yes \\ + \t{2} & Yes & Yes & No & No & No & Yes \\ + \t{3} & Yes & Yes & No & No & No & Yes \\ + \t{4} & No & No & Yes & Yes & Yes & Yes \\ + \t{5} & No & No & Yes & Yes & Yes & No \\ \bottomrule \end{tabular} \end{centertable}