Don't fail if gstreamer is not installed, since other phonon backends may have been selected. Fixes bug 490902.

Do the same with QtMultimedia audio backend.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 24 insertions, 20 deletions

diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index 90804557d0a3..5e8957d17bd6 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtdemo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.9 2013/11/04 21:43:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.10 2013/12/28 02:06:13 pesa Exp $
+
+  28 Dec 2013; Davide Pesavento <pesa@gentoo.org> qtdemo-4.8.5-r1.ebuild:
+  Don't fail if gstreamer is not installed, since other phonon backends may have
+  been selected. Fixes bug 490902. Do the same with QtMultimedia audio backend.
 
   04 Nov 2013; Agostino Sarubbo <ago@gentoo.org> qtdemo-4.8.5-r1.ebuild:
   Stable for ppc64, wrt bug #488536
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index dc17b81b98a3..1cc7dfa864ad 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtdemo-4.8.4.ebuild 2820 SHA256 78b2416dcfa2440424c94083f7aab9cb5586553d6177fb99a68cb933250092ef SHA512 914c48eb9cea03bc74e4564bc8bdb3359b5eafb5a46d0544acd65ce044dd69bfb5381f6003b55483d0276d60d6c965c5f9fb6030812b7ef20b6b654fde005b9d WHIRLPOOL 1160c59e520fbb3c795e0dda59194535e961d4b865b4698fec21a9e98c1d38529d29d40cbf4b9b4cf6e431bb4c19286ac1cd19c9bb6c4e5f946ba35b55310f08
-EBUILD qtdemo-4.8.5-r1.ebuild 2884 SHA256 69e0f3b430200c25038f317a68561eace89d55cb9aa6c998ed1f57783c03b9b5 SHA512 72a4489798b0dcdfbe045499e143dd090dabc59b176520d9b152604de3bdd15583113ac9253f64ae1260a5fe676e246474b51ad0743c693b726b11452b1304b3 WHIRLPOOL e8e792a3edafe380a62b8516fdcae808ef7e26eb790c17cfd1efcb5cc8267cff12d7dd7ab019f1068c353813a060b7dab1a3eb01644326d1075135472d5f9e96
-MISC ChangeLog 13928 SHA256 d44b502e58de47058b72890b9cc546ea05b334121680d58364be6e90dfc5eb07 SHA512 5221a38cd4f6f4630bed4bc533aeb5252b080594db8c296280b9cdc42725517bf0af5614293260cbebd1b9251b805b1b76d81e4d85554f32f33da1b67483efc2 WHIRLPOOL 26ded09e627d6f1b901aee708d6e8da1f5e656de4865eb66b74869d737d17854792f6d5be3fa277926b611fe44b0109898d42af5c4e3c86d38ba429c45d10be9
+EBUILD qtdemo-4.8.5-r1.ebuild 2922 SHA256 2a8b0b050419c6b15dc62aa5e64ddc129c9107899c2ae96385425132b2ece2eb SHA512 7b35bf6737ea85c04653077a7d763dc833f44c858a177381fc45029651038f1d8814192d2e06f68b3a36f1d3042efc6a9bc6507cc25ea9bf783f789701e6214c WHIRLPOOL ce22d3812314352f3a7cd3648c92538ac79004ee09309da552b794004378420dbe52b4546110331d55ce8e09e305e7c72fe1b9b1ebc769e7f7521fba50c5202e
+MISC ChangeLog 14166 SHA256 a8de5ba04fcd35d1d8d22e7da0ef170156785de378f8627c90a08b72c0653f0f SHA512 f431ad5cfd4dcbb5e3783d7dfb26c4c7168a58eedd59feefc47078523d2e6e4bef0b15e7f2fc48c39fe26e78252dda93cd7de677e2d986197d246a8ed753be14 WHIRLPOOL 3f35c3880709e0a7abc31420a38359d43a64de86d11fde4e4a4b1d8f5963bc1734e687ab34c3bb0765eaac293551b7080b56eb3fccfc15d32a0ca026eb26b009
 MISC metadata.xml 1079 SHA256 08bc762000c20f0f047c68fcc5f555645f33db71c819f453332bfc49613cfb6a SHA512 0703ae5856ba12a07bc8aa42b10992c32722b2eb86f2f8fc2a0696c866e530a0233fcfcc15507c7fa673c18496eccda89b970ef74394e25e9c4ce7fb23f409b9 WHIRLPOOL b939c74d638808140f7f67af8afb459958b4959956f4c02b31d630e9031febda2e79f52cbbd6f62188073e7b22f56feaacbc4db62ffdf1468856ebd50bcefad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSeBQQAAoJELp701BxlEWfdPQP/2gkDuXnu+eRzVI5fLk7eUpP
