From a5b60005a03208fbde43080ef2919f3cb911faca Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 12 Aug 2008 19:54:51 +0000 Subject: [PATCH] Create a single EAPI section to contain all of the EAPI subsections and replace sect[1-3] elements with "section" elements which have unbounded depth. svn path=/main/trunk/; revision=11402 --- doc/package/ebuild.docbook | 3 ++ doc/package/ebuild/eapi/0.docbook | 12 +++--- doc/package/ebuild/eapi/1.docbook | 16 ++++---- doc/package/ebuild/eapi/2.docbook | 44 ++++++++++----------- doc/package/ebuild/helper_functions.docbook | 32 +++++++-------- doc/package/ebuild/phases.docbook | 16 ++++---- 6 files changed, 63 insertions(+), 60 deletions(-) diff --git a/doc/package/ebuild.docbook b/doc/package/ebuild.docbook index 162b79c53..ecd88017a 100644 --- a/doc/package/ebuild.docbook +++ b/doc/package/ebuild.docbook @@ -2,7 +2,10 @@ Ebuild &package_ebuild_phases; &package_ebuild_helper_functions; +
+EAPI &package_ebuild_eapi_0; &package_ebuild_eapi_1; &package_ebuild_eapi_2; +
diff --git a/doc/package/ebuild/eapi/0.docbook b/doc/package/ebuild/eapi/0.docbook index 72e998b9c..d00861ccf 100644 --- a/doc/package/ebuild/eapi/0.docbook +++ b/doc/package/ebuild/eapi/0.docbook @@ -1,8 +1,8 @@ - +
EAPI 0 - +
Phases - +
Default src_compile Phase Function src_compile() { @@ -14,6 +14,6 @@ src_compile() { fi } - - - +
+
+
diff --git a/doc/package/ebuild/eapi/1.docbook b/doc/package/ebuild/eapi/1.docbook index ad84ae6f9..ca421352f 100644 --- a/doc/package/ebuild/eapi/1.docbook +++ b/doc/package/ebuild/eapi/1.docbook @@ -1,8 +1,8 @@ - +
EAPI 1 - +
Phases - +
Default src_compile Phase Function Support for the ECONF_SOURCE variable, which is also supported @@ -18,9 +18,9 @@ src_compile() { fi } - - - +
+
+
SLOT Dependencies Any valid atom can be constrained to match a specific SLOT. This is @@ -50,5 +50,5 @@ src_compile() { - - +
+
diff --git a/doc/package/ebuild/eapi/2.docbook b/doc/package/ebuild/eapi/2.docbook index 8e152f21d..1a4073e5e 100644 --- a/doc/package/ebuild/eapi/2.docbook +++ b/doc/package/ebuild/eapi/2.docbook @@ -1,8 +1,8 @@ - +
EAPI 2_pre1 - +
Helpers - +
doman Language codes in file names are now used for path translation. @@ -29,11 +29,11 @@ - - - +
+
+
USE Dependencies - +
Unconditional USE Dependencies Syntax Examples @@ -61,8 +61,8 @@
- - +
+
Conditional USE Dependencies Syntax Examples @@ -94,14 +94,14 @@
- - - - +
+
+
+
EAPI 2_pre2 - +
Phases - +
New src_configure Phase Function The configure portion of the src_compile function has been @@ -164,8 +164,8 @@ src_compile() { - - +
+
Default Phase Functions The default pkg_nofetch and src_* phase functions are now @@ -261,8 +261,8 @@ src_compile() { - - +
+
Default Phase Function Alias A function named "default" is redefined for each phase so that it @@ -271,6 +271,6 @@ src_compile() { src_compile phase is equivalent to a call to the function named default_src_compile. - - - +
+
+
diff --git a/doc/package/ebuild/helper_functions.docbook b/doc/package/ebuild/helper_functions.docbook index 9c417afb9..1a4737c5b 100644 --- a/doc/package/ebuild/helper_functions.docbook +++ b/doc/package/ebuild/helper_functions.docbook @@ -1,31 +1,31 @@ - +
Helper Functions - +
Output - +
ebegin Like einfo, we output a helpful message and then hint that the following operation may take some time to complete. Once the task is finished, you need to call eend. - - +
+
eend Followup the ebegin message with an appropriate "OK" or "!!" (for errors) marker. If status is non-zero, then the additional error message is displayed. - - +
+
einfo Same as elog, but should be used when the message isn't important to the user (like progress or status messages during the build process). - - +
+
elog If you need to display a message that you wish the user to read @@ -33,18 +33,18 @@ but adds a little more to the output so as to catch the user's eye. The message will also be logged by portage for later review. - - +
+
eqawarn Same as einfo, but should be used when showing a QA warning to the user. - - +
+
ewarn Same as einfo, but should be used when showing a warning to the user. - - - +
+
+
diff --git a/doc/package/ebuild/phases.docbook b/doc/package/ebuild/phases.docbook index 383c605ce..2cb1b4447 100644 --- a/doc/package/ebuild/phases.docbook +++ b/doc/package/ebuild/phases.docbook @@ -1,4 +1,4 @@ - +
Ebuild Phases Ebuild execution is divided into a series of phases. In order @@ -40,13 +40,13 @@ - +
Interaction with previous installed version The order for upgrade and downgrade operations changed in version 2.1.5, but the order for reinstall operations remained unchanged. - +
Upgrade/downgrade order used by versions less than 2.1.5 (deprecated) @@ -64,8 +64,8 @@ - - +
+
Upgrade/downgrade order starting with version 2.1.5 The new order for upgrades and downgrades is identical to the order used @@ -95,6 +95,6 @@ pkg_preinst) and store the result in a global variable to be accessed by pkg_postinst when it is called. - - - +
+
+
-- 2.26.2