1 |
commit: 304f11c05aa2b8f9d241890ad87e67a3ba1b4c7d |
2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 1 20:52:32 2012 +0000 |
4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 1 20:52:32 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=304f11c0 |
7 |
|
8 |
qt-{assistant,core,dbus}: Replace ECLASS with QT_ECLASS |
9 |
|
10 |
It turns out that ECLASS is used internally by portage. |
11 |
See line 329 in /usr/lib64/portage/bin/ebuild.sh |
12 |
|
13 |
Replaced by a more specific variable |
14 |
|
15 |
--- |
16 |
x11-libs/qt-assistant/Manifest | 4 ++-- |
17 |
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 16 ++++++++-------- |
18 |
x11-libs/qt-assistant/qt-assistant-4.9999.ebuild | 16 ++++++++-------- |
19 |
x11-libs/qt-core/Manifest | 4 ++-- |
20 |
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 10 +++++----- |
21 |
x11-libs/qt-core/qt-core-4.9999.ebuild | 10 +++++----- |
22 |
x11-libs/qt-dbus/Manifest | 4 ++-- |
23 |
x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild | 8 ++++---- |
24 |
x11-libs/qt-dbus/qt-dbus-4.9999.ebuild | 8 ++++---- |
25 |
9 files changed, 40 insertions(+), 40 deletions(-) |
26 |
|
27 |
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest |
28 |
index c3b53af..eda7e3b 100644 |
29 |
--- a/x11-libs/qt-assistant/Manifest |
30 |
+++ b/x11-libs/qt-assistant/Manifest |
31 |
@@ -4,6 +4,6 @@ AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f86 |
32 |
AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c504585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA256 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde |
33 |
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d |
34 |
EBUILD qt-assistant-4.7.9999.ebuild 2772 RMD160 3630fabc5bd1c439e6b2d9d123f2d6b747a28a84 SHA1 c81e03e87e62cefb0f1496106c3a680fc6cbe9b1 SHA256 005ddd402c7485d988d4987f8bc39ca3f0e4616456228831e2eb0bf1394530d3 |
35 |
-EBUILD qt-assistant-4.8.9999.ebuild 4456 RMD160 81de97c973378ff68a5145a29713f6b0fd85d932 SHA1 b7a66ccda011cf1ccc443bcf9c7790e76294781e SHA256 4bf977babc860dca0bd2b6f06043e2a71d38c0f7312b7aaadae8ede2055a17dc |
36 |
-EBUILD qt-assistant-4.9999.ebuild 4456 RMD160 81de97c973378ff68a5145a29713f6b0fd85d932 SHA1 b7a66ccda011cf1ccc443bcf9c7790e76294781e SHA256 4bf977babc860dca0bd2b6f06043e2a71d38c0f7312b7aaadae8ede2055a17dc |
37 |
+EBUILD qt-assistant-4.8.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6 |
38 |
+EBUILD qt-assistant-4.9999.ebuild 4480 RMD160 9c661bd779ac47f97af80e6c8ebaa6d6ca250685 SHA1 ea6dade3b342abe808eb6affe48c881f800a54a1 SHA256 96e0e4d03b016d0f08435e1392c6621a05e4943446ad00c616c7131fc2415ec6 |
39 |
MISC metadata.xml 816 RMD160 7f4cdb5e95a0e1f50fa64172fc238ced50797074 SHA1 8d04c81cb77a5dbe825a070958700cda6fbb64b3 SHA256 080d4e3bc86ad0b0907f13b2ac88cedf515d2508d3135ee4276babdd6098763f |
40 |
|
41 |
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |
42 |
index 2c8b30b..c16ab12 100644 |
43 |
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |
44 |
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |
45 |
@@ -4,9 +4,9 @@ |
46 |
|
47 |
EAPI="4" |
48 |
if [[ ${PV} == 4*9999 ]]; then |
49 |
- ECLASS="-edge" |
50 |
+ QT_ECLASS="-edge" |
51 |
fi |
52 |
-inherit qt4-build${ECLASS} |
53 |
+inherit qt4-build${QT_ECLASS} |
54 |
|
55 |
DESCRIPTION="The assistant help module for the Qt toolkit" |
56 |
SLOT="4" |
57 |
@@ -50,11 +50,11 @@ pkg_setup() { |
58 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
59 |
${QT4_EXTRACT_DIRECTORIES}" |
60 |
|
61 |
- qt4-build${ECLASS}_pkg_setup |
62 |
+ qt4-build${QT_ECLASS}_pkg_setup |
63 |
} |
64 |
|
65 |
src_unpack() { |
66 |
- qt4-build${ECLASS}_src_unpack |
67 |
+ qt4-build${QT_ECLASS}_src_unpack |
68 |
# compat version |
69 |
# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ |
70 |
if use compat; then |
71 |
@@ -68,7 +68,7 @@ src_unpack() { |
72 |
} |
73 |
|
74 |
src_prepare() { |
75 |
- qt4-build${ECLASS}_src_prepare |
76 |
+ qt4-build${QT_ECLASS}_src_prepare |
77 |
if use compat; then |
78 |
epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch |
79 |
fi |
80 |
@@ -88,7 +88,7 @@ src_configure() { |
81 |
-no-svg $(qt_use qt3support) $(qt_use webkit)" |
82 |
! use glib && myconf="${myconf} -no-glib" |
83 |
|
84 |
- qt4-build${ECLASS}_src_configure |
85 |
+ qt4-build${QT_ECLASS}_src_configure |
86 |
} |
87 |
|
88 |
src_compile() { |
89 |
@@ -96,7 +96,7 @@ src_compile() { |
90 |
export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" |
91 |
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" |
92 |
|
93 |
- qt4-build${ECLASS}_src_compile |
94 |
+ qt4-build${QT_ECLASS}_src_compile |
95 |
|
96 |
# ugly hack to build docs |
97 |
cd "${S}" |
98 |
@@ -112,7 +112,7 @@ src_compile() { |
99 |
} |
100 |
|
101 |
src_install() { |
102 |
- qt4-build${ECLASS}_src_install |
103 |
+ qt4-build${QT_ECLASS}_src_install |
104 |
cd "${S}" |
105 |
#see src_compile note |
106 |
if [[ ${PV} != 4*9999 ]]; then |
107 |
|
108 |
diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild |
109 |
index 2c8b30b..c16ab12 100644 |
110 |
--- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild |
111 |
+++ b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild |
112 |
@@ -4,9 +4,9 @@ |
113 |
|
114 |
EAPI="4" |
115 |
if [[ ${PV} == 4*9999 ]]; then |
116 |
- ECLASS="-edge" |
117 |
+ QT_ECLASS="-edge" |
118 |
fi |
119 |
-inherit qt4-build${ECLASS} |
120 |
+inherit qt4-build${QT_ECLASS} |
121 |
|
122 |
DESCRIPTION="The assistant help module for the Qt toolkit" |
123 |
SLOT="4" |
124 |
@@ -50,11 +50,11 @@ pkg_setup() { |
125 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
126 |
${QT4_EXTRACT_DIRECTORIES}" |
127 |
|
128 |
- qt4-build${ECLASS}_pkg_setup |
129 |
+ qt4-build${QT_ECLASS}_pkg_setup |
130 |
} |
131 |
|
132 |
src_unpack() { |
133 |
- qt4-build${ECLASS}_src_unpack |
134 |
+ qt4-build${QT_ECLASS}_src_unpack |
135 |
# compat version |
136 |
# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ |
137 |
if use compat; then |
138 |
@@ -68,7 +68,7 @@ src_unpack() { |
139 |
} |
140 |
|
141 |
src_prepare() { |
142 |
- qt4-build${ECLASS}_src_prepare |
143 |
+ qt4-build${QT_ECLASS}_src_prepare |
144 |
if use compat; then |
145 |
epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch |
146 |
fi |
147 |
@@ -88,7 +88,7 @@ src_configure() { |
148 |
-no-svg $(qt_use qt3support) $(qt_use webkit)" |
149 |
! use glib && myconf="${myconf} -no-glib" |
150 |
|
151 |
- qt4-build${ECLASS}_src_configure |
152 |
+ qt4-build${QT_ECLASS}_src_configure |
153 |
} |
154 |
|
155 |
src_compile() { |
156 |
@@ -96,7 +96,7 @@ src_compile() { |
157 |
export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" |
158 |
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" |
159 |
|
160 |
- qt4-build${ECLASS}_src_compile |
161 |
+ qt4-build${QT_ECLASS}_src_compile |
162 |
|
163 |
# ugly hack to build docs |
164 |
cd "${S}" |
165 |
@@ -112,7 +112,7 @@ src_compile() { |
166 |
} |
167 |
|
168 |
src_install() { |
169 |
- qt4-build${ECLASS}_src_install |
170 |
+ qt4-build${QT_ECLASS}_src_install |
171 |
cd "${S}" |
172 |
#see src_compile note |
173 |
if [[ ${PV} != 4*9999 ]]; then |
174 |
|
175 |
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest |
176 |
index 0a63901..ce1e8fa 100644 |
177 |
--- a/x11-libs/qt-core/Manifest |
178 |
+++ b/x11-libs/qt-core/Manifest |
179 |
@@ -1,5 +1,5 @@ |
180 |
AUX qt-core-4.8.0-qurl-regression-fix.patch 742 RMD160 0fc99db2d43af1784c5dfcdf948915dc34749536 SHA1 44463c6f8faf5857d238778d0b57b12c36364096 SHA256 4a799c2948966a7c746e98e680db38fd05da8bf9fea581a1780ad3f94305f5dc |
181 |
EBUILD qt-core-4.7.9999.ebuild 4022 RMD160 fa68febaa31c0cce43b5c350d06459e2f38dfa9e SHA1 318ce1b9622e8054a8ca89c4c6b18cbc464135d5 SHA256 c60b5ceb76f8190464cf494aa7209666ec97a0a23693e8059de461766e2991a2 |
182 |
-EBUILD qt-core-4.8.9999.ebuild 4964 RMD160 28d43d0ceece24a7bc6f502d0b17d20c139832be SHA1 e217b2d1ca46674c4260ec5f83ffcff86eff6c67 SHA256 44bf6306f2707366ab59bfd6f05547dc208a52995b8cda3ab6435c5d66a218a3 |
183 |
-EBUILD qt-core-4.9999.ebuild 4964 RMD160 28d43d0ceece24a7bc6f502d0b17d20c139832be SHA1 e217b2d1ca46674c4260ec5f83ffcff86eff6c67 SHA256 44bf6306f2707366ab59bfd6f05547dc208a52995b8cda3ab6435c5d66a218a3 |
184 |
+EBUILD qt-core-4.8.9999.ebuild 4979 RMD160 25901bf3503b12e83039d8e25d105a2ff1b00029 SHA1 695a94b49bea8d6f3e84c114dd96b9c16ea35852 SHA256 070f94884eb7c08609be115af1b86a638bf33cbd0a72164bc6d9c0fabf392324 |
185 |
+EBUILD qt-core-4.9999.ebuild 4979 RMD160 25901bf3503b12e83039d8e25d105a2ff1b00029 SHA1 695a94b49bea8d6f3e84c114dd96b9c16ea35852 SHA256 070f94884eb7c08609be115af1b86a638bf33cbd0a72164bc6d9c0fabf392324 |
186 |
MISC metadata.xml 803 RMD160 83aa032a8ce070f8cb633679563d4c9a501a0eda SHA1 332f440bedc7f39993f64d7d18508c6eac55cb08 SHA256 33c8d5ca13dfc9ea047db0078e8f9a9e4ecd47694a937f47f8f499df07428681 |
187 |
|
188 |
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild |
189 |
index 99395ce..8d2099b 100644 |
190 |
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild |
191 |
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild |
192 |
@@ -4,9 +4,9 @@ |
193 |
|
194 |
EAPI="4" |
195 |
if [[ ${PV} == 4*9999 ]]; then |
196 |
- ECLASS="-edge" |
197 |
+ QT_ECLASS="-edge" |
198 |
fi |
199 |
-inherit qt4-build${ECLASS} |
200 |
+inherit qt4-build${QT_ECLASS} |
201 |
|
202 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" |
203 |
SLOT="4" |
204 |
@@ -70,7 +70,7 @@ pkg_setup() { |
205 |
tools/linguist/shared |
206 |
translations" |
207 |
fi |
208 |
- qt4-build${ECLASS}_pkg_setup |
209 |
+ qt4-build${QT_ECLASS}_pkg_setup |
210 |
} |
211 |
|
212 |
src_prepare() { |
213 |
@@ -79,7 +79,7 @@ src_prepare() { |
214 |
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
215 |
done |
216 |
|
217 |
- qt4-build${ECLASS}_src_prepare |
218 |
+ qt4-build${QT_ECLASS}_src_prepare |
219 |
|
220 |
# bug 172219 |
221 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
222 |
@@ -102,7 +102,7 @@ src_configure() { |
223 |
$(qt_use ssl openssl) |
224 |
$(qt_use qt3support)" |
225 |
|
226 |
- qt4-build${ECLASS}_src_configure |
227 |
+ qt4-build${QT_ECLASS}_src_configure |
228 |
} |
229 |
|
230 |
src_install() { |
231 |
|
232 |
diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild |
233 |
index 99395ce..8d2099b 100644 |
234 |
--- a/x11-libs/qt-core/qt-core-4.9999.ebuild |
235 |
+++ b/x11-libs/qt-core/qt-core-4.9999.ebuild |
236 |
@@ -4,9 +4,9 @@ |
237 |
|
238 |
EAPI="4" |
239 |
if [[ ${PV} == 4*9999 ]]; then |
240 |
- ECLASS="-edge" |
241 |
+ QT_ECLASS="-edge" |
242 |
fi |
243 |
-inherit qt4-build${ECLASS} |
244 |
+inherit qt4-build${QT_ECLASS} |
245 |
|
246 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" |
247 |
SLOT="4" |
248 |
@@ -70,7 +70,7 @@ pkg_setup() { |
249 |
tools/linguist/shared |
250 |
translations" |
251 |
fi |
252 |
- qt4-build${ECLASS}_pkg_setup |
253 |
+ qt4-build${QT_ECLASS}_pkg_setup |
254 |
} |
255 |
|
256 |
src_prepare() { |
257 |
@@ -79,7 +79,7 @@ src_prepare() { |
258 |
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
259 |
done |
260 |
|
261 |
- qt4-build${ECLASS}_src_prepare |
262 |
+ qt4-build${QT_ECLASS}_src_prepare |
263 |
|
264 |
# bug 172219 |
265 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
266 |
@@ -102,7 +102,7 @@ src_configure() { |
267 |
$(qt_use ssl openssl) |
268 |
$(qt_use qt3support)" |
269 |
|
270 |
- qt4-build${ECLASS}_src_configure |
271 |
+ qt4-build${QT_ECLASS}_src_configure |
272 |
} |
273 |
|
274 |
src_install() { |
275 |
|
276 |
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest |
277 |
index db32d7b..a26ff16 100644 |
278 |
--- a/x11-libs/qt-dbus/Manifest |
279 |
+++ b/x11-libs/qt-dbus/Manifest |
280 |
@@ -1,5 +1,5 @@ |
281 |
AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8 |
282 |
EBUILD qt-dbus-4.7.9999.ebuild 758 RMD160 c6db295132086cb2b61408e2e20ceadfe9e49665 SHA1 7060bde745f6a0328ef243bb98edfffe358146ed SHA256 78bdbbd13a9bf5572bb4c18ff6357cb9f1b8ab6eb8d58f41f0e4658f17f31430 |
283 |
-EBUILD qt-dbus-4.8.9999.ebuild 1089 RMD160 b03159911629c9df75e736923e353b202f206f7c SHA1 6a05be6c34d080d6a4b488f7c979afb10168fb7a SHA256 07764b94d8623248eb30629ce58f8291615c0d8287a5bf5b728a2b138846ee6e |
284 |
-EBUILD qt-dbus-4.9999.ebuild 1089 RMD160 b03159911629c9df75e736923e353b202f206f7c SHA1 6a05be6c34d080d6a4b488f7c979afb10168fb7a SHA256 07764b94d8623248eb30629ce58f8291615c0d8287a5bf5b728a2b138846ee6e |
285 |
+EBUILD qt-dbus-4.8.9999.ebuild 1101 RMD160 96453943b277586f8d7a73e19af3b9f2432ec633 SHA1 80749069d678ec3c2683d696b1a91c1c2c8980fa SHA256 1c54c59da080a90cdee84530954bc2fe785e08d50d1f1efbc03f5cd782ddd527 |
286 |
+EBUILD qt-dbus-4.9999.ebuild 1101 RMD160 96453943b277586f8d7a73e19af3b9f2432ec633 SHA1 80749069d678ec3c2683d696b1a91c1c2c8980fa SHA256 1c54c59da080a90cdee84530954bc2fe785e08d50d1f1efbc03f5cd782ddd527 |
287 |
MISC metadata.xml 369 RMD160 52b34abcd322c2436157d9045cb892cffdbf00e4 SHA1 91a5ea601ffcd5d32626c6cd23767f39ecc743cb SHA256 f92954ba27e6923458310562b1537216409895a1ba484399f49809824a80e980 |
288 |
|
289 |
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild |
290 |
index 6a9686d..3975740 100644 |
291 |
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild |
292 |
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild |
293 |
@@ -4,9 +4,9 @@ |
294 |
|
295 |
EAPI="4" |
296 |
if [[ ${PV} == 4*9999 ]]; then |
297 |
- ECLASS="-edge" |
298 |
+ QT_ECLASS="-edge" |
299 |
fi |
300 |
-inherit qt4-build${ECLASS} |
301 |
+inherit qt4-build${QT_ECLASS} |
302 |
|
303 |
DESCRIPTION="The DBus module for the Qt toolkit" |
304 |
SLOT="4" |
305 |
@@ -39,10 +39,10 @@ pkg_setup() { |
306 |
src/xml" |
307 |
fi |
308 |
|
309 |
- qt4-build${ECLASS}_pkg_setup |
310 |
+ qt4-build${QT_ECLASS}_pkg_setup |
311 |
} |
312 |
|
313 |
src_configure() { |
314 |
myconf="${myconf} -dbus-linked" |
315 |
- qt4-build${ECLASS}_src_configure |
316 |
+ qt4-build${QT_ECLASS}_src_configure |
317 |
} |
318 |
|
319 |
diff --git a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild |
320 |
index 6a9686d..3975740 100644 |
321 |
--- a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild |
322 |
+++ b/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild |
323 |
@@ -4,9 +4,9 @@ |
324 |
|
325 |
EAPI="4" |
326 |
if [[ ${PV} == 4*9999 ]]; then |
327 |
- ECLASS="-edge" |
328 |
+ QT_ECLASS="-edge" |
329 |
fi |
330 |
-inherit qt4-build${ECLASS} |
331 |
+inherit qt4-build${QT_ECLASS} |
332 |
|
333 |
DESCRIPTION="The DBus module for the Qt toolkit" |
334 |
SLOT="4" |
335 |
@@ -39,10 +39,10 @@ pkg_setup() { |
336 |
src/xml" |
337 |
fi |
338 |
|
339 |
- qt4-build${ECLASS}_pkg_setup |
340 |
+ qt4-build${QT_ECLASS}_pkg_setup |
341 |
} |
342 |
|
343 |
src_configure() { |
344 |
myconf="${myconf} -dbus-linked" |
345 |
- qt4-build${ECLASS}_src_configure |
346 |
+ qt4-build${QT_ECLASS}_src_configure |
347 |
} |