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

[Michael Palimaka]

commit:     eecf4480276ce647cd4feb0a8f7c3a7c92497d0a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 16:43:51 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 16:43:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=eecf4480

[dev-qt/designer] Improve phonon support wrt bug #477632.

Introduces kde USE flag to pull designer plugin from media-libs/phonon instead 
of the deprecated dev-qt/phonon.

Package-Manager: portage-2.2.17

 dev-qt/designer/designer-4.8.9999.ebuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-qt/designer/designer-4.8.9999.ebuild 
b/dev-qt/designer/designer-4.8.9999.ebuild
index a67682f..39d07bc 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -15,18 +15,19 @@ else
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS}"
+IUSE="${DESIGNER_PLUGINS} kde"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
        ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
        ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
        declarative? ( 
~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-       phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+       phonon? ( !kde? ( 
~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) )
        qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] 
)
        webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
+PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )"
 
 QT4_TARGET_DIRECTORIES="tools/designer"
 
@@ -35,8 +36,13 @@ src_prepare() {
 
        local plugin
        for plugin in ${DESIGNER_PLUGINS}; do
-               use ${plugin} || sed -i -e "/\<${plugin}\>/d" \
-                       tools/designer/src/plugins/plugins.pro || die
+               if use ${plugin} ; then
+                       if [[ ${plugin} == phonon ]] && use kde ; then
+                               continue
+                       fi
+                       sed -i -e "/\<${plugin}\>/d" \
+                               tools/designer/src/plugins/plugins.pro || die
+               fi
        done
 }