[gentoo-commits] proj/qt:master commit in: dev-python/pyside/

[Davide Pesavento]

commit:     6865d1f84a82750b90c88b9578fe077380037f8b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 18:09:10 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May  7 18:09:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6865d1f8

dev-python/pyside: handle QtMultimediaWidgets module

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-python/pyside/metadata.xml       | 2 +-
 dev-python/pyside/pyside-9999.ebuild | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index 6dff63cb..a4b07195 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -11,7 +11,7 @@
                <flag name="designer">Build QtDesigner and QtUiTools 
modules</flag>
                <flag name="gui">Build QtGui module</flag>
                <flag name="help">Build QtHelp module</flag>
-               <flag name="multimedia">Build QtMultimedia module</flag>
+               <flag name="multimedia">Build QtMultimedia and 
QtMultimediaWidgets modules</flag>
                <flag name="network">Build QtNetwork module</flag>
                <flag name="opengl">Build QtOpenGL module</flag>
                <flag name="printsupport">Build QtPrintSupport module</flag>

diff --git a/dev-python/pyside/pyside-9999.ebuild 
b/dev-python/pyside/pyside-9999.ebuild
index e928ede9..add5ade8 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -50,7 +50,7 @@ REQUIRED_USE="
 #   find_package(Qt5 ${QT_PV} REQUIRED COMPONENTS Core)
 QT_PV="5.6*:5"
 
-RDEPEND="
+DEPEND="
        ${PYTHON_DEPS}
        >=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
        =dev-qt/qtcore-${QT_PV}
@@ -79,7 +79,7 @@ RDEPEND="
        testlib? ( =dev-qt/qttest-${QT_PV} )
        widgets? ( =dev-qt/qtwidgets-${QT_PV} )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
        #FIXME: Remove the following "sed" patch after this upstream issue is 
closed:
@@ -102,7 +102,7 @@ src_configure() {
        # For each line of the form "CHECK_PACKAGE_FOUND(${PACKAGE_NAME} opt)" 
in
        # PySide2/CMakeLists.txt defining an optional dependency, an option of 
the
        # form "-DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGE_NAME}=$(usex 
!${USE_FLAG})"
-       # is passed to "cmake" here conditionally disabling this dependency.
+       # is passed to cmake here conditionally disabling this dependency.
        local mycmakeargs=(
                -DBUILD_TESTS=$(usex test)
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
@@ -111,6 +111,7 @@ src_configure() {
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
+               -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex 
!multimedia)
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5OpenGL=$(usex !opengl)
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !declarative)