Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 114 insertions, 22 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index bf786908d03f..35c5d94d36d3 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,11 @@
 # 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.69 2014/11/02 09:00:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.70 2014/11/04 10:13:39 mrueg Exp $
+
+*phonon-4.8.2 (04 Nov 2014)
+
+  04 Nov 2014; Manuel Rüger <mrueg@gentoo.org> +phonon-4.8.2.ebuild:
+  Version bump.
 
   02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> phonon-4.7.2.ebuild:
   Stable for alpha, wrt bug #519592
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 9fb139b3de7b..07ddd741f2ba 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
@@ -8,27 +5,12 @@ DIST phonon-4.6.0.tar.xz 280712 SHA256 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee352
 DIST phonon-4.7.2.tar.xz 330244 SHA256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 WHIRLPOOL 2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
 DIST phonon-4.8.0.tar.xz 321468 SHA256 3bcb2a66c83fc5a4518a49cc96bb8971f155947571050a0e02b6be13c91ed524 SHA512 0dc12a4d479245ba7ffab954c91c78e3c469982e6b8ed5ff9b80150aebab448023ffde68b67a2520ca76af9ce3c0608d250f59275767c092f4e364da8cfe105f WHIRLPOOL 00bdd70549a02d601f173b58038185c4af2de6ae2bf0d89e30e212c711af7a8b7f74704ba99d83889cc3065fbe5f78797c42cf538dd9c7e813aa3208c83b6a8b
 DIST phonon-4.8.1.tar.xz 321652 SHA256 b6ca0126cd5330731875acc1cc0b60f8c9ed7ebc71e1d0210b74bf21658027d1 SHA512 98a69fbc8744b44d1041b0b71e7014fb66fa646176b2b356bc45a59248a4bf08be4f690ed1449db4653513c323e342564efe3d94c29117792158530b4e59cee6 WHIRLPOOL 8f1a269bb89ebaadd7e5b1bfa425e6a008d8f0af56c85d6f16fce4a7bf14d8a94f3ea6634400c72a5e56a1b3835d91da832603553f273e5d11a8e83a3078abfa
+DIST phonon-4.8.2.tar.xz 321728 SHA256 cf599750fe05652954e203f0320c485ad0d3b24bde6862cfc1230dbed6f9d276 SHA512 a9e21109e0adaa6d81be9d09af4539108278400e005ec6d51551f81901c64c9212b515d476db44dcca0b5bbebcc776c6feda8d8cdacd2c118fc5609911b2c3ed WHIRLPOOL b2c8642e564b8afd4f46a22f27a6d68f6df57ab76f0f0b9c61ca3b161c172fc098dfbdf983c8c9734baeddb7f74d7231f2ba972f975437408ab0fb4f586e686e
 EBUILD phonon-4.6.0-r1.ebuild 2241 SHA256 391af060ed7195b30ab641fdb5c22192eba93064739f728c2eac617ed6ee98d1 SHA512 be3a1416953f5e9166b32a915c33e4bf3a8aa9ad24e353733e2f8d2ad587f43f5bc67cfc00c74ccba255e1b818409319bb8232a93c9c0fbc658775008413207b WHIRLPOOL 360fbf823e7848be981d2ba2bc236304e4a3c6c3b0469e5b5883ce33fe623f5202263e18039617e303b2313620129601141ac6641576dd50a65a49b43bc5c564
 EBUILD phonon-4.7.2.ebuild 2463 SHA256 4829c679001c02965e571e27f5e39d92f8e50fa9851213f76c89f779c3ccf7c7 SHA512 9d3c85218e10e485f406f338e8fd0cb8521f5c929dba3c98e6c83dacf6671069037b671e3ca832969afbafebeae1341e2d1290b5bd482763db1a7246310248f4 WHIRLPOOL 633ae23ac2786a8e445a9c1690cf35fdca303f2f04f85c5ce0cb61b239ab4b4663a1f94c6a2ecb64ed3feb4178032c5b44590ec76dbfe7d3eb1a911e7a6b963d
 EBUILD phonon-4.8.0.ebuild 2478 SHA256 3aab6a7799c175d8de8739ab1eee06ff10b8ff6b36323f7371fce92b80aa3b1b SHA512 f5ea712528e1665fbf8a03b7c9b398fea2e0adc1aec2dd29cdfeca20435f80275ff3ba591da8b182d5341d9550f882961999eeb53bc93a525fec8e7f97279421 WHIRLPOOL 4a5914efd5adffdb168ca2f6ad6679e1aac285a372383bf0424dfc944b1784aae9f16f22e753ca69347a7cbd1c5fcaefba405f0964024bbca198b04400f9e0be
 EBUILD phonon-4.8.1.ebuild 2478 SHA256 0240a7a2417a4e7ee2d81673be736ee6f3e5634ed01d7a6da8b1ddecd97860e5 SHA512 9f939ac28403ee3c6bda1b8c6ac9ddcf95d73faa7e9254c1748e1ebabf2356e364213d5c4932c91b8581f254247ce00916077c72b47f03564f14cc368319a5f6 WHIRLPOOL 7347d06ce61aa9027e4900de3d9e9662443c552228482c0753cd70ff9ec2c12a5a0dfbcfee2cca5e98451cb898d2155d820f1c268a1d7868a400d898f640bab3
