diff options
| -rw-r--r-- | doc/package/ebuild/eapi/5.docbook | 40 | ||||
| -rw-r--r-- | man/ebuild.5 | 2 | ||||
| -rw-r--r-- | man/emerge.1 | 8 | ||||
| -rw-r--r-- | pym/portage/const.py | 2 | ||||
| -rw-r--r-- | pym/portage/tests/repoman/test_simple.py | 4 | ||||
| -rw-r--r-- | pym/portage/tests/update/test_update_dbentry.py | 16 |
6 files changed, 36 insertions, 36 deletions
diff --git a/doc/package/ebuild/eapi/5.docbook b/doc/package/ebuild/eapi/5.docbook index c910092c6..376262e1c 100644 --- a/doc/package/ebuild/eapi/5.docbook +++ b/doc/package/ebuild/eapi/5.docbook @@ -1,8 +1,8 @@ -<section id='package-ebuild-eapi-5_pre2'> -<title>EAPI 5_pre2</title> -<section id='package-ebuild-eapi-5_pre2-metadata'> +<section id='package-ebuild-eapi-5'> +<title>EAPI 5</title> +<section id='package-ebuild-eapi-5-metadata'> <title>Metadata</title> -<section id='package-ebuild-eapi-5_pre2-metadata-required-use-at-most-one-of'> +<section id='package-ebuild-eapi-5-metadata-required-use-at-most-one-of'> <title>REQUIRED_USE supports new at-most-one-of operator</title> <para> The new at-most-one-of operator consists of the string '??', @@ -10,7 +10,7 @@ and is satisfied if zero or one (but no more) of its child elements is matched. </para> </section> -<section id='package-ebuild-eapi-5_pre2-metadata-slot-sub-slot'> +<section id='package-ebuild-eapi-5-metadata-slot-sub-slot'> <title>SLOT supports optional "sub-slot" part</title> <para> The SLOT variable may contain an optional sub-slot part that @@ -24,11 +24,11 @@ implicit sub-slot which is equal to the regular slot. </para> <para> Refer to the -<link linkend="package-ebuild-eapi-5_pre2-metadata-dependency-atom-slot-operators"> +<link linkend="package-ebuild-eapi-5-metadata-dependency-atom-slot-operators"> slot operators</link> documentation for more information about sub-slot usage. </para> </section> -<section id='package-ebuild-eapi-5_pre2-metadata-dependency-atom-slot-operators'> +<section id='package-ebuild-eapi-5-metadata-dependency-atom-slot-operators'> <title>Dependency atom slot operators</title> <para> A slot dependency may contain an optional sub-slot part that @@ -70,9 +70,9 @@ the regular slot). </para> </section> </section> -<section id='package-ebuild-eapi-5_pre2-profile'> +<section id='package-ebuild-eapi-5-profile'> <title>Profiles</title> -<section id='package-ebuild-eapi-5_pre2-profile-iuse-injection'> +<section id='package-ebuild-eapi-5-profile-iuse-injection'> <title>Profile IUSE Injection</title> <para> IUSE_EFFECTIVE is a variable calculated from IUSE and @@ -156,7 +156,7 @@ equivalent of ${v}. </table> </para> </section> -<section id='package-ebuild-eapi-5_pre2-profile-stable-use-masking'> +<section id='package-ebuild-eapi-5-profile-stable-use-masking'> <title>Profile stable USE forcing and masking</title> <para> In profile directories with an EAPI supporting stable masking, @@ -168,29 +168,29 @@ only influence packages that are merged due to a stable keyword. </para> </section> </section> -<section id='package-ebuild-eapi-5_pre2-helpers'> +<section id='package-ebuild-eapi-5-helpers'> <title>Helpers</title> -<section id='package-ebuild-eapi-5_pre2-helpers-econf-disable-silent-rules'> +<section id='package-ebuild-eapi-5-helpers-econf-disable-silent-rules'> <title>econf adds --disable-silent-rules</title> <para> This option will automatically be passed if --disable-silent-rules occurs in the output of configure --help. </para> </section> -<section id='package-ebuild-eapi-5_pre2-helpers-newfoo-stdin'> +<section id='package-ebuild-eapi-5-helpers-newfoo-stdin'> <title>new* commands can read from standard input</title> <para> Standard input is read when the first parameter is - (a hyphen). </para> </section> -<section id='package-ebuild-eapi-5_pre2-helpers-foo-version-host-root'> +<section id='package-ebuild-eapi-5-helpers-foo-version-host-root'> <title>New option --host-root for {has,best}_version</title> <para> This option --host-root will cause the query to apply to the host root instead of ROOT. </para> </section> -<section id='package-ebuild-eapi-5_pre2-helpers-doheader'> +<section id='package-ebuild-eapi-5-helpers-doheader'> <title>New doheader helper function</title> <para> Installs the given header files into /usr/include/, by default @@ -198,7 +198,7 @@ with file mode 0644. This can be overridden by setting INSOPTIONS with the insopts function. </para> </section> -<section id='package-ebuild-eapi-5_pre2-helpers-usex'> +<section id='package-ebuild-eapi-5-helpers-usex'> <title>New usex helper function</title> <programlisting> USAGE: usex <USE flag> [true output] [false output] [true suffix] [false suffix] @@ -208,9 +208,9 @@ DESCRIPTION: </programlisting> </section> </section> -<section id='package-ebuild-eapi-5_pre2-phases'> +<section id='package-ebuild-eapi-5-phases'> <title>Phases</title> -<section id='package-ebuild-eapi-5_pre2-phases-src-test-parallel'> +<section id='package-ebuild-eapi-5-phases-src-test-parallel'> <title>src_test supports parallel tests</title> <para> Unlike older EAPIs, the default src_test implementation will not @@ -218,9 +218,9 @@ pass the -j1 option to emake. </para> </section> </section> -<section id='package-ebuild-eapi-5_pre2-ebuild-environment-variables'> +<section id='package-ebuild-eapi-5-ebuild-environment-variables'> <title>Ebuild Environment Variables</title> -<section id='package-ebuild-eapi-5_pre2-ebuild-environment-variables-ebuild-phase-func'> +<section id='package-ebuild-eapi-5-ebuild-environment-variables-ebuild-phase-func'> <title>New EBUILD_PHASE_FUNC variable</title> <para> During execution of an ebuild phase function (such as pkg_setup diff --git a/man/ebuild.5 b/man/ebuild.5 index 338a7653a..22e646841 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -19,7 +19,7 @@ Here's a simple example ebuild: # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" inherit some_eclass another_eclass diff --git a/man/emerge.1 b/man/emerge.1 index b3ac37915..f2fb6ccb9 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -493,8 +493,8 @@ Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored. Ignore the slot/sub\-slot := operator parts of dependencies that have been recorded when packages where built. This option is intended only for debugging purposes, and it only affects built packages -that specify slot/sub\-slot := operator dependencies using the -experimental "4\-slot\-abi" or "5_pre2" EAPIs. +that specify slot/sub\-slot := operator dependencies which are +supported beginning with \fBEAPI 5\fR. .TP .BR "-j [JOBS], \-\-jobs[=JOBS]" Specifies the number of packages to build simultaneously. If this option is @@ -659,8 +659,8 @@ Automatically rebuild or reinstall packages when slot/sub\-slot := operator dependencies can be satisfied by a newer slot, so that older packages slots will become eligible for removal by the \-\-depclean action as soon as possible. This option only -affects packages that specify slot/sub\-slot := dependencies using the -experimental "4\-slot\-abi" or "5_pre2" EAPIs. +affects packages that specify slot/sub\-slot := dependencies +which are supported beginning with \fBEAPI 5\fR. Since this option requires checking of reverse dependencies, it enables \-\-complete\-graph mode whenever a new slot is installed. This option is enabled by diff --git a/pym/portage/const.py b/pym/portage/const.py index fe283f486..49a14d3ab 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -109,7 +109,7 @@ SUPPORTED_FEATURES = frozenset([ "unmerge-logs", "unmerge-orphans", "userfetch", "userpriv", "usersandbox", "usersync", "webrsync-gpg", "xattr"]) -EAPI = 4 +EAPI = 5 HASHING_BLOCKSIZE = 32768 MANIFEST1_HASH_FUNCTIONS = ("MD5", "SHA256", "RMD160") diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index 639ec31ea..f29a177f0 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -79,7 +79,7 @@ class SimpleRepomanTestCase(TestCase): ) profile = { - "eapi": ("5_pre2",), + "eapi": ("5",), "package.use.stable.mask": ("dev-libs/A flag",) } @@ -87,7 +87,7 @@ class SimpleRepomanTestCase(TestCase): "dev-libs/A-0": { "COPYRIGHT_HEADER" : copyright_header, "DESCRIPTION" : "Desc goes here", - "EAPI" : "5_pre2", + "EAPI" : "5", "HOMEPAGE" : "http://example.com", "IUSE" : "flag", "KEYWORDS": "x86", diff --git a/pym/portage/tests/update/test_update_dbentry.py b/pym/portage/tests/update/test_update_dbentry.py index cb69053f7..ae634f031 100644 --- a/pym/portage/tests/update/test_update_dbentry.py +++ b/pym/portage/tests/update/test_update_dbentry.py @@ -27,16 +27,16 @@ class UpdateDbentryTestCase(TestCase): (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "2", " dev-libs/A[foo] ", " dev-libs/B[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0/1=[foo] ", " dev-libs/B:0/1=[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0/1[foo] ", " dev-libs/B:0/1[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0/0[foo] ", " dev-libs/B:0/0[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0=[foo] ", " dev-libs/B:0=[foo] "), (("slotmove", Atom("dev-libs/A"), "0", "1"), "1", @@ -45,16 +45,16 @@ class UpdateDbentryTestCase(TestCase): (("slotmove", Atom("dev-libs/A"), "0", "1"), "1", " >=dev-libs/A-1:0 ", " >=dev-libs/A-1:1 "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0/1=[foo] ", " dev-libs/A:1/1=[foo] "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0/1[foo] ", " dev-libs/A:1/1[foo] "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0/0[foo] ", " dev-libs/A:1/1[foo] "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0=[foo] ", " dev-libs/A:1=[foo] "), ) for update_cmd, eapi, input_str, output_str in cases: |