diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:53:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:53:23 +0000 |
| commit | 2b7247098217acc9e80b617ae5f43987d419337f (patch) | |
| tree | f4c913d1efa463921c9c1762fc14921ea917c90b | |
| parent | 95ef30c8662aac7a5909da89c240cc7740606c41 (diff) | |
| download | portage-2b7247098217acc9e80b617ae5f43987d419337f.tar.gz portage-2b7247098217acc9e80b617ae5f43987d419337f.tar.bz2 portage-2b7247098217acc9e80b617ae5f43987d419337f.zip | |
Enable EAPI 3 and deprecate EAPI 3_pre2. (trunk r15221)
svn path=/main/branches/2.1.7/; revision=15270
| -rw-r--r-- | doc/package/ebuild/eapi/3.docbook | 20 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/const.py | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/doc/package/ebuild/eapi/3.docbook b/doc/package/ebuild/eapi/3.docbook index 4665b0955..3e8c85ae5 100644 --- a/doc/package/ebuild/eapi/3.docbook +++ b/doc/package/ebuild/eapi/3.docbook @@ -1,10 +1,10 @@ -<section id='package-ebuild-eapi-3_pre2'> -<title>EAPI 3_pre2</title> -<section id='package-ebuild-eapi-3_pre2-helpers'> +<section id='package-ebuild-eapi-3'> +<title>EAPI 3</title> +<section id='package-ebuild-eapi-3-helpers'> <title>Helpers</title> -<section id='package-ebuild-eapi-3_pre2-helpers-unpack'> +<section id='package-ebuild-eapi-3-helpers-unpack'> <title>unpack</title> -<section id='package-ebuild-eapi-3_pre2-helpers-unpack-xz'> +<section id='package-ebuild-eapi-3-helpers-unpack-xz'> <title>Support for the xz file extension</title> <para> The unpack helper now supports the xz file extension. @@ -12,15 +12,15 @@ The unpack helper now supports the xz file extension. </section> </section> </section> -<section id='package-ebuild-eapi-3_pre2-prefix'> +<section id='package-ebuild-eapi-3-prefix'> <title>Support for installation prefix</title> -<section id='package-ebuild-eapi-3_pre2-prefix-helpers'> +<section id='package-ebuild-eapi-3-prefix-helpers'> <title>Helpers</title> <para> Beginning with EAPI 3, all helpers use ${ED} instead of ${D} when appropriate. For example, see econf and einstall below. </para> -<section id='package-ebuild-eapi-3_pre2-prefix-helpers-econf'> +<section id='package-ebuild-eapi-3-prefix-helpers-econf'> <title>econf</title> <programlisting> ${ECONF_SOURCE:-.}/configure \ @@ -37,7 +37,7 @@ ${ECONF_SOURCE:-.}/configure \ configure options || die "econf failed" </programlisting> </section> -<section id='package-ebuild-eapi-3_pre2-prefix-helpers-einstall'> +<section id='package-ebuild-eapi-3-prefix-helpers-einstall'> <title>einstall</title> <para> Note that, for make-based packages, 'emake install DESTDIR=${D}' (with @@ -57,7 +57,7 @@ make \ </programlisting> </section> </section> -<section id='package-ebuild-eapi-3_pre2-prefix-variables'> +<section id='package-ebuild-eapi-3-prefix-variables'> <title>Variables</title> <table><title>Installation Prefix Variables</title> <tgroup cols='2' align='left' > diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 4e810d90f..381413bec 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6071,8 +6071,8 @@ def _spawn_misc_sh(mysettings, commands, phase=None, **kwargs): return rval -_testing_eapis = frozenset(["3_pre2"]) -_deprecated_eapis = frozenset(["3_pre1", "2_pre3", "2_pre2", "2_pre1"]) +_testing_eapis = frozenset() +_deprecated_eapis = frozenset(["3_pre2", "3_pre1", "2_pre3", "2_pre2", "2_pre1"]) def _eapi_is_deprecated(eapi): return eapi in _deprecated_eapis diff --git a/pym/portage/const.py b/pym/portage/const.py index 890abe83b..f35ef8f3a 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -81,7 +81,7 @@ EBUILD_PHASES = ["setup", "unpack", "prepare", "configure", "package", "preinst", "postinst","prerm", "postrm", "nofetch", "config", "info", "other"] -EAPI = 2 +EAPI = 3 HASHING_BLOCKSIZE = 32768 MANIFEST1_HASH_FUNCTIONS = ["MD5", "SHA256", "RMD160"] |