Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-core/
Date: Tue, 27 Nov 2012 12:02:36
Message-Id: 1354007961.c6854cd8a6ccd392ac5d48ccc0788a21d7343d4b.pesa@gentoo
1 commit: c6854cd8a6ccd392ac5d48ccc0788a21d7343d4b
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Tue Nov 27 09:19:21 2012 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 27 09:19:21 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c6854cd8
7
8 [x11-libs/qt-core:4] Remove USE=optimized-qmake wrt bug 434780.
9
10 ---
11 x11-libs/qt-core/metadata.xml | 1 -
12 x11-libs/qt-core/qt-core-4.8.9999.ebuild | 3 +--
13 2 files changed, 1 insertions(+), 3 deletions(-)
14
15 diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml
16 index eb61685..7d709fa 100644
17 --- a/x11-libs/qt-core/metadata.xml
18 +++ b/x11-libs/qt-core/metadata.xml
19 @@ -8,7 +8,6 @@
20 <flag name="exceptions">Add support for exceptions - like catching them
21 inside the event loop (recommended by Nokia)</flag>
22 <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
23 - <flag name="optimized-qmake">Enable qmake optimization</flag>
24 <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
25 this does not mean you can compile pure Qt3 programs with Qt4.</flag>
26 </use>
27
28 diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
29 index 242cd7b..f4e2ed6 100644
30 --- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
31 +++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
32 @@ -13,7 +13,7 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
33 else
34 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
35 fi
36 -IUSE="+glib iconv icu optimized-qmake qt3support ssl"
37 +IUSE="+glib iconv icu qt3support ssl"
38
39 DEPEND="
40 sys-libs/zlib
41 @@ -107,7 +107,6 @@ src_configure() {
42 $(qt_use glib)
43 $(qt_use iconv)
44 $(qt_use icu)
45 - $(qt_use optimized-qmake)
46 $(use ssl && echo -openssl-linked || echo -no-openssl)
47 $(qt_use qt3support)"