[gentoo-commits] portage r13396 - in main/branches/prefix/bin: . ebuild-helpers ebuild-helpers/3 - gentoo-commits

From:	"Fabian Groffen (grobian)" <grobian@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] portage r13396 - in main/branches/prefix/bin: . ebuild-helpers ebuild-helpers/3
Date:	Sat, 25 Apr 2009 09:07:26
Message-Id:	`E1Lxdr1-00011J-51@stork.gentoo.org`

1

Author: grobian

2

Date: 2009-04-25 09:07:18 +0000 (Sat, 25 Apr 2009)

3

New Revision: 13396

4

5

Modified:

6

   main/branches/prefix/bin/banned-helper

7

   main/branches/prefix/bin/ebuild-helpers/3/dodoc

8

   main/branches/prefix/bin/ebuild-helpers/die

9

   main/branches/prefix/bin/ebuild-helpers/dobin

10

   main/branches/prefix/bin/ebuild-helpers/dodoc

11

   main/branches/prefix/bin/ebuild-helpers/doexe

12

   main/branches/prefix/bin/ebuild-helpers/doins

13

   main/branches/prefix/bin/ebuild-helpers/doman

14

   main/branches/prefix/bin/ebuild-helpers/ecompress

15

   main/branches/prefix/bin/ebuild-helpers/ecompressdir

16

   main/branches/prefix/bin/ebuild-helpers/elog

17

   main/branches/prefix/bin/ebuild.sh

18

Log:

19

- consistently use @PORTAGE_BASE@ instead of path

20

- fix for Prefix by not calling /bin/bash

21

- fix for Prefix by not defaulting to non-Prefixed paths

22

- fix second export PATH for Prefix, make note on difference with trunk

Modified: main/branches/prefix/bin/banned-helper

27

===================================================================

28

--- main/branches/prefix/bin/banned-helper	2009-04-25 08:40:48 UTC (rev 13395)

29

+++ main/branches/prefix/bin/banned-helper	2009-04-25 09:07:18 UTC (rev 13396)

30

@@ -1,4 +1,4 @@

31

-#!/bin/bash

32

+#!@PORTAGE_BASH@

33

 # Copyright 2009 Gentoo Foundation

34

 # Distributed under the terms of the GNU General Public License v2

35

 # $Id$

36

37

Modified: main/branches/prefix/bin/ebuild-helpers/3/dodoc

38

===================================================================

39

--- main/branches/prefix/bin/ebuild-helpers/3/dodoc	2009-04-25 08:40:48 UTC (rev 13395)

40

+++ main/branches/prefix/bin/ebuild-helpers/3/dodoc	2009-04-25 09:07:18 UTC (rev 13396)

41

@@ -1,16 +1,16 @@

42

-#!/bin/bash

43

+#!@PORTAGE_BASH@

44

 # Copyright 1999-2009 Gentoo Foundation

45

 # Distributed under the terms of the GNU General Public License v2

46

 # $Id$

47

48

-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

49

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

50

