Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 480584
Collapse All | Expand All

(-)gentoo_packages.old (+10 lines)
Lines 15-20 Link Here
15
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
15
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
16
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
16
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
17
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
17
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
18
	[[ -z ${(P)var} ]] &&
19
	    local $var="`portageq envvar PORTDIR`"
18
20
19
    flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *}
21
    flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *}
20
    ${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} )
22
    ${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} )
Lines 40-45 Link Here
40
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
42
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
41
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
43
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
42
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
44
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
45
	[[ -z ${(P)var} ]] &&
46
	    local $var="`portageq envvar PORTDIR`"
43
    done
47
    done
44
    trees=($PORTDIR $=PORTDIR_OVERLAY)
48
    trees=($PORTDIR $=PORTDIR_OVERLAY)
45
    category=( $trees/*-*(/:t) )
49
    category=( $trees/*-*(/:t) )
Lines 79-84 Link Here
79
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
83
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
80
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
84
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
81
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
85
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
86
	[[ -z ${(P)var} ]] &&
87
	    local $var="`portageq envvar PORTDIR`"
82
    done
88
    done
83
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
89
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
84
90
Lines 96-101 Link Here
96
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
102
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
97
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
103
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
98
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
104
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
105
	[[ -z ${(P)var} ]] &&
106
	    local $var="`portageq envvar PORTDIR`"
99
    done
107
    done
100
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
108
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
101
    category=( $trees/*-*(/:t) )
109
    category=( $trees/*-*(/:t) )
Lines 126-131 Link Here
126
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
134
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
127
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
135
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
128
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
136
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
137
	[[ -z ${(P)var} ]] &&
138
	    local $var="`portageq envvar PORTDIR`"
129
    done
139
    done
130
    trees=($PORTDIR $=PORTDIR_OVERLAY)
140
    trees=($PORTDIR $=PORTDIR_OVERLAY)
131
    category=( $trees/*-*(/:t) )
141
    category=( $trees/*-*(/:t) )

Return to bug 480584