media-libs/phonon-4.7.1-r2: revbump/merge upstream, fix broken blocker

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

4 files changed, 23 insertions, 10 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 127597f..3c33069 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/phonon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.54 2013/12/06 12:54:16 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.56 2014/05/27 11:21:03 johu Exp $
+
+*phonon-4.7.1-r1 (27 May 2014)
+
+  27 May 2014; Johannes Huber <johu@gentoo.org> +phonon-4.7.1-r1.ebuild,
+  -phonon-4.7.1.ebuild, phonon-9999.ebuild:
+  Revision bump fixes automagic dependency on dev-libs/libqzeitgeist.
+
+  13 Mar 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml,
+  phonon-4.7.1.ebuild, phonon-9999.ebuild:
+  Introduce designer USE flag wrt bug #504460.
 
 *phonon-4.7.1 (06 Dec 2013)
 
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 7ef00a7..de7bdd1 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -2,6 +2,6 @@ AUX phonon-4.5.1-qmakeworkaround.patch 1084 SHA256 a8b22a299ceae59594ca74661af9c
 AUX phonon-4.6.0-rpath.patch 600 SHA256 354b590e07db72d9479d4895d305ac87a4a7b895524505cffcb7237e6259e727 SHA512 426e8a7ac82a2ddaa82500e93c41263a6113939bc5127ac87911d530dd691a19dc08c6929b7ea716a2cf6fb7577f44ef42f4a2c60982baf5e31eb933438a2fe2 WHIRLPOOL 7a8e60fe888388bff6e1bc671f085dd564d3492e56d2d7029b2738d433666828eddadfd47bc1cdf2dc6d301ab8473f6447bb100d7cbbfd961809d6f2d943065a
 AUX phonon-4.7.0-plugin-install.patch 1252 SHA256 a56f24ac961ab9c422d1a06adb602f720039b10ba7bde8ecb8aeeb1fa44a7be0 SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2 WHIRLPOOL eceea6af1b0a97475b8263b5e48bf1ae4b9d5a26adc9fbff240e39b414f9ba03c0ceb235821658cfcd865e50d638cb977b4ab748ffe264870d1336908b5c2e5a
 DIST phonon-4.7.1.tar.xz 329900 SHA256 4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d SHA512 64d0695bed48837d7c9a047500a18931014e1f52b7add491d8aa219ebe66a74724257ce644fac41bf1f237e7dc3d655003feb884d74c36a43fe285fb2265c902 WHIRLPOOL 7fe337d08e8114a709f4067438321973d1faea906cd41396c531faec57d0c348a900f5e8fd9cd5dcae1ca3275855faa25b036fe090fa3a75042f3cb7a0ac0359
-EBUILD phonon-4.7.1-r1.ebuild 2785 SHA256 4558cf81489e870f40e2f7e01562865fe656a15372ccc364fa67c7281d50bada SHA512 3e8a4665a1ada6e93a8a74f6c9a43d5771fb97f7bb9dbc18dc0e944b9e9b3a79b430098c04a5b9b50076b1cbe6469dd2f318c7e1bb9199a42dc7741973efb6de WHIRLPOOL 0dfceb8cb25f569ad1addba645c749304c13f7bbb5890b06d97091fb043a59585534282869f0cdacbbae3783c959faa99bc9f433cdb0318dc56f2cfdce7bd4f2
-MISC ChangeLog 17545 SHA256 43a3042fee04b01466ad5b231e68ef943d1e2379f821553210dca84c1fee51f4 SHA512 f93b956b98bd882b55110a345d5192e90992726fb320ed55ba717d3db557a720820dc4fbd92b3ecdbd5af9bbdfa2ccf3fdea4e51293112f3ba17cb77dca553b9 WHIRLPOOL 72800e620c28d25db24953b4c1d26617347bf90f2924dfcee40279a86dcc80106d4dd56e51a68f6ec5c096d1c86f989c1a8ddc27b1ac2db9c9870a4af8da75fa
-MISC metadata.xml 300 SHA256 30942d7da188e105a7f745018a518ecc4438fc8ae8840ecbbabd676eed725bc0 SHA512 06a922941c56ea38b578d632109105238b6c32d0027bb519e88ccad31ccb6685097b008ac3ecd57925e0b0caf8cc55115f2db0d7090a5355d4a5054b2561fff7 WHIRLPOOL 01a73fde630c918ed1e968db3e3b5f519a7a9b57d73f720d5db8527fbb18e3278292aadd1774b5836aee1fc4bf99364bfec9082983a42da0a27f5464bc17ea90
+EBUILD phonon-4.7.1-r2.ebuild 2937 SHA256 b589cec068ac2e878483fac5f25daf57a108ec153e52b317b532518b9176163f SHA512 c074125a1b76c68404babfc151fa6dc1eccb83726940c3140d94fe0d55d803c34242f85e28d6b3d81beb1911881180fdca519d070f178212b65dd712e9b2a3bd WHIRLPOOL 05bd8f837561c18ed2425bafd7ff0ce858c06e3cbeae720894cba4ac5939e7b16365899cc038d6e68ed9184d4bd51cfd1fb86c488707a4f52934be586f5b95ab
+MISC ChangeLog 17926 SHA256 91e0b811a6221e3a531a9aa65bbaf04da5e28d5b2cf7d26f568708d20518baec SHA512 f769d54f8a77be02f22a5aa8744f78e6ba8beb68cab0a275389059c669520fda40335b4eff0959979edc91449c9b06407090b707ea627dfd2a19b98eb2e81320 WHIRLPOOL 1b4709b0fb547a59dbce5f0e7aac54d369729fc26663bf99d98a6c376c8ccecd933efc2b213516c32f3084607a7afd804c16119445185ff2d3c5ffe691d8ba7d
+MISC metadata.xml 376 SHA256 b6e977c91e7d978354256178dccb1ac955d3450e8ebee18fdb7a92fca474dd25 SHA512 050b89a54756ef31146d2dd64ddad0335fbcbb4b22124d0bcf58de7f8a80555c9acf97523f8b581bafde53a67c1f27959ab13ff2e0030eae42a5c445bb676508 WHIRLPOOL d42c2272219d11d23d3e0e59b003e9c94cefbde390e47fd6009651fb6f5d2c18d8b7374f06c7b79c6622f2b7241af7f00d21a0087c84f0603e2ddf9493480535
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index 10f0c21..330295c 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>kde</herd>
 <use>
+	<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 	<flag name="vlc">Install VLC Phonon backend</flag>
 	<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
 </use>
diff --git a/media-libs/phonon/phonon-4.7.1-r1.ebuild b/media-libs/phonon/phonon-4.7.1-r2.ebuild
index a389998..27df590 100644
--- a/media-libs/phonon/phonon-4.7.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.7.1-r2.ebuild
@@ -20,16 +20,15 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="aqua debug +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
+IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
 
 COMMON_DEPEND="
 	!!dev-qt/qtphonon:4
 	qt4? (
 		dev-qt/qtcore:4[${MULTILIB_USEDEP}]
-		dev-qt/designer:4[${MULTILIB_USEDEP}]
 		dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
 		dev-qt/qtgui:4[${MULTILIB_USEDEP}]
-		dev-qt/qttest:4[${MULTILIB_USEDEP}]
+		designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
 	)
 	qt5? (
 		dev-qt/qtcore:5[${MULTILIB_USEDEP}]
@@ -37,7 +36,8 @@ COMMON_DEPEND="
 		dev-qt/qtdeclarative:5[${MULTILIB_USEDEP}]
 		dev-qt/qtgui:5[${MULTILIB_USEDEP}]
 		dev-qt/qtopengl:5[${MULTILIB_USEDEP}]
-		dev-qt/qttest:5[${MULTILIB_USEDEP}]
+		dev-qt/qtwidgets:5[${MULTILIB_USEDEP}]
+		designer? ( dev-qt/designer:5[${MULTILIB_USEDEP}] )
 	)
 	pulseaudio? (
 		dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	)
 	zeitgeist? ( dev-libs/libqzeitgeist[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-qtlibs-201310081
+		!<=app-emulation/emul-linux-x86-qtlibs-20140508-r8
 		!app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
 	)
 "
@@ -82,8 +82,10 @@ src_configure() {
 	myconfigure() {
 		local mycmakeargs=(
 			-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+			$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
 			$(cmake-utils_use_with pulseaudio GLIB2)
 			$(cmake-utils_use_with pulseaudio PulseAudio)
+			$(cmake-utils_use_with zeitgeist QZeitgeist)
 		)
 		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
 			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)