Fix bugs #477652 and #477862.

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

4 files changed, 49 insertions, 40 deletions

diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index c59f47d212f5..4fd3569baf8c 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2013/07/09 10:47:30 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.5 2013/07/25 09:07:41 pesa Exp $
+
+*qtdemo-4.8.5-r1 (25 Jul 2013)
+
+  25 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtdemo-4.8.5-r1.ebuild,
+  -qtdemo-4.8.5.ebuild, metadata.xml:
+  Fix bugs #477652 and #477862.
 
 *qtdemo-4.8.5 (09 Jul 2013)
 
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index 75c8a434310c..d46125d109b1 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -5,23 +5,23 @@ AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7
 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.ebuild 2820 SHA256 ac2e61443983719c3491d3e6185b39cf0715f97f830a9d9771b3e1ee7cabb2ff SHA512 026a92f957680a97dde7d2c96da8df252cb8079b07e91c40315bb70331f50e158edf91a032ecdc75db781e7339f07ce9697c544789fba016fc3cc4505d2c0b8b WHIRLPOOL c010ce390b9b65c679b3d6e81b81763b70397771f087e99046d9f8f6595267360521018f372c4120d9a08e803af95dfe240dfc900a329595737048157a5de4d9
-MISC ChangeLog 13315 SHA256 6d20d00147c018bd94873f2c893d285ac063ef66a182d20a27e7bf76d60e8ce8 SHA512 ba9871771252848fd79896f185bb9b321b1d82c45e026f7f4a4cb18ab43fddc0e2ccd353a9bebc4abce67f5f792f567e5be6af5ce5aa23d9c17f416ce98f8bbf WHIRLPOOL 5819e6d73eae3188443713ee987151506e08e59cc9dbeab4673448b4b9d22f6c1b2b301febe975defa4262062fad3be9240b56d17e0291517fd8cd2b47aca6ba
-MISC metadata.xml 1018 SHA256 1121d70cccd79f423d3d88174adcb27f932fdafc02875c925981808bd16e94b6 SHA512 526c1c7991244ef801666633bcf5960e6f0dab2b5cab08dccbb0ba5281aae608938656acb1178d341d8b66ea8f2428294ad0995b8a13ded337e68b0e52c75f6a WHIRLPOOL 9f164eef97700630d6bb4ee3958dd7491d2954416d88366aaf980de6d78f9733b7058becdddc58bfe1a4fec4992bd5fc9e0ebfe461cb87f58c8657cc7f73b105
+EBUILD qtdemo-4.8.5-r1.ebuild 2889 SHA256 bc0bfe8ecba56d08b10d8101bdee16af915eb3882cf0eaaafc812001211865a2 SHA512 af4d7b85319f9162bb80cf677ddf321716b24adcfaf69abc448958313f9c7d6f8f851a275472e3f785734cc7c9549d459040ea0b9eddb74f962df30b489b7c3d WHIRLPOOL 8b6dbf655bbaadf51d69c329ea7cc68e6704f2e5aa9beaa04ed0f607e350e6acad6d7a6894028862f0a2be63f8831076ac9ce0ef472977ed22860d7de9b4bb44
+MISC ChangeLog 13493 SHA256 94f44f6a35d9ae356e92c42d329acebdb289554ceb0283fef1f5ba18caecfd9f SHA512 b16a935d15b84bb350572631c5cb89aada96e4b3a250ce77cffcb14e3961c4307fb790b4daa430f4457a343186a68fa3035450ccc953a18540ed80af21fbbfc2 WHIRLPOOL 519ffa7cb6f6638f2b427707f4076a80a2fd6b6e535489c3eefdf6cf9a429727dea4d597976dfb636eb16402be458d7acd857ea8f2733ceb611d7d239b26a89e
+MISC metadata.xml 1079 SHA256 08bc762000c20f0f047c68fcc5f555645f33db71c819f453332bfc49613cfb6a SHA512 0703ae5856ba12a07bc8aa42b10992c32722b2eb86f2f8fc2a0696c866e530a0233fcfcc15507c7fa673c18496eccda89b970ef74394e25e9c4ce7fb23f409b9 WHIRLPOOL b939c74d638808140f7f67af8afb459958b4959956f4c02b31d630e9031febda2e79f52cbbd6f62188073e7b22f56feaacbc4db62ffdf1468856ebd50bcefad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR2+pjAAoJENXLsxwXqFxy6pAP/16O/86Fn+hnesxlZgOwx8dU
-xFdfYMBa37UYgFzBKzVqByCyvupi96NTe9uvOzHJLijzYo9bv8pViugFosN2nMgn
-dAtUdMN+JSfIo4c7JZDR0BOknT4p9EE+0Qgik9OE5gHEEYlX+FYchnmwEoS8fBRe
-b0CJI3qqM6ITDp7Vfq0IK5sAB5MzcTuXbZ4qOazuOegqQY9wHYk8HAzghvo7YY20
-KVCHy40AKo/NKswtec/4NevlkxewkX8H1C92T563NZqsOHjMPp70OaMMzGU9lPEp
-zX4G20Q+17zccLg2VK2YDFfrdSaEAesacKezXhh4GyXe6hlBDyVrljvNfs34HzLE
-R4MkZ2/hXS0rjSBdbxF0+mWJ+L3Y8aegbNoqhhSgGiR04YNJFevAItbr72us4d2N
-v+Ovy+SaYjTL74fgD1wGoxel+zhNweHmmtbi4k/76ryzWubbneT6MJSZuGiX4P68
-HKIclfXZVcGcXXj2LrKLe4qHL3yW0ztgRBW9ErM/pknk7VI3NbKHrcGKa3L21b9i
-snyMICnpUnNDZIvqPsBH+nK405Igf4wFQ5HXWLLordCLMJktuBiKg32KacwIZcQp
-TzjmFQBnwBT+OD2ML7deEA3JkzNE5n1J9pgDgYQMkeYhmzruf3XXOX+JDnCDa2+F
-1B28I9jXWMDNC1fPr1ci
-=qQwI
+iQIcBAEBCAAGBQJR8OsBAAoJENXLsxwXqFxy4cMP/iwtaar3Br7ejavtt62THicm
+q8Xuz8x1o87EUpCGpdypxuwmS+f5SlOQF6zSL9nJ+EK0kxb9zfkJ3UOsl6CLAhxe
+TRnj5zezsA42IzYXPKJWxIkhdtdr/gZFCu0ulKxFMnZpinolEapML4mVHZ6Uxf62
+YN85WS8EqdflvsSpDWvu0dyjaFHpKwyrNPGEGSPaIFJG/0/zo/xhhOpYrKQXoFzU
+nit2tIUBjy7Qu3OUlbUoJh4m9i4P6ZlLT1ojS+99DWrI9G/I8fPPYFYjYfqz0jTa
+tW+3Kxlq0975FWgOpCh0Ye757Fbc+F82OLb2f+6eSUarUr4nFgqO+ZekLKCAFKVm
+hWHoznkM3mm3/NwIGnN5lMIVQZnY/TXtInU+Ds0qMUsGh95/W8n5uTx7WjhJ/Wvm
+LC8DE+X3hmtXTjXr9599SeJ40c8bVHGiMHcGNwja2JK1PbM+HtYVtHD6MWn4zij7
+e7iXbzUe8pEjuRtQ+GJGF29/bOZ1l9fmDw81Wdsx21PuGsmRFRdhtl6Jg4I7BaiJ
+HFRJbJH93MYiJYfDEjZTWCCkOWGIYcgpqkyOMBUdkTZhLoEP6U3LWmHitCriHELt
+re6/DcrL6RELMa/mohBdBBKLus887UZT8aXRRkZTYXokRMsBf6GgMVIyzwrvTfYV
+eauC8Hbg5+NIDViPgXeE
+=qhrA
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index e7b551b15594..2d20d629c78f 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="multimedia">Build QtMultimedia examples and demos</flag>
 		<flag name="opengl">Build QtOpenGL examples and demos</flag>
 		<flag name="openvg">Build QtOpenVG examples and demos</flag>
