commit: d0167a532ebbb7d33bedfe96d7f0487168b4b360
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 16:38:13 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 16:38:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d0167a53
[dev-qt/qtgui:5] Make harfbuzz mandatory.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 1 -
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 10 +++++-----
dev-qt/qtgui/qtgui-5.5.9999.ebuild | 10 +++++-----
dev-qt/qtgui/qtgui-5.9999.ebuild | 10 +++++-----
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 539f157..c05ce15 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -11,7 +11,6 @@
<flag name="gles2">Use GLES 2.0 or later instead of full
OpenGL</flag>
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop
support</flag>
<flag name="gtkstyle">Build a Qt style called GTK+ that mimics
the active GTK+ theme</flag>
- <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for
text shaping</flag>
<flag name="ibus">Build the IBus input method plugin</flag>
<flag name="kms">Build the KMS platform plugin</flag>
<flag name="libinput">Enable input device support via
<pkg>dev-libs/libinput</pkg></flag>
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index a70a21d..171ad0e 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
@@ -30,6 +30,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.5.5:2
+ >=media-libs/harfbuzz-0.9.40:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
@@ -41,7 +42,6 @@ RDEPEND="
!!x11-libs/cairo[qt4]
)
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -105,8 +105,8 @@ QT5_GENTOO_CONFIG=(
gtkstyle:gtkstyle:
gtkstyle:gtk2:STYLE_GTK
!:no-gui:
- harfbuzz:system-harfbuzz:HARFBUZZ
- !harfbuzz:no-harfbuzz:
+ :system-harfbuzz:HARFBUZZ
+ !:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
@@ -157,7 +157,7 @@ src_configure() {
-system-freetype
$(usex gif '' -no-gif)
$(qt_use gtkstyle)
- $(qt_use harfbuzz harfbuzz system)
+ -system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
index a70a21d..171ad0e 100644
--- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
@@ -30,6 +30,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.5.5:2
+ >=media-libs/harfbuzz-0.9.40:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
@@ -41,7 +42,6 @@ RDEPEND="
!!x11-libs/cairo[qt4]
)
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -105,8 +105,8 @@ QT5_GENTOO_CONFIG=(
gtkstyle:gtkstyle:
gtkstyle:gtk2:STYLE_GTK
!:no-gui:
- harfbuzz:system-harfbuzz:HARFBUZZ
- !harfbuzz:no-harfbuzz:
+ :system-harfbuzz:HARFBUZZ
+ !:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
@@ -157,7 +157,7 @@ src_configure() {
-system-freetype
$(usex gif '' -no-gif)
$(qt_use gtkstyle)
- $(qt_use harfbuzz harfbuzz system)
+ -system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use libinput)
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index a70a21d..171ad0e 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
@@ -30,6 +30,7 @@ RDEPEND="
~dev-qt/qtcore-${PV}
media-libs/fontconfig
>=media-libs/freetype-2.5.5:2
+ >=media-libs/harfbuzz-0.9.40:=
>=sys-libs/zlib-1.2.5
virtual/opengl
dbus? ( ~dev-qt/qtdbus-${PV} )
@@ -41,7 +42,6 @@ RDEPEND="
!!x11-libs/cairo[qt4]
)
gles2? ( media-libs/mesa[gles2] )
- harfbuzz? ( >=media-libs/harfbuzz-0.9.40:= )
jpeg? ( virtual/jpeg:0 )
kms? (
media-libs/mesa[gbm]
@@ -105,8 +105,8 @@ QT5_GENTOO_CONFIG=(
gtkstyle:gtkstyle:
gtkstyle:gtk2:STYLE_GTK
!:no-gui:
- harfbuzz:system-harfbuzz:HARFBUZZ
- !harfbuzz:no-harfbuzz:
+ :system-harfbuzz:HARFBUZZ
+ !:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
@@ -157,7 +157,7 @@ src_configure() {
-system-freetype
$(usex gif '' -no-gif)
$(qt_use gtkstyle)
- $(qt_use harfbuzz harfbuzz system)
+ -system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use kms)
$(qt_use libinput)
