commit:     3c7ccc40ac224ac086c1660342eb6f06669a402a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 19:37:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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
 }

Reply via email to