Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
Date: Tue, 01 Oct 2013 00:01:14
Message-Id: 1380585264.fe0070242d3fa1eeb6e090dfe76825642ff2912a.pesa@gentoo
1 commit: fe0070242d3fa1eeb6e090dfe76825642ff2912a
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Mon Sep 30 23:54:24 2013 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 30 23:54:24 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe007024
7
8 [dev-qt/qtgui:5] Add USE=harfbuzz.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 dev-qt/qtgui/metadata.xml | 3 +++
14 dev-qt/qtgui/qtgui-5.2.9999.ebuild | 6 +++++-
15 dev-qt/qtgui/qtgui-5.9999.ebuild | 6 +++++-
16 3 files changed, 13 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
19 index e48197a..315ddb4 100644
20 --- a/dev-qt/qtgui/metadata.xml
21 +++ b/dev-qt/qtgui/metadata.xml
22 @@ -14,6 +14,9 @@
23 <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
24 <flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
25 GTK+ theme</flag>
26 + <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for text shaping
27 + (EXPERIMENTAL). If enabled, it can still be disabled at runtime by
28 + setting QT_HARFBUZZ environment variable to &quot;old&quot;.</flag>
29 <flag name="kms">Enable KMS-based QPA plugin</flag>
30 <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
31 this does not mean you can compile pure Qt3 programs with Qt4.</flag>
32
33 diff --git a/dev-qt/qtgui/qtgui-5.2.9999.ebuild b/dev-qt/qtgui/qtgui-5.2.9999.ebuild
34 index 570d207..417d5d1 100644
35 --- a/dev-qt/qtgui/qtgui-5.2.9999.ebuild
36 +++ b/dev-qt/qtgui/qtgui-5.2.9999.ebuild
37 @@ -18,7 +18,7 @@ fi
38
39 # TODO: directfb, linuxfb, ibus
40
41 -IUSE="accessibility eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
42 +IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb"
43 REQUIRED_USE="
44 eglfs? ( evdev gles2 )
45 gles2? ( opengl )
46 @@ -36,6 +36,7 @@ RDEPEND="
47 media-libs/mesa[egl,gles]
48 ) )
49 glib? ( dev-libs/glib:2 )
50 + harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
51 jpeg? ( virtual/jpeg:0 )
52 kms? (
53 media-libs/mesa[gbm]
54 @@ -79,6 +80,7 @@ pkg_setup() {
55 $(usev evdev)
56 fontconfig
57 $(use gles2 && echo egl opengles2)
58 + $(use harfbuzz && echo system-harfbuzz)
59 $(usev kms)
60 $(usev opengl)
61 $(use udev && echo libudev)
62 @@ -112,9 +114,11 @@ src_configure() {
63 $(qt_use eglfs)
64 $(qt_use evdev)
65 -fontconfig
66 + -system-freetype
67 $(use gif || echo -no-gif)
68 ${gl}
69 $(qt_use glib)
70 + $(qt_use harfbuzz harfbuzz system)
71 $(qt_use jpeg libjpeg system)
72 $(qt_use kms)
73 $(qt_use png libpng system)
74
75 diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
76 index 570d207..417d5d1 100644
77 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild
78 +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
79 @@ -18,7 +18,7 @@ fi
80
81 # TODO: directfb, linuxfb, ibus
82
83 -IUSE="accessibility eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
84 +IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb"
85 REQUIRED_USE="
86 eglfs? ( evdev gles2 )
87 gles2? ( opengl )
88 @@ -36,6 +36,7 @@ RDEPEND="
89 media-libs/mesa[egl,gles]
90 ) )
91 glib? ( dev-libs/glib:2 )
92 + harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= )
93 jpeg? ( virtual/jpeg:0 )
94 kms? (
95 media-libs/mesa[gbm]
96 @@ -79,6 +80,7 @@ pkg_setup() {
97 $(usev evdev)
98 fontconfig
99 $(use gles2 && echo egl opengles2)
100 + $(use harfbuzz && echo system-harfbuzz)
101 $(usev kms)
102 $(usev opengl)
103 $(use udev && echo libudev)
104 @@ -112,9 +114,11 @@ src_configure() {
105 $(qt_use eglfs)
106 $(qt_use evdev)
107 -fontconfig
108 + -system-freetype
109 $(use gif || echo -no-gif)
110 ${gl}
111 $(qt_use glib)
112 + $(qt_use harfbuzz harfbuzz system)
113 $(qt_use jpeg libjpeg system)
114 $(qt_use kms)
115 $(qt_use png libpng system)