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

(-)zsh-completion-20080310.old/_gentoo_packages (-12 / +26 lines)
Lines 9-18 Link Here
9
_gentoo_packages_update_useflag(){
9
_gentoo_packages_update_useflag(){
10
    local flags PORTDIR
10
    local flags PORTDIR
11
	var=PORTDIR
11
	var=PORTDIR
12
	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
13
	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
12
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
14
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
13
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
15
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
14
	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
16
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
15
	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
17
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
16
18
17
    flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *}
19
    flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *}
18
    ${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} )
20
    ${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} )
Lines 22-27 Link Here
22
_gentoo_packages_update_active_useflag(){
24
_gentoo_packages_update_active_useflag(){
23
  local flags USE
25
  local flags USE
24
  var=USE
26
  var=USE
27
  [[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
28
    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
25
  [[ -z ${(P)var} && -r /etc/make.conf ]] &&
29
  [[ -z ${(P)var} && -r /etc/make.conf ]] &&
26
    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
30
    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
27
  flags=(${${${=USE}%-*}%\\*})
31
  flags=(${${${=USE}%-*}%\\*})
Lines 30-39 Link Here
30
_gentoo_packages_update_category(){
34
_gentoo_packages_update_category(){
31
    local var trees category
35
    local var trees category
32
    for var in PORTDIR PORTDIR_OVERLAY ; do
36
    for var in PORTDIR PORTDIR_OVERLAY ; do
37
	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
38
	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
33
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
39
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
34
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
40
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
35
	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
41
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
36
	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
42
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
37
    done
43
    done
38
    trees=($PORTDIR $=PORTDIR_OVERLAY)
44
    trees=($PORTDIR $=PORTDIR_OVERLAY)
39
    category=( $trees/*-*(/:t) )
45
    category=( $trees/*-*(/:t) )
Lines 67-76 Link Here
67
    local var trees packages
73
    local var trees packages
68
74
69
    for var in PORTDIR PORTDIR_OVERLAY ; do
75
    for var in PORTDIR PORTDIR_OVERLAY ; do
76
	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
77
	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
70
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
78
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
71
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
79
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
72
	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
80
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
73
	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
81
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
74
    done
82
    done
75
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
83
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
76
84
Lines 82-91 Link Here
82
    local var trees category packages pkg expl
90
    local var trees category packages pkg expl
83
91
84
    for var in PORTDIR PORTDIR_OVERLAY ; do
92
    for var in PORTDIR PORTDIR_OVERLAY ; do
93
	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
94
	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
85
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
95
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
86
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
96
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
87
	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
97
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
88
	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
98
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
89
    done
99
    done
90
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
100
    trees=( $PORTDIR $=PORTDIR_OVERLAY)
91
    category=( $trees/*-*(/:t) )
101
    category=( $trees/*-*(/:t) )
Lines 110-119 Link Here
110
    local var overlay_ebuilds portage_ebuilds expl trees category
120
    local var overlay_ebuilds portage_ebuilds expl trees category
111
121
112
    for var in PORTDIR PORTDIR_OVERLAY ; do
122
    for var in PORTDIR PORTDIR_OVERLAY ; do
123
	[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
124
	    local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
113
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
125
	[[ -z ${(P)var} && -r /etc/make.conf ]] &&
114
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
126
	    local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
115
	[[ -z ${(P)var} && -r /etc/make.globals ]] &&
127
	[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
116
	    local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
128
	    local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
117
    done
129
    done
118
    trees=($PORTDIR $=PORTDIR_OVERLAY)
130
    trees=($PORTDIR $=PORTDIR_OVERLAY)
119
    category=( $trees/*-*(/:t) )
131
    category=( $trees/*-*(/:t) )
Lines 130-139 Link Here
130
142
131
#Function to show tbz2 files available
143
#Function to show tbz2 files available
132
_gentoo_packages_update_binary() {
144
_gentoo_packages_update_binary() {
145
    [[ -z $PKGDIR && -r /etc/portage/make.conf ]] &&
146
	local PKGDIR="`. /etc/portage/make.conf 2>/dev/null; echo $PKGDIR`"
133
    [[ -z $PKGDIR && -r /etc/make.conf ]] &&
147
    [[ -z $PKGDIR && -r /etc/make.conf ]] &&
134
	local PKGDIR="`. /etc/make.conf 2>/dev/null; echo $PKGDIR`"
148
	local PKGDIR="`. /etc/make.conf 2>/dev/null; echo $PKGDIR`"
135
    [[ -z $PKGDIR && -r /etc/make.globals ]] &&
149
    [[ -z $PKGDIR && -r /usr/share/portage/config/make.globals ]] &&
136
	local PKGDIR="`. /etc/make.globals 2>/dev/null; echo $PKGDIR`"
150
	local PKGDIR="`. /usr/share/portage/config/make.globals 2>/dev/null; echo $PKGDIR`"
137
151
138
    # this doesn't take care of ${PORTAGE_BINHOST}. If Gentoo official
152
    # this doesn't take care of ${PORTAGE_BINHOST}. If Gentoo official
139
    # binary mirror will be available we should rewrite it accordingly.
153
    # binary mirror will be available we should rewrite it accordingly.
(-)zsh-completion-20080310.old/_portage_utils (-2 / +4 lines)
Lines 4-13 Link Here
4
#
4
#
5
local common_args PORTDIR
5
local common_args PORTDIR
6
var=PORTDIR
6
var=PORTDIR
7
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
8
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
7
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
9
[[ -z ${(P)var} && -r /etc/make.conf ]] &&
8
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
10
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
9
[[ -z ${(P)var} && -r /etc/make.globals ]] &&
11
[[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
10
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`"
12
local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
11
common_args=(
13
common_args=(
12
	{'(--verbose)-v','(-v)--verbose'}'[Make a lot of noise]' \
14
	{'(--verbose)-v','(-v)--verbose'}'[Make a lot of noise]' \
13
	{'(--quiet)-q','(-q)--quiet'}'[Tighter output; suppress warnings]' \
15
	{'(--quiet)-q','(-q)--quiet'}'[Tighter output; suppress warnings]' \

Return to bug 431958