From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-714153-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id A703413877A
for <garchives@archives.gentoo.org>; Thu, 24 Jul 2014 22:43:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E4696E0ED6;
Thu, 24 Jul 2014 22:33:17 +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 9F6FBE0F2B
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Jul 2014 22:31:01 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 26B0D340D1B
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Jul 2014 01:05:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id B720D193E8
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Jul 2014 01:05:04 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
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" <pesa@gentoo.org>
Message-ID: <1406163063.91d676a9b5f7e0d6fbac03cb5be88989757e0d2a.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
X-VCS-Repository: proj/qt
X-VCS-Files: dev-qt/qtgui/qtgui-5.3.1.ebuild dev-qt/qtgui/qtgui-5.3.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: 91d676a9b5f7e0d6fbac03cb5be88989757e0d2a
X-VCS-Branch: master
Date: Thu, 24 Jul 2014 01:05:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d5afae57-75ef-49b5-8c67-c5e12713045c
X-Archives-Hash: 3f55b40316fdf7bf5d3acb94fe203e67
commit: 91d676a9b5f7e0d6fbac03cb5be88989757e0d2a
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 24 00:51:03 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 00:51:03 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=91d676a9
[dev-qt/qtgui:5] Convert to QT5_GENTOO_CONFIG.
Package-Manager: portage-2.2.10
---
dev-qt/qtgui/qtgui-5.3.1.ebuild | 54 +++++++++++++++++++++-----------------
dev-qt/qtgui/qtgui-5.3.9999.ebuild | 54 +++++++++++++++++++++-----------------
dev-qt/qtgui/qtgui-5.9999.ebuild | 54 +++++++++++++++++++++-----------------
3 files changed, 90 insertions(+), 72 deletions(-)
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index 273bc68..e2c6534 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -77,35 +77,41 @@ QT5_TARGET_SUBDIRS=(
src/plugins/platforms
)
-pkg_setup() {
- QCONFIG_ADD=(
- $(use accessibility && echo accessibility-atspi-bridge)
- $(usev egl && use xcb && echo egl_x11)
- $(usev eglfs)
- $(usev evdev && echo mtdev)
- fontconfig
- $(use gles2 && echo opengles2)
- $(use harfbuzz && echo system-harfbuzz)
- $(usev kms)
- $(usev opengl)
- $(use udev && echo libudev)
- $(usev xcb && echo xcb-plugin xcb-render xcb-sm xcb-xlib)
- )
- QCONFIG_DEFINE=(
- $(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
- $(use egl || echo QT_NO_EGL QT_NO_EGL_X11)
- $(use eglfs || echo QT_NO_EGLFS)
- $(use evdev || echo QT_NO_EVDEV)
- $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2)
- $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG)
- $(use opengl && echo QT_OPENGL || echo QT_NO_OPENGL)
- $(use png || echo QT_NO_IMAGEFORMAT_PNG)
- )
+QT5_GENTOO_CONFIG=(
+ accessibility:accessibility-atspi-bridge
+ egl
+ eglfs
+ evdev
+ evdev:mtdev:
+ :fontconfig
+ :system-freetype:FREETYPE
+ gles2::OPENGL_ES
+ gles2:opengles2:OPENGL_ES_2
+ harfbuzz:system-harfbuzz:HARFBUZZ
+ jpeg:system-jpeg:IMAGEFORMAT_JPEG
+ !jpeg:no-jpeg:
+ kms:kms:
+ opengl
+ png:png:
+ png:system-png:IMAGEFORMAT_PNG
+ !png:no-png:
+ udev:libudev:
+ xcb:xcb:
+ xcb:xcb-glx:
+ xcb:xcb-plugin:
+ xcb:xcb-render:
+ xcb:xcb-sm:
+ xcb:xcb-xlib:
+)
+pkg_setup() {
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
+ # egl_x11 is activated when both egl and xcb are enabled
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
qt5-build_pkg_setup
}
diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
index 273bc68..e2c6534 100644
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
@@ -77,35 +77,41 @@ QT5_TARGET_SUBDIRS=(
src/plugins/platforms
)
-pkg_setup() {
- QCONFIG_ADD=(
- $(use accessibility && echo accessibility-atspi-bridge)
- $(usev egl && use xcb && echo egl_x11)
- $(usev eglfs)
- $(usev evdev && echo mtdev)
- fontconfig
- $(use gles2 && echo opengles2)
- $(use harfbuzz && echo system-harfbuzz)
- $(usev kms)
- $(usev opengl)
- $(use udev && echo libudev)
- $(usev xcb && echo xcb-plugin xcb-render xcb-sm xcb-xlib)
- )
- QCONFIG_DEFINE=(
- $(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
- $(use egl || echo QT_NO_EGL QT_NO_EGL_X11)
- $(use eglfs || echo QT_NO_EGLFS)
- $(use evdev || echo QT_NO_EVDEV)
- $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2)
- $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG)
- $(use opengl && echo QT_OPENGL || echo QT_NO_OPENGL)
- $(use png || echo QT_NO_IMAGEFORMAT_PNG)
- )
+QT5_GENTOO_CONFIG=(
+ accessibility:accessibility-atspi-bridge
+ egl
+ eglfs
+ evdev
+ evdev:mtdev:
+ :fontconfig
+ :system-freetype:FREETYPE
+ gles2::OPENGL_ES
+ gles2:opengles2:OPENGL_ES_2
+ harfbuzz:system-harfbuzz:HARFBUZZ
+ jpeg:system-jpeg:IMAGEFORMAT_JPEG
+ !jpeg:no-jpeg:
+ kms:kms:
+ opengl
+ png:png:
+ png:system-png:IMAGEFORMAT_PNG
+ !png:no-png:
+ udev:libudev:
+ xcb:xcb:
+ xcb:xcb-glx:
+ xcb:xcb-plugin:
+ xcb:xcb-render:
+ xcb:xcb-sm:
+ xcb:xcb-xlib:
+)
+pkg_setup() {
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
+ # egl_x11 is activated when both egl and xcb are enabled
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
qt5-build_pkg_setup
}
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 1dc3409..463516f 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -78,35 +78,41 @@ QT5_TARGET_SUBDIRS=(
src/plugins/platforms
)
-pkg_setup() {
- QCONFIG_ADD=(
- $(use accessibility && echo accessibility-atspi-bridge)
- $(usev egl && use xcb && echo egl_x11)
- $(usev eglfs)
- $(usev evdev && echo mtdev)
- fontconfig
- $(use gles2 && echo opengles2)
- $(use harfbuzz && echo system-harfbuzz)
- $(usev kms)
- $(usev opengl)
- $(use udev && echo libudev)
- $(usev xcb && echo xcb-plugin xcb-render xcb-sm xcb-xlib)
- )
- QCONFIG_DEFINE=(
- $(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
- $(use egl || echo QT_NO_EGL QT_NO_EGL_X11)
- $(use eglfs || echo QT_NO_EGLFS)
- $(use evdev || echo QT_NO_EVDEV)
- $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2)
- $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG)
- $(use opengl && echo QT_OPENGL || echo QT_NO_OPENGL)
- $(use png || echo QT_NO_IMAGEFORMAT_PNG)
- )
+QT5_GENTOO_CONFIG=(
+ accessibility:accessibility-atspi-bridge
+ egl
+ eglfs
+ evdev
+ evdev:mtdev:
+ :fontconfig
+ :system-freetype:FREETYPE
+ gles2::OPENGL_ES
+ gles2:opengles2:OPENGL_ES_2
+ harfbuzz:system-harfbuzz:HARFBUZZ
+ jpeg:system-jpeg:IMAGEFORMAT_JPEG
+ !jpeg:no-jpeg:
+ kms:kms:
+ opengl
+ png:png:
+ png:system-png:IMAGEFORMAT_PNG
+ !png:no-png:
+ udev:libudev:
+ xcb:xcb:
+ xcb:xcb-glx:
+ xcb:xcb-plugin:
+ xcb:xcb-render:
+ xcb:xcb-sm:
+ xcb:xcb-xlib:
+)
+pkg_setup() {
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions)
use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
+ # egl_x11 is activated when both egl and xcb are enabled
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
+
qt5-build_pkg_setup
}