+		<flag name="phonon">Build Phonon examples and demos</flag>
 		<flag name="qt3support">Build Qt3Support examples and demos</flag>
 		<flag name="webkit">Build QtWebKit examples and demos</flag>
 		<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
index 393f63272fb7..336fa6d6d309 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.5.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.ebuild,v 1.1 2013/07/09 10:47:30 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.1 2013/07/25 09:07:41 pesa Exp $
 
 EAPI=4
 
@@ -13,29 +13,29 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 fi
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
+IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?]
-	~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?]
-	~dev-qt/qthelp-${PV}:4[aqua=,debug=]
-	~dev-qt/qtscript-${PV}:4[aqua=,debug=]
-	~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?]
-	~dev-qt/qtsvg-${PV}:4[aqua=,debug=]
-	~dev-qt/qttest-${PV}:4[aqua=,debug=]
-	dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] )
-	declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] )
-	kde? ( media-libs/phonon[aqua=] )
-	!kde? ( || (
-		~dev-qt/qtphonon-${PV}:4[aqua=,debug=]
-		media-libs/phonon[aqua=]
-	) )
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] )
-	opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] )
-	openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] )
-	qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] )
-	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,debug=] )
+	~dev-qt/designer-${PV}[aqua=,debug=]
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?]
+	~dev-qt/qthelp-${PV}[aqua=,debug=]
+	~dev-qt/qtscript-${PV}[aqua=,debug=]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?]
+	~dev-qt/qtsvg-${PV}[aqua=,debug=]
+	~dev-qt/qttest-${PV}[aqua=,debug=]
+	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
+	multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
+	opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] )
+	openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] )
+	phonon? (
+		kde? ( media-libs/phonon[aqua=] )
+		!kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
+	)
+	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
 "
 RDEPEND="${DEPEND}"
 
@@ -49,8 +49,8 @@ pkg_setup() {
 		examples"
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		doc/src/images
-		src
 		include
+		src
 		tools"
 
 	qt4-build_pkg_setup
@@ -66,6 +66,7 @@ src_prepare() {
 		'multimedia:spectrum'
 		'opengl:boxes|glhypnotizer'
 		'openvg'
+		'phonon:mediaplayer'
 		'webkit:browser'
 		'xmlpatterns'
 	)
@@ -99,6 +100,7 @@ src_configure() {
 		$(qt_use multimedia)
 		$(qt_use opengl)
 		$(qt_use openvg)
+		$(qt_use phonon)
 		$(qt_use qt3support)
 		$(qt_use webkit)
 		$(qt_use xmlpatterns)"