commit: 0273488109121d751e8ea3c60034dcb91280f54f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 10:12:05 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 00:01:00 2020 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=02734881
ebuild-writing/eapi: Move EAPI=1 information to other sections.
- Default src_compile: already in ebuild-writing/functions/src_compile
- SLOT dependencies: already in general-concepts/dependencies
- IUSE defaults moved to general-concepts/use-flags
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ebuild-writing/eapi/text.xml | 70 ----------------------------------
general-concepts/dependencies/text.xml | 5 ---
general-concepts/use-flags/text.xml | 28 ++++++++++++++
3 files changed, 28 insertions(+), 75 deletions(-)
diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml
index a1f698f..f7427fd 100644
--- a/ebuild-writing/eapi/text.xml
+++ b/ebuild-writing/eapi/text.xml
@@ -62,76 +62,6 @@ is the best. Using the features of the latest EAPI is
encouraged.
</body>
</section>
-<section>
-<title>EAPI=1</title>
-<body>
-
-<ul>
- <li>
- <p><b>Default src_compile Phase Function</b></p>
- <p>
- Support for the <c>ECONF_SOURCE</c> variable, which is also
supported by
- <c>econf</c>, has been added to the default <c>src_compile</c>
implementation.
- </p>
-<codesample lang="ebuild">
-src_compile() {
- if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
- econf
- fi
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ] ; then
- emake || die "emake failed"
- fi
-}
-</codesample>
- </li>
- <li>
- <p><b>SLOT dependencies</b></p>
- <p>
- Any valid package dependency specification can be constrained
to match
- a specific SLOT. This is accomplished by appending a colon to
the
- specification, followed by a SLOT value.
- </p>
- <p>
- <b>SLOT dependency examples:</b>
- </p>
- <ul>
- <li><c>x11-libs/qt:3</c></li>
- <li><c>~x11-libs/qt-3.3.8:3</c></li>
- <li><c>>=x11-libs/qt-3.3.8:3</c></li>
- <li><c>=x11-libs/qt-3.3*:3</c></li>
- </ul>
- </li>
- <li>
- <p><b>IUSE defaults</b></p>
- <p>
- Add + or - before the name of the use flag in IUSE to turn it
on or off by
- default.
- </p>
-
- <important>
- The default USE-ordering is
<c>USE_ORDER="env:pkg:conf:defaults:pkginternal:env.d"</c>
- (see man make.conf)
- </important>
- <important>
- Disabling default IUSE is pretty much useless as it does not
- override the profile and user config (make.conf and package.use)
- </important>
-
-<codesample lang="ebuild">
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=1
-
-IUSE="foo +bar"
-</codesample>
- </li>
-</ul>
-
-</body>
-</section>
-
-
<section>
<title>EAPI=2</title>
diff --git a/general-concepts/dependencies/text.xml
b/general-concepts/dependencies/text.xml
index 195371c..9f2cc47 100644
--- a/general-concepts/dependencies/text.xml
+++ b/general-concepts/dependencies/text.xml
@@ -297,11 +297,6 @@ newer package that caused the issues.
<title>SLOT Dependencies</title>
<body>
-<p>
-In order to depend on a package in a specific <c>SLOT</c> you must specify
-at least <c>EAPI=1</c>.
-</p>
-
<p>
To depend on a specific <c>SLOT</c>, <c>:SLOT</c> should be appended to
the package name, where 'SLOT' is the <c>SLOT</c> of the package wanted:
diff --git a/general-concepts/use-flags/text.xml
b/general-concepts/use-flags/text.xml
index 772791f..30b19f7 100644
--- a/general-concepts/use-flags/text.xml
+++ b/general-concepts/use-flags/text.xml
@@ -194,6 +194,34 @@ To get a flag added to <c>use.mask</c>, ask the relevant
arch team.
</body>
</section>
+<section>
+<title>IUSE defaults</title>
+<body>
+
+<p>
+Add <c>+</c> or <c>-</c> before the name of the use flag in <c>IUSE</c> to turn
+it on or off by default.
+</p>
+
+<important>
+Adding <c>-</c> before a flag in <c>IUSE</c> is pretty much useless, as it will
+neither override the user configuration (<c>make.conf</c>) nor the profile
+default (<c>make.defaults</c> and <c>package.use</c>). See make.conf(5) for
+details on USE-ordering in Portage.
+</important>
+
+<codesample lang="ebuild">
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="foo +bar"
+</codesample>
+
+</body>
+</section>
+
<section>
<title>Local and Global USE Flags</title>
<body>