51

 if [ $# -lt 1 ] ; then

52

 	vecho "${0##*/}: at least one argument needed" 1>&2

53

 	exit 1

54

fi

55

56

-dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"

57

+dir="${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"

58

 if [ ! -d "${dir}" ] ; then

59

 	install -d "${dir}"

60

fi

61

62

Modified: main/branches/prefix/bin/ebuild-helpers/die

63

===================================================================

64

--- main/branches/prefix/bin/ebuild-helpers/die	2009-04-25 08:40:48 UTC (rev 13395)

65

+++ main/branches/prefix/bin/ebuild-helpers/die	2009-04-25 09:07:18 UTC (rev 13396)

66

@@ -1,4 +1,4 @@

67

-#!/bin/bash

68

+#!@PORTAGE_BASH@

69

 # Copyright 2009 Gentoo Foundation

70

 # Distributed under the terms of the GNU General Public License v2

71

 # $Id$

72

@@ -7,6 +7,6 @@

73

 # IPC to guarantee that the ebuild process and all of its children (including

74

 # this helper) are killed immediately, ensuring that "false success" is

75

 # impossible.

76

-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

77

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

78

 die "$@"

79

 exit 1

80

81

Modified: main/branches/prefix/bin/ebuild-helpers/dobin

82

===================================================================

83

--- main/branches/prefix/bin/ebuild-helpers/dobin	2009-04-25 08:40:48 UTC (rev 13395)

84

+++ main/branches/prefix/bin/ebuild-helpers/dobin	2009-04-25 09:07:18 UTC (rev 13396)

85

@@ -3,7 +3,7 @@

86

 # Distributed under the terms of the GNU General Public License v2

87

 # $Id$

88

89

-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

90

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

91

92

 if [[ $# -lt 1 ]] ; then

93

 	vecho "$0: at least one argument needed" 1>&2

94

95

Modified: main/branches/prefix/bin/ebuild-helpers/dodoc

96

===================================================================

97

--- main/branches/prefix/bin/ebuild-helpers/dodoc	2009-04-25 08:40:48 UTC (rev 13395)

98

+++ main/branches/prefix/bin/ebuild-helpers/dodoc	2009-04-25 09:07:18 UTC (rev 13396)

99

@@ -4,7 +4,7 @@

100

 # $Id$

101

102

 if [ $# -lt 1 ] ; then

103

-	source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

104

+	source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

105

 	vecho "${0##*/}: at least one argument needed" 1>&2

106

 	exit 1 	

107

fi

108

109

Modified: main/branches/prefix/bin/ebuild-helpers/doexe

110

===================================================================

111

--- main/branches/prefix/bin/ebuild-helpers/doexe	2009-04-25 08:40:48 UTC (rev 13395)

112

+++ main/branches/prefix/bin/ebuild-helpers/doexe	2009-04-25 09:07:18 UTC (rev 13396)

113

@@ -3,7 +3,7 @@

114

 # Distributed under the terms of the GNU General Public License v2

115

 # $Id$

116

117

-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

118

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

119

120

 if [[ $# -lt 1 ]] ; then

121

 	echo "$0: at least one argument needed" 1>&2

122

123

Modified: main/branches/prefix/bin/ebuild-helpers/doins

124

===================================================================

125

--- main/branches/prefix/bin/ebuild-helpers/doins	2009-04-25 08:40:48 UTC (rev 13395)

126

+++ main/branches/prefix/bin/ebuild-helpers/doins	2009-04-25 09:07:18 UTC (rev 13396)

127

@@ -3,7 +3,7 @@

128

 # Distributed under the terms of the GNU General Public License v2

129

 # $Id$

130

131

-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

132

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

133

134

 if [ $# -lt 1 ] ; then

135

 	echo "${0##*/}: at least one argument needed" 1>&2

136

137

Modified: main/branches/prefix/bin/ebuild-helpers/doman

138

===================================================================

139

--- main/branches/prefix/bin/ebuild-helpers/doman	2009-04-25 08:40:48 UTC (rev 13395)

140

+++ main/branches/prefix/bin/ebuild-helpers/doman	2009-04-25 09:07:18 UTC (rev 13396)

141

@@ -3,7 +3,7 @@

142

 # Distributed under the terms of the GNU General Public License v2

143

 # $Id$

144

145

-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

146

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

147

148

 if [[ $# -lt 1 ]] ; then

149

 	echo "$0: at least one argument needed" 1>&2

150

151

Modified: main/branches/prefix/bin/ebuild-helpers/ecompress

152

===================================================================

153

--- main/branches/prefix/bin/ebuild-helpers/ecompress	2009-04-25 08:40:48 UTC (rev 13395)

154

+++ main/branches/prefix/bin/ebuild-helpers/ecompress	2009-04-25 09:07:18 UTC (rev 13396)

155

@@ -3,7 +3,7 @@

156

 # Distributed under the terms of the GNU General Public License v2

157

 # $Id$

158

159

-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

160

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

161

162

 if [[ -z $1 ]] ; then

163

 	vecho "${0##*/}: at least one argument needed" 1>&2

164

165

Modified: main/branches/prefix/bin/ebuild-helpers/ecompressdir

166

===================================================================

167

--- main/branches/prefix/bin/ebuild-helpers/ecompressdir	2009-04-25 08:40:48 UTC (rev 13395)

168

+++ main/branches/prefix/bin/ebuild-helpers/ecompressdir	2009-04-25 09:07:18 UTC (rev 13396)

169

@@ -3,7 +3,7 @@

170

 # Distributed under the terms of the GNU General Public License v2

171

 # $Id$

172

173

-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

174

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

175

176

 if [[ -z $1 ]] ; then

177

 	vecho "${0##*/}: at least one argument needed" 1>&2

178

179

Modified: main/branches/prefix/bin/ebuild-helpers/elog

180

===================================================================

181

--- main/branches/prefix/bin/ebuild-helpers/elog	2009-04-25 08:40:48 UTC (rev 13395)

182

+++ main/branches/prefix/bin/ebuild-helpers/elog	2009-04-25 09:07:18 UTC (rev 13396)

183

@@ -3,6 +3,6 @@

184

 # Distributed under the terms of the GNU General Public License v2

185

 # $Id$

186

187

-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

188

+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh

189

190

 ${0##*/} "$@"

191

192

Modified: main/branches/prefix/bin/ebuild.sh

193

===================================================================

194

--- main/branches/prefix/bin/ebuild.sh	2009-04-25 08:40:48 UTC (rev 13395)

195

+++ main/branches/prefix/bin/ebuild.sh	2009-04-25 09:07:18 UTC (rev 13396)

196

@@ -71,6 +71,8 @@

197

 # Unset some variables that break things.

198

 unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE

199

200

+#export PATH="/usr/local/sbin:/sbin:/usr/sbin:$PORTAGE_BIN_PATH/ebuild-helpers:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"

201

+# PREFIX: we deviate in path order, should we split up DEFAULT_PATH?

202

 export PATH="${DEFAULT_PATH}:$PORTAGE_BIN_PATH/ebuild-helpers:${ROOTPATH}"

203

 [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"

204

205

@@ -1923,7 +1925,9 @@

206

;;

207

 	esac

208

209

-	export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"

210

+	#export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"

211

+	# PREFIX: same deviation as at the top of this file

212

+	export PATH="${DEFAULT_PATH}:${ebuild_helpers_path}:${ROOTPATH}"

213

 	[[ -n $PREROOTPATH ]] && export PATH="${PREROOTPATH%%:}:$PATH"

214

 	unset ebuild_helpers_path

1	Author: grobian
2	Date: 2009-04-25 09:07:18 +0000 (Sat, 25 Apr 2009)
3	New Revision: 13396
4
5	Modified:
6	main/branches/prefix/bin/banned-helper
7	main/branches/prefix/bin/ebuild-helpers/3/dodoc
8	main/branches/prefix/bin/ebuild-helpers/die
9	main/branches/prefix/bin/ebuild-helpers/dobin
10	main/branches/prefix/bin/ebuild-helpers/dodoc
11	main/branches/prefix/bin/ebuild-helpers/doexe
12	main/branches/prefix/bin/ebuild-helpers/doins
13	main/branches/prefix/bin/ebuild-helpers/doman
14	main/branches/prefix/bin/ebuild-helpers/ecompress
15	main/branches/prefix/bin/ebuild-helpers/ecompressdir
16	main/branches/prefix/bin/ebuild-helpers/elog
17	main/branches/prefix/bin/ebuild.sh
18	Log:
19	- consistently use @PORTAGE_BASE@ instead of path
20	- fix for Prefix by not calling /bin/bash
21	- fix for Prefix by not defaulting to non-Prefixed paths
22	- fix second export PATH for Prefix, make note on difference with trunk
23
24
25
26	Modified: main/branches/prefix/bin/banned-helper
27	===================================================================
28	--- main/branches/prefix/bin/banned-helper 2009-04-25 08:40:48 UTC (rev 13395)
29	+++ main/branches/prefix/bin/banned-helper 2009-04-25 09:07:18 UTC (rev 13396)
30	@@ -1,4 +1,4 @@
31	-#!/bin/bash
32	+#!@PORTAGE_BASH@
33	# Copyright 2009 Gentoo Foundation
34	# Distributed under the terms of the GNU General Public License v2
35	# $Id$
36
37	Modified: main/branches/prefix/bin/ebuild-helpers/3/dodoc
38	===================================================================
39	--- main/branches/prefix/bin/ebuild-helpers/3/dodoc 2009-04-25 08:40:48 UTC (rev 13395)
40	+++ main/branches/prefix/bin/ebuild-helpers/3/dodoc 2009-04-25 09:07:18 UTC (rev 13396)
41	@@ -1,16 +1,16 @@
42	-#!/bin/bash
43	+#!@PORTAGE_BASH@
44	# Copyright 1999-2009 Gentoo Foundation
45	# Distributed under the terms of the GNU General Public License v2
46	# $Id$
47
48	-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
49	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
50
51	if [ $# -lt 1 ] ; then
52	vecho "${0##*/}: at least one argument needed" 1>&2
53	exit 1
54	fi
55
56	-dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
57	+dir="${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
58	if [ ! -d "${dir}" ] ; then
59	install -d "${dir}"
60	fi
61
62	Modified: main/branches/prefix/bin/ebuild-helpers/die
63	===================================================================
64	--- main/branches/prefix/bin/ebuild-helpers/die 2009-04-25 08:40:48 UTC (rev 13395)
65	+++ main/branches/prefix/bin/ebuild-helpers/die 2009-04-25 09:07:18 UTC (rev 13396)
66	@@ -1,4 +1,4 @@
67	-#!/bin/bash
68	+#!@PORTAGE_BASH@
69	# Copyright 2009 Gentoo Foundation
70	# Distributed under the terms of the GNU General Public License v2
71	# $Id$
72	@@ -7,6 +7,6 @@
73	# IPC to guarantee that the ebuild process and all of its children (including
74	# this helper) are killed immediately, ensuring that "false success" is
75	# impossible.
76	-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
77	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
78	die "$@"
79	exit 1
80
81	Modified: main/branches/prefix/bin/ebuild-helpers/dobin
82	===================================================================
83	--- main/branches/prefix/bin/ebuild-helpers/dobin 2009-04-25 08:40:48 UTC (rev 13395)
84	+++ main/branches/prefix/bin/ebuild-helpers/dobin 2009-04-25 09:07:18 UTC (rev 13396)
85	@@ -3,7 +3,7 @@
86	# Distributed under the terms of the GNU General Public License v2
87	# $Id$
88
89	-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
90	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
91
92	if [[ $# -lt 1 ]] ; then
93	vecho "$0: at least one argument needed" 1>&2
94
95	Modified: main/branches/prefix/bin/ebuild-helpers/dodoc
96	===================================================================
97	--- main/branches/prefix/bin/ebuild-helpers/dodoc 2009-04-25 08:40:48 UTC (rev 13395)
98	+++ main/branches/prefix/bin/ebuild-helpers/dodoc 2009-04-25 09:07:18 UTC (rev 13396)
99	@@ -4,7 +4,7 @@
100	# $Id$
101
102	if [ $# -lt 1 ] ; then
103	- source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
104	+ source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
105	vecho "${0##*/}: at least one argument needed" 1>&2
106	exit 1
107	fi
108
109	Modified: main/branches/prefix/bin/ebuild-helpers/doexe
110	===================================================================
111	--- main/branches/prefix/bin/ebuild-helpers/doexe 2009-04-25 08:40:48 UTC (rev 13395)
112	+++ main/branches/prefix/bin/ebuild-helpers/doexe 2009-04-25 09:07:18 UTC (rev 13396)
113	@@ -3,7 +3,7 @@
114	# Distributed under the terms of the GNU General Public License v2
115	# $Id$
116
117	-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
118	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
119
120	if [[ $# -lt 1 ]] ; then
121	echo "$0: at least one argument needed" 1>&2
122
123	Modified: main/branches/prefix/bin/ebuild-helpers/doins
124	===================================================================
125	--- main/branches/prefix/bin/ebuild-helpers/doins 2009-04-25 08:40:48 UTC (rev 13395)
126	+++ main/branches/prefix/bin/ebuild-helpers/doins 2009-04-25 09:07:18 UTC (rev 13396)
127	@@ -3,7 +3,7 @@
128	# Distributed under the terms of the GNU General Public License v2
129	# $Id$
130
131	-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
132	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
133
134	if [ $# -lt 1 ] ; then
135	echo "${0##*/}: at least one argument needed" 1>&2
136
137	Modified: main/branches/prefix/bin/ebuild-helpers/doman
138	===================================================================
139	--- main/branches/prefix/bin/ebuild-helpers/doman 2009-04-25 08:40:48 UTC (rev 13395)
140	+++ main/branches/prefix/bin/ebuild-helpers/doman 2009-04-25 09:07:18 UTC (rev 13396)
141	@@ -3,7 +3,7 @@
142	# Distributed under the terms of the GNU General Public License v2
143	# $Id$
144
145	-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
146	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
147
148	if [[ $# -lt 1 ]] ; then
149	echo "$0: at least one argument needed" 1>&2
150
151	Modified: main/branches/prefix/bin/ebuild-helpers/ecompress
152	===================================================================
153	--- main/branches/prefix/bin/ebuild-helpers/ecompress 2009-04-25 08:40:48 UTC (rev 13395)
154	+++ main/branches/prefix/bin/ebuild-helpers/ecompress 2009-04-25 09:07:18 UTC (rev 13396)
155	@@ -3,7 +3,7 @@
156	# Distributed under the terms of the GNU General Public License v2
157	# $Id$
158
159	-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
160	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
161
162	if [[ -z $1 ]] ; then
163	vecho "${0##*/}: at least one argument needed" 1>&2
164
165	Modified: main/branches/prefix/bin/ebuild-helpers/ecompressdir
166	===================================================================
167	--- main/branches/prefix/bin/ebuild-helpers/ecompressdir 2009-04-25 08:40:48 UTC (rev 13395)
168	+++ main/branches/prefix/bin/ebuild-helpers/ecompressdir 2009-04-25 09:07:18 UTC (rev 13396)
169	@@ -3,7 +3,7 @@
170	# Distributed under the terms of the GNU General Public License v2
171	# $Id$
172
173	-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
174	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
175
176	if [[ -z $1 ]] ; then
177	vecho "${0##*/}: at least one argument needed" 1>&2
178
179	Modified: main/branches/prefix/bin/ebuild-helpers/elog
180	===================================================================
181	--- main/branches/prefix/bin/ebuild-helpers/elog 2009-04-25 08:40:48 UTC (rev 13395)
182	+++ main/branches/prefix/bin/ebuild-helpers/elog 2009-04-25 09:07:18 UTC (rev 13396)
183	@@ -3,6 +3,6 @@
184	# Distributed under the terms of the GNU General Public License v2
185	# $Id$
186
187	-source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh
188	+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
189
190	${0##*/} "$@"
191
192	Modified: main/branches/prefix/bin/ebuild.sh
193	===================================================================
194	--- main/branches/prefix/bin/ebuild.sh 2009-04-25 08:40:48 UTC (rev 13395)
195	+++ main/branches/prefix/bin/ebuild.sh 2009-04-25 09:07:18 UTC (rev 13396)
196	@@ -71,6 +71,8 @@
197	# Unset some variables that break things.
198	unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
199
200	+#export PATH="/usr/local/sbin:/sbin:/usr/sbin:$PORTAGE_BIN_PATH/ebuild-helpers:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
201	+# PREFIX: we deviate in path order, should we split up DEFAULT_PATH?
202	export PATH="${DEFAULT_PATH}:$PORTAGE_BIN_PATH/ebuild-helpers:${ROOTPATH}"
203	[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
204
205	@@ -1923,7 +1925,9 @@
206	;;
207	esac
208
209	- export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
210	+ #export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
211	+ # PREFIX: same deviation as at the top of this file
212	+ export PATH="${DEFAULT_PATH}:${ebuild_helpers_path}:${ROOTPATH}"
213	[[ -n $PREROOTPATH ]] && export PATH="${PREROOTPATH%%:}:$PATH"
214	unset ebuild_helpers_path

Gentoo Archives: gentoo-commits