-V7tze5QVdHvkdkTo6EhZIuH/zywjYhvqBp+ox/xgZGHeoqPaLRCMzlBkafkWcuIB
-ePAtZFCe1/LmXKWv5slO5orKUE0KR+qyJ73Z2U+IOab85NOXpJeWUi2Wdh/O8mvi
-lBxrLzpPgLaCK1TxF22l6NXj7L5IrlDlbvjbIh2yiCoftetvFvzUdPIKYn3neXQB
-BY/SSpY0/bnxshPG5QPWIPB2w27xJIjMr+JtII3hWUOJn7MIrPGRuSsKT4lk/YR2
-c+hggKDkZ4iyolgAwCOaQpiP4znPSEM9w+b+ia5Ip56RklkTZEYonPxAm79CSr7U
-98IgIMUrwcwZHycZGbw82b92u9XtJ3KgQ+UMbuCBtCDNPgDQihJwJbJDir90K1Ao
-vZcEtJmadC27P95EevdJid90WZ84dyD05PaNfjriku8TRg4ISvzNzkTGxO7gnyUm
-iONO4FHr/Cp8ySxk2ej6AD9e4DxgUXizcTOfah42BT7r3XIpOgOEVEhU1m2Z2ody
-5Ib8nGA3IB6MMsX/+cvLruN997UVqy58lpq4rXOkXts1H44XIY4zNFn31ocJx42y
-0GiSVfiJ67NhGtTmdKXrD8j5rr8Wpcd3iKSOW2iZm9KQHggBdQRj6VNrRpq0N8xZ
-xGJqNJEQiF9g7gVTWXGi
-=r1XG
+iQIcBAEBCAAGBQJSvjIWAAoJENXLsxwXqFxy8uEP/1+QuEeB1+eG4zztT7wTzTf4
+hPxhhf+xTZ17yzrx0eaTitlCNuVu9NIqBaDZ5SAMdRy/rw9VW5FuAxaLgoKK66uZ
+0fg/TJHQWsDmgprQbDTvgR75Gf0H9rgZXwb2xZQuDw+zgF6wTEWTrz+CovrvstMT
+kphLdhJe6k5DYlvZAEeu+IgwPA8HvZF5NVynTDgYixvwMshM/iPU/4mzYQ19tY2R
+fkDrjT8JkM/XXRUfZdi5p89Q/+LoEBRio2EM7AMzDErLSL58GS9QnUxWz5+ysDz9
+ztyHXPRKbnYiFFk6VoFSwfndwrqM7bAnBrCinkLIuT/yhg1eeAhpSInA25BkoTV2
+YY5Envcy8BwexOlqScEqPfP1/jqzJE/qbYhuFEqxx5QtAhPUPXMuhiWQR/HpB4RU
+bW0JbkX1+pyrIFZnPacd9H7gjDkTur/aYFXzsU+DPntwccPqZHQOSs77V2FWplEM
+lPNhXVwfoPO2A2mTfcSxeEXQyYc1n72GE95+LDvSbVy1tcntb4XSBh+0nZEGXpGe
+bnlQWIFDi1+hlnPQPsig+emI1HM3H+rLG62QiqWFetoLyfJtrL9t1npFbU20u19o
+qqn7D3TgZYW9RDMiT8FZUMi4hi2iq0wRR7Gu3coGeEoFCReUDuKWsaca6HXbJPax
+46NMyFd+BmyrToDRKY7E
+=rwC7
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
index 2d7e72174480..00dba52ca991 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.5 2013/11/04 21:43:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.6 2013/12/28 02:06:13 pesa Exp $
 
 EAPI=4
 
@@ -97,10 +97,10 @@ src_configure() {
 	myconf+="
 		$(qt_use dbus)
 		$(qt_use declarative)
-		$(qt_use multimedia)
+		$(qt_use multimedia) -no-audio-backend
 		$(qt_use opengl)
 		$(qt_use openvg)
-		$(qt_use phonon)
+		$(qt_use phonon) -no-phonon-backend
 		$(qt_use qt3support)
 		$(qt_use webkit)
 		$(qt_use xmlpatterns)"