Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 141 insertions, 31 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 3c3306975612..cd7bf1cdc5bb 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 dd3140a5bb05..3e0721c694ee 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -6,26 +6,28 @@ AUX phonon-4.6.0-rpath.patch 600 SHA256 354b590e07db72d9479d4895d305ac87a4a7b895
 AUX phonon-4.7.0-plugin-install.patch 1252 SHA256 a56f24ac961ab9c422d1a06adb602f720039b10ba7bde8ecb8aeeb1fa44a7be0 SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2 WHIRLPOOL eceea6af1b0a97475b8263b5e48bf1ae4b9d5a26adc9fbff240e39b414f9ba03c0ceb235821658cfcd865e50d638cb977b4ab748ffe264870d1336908b5c2e5a
 DIST phonon-4.6.0.tar.xz 280712 SHA256 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4 SHA512 d07c0eaa1be04d80266f6630933bbe8e4f822dc9eb1c31946a08339530cd81e450f1764731c309ae4c661ea3416237521d2048d3e7c0f9cbb7528b1bbbc60f7d WHIRLPOOL 9ec4ae833e3824683ea5c469d3be4b2248645e47d9df199efb717364cf6f67eaffb1e5747e3e0cb0aa71fd5ec3c270119a187a8f5ef2bf6134427b48640740a9
 DIST phonon-4.7.1.tar.xz 329900 SHA256 4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d SHA512 64d0695bed48837d7c9a047500a18931014e1f52b7add491d8aa219ebe66a74724257ce644fac41bf1f237e7dc3d655003feb884d74c36a43fe285fb2265c902 WHIRLPOOL 7fe337d08e8114a709f4067438321973d1faea906cd41396c531faec57d0c348a900f5e8fd9cd5dcae1ca3275855faa25b036fe090fa3a75042f3cb7a0ac0359
+DIST phonon-4.7.2.tar.xz 330244 SHA256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 WHIRLPOOL 2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
 EBUILD phonon-4.6.0-r1.ebuild 2241 SHA256 391af060ed7195b30ab641fdb5c22192eba93064739f728c2eac617ed6ee98d1 SHA512 be3a1416953f5e9166b32a915c33e4bf3a8aa9ad24e353733e2f8d2ad587f43f5bc67cfc00c74ccba255e1b818409319bb8232a93c9c0fbc658775008413207b WHIRLPOOL 360fbf823e7848be981d2ba2bc236304e4a3c6c3b0469e5b5883ce33fe623f5202263e18039617e303b2313620129601141ac6641576dd50a65a49b43bc5c564
 EBUILD phonon-4.7.1-r1.ebuild 2559 SHA256 9d6d3261d2e79b478f9cc625e47c632d9b0e4e8de026360c4fdb5694e63b1c92 SHA512 940f688e6b4c26942af3dbb4c4ade58b96eba8d33429cfecb375e2e1e956d3100706f84df4cd475bf62d3cf6c1b8fd1475b16889c37b976074b5cc2c552a0df0 WHIRLPOOL 36297f583de8a83fb1b49f7f009e8a59ab3943e1a61271c754fddb8dc8cf91a02c679194ce6509b474758916c360b4f50b599066bf9473ff120cb552b32845b2
