Enable EAPI 3 and deprecate EAPI 3_pre2.
svn path=/main/trunk/; revision=15221
diff --git a/doc/package/ebuild/eapi/3.docbook b/doc/package/ebuild/eapi/3.docbook
index 4665b09..3e8c85a 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 @@
</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 @@
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 @@
</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 0feabf4..c0b1e2e 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6071,8 +6071,8 @@
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 8b36aac..1459644 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -82,7 +82,7 @@
"package", "preinst", "postinst","prerm", "postrm",
"nofetch", "config", "info", "other"]
-EAPI = 2
+EAPI = 3
HASHING_BLOCKSIZE = 32768
MANIFEST1_HASH_FUNCTIONS = ["MD5", "SHA256", "RMD160"]
