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 EBC81138247 for ; Tue, 12 Nov 2013 23:25:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81DA8E0A7D; Tue, 12 Nov 2013 23:25:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A97FE0A7D for ; Tue, 12 Nov 2013 23:25:18 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C01C633F225 for ; Tue, 12 Nov 2013 23:25:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3AD15E530A for ; Tue, 12 Nov 2013 23:25:16 +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: <1384298694.d5cd89de3e810e06448c12851360d8f57933afb0.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.2.0_beta1.ebuild dev-qt/qtgui/qtgui-5.2.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: d5cd89de3e810e06448c12851360d8f57933afb0 X-VCS-Branch: master Date: Tue, 12 Nov 2013 23:25:16 +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: 179d0ead-9fa3-48b1-a3ac-d720781d90f9 X-Archives-Hash: a33d7474438933cdea26a5cf12346eb4 commit: d5cd89de3e810e06448c12851360d8f57933afb0 Author: Davide Pesavento gmail com> AuthorDate: Tue Nov 12 23:24:54 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Nov 12 23:24:54 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d5cd89de [dev-qt/qtgui:5] More thorough handling of QCONFIG_DEFINE flags. Should fix bug 489278. Package-Manager: portage-2.2.7 --- dev-qt/qtgui/qtgui-5.2.0_beta1.ebuild | 8 +++++--- dev-qt/qtgui/qtgui-5.2.9999.ebuild | 8 +++++--- dev-qt/qtgui/qtgui-5.9999.ebuild | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.2.0_beta1.ebuild b/dev-qt/qtgui/qtgui-5.2.0_beta1.ebuild index ca90fec..ad6a957 100644 --- a/dev-qt/qtgui/qtgui-5.2.0_beta1.ebuild +++ b/dev-qt/qtgui/qtgui-5.2.0_beta1.ebuild @@ -93,9 +93,11 @@ pkg_setup() { ) QCONFIG_DEFINE=( $(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) - $(use eglfs && echo QT_EGLFS) - $(use gles2 && echo QT_EGL) - $(use jpeg && echo QT_IMAGEFORMAT_JPEG) + $(use eglfs || echo QT_NO_EGLFS) + $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2 || echo QT_NO_EGL) + $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG) + $(use opengl || echo QT_NO_OPENGL) + $(use png || echo QT_NO_IMAGEFORMAT_PNG) ) use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) diff --git a/dev-qt/qtgui/qtgui-5.2.9999.ebuild b/dev-qt/qtgui/qtgui-5.2.9999.ebuild index ca90fec..ad6a957 100644 --- a/dev-qt/qtgui/qtgui-5.2.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.2.9999.ebuild @@ -93,9 +93,11 @@ pkg_setup() { ) QCONFIG_DEFINE=( $(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) - $(use eglfs && echo QT_EGLFS) - $(use gles2 && echo QT_EGL) - $(use jpeg && echo QT_IMAGEFORMAT_JPEG) + $(use eglfs || echo QT_NO_EGLFS) + $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2 || echo QT_NO_EGL) + $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG) + $(use opengl || echo QT_NO_OPENGL) + $(use png || echo QT_NO_IMAGEFORMAT_PNG) ) use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index ca90fec..ad6a957 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -93,9 +93,11 @@ pkg_setup() { ) QCONFIG_DEFINE=( $(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) - $(use eglfs && echo QT_EGLFS) - $(use gles2 && echo QT_EGL) - $(use jpeg && echo QT_IMAGEFORMAT_JPEG) + $(use eglfs || echo QT_NO_EGLFS) + $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2 || echo QT_NO_EGL) + $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG) + $(use opengl || echo QT_NO_OPENGL) + $(use png || echo QT_NO_IMAGEFORMAT_PNG) ) use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)