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

Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: qt-core-4.6.0-r1.ebuild ChangeLog qt-core-4.6.0.ebuild
Date: Fri, 25 Dec 2009 15:35:17
Message-Id: E1NOCC9-0003Lx-WA@stork.gentoo.org
1 abcd 09/12/25 15:35:13
2
3 Modified: ChangeLog
4 Added: qt-core-4.6.0-r1.ebuild
5 Removed: qt-core-4.6.0.ebuild
6 Log:
7 Add prefix support, revbump due to otherwise unresolvable USE deps
8 (Portage version: -svn/cvs/Linux i686)
9
10 Revision Changes Path
11 1.83 x11-libs/qt-core/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.83&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.83&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.82&r2=1.83
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v
20 retrieving revision 1.82
21 retrieving revision 1.83
22 diff -u -r1.82 -r1.83
23 --- ChangeLog 23 Dec 2009 12:50:15 -0000 1.82
24 +++ ChangeLog 25 Dec 2009 15:35:13 -0000 1.83
25 @@ -1,6 +1,12 @@
26 # ChangeLog for x11-libs/qt-core
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.82 2009/12/23 12:50:15 spatz Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.83 2009/12/25 15:35:13 abcd Exp $
30 +
31 +*qt-core-4.6.0-r1 (25 Dec 2009)
32 +
33 + 25 Dec 2009; Jonathan Callen <abcd@g.o> -qt-core-4.6.0.ebuild,
34 + +qt-core-4.6.0-r1.ebuild:
35 + Add prefix support, revbump due to otherwise unresolvable USE deps
36
37 23 Dec 2009; Dror Levin <spatz@g.o> qt-core-4.6.0.ebuild,
38 +files/qt-core-4.6.0-hebrew.patch:
39
40
41
42 1.1 x11-libs/qt-core/qt-core-4.6.0-r1.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.6.0-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.6.0-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: qt-core-4.6.0-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2009 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:35:13 abcd Exp $
52
53 EAPI="2"
54 inherit qt4-build
55
56 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
57 SLOT="4"
58 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
59 IUSE="doc +glib iconv optimized-qmake qt3support ssl"
60
61 RDEPEND="sys-libs/zlib
62 glib? ( dev-libs/glib )
63 ssl? ( dev-libs/openssl )
64 !<x11-libs/qt-4.4.0:4"
65 DEPEND="${RDEPEND}
66 dev-util/pkgconfig"
67 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
68
69 QT4_TARGET_DIRECTORIES="
70 src/tools/bootstrap
71 src/tools/moc
72 src/tools/rcc
73 src/tools/uic
74 src/corelib
75 src/xml
76 src/network
77 src/plugins/codecs
78 tools/linguist/lconvert
79 tools/linguist/lrelease
80 tools/linguist/lupdate"
81
82 # Most ebuilds include almost everything for testing
83 # Will clear out unneeded directories after everything else works OK
84 QT4_EXTRACT_DIRECTORIES="
85 include/Qt
86 include/QtCore
87 include/QtNetwork
88 include/QtScript
89 include/QtXml
90 src/plugins/plugins.pro
91 src/plugins/qpluginbase.pri
92 src/src.pro
93 src/3rdparty/des
94 src/3rdparty/harfbuzz
95 src/3rdparty/md4
96 src/3rdparty/md5
97 src/3rdparty/sha1
98 src/3rdparty/easing
99 src/script
100 tools/linguist/shared
101 translations"
102
103 PATCHES=(
104 "${FILESDIR}/qt-4.6-nolibx11.diff"
105 "${FILESDIR}/${P}-hebrew.patch"
106 )
107
108 pkg_setup() {
109 qt4-build_pkg_setup
110
111 if has_version x11-libs/qt-core; then
112 # Check to see if they've changed the glib flag since the last time installing this package.
113 if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
114 ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
115 ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
116 elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
117 ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
118 ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
119 fi
120
121 # Check to see if they've changed the qt3support flag since the last time installing this package.
122 # If so, give a list of packages they need to uninstall first.
123 if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then
124 local need_to_remove
125 ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
126 for x in sql opengl gui qt3support; do
127 local pkg="x11-libs/qt-${x}"
128 if has_version $pkg; then
129 need_to_remove="${need_to_remove} ${pkg}"
130 fi
131 done
132 if [[ -n ${need_to_remove} ]]; then
133 die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
134 fi
135 elif ! use qt3support && built_with_use x11-libs/qt-core qt3support ; then
136 local need_to_remove
137 ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
138 for x in sql opengl gui qt3support; do
139 local pkg="x11-libs/qt-${x}"
140 if has_version $pkg; then
141 need_to_remove="${need_to_remove} ${pkg}"
142 fi
143 done
144 if [[ -n ${need_to_remove} ]]; then
145 die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
146 fi
147 fi
148 fi
149 }
150
151 src_unpack() {
152 if use doc; then
153 QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
154 doc/"
155 QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
156 tools/qdoc3"
157 fi
158 QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
159 ${QT4_EXTRACT_DIRECTORIES}"
160
161 qt4-build_src_unpack
162
163 # Don't pre-strip, bug 235026
164 for i in kr jp cn tw ; do
165 echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
166 done
167 }
168
169 src_prepare() {
170 qt4-build_src_prepare
171
172 # bug 172219
173 sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
174 "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
175 sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
176 "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
177 }
178
179 src_configure() {
180 unset QMAKESPEC
181
182 myconf="${myconf}
183 $(qt_use glib)
184 $(qt_use iconv)
185 $(qt_use optimized-qmake)
186 $(qt_use ssl openssl)
187 $(qt_use qt3support)"
188
189 myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
190 -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
191 -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
192 -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
193 -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
194 -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
195 -no-cups -no-xsync -no-xinput -no-multimedia"
196
197 if ! use doc; then
198 myconf="${myconf} -nomake docs"
199 fi
200
201 qt4-build_src_configure
202 }
203
204 src_compile() {
205 # bug 259736
206 unset QMAKESPEC
207 qt4-build_src_compile
208 }
209
210 src_install() {
211 dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
212
213 install_directories src/{corelib,xml,network,plugins/codecs}
214
215 emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
216
217 if use doc; then
218 emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed"
219 fi
220
221 # use freshly built libraries
222 local DYLD_FPATH=
223 [[ -d "${S}"/lib/QtCore.framework ]] \
224 && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
225 DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
226 LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
227 || die "generating translations faied"
228 insinto ${QTTRANSDIR#${EPREFIX}}
229 doins translations/*.qm || die "doins translations failed"
230
231 setqtenv
232 fix_library_files
233
234 # List all the multilib libdirs
235 local libdirs=
236 for libdir in $(get_all_libdirs); do
237 libdirs+=:${EPREFIX}/usr/${libdir}/qt4
238 done
239
240 cat <<-EOF > "${T}/44qt4"
241 LDPATH="${libdirs:1}"
242 EOF
243 doenvd "${T}/44qt4"
244
245 dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
246 mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
247 || die "Failed to move qconfig.pri"
248
249 # Framework hacking
250 if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
251 #TODO do this better
252 sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
253 "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
254 || die "sed for qconfig.h failed."
255 dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
256 else
257 sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
258 "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
259 "${D}${QTHEADERDIR}"/Qt/qconfig.h \
260 || die "sed for qconfig.h failed"
261 fi
262
263 if use glib; then
264 QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
265 $(use ssl && echo QT_OPENSSL)"
266 install_qconfigs
267 fi
268
269 # remove some unnecessary headers
270 rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
271 qatomic_windows.h,\
272 qatomic_windowsce.h,\
273 qt_windows.h}
274
275 keepdir "${QTSYSCONFDIR#${EPREFIX}}"
276
277 # Framework magic
278 fix_includes
279 }
Report Message
Find on MARC Find on Google Groups