From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 86012138D02 for ; Wed, 24 Jun 2015 16:38:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8B6AE076D; Wed, 24 Jun 2015 16:38:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C52BE076D for ; Wed, 24 Jun 2015 16:38:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87D463408EE for ; Wed, 24 Jun 2015 16:38:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD85AA4D for ; Wed, 24 Jun 2015 16:38:21 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1435163893.d0167a532ebbb7d33bedfe96d7f0487168b4b360.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/metadata.xml dev-qt/qtgui/qtgui-5.5.0_rc.ebuild dev-qt/qtgui/qtgui-5.5.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: d0167a532ebbb7d33bedfe96d7f0487168b4b360 X-VCS-Branch: master Date: Wed, 24 Jun 2015 16:38:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 82801400-6683-4768-bdb6-727ddd5dd325 X-Archives-Hash: 5b4a8eddd430f8e5aba90266efbfcb6b commit: d0167a532ebbb7d33bedfe96d7f0487168b4b360 Author: Davide Pesavento gentoo org> AuthorDate: Wed Jun 24 16:38:13 2015 +0000 Commit: Davide Pesavento gentoo 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 @@ Use GLES 2.0 or later instead of full OpenGL Enable dev-libs/glib eventloop support Build a Qt style called GTK+ that mimics the active GTK+ theme - Use media-libs/harfbuzz for text shaping Build the IBus input method plugin Build the KMS platform plugin Enable input device support via dev-libs/libinput 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)