aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2020-02-08 20:43:23 +0100
committerUlrich Müller <ulm@gentoo.org>2020-02-11 12:38:00 +0100
commit3b8fa72d91bbdd08aa08f7e7bf0ca66833095186 (patch)
treeac5d3a0407786a7c860d006d1f50d934647ec504 /general-concepts
parentMakefile: Remove quirks necessary for installing in-place. (diff)
downloaddevmanual-3b8fa72d91bbdd08aa08f7e7bf0ca66833095186.tar.gz
devmanual-3b8fa72d91bbdd08aa08f7e7bf0ca66833095186.tar.bz2
devmanual-3b8fa72d91bbdd08aa08f7e7bf0ca66833095186.zip
ebuild-writing/eapi: Move EAPI=4 information to other sections.
- Utilities die, nonfatal: New section in ebuild-writing/error-handling, new chapter function-reference/error-functions - dodoc -r: Already in function-reference/install-functions, add additional example to ebuild-writing/functions/src_install - doins symlink support: Incorporated into function-reference/install-functions - dosed, dohard banned: Not mentioned anywhere else - econf --disable-dependency-tracking: New section about econf options in ebuild-writing/functions/src_configure/configuring - Controllable compression and docompress: New chapter ebuild-writing/functions/src_install/docompress - USE dependency defaults: Incorporated into general-concepts/dependencies - pkg_pretend: Already in ebuild-writing/functions/pkg_pretend - default src_install: Already in ebuild-writing/functions/src_install - pkg_info: Incorporated into ebuild-writing/functions/pkg_info - REQUIRED_USE: Already in ebuild-writing/variables - MERGE_TYPE, REPLACING_VERSIONS, REPLACED_BY_VERSION: Moved to ebuild-writing/variables - DOCS: Incorporated into ebuild-writing/variables - AA, KV removed: Not mentioned anywhere else - RDEPEND=DEPEND: Already handled in commit 5a946b4 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'general-concepts')
-rw-r--r--general-concepts/dependencies/text.xml20
-rw-r--r--general-concepts/use-flags/text.xml8
-rw-r--r--general-concepts/virtuals/text.xml2
3 files changed, 20 insertions, 10 deletions
diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml
index 2aca289..ff198fb 100644
--- a/general-concepts/dependencies/text.xml
+++ b/general-concepts/dependencies/text.xml
@@ -572,15 +572,25 @@ There are also shortcuts for conditional situations:
<body>
<p>
-If a dependency is introducing or removing a <c>USE</c> flag in new versions, a use
-dependency default may be used. Appending a <c>(+)</c> or <c>(-)</c> suffix will indicate
-whether the absence of the flag from a particular version should indicate its
-presence or absence.
+If a dependency is introducing or removing a <c>USE</c> flag in a new package
+version, a <c>(+)</c> or <c>(-)</c> may be added to the use-dependency
+specification to define a default value in case the flag does not exist in the
+target package. The <c>(+)</c> indicates that the missing flag is assumed to be
+enabled, <c>(-)</c> the opposite.
</p>
+
<p>
-<c>>=dev-libs/boost-1.48[threads(+)]</c> will treat all versions without <c>threads</c> as having it set.
+For example, the following will treat all <c>boost</c> versions without the
+<c>threads</c> flag as having it enabled, and all <c>gcc</c> versions without
+the <c>openmp</c> as having it disabled:
</p>
+<codesample lang="ebuild">
+DEPEND="
+ &gt;=dev-libs/boost-1.48[threads(+)]
+ sys-devel/gcc[openmp(-)]"
+</codesample>
+
</body>
</subsection>
</section>
diff --git a/general-concepts/use-flags/text.xml b/general-concepts/use-flags/text.xml
index 30b19f7..295bb8f 100644
--- a/general-concepts/use-flags/text.xml
+++ b/general-concepts/use-flags/text.xml
@@ -316,10 +316,10 @@ src_compile() {
</codesample>
<p>
-In some exceptional cases, above policy would break reverse USE
-dependencies. To avoid this, the ebuild can specify allowed USE flag
-combinations with <c>REQUIRED_USE</c> (available in EAPI 4). See section
-<uri link="::ebuild-writing/eapi/#EAPI=4"/> for a description
+In some exceptional cases, above policy would break reverse USE dependencies.
+To avoid this, the ebuild can specify allowed USE flag combinations with
+<c>REQUIRED_USE</c>. See section
+<uri link="::ebuild-writing/variables/#REQUIRED_USE"/> for a description
of its syntax.
</p>
diff --git a/general-concepts/virtuals/text.xml b/general-concepts/virtuals/text.xml
index 4f8b96d..bcea98d 100644
--- a/general-concepts/virtuals/text.xml
+++ b/general-concepts/virtuals/text.xml
@@ -24,7 +24,7 @@ An example of a virtual:
</p>
<codesample lang="ebuild">
-EAPI=4
+EAPI=7
DESCRIPTION="Virtual for C++ tr1 &lt;type_traits&gt;"
SLOT="0"