From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 23 Sep 2009 06:44:54 +0000 (-0000)
Subject: Bug #285979 - Replace references to CDEPEND with UNUSED_00, to make it clear
X-Git-Tag: v2.2_rc42~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d62e6fcf8f8c420c00864e97f9bfd73dda7ee3e7;p=portage.git

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 8d65412f1..deadbf3eb 100755
--- 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 edec13501..f9a62a1ca 100755
--- 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 ad15dc646..5e9a9061d 100644
--- 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 33e1338ff..8e6811ffd 100644
--- 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 c7d618c26..bf465efdb 100644
--- 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 3f8ff1149..81b1f17fd 100644
--- 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