Bug #285979 - Replace references to CDEPEND with UNUSED_00, to make it clear

that this key really is unused.

svn path=/main/trunk/; revision=14393

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8d65412f10c266f3037c212094f908ccd466ffe0..deadbf3eb98fc8492b47d33fcc69942fdb5b3913 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -2051,12 +2051,11 @@ ebuild_main() {
                fi
 
                auxdbkeys="DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE
-                       DESCRIPTION KEYWORDS INHERITED IUSE CDEPEND PDEPEND PROVIDE EAPI
+                       DESCRIPTION KEYWORDS INHERITED IUSE UNUSED_00 PDEPEND PROVIDE EAPI
                        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
 

diff --git a/bin/repoman b/bin/repoman
index edec13501a8d7e47aa109252312c1be6d215d8e6..f9a62a1ca3468b4fdceb01dea6e65212ba75671c 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -375,7 +375,6 @@ non_ascii_re = re.compile(r'[^\x00-\x7f]')
 
 missingvars=["KEYWORDS","LICENSE","DESCRIPTION","HOMEPAGE","SLOT"]
 allvars = set(x for x in portage.auxdbkeys if not x.startswith("UNUSED_"))
-allvars.discard("CDEPEND")
 allvars.update(Package.metadata_keys)
 allvars = sorted(allvars)
 commitmessage=None

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index ad15dc646cf3dfd06e062f6d123af9fc5e86201c..5e9a9061db63da1b124eedd9e94cacb4ce464f8c 100644 (file)
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -153,7 +153,6 @@ class Package(Task):
 
 _all_metadata_keys = set(x for x in portage.auxdbkeys \
        if not x.startswith("UNUSED_"))
-_all_metadata_keys.discard("CDEPEND")
 _all_metadata_keys.update(Package.metadata_keys)
 _all_metadata_keys = frozenset(_all_metadata_keys)
 

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 33e1338ffb2cc5ff61c65d0e161202541314727c..8e6811ffddba7593939948422548896633349c3e 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -8403,7 +8403,7 @@ def getmaskingstatus(mycpv, settings=None, portdb=None):
 auxdbkeys=[
   'DEPEND',    'RDEPEND',   'SLOT',      'SRC_URI',
        'RESTRICT',  'HOMEPAGE',  'LICENSE',   'DESCRIPTION',
-       'KEYWORDS',  'INHERITED', 'IUSE',      'CDEPEND',
+       'KEYWORDS',  'INHERITED', 'IUSE', 'UNUSED_00',
        'PDEPEND',   'PROVIDE', 'EAPI',
        'PROPERTIES', 'DEFINED_PHASES', 'UNUSED_05', 'UNUSED_04',
        'UNUSED_03', 'UNUSED_02', 'UNUSED_01',

diff --git a/pym/portage/cache/flat_list.py b/pym/portage/cache/flat_list.py
index c7d618c26b8e7411eff0344f6f1cf5dbca17cc2c..bf465efdb21e929b1636f54636e49c7f5a36e7c4 100644 (file)
--- a/pym/portage/cache/flat_list.py
+++ b/pym/portage/cache/flat_list.py
@@ -19,7 +19,7 @@ class database(fs_template.FsBased):
        # do not screw with this ordering. _eclasses_ needs to be last
        auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',
                'RESTRICT',  'HOMEPAGE',  'LICENSE', 'DESCRIPTION',
-               'KEYWORDS',  'IUSE', 'CDEPEND',
+               'KEYWORDS',  'IUSE', 'UNUSED_00',
                'PDEPEND',   'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES')
 
        def __init__(self, label, auxdbkeys, **config):

diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py
index 3f8ff1149618b69cf6e65fef1d69e5b207ba674b..81b1f17fd42de61e8fd687e4c8b2ac55b12613c0 100644 (file)
--- a/pym/portage/cache/metadata.py
+++ b/pym/portage/cache/metadata.py
@@ -26,7 +26,7 @@ class database(flat_hash.database):
        complete_eclass_entries = False
        auxdbkey_order=('DEPEND', 'RDEPEND', 'SLOT', 'SRC_URI',
                'RESTRICT',  'HOMEPAGE',  'LICENSE', 'DESCRIPTION',
-               'KEYWORDS',  'INHERITED', 'IUSE', 'CDEPEND',
+               'KEYWORDS',  'INHERITED', 'IUSE', 'UNUSED_00',
                'PDEPEND',   'PROVIDE', 'EAPI', 'PROPERTIES', 'DEFINED_PHASES')
 
        autocommits = True