From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 5 Sep 2010 11:38:02 +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=c40b0ab0d7913fe11603f1934ad68845d7c2dcf4;p=portage.git

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

Conflicts:
	bin/ebuild-helpers/prepinfo
	pym/portage/const.py
---

c40b0ab0d7913fe11603f1934ad68845d7c2dcf4
diff --cc bin/ebuild-helpers/prepinfo
index 2200b89b2,cbbba3ed0..1349e459e
--- a/bin/ebuild-helpers/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
@@@ -23,7 -23,10 +23,10 @@@ if [[ ! -d ${ED}${infodir} ]] ; the
  	fi
  fi
  
 -find "${D}${infodir}" -type d -print0 | while read -d $'\0' x ; do
 +find "${ED}${infodir}" -type d -print0 | while read -d $'\0' x ; do
+ 	for f in "${x}"/.keepinfodir*; do
+ 		[[ -e ${f} ]] && continue 2
+ 	done
  	rm -f "${x}"/dir{,.info}{,.gz,.bz2}
  done
  
diff --cc pym/portage/const.py
index a74e8bbaf,e56ebecbc..5d35b7b11
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -63,10 -50,13 +63,13 @@@ WORLD_SETS_FILE          = PRIVATE_PAT
  CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
  NEWS_LIB_PATH            = "var/lib/gentoo"
  
- # these variables are not used with target_root or config_root
+ # these variables get EPREFIX prepended automagically when they are
+ # translated into their lowercase variants
  DEPCACHE_PATH            = "/var/cache/edb/dep"
  GLOBAL_CONFIG_PATH       = "/usr/share/portage/config"
+ 
+ # these variables are not used with target_root or config_root
 -PORTAGE_BASE_PATH        = os.path.join(os.sep, os.sep.join(__file__.split(os.sep)[:-3]))
 +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