+EBUILD phonon-4.8.2.ebuild 2473 SHA256 a6588e10fa37cd61a6c65dc01ab25715df2e3a3f27a73375bad7f9fced1234bc SHA512 e45a141193c9cd6c56a9ad75f2801ad7c609d44674541d80e3fe2000bc91634e99b187a0bf9c4f4a4ee6bdd8a881cf1871c56e2fa86698e1be2acdd3be5809f5 WHIRLPOOL 997cb17597d234e9018560179904b46a1da0c0d132da54e21ec5258eea2bb307675c0ac654790ca721a56de9a1c186d0fa64591780a8cf2df2167a6b8aa66978
 EBUILD phonon-9999.ebuild 2478 SHA256 812d9b32d845010695bde886cef8f16c0fce8d89c50ad2e45eb6474a53a8abdc SHA512 6d1fbc2def0f27c51093ea4aaf9dbd6f7766135aee5f8a68cee5771ef37878f3345b3d6eddcde8a53b8bc53ee384f083cd58d1834738d799f68057f77bb3726c WHIRLPOOL 0cc86baed7c41fc8939f567f8fcc289f83a5a29e57d6081c4b380f0f3f87daa8e7cdda9c048ad7a72bec47c5288ab7bd575c2366dcae9ef458a74d0731e748d3
-MISC ChangeLog 19440 SHA256 577770c058e3813c5edb9336de8185643ea0a92a41a9bd3559453be469141722 SHA512 b5d8ba21c956b894cf5e2d1e26b99d3917286359f67abe6f128a87327aa78468cbab3863bedafaf842353ea682b128fed2a9a93423cfad86c3c02a1a03e01666 WHIRLPOOL 500999d6e193d671bb9e1e28b77f4f1addaf7dc21dadf478bcc8a9617038e2cee3b6a7f26a93fdd0cc9b407eb21c6357fff84c317986949d9933527192261f94
+MISC ChangeLog 19558 SHA256 5075fd8bb3da7176202ed80bac15ee8dc2ae71c630308567fadfaa5a759505be SHA512 112ebd8733abc307054ac591dc0c6c2485b625adc736fa821efe9eb20d5f52ae465ffb0ebd781eb0ea83b6961b034d46c7d5f5ce5b326050a601bac6db653729 WHIRLPOOL efba4997324307e1cfb1f3f394bb44c80a4014c2222050e35e96a5541b2bfdf595708cf09b7f3c6ab6d57dbd6a44138fe9a693501768df11472cd49d78c3f37a
 MISC metadata.xml 382 SHA256 6758869ff5c1d28cbfabfb7ad27e23038a688afcbfbc8f880c742ab9be908f06 SHA512 41f9e7123fc4069d8bc6258113de25b8de23c7a396ae4285507ebac62dfe0fa93f939940533ccb39c1e1d5419f7f0bb65db2517a0789b7242bd36cb3dc612f57 WHIRLPOOL ad1713d849565ad3a1f85ee59cbbdf857877b308d093061d6db7bffa829a1daf3b94213b6d007d9832ba4e9091d8c9b0bb7b25bdd2e41628c1786cab799b707a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUVfLEAAoJELp701BxlEWfowwP/jEcO4oclesi1y6o10Oovo7w
-mGkG284E4AoO3d8kcC2pVfrFd4iAJAJTB9SA1VavIyBDHv4G4dtcTqo9vr7i4szp
-XofKoi/Bzcb+LUY902laqas4ZMQvh+/1dFbsPkpIVTTBtPYb5IBqgLxmiWPKZMZ1
-b/t4mFCItv5Cf/6SiPykeRbVqxuMOwrXAjlqjYvErhyvk7tvg6YBMKnPCwweywdZ
-Iv+QBOIX46J5H6wEXNuTeA2E+kOPGBJe8i+kmxYV1bKk4n9sCR3J9KRjDIP7D7wa
-ntwlGUBw/N+8fU6o0sOjRV0muuLlvKta7O1AuFoGknothJNSuy2FiZtcYCfE80XP
-hs/YYVNDGuNh4AggXQyGl0gmC7EmpGEqQbgMqv1YHSEZlEzJ55lwiOlRHiPKNPLu
-TjgPX1dzx/puO3gZWI+2dRxDG+odG4QkzQXT8/jtGhr9MKq/Bk1U1q/8ecUvxg9W
-tPkZcxBpBay1SEqi+/scY2b+lFwyCgSDlyL9jIfxq5DAC15e3HXrrW4cP6CDHARg
-y0EhVneA/uetioWpafoYExsbCsLnPnUfiCpa8zn31CIHc9Ik/m46W1HggYcdGY6j
-pdxAUHxItL3Q+T+cYeqivjeBYwUa7yBvEPfOjh8N8BnqRvEwPctks8gsoAeUiRXA
-lw9p7URv3BXvPctpJAp2
-=HyQn
------END PGP SIGNATURE-----
diff --git a/media-libs/phonon/phonon-4.8.2.ebuild b/media-libs/phonon/phonon-4.8.2.ebuild
new file mode 100644
index 000000000000..818053be4076
--- /dev/null
+++ b/media-libs/phonon/phonon-4.8.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.8.2.ebuild,v 1.1 2014/11/04 10:13:39 mrueg 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.8.0[qt4?,qt5?] )
+	vlc? ( >=media-libs/phonon-vlc-0.8.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
+}