-EBUILD phonon-9999.ebuild 2556 SHA256 219ffb3957f64258b1b0670b0d228bb17b5d3b1c773fa70ebd171299027b6e4b SHA512 ae532e4ced379f0fca3724b135691d9d833a34ab0c97adc349127d449b94dfe27a309c168d692ede2dd77dd196dae0379b1f4ed3a23f292996128136c01cc6c7 WHIRLPOOL b3efe76264b6fd52919e1b44fce0a35d1d7331bad0af2350bae641bb35e7e630b6314ef233d305048e5f33c3536780f239d0d97b1cffc04c969c72c9cdcb994b
-MISC ChangeLog 17926 SHA256 91e0b811a6221e3a531a9aa65bbaf04da5e28d5b2cf7d26f568708d20518baec SHA512 f769d54f8a77be02f22a5aa8744f78e6ba8beb68cab0a275389059c669520fda40335b4eff0959979edc91449c9b06407090b707ea627dfd2a19b98eb2e81320 WHIRLPOOL 1b4709b0fb547a59dbce5f0e7aac54d369729fc26663bf99d98a6c376c8ccecd933efc2b213516c32f3084607a7afd804c16119445185ff2d3c5ffe691d8ba7d
+EBUILD phonon-4.7.2.ebuild 2478 SHA256 75a7ab0be8a5ab7362b1033fd924ef82c9ce89c48e9cdfbfe1ffbf8fbab16c2b SHA512 2faa5fe36ac34a5a037974fc0503fcbbccdcb8695a143bb8c3eeafc00330147f3148a9f7993005f880d06c1ede6440838ffe8cefc34cd4d81049bf1155481080 WHIRLPOOL 644553091be1968dae19bf159037aaa5fd6ec653a969786457b487dd06f64cad0bef3a9f2875771f4ac5d70d8cc476a5794e98b2317c0fab5ff66b3a576687bb
+EBUILD phonon-9999.ebuild 2478 SHA256 6125ffea1a1eea1f6e83728fc8e2d218018461a91300b6d86da2d944f3ef10d0 SHA512 24c6ec4394269a66281e1815b661b6b5f2f3abd5783bc1e88f4aef6998388fbf1f25bb0d72ef89fa156566c18bd0720c5f9593ba7a6e0c45cbc4b4871d7bb4eb WHIRLPOOL 04c6312964a0442fff536dcf89083f3fcf99da322c26164dd72e0dcc72d611115c89b39deedfa4f9e7e220bfdc126f6b8c1c8919c7d05af56b2ea5c9e1b5ed19
+MISC ChangeLog 18078 SHA256 4ee992ca3da2c9c74ed8c9ed0cd30391be0b601507961f0541774c5537039a51 SHA512 189f4318df551c3bde5ab956e20c180525665ef9e1dd70ca8e14542dead6ce943d18b2427b6607ad2f56eeee4a25c57b1e4d14026d5695da328ecd073b158ad1 WHIRLPOOL 5d055656a1705f64ab84fddf1e7a88472a3ff254586b785e3bf480b53f0b7ed2c548dfb8ab4c6f0cc946871f7d104d1ce32c4501d9e924834f5246d0d05fe913
 MISC metadata.xml 382 SHA256 6758869ff5c1d28cbfabfb7ad27e23038a688afcbfbc8f880c742ab9be908f06 SHA512 41f9e7123fc4069d8bc6258113de25b8de23c7a396ae4285507ebac62dfe0fa93f939940533ccb39c1e1d5419f7f0bb65db2517a0789b7242bd36cb3dc612f57 WHIRLPOOL ad1713d849565ad3a1f85ee59cbbdf857877b308d093061d6db7bffa829a1daf3b94213b6d007d9832ba4e9091d8c9b0bb7b25bdd2e41628c1786cab799b707a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJTpaS6RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJTpaaSRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7FwwEACHOhTInxGl2Z/6h7SvfKcjr5jd2TpQzBML+ne7+V7QXHpqFK61GkIMRyT9
