media-libs/phonon: revbump/merge, atoms

Revbump, merge and bring dependency atoms into spec for multilib.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

5 files changed, 152 insertions, 31 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 3c33069..cd7bf1c 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.56 2014/05/27 11:21:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.57 2014/06/21 15:36:48 kensington Exp $
+
+*phonon-4.7.2 (21 Jun 2014)
+
+  21 Jun 2014; Michael Palimaka <kensington@gentoo.org> +phonon-4.7.2.ebuild,
+  phonon-9999.ebuild:
+  Version bump.
 
 *phonon-4.7.1-r1 (27 May 2014)
 
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index de7bdd1..30fd246 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,7 +1,8 @@
 AUX phonon-4.5.1-qmakeworkaround.patch 1084 SHA256 a8b22a299ceae59594ca74661af9c37cbaee14ee3c7000aa7b52e2fe7c2c5988 SHA512 f97a5835fc58b7774f3a628b0e40c6cf1bd06ab28beedd9d985153eff9753a38081e5ef1f6c7eb7371cacc8629069ab7ede02943f4267f04b0674eaa00de3306 WHIRLPOOL 1867db0692e0a1b28b540e852e9232d137d61375f006d3165047172e352c36718342f75864a19acae1b00dbac525dd877b436b1f2989d7ed07e87a281f42f31e
 AUX phonon-4.6.0-rpath.patch 600 SHA256 354b590e07db72d9479d4895d305ac87a4a7b895524505cffcb7237e6259e727 SHA512 426e8a7ac82a2ddaa82500e93c41263a6113939bc5127ac87911d530dd691a19dc08c6929b7ea716a2cf6fb7577f44ef42f4a2c60982baf5e31eb933438a2fe2 WHIRLPOOL 7a8e60fe888388bff6e1bc671f085dd564d3492e56d2d7029b2738d433666828eddadfd47bc1cdf2dc6d301ab8473f6447bb100d7cbbfd961809d6f2d943065a
 AUX phonon-4.7.0-plugin-install.patch 1252 SHA256 a56f24ac961ab9c422d1a06adb602f720039b10ba7bde8ecb8aeeb1fa44a7be0 SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2 WHIRLPOOL eceea6af1b0a97475b8263b5e48bf1ae4b9d5a26adc9fbff240e39b414f9ba03c0ceb235821658cfcd865e50d638cb977b4ab748ffe264870d1336908b5c2e5a
