diff -u zsh-completion-20080310.old/_gentoo_packages zsh-completion-20080310/_gentoo_packages
--- zsh-completion-20080310.old/_gentoo_packages	2008-03-10 09:25:10.000000000 -0400
+++ zsh-completion-20080310/_gentoo_packages	2012-11-18 15:43:15.099072312 -0500
@@ -9,10 +9,12 @@
 _gentoo_packages_update_useflag(){
     local flags PORTDIR
 	var=PORTDIR
+	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
 	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
 	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
-	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
-	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
 
     flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *}
     ${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} )
@@ -22,6 +24,8 @@
 _gentoo_packages_update_active_useflag(){
   local flags USE
   var=USE
+  [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
   [[ -z ${(P)var} && -r /etc/make.conf ]] &&
     local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
   flags=(${${${=USE}%-*}%\\*})
@@ -30,10 +34,12 @@
 _gentoo_packages_update_category(){
     local var trees category
     for var in PORTDIR PORTDIR_OVERLAY ; do
+	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
 	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
 	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
-	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
-	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
     done
     trees=($PORTDIR $=PORTDIR_OVERLAY)
     category=( $trees/*-*(/:t) )
@@ -67,10 +73,12 @@
     local var trees packages
 
     for var in PORTDIR PORTDIR_OVERLAY ; do
+	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
 	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
 	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
-	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
-	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
     done
     trees=( $PORTDIR $=PORTDIR_OVERLAY)
 
@@ -82,10 +90,12 @@
     local var trees category packages pkg expl
 
     for var in PORTDIR PORTDIR_OVERLAY ; do
+	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
 	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
 	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
-	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
-	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
     done
     trees=( $PORTDIR $=PORTDIR_OVERLAY)
     category=( $trees/*-*(/:t) )
@@ -110,10 +120,12 @@
     local var overlay_ebuilds portage_ebuilds expl trees category
 
     for var in PORTDIR PORTDIR_OVERLAY ; do
+	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
 	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
 	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
-	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
-	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
     done
     trees=($PORTDIR $=PORTDIR_OVERLAY)
     category=( $trees/*-*(/:t) )
@@ -130,10 +142,12 @@
 
 #Function to show tbz2 files available
 _gentoo_packages_update_binary() {
+    [[ -z $PKGDIR && -r /etc/portage/make.conf ]] &&
+	local PKGDIR="`. /etc/portage/make.conf 2>/dev/null; echo $PKGDIR`"
     [[ -z $PKGDIR && -r /etc/make.conf ]] &&
 	local PKGDIR="`. /etc/make.conf 2>/dev/null; echo $PKGDIR`"
-    [[ -z $PKGDIR && -r /etc/make.globals ]] &&
-	local PKGDIR="`. /etc/make.globals 2>/dev/null; echo $PKGDIR`"
+    [[ -z $PKGDIR && -r /usr/share/portage/config/make.globals ]] &&
+	local PKGDIR="`. /usr/share/portage/config/make.globals 2>/dev/null; echo $PKGDIR`"
 
     # this doesn't take care of ${PORTAGE_BINHOST}. If Gentoo official
     # binary mirror will be available we should rewrite it accordingly.
diff -u zsh-completion-20080310.old/_portage_utils zsh-completion-20080310/_portage_utils
--- zsh-completion-20080310.old/_portage_utils	2008-03-10 09:25:10.000000000 -0400
+++ zsh-completion-20080310/_portage_utils	2012-11-18 15:45:05.065735450 -0500
@@ -4,10 +4,12 @@
 #
 local common_args PORTDIR
 var=PORTDIR
+[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
+local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
 [[ -z ${(P)var} && -r /etc/make.conf ]] &&
 local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
-[[ -z ${(P)var} && -r /etc/make.globals ]] &&
-local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
+[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
+local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
 common_args=(
 	{'(--verbose)-v','(-v)--verbose'}'[Make a lot of noise]' \
 	{'(--quiet)-q','(-q)--quiet'}'[Tighter output; suppress warnings]' \