1 |
pesa 11/11/19 20:31:12 |
2 |
|
3 |
Modified: ChangeLog qt4-build.eclass |
4 |
Log: |
5 |
Remove support for Qt 4.5, add blockers for qt-declarative, small cleanup. |
6 |
|
7 |
Revision Changes Path |
8 |
1.19 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.19&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.19&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.18&r2=1.19 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.18 |
18 |
retrieving revision 1.19 |
19 |
diff -u -r1.18 -r1.19 |
20 |
--- ChangeLog 19 Nov 2011 20:00:35 -0000 1.18 |
21 |
+++ ChangeLog 19 Nov 2011 20:31:12 -0000 1.19 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.18 2011/11/19 20:00:35 pesa Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.19 2011/11/19 20:31:12 pesa Exp $ |
27 |
+ |
28 |
+ 19 Nov 2011; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
29 |
+ Remove support for Qt 4.5, add blockers for qt-declarative, small cleanup. |
30 |
|
31 |
19 Nov 2011; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
32 |
Make qt_assistant_cleanup() a no-op for Qt 4.7.4 and later (bug #386709). |
33 |
|
34 |
|
35 |
|
36 |
1.100 eclass/qt4-build.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.100&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.100&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.99&r2=1.100 |
41 |
|
42 |
Index: qt4-build.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
45 |
retrieving revision 1.99 |
46 |
retrieving revision 1.100 |
47 |
diff -u -r1.99 -r1.100 |
48 |
--- qt4-build.eclass 19 Nov 2011 20:00:35 -0000 1.99 |
49 |
+++ qt4-build.eclass 19 Nov 2011 20:31:12 -0000 1.100 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2011 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.99 2011/11/19 20:00:35 pesa Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.100 2011/11/19 20:31:12 pesa Exp $ |
55 |
|
56 |
# @ECLASS: qt4-build.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -12,24 +12,21 @@ |
59 |
inherit base eutils multilib toolchain-funcs flag-o-matic versionator |
60 |
|
61 |
MY_PV=${PV/_/-} |
62 |
-if version_is_at_least 4.5.99999999; then |
63 |
- MY_P=qt-everywhere-opensource-src-${MY_PV} |
64 |
- [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && |
65 |
- [[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && |
66 |
- IUSE="+exceptions" |
67 |
-else |
68 |
- MY_P=qt-x11-opensource-src-${MY_PV} |
69 |
-fi |
70 |
- |
71 |
-if version_is_at_least 4.7.99999999; then |
72 |
- IUSE+=" c++0x qpa" |
73 |
-fi |
74 |
+MY_P=qt-everywhere-opensource-src-${MY_PV} |
75 |
|
76 |
HOMEPAGE="http://qt.nokia.com/" |
77 |
SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" |
78 |
- |
79 |
LICENSE="|| ( LGPL-2.1 GPL-3 )" |
80 |
-IUSE+=" debug pch aqua" |
81 |
+ |
82 |
+IUSE="aqua debug pch" |
83 |
+ |
84 |
+[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && |
85 |
+[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && |
86 |
+ IUSE+=" +exceptions" |
87 |
+ |
88 |
+if version_is_at_least 4.7.99999999; then |
89 |
+ IUSE+=" c++0x qpa" |
90 |
+fi |
91 |
|
92 |
RDEPEND=" |
93 |
!<x11-libs/qt-assistant-${PV} |
94 |
@@ -38,6 +35,8 @@ |
95 |
!>x11-libs/qt-core-${PV}-r9999 |
96 |
!<x11-libs/qt-dbus-${PV} |
97 |
!>x11-libs/qt-dbus-${PV}-r9999 |
98 |
+ !<x11-libs/qt-declarative-${PV} |
99 |
+ !>x11-libs/qt-declarative-${PV}-r9999 |
100 |
!<x11-libs/qt-demo-${PV} |
101 |
!>x11-libs/qt-demo-${PV}-r9999 |
102 |
!<x11-libs/qt-gui-${PV} |
103 |
@@ -74,8 +73,8 @@ |
104 |
|
105 |
# Protect users by not allowing downgrades between releases |
106 |
# Downgrading revisions within the same release should be allowed |
107 |
- if has_version '>'${CATEGORY}/${P}-r9999 ; then |
108 |
- if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then |
109 |
+ if has_version '>'${CATEGORY}/${P}-r9999; then |
110 |
+ if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then |
111 |
eerror "Sanity check to keep you from breaking your system:" |
112 |
eerror " Downgrading Qt is completely unsupported and will break your system!" |
113 |
die "aborting to save your system" |
114 |
@@ -203,8 +202,8 @@ |
115 |
fi |
116 |
|
117 |
if [[ ${PN} != qt-core ]]; then |
118 |
- skip_qmake_build_patch |
119 |
- skip_project_generation_patch |
120 |
+ skip_qmake_build |
121 |
+ skip_project_generation |
122 |
symlink_binaries_to_buildtree |
123 |
fi |
124 |
|
125 |
@@ -219,7 +218,7 @@ |
126 |
append-flags -fno-gcse |
127 |
fi |
128 |
|
129 |
- if has c++0x ${IUSE//+} && use c++0x; then |
130 |
+ if use_if_iuse c++0x; then |
131 |
ewarn "You are about to build Qt4 using the C++11 standard. Even though" |
132 |
ewarn "this is an official standard, some of the reverse dependencies" |
133 |
ewarn "may fail to compile or link againt the Qt4 libraries. Before" |
134 |
@@ -501,17 +500,9 @@ |
135 |
*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; |
136 |
esac |
137 |
|
138 |
- # 4.5: build everything but qt-xmlpatterns w/o exceptions |
139 |
- # 4.6: exceptions USE flag |
140 |
+ # exceptions USE flag |
141 |
local exceptions="-exceptions" |
142 |
- case "${PV}" in |
143 |
- 4.5.*) |
144 |
- [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions" |
145 |
- ;; |
146 |
- *) |
147 |
- has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)" |
148 |
- ;; |
149 |
- esac |
150 |
+ in_iuse exceptions && exceptions="$(qt_use exceptions)" |
151 |
|
152 |
# note about -reduce-relocations: |
153 |
# That flag seems to introduce major breakage to applications, |
154 |
@@ -688,18 +679,18 @@ |
155 |
generate_qconfigs |
156 |
} |
157 |
|
158 |
-# @FUNCTION: skip_qmake_build_patch |
159 |
+# @FUNCTION: skip_qmake_build |
160 |
# @DESCRIPTION: |
161 |
# Don't need to build qmake, as it's already installed from qt-core |
162 |
-skip_qmake_build_patch() { |
163 |
+skip_qmake_build() { |
164 |
# Don't need to build qmake, as it's already installed from qt-core |
165 |
sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed" |
166 |
} |
167 |
|
168 |
-# @FUNCTION: skip_project_generation_patch |
169 |
+# @FUNCTION: skip_project_generation |
170 |
# @DESCRIPTION: |
171 |
# Exit the script early by throwing in an exit before all of the .pro files are scanned |
172 |
-skip_project_generation_patch() { |
173 |
+skip_project_generation() { |
174 |
# Exit the script early by throwing in an exit before all of the .pro files are scanned |
175 |
sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ |
176 |
-i "${S}"/configure || die "sed failed" |
177 |
@@ -711,7 +702,7 @@ |
178 |
# time |
179 |
symlink_binaries_to_buildtree() { |
180 |
for bin in qmake moc uic rcc; do |
181 |
- ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed" |
182 |
+ ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed" |
183 |
done |
184 |
} |
185 |
|
186 |
@@ -793,7 +784,7 @@ |
187 |
*-linux-*|*-linux) |
188 |
spec=linux ;; |
189 |
*) |
190 |
- die "Unknown CHOST, no platform chosen." |
191 |
+ die "Unknown CHOST, no platform chosen" |
192 |
esac |
193 |
|
194 |
CXX=$(tc-getCXX) |
195 |
@@ -802,7 +793,7 @@ |
196 |
elif [[ ${CXX} == *icpc* ]]; then |
197 |
spec+=-icc |
198 |
else |
199 |
- die "Unknown compiler '${CXX}'." |
200 |
+ die "Unknown compiler '${CXX}'" |
201 |
fi |
202 |
if [[ -n ${LIBDIR/lib} ]]; then |
203 |
spec+=-${LIBDIR/lib} |