Merged from trunk -r14198:14199

   | 14199   | DEPCACHE_PATH is not used with ROOT at all, so move it out   |
   | grobian | of the target_root variable group                            |

svn path=/main/branches/prefix/; revision=14200

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 81fd1c8738250935ef0fe3b8986ec35de4bcd26a..2fada41246ffc8c57a50d7c821220c102aaf1c71 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -58,7 +58,6 @@ DEPRECATED_PROFILE_FILE  = PROFILE_PATH + "/deprecated"
 # have a leading '/' since they are used directly with os.path.join)
 VDB_PATH                 = EPREFIX_LSTRIP + "/" + "var/db/pkg"
 CACHE_PATH               = EPREFIX_LSTRIP + "/" + "var/cache/edb"
-DEPCACHE_PATH            = CACHE_PATH + "/dep"  # FIXME: does not seem to use ROOT when used
 PRIVATE_PATH             = EPREFIX_LSTRIP + "/" + "var/lib/portage"
 WORLD_FILE               = PRIVATE_PATH + "/world"
 WORLD_SETS_FILE          = PRIVATE_PATH + "/world_sets"
@@ -66,6 +65,7 @@ CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
 NEWS_LIB_PATH            = EPREFIX_LSTRIP + "/" + "var/lib/gentoo"
 
 # these variables are not used with target_root or config_root
+DEPCACHE_PATH            = EPREFIX + "/var/cache/edb/dep"
 GLOBAL_CONFIG_PATH       = DATADIR + "/portage/config"
 PORTAGE_BASE_PATH        = PORTAGE_BASE
 PORTAGE_BIN_PATH         = PORTAGE_BASE_PATH + "/bin"