-DIST phonon-4.7.1.tar.xz 329900 SHA256 4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d SHA512 64d0695bed48837d7c9a047500a18931014e1f52b7add491d8aa219ebe66a74724257ce644fac41bf1f237e7dc3d655003feb884d74c36a43fe285fb2265c902 WHIRLPOOL 7fe337d08e8114a709f4067438321973d1faea906cd41396c531faec57d0c348a900f5e8fd9cd5dcae1ca3275855faa25b036fe090fa3a75042f3cb7a0ac0359
-EBUILD phonon-4.7.1-r2.ebuild 2937 SHA256 b589cec068ac2e878483fac5f25daf57a108ec153e52b317b532518b9176163f SHA512 c074125a1b76c68404babfc151fa6dc1eccb83726940c3140d94fe0d55d803c34242f85e28d6b3d81beb1911881180fdca519d070f178212b65dd712e9b2a3bd WHIRLPOOL 05bd8f837561c18ed2425bafd7ff0ce858c06e3cbeae720894cba4ac5939e7b16365899cc038d6e68ed9184d4bd51cfd1fb86c488707a4f52934be586f5b95ab
-MISC ChangeLog 17926 SHA256 91e0b811a6221e3a531a9aa65bbaf04da5e28d5b2cf7d26f568708d20518baec SHA512 f769d54f8a77be02f22a5aa8744f78e6ba8beb68cab0a275389059c669520fda40335b4eff0959979edc91449c9b06407090b707ea627dfd2a19b98eb2e81320 WHIRLPOOL 1b4709b0fb547a59dbce5f0e7aac54d369729fc26663bf99d98a6c376c8ccecd933efc2b213516c32f3084607a7afd804c16119445185ff2d3c5ffe691d8ba7d
-MISC metadata.xml 376 SHA256 b6e977c91e7d978354256178dccb1ac955d3450e8ebee18fdb7a92fca474dd25 SHA512 050b89a54756ef31146d2dd64ddad0335fbcbb4b22124d0bcf58de7f8a80555c9acf97523f8b581bafde53a67c1f27959ab13ff2e0030eae42a5c445bb676508 WHIRLPOOL d42c2272219d11d23d3e0e59b003e9c94cefbde390e47fd6009651fb6f5d2c18d8b7374f06c7b79c6622f2b7241af7f00d21a0087c84f0603e2ddf9493480535
+DIST phonon-4.7.2.tar.xz 330244 SHA256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 WHIRLPOOL 2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
+EBUILD phonon-4.7.2-r1.ebuild 2989 SHA256 77af39fd97916c9f2898778e5afcf8d3c2ff106d7e1e68cb1cdcf2e57e29baad SHA512 4f15cb1ab361602c7db70a60605b4990e74e06423668ef4f4f6dad31d39aed4f066ece2f4c025bc4764ba0435fe39a0dc9098fbf3c91153533d16a5cb2d7f238 WHIRLPOOL 583891aa48f2d5361242a59ea655a821ea620f2d80899baa19394b9f49db7d8379e5b5869f4d8cc402adca8c2a05c127982d5ef54dcb246e10e067073302492a
+EBUILD phonon-9999-r1.ebuild 2989 SHA256 77af39fd97916c9f2898778e5afcf8d3c2ff106d7e1e68cb1cdcf2e57e29baad SHA512 4f15cb1ab361602c7db70a60605b4990e74e06423668ef4f4f6dad31d39aed4f066ece2f4c025bc4764ba0435fe39a0dc9098fbf3c91153533d16a5cb2d7f238 WHIRLPOOL 583891aa48f2d5361242a59ea655a821ea620f2d80899baa19394b9f49db7d8379e5b5869f4d8cc402adca8c2a05c127982d5ef54dcb246e10e067073302492a
+MISC ChangeLog 18078 SHA256 4ee992ca3da2c9c74ed8c9ed0cd30391be0b601507961f0541774c5537039a51 SHA512 189f4318df551c3bde5ab956e20c180525665ef9e1dd70ca8e14542dead6ce943d18b2427b6607ad2f56eeee4a25c57b1e4d14026d5695da328ecd073b158ad1 WHIRLPOOL 5d055656a1705f64ab84fddf1e7a88472a3ff254586b785e3bf480b53f0b7ed2c548dfb8ab4c6f0cc946871f7d104d1ce32c4501d9e924834f5246d0d05fe913
+MISC metadata.xml 382 SHA256 6758869ff5c1d28cbfabfb7ad27e23038a688afcbfbc8f880c742ab9be908f06 SHA512 41f9e7123fc4069d8bc6258113de25b8de23c7a396ae4285507ebac62dfe0fa93f939940533ccb39c1e1d5419f7f0bb65db2517a0789b7242bd36cb3dc612f57 WHIRLPOOL ad1713d849565ad3a1f85ee59cbbdf857877b308d093061d6db7bffa829a1daf3b94213b6d007d9832ba4e9091d8c9b0bb7b25bdd2e41628c1786cab799b707a
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index 330295c..d261a0e 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-	<flag name="vlc">Install VLC Phonon backend</flag>
-	<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
-</use>
+	<herd>kde</herd>
+	<use>
+		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="vlc">Install VLC Phonon backend</flag>
+		<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/phonon/phonon-4.7.1-r2.ebuild b/media-libs/phonon/phonon-4.7.2-r1.ebuild
index 27df590..e54d8aa 100644
--- a/media-libs/phonon/phonon-4.7.1-r2.ebuild
+++ b/media-libs/phonon/phonon-4.7.2-r1.ebuild
@@ -22,26 +22,32 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
 
-COMMON_DEPEND="
+REQUIRED_USE="
+	|| ( aqua gstreamer vlc )
+	|| ( qt4 qt5 )
+	zeitgeist? ( qt4 )
+"
+
+# FIXME: multilibutize qt5 section when applicable
+# FIXME: multilibutize libqzeitgeist
+RDEPEND="
 	!!dev-qt/qtphonon:4
 	qt4? (
-		dev-qt/qtcore:4[${MULTILIB_USEDEP}]
-		dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
-		dev-qt/qtgui:4[${MULTILIB_USEDEP}]
-		designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
+		>=dev-qt/qtcore-4.8.5-r2:4[${MULTILIB_USEDEP}]
+		>=dev-qt/qtdbus-4.8.5-r1:4[${MULTILIB_USEDEP}]
+		>=dev-qt/qtgui-4.8.5-r3:4[${MULTILIB_USEDEP}]
+		designer? ( >=dev-qt/designer-4.8.5-r1:4[${MULTILIB_USEDEP}] )
 	)
 	qt5? (
 		dev-qt/qtcore:5[${MULTILIB_USEDEP}]
 		dev-qt/qtdbus:5[${MULTILIB_USEDEP}]
-		dev-qt/qtdeclarative:5[${MULTILIB_USEDEP}]
 		dev-qt/qtgui:5[${MULTILIB_USEDEP}]
-		dev-qt/qtopengl:5[${MULTILIB_USEDEP}]
 		dev-qt/qtwidgets:5[${MULTILIB_USEDEP}]
 		designer? ( dev-qt/designer:5[${MULTILIB_USEDEP}] )
 	)
 	pulseaudio? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		>=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
