| 1 |
wired 10/02/17 23:32:25 |
| 2 |
|
| 3 |
Modified: qt4-build.eclass |
| 4 |
Log: |
| 5 |
[qt4-build.eclass] added exceptions USE flag for >= Qt 4.6.x - bug #240185 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.65 eclass/qt4-build.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.65&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.65&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.64&r2=1.65 |
| 13 |
|
| 14 |
Index: qt4-build.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 17 |
retrieving revision 1.64 |
| 18 |
retrieving revision 1.65 |
| 19 |
diff -u -r1.64 -r1.65 |
| 20 |
--- qt4-build.eclass 15 Feb 2010 16:34:00 -0000 1.64 |
| 21 |
+++ qt4-build.eclass 17 Feb 2010 23:32:24 -0000 1.65 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.64 2010/02/15 16:34:00 spatz Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.65 2010/02/17 23:32:24 wired Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4-build.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -17,6 +17,7 @@ |
| 31 |
MY_PV=${PV/_/-} |
| 32 |
if version_is_at_least 4.5.99999999; then |
| 33 |
MY_P=qt-everywhere-opensource-src-${MY_PV} |
| 34 |
+ [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE="+exceptions" |
| 35 |
else |
| 36 |
MY_P=qt-x11-opensource-src-${MY_PV} |
| 37 |
fi |
| 38 |
@@ -25,7 +26,7 @@ |
| 39 |
SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" |
| 40 |
|
| 41 |
LICENSE="|| ( LGPL-2.1 GPL-3 )" |
| 42 |
-IUSE="debug pch aqua" |
| 43 |
+IUSE+=" debug pch aqua" |
| 44 |
|
| 45 |
RDEPEND=" |
| 46 |
!<x11-libs/qt-assistant-${PV} |
| 47 |
@@ -38,6 +39,8 @@ |
| 48 |
!>x11-libs/qt-demo-${PV}-r9999 |
| 49 |
!<x11-libs/qt-gui-${PV} |
| 50 |
!>x11-libs/qt-gui-${PV}-r9999 |
| 51 |
+ !<x11-libs/qt-multimedia-${PV} |
| 52 |
+ !>x11-libs/qt-multimedia-${PV}-r9999 |
| 53 |
!<x11-libs/qt-opengl-${PV} |
| 54 |
!>x11-libs/qt-opengl-${PV}-r9999 |
| 55 |
!<x11-libs/qt-phonon-${PV} |
| 56 |
@@ -407,24 +410,15 @@ |
| 57 |
*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; |
| 58 |
esac |
| 59 |
|
| 60 |
- # 4.6: build qt-core with exceptions or qt-xmlpatterns won't build |
| 61 |
- local exceptions= |
| 62 |
+ # 4.5: build everything but qt-xmlpatterns w/o exceptions |
| 63 |
+ # 4.6: exceptions USE flag |
| 64 |
+ local exceptions="-exceptions" |
| 65 |
case "${PV}" in |
| 66 |
- 4.6.*) |
| 67 |
- if [[ ${PN} != "qt-core" ]] && [[ ${PN} != "qt-xmlpatterns" ]]; then |
| 68 |
- case "${PV}:${CHOST}" in |
| 69 |
- 4.6.0*:*-darwin*) |
| 70 |
- : # http://bugreports.qt.nokia.com/browse/QTBUG-5909 |
| 71 |
- # workaround for compilation error on OSX (qt-gui) |
| 72 |
- ;; |
| 73 |
- *) |
| 74 |
- exceptions="-no-exceptions" |
| 75 |
- ;; |
| 76 |
- esac |
| 77 |
- fi |
| 78 |
+ 4.5.*) |
| 79 |
+ [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions" |
| 80 |
;; |
| 81 |
*) |
| 82 |
- [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions" |
| 83 |
+ has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)" |
| 84 |
;; |
| 85 |
esac |
Archives