Allow minitube to build against qt-phonon despite the gstreamer use flag status. Bug #357111. Thanks to Jorge Manuel B. S. Vicetto for the patch

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 26 insertions, 21 deletions

diff --git a/media-video/minitube/ChangeLog b/media-video/minitube/ChangeLog
index fdce77e6ace5..538bf050a26d 100644
--- a/media-video/minitube/ChangeLog
+++ b/media-video/minitube/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/minitube
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.44 2011/02/10 22:35:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.45 2011/03/09 21:01:51 hwoarang Exp $
+
+  09 Mar 2011; Markos Chandras <hwoarang@gentoo.org> minitube-1.4.ebuild:
+  Allow minitube to build against qt-phonon despite the gstreamer use flag
+  status. Bug #357111. Thanks to Jorge Manuel B. S. Vicetto for the patch
 
 *minitube-1.4 (10 Feb 2011)
 
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index 890b06e3a151..043aa2ceb11d 100644
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST minitube-1.3.tar.gz 430509 RMD160 18c7174c70da4d8cc5030311d2714c4711fac029 SHA1 d9ebd74f04c7f20274e10164d42d7b6f0785415d SHA256 4be865887cafcea0a23307034a4b519386d2954f5ce05923b682b0eb96b509c0
 DIST minitube-1.4.tar.gz 444068 RMD160 7012400263f30b724eb5a659d647ca0409a77c98 SHA1 8ab536c57b3c477e9946c1b823ce0b8f57f51185 SHA256 5ed032de1b4f6e2b1e88e4b2c881efd63a26a255db44d5c9528b6abb134e3db9
 EBUILD minitube-1.3.ebuild 1648 RMD160 fd342f9d69df06715663bd3369b9074160bf321f SHA1 11f8259fe5f6f1fe221e80eddebb93f3cf05d986 SHA256 7cecd2c33a56e207e560395f9293bb8fb90a9667805e1e2aca479df7b4e4c0b4
-EBUILD minitube-1.4.ebuild 1650 RMD160 86bb40b2f994ab072db7e9911929d793268c2d7a SHA1 f05fa4288402d1b79c36deaf07fbb360c5c61aa2 SHA256 809987b00dc42c6e97342d2e76eb92b85e5f631e9b7c65d671beef66e80386d1
-MISC ChangeLog 6394 RMD160 22042097ab8e2e205545e6e76d4f97eba1d037d5 SHA1 b27c78f8e041108af0ca70b8a2c7837100c20295 SHA256 f856706759c3fb1ae02b4790f070dbbce69df10f8b0d8472899f1ca30aee27aa
+EBUILD minitube-1.4.ebuild 1604 RMD160 352c57cf5749d7ddc00d32ec1161b61793dabdca SHA1 f3f7a098bfaf48e4cd1dc814359d853827ef30b3 SHA256 f8408811a25bd295c4213187e5d5f22894026a16afd1b5e1b1b17b48ed731173
+MISC ChangeLog 6618 RMD160 2df66c74aa5dead646e6ec3d0351d601c7bccd1f SHA1 b4f29348fa48cb4ee22f65dd6b95cb12068052e8 SHA256 ff2acd270bb67e59d5e3ec92c3940e8a24278ee7539c81b4e093efbbffc2fac0
 MISC metadata.xml 265 RMD160 e723dc6fc78de62b3144444b1329d9791b1f2099 SHA1 4ed7a4469aafc625f36fb28d3b7932d1c9e75f91 SHA256 218f4f107ec5040834a5d0d24c83e179cdd83cdb49a639fa29df53f479a680c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNVGg8AAoJEPqDWhW0r/LCyAgP/2s712WnSYG4BEVZBpiZzKub
