Version bump (bug 510042). Add multilib support (bug 498010).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

5 files changed, 87 insertions, 22 deletions

diff --git a/dev-qt/qtphonon/ChangeLog b/dev-qt/qtphonon/ChangeLog
index 702d64cfe2c7..a11c0aaa2c29 100644
--- a/dev-qt/qtphonon/ChangeLog
+++ b/dev-qt/qtphonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtphonon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.8 2014/01/26 18:04:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.9 2014/11/15 02:37:39 pesa Exp $
+
+*qtphonon-4.8.6-r1 (15 Nov 2014)
+
+  15 Nov 2014; Davide Pesavento <pesa@gentoo.org> +qtphonon-4.8.6-r1.ebuild,
+  metadata.xml, qtphonon-4.8.5.ebuild:
+  Version bump (bug 510042). Add multilib support (bug 498010).
 
   26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtphonon-4.8.4.ebuild,
   metadata.xml:
diff --git a/dev-qt/qtphonon/Manifest b/dev-qt/qtphonon/Manifest
index c1ae65dac0b8..03c5bc4d6386 100644
--- a/dev-qt/qtphonon/Manifest
+++ b/dev-qt/qtphonon/Manifest
@@ -2,23 +2,27 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
-EBUILD qtphonon-4.8.5.ebuild 1272 SHA256 a3e135ea302898e24d90df6e15fad490b6dc02073eae8eae54a32384f5eb1126 SHA512 8284d3ded749c219aa88c19c52fdec43418e24de9ffed4211dae3e1ac26dd8958abc91c8c7d1e692878eaff987c3b7526dab049243b60fe57d231485caeadaa5 WHIRLPOOL 016b6e4a4ad8ff1798fa0b3d3a8f5e2d06568eeea98cad248e3364d04c3bf9295bad60dadf7f27c2a192172facbbf8a8774086e251f1a483b539046efd863080
-MISC ChangeLog 17337 SHA256 7352ce412905b54ef4455fe775553865fbc79f1e2aefc7bb14195fad4d1c2206 SHA512 9125e6ed240cfbecc007d4cbccc29382a8e176ce762e4d76f216a1847573cf4f656e523cbbf359166b06504920f97753109b94a57719637c9a52c424dd8bc1b0 WHIRLPOOL 2ea632d995cf2c02627eee5eeb4401ce82f46be2b8749750ce968ec812d375157fa2a6608db4e1a588e3d8b9aaca3a56b0366637c4989a9c4a1120c70e5add2a
-MISC metadata.xml 575 SHA256 c94321b7e283133a9b2b5208a82bc22984e64f9eed83221e0ec44ff1970cfa5d SHA512 f56d9f18471c8c34fd037e5eafd2b556ac861c9e048025ca140bb884b6cd8ceb97a40a34287056825d88efebeccdbc9d3ab9524a480c87e4db02a2e73f09b5a5 WHIRLPOOL ef6150c0308cbfccfefb4d1522b84ac89151f337aac25501f665c49e61ea503c6205a12d01120e882823af6690fbfa4129955b2da34219ac59cb6b51d9bc15bf
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
+EBUILD qtphonon-4.8.5.ebuild 1274 SHA256 df2ab5279d5c650b3e54c55e644639c615d2cacc1e8d0837ef912992a65fda01 SHA512 eb044247cdb97995af60aa68bb95ed906836dfb23cd4c89da6a382e3401eb5619cc6151b28e2a652b0ecf0c7a28b2eba9985ebb9358c44237557357923562cf1 WHIRLPOOL da8260f6f3e72476d4548a63a894b58e65f0c79e6b6e0c32ebecb37b8037b35a04f1fa1093ec0f6d0e55c8de585e1b6aafb2b33c771f567f009a0dc362bffa40
+EBUILD qtphonon-4.8.6-r1.ebuild 1413 SHA256 bf3741435f7de6234963fec37ad76d8c6fd48f4155a2da7e1cc9d52220b398d1 SHA512 39fb6d2973381ba2eca29db177fa31b69b58bdb118a62a1c34b2a3446fd1a2be64ca70b5d9783abe4d2c988c424a6318be4c780f6d6cb04e5202a7b11dbf287c WHIRLPOOL 658393eb2e96a256181f433cfe5eecce32e24677cd500fc471a8eb0f4c1c29dc74955cf4af3b995803da36701b2b9ea0fa8d12e9a0416932cbaead50629e7b2e
+MISC ChangeLog 17552 SHA256 b263ff703381338b7c6c4e3d76ae978ccbf6ba519dc2b2d38cebc100df963b4e SHA512 1fd86481068cb5ca9bf3c8f00037f197db004bf1734cbb99d1bd5adf1bbcdfd6f5f7ae140a9b908ed63141850ecdb23c0227d67ac09b79d2d6492ba467032672 WHIRLPOOL afdbc6b04934a923a1b926cab5d9cda5daeaec010de680825fac583c6f9908de9c5c18a618657059198747a11129666c66bd877e2687795094766f3b4ae2d4ae
+MISC metadata.xml 574 SHA256 20142c49a9a7e3bc8058ec314674a8048c422a7166b2d474aa64fc14f7b1a4d3 SHA512 7a50d9a4ec67efdd22f6360e00fec6fa928bc6881a34e9eca229d7288638e8cb56235e30d9478894238f227b67ecba4af339af42430d34f5bbf3d6db1339f9a5 WHIRLPOOL 86aa6360730c9fbbf48cde46726745c55925554a107dff27ccf166af15e50c550d0cec50c9321226bd8ad2d95be18ed68128a60f49ad1a63180e9f45b3167e97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJS5U4/AAoJENXLsxwXqFxyimUQAIIxiy6g82ymhTMsM22QlUNQ
-iko4OEUc2bylT9KH7/eY3CIdgFhhnHpqDIaobwAlJ3WhZWpGKmfsYSnUe08ilMBk
-ccwffcC46yk/sr1kr6kGymmiuXMMtfjvZWbqVqXzffqZTZL2RtbGp6s3tXm4MRMS
-GXBUOeSniV3Vt0MCyLYxiGM32VSNOlCkex9Tz92YPOUuWzfyqOO7pF0e8ZypdaiD
-tehZpDGWoZUXC8tcSn+vzYkfuTIc2WHZC0SfYlZVmD48fdoquhjGncNvxe65MRc2
-p70H86/c13tQYL3CI6QNRTXHcHrFa9OuSAlpFFofWre5E5HabZKVKzUQ5IHv7Jp9
-bJffjFUyNLR0uD21FEggZYJVegr75+1SuQUWfJV5Y3SuCRH2rfhpyCJ+VIbYVMVU
-oYa7IHpi0BhMS0GDiqQImGoLg0Ht4qAJemxm911rVnWbtPc+5dAX3T0ow8dtggzP
-VXxmVDo714nABmoUJWv+vefCVlptwbnlApF0/qs3ACi+qqT8NHajAOerVbbk472Y
-6OtGbh613k188K8HXwsiCobZ0FE3+wUDN+LM3VNNF+sl5Qmqu8Abmw4KgksP+zl+
-hWcQxtlQORdq9FCyBVMKkJpoll0SD3l7oZhrSQkOXNIALXpCsYcDIsrEtqM9LyhX
-TT0MLpNXKnsgGReE/UL5
-=nZkE
+iQJ8BAEBCABmBQJUZrx0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9+F0QAIzHCPVvL9B9UAnOkI3Yvv9M
+euwXQNhAwVUIrqbdVFkwlb97YuPUHT+RCMECZbBkV6bv9Gs/kXRmdDD74ic6ROH4
+1dSYLqO+/gjDKnL5/c/Ru/Pc6pDTDOllem84SdjkwdPSy887YOPMN3pAbQca7S+6
+ev3cz0YIg1kbVLvJYw5C3xfO4x+u7mUAHmlAvICu7ewZB1fSXDl2QpRcZMNTjsKX
+vibTddoCM4NES1Xqy3YNN9K0eb1fCbZgJki+UljX/H/oyc9EDvPJw6/gOJaVvcr2
+okk/YVr46ZsxnuBhjOK/vzWr+FAZdRHkByRBkY6NyVvnkQYu5fq5qWkY0OOkGR1a
+FiuWtGYXFlK1xGj2juwVakSof0nDg6wRJL8fTpsXqKaH5BOzA//eKly1qPlfu/ST
+l2f8fff7pQaX1tKVPmj6yQejnBk08cSvdELsM6fs+KwRUWnhHFH/8yxM9N6/7gOm
+6BwPu/FPfejFaHB49ulUFiJb8VPsuNKvJG7RvAoPKWBmHqoBhoX5Ber/mgOVXDvs
+bQBhov2yiTIrvVqYKzDgdGi+Yqs64beJaV0At6D3ADPrxF+tibAcAtPsxy9lOjEj
+sKUdHbFQXkck2QdQMNV9TXV64NAbHnWSwlv53tQ6TMgA/HNgJsZPXIPk3DWupXkt
+VYzfDxQykqPAaIzuD6jG
+=MCVr
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml
index 7dfcbbfcc663..df4f2349678a 100644
--- a/dev-qt/qtphonon/metadata.xml
+++ b/dev-qt/qtphonon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd> 
+	<herd>qt</herd>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
diff --git a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
index b34766d1c1a1..d9abcf5a4f2d 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.5.ebuild,v 1.6 2013/11/11 14:00:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.5.ebuild,v 1.7 2014/11/15 02:37:39 pesa Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ DEPEND="
 	!media-sound/phonon
 	!aqua? ( media-libs/gstreamer:0.10
 		 media-plugins/gst-plugins-meta:0.10 )
-	aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
+	aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] )
 	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..9aeb54e051fd
--- /dev/null
+++ b/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:37:39 pesa Exp $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The Phonon module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="dbus qt3support"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+	aqua? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] )
+	!aqua? (
+		>=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-meta-0.10-r9:0.10[${MULTILIB_USEDEP}]
+	)
+	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+	!kde-base/phonon-kde
+	!kde-base/phonon-xine
+	!media-libs/phonon
+	!media-sound/phonon
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/phonon
+	src/plugins/phonon"
+
+QCONFIG_ADD="phonon"
+
+pkg_setup() {
+	QCONFIG_DEFINE="
+		QT_PHONON
+		$(use aqua || echo QT_GSTREAMER)"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-phonon -phonon-backend
+		-no-opengl -no-svg
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)
+	)
+	qt4_multilib_src_configure
+}