Add support for the new DEFINED_PHASES metadata key which is automatically generated

from the set of phase functions that are defined by the ebuild and any eclasses it
may have inherited. (trunk r12272:12274)

svn path=/main/branches/2.1.6/; revision=12307

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 7b4fa68689fb1f3a9cd1586ef9b972304cfee4fc..842e2ffabda87f24972e2f39cf56047053a3f15f 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -2053,12 +2053,38 @@ ebuild_main() {
 
                auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE
                        DESCRIPTION KEYWORDS INHERITED IUSE CDEPEND PDEPEND PROVIDE EAPI
-                       PROPERTIES UNUSED_06 UNUSED_05 UNUSED_04
+                       PROPERTIES DEFINED_PHASES UNUSED_05 UNUSED_04
                        UNUSED_03 UNUSED_02 UNUSED_01"
 
                #the extra $(echo) commands remove newlines
                unset CDEPEND
                [ -n "${EAPI}" ] || EAPI=0
+               local eapi=$EAPI
+
+               # alphabetically ordered by $EBUILD_PHASE value
+               local valid_phases
+               case $eapi in
+                       0|1)
+                               valid_phases="src_compile pkg_config pkg_info src_install
+                                       pkg_nofetch pkg_postinst pkg_postrm pkg_preinst pkg_prerm
+                                       pkg_setup src_test src_unpack"
+                               ;;
+                       *)
+                               valid_phases="src_compile pkg_config src_configure pkg_info
+                                       src_install pkg_nofetch pkg_postinst pkg_postrm pkg_preinst
+                                       src_prepare pkg_prerm pkg_setup src_test src_unpack"
+                               ;;
+               esac
+
+               DEFINED_PHASES=
+               for f in $valid_phases ; do
+                       if [[ $(type -t $f) = function ]] ; then
+                               f=${f#pkg_}
+                               DEFINED_PHASES+=" ${f#src_}"
+                       fi
+               done
+               [[ -n $DEFINED_PHASES ]] || DEFINED_PHASES=-
+
                if [ -n "${dbkey}" ] ; then
                        > "${dbkey}"
                        for f in ${auxdbkeys} ; do

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 032c2c64d0ef08e6f7a9ae6e3a66f3f120c0fc1b..75a71a752f5bb643acc98d67897ac249a264818b 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7101,7 +7101,7 @@ auxdbkeys=[
        'RESTRICT',  'HOMEPAGE',  'LICENSE',   'DESCRIPTION',
        'KEYWORDS',  'INHERITED', 'IUSE',      'CDEPEND',
        'PDEPEND',   'PROVIDE', 'EAPI',
-       'PROPERTIES', 'UNUSED_06', 'UNUSED_05', 'UNUSED_04',
+       'PROPERTIES', 'DEFINED_PHASES', 'UNUSED_05', 'UNUSED_04',
        'UNUSED_03', 'UNUSED_02', 'UNUSED_01',
        ]
 auxdbkeylen=len(auxdbkeys)

diff --git a/pym/portage/cache/flat_list.py b/pym/portage/cache/flat_list.py
index 65983393f5e91fa974158fdcb1443b93980f1c01..413d4d33d164ad4193f50214be871173af470e5f 100644 (file)
--- a/pym/portage/cache/flat_list.py
+++ b/pym/portage/cache/flat_list.py
@@ -11,7 +11,7 @@ class database(fs_template.FsBased):
        auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',
                'RESTRICT',  'HOMEPAGE',  'LICENSE', 'DESCRIPTION',
                'KEYWORDS',  'IUSE', 'CDEPEND',
-               'PDEPEND',   'PROVIDE', 'EAPI', 'PROPERTIES')
+               'PDEPEND',   'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES')
 
        def __init__(self, label, auxdbkeys, **config):
                super(database,self).__init__(label, auxdbkeys, **config)

diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py
index 164761adbd90f09494a088917e357bed1bb0a384..86717e6c528dc576da88d1b4cf2498ccc5d3495a 100644 (file)
--- a/pym/portage/cache/metadata.py
+++ b/pym/portage/cache/metadata.py
@@ -18,7 +18,7 @@ class database(flat_hash.database):
        auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',
                'RESTRICT',  'HOMEPAGE',  'LICENSE', 'DESCRIPTION',
                'KEYWORDS',  'INHERITED', 'IUSE', 'CDEPEND',
-               'PDEPEND',   'PROVIDE', 'EAPI', 'PROPERTIES')
+               'PDEPEND',   'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES')
 
        autocommits = True