+		>=dev-libs/glib-2.38.2-r1:2[${MULTILIB_USEDEP}]
+		>=media-sound/pulseaudio-5.0[glib,${MULTILIB_USEDEP}]
 	)
 	zeitgeist? ( dev-libs/libqzeitgeist[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
@@ -49,21 +55,16 @@ COMMON_DEPEND="
 		!app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
 	)
 "
-PDEPEND="
-	aqua? ( media-libs/phonon-qt7[${MULTILIB_USEDEP}] )
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?,${MULTILIB_USEDEP}] )
-	vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	qt4? ( >=dev-util/automoc-0.9.87 )
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="
-	|| ( aqua gstreamer vlc )
-	|| ( qt4 qt5 )
-	zeitgeist? ( qt4 )
+# FIXME: multilibutize phonon-qt7
+PDEPEND="
+	aqua? ( media-libs/phonon-qt7[${MULTILIB_USEDEP}] )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?,${MULTILIB_USEDEP}] )
+	vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?,${MULTILIB_USEDEP}] )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
diff --git a/media-libs/phonon/phonon-9999-r1.ebuild b/media-libs/phonon/phonon-9999-r1.ebuild
new file mode 100644
index 0000000..e54d8aa
--- /dev/null
+++ b/media-libs/phonon/phonon-9999-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+else
+	SCM_ECLASS="git-r3"
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	KEYWORDS=""
+fi
+
+inherit cmake-multilib multibuild ${SCM_ECLASS}
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
+
+REQUIRED_USE="
+	|| ( aqua gstreamer vlc )
+	|| ( qt4 qt5 )
+	zeitgeist? ( qt4 )
+"
+
+# FIXME: multilibutize qt5 section when applicable
+# FIXME: multilibutize libqzeitgeist
+RDEPEND="
+	!!dev-qt/qtphonon:4
+	qt4? (
+		>=dev-qt/qtcore-4.8.5-r2:4[${MULTILIB_USEDEP}]
+		>=dev-qt/qtdbus-4.8.5-r1:4[${MULTILIB_USEDEP}]
+		>=dev-qt/qtgui-4.8.5-r3:4[${MULTILIB_USEDEP}]
+		designer? ( >=dev-qt/designer-4.8.5-r1:4[${MULTILIB_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/qtcore:5[${MULTILIB_USEDEP}]
+		dev-qt/qtdbus:5[${MULTILIB_USEDEP}]
+		dev-qt/qtgui:5[${MULTILIB_USEDEP}]
+		dev-qt/qtwidgets:5[${MULTILIB_USEDEP}]
+		designer? ( dev-qt/designer:5[${MULTILIB_USEDEP}] )
+	)
+	pulseaudio? (
+		>=dev-libs/glib-2.38.2-r1:2[${MULTILIB_USEDEP}]
+		>=media-sound/pulseaudio-5.0[glib,${MULTILIB_USEDEP}]
+	)
+	zeitgeist? ( dev-libs/libqzeitgeist[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-qtlibs-20140508-r8
+		!app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	qt4? ( >=dev-util/automoc-0.9.87 )
+	virtual/pkgconfig
+"
+
+# FIXME: multilibutize phonon-qt7
+PDEPEND="
+	aqua? ( media-libs/phonon-qt7[${MULTILIB_USEDEP}] )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?,${MULTILIB_USEDEP}] )
+	vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?,${MULTILIB_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+			$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
+			$(cmake-utils_use_with pulseaudio GLIB2)
+			$(cmake-utils_use_with pulseaudio PulseAudio)
+			$(cmake-utils_use_with zeitgeist QZeitgeist)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+		fi
+		cmake-multilib_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-multilib_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-multilib_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-multilib_src_test
+}