From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8122139694 for ; Sun, 4 Jun 2017 13:32:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B11421C1F5; Sun, 4 Jun 2017 13:32:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 054B621C1F5 for ; Sun, 4 Jun 2017 13:32:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6067A34191C for ; Sun, 4 Jun 2017 13:32:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0666D7472 for ; Sun, 4 Jun 2017 13:32:44 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1496583155.7518ff161f46f5dd508f7b40ce07d2ecc39a44b9.kensington@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.9.0.ebuild dev-qt/qtgui/qtgui-5.9.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 7518ff161f46f5dd508f7b40ce07d2ecc39a44b9 X-VCS-Branch: master Date: Sun, 4 Jun 2017 13:32:44 +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: f6b605ff-9657-49eb-9dc3-358753f5e9f1 X-Archives-Hash: 9a31b2ddeb10a761a7c1b70a03e129cf commit: 7518ff161f46f5dd508f7b40ce07d2ecc39a44b9 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 4 13:32:30 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 4 13:32:35 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7518ff16 dev-qt/qtgui: fix build with USE="-dbus" Gentoo-bug: 620348 Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-qt/qtgui/qtgui-5.9.0.ebuild | 4 ++-- dev-qt/qtgui/qtgui-5.9.9999.ebuild | 4 ++-- dev-qt/qtgui/qtgui-5.9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.9.0.ebuild b/dev-qt/qtgui/qtgui-5.9.0.ebuild index b328d687..53aa133b 100644 --- a/dev-qt/qtgui/qtgui-5.9.0.ebuild +++ b/dev-qt/qtgui/qtgui-5.9.0.ebuild @@ -123,8 +123,8 @@ src_prepare() { # 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) - use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ - src/platformsupport/platformsupport.pro || die + qt_use_disable_config dbus dbus \ + src/platformsupport/themes/genericunix/genericunix.pri qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro diff --git a/dev-qt/qtgui/qtgui-5.9.9999.ebuild b/dev-qt/qtgui/qtgui-5.9.9999.ebuild index b328d687..53aa133b 100644 --- a/dev-qt/qtgui/qtgui-5.9.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9.9999.ebuild @@ -123,8 +123,8 @@ src_prepare() { # 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) - use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ - src/platformsupport/platformsupport.pro || die + qt_use_disable_config dbus dbus \ + src/platformsupport/themes/genericunix/genericunix.pri qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index b328d687..53aa133b 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -123,8 +123,8 @@ src_prepare() { # 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) - use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ - src/platformsupport/platformsupport.pro || die + qt_use_disable_config dbus dbus \ + src/platformsupport/themes/genericunix/genericunix.pri qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro