From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 4 Sep 2010 17:29:22 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2faf56cef94ad74a529e146ba41769b4a32df58a;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix

Dropped EPREFIX from vars that are used with target_root accordingly.

Conflicts:
	pym/portage/const.py
---

2faf56cef94ad74a529e146ba41769b4a32df58a
diff --cc pym/portage/const.py
index 9b64d312b,c1ae458be..dcae9b58e
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -1,20 -1,9 +1,20 @@@
  # portage: Constants
- # Copyright 1998-2009 Gentoo Foundation
+ # Copyright 1998-2010 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 +# ===========================================================================
 +# autotool supplied constants.
 +# ===========================================================================
 +from portage.const_autotool import *
 +
  import os
  
 +# save the original prefix
 +BPREFIX = EPREFIX
 +# pick up EPREFIX from the environment if set
 +if "EPREFIX" in os.environ:
 +	EPREFIX = os.path.normpath(os.environ["EPREFIX"])
 +
  # ===========================================================================
  # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
  # ===========================================================================
@@@ -62,12 -48,12 +61,12 @@@ PRIVATE_PATH             = "var/lib/por
  WORLD_FILE               = PRIVATE_PATH + "/world"
  WORLD_SETS_FILE          = PRIVATE_PATH + "/world_sets"
  CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
- NEWS_LIB_PATH            = EPREFIX_LSTRIP + "/" + "var/lib/gentoo"
+ NEWS_LIB_PATH            = "var/lib/gentoo"
  
  # these variables are not used with target_root or config_root
 -DEPCACHE_PATH            = "/var/cache/edb/dep"
 -GLOBAL_CONFIG_PATH       = "/usr/share/portage/config"
 -PORTAGE_BASE_PATH        = os.path.join(os.sep, os.sep.join(__file__.split(os.sep)[:-3]))
 +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"
  PORTAGE_PYM_PATH         = PORTAGE_BASE_PATH + "/pym"
  LOCALE_DATA_PATH         = PORTAGE_BASE_PATH + "/locale"  # FIXME: not used