* [gentoo-pms] Three patches for review
@ 2010-04-20 7:25 99% Ulrich Mueller
0 siblings, 0 replies; 1+ results
From: Ulrich Mueller @ 2010-04-20 7:25 UTC (permalink / raw
To: gentoo-pms
[-- Attachment #1: message body text --]
[-- Type: text/plain, Size: 422 bytes --]
Attached are three patches for review:
1) The patch attached to bug 303919, but also with
eapi-differences.tex updated. The change in "doman -i18n" behaviour
has been approved in yesterday's council meeting.
2) Sort list of EAPI changes by order of their occurence in the text.
This affects mostly EAPI 4.
3) Fix an undefined reference to a table (and rewraps the overlong
lines in the paragraph).
Ulrich
[-- Attachment #2: 0001-Document-the-i18n-option-of-doman.patch --]
[-- Type: text/plain, Size: 5197 bytes --]
From 671d957d23d515f52558a748fafa1081d4fe8e12 Mon Sep 17 00:00:00 2001
From: Ulrich Mueller <ulm@gentoo.org>
Date: Sat, 6 Mar 2010 12:02:41 +0100
Subject: [PATCH 1/3] Document the -i18n option of doman.
See bug 303919.
Signed-off-by: Ulrich Mueller <ulm@gentoo.org>
---
eapi-differences.tex | 6 +++++-
pkg-mgr-commands.tex | 38 +++++++++++++++++++++++---------------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/eapi-differences.tex b/eapi-differences.tex
index d96b6ee..b478e4a 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -133,6 +133,9 @@ Most utilities die & \compactfeatureref{die-on-failure} &
\t{doman} languages & \compactfeatureref{doman-langs} &
No & No & Yes & Yes & Yes \\
+\t{doman -i18n} precedence & \compactfeatureref{doman-langs} &
+ N/A & N/A & No & No & Yes \\
+
Controllable compression & \compactfeatureref{controllable-compress} &
No & No & No & No & Yes \\
@@ -182,7 +185,7 @@ EAPI 2 is EAPI 1 with the following changes:
\item Different \t{src\_compile} implementation, \featureref{src-compile-2}.
\item \t{default\_} phase functions for phases \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare},
\t{src\_configure}, \t{src\_compile} and \t{src\_test}; \featureref{default-phase-funcs}.
-\item \t{doman} languages support, \featureref{doman-langs}.
+\item \t{doman} language detection by filename, \featureref{doman-langs}.
\item \t{default} function, \featureref{default-func}.
\end{compactitem}
@@ -210,6 +213,7 @@ EAPI 4 is EAPI 3 with the following changes:
\item Controllable compression and \t{docompress}, \featureref{controllable-compress}.
\item \t{dodoc -r} support, \featureref{dodoc}.
\item \t{doins} supports symlinks, \featureref{doins}.
+\item \t{doman -i18n} option takes precedence, \featureref{doman-langs}.
\item \t{dohard}, \t{dosed} banned, \featureref{banned-commands}.
\item \t{econf} adds \t{-{}-disable-dependency-tracking}, \featureref{econf-options}.
\item \t{pkg\_info} can run on non-installed packages, \featureref{pkg-info}.
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 5054878..654843c 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -339,14 +339,20 @@ that can be passed to \t{dohtml} are as follows:
\end{algorithm}
\item[doman] Installs a man page into the appropriate subdirectory of \t{/usr/share/man} depending
- upon its apparent section suffix (e.g. \t{foo.1} goes to \t{/usr/share/man/man1/foo.1} with file
- mode \t{0644}.
+ upon its apparent section suffix (e.\,g.\ \t{foo.1} goes to \t{/usr/share/man/man1/foo.1} with
+ file mode \t{0644}.
- \featurelabel{doman-langs} In EAPIs listed in table~\ref{tab:doman-table} as supporting language
- codes, a man page with name of the form\t{foo.lang.1} shall go to
- \t{/usr/share/man/lang/man1/foo.1}, where \t{lang} refers to a pair of lower-case ASCII letters
- optionally followed by an underscore and a pair of upper-case ASCII letters. Failure behaviour
- is EAPI dependent as per section~\ref{sec:failure-behaviour}.
+ \featurelabel{doman-langs} In EAPIs listed in table~\ref{tab:doman-table} as supporting
+ language detection by filename, a man page with name of the form \t{foo.}\i{lang}\t{.1} shall
+ go to \t{/usr/share/man/}\i{lang}\t{/man1/foo.1}, where \i{lang} refers to a pair of lower-case
+ ASCII letters optionally followed by an underscore and a pair of upper-case ASCII letters.
+ Failure behaviour is EAPI dependent as per section~\ref{sec:failure-behaviour}.
+
+ With option \t{-i18n=}\i{lang}, a man page shall be installed into an appropriate subdirectory
+ of \t{/usr/share/man/}\i{lang} (e.\,g.\ \t{/usr/share/man/}\i{lang}\t{/man1/foo.pl.1} would be
+ the destination for \t{foo.pl.1}). The \i{lang} subdirectory level is skipped if \i{lang} is
+ the empty string. In EAPIs specified by table~\ref{tab:doman-table}, the \t{-i18n} option takes
+ precedence over the language code in the filename.
\item[domo] Installs a \t{.mo} file with file mode \t{0644} into the appropriate subdirectory of
\t{DESTTREE/share/locale}, generated by taking the basename of the file, removing the \t{.*}
@@ -425,17 +431,19 @@ that can be passed to \t{dohtml} are as follows:
\end{tabular}
\end{centertable}
-\begin{centertable}{EAPIs supporting \t{doman} languages} \label{tab:doman-table}
- \begin{tabular}{ l l }
+\begin{centertable}{\t{doman} language support options for EAPIs}
+ \label{tab:doman-table}
+ \begin{tabular}{ l l l }
\toprule
\multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{Supports \t{doman} languages?}} \\
+ \multicolumn{1}{c}{\textbf{Language detection by filename?}} &
+ \multicolumn{1}{c}{\textbf{Option \t{-i18n} takes precedence?}} \\
\midrule
- \t{0} & No \\
- \t{1} & No \\
- \t{2} & Yes \\
- \t{3} & Yes \\
- \t{4} & Yes \\
+ \t{0} & No & Not applicable \\
+ \t{1} & No & Not applicable \\
+ \t{2} & Yes & No \\
+ \t{3} & Yes & No \\
+ \t{4} & Yes & Yes \\
\bottomrule
\end{tabular}
\end{centertable}
--
1.7.0.4
[-- Attachment #3: 0002-Sort-lists-of-EAPI-changes-by-order-of-their-occuren.patch --]
[-- Type: text/plain, Size: 3620 bytes --]
From b44d6b59941307e6212fc7d8c033f84ed73657f7 Mon Sep 17 00:00:00 2001
From: Ulrich Mueller <ulm@gentoo.org>
Date: Tue, 20 Apr 2010 08:53:27 +0200
Subject: [PATCH 2/3] Sort lists of EAPI changes by order of their occurence in the text.
Signed-off-by: Ulrich Mueller <ulm@gentoo.org>
---
eapi-differences.tex | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/eapi-differences.tex b/eapi-differences.tex
index b478e4a..2cc4349 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -177,9 +177,9 @@ EAPI 1 is EAPI 0 with the following changes:
EAPI 2 is EAPI 1 with the following changes:
\begin{compactitem}
-\item \t{SRC\_URI} arrows, \featureref{src-uri-arrows}.
\item Use dependencies, \featureref{use-deps}.
\item \t{!} and \t{!!} blockers, \featureref{bang-strength}.
+\item \t{SRC\_URI} arrows, \featureref{src-uri-arrows}.
\item \t{src\_prepare}, \featureref{src-prepare}.
\item \t{src\_configure}, \featureref{src-configure}.
\item Different \t{src\_compile} implementation, \featureref{src-compile-2}.
@@ -204,27 +204,27 @@ EAPI 3 is EAPI 2 with the following changes:
EAPI 4 is EAPI 3 with the following changes:
\begin{compactitem}
-\item \t{pkg\_pretend}, \featureref{pkg-pretend}.
+\item \t{PROPERTIES} support is mandatory, \featureref{properties}.
+\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{DEFINED\_PHASES} support is mandatory, \featureref{defined-phases}.
-\item \t{PROPERTIES} support is mandatory, \featureref{properties}.
+\item \t{S} to \t{WORKDIR} fallback restricted, \featureref{s-workdir-fallback}.
+\item \t{pkg\_pretend}, \featureref{pkg-pretend}.
\item Default \t{src\_install} no longer a no-op, \featureref{src-install-4}.
-\item Controllable compression and \t{docompress}, \featureref{controllable-compress}.
-\item \t{dodoc -r} support, \featureref{dodoc}.
-\item \t{doins} supports symlinks, \featureref{doins}.
-\item \t{doman -i18n} option takes precedence, \featureref{doman-langs}.
-\item \t{dohard}, \t{dosed} banned, \featureref{banned-commands}.
-\item \t{econf} adds \t{-{}-disable-dependency-tracking}, \featureref{econf-options}.
\item \t{pkg\_info} can run on non-installed packages, \featureref{pkg-info}.
-\item \t{USE} is calculated differently, \featureref{profile-iuse-injection}.
\item \t{AA} is gone, \featureref{aa}.
\item \t{KV} is gone, \featureref{kv}.
+\item \t{USE} is calculated differently, \featureref{profile-iuse-injection}.
\item \t{REPLACING\_VERSIONS} and \t{REPLACED\_BY\_VERSION}, \featureref{replace-version-vars}.
-\item \t{S} to \t{WORKDIR} fallback restricted, \featureref{s-workdir-fallback}.
-\item \t{RDEPEND=DEPEND} no longer done, \featureref{rdepend-depend}.
\item Utilities now die on failure, \featureref{die-on-failure}, unless called under \t{nonfatal},
\featureref{nonfatal}
+\item \t{dohard}, \t{dosed} banned, \featureref{banned-commands}.
+\item \t{econf} adds \t{-{}-disable-dependency-tracking}, \featureref{econf-options}.
+\item \t{dodoc -r} support, \featureref{dodoc}.
+\item \t{doins} supports symlinks, \featureref{doins}.
+\item \t{doman -i18n} option takes precedence, \featureref{doman-langs}.
+\item Controllable compression and \t{docompress}, \featureref{controllable-compress}.
\end{compactitem}
% vim: set filetype=tex fileencoding=utf8 et tw=100 spell spelllang=en :
--
1.7.0.4
[-- Attachment #4: 0003-Fix-undefined-reference-to-offset-prefix-table.patch --]
[-- Type: text/plain, Size: 1570 bytes --]
From 948aa6b892a589179aa71859390bc38e0d47230b Mon Sep 17 00:00:00 2001
From: Ulrich Mueller <ulm@gentoo.org>
Date: Tue, 20 Apr 2010 08:54:31 +0200
Subject: [PATCH 3/3] Fix undefined reference to offset-prefix-table.
Signed-off-by: Ulrich Mueller <ulm@gentoo.org>
---
pkg-mgr-commands.tex | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 654843c..fe6e0c4 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -160,10 +160,10 @@ has returned.
\end{centertable}
Note that the \t{\$\{EPREFIX\}} component represents the same offset-prefix as described in
- Table~\ref{tab:defined_vars}. It facilitates offset-prefix installations which is supported by EAPIs
- listed in Table~\ref{tab:offset-prefix-table}. When no offset-prefix installation is in effect,
- \t{EPREFIX} becomes the empty string, making the behaviour of \t{econf} equal for both offset-prefix
- supporting and agnostic EAPIs.
+ Table~\ref{tab:defined_vars}. It facilitates offset-prefix installations which is supported by
+ EAPIs listed in Table~\ref{tab:offset-env-vars-table}. When no offset-prefix installation is in
+ effect, \t{EPREFIX} becomes the empty string, making the behaviour of \t{econf} equal for both
+ offset-prefix supporting and agnostic EAPIs.
\t{econf} must be implemented internally---that is, as a bash function and not an external
script. Should any portion of it fail, it must abort the build using \t{die}, unless run using
--
1.7.0.4
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-04-20 7:25 99% [gentoo-pms] Three patches for review Ulrich Mueller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox