Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qtbearer/, dev-qt/qtphonon/, dev-qt/qtgui/, dev-qt/qthelp/, ...
Date: Sun, 01 Jun 2014 02:41:45
Message-Id: 1401590396.1cd844487d67bdf5bfe24c8c15aadce4bd6ae2fc.pesa@gentoo
1 commit: 1cd844487d67bdf5bfe24c8c15aadce4bd6ae2fc
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 31 00:55:42 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 1 02:39:56 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1cd84448
7
8 [qt4-build-multilib.eclass] Stop exporting pkg_setup.
9
10 ---
11 dev-qt/qtbearer/qtbearer-4.8.6.ebuild | 2 --
12 dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 2 --
13 dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild | 2 --
14 dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 2 --
15 dev-qt/qtgui/qtgui-4.8.6.ebuild | 2 --
16 dev-qt/qtgui/qtgui-4.8.9999.ebuild | 2 --
17 dev-qt/qthelp/qthelp-4.8.6.ebuild | 2 --
18 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 2 --
19 dev-qt/qtphonon/qtphonon-4.8.6.ebuild | 2 --
20 dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 2 --
21 eclass/qt4-build-multilib.eclass | 15 +--------------
22 11 files changed, 1 insertion(+), 34 deletions(-)
23
24 diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
25 index 8d2117e..c99bbab 100644
26 --- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
27 +++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
28 @@ -40,8 +40,6 @@ pkg_setup() {
29 src/plugins/bearer/generic
30 $(use connman && echo src/plugins/bearer/connman)
31 $(use networkmanager && echo src/plugins/bearer/networkmanager)"
32 -
33 - qt4-build-multilib_pkg_setup
34 }
35
36 src_configure() {
37
38 diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
39 index 8d2117e..c99bbab 100644
40 --- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
41 +++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
42 @@ -40,8 +40,6 @@ pkg_setup() {
43 src/plugins/bearer/generic
44 $(use connman && echo src/plugins/bearer/connman)
45 $(use networkmanager && echo src/plugins/bearer/networkmanager)"
46 -
47 - qt4-build-multilib_pkg_setup
48 }
49
50 src_configure() {
51
52 diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
53 index 38e3027..a0b8602 100644
54 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
55 +++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
56 @@ -48,8 +48,6 @@ QCONFIG_DEFINE="QT_DECLARATIVE"
57 pkg_setup() {
58 use webkit && QT4_TARGET_DIRECTORIES+="
59 src/3rdparty/webkit/Source/WebKit/qt/declarative"
60 -
61 - qt4-build-multilib_pkg_setup
62 }
63
64 src_configure() {
65
66 diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
67 index 38e3027..a0b8602 100644
68 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
69 +++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
70 @@ -48,8 +48,6 @@ QCONFIG_DEFINE="QT_DECLARATIVE"
71 pkg_setup() {
72 use webkit && QT4_TARGET_DIRECTORIES+="
73 src/3rdparty/webkit/Source/WebKit/qt/declarative"
74 -
75 - qt4-build-multilib_pkg_setup
76 }
77
78 src_configure() {
79
80 diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
81 index bf01a8c..e652ddf 100644
82 --- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
83 +++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
84 @@ -118,8 +118,6 @@ pkg_setup() {
85 $(use xinerama && echo QT_XINERAMA)
86 QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
87 $(use xv && echo QT_XVIDEO)"
88 -
89 - qt4-build-multilib_pkg_setup
90 }
91
92 src_prepare() {
93
94 diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
95 index bb6bb86..2e49b9d 100644
96 --- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
97 +++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
98 @@ -117,8 +117,6 @@ pkg_setup() {
99 $(use xinerama && echo QT_XINERAMA)
100 QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
101 $(use xv && echo QT_XVIDEO)"
102 -
103 - qt4-build-multilib_pkg_setup
104 }
105
106 src_prepare() {
107
108 diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
109 index 2525195..4ee3aa3 100644
110 --- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
111 +++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
112 @@ -52,8 +52,6 @@ pkg_setup() {
113 use compat && QT4_TARGET_DIRECTORIES+="
114 tools/assistant/compat
115 tools/assistant/compat/lib"
116 -
117 - qt4-build-multilib_pkg_setup
118 }
119
120 src_unpack() {
121
122 diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
123 index 2525195..4ee3aa3 100644
124 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
125 +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
126 @@ -52,8 +52,6 @@ pkg_setup() {
127 use compat && QT4_TARGET_DIRECTORIES+="
128 tools/assistant/compat
129 tools/assistant/compat/lib"
130 -
131 - qt4-build-multilib_pkg_setup
132 }
133
134 src_unpack() {
135
136 diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
137 index 55db6be..d684e9f 100644
138 --- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
139 +++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
140 @@ -45,8 +45,6 @@ QCONFIG_ADD="phonon"
141 pkg_setup() {
142 QCONFIG_DEFINE="QT_PHONON
143 $(use aqua || echo QT_GSTREAMER)"
144 -
145 - qt4-build-multilib_pkg_setup
146 }
147
148 src_configure() {
149
150 diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
151 index 55db6be..d684e9f 100644
152 --- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
153 +++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
154 @@ -45,8 +45,6 @@ QCONFIG_ADD="phonon"
155 pkg_setup() {
156 QCONFIG_DEFINE="QT_PHONON
157 $(use aqua || echo QT_GSTREAMER)"
158 -
159 - qt4-build-multilib_pkg_setup
160 }
161
162 src_configure() {
163
164 diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
165 index 4771381..84aa4b4 100644
166 --- a/eclass/qt4-build-multilib.eclass
167 +++ b/eclass/qt4-build-multilib.eclass
168 @@ -51,20 +51,7 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
169 DEPEND+=" dev-lang/perl"
170 fi
171
172 -EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
173 -
174 -# @FUNCTION: qt4-build-multilib_pkg_setup
175 -# @DESCRIPTION:
176 -# Sets up PATH and LD_LIBRARY_PATH.
177 -qt4-build-multilib_pkg_setup() {
178 - # Warn users of possible breakage when downgrading to a previous release.
179 - # Downgrading revisions within the same release is safe.
180 - if has_version ">${CATEGORY}/${P}-r9999:4"; then
181 - ewarn
182 - ewarn "Downgrading Qt is completely unsupported and can break your system!"
183 - ewarn
184 - fi
185 -}
186 +EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
187
188 # @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
189 # @DEFAULT_UNSET
Report Message
Find on MARC Find on Google Groups