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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

4 files changed, 66 insertions, 5 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/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
+}