[gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/

[Michael Palimaka]

commit:     e1975f82bb815557122d62d984be7758c0452539
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 19:09:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 19:09:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e1975f82

media-libs/qt-gstreamer: drop qtquick1 dependency

Package-Manager: portage-2.2.28

 media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild 
b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
index 3677ba0..e5955c4 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -6,14 +6,14 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
        SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz";
-       KEYWORDS="~amd64 ~arm ~x86"
+       KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
        GIT_ECLASS="git-r3"
        EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
-       KEYWORDS=""
+       inherit git-r3
 fi
 
-inherit cmake-utils ${GIT_ECLASS} multibuild
+inherit cmake-utils multibuild
 
 DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
 HOMEPAGE="http://gstreamer.freedesktop.org/modules/qt-gstreamer.html";
@@ -27,8 +27,8 @@ REQUIRED_USE="|| ( qt4 qt5 )"
 RDEPEND="
        dev-libs/glib:2
        >=dev-libs/boost-1.40:=
-       media-libs/gst-plugins-base:1.0
        media-libs/gstreamer:1.0
+       media-libs/gst-plugins-base:1.0
        qt4? (
                dev-qt/qtcore:4
                dev-qt/qtdeclarative:4
@@ -40,16 +40,13 @@ RDEPEND="
                dev-qt/qtdeclarative:5
                dev-qt/qtgui:5
                dev-qt/qtopengl:5
-               dev-qt/qtquick1:5
                dev-qt/qtwidgets:5
        )
 "
-DEPEND="
-       ${RDEPEND}
+DEPEND="${RDEPEND}
        test? (
-               qt4? (
-                       dev-qt/qttest:4
-               )
+               qt4? ( dev-qt/qttest:4 )
+               qt5? ( dev-qt/qttest:5 )
        )
 "
 
@@ -63,6 +60,7 @@ pkg_setup() {
 src_configure() {
        myconfigure() {
                local mycmakeargs=(
+                       -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
                        -DQTGSTREAMER_EXAMPLES=OFF
                        -DQTGSTREAMER_TESTS=$(usex test)
                        -DQT_VERSION=${MULTIBUILD_VARIANT}