-USBo7RZ8iN+3LurOTNmt8LMjBOYSC65bS+p8KSDcGD/6VPvF0gTa3TRcFt7mvc94
-h9I/j5TU9YIVUYAKu0P3nFfGCvsBR/xIT4DFKh/kX1xrt8E05jp16hnIej+QQnC7
-6mUAfThmdwkuNqxj5Hqo2PRiy2QF0ez/T6ex2dQe1LsE8/AUtIlAc9UNcSZS4OH3
-FjV4rWxhXcKlXEfr5ePgiDdhNjJtPE+3RCwdqmbynkCHeez7/9O3gcxAQNAoiMC+
-4jKxM7vuPcaaHWYhwLaqX24EV2Y0a6v9p6MQd470oe7yI12Ppch409Ovep0xdsBo
-wiQEYDKs18vkFvRi9Rx4l/lI3Zg/dbVRN5uEG4GoATus04rZ04sflShGaTtu5SuP
-a/HYUWABwVp7ZKGcGkunyj1RuXF0WJsy21TKjV44B0qiyb8KLg27CzrX7buLjkfL
-1j25s+KNG1DjXu65rXLvm84tr+iTgkeotMgsRACuPVxOW/jeAqy/p9WmL1p5+t67
-+nKljlTPn6+m5eB4f6YQMzMGEcIVs9DPf6SL4rw4Ho7AA1fA3g/G93vUoHP8ItjM
-jpJNJ4Ww6C8sB9w1ppJ06Gdl8f0NUN97hEJmw3j53R1UHRA1fA==
-=B1kl
+7O2tD/9d18F//tYYsEttSsUXtFtVujhim7XagiVMtugd9hIoA/OKLljO2bh/xUcZ
+gDHLFHG8Pvg8KKX7JzwoMYFejBGv08ayHhR9z1wBVE5N5aiirRVLuCWkmN3+066M
+eOf0uQDXo2JsvQfO9KUPnfWmzRLZHic8FTJ10tZYoSftYJ8XNdoIn7lwB8KVCSL0
+lWoRojFdV9vwDk69t4j8nQi7C9YPM7sYNIn1cD2ecV/Cn0YPMb8Xv08aoPEwjQlv
+aOU/dCvuR41GRImkTD4Aq4vxzyW9tIsseSsPCWvGNdwIHY41eeSCkTJ7GwuBdMqQ
+7UFnM2BU5AkWXCyZmPNmyiSd/CX14Sm3z42sZsy5SNkXR7jxn1QznFp1dDSgwiRr
+iyK8SzsdadUVQry3zXIgahDYCMIgT2ifG2YhtFyVY0KVYQWJU61YbIEB/WZPGhnh
+RaPg5ATVFVJpuAG+IRhpOA1E0ZcHUoAjlgd+X9kw1xL//hl4KGhyGzW3puJtnwuT
+t3/GgttUWkzNHtTend2/P/5nkLAWF4IGD9LLxVEiMDyvQV3h+tspFpHWG/QLmCeq
+VSpP6OwcaRqW/CB3d3IBpP9qX0Nah66lxLhEBFPdg1YeqaQHXaRdgg9DFPDdCvNn
+NNoetIEST1Y7m9OdkF4+E8FQZDtjZRBUoOiDv2/jFiJUzSxw7Q==
+=Iehm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon/phonon-4.7.2.ebuild b/media-libs/phonon/phonon-4.7.2.ebuild
new file mode 100644
index 000000000000..dd1f8f6f6788
--- /dev/null
+++ b/media-libs/phonon/phonon-4.7.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.2.ebuild,v 1.1 2014/06/21 15:36:48 kensington Exp $
+
+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-utils 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 )
+"
+
+RDEPEND="
+	!!dev-qt/qtphonon:4
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		designer? ( dev-qt/designer:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+	zeitgeist? ( dev-libs/libqzeitgeist )
+"
+DEPEND="${RDEPEND}
+	qt4? ( >=dev-util/automoc-0.9.87 )
+	virtual/pkgconfig
+"
+PDEPEND="
+	aqua? ( media-libs/phonon-qt7 )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?] )
+	vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?] )
+"
+
+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-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 82e44e1ac4f8..2e1a1d3c1e5e 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.22 2014/05/27 11:21:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.23 2014/06/21 15:36:48 kensington Exp $
 
 EAPI=5
 
@@ -22,7 +22,13 @@ 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 )
+"
+
+RDEPEND="
 	!!dev-qt/qtphonon:4
 	qt4? (
 		dev-qt/qtcore:4
@@ -33,9 +39,7 @@ COMMON_DEPEND="
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
 		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
 		dev-qt/qtwidgets:5
 		designer? ( dev-qt/designer:5 )
 	)
@@ -45,22 +49,15 @@ COMMON_DEPEND="
 	)
 	zeitgeist? ( dev-libs/libqzeitgeist )
 "
+DEPEND="${RDEPEND}
+	qt4? ( >=dev-util/automoc-0.9.87 )
+	virtual/pkgconfig
+"
 PDEPEND="
 	aqua? ( media-libs/phonon-qt7 )
 	gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?] )
 	vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?] )
 "
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	qt4? ( >=dev-util/automoc-0.9.87 )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( aqua gstreamer vlc )
-	|| ( qt4 qt5 )
-	zeitgeist? ( qt4 )
-"
 
 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )