[gentoo-commits] proj/portage:prefix commit in: / - gentoo-commits

From:	Fabian Groffen <grobian@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/portage:prefix commit in: /
Date:	Fri, 23 Dec 2011 09:51:31
Message-Id:	`d32995adfc27f2a5bd4d85f951c3e828dc867600.grobian@gentoo`

1

commit:     d32995adfc27f2a5bd4d85f951c3e828dc867600

2

Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>

3

AuthorDate: Fri Dec 23 09:44:26 2011 +0000

4

Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>

5

CommitDate: Fri Dec 23 09:44:26 2011 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d32995ad

7

8

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

9

10

Conflicts:

11

	bin/ebuild-helpers/newbin

12

	bin/ebuild-helpers/newconfd

13

	bin/ebuild-helpers/newdoc

14

	bin/ebuild-helpers/newenvd

15

	bin/ebuild-helpers/newexe

16

	bin/ebuild-helpers/newinitd

17

	bin/ebuild-helpers/newlib.a

18

	bin/ebuild-helpers/newlib.so

19

	bin/ebuild-helpers/newman

20

	bin/ebuild-helpers/newsbin

21

	pym/portage/util/_pty.py

22

23

24

 bin/ebuild-helpers/newbin                |    5 +-

25

 bin/ebuild-helpers/newconfd              |    5 +-

26

 bin/ebuild-helpers/newdoc                |    5 +-

27

 bin/ebuild-helpers/newenvd               |    5 +-

28

 bin/ebuild-helpers/newexe                |    5 +-

29

 bin/ebuild-helpers/newinitd              |    5 +-

30

 bin/ebuild-helpers/newins                |    3 +

31

 bin/ebuild-helpers/newlib.a              |    5 +-

32

 bin/ebuild-helpers/newlib.so             |    5 +-

33

 bin/ebuild-helpers/newman                |    5 +-

34

 bin/ebuild-helpers/newsbin               |    5 +-

35

 bin/ebuild.sh                            |    2 +-

36

 bin/misc-functions.sh                    |   77 ++++++++------

37

 bin/phase-functions.sh                   |   17 ++--

38

 man/ebuild.5                             |   11 +-

39

 man/make.conf.5                          |    7 +-

40

 pym/portage/dbapi/vartree.py             |    3 +

41

 pym/portage/package/ebuild/config.py     |    5 +-

42

 pym/portage/package/ebuild/fetch.py      |   25 +++--

43

 pym/portage/tests/ebuild/test_pty_eof.py |   26 -----

44

 pym/portage/util/_pty.py                 |  162 ++----------------------------

45

 21 files changed, 138 insertions(+), 250 deletions(-)

46

47

diff --cc bin/ebuild-helpers/newbin

48

index bf5def8,bf98744..f3deef1

49

--- a/bin/ebuild-helpers/newbin

50

+++ b/bin/ebuild-helpers/newbin

51

@@@ -1,5 -1,5 +1,5 @@@

52

 -#!/bin/bash

53

 +#!@PORTAGE_BASH@

54

- # Copyright 1999-2010 Gentoo Foundation

55

+ # Copyright 1999-2011 Gentoo Foundation

56

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

57

58

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

59

diff --cc bin/ebuild-helpers/newconfd

60

index 284de97,fa3710d..d9462f6

61

--- a/bin/ebuild-helpers/newconfd

62

+++ b/bin/ebuild-helpers/newconfd

63

@@@ -1,5 -1,5 +1,5 @@@

64

 -#!/bin/bash

65

 +#!@PORTAGE_BASH@

66

- # Copyright 1999-2010 Gentoo Foundation

67

+ # Copyright 1999-2011 Gentoo Foundation

68

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

69

70

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

71

diff --cc bin/ebuild-helpers/newdoc

72

index 0ca1e52,df6fb1d..d26aec9

73

--- a/bin/ebuild-helpers/newdoc

74

+++ b/bin/ebuild-helpers/newdoc

75

@@@ -1,5 -1,5 +1,5 @@@

76

 -#!/bin/bash

77

 +#!@PORTAGE_BASH@

78

- # Copyright 1999-2010 Gentoo Foundation

79

+ # Copyright 1999-2011 Gentoo Foundation

80

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

81

82

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

83

diff --cc bin/ebuild-helpers/newenvd

84

index 02ad10e,c54af05..0688425

85

--- a/bin/ebuild-helpers/newenvd

86

+++ b/bin/ebuild-helpers/newenvd

87

@@@ -1,5 -1,5 +1,5 @@@

88

 -#!/bin/bash

89

 +#!@PORTAGE_BASH@

90

- # Copyright 1999-2010 Gentoo Foundation

91

+ # Copyright 1999-2011 Gentoo Foundation

92

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

93

94

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

95

diff --cc bin/ebuild-helpers/newexe

96

index 0877d20,9bcf64b..334096c

97

--- a/bin/ebuild-helpers/newexe

98

+++ b/bin/ebuild-helpers/newexe

99

@@@ -1,5 -1,5 +1,5 @@@

100

 -#!/bin/bash

101

 +#!@PORTAGE_BASH@

102

- # Copyright 1999-2010 Gentoo Foundation

103

+ # Copyright 1999-2011 Gentoo Foundation

104

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

105

106

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

107

diff --cc bin/ebuild-helpers/newinitd

108

index aa7955c,03bbe68..ad6d773

109

--- a/bin/ebuild-helpers/newinitd

110

+++ b/bin/ebuild-helpers/newinitd

111

@@@ -1,5 -1,5 +1,5 @@@

112

 -#!/bin/bash

113

 +#!@PORTAGE_BASH@

114

- # Copyright 1999-2010 Gentoo Foundation

115

+ # Copyright 1999-2011 Gentoo Foundation

116

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

117

118

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

119

diff --cc bin/ebuild-helpers/newlib.a

120

index d14ea0e,7ff8195..699c2c6

121

--- a/bin/ebuild-helpers/newlib.a

122

+++ b/bin/ebuild-helpers/newlib.a

123

@@@ -1,5 -1,5 +1,5 @@@

124

 -#!/bin/bash

125

 +#!@PORTAGE_BASH@

126

- # Copyright 1999-2010 Gentoo Foundation

127

+ # Copyright 1999-2011 Gentoo Foundation

128

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

129

130

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

131

diff --cc bin/ebuild-helpers/newlib.so

132

index 3349900,fd4c097..7e6e7cd

133

--- a/bin/ebuild-helpers/newlib.so

134

+++ b/bin/ebuild-helpers/newlib.so

135

@@@ -1,5 -1,5 +1,5 @@@

136

 -#!/bin/bash

137

 +#!@PORTAGE_BASH@

138

- # Copyright 1999-2010 Gentoo Foundation

139

+ # Copyright 1999-2011 Gentoo Foundation

140

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

141

142

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

143

diff --cc bin/ebuild-helpers/newman

144

index d15abc0,889e0f9..dc4962e

145

--- a/bin/ebuild-helpers/newman

146

+++ b/bin/ebuild-helpers/newman

147

@@@ -1,5 -1,5 +1,5 @@@

148

 -#!/bin/bash

149

 +#!@PORTAGE_BASH@

150

- # Copyright 1999-2010 Gentoo Foundation

151

+ # Copyright 1999-2011 Gentoo Foundation

152

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

153

154

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

155

diff --cc bin/ebuild-helpers/newsbin

156

index f8e79df,9df0af2..c02124b

157

--- a/bin/ebuild-helpers/newsbin

158

+++ b/bin/ebuild-helpers/newsbin

159

@@@ -1,5 -1,5 +1,5 @@@

160

 -#!/bin/bash

161

 +#!@PORTAGE_BASH@

162

- # Copyright 1999-2010 Gentoo Foundation

163

+ # Copyright 1999-2011 Gentoo Foundation

164

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

165

166

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

167

diff --cc bin/misc-functions.sh

168

index 8b58bda,dcfdceb..436a50b

169

mode 100644,100755..100644

170

--- a/bin/misc-functions.sh

171

+++ b/bin/misc-functions.sh

172

diff --cc bin/phase-functions.sh

173

index 493bb54,2167853..c002a34

174

--- a/bin/phase-functions.sh

175

+++ b/bin/phase-functions.sh

176

@@@ -126,17 -126,18 +126,18 @@@ filter_readonly_variables() 

177

  			LC_CTYPE LC_MESSAGES LC_MONETARY

178

  			LC_NUMERIC LC_PAPER LC_TIME"

179

fi

180

- 	if [[ ${EMERGE_FROM} != binary ]] && ! has --allow-extra-vars $* ; then

181

- 		filtered_vars="

182

- 			${filtered_vars}

183

- 			${PORTAGE_SAVED_READONLY_VARS}

184

- 			${PORTAGE_MUTABLE_FILTERED_VARS}

185

- 		"

186

- 	elif ! has --allow-extra-vars $* ; then

187

- 		filtered_vars+=" ${binpkg_untrusted_vars}"

188

+ 	if ! has --allow-extra-vars $* ; then

189

+ 		if [ "${EMERGE_FROM}" = binary ] ; then

190

+ 			# preserve additional variables from build time,

191

+ 			# while excluding untrusted variables

192

+ 			filtered_vars+=" ${binpkg_untrusted_vars}"

193

+ 		else

194

+ 			filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}"

195

+ 			filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}"

196

+ 		fi

197

fi

198

199

 -	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"

200

 +	"${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"

201

}

202

203

  # @FUNCTION: preprocess_ebuild_env

1	commit: d32995adfc27f2a5bd4d85f951c3e828dc867600
2	Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3	AuthorDate: Fri Dec 23 09:44:26 2011 +0000
4	Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5	CommitDate: Fri Dec 23 09:44:26 2011 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d32995ad
7
8	Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
9
10	Conflicts:
11	bin/ebuild-helpers/newbin
12	bin/ebuild-helpers/newconfd
13	bin/ebuild-helpers/newdoc
14	bin/ebuild-helpers/newenvd
15	bin/ebuild-helpers/newexe
16	bin/ebuild-helpers/newinitd
17	bin/ebuild-helpers/newlib.a
18	bin/ebuild-helpers/newlib.so
19	bin/ebuild-helpers/newman
20	bin/ebuild-helpers/newsbin
21	pym/portage/util/_pty.py
22
23
24	bin/ebuild-helpers/newbin \| 5 +-
25	bin/ebuild-helpers/newconfd \| 5 +-
26	bin/ebuild-helpers/newdoc \| 5 +-
27	bin/ebuild-helpers/newenvd \| 5 +-
28	bin/ebuild-helpers/newexe \| 5 +-
29	bin/ebuild-helpers/newinitd \| 5 +-
30	bin/ebuild-helpers/newins \| 3 +
31	bin/ebuild-helpers/newlib.a \| 5 +-
32	bin/ebuild-helpers/newlib.so \| 5 +-
33	bin/ebuild-helpers/newman \| 5 +-
34	bin/ebuild-helpers/newsbin \| 5 +-
35	bin/ebuild.sh \| 2 +-
36	bin/misc-functions.sh \| 77 ++++++++------
37	bin/phase-functions.sh \| 17 ++--
38	man/ebuild.5 \| 11 +-
39	man/make.conf.5 \| 7 +-
40	pym/portage/dbapi/vartree.py \| 3 +
41	pym/portage/package/ebuild/config.py \| 5 +-
42	pym/portage/package/ebuild/fetch.py \| 25 +++--
43	pym/portage/tests/ebuild/test_pty_eof.py \| 26 -----
44	pym/portage/util/_pty.py \| 162 ++----------------------------
45	21 files changed, 138 insertions(+), 250 deletions(-)
46
47	diff --cc bin/ebuild-helpers/newbin
48	index bf5def8,bf98744..f3deef1
49	--- a/bin/ebuild-helpers/newbin
50	+++ b/bin/ebuild-helpers/newbin
51	@@@ -1,5 -1,5 +1,5 @@@
52	-#!/bin/bash
53	+#!@PORTAGE_BASH@
54	- # Copyright 1999-2010 Gentoo Foundation
55	+ # Copyright 1999-2011 Gentoo Foundation
56	# Distributed under the terms of the GNU General Public License v2
57
58	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
59	diff --cc bin/ebuild-helpers/newconfd
60	index 284de97,fa3710d..d9462f6
61	--- a/bin/ebuild-helpers/newconfd
62	+++ b/bin/ebuild-helpers/newconfd
63	@@@ -1,5 -1,5 +1,5 @@@
64	-#!/bin/bash
65	+#!@PORTAGE_BASH@
66	- # Copyright 1999-2010 Gentoo Foundation
67	+ # Copyright 1999-2011 Gentoo Foundation
68	# Distributed under the terms of the GNU General Public License v2
69
70	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
71	diff --cc bin/ebuild-helpers/newdoc
72	index 0ca1e52,df6fb1d..d26aec9
73	--- a/bin/ebuild-helpers/newdoc
74	+++ b/bin/ebuild-helpers/newdoc
75	@@@ -1,5 -1,5 +1,5 @@@
76	-#!/bin/bash
77	+#!@PORTAGE_BASH@
78	- # Copyright 1999-2010 Gentoo Foundation
79	+ # Copyright 1999-2011 Gentoo Foundation
80	# Distributed under the terms of the GNU General Public License v2
81
82	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
83	diff --cc bin/ebuild-helpers/newenvd
84	index 02ad10e,c54af05..0688425
85	--- a/bin/ebuild-helpers/newenvd
86	+++ b/bin/ebuild-helpers/newenvd
87	@@@ -1,5 -1,5 +1,5 @@@
88	-#!/bin/bash
89	+#!@PORTAGE_BASH@
90	- # Copyright 1999-2010 Gentoo Foundation
91	+ # Copyright 1999-2011 Gentoo Foundation
92	# Distributed under the terms of the GNU General Public License v2
93
94	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
95	diff --cc bin/ebuild-helpers/newexe
96	index 0877d20,9bcf64b..334096c
97	--- a/bin/ebuild-helpers/newexe
98	+++ b/bin/ebuild-helpers/newexe
99	@@@ -1,5 -1,5 +1,5 @@@
100	-#!/bin/bash
101	+#!@PORTAGE_BASH@
102	- # Copyright 1999-2010 Gentoo Foundation
103	+ # Copyright 1999-2011 Gentoo Foundation
104	# Distributed under the terms of the GNU General Public License v2
105
106	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
107	diff --cc bin/ebuild-helpers/newinitd
108	index aa7955c,03bbe68..ad6d773
109	--- a/bin/ebuild-helpers/newinitd
110	+++ b/bin/ebuild-helpers/newinitd
111	@@@ -1,5 -1,5 +1,5 @@@
112	-#!/bin/bash
113	+#!@PORTAGE_BASH@
114	- # Copyright 1999-2010 Gentoo Foundation
115	+ # Copyright 1999-2011 Gentoo Foundation
116	# Distributed under the terms of the GNU General Public License v2
117
118	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
119	diff --cc bin/ebuild-helpers/newlib.a
120	index d14ea0e,7ff8195..699c2c6
121	--- a/bin/ebuild-helpers/newlib.a
122	+++ b/bin/ebuild-helpers/newlib.a
123	@@@ -1,5 -1,5 +1,5 @@@
124	-#!/bin/bash
125	+#!@PORTAGE_BASH@
126	- # Copyright 1999-2010 Gentoo Foundation
127	+ # Copyright 1999-2011 Gentoo Foundation
128	# Distributed under the terms of the GNU General Public License v2
129
130	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
131	diff --cc bin/ebuild-helpers/newlib.so
132	index 3349900,fd4c097..7e6e7cd
133	--- a/bin/ebuild-helpers/newlib.so
134	+++ b/bin/ebuild-helpers/newlib.so
135	@@@ -1,5 -1,5 +1,5 @@@
136	-#!/bin/bash
137	+#!@PORTAGE_BASH@
138	- # Copyright 1999-2010 Gentoo Foundation
139	+ # Copyright 1999-2011 Gentoo Foundation
140	# Distributed under the terms of the GNU General Public License v2
141
142	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
143	diff --cc bin/ebuild-helpers/newman
144	index d15abc0,889e0f9..dc4962e
145	--- a/bin/ebuild-helpers/newman
146	+++ b/bin/ebuild-helpers/newman
147	@@@ -1,5 -1,5 +1,5 @@@
148	-#!/bin/bash
149	+#!@PORTAGE_BASH@
150	- # Copyright 1999-2010 Gentoo Foundation
151	+ # Copyright 1999-2011 Gentoo Foundation
152	# Distributed under the terms of the GNU General Public License v2
153
154	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
155	diff --cc bin/ebuild-helpers/newsbin
156	index f8e79df,9df0af2..c02124b
157	--- a/bin/ebuild-helpers/newsbin
158	+++ b/bin/ebuild-helpers/newsbin
159	@@@ -1,5 -1,5 +1,5 @@@
160	-#!/bin/bash
161	+#!@PORTAGE_BASH@
162	- # Copyright 1999-2010 Gentoo Foundation
163	+ # Copyright 1999-2011 Gentoo Foundation
164	# Distributed under the terms of the GNU General Public License v2
165
166	source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
167	diff --cc bin/misc-functions.sh
168	index 8b58bda,dcfdceb..436a50b
169	mode 100644,100755..100644
170	--- a/bin/misc-functions.sh
171	+++ b/bin/misc-functions.sh
172	diff --cc bin/phase-functions.sh
173	index 493bb54,2167853..c002a34
174	--- a/bin/phase-functions.sh
175	+++ b/bin/phase-functions.sh
176	@@@ -126,17 -126,18 +126,18 @@@ filter_readonly_variables()
177	LC_CTYPE LC_MESSAGES LC_MONETARY
178	LC_NUMERIC LC_PAPER LC_TIME"
179	fi
180	- if [[ ${EMERGE_FROM} != binary ]] && ! has --allow-extra-vars $* ; then
181	- filtered_vars="
182	- ${filtered_vars}
183	- ${PORTAGE_SAVED_READONLY_VARS}
184	- ${PORTAGE_MUTABLE_FILTERED_VARS}
185	- "
186	- elif ! has --allow-extra-vars $* ; then
187	- filtered_vars+=" ${binpkg_untrusted_vars}"
188	+ if ! has --allow-extra-vars $* ; then
189	+ if [ "${EMERGE_FROM}" = binary ] ; then
190	+ # preserve additional variables from build time,
191	+ # while excluding untrusted variables
192	+ filtered_vars+=" ${binpkg_untrusted_vars}"
193	+ else
194	+ filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}"
195	+ filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}"
196	+ fi
197	fi
198
199	- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" \|\| die "filter-bash-environment.py failed"
200	+ "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" \|\| die "filter-bash-environment.py failed"
201	}
202
203	# @FUNCTION: preprocess_ebuild_env

Gentoo Archives: gentoo-commits