-cgtmDHq62afXbP9E9N6YztDtJFx0uuZzMFW/3ompODAJBACj3RVYjB8meo6HJKXD
-0P7cWRSWwbEYjkIbF8c/tMOXxBZ+ngjYgdxuNGxC9SU325NXMoQy/g0eMgnHBjRy
-/JJzS3ziEsAOXeyAO7JfAusvXXY18F03xllW7brFZfld5ZzjVZIZL/LAhD1lV4hu
-hUe/kA97xqWbQoPTSQAEw4CKEKswRh6TgKKkvyXj/dsFxIYRTy7GxqC0Ko/Pa19B
-LQHG/wfMJm+u07MCbj1YWpjQKu9mlr1yfe5qSUA1ei8Ws3HIvUmaB+rcqnaLJQmL
-T93moqANAsCAoDM6QZB8qvMk/VXQzC5Lz2O3sawsIDmRcUBPTw8kioWKDtYp2nat
-mNIp6LsdKZyKPJwEn/sFfvkA2r1f7AQpkOF4pPBX5Np00C4BrbqOry4KtZIrAtNm
-ohOMNWN154DFvAZc1Z3le/hD98zkuDhJxMF87vdNo6efn9b/xdlmrboTSEtxtTb/
-s+SCm7JzB1d+dU0XOnCkpWNMhG3MtayRdxrbCZks5FiqRbqR8QYq8iBKm4jDPjrL
-x6OqJu7FvhaihDLiEMbaMvTTRt8jlxAA4O3on7lUWG5DmwdSkz6jjXFXUptZRvp0
-whryh30DE9zHIdjWbgPs
-=hbFN
+iQIcBAEBCgAGBQJNd+q0AAoJEPqDWhW0r/LCbaQP/ignuvPU9Y694WCQXC9Z50LJ
+2sz5ahwJqbWK4d44q7Lr0gvwYuJ00YOjTXPuABO6TJL2JlLeg9stHxtMn02Co2WE
+cF2tBjfK+j7H9rb2UdvMTxScd6SV6F1eVHRc3WFfcm0fckvGXaE0YSgMi61OOZtP
+kQuPYIVR5zChcnkm5stCIrMhmD3KyssOLH0zWF18r1ZB3URJmsgQOr7JWQJxcr6t
+A46bOKiQAO2ZPvup1Vek68lm4aUT/kHL9UopGsE7+NC4qucXg5SUBRwGKdNujP7L
+x+jooKvaUoc2ccMzUBi4CYT1NvgWsb/Dgqb8qpw/M//crWA/JEbAw/kVtxCC9mhQ
+hO01o9zq2KBrrdqHFhqpprSC4LEvVwiuimSJvHCTUypX0n/4dOyA27h7g1o1BW7n
+y0nb5NfE7Ggntxxmeclr70vnTckb/DSxlEkUrbZCDEj3iX62g2mjTF0QgmgR5OLk
+8H+5p/Z/8bnLIkQTsCNR4qy3dxrc1k6K8IADXcHW9kmyfuGK4fdOo+uK5OQu7kOT
+0ZsYZl9LYSQHjCivV2UBjm8JiwpohBRRw0nRInQ0FsOFxH0oeLl/RMqSgtnMyjdl
+EQvKRrvwo0qTN7fWDUnRzJUEUBLt+MJWaggKifwcM6uKX18VnCkxcs2EIEJl7igT
+1nE/zidnFEMglDHAKpA9
+=9gfs
 -----END PGP SIGNATURE-----
diff --git a/media-video/minitube/minitube-1.4.ebuild b/media-video/minitube/minitube-1.4.ebuild
index 9a29d99433d5..e8e6ce54c6e0 100644
--- a/media-video/minitube/minitube-1.4.ebuild
+++ b/media-video/minitube/minitube-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-1.4.ebuild,v 1.1 2011/02/10 22:35:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-1.4.ebuild,v 1.2 2011/03/09 21:01:51 hwoarang Exp $
 
 EAPI="2"
 LANGS="ar es pt_BR pt_PT uk"
@@ -20,14 +20,15 @@ IUSE="debug kde gstreamer"
 
 DEPEND="x11-libs/qt-gui:4[accessibility]
 	x11-libs/qt-dbus:4
+	kde? ( || ( media-sound/phonon[gstreamer?]  x11-libs/qt-phonon:4 ) )
+	!kde? ( || ( x11-libs/qt-phonon media-sound/phonon[gstreamer?] ) )
 	gstreamer? (
-		kde? ( || ( media-sound/phonon[gstreamer]  x11-libs/qt-phonon:4 ) )
-		!kde? ( || ( x11-libs/qt-phonon media-sound/phonon[gstreamer] ) )
 		media-plugins/gst-plugins-soup
 		media-plugins/gst-plugins-ffmpeg
 		media-plugins/gst-plugins-faac
-		media-plugins/gst-plugins-faad )
-	!gstreamer? ( media-sound/phonon[-gstreamer] )"
+		media-plugins/gst-plugins-faad
+	)
+"
 
 RDEPEND="${DEPEND}"