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 0A4B71395E2 for ; Thu, 1 Dec 2016 13:49:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 674A5E0B8D; Thu, 1 Dec 2016 13:49:30 +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 4017EE0B8D for ; Thu, 1 Dec 2016 13:49:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E74B7340A23 for ; Thu, 1 Dec 2016 13:49:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B330624A4 for ; Thu, 1 Dec 2016 13:49:24 +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: <1480600150.3c7ccc40ac224ac086c1660342eb6f06669a402a.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.8.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: 3c7ccc40ac224ac086c1660342eb6f06669a402a X-VCS-Branch: master Date: Thu, 1 Dec 2016 13:49:24 +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: ce6d87b5-4d9d-4541-a07f-8953075f3586 X-Archives-Hash: ce0522e53ed7cdb308ca0d91c067ec9e commit: 3c7ccc40ac224ac086c1660342eb6f06669a402a Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 30 19:37:07 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 1 13:49:10 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c7ccc40 dev-qt/qtgui: fix automagic dependency Package-Manager: portage-2.3.2 dev-qt/qtgui/qtgui-5.8.9999.ebuild | 11 ++++++----- dev-qt/qtgui/qtgui-5.9999.ebuild | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.8.9999.ebuild b/dev-qt/qtgui/qtgui-5.8.9999.ebuild index b4e9ee6..93d456c 100644 --- a/dev-qt/qtgui/qtgui-5.8.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.8.9999.ebuild @@ -15,7 +15,7 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk - ibus jpeg libinput +png tslib tuio +udev +xcb" + ibus jpeg libinput +png tslib tuio +udev vnc +xcb" REQUIRED_USE=" || ( eglfs xcb ) accessibility? ( dbus xcb ) @@ -56,6 +56,7 @@ RDEPEND=" tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) + vnc? ( ~dev-qt/qtnetwork-${PV} ) xcb? ( x11-libs/libICE x11-libs/libSM @@ -133,16 +134,16 @@ 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) - # avoid automagic dep on qtdbus use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ src/platformsupport/platformsupport.pro || die + qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro + qt_use_disable_mod ibus dbus \ src/plugins/platforminputcontexts/platforminputcontexts.pro - # avoid automagic dep on qtnetwork - use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ - src/plugins/generic/generic.pro || die + use vnc || sed -i -e '/SUBDIRS += vnc/d' \ + src/plugins/platforms/platforms.pro || die qt5-build_src_prepare } diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index b4e9ee6..93d456c 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -15,7 +15,7 @@ fi # TODO: linuxfb IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk - ibus jpeg libinput +png tslib tuio +udev +xcb" + ibus jpeg libinput +png tslib tuio +udev vnc +xcb" REQUIRED_USE=" || ( eglfs xcb ) accessibility? ( dbus xcb ) @@ -56,6 +56,7 @@ RDEPEND=" tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) + vnc? ( ~dev-qt/qtnetwork-${PV} ) xcb? ( x11-libs/libICE x11-libs/libSM @@ -133,16 +134,16 @@ 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) - # avoid automagic dep on qtdbus use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ src/platformsupport/platformsupport.pro || die + qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro + qt_use_disable_mod ibus dbus \ src/plugins/platforminputcontexts/platforminputcontexts.pro - # avoid automagic dep on qtnetwork - use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ - src/plugins/generic/generic.pro || die + use vnc || sed -i -e '/SUBDIRS += vnc/d' \ + src/plugins/platforms/platforms.pro || die qt5-build_src_prepare }