| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-29 18:53:23 +0000 (Fri, 29 Jan 2010) |
| 3 |
New Revision: 15270 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/doc/package/ebuild/eapi/3.docbook |
| 7 |
main/branches/2.1.7/pym/portage/__init__.py |
| 8 |
main/branches/2.1.7/pym/portage/const.py |
| 9 |
Log: |
| 10 |
Enable EAPI 3 and deprecate EAPI 3_pre2. (trunk r15221) |
| 11 |
|
| 12 |
Modified: main/branches/2.1.7/doc/package/ebuild/eapi/3.docbook |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.7/doc/package/ebuild/eapi/3.docbook 2010-01-29 18:53:15 UTC (rev 15269) |
| 15 |
+++ main/branches/2.1.7/doc/package/ebuild/eapi/3.docbook 2010-01-29 18:53:23 UTC (rev 15270) |
| 16 |
@@ -1,10 +1,10 @@ |
| 17 |
-<section id='package-ebuild-eapi-3_pre2'> |
| 18 |
-<title>EAPI 3_pre2</title> |
| 19 |
-<section id='package-ebuild-eapi-3_pre2-helpers'> |
| 20 |
+<section id='package-ebuild-eapi-3'> |
| 21 |
+<title>EAPI 3</title> |
| 22 |
+<section id='package-ebuild-eapi-3-helpers'> |
| 23 |
<title>Helpers</title> |
| 24 |
-<section id='package-ebuild-eapi-3_pre2-helpers-unpack'> |
| 25 |
+<section id='package-ebuild-eapi-3-helpers-unpack'> |
| 26 |
<title>unpack</title> |
| 27 |
-<section id='package-ebuild-eapi-3_pre2-helpers-unpack-xz'> |
| 28 |
+<section id='package-ebuild-eapi-3-helpers-unpack-xz'> |
| 29 |
<title>Support for the xz file extension</title> |
| 30 |
<para> |
| 31 |
The unpack helper now supports the xz file extension. |
| 32 |
@@ -12,15 +12,15 @@ |
| 33 |
</section> |
| 34 |
</section> |
| 35 |
</section> |
| 36 |
-<section id='package-ebuild-eapi-3_pre2-prefix'> |
| 37 |
+<section id='package-ebuild-eapi-3-prefix'> |
| 38 |
<title>Support for installation prefix</title> |
| 39 |
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers'> |
| 40 |
+<section id='package-ebuild-eapi-3-prefix-helpers'> |
| 41 |
<title>Helpers</title> |
| 42 |
<para> |
| 43 |
Beginning with EAPI 3, all helpers use ${ED} instead of ${D} |
| 44 |
when appropriate. For example, see econf and einstall below. |
| 45 |
</para> |
| 46 |
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers-econf'> |
| 47 |
+<section id='package-ebuild-eapi-3-prefix-helpers-econf'> |
| 48 |
<title>econf</title> |
| 49 |
<programlisting> |
| 50 |
${ECONF_SOURCE:-.}/configure \ |
| 51 |
@@ -37,7 +37,7 @@ |
| 52 |
configure options || die "econf failed" |
| 53 |
</programlisting> |
| 54 |
</section> |
| 55 |
-<section id='package-ebuild-eapi-3_pre2-prefix-helpers-einstall'> |
| 56 |
+<section id='package-ebuild-eapi-3-prefix-helpers-einstall'> |
| 57 |
<title>einstall</title> |
| 58 |
<para> |
| 59 |
Note that, for make-based packages, 'emake install DESTDIR=${D}' (with |
| 60 |
@@ -57,7 +57,7 @@ |
| 61 |
</programlisting> |
| 62 |
</section> |
| 63 |
</section> |
| 64 |
-<section id='package-ebuild-eapi-3_pre2-prefix-variables'> |
| 65 |
+<section id='package-ebuild-eapi-3-prefix-variables'> |
| 66 |
<title>Variables</title> |
| 67 |
<table><title>Installation Prefix Variables</title> |
| 68 |
<tgroup cols='2' align='left' > |
| 69 |
|
| 70 |
Modified: main/branches/2.1.7/pym/portage/__init__.py |
| 71 |
=================================================================== |
| 72 |
--- main/branches/2.1.7/pym/portage/__init__.py 2010-01-29 18:53:15 UTC (rev 15269) |
| 73 |
+++ main/branches/2.1.7/pym/portage/__init__.py 2010-01-29 18:53:23 UTC (rev 15270) |
| 74 |
@@ -6071,8 +6071,8 @@ |
| 75 |
|
| 76 |
return rval |
| 77 |
|
| 78 |
-_testing_eapis = frozenset(["3_pre2"]) |
| 79 |
-_deprecated_eapis = frozenset(["3_pre1", "2_pre3", "2_pre2", "2_pre1"]) |
| 80 |
+_testing_eapis = frozenset() |
| 81 |
+_deprecated_eapis = frozenset(["3_pre2", "3_pre1", "2_pre3", "2_pre2", "2_pre1"]) |
| 82 |
|
| 83 |
def _eapi_is_deprecated(eapi): |
| 84 |
return eapi in _deprecated_eapis |
| 85 |
|
| 86 |
Modified: main/branches/2.1.7/pym/portage/const.py |
| 87 |
=================================================================== |
| 88 |
--- main/branches/2.1.7/pym/portage/const.py 2010-01-29 18:53:15 UTC (rev 15269) |
| 89 |
+++ main/branches/2.1.7/pym/portage/const.py 2010-01-29 18:53:23 UTC (rev 15270) |
| 90 |
@@ -81,7 +81,7 @@ |
| 91 |
"package", "preinst", "postinst","prerm", "postrm", |
| 92 |
"nofetch", "config", "info", "other"] |
| 93 |
|
| 94 |
-EAPI = 2 |
| 95 |
+EAPI = 3 |
| 96 |
|
| 97 |
HASHING_BLOCKSIZE = 32768 |
| 98 |
MANIFEST1_HASH_FUNCTIONS = ["MD5", "SHA256", "RMD